- wine-devel - winehq.org

[PATCH v2] shellpath.c: Fix creation of HOME directory symbolic links
by Rob Walker 11 Jun '18

11 Jun '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=41668 The Shell Folders, that Wine symlinks to the user's HOME directory, are only re-created on each Wine boot if they: do not pre-exist or are broken symbolic links. Handling the DESKTOP Shell Folder is a special case as this is created twice (during a standard boot), early in the Wine boot process. This is handled by 2 separate processes, loading shell32.dll, in sequence. This makes it hard to determine if the DESKTOP folder was created before the Wine boot (either from a previous Wine boot or by the end user). The final (implemented) solution determines the exact start time of the Wine boot process (using the current system time and tick-count). If the DESKTOP directory was last written after this Wine boot time, we can assume that "we" (Wine) automatically created the directory. Only in this instance do we attempt to set a symlink to the DESKTOP directory (subdirectory of HOME). Test on Gentoo GNU/Linux. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/shell32/shellpath.c | 325 ++++++++++++++++++--------------------- 1 file changed, 151 insertions(+), 174 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index a551e93aa8..c87c73846b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -58,6 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); static const BOOL is_win64 = sizeof(void *) > sizeof(int); +static LONG register_shell_folders = 0; /* ########## Combining and Constructing paths ########## @@ -4098,6 +4099,15 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( goto end; } + /* Allow function create_homedir_symbolic_link create this directory + (or a HOME directory symlink) for us, later in the boot process. */ + if (!InterlockedCompareExchange(&register_shell_folders, -1, -1) && (folder == CSIDL_DESKTOPDIRECTORY)) + { + TRACE("Faking successful creation of system directory %s (%#x)\n", debugstr_w(szBuildPath), folder); + hr = S_OK; + goto end; + } + /* create directory/directories */ ret = SHCreateDirectoryExW(hwndOwner, szBuildPath, NULL); if (ret && ret != ERROR_ALREADY_EXISTS) @@ -4107,7 +4117,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( goto end; } - TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath)); + TRACE("Created missing system directory %s (%#x)\n", debugstr_w(szBuildPath), folder); end: TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath)); return hr; @@ -4385,193 +4395,111 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { } /****************************************************************************** - * _SHCreateSymbolicLinks [Internal] - * - * Sets up symbol links for various shell folders to point into the users home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we imply that the user - * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Videos' subfolders under '$HOME/My Documents', if those - * do not already exits. We put appropriate symbolic links in place for those, - * too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds fo 'My Pictures' and 'My Videos'. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + * create_homedir_symbolic_link [Internal] + * + * Creates a symbolic link from the current Wineprefix to an appropriate + * HOME subdirectory (if one is found). + * + * Creates 'XXXX' directory in Wineprefix. + * Then create a 'My XXXX' symbolic link in Wineprefix: + * 1) If '$HOME/XXXX' (IDS directory) exists then target this. + * 2) If '$HOME/XXXX' (XDG_XXXX_DIR) exists then target this. + * 3) If '$HOME/XXXX' (MacOS XXXX media directory) exists then target this. + * + * PARAMS + * ids_dir [I] Windows Resource Identifier code for current Shell Folder. + * csidl_dir [I] Constant Special Item ID List identifier for current Shell Folder. + * xdg_dir [I] Full path of external Unix XDG directory corresponding to current Shell Folder. + * ws_osx_dir [I] Fallback directory name to use, corresponding to current Shell Folder (OSX specific). + * */ -static void _SHCreateSymbolicLinks(void) -{ - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; - const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; - int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; - static const unsigned int num = ARRAY_SIZE(xdg_dirs); - WCHAR wszTempPath[MAX_PATH]; - char szPersonalTarget[FILENAME_MAX], *pszPersonal; - char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; - char szDesktopTarget[FILENAME_MAX], *pszDesktop; - struct stat statFolder; - const char *pszHome; +void create_homedir_symbolic_link(UINT ids_dir, + int csidl_dir, + const char * xdg_dir, + const WCHAR * ws_osx_dir) +{ + static const char * env_homedir = NULL; + WCHAR ws_temp_path[MAX_PATH]; + char home_target[FILENAME_MAX], * prefix_dir; + struct stat stat_folder, stat_home_folder; HRESULT hr; - char ** xdg_results; - char * xdg_desktop_dir; - - /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) return; - pszPersonal = wine_get_unix_file_name(wszTempPath); - if (!pszPersonal) return; + BOOL target_ok; - hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); - if (FAILED(hr)) xdg_results = NULL; - - pszHome = getenv("HOME"); - if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) + hr = SHGetFolderPathW(NULL, csidl_dir, NULL, + SHGFP_TYPE_DEFAULT, ws_temp_path); + if (SUCCEEDED(hr)) { - while (1) - { - /* Check if there's already a Wine-specific 'My Documents' folder */ - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && - !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* '$HOME/My Documents' exists. Create 'My Pictures', - * 'My Videos' and 'My Music' subfolders or fail silently if - * they already exist. - */ - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) - { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } - break; - } - - /* Try to point to the XDG Documents folder */ - if (xdg_results && xdg_results[num-2] && - !stat(xdg_results[num-2], &statFolder) && - S_ISDIR(statFolder.st_mode)) - { - strcpy(szPersonalTarget, xdg_results[num-2]); - break; - } - - /* Or the hardcoded / OS X Documents folder */ - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, DocumentsW) && - !stat(szPersonalTarget, &statFolder) && - S_ISDIR(statFolder.st_mode)) - break; - - /* As a last resort point to $HOME. */ - strcpy(szPersonalTarget, pszHome); - break; - } - - /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - remove(pszPersonal); - symlink(szPersonalTarget, pszPersonal); + TRACE("%s directory already exists\n", + debugstr_w(ws_temp_path)); + return; + } + else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + hr = SHGetFolderPathW(NULL, csidl_dir|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, ws_temp_path); + if (FAILED(hr)) return; } else { - /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs - * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ - pszHome = NULL; - strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } + ERR("Failed to get Wineprefix path corresponding to %d CSIDL\n", + csidl_dir); + return; } - /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ - for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) + prefix_dir = wine_get_unix_file_name(ws_temp_path); + if (!prefix_dir) { - /* Create the current 'My Whatever' folder and get its unix path. */ - hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) continue; - - pszMyStuff = wine_get_unix_file_name(wszTempPath); - if (!pszMyStuff) continue; - - while (1) - { - /* Check for the Wine-specific '$HOME/My Documents' subfolder */ - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && - !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - break; - - /* Try the XDG_XXX_DIR folder */ - if (xdg_results && xdg_results[i]) - { - strcpy(szMyStuffTarget, xdg_results[i]); - break; - } - - /* Or the OS X folder (these are never localized) */ - if (pszHome) - { - strcpy(szMyStuffTarget, pszHome); - if (_SHAppendToUnixPath(szMyStuffTarget, MyOSXStuffW[i]) && - !stat(szMyStuffTarget, &statFolder) && - S_ISDIR(statFolder.st_mode)) - break; - } + ERR("Failed to get Unix Wineprefix directory for: %s\n", + debugstr_w(ws_temp_path)); + return; + } - /* As a last resort point to the same location as 'My Documents' */ - strcpy(szMyStuffTarget, szPersonalTarget); - break; - } - remove(pszMyStuff); - symlink(szMyStuffTarget, pszMyStuff); - heap_free(pszMyStuff); + if (!env_homedir) env_homedir = getenv("HOME"); + if (!(env_homedir + && (stat(env_homedir, &stat_home_folder) != 1) + && S_ISDIR(stat_home_folder.st_mode))) + { + if (prefix_dir) heap_free(prefix_dir); + return; } - /* Last but not least, the Desktop folder */ - if (pszHome) - strcpy(szDesktopTarget, pszHome); + /* Check for: + * '$HOME/XXXX' (IDS directory) + * or '$HOME/XXXX' (XDG directory) + * or '$HOME/XXXX' (MacOS directory) + */ + target_ok = FALSE; + strcpy(home_target, env_homedir); + if (_SHAppendToUnixPath(home_target, MAKEINTRESOURCEW(ids_dir)) + && (stat(home_target, &stat_folder) != -1) + && S_ISDIR(stat_folder.st_mode)) + { + target_ok = TRUE; + } + else if (xdg_dir) + { + strcpy(home_target, xdg_dir); + /* Only link to the XDG directory, if it does not point directly + * to the user's HOME directory (XDG specification fallback path). */ + target_ok = TRUE; + } else - strcpy(szDesktopTarget, pszPersonal); - heap_free(pszPersonal); - - xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; - if (xdg_desktop_dir || - (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && - !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { - hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) - { - remove(pszDesktop); - if (xdg_desktop_dir) - symlink(xdg_desktop_dir, pszDesktop); - else - symlink(szDesktopTarget, pszDesktop); - heap_free(pszDesktop); - } + strcpy(home_target, env_homedir); + target_ok = _SHAppendToUnixPath(home_target, ws_osx_dir) + && (stat(home_target, &stat_folder) != -1) + && S_ISDIR(stat_folder.st_mode); } - /* Free resources allocated by XDG_UserDirLookup() */ - if (xdg_results) + if (target_ok) { - for (i = 0; i < num; i++) - heap_free(xdg_results[i]); - heap_free(xdg_results); + TRACE("Delete path: %s\n", debugstr_a(prefix_dir)); + remove(prefix_dir); + TRACE("Symlink: %s -> %s\n", debugstr_a(prefix_dir), debugstr_a(home_target)); + symlink(home_target, prefix_dir); } + + if (prefix_dir) heap_free(prefix_dir); } /****************************************************************************** @@ -6126,15 +6054,61 @@ static void register_system_knownfolders(void) } } +/****************************************************************************** + * create_homedir_symbolic_links [Internal] + * + * Parse WINESYMLINK env variable, for each XDG directory argument. To test if symlinking is + * enabled for that XDG directory / Wine Profile Folder. + * Then calls the function create_homedir_symbolic_link to potentially symlink from a Shell Folder, + * in the current Wineprefix, to a subdirectory of the current user's HOME directory. + * + * PARAMS + * xdg_dirnames [I] Pointer to an array of Unix XDG directory names + * (without "XDG_" prefix and "_DIR" suffix). + * xdg_dir_count [I] Item count of array (above). + * + */ +static void create_homedir_symbolic_links(const char * const xdg_dirnames[], const UINT xdg_dir_count) +{ + char ** xdg_dirs_array; + char * xdg_dir; + HRESULT hr; + UINT i; + + if (!xdg_dirnames) return; + + hr = XDG_UserDirLookup(xdg_dirnames, xdg_dir_count, &xdg_dirs_array); + if (FAILED(hr)) xdg_dirs_array = NULL; + + for (i = 0; i < xdg_dir_count; ++i) + { + xdg_dir = xdg_dirs_array ? xdg_dirs_array[i] : NULL; + if (!strcmp(xdg_dirnames[i],"DOCUMENTS")) + create_homedir_symbolic_link(IDS_PERSONAL, CSIDL_PERSONAL, xdg_dir, DocumentsW); + else if (!strcmp(xdg_dirnames[i],"PICTURES")) + create_homedir_symbolic_link(IDS_MYPICTURES, CSIDL_MYPICTURES, xdg_dir, PicturesW); + else if (!strcmp(xdg_dirnames[i],"VIDEOS")) + create_homedir_symbolic_link(IDS_MYVIDEOS, CSIDL_MYVIDEO, xdg_dir, MoviesW); + else if (!strcmp(xdg_dirnames[i],"MUSIC")) + create_homedir_symbolic_link(IDS_MYMUSIC, CSIDL_MYMUSIC, xdg_dir, MusicW); + else if (!strcmp(xdg_dirnames[i],"DESKTOP")) + create_homedir_symbolic_link(IDS_DESKTOPDIRECTORY, CSIDL_DESKTOPDIRECTORY, xdg_dir, DesktopW); + else + ERR("XDG directory name specifier invalid: %s\n", debugstr_a(xdg_dirnames[i])); + if (xdg_dir) heap_free(xdg_dirs_array[i]); + } + if (xdg_dirs_array) heap_free(xdg_dirs_array); +} + HRESULT SHELL_RegisterShellFolders(void) { + static const char * const xdg_dirnames[] = { "DOCUMENTS", "PICTURES", "VIDEOS", "MUSIC", "DESKTOP" }; + const UINT xdg_dir_count = 5; HRESULT hr; - /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Videos', 'My Music' and 'Desktop' in advance, so that the - * _SHRegister*ShellFolders() functions will find everything nice and clean - * and thus will not attempt to create them in the profile directory. */ - _SHCreateSymbolicLinks(); + /* Early setup of symlinks from specific User Shell Folders, in + * current Wineprefix, to subdirecties of the user's HOME directory. */ + create_homedir_symbolic_links(xdg_dirnames, xdg_dir_count); hr = _SHRegisterUserShellFolders(TRUE); if (SUCCEEDED(hr)) @@ -6147,5 +6121,8 @@ HRESULT SHELL_RegisterShellFolders(void) hr = set_folder_attributes(); if (SUCCEEDED(hr)) register_system_knownfolders(); + + (void) InterlockedExchange(&register_shell_folders, 1); + return hr; } -- 2.17.1

3 3

[PATCH 2/5] mstask: Implement IEnumWorkItems::Next().
by Dmitry Timoshkov 11 Jun '18

11 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 98 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 416a3218d0..8db6e28b5e 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -43,6 +43,7 @@ typedef struct { IEnumWorkItems IEnumWorkItems_iface; LONG ref; + HANDLE handle; } EnumWorkItemsImpl; static inline TaskSchedulerImpl *impl_from_ITaskScheduler(ITaskScheduler *iface) @@ -97,6 +98,8 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) if (ref == 0) { + if (This->handle != INVALID_HANDLE_VALUE) + FindClose(This->handle); heap_free(This); InterlockedDecrement(&dll_ref); } @@ -104,11 +107,101 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) return ref; } +static void free_list(LPWSTR *list, LONG count) +{ + LONG i; + + for (i = 0; i < count; i++) + CoTaskMemFree(list[i]); + + CoTaskMemFree(list); +} + +static inline BOOL is_file(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPWSTR **names, ULONG *fetched) { + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\','*',0 }; EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, count, names, fetched); - return E_NOTIMPL; + WCHAR path[MAX_PATH]; + WIN32_FIND_DATAW data; + ULONG enumerated, dummy; + LPWSTR *list; + HRESULT hr = S_FALSE; + + TRACE("(%p)->(%u %p %p)\n", This, count, names, fetched); + + if (!count || !names || (!fetched && count > 1)) return E_INVALIDARG; + + if (!fetched) fetched = &dummy; + + *names = NULL; + *fetched = 0; + enumerated = 0; + list = NULL; + + if (This->handle == INVALID_HANDLE_VALUE) + { + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + This->handle = FindFirstFileW(path, &data); + if (This->handle == INVALID_HANDLE_VALUE) + return S_FALSE; + } + else + { + if (!FindNextFileW(This->handle, &data)) + return S_FALSE; + } + + do + { + if (is_file(&data)) + { + LPWSTR *new_list; + + if (!list) + new_list = CoTaskMemAlloc((enumerated + 1) * sizeof(list[0])); + else + new_list = CoTaskMemRealloc(list, (enumerated + 1) * sizeof(list[0])); + if (!new_list) + { + hr = E_OUTOFMEMORY; + break; + } + + list = new_list; + + list[enumerated] = CoTaskMemAlloc((lstrlenW(data.cFileName) + 1) * sizeof(WCHAR)); + if (!list[enumerated]) + { + hr = E_OUTOFMEMORY; + break; + } + + lstrcpyW(list[enumerated], data.cFileName); + enumerated++; + + if (enumerated >= count) + { + hr = S_OK; + break; + } + } + } while (FindNextFileW(This->handle, &data)); + + if (FAILED(hr)) + free_list(list, enumerated); + else + { + *fetched = enumerated; + *names = list; + } + + return hr; } static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) @@ -154,6 +247,7 @@ static HRESULT create_task_enum(IEnumWorkItems **ret) tasks->IEnumWorkItems_iface.lpVtbl = &EnumWorkItemsVtbl; tasks->ref = 1; + tasks->handle = INVALID_HANDLE_VALUE; *ret = &tasks->IEnumWorkItems_iface; InterlockedIncrement(&dll_ref); -- 2.16.3

2 1

[PATCH] ntdll: Implement RtlReleaseRelativeName
by Stefan Leichter 11 Jun '18

11 Jun '18

For https://bugs.winehq.org/show_bug.cgi?id=45294 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/path.c | 8 ++++++++ 2 files changed, 9 insertions(+)

1 0

[PATCH] winhttp: Store the server certificate context in the request.
by Hans Leidekker 11 Jun '18

11 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 1 - dlls/winhttp/request.c | 11 +++++++++++ dlls/winhttp/session.c | 14 ++++++-------- dlls/winhttp/tests/winhttp.c | 5 +++++ dlls/winhttp/winhttp_private.h | 2 ++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d0d02d535e..d577a64783 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -47,7 +47,6 @@ #include "windef.h" #include "winbase.h" #include "winhttp.h" -#include "wincrypt.h" #include "schannel.h" #include "winhttp_private.h" diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 96a2c91de5..56ec910294 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1765,6 +1765,10 @@ static BOOL open_connection( request_t *request ) return FALSE; } } + + CertFreeCertificateContext( request->server_cert ); + request->server_cert = NULL; + if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &connect->session->cred_handle )) @@ -1787,6 +1791,13 @@ static BOOL open_connection( request_t *request ) request->netconn = netconn; } + if (netconn->secure && !(request->server_cert = netconn_get_certificate( netconn ))) + { + heap_free( addressW ); + netconn_close( netconn ); + return FALSE; + } + done: request->read_pos = request->read_size = 0; request->read_chunked = FALSE; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e2b91fa513..fb815682c2 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -40,7 +40,6 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" -#include "wincrypt.h" #include "winreg.h" #define COBJMACROS #include "ole2.h" @@ -597,6 +596,8 @@ static void request_destroy( object_header_t *hdr ) } release_object( &request->connect->hdr ); + CertFreeCertificateContext( request->server_cert ); + destroy_authinfo( request->authinfo ); destroy_authinfo( request->proxy_authinfo ); @@ -759,14 +760,14 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } - if (!request->netconn || !(cert = netconn_get_certificate( request->netconn ))) return FALSE; + if (!(cert = CertDuplicateCertificateContext( request->server_cert ))) return FALSE; *(CERT_CONTEXT **)buffer = (CERT_CONTEXT *)cert; *buflen = sizeof(cert); return TRUE; } case WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: { - const CERT_CONTEXT *cert; + const CERT_CONTEXT *cert = request->server_cert; const CRYPT_OID_INFO *oidInfo; WINHTTP_CERTIFICATE_INFO *ci = buffer; @@ -778,16 +779,14 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } - if (!request->netconn || !(cert = netconn_get_certificate( request->netconn ))) return FALSE; + if (!cert) return FALSE; ci->ftExpiry = cert->pCertInfo->NotAfter; ci->ftStart = cert->pCertInfo->NotBefore; ci->lpszSubjectInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Subject ); ci->lpszIssuerInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Issuer ); ci->lpszProtocolName = NULL; - oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, - cert->pCertInfo->SignatureAlgorithm.pszObjId, - 0 ); + oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, cert->pCertInfo->SignatureAlgorithm.pszObjId, 0 ); if (oidInfo) ci->lpszSignatureAlgName = (LPWSTR)oidInfo->pwszName; else @@ -795,7 +794,6 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf ci->lpszEncryptionAlgName = NULL; ci->dwKeySize = request->netconn ? netconn_get_cipher_strength( request->netconn ) : 0; - CertFreeCertificateContext( cert ); *buflen = sizeof(*ci); return TRUE; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4d8585be1a..2c22276899 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1107,6 +1107,11 @@ static void test_secure_connection(void) } ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); + size = sizeof(cert); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size); + ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + if (ret) CertFreeCertificateContext(cert); + cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0eb0dead87..d639a2deb2 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -46,6 +46,7 @@ #include "ole2.h" #include "sspi.h" +#include "wincrypt.h" static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; @@ -209,6 +210,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; int send_timeout; -- 2.11.0

2 1

[PATCH] webservices/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 11 Jun '18

11 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/tests/channel.c | 12 ++++++------ dlls/webservices/tests/msg.c | 2 +- dlls/webservices/tests/proxy.c | 8 ++++---- dlls/webservices/tests/reader.c | 20 ++++++++++---------- dlls/webservices/tests/url.c | 4 ++-- dlls/webservices/tests/writer.c | 38 +++++++++++++++++++------------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 17a0b58ac8..c995a08829 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -134,7 +134,7 @@ static void test_WsOpenChannel(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.length = ARRAY_SIZE( url ); addr.url.chars = url; hr = WsOpenChannel( NULL, &addr, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -179,7 +179,7 @@ static void test_WsResetChannel(void) ok( hr == S_OK, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.length = ARRAY_SIZE( url ); addr.url.chars = url; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -301,7 +301,7 @@ static void test_WsOpenListener(void) hr = WsOpenListener( listener, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - url.length = sizeof(str)/sizeof(str[0]); + url.length = ARRAY_SIZE( str ); url.chars = str; hr = WsOpenListener( NULL, &url, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -320,7 +320,7 @@ static void test_WsOpenListener(void) hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - url.length = sizeof(str2)/sizeof(str2[0]); + url.length = ARRAY_SIZE( str2 ); url.chars = str2; hr = WsOpenListener( listener, &url, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -333,7 +333,7 @@ static void test_WsOpenListener(void) hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - url.length = sizeof(str3)/sizeof(str3[0]); + url.length = ARRAY_SIZE( str3 ); url.chars = str3; hr = WsOpenListener( listener, &url, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -387,7 +387,7 @@ static void test_WsResetListener(void) { WCHAR str[] = {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; + WS_STRING url = { ARRAY_SIZE( str ), str }; WS_LISTENER *listener; WS_LISTENER_STATE state; WS_LISTENER_PROPERTY prop; diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 550ae1dd0d..22d69ece2c 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -258,7 +258,7 @@ static void test_WsAddressMessage(void) memset( &endpoint, 0, sizeof(endpoint) ); endpoint.url.chars = localhost; - endpoint.url.length = sizeof(localhost)/sizeof(localhost[0]); + endpoint.url.length = ARRAY_SIZE( localhost ); hr = WsAddressMessage( msg, &endpoint, NULL ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index 95f980a2ff..f5297796b3 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -164,7 +164,7 @@ static void test_WsOpenServiceProxy(void) ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.length = ARRAY_SIZE( url ); addr.url.chars = url; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -206,7 +206,7 @@ static void test_WsResetServiceProxy(void) ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.length = ARRAY_SIZE( url ); addr.url.chars = url; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -385,7 +385,7 @@ static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) *ret = NULL; hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, - 0, prop, sizeof(prop)/sizeof(prop[0]), &proxy, NULL ); + 0, prop, ARRAY_SIZE( prop ), &proxy, NULL ); if (hr != S_OK) return hr; memset( &addr, 0, sizeof(addr) ); @@ -687,7 +687,7 @@ static DWORD CALLBACK server_proc( void *arg ) } buf[i] = 0; - for (j = 0; j < sizeof(tests)/sizeof(tests[0]); j++) + for (j = 0; j < ARRAY_SIZE( tests ); j++) { if (strstr( buf, tests[j].req_action )) { diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index bd8a37cc52..b21e8396be 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -479,7 +479,7 @@ static void test_WsSetInput(void) enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; enc.charSet = WS_CHARSET_AUTO; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { input.encodedData = tests[i].data; input.encodedDataSize = tests[i].size; @@ -1174,7 +1174,7 @@ static void test_WsReadNode(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_input( reader, tests[i].text, strlen(tests[i].text) ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1644,7 +1644,7 @@ static void test_WsReadType(void) ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); enum_desc.values = enum_values; - enum_desc.valueCount = sizeof(enum_values)/sizeof(enum_values[0]); + enum_desc.valueCount = ARRAY_SIZE( enum_values ); enum_desc.maxByteCount = 3; enum_desc.nameIndices = NULL; @@ -3526,7 +3526,7 @@ static void test_datetime(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { memset( &date, 0, sizeof(date) ); prepare_type_test( reader, tests[i].str, strlen(tests[i].str) ); @@ -3578,7 +3578,7 @@ static void test_WsDateTimeToFileTime(void) hr = WsDateTimeToFileTime( NULL, &ft, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { memset( &ft, 0, sizeof(ft) ); hr = WsDateTimeToFileTime( &tests[i].dt, &ft, NULL ); @@ -3716,7 +3716,7 @@ static void test_double(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { val = 0; prepare_type_test( reader, tests[i].str, strlen(tests[i].str) ); @@ -4064,7 +4064,7 @@ static void test_entities(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_input( reader, tests[i].str, strlen(tests[i].str) ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -4628,7 +4628,7 @@ static void test_WsReadQualifiedName(void) hr = WsReadQualifiedName( reader, heap, NULL, &localname, NULL, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_input( reader, tests[i].str, strlen(tests[i].str) ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -5647,7 +5647,7 @@ static void test_dictionary(void) UuidCreate( &dict.guid ); dict.strings = strings; - dict.stringCount = sizeof(strings)/sizeof(strings[0]); + dict.stringCount = ARRAY_SIZE( strings ); dict.isConst = TRUE; /* short dictionary element */ @@ -6385,7 +6385,7 @@ static void test_float(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { val = 0; prepare_type_test( reader, tests[i].str, strlen(tests[i].str) ); diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 82059a02bf..2b8dda482e 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -131,7 +131,7 @@ static void test_WsDecodeUrl(void) hr = WsDecodeUrl( &str, 0, NULL, (WS_URL **)&url, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; @@ -271,7 +271,7 @@ static void test_WsEncodeUrl(void) hr = WsEncodeUrl( (const WS_URL *)&url, 0, heap, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { memset( &url, 0, sizeof(url) ); url.url.scheme = tests[i].scheme; diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 15d4569662..e33c38951e 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -710,7 +710,7 @@ static void test_basic_type(void) ok( hr == S_OK, "got %08x\n", hr ); /* element content type mapping */ - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { prepare_basic_type_test( writer ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, tests[i].type, NULL, @@ -723,7 +723,7 @@ static void test_basic_type(void) } /* element type mapping is the same as element content type mapping for basic types */ - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { const INT64 *ptr = &tests[i].val; @@ -738,7 +738,7 @@ static void test_basic_type(void) } /* attribute type mapping */ - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { prepare_basic_type_test( writer ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); @@ -1103,7 +1103,7 @@ static void test_WsWriteValue(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); /* element type mapping */ - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1120,7 +1120,7 @@ static void test_WsWriteValue(void) } /* attribute type mapping */ - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2170,7 +2170,7 @@ static void test_text_types(void) hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2257,7 +2257,7 @@ static void test_double(void) ok( hr == S_OK, "got %08x\n", hr ); text.text.textType = WS_XML_TEXT_TYPE_DOUBLE; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2772,7 +2772,7 @@ static void test_escapes(void) hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests_elem)/sizeof(tests_elem[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests_elem ); i++) { hr = set_output( writer ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -2789,7 +2789,7 @@ static void test_escapes(void) check_output( writer, tests_elem[i].result, __LINE__ ); } - for (i = 0; i < sizeof(tests_attr)/sizeof(tests_attr[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests_attr ); i++) { hr = set_output( writer ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -2812,7 +2812,7 @@ static void test_escapes(void) check_output( writer, tests_attr[i].result, __LINE__ ); } - for (i = 0; i < sizeof(tests_cdata)/sizeof(tests_cdata[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests_cdata ); i++) { hr = set_output( writer ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -2835,7 +2835,7 @@ static void test_escapes(void) check_output( writer, tests_cdata[i].result, __LINE__ ); } - for (i = 0; i < sizeof(tests_comment)/sizeof(tests_comment[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests_comment ); i++) { WS_XML_COMMENT_NODE comment = {{WS_XML_NODE_TYPE_COMMENT}}; @@ -2954,7 +2954,7 @@ static void test_write_option(void) hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -3041,7 +3041,7 @@ static void test_datetime(void) hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3231,7 +3231,7 @@ static void test_WsWriteQualifiedName(void) hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( tests ); i++) { WS_XML_STRING prefix2, localname2, ns2; const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; @@ -3551,7 +3551,7 @@ static void test_binary_encoding(void) hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - for (i = 0; i < sizeof(elem_tests)/sizeof(elem_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( elem_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -3574,7 +3574,7 @@ static void test_binary_encoding(void) if (hr == S_OK) check_output_bin( writer, elem_tests[i].result, elem_tests[i].len_result, __LINE__ ); } - for (i = 0; i < sizeof(attr_tests)/sizeof(attr_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( attr_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -3778,12 +3778,12 @@ static void test_dictionary(void) UuidCreate( &dict.guid ); dict.strings = strings; - dict.stringCount = sizeof(strings)/sizeof(strings[0]); + dict.stringCount = ARRAY_SIZE( strings ); dict.isConst = TRUE; bin.staticDictionary = &dict; - for (i = 0; i < sizeof(elem_tests)/sizeof(elem_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( elem_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); @@ -3799,7 +3799,7 @@ static void test_dictionary(void) if (hr == S_OK) check_output_bin( writer, elem_tests[i].result, elem_tests[i].len_result, __LINE__ ); } - for (i = 0; i < sizeof(attr_tests)/sizeof(attr_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE( attr_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); ok( hr == S_OK, "%u: got %08x\n", i, hr ); -- 2.14.4

2 1

wine-3.0.2-rc1 Available
by Michael Stefaniuc 10 Jun '18

10 Jun '18

Hello guys, I have pushed wine-3.0.2-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Nothing fancy this time. The bulk of the changes is stuff from wine-3.5 to wine-3.7 with some older stuff that got deferred during 3.0.1. The interesting parts from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 3.0.2 (total 54): 13351 Empire Earth v. 1.00: mouse is not responsive 15350 wrong keyboard layout in Tomb Raider Anniversary / Legend 29842 IE4 crashes on showing certificate authorities, needs wininet.dll.ParseX509EncodedCertificateForListBoxEntry 29999 Bloodrayne 2: text in the menus misplaced 30076 .NET Framework 4.x with WinVer setting "Windows 7" spams terminal with "LocaleNameToLCID/LCIDToLocaleName unsupported flags 8000000" (LOCALE_ALLOW_NEUTRAL_NAMES) 30103 Static controls with bitmap do not display correct background. 30611 Lazarus browser sample fails, needs ieframe:ViewObject_Draw implementation 31850 Age of Mythology needs pidgen.dll.PIDGenSimpA 34101 Need for Speed: Shift demo crashes in 'purist' mode (d3dx9_36) (needs ID3DXEffect::FindNextValidTechnique method implementation) 36843 "Read only"checkbox on Save As dialog 37228 Cisco Jabber 11.x crashes on unimplemented function ntdsapi.dll.DsCrackNamesW 37594 World of Warcraft in-game browser does not work (needs advapi32.BuildSecurityDescriptorW() implementation) 38564 Rush for Berlin Gold crashes after starting 38836 SCM 'StartService' must wait for driver service entry point execution before return (PunkBuster 'PnkBstrB' service failure, CPU-Z randomly fails to load its driver, BattlEye 'BEDaisy' kernel service) 39209 Smart Diary Suite 4 crashes when updating options ('CLSID_AudioCompressorCategory', '{33D9A761-90C8-11d0-BD43-00A0C911CE86}' must be treated as special category) 39452 mpr.WNetGetUniversalName() return value (causes Intel MPI to fail) 39979 SupArc crashes inside msvcr110 40767 Indiana Jones and The Emperor's Tomb quits after the splash screen 41377 Windows 10 DISM fails to find its resources (kernel32 SetThreadUILanguage must return non-zero/best fit language identifier if zero is passed) 42267 Rogue-Killer installer crashes on unimplemented function ntdll.dll._aulldvrm 42446 Native Instruments 'Native Access' 1.1.x fails to start, reports 'You cannot start Native Access from the mounted disk' 42686 Poedit crashes on start on unimplemented function msvcp140.dll.?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ 42768 Ys: The Ark of Napishtim (Ys 6) silently crashes playing in-game videos 43351 x64dbg needs kernel32.dll CreateRemoteThreadEx in Win7+ mode 43831 Cuphead (Steam) crashes on startup (needs setupapi.CM_Get_Parent stub to return CR_NO_SUCH_DEVNODE) 43930 iCopy 1.6.x (.NET 2.0 app) crashes on startup (IWiaDevMgr::SelectDeviceDlg DeviceID pointer parameter can be NULL, needs be declared 'unique' for RPC marshalling) 44135 Olive Tree Bible Software BibleStudySetup_6.0.23.exe fails to install 44138 Native Access needs unimplemented function iphlpapi.dll.if_indextoname 44278 Multiple applications crash on unimplemented function msvcp140.dll.?uncaught_exceptions@std@@YAHXZ 44404 Several .Net apps (e.g. Remembear) throw errors/crash,caused by msctf stubs TextStoreACPSink_{OnTextChange,OnSelectionChange,OnLayoutChange} 44466 PrtSc button crashes StarCraft 44496 Custom imports resolver used by multiple kernel drivers can't cope with 'ntoskrnl.exe' low-level (wc)string/copy helpers being forwarded to 'msvcrt.dll' (BattlEye 'BEDaisy', Sentinel HASP 'hardlock.sys') 44504 vlc 2.2.6: playback performance hampered 44530 64-bit Sentinel HASP hardlock.sys kernel driver tries to access to DR7 (not handled in ntoskrnl emulate_instruction) 44693 Native Access crashes on unimplemented function vcruntime140.dll.__current_exception 44742 Divinity: Original Sin 2 crashes due to unimplemented IPHLPAPI.DLL.ConvertLengthToIpv4Mask 44744 Autodesk Fusion 360 need propsys.dll.PSGetPropertyKeyFromName to be installed 44746 Running any command in MS PowerShell 6+ (.NET app) results in advapi:EventActivityIdControl console spam 44770 ExpressPCB Plus 1.1 (.NET 3.5 SP1 app) throws 'System.NotImplementedException: Not implemented at System.Drawing.Pen.TranslateTransform' (GdipTranslatePenTransform not implemented) 44772 progecad 2018 installer does not start 44804 PCBWeb crashes: Call to unimplemented function d3dx11_43.dll.D3DX11CreateTextureFromFileW 44811 BattlEye 'BEDaisy' kernel service crashes on unimplemented function ntoskrnl.exe._chkstk 44818 ntdll.NtClose (kernel32.CloseHandle) should throw invalid handle exception (EXCEPTION_INVALID_HANDLE) for invalid handles when run under debugger 44864 Incoming crashes after the intro video 44874 Phonetools 9.x crashes on unimplemented function KERNEL32.dll.RequestDeviceWakeup 44904 winebus blocks auto start up of scheduler service 44923 Failing kernel driver services can stall WINEPREFIX bootstrapping/startup for a considerable time when configured as autostart 44924 StarForce v3 kernel drivers need ntoskrnl.IoCreateSynchronizationEvent to return a non-NULL handle 44932 limited list of available printer's paper/page size 44944 Adobe Premiere Elements 14 fails to install: ERROR: Third party payload installer pxengine5_08_13a.exe failed with exit code: -1 44971 HackShield for Banking Driver 'HSBDrvNt.sys' (part of Ahnlab Safe Transaction) crashes on unimplemented function ntoskrnl.exe.ExInterlockedPopEntrySList 44984 Maya 2018 LT Installer requires unimplemented function api-ms-win-crt-time-l1-1-0.dll._timespec64_get 44993 Magic The Gathering Arena fails to install 45026 Windows File Manager (WinFile) fails to build in winelib (LPDROPSTRUCT missing from winuser.h) ---------------------------------------------------------------- Changes since 3.0.1: Alexander Morozov (1): ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe. Alexandre Julliard (7): winex11: Use the correct colormap for the OpenGL parent window. winex11: Store the visual info in the OpenGL pixel format. winex11: Store only the pixmap size instead of the window rectangle in the GL drawable. winex11: Implement refcounting of GL drawables. winex11: Hold a reference to the drawable from the GL context. wininet/tests: Update the winehq.org certificate data. ntoskrnl: Add emulation of CRn and DRn registers on x86-64. Alistair Leslie-Hughes (9): comctl32/treeview: Fix item icon background when using TVS_FULLROWSELECT style. pidgen: Add PIDGenSimpA stub. winedevice: Wait until driver has started before returning. ntoskrnl.exe: Dont forward some msvcrt functions. propsys: Add PSGetPropertyKeyFromName stub. ntoskrnl.exe: Implement _chkstk. winedevice: Improve error handling when a driver fails to load. maintainers: Update Staging branch. maintainers: Remove previous wine-staging maintainers. Andrew Eikum (1): maintainers: Remove myself from a dmusic DLL. Andrew Wesie (1): advapi32: Implement BuildSecurityDescriptorW. Andrey Gusev (1): d3dx11: Add D3DX11CreateTextureFromFileA/W stub. André Hentschel (3): wininet: Fix negated check for drain_content result (clang). gdiplus: Add stub for GdipSetPathGradientPath. progman: Fix warning in PUT_SHORT macro (clang). Austin English (4): wininet: Add ParseX509EncodedCertificateForListBoxEntry stub. ntdsapi: Add DsCrackNamesA/W stubs. include/winuser.h: Add tagDROPSTRUCT struct. include/wfext.h: Add miscellaneous FM_* defines. Christian Inci (1): wined3d: Recognize Titan V. Dagfinn Reiakvam (1): iphlpapi: Add support for ConvertLengthToIpv4Mask(). Dmitry Timoshkov (5): avifil32: Correct threading model on interfaces. services: Add a 3000 ms timeout to StartService. winspool.drv: Add A0, A1 and A2 paper sizes to generic.ppd. dinput: The DIK_ key code should match the scan code. sspicli: Add forwards to secur32. Gijs Vermeulen (1): ntoskrnl.exe: Improve IoCreateSynchronizationEvent stub. Hans Leidekker (2): iphlpapi: Implement if_indextoname. msi: Don't cache the base URL. Henri Verbeet (1): winex11: Restore the X11DRV_FLUSH_GL_DRAWABLE XFlush() for setups without OML_sync_control. Huw D. M. Davies (1): winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup. Ivan Kalvachev (1): kernel32: Add DECL_HOTPATCH to OutputDebugString functions. Jarkko Korpi (1): kernel32: Silence repeated LocaleNameToLCID unsupported flags. Johann Frei (1): dinput: Implement X/Y axis granularity and add test. Louis Lenders (9): ntdll: Update version resource. kernel32/tests: Add simple test for SetThreadUILanguage. kernel32: Improve stub for SetThreadUILanguage. iexplore/iexplore.inf: Add svcVersion reg key and update to win7. msctf: Return S_OK in TextStoreACPSink_OnTextChange. msctf: Return S_OK in TextStoreACPSink_OnSelectionChange. msctf: Return S_OK in TextStoreACPSink_OnLayoutChange. wine.inf: Create catroot directory. kernel32: Add stub for RequestDeviceWakeup. Mark White (1): kernel32: Fix forward slash path handling to GetVolumePathNameW. Martin Storsjo (1): ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64. Matteo Bruni (2): d3dx9: Implement FindNextValidTechnique(). d3d8: Forbid setting a viewport larger than the render target. Michael Müller (3): ieframe: Return S_OK in IViewObject::Draw stub. mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName. ntoskrnl: Implement ExInterlockedPopEntrySList. Michael Stefaniuc (1): maintainers: Add a DirectMusic section. Nikolay Sivov (7): comdlg32: Add a helper to test if file dialog hook is enabled. comdlg32: Hide Read-only checkbox for Save dialogs. gdiplus: Implement GdipTranslatePenTransform. wincodecs: Use static array for property bag descriptions. wincodecs: Encoder options are optional for CreateNewFrame(). user32/static: Use correct brush color for centered image background. kernel32: Add CreateRemoteThreadEx(). Piotr Caban (6): msvcrt: Optimize _strupr implementation in C locale. msvcrt/tests: Add _strupr tests. msvcp140: Add __uncaught_exceptions implementation. ucrtbase: Add __current_exception() implementation. msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub. ucrtbase: Add _timespec{32,64}_get implementation. Sebastian Lackner (2): ntdll: Throw exception if invalid handle is passed to NtClose and debugger enabled. advapi32/tests: Add basic tests for BuildSecurityDescriptor. Stefan Dösinger (1): ddraw: Don't read past the end of the executebuffer. Stefan Leichter (2): advapi32: Silence the fixme in EventActivityIdControl. include: Fix declaration of SelectDeviceDlg. Tim Wanders (1): setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub. Zebediah Figura (5): ntdll: Implement _alldvrm() and _aulldvrm(). devenum/tests: Test registering DirectShow filters. devenum: More correctly handle device types. devenum: Allow parsing display name without class ID. devenum: Correctly implement IMoniker::GetDisplayName(). -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo 09 Jun '18

09 Jun '18

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2021f0d18a..d6999c1043 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-18 13:47+0200\n" +"PO-Revision-Date: 2018-06-09 23:18+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -12800,10 +12800,8 @@ msgid "Confirm Value Delete" msgstr "Bekreft sletting av verdi" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Virkelig slette registerverdien \"%1\"?" +msgstr "Virkelig slette den valgte registerverdien?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." -- 2.17.1

1 0

[PATCH] d3dcompiler/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 27 ++++++++++++++------------- dlls/d3dcompiler_43/tests/blob.c | 18 +++++++++--------- dlls/d3dcompiler_43/tests/hlsl.c | 14 +++++++------- dlls/d3dcompiler_43/tests/reflection.c | 18 +++++++++--------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 6fd78c186e..f077369ba8 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -108,7 +108,7 @@ static void preproc_test(void) { }, }; - exec_tests("preproc", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("preproc", tests, ARRAY_SIZE(tests)); } static void ps_1_1_test(void) { @@ -134,7 +134,7 @@ static void ps_1_1_test(void) { }, }; - exec_tests("ps_1_1", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("ps_1_1", tests, ARRAY_SIZE(tests)); } static void vs_1_1_test(void) { @@ -277,7 +277,7 @@ static void vs_1_1_test(void) { }, }; - exec_tests("vs_1_1", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("vs_1_1", tests, ARRAY_SIZE(tests)); } static void ps_1_3_test(void) { @@ -517,7 +517,7 @@ static void ps_1_3_test(void) { }, }; - exec_tests("ps_1_3", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("ps_1_3", tests, ARRAY_SIZE(tests)); } static void ps_1_4_test(void) { @@ -627,7 +627,7 @@ static void ps_1_4_test(void) { }, }; - exec_tests("ps_1_4", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("ps_1_4", tests, ARRAY_SIZE(tests)); } static void vs_2_0_test(void) { @@ -818,7 +818,7 @@ static void vs_2_0_test(void) { }, }; - exec_tests("vs_2_0", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("vs_2_0", tests, ARRAY_SIZE(tests)); } static void vs_2_x_test(void) { @@ -879,7 +879,7 @@ static void vs_2_x_test(void) { }, }; - exec_tests("vs_2_x", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("vs_2_x", tests, ARRAY_SIZE(tests)); } static void ps_2_0_test(void) { @@ -952,7 +952,7 @@ static void ps_2_0_test(void) { }, }; - exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("ps_2_0", tests, ARRAY_SIZE(tests)); } static void ps_2_x_test(void) { @@ -1090,7 +1090,7 @@ static void ps_2_x_test(void) { }, }; - exec_tests("ps_2_x", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("ps_2_x", tests, ARRAY_SIZE(tests)); } static void vs_3_0_test(void) { @@ -1175,7 +1175,7 @@ static void vs_3_0_test(void) { }; - exec_tests("vs_3_0", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("vs_3_0", tests, ARRAY_SIZE(tests)); } static void ps_3_0_test(void) { @@ -1261,7 +1261,7 @@ static void ps_3_0_test(void) { }, }; - exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); + exec_tests("ps_3_0", tests, ARRAY_SIZE(tests)); } static void failure_test(void) { @@ -1408,7 +1408,8 @@ static void failure_test(void) { unsigned int i; ID3DBlob *shader, *messages; - for(i = 0; i < (sizeof(tests) / sizeof(tests[0])); i++) { + for(i = 0; i < ARRAY_SIZE(tests); i++) + { shader = NULL; messages = NULL; hr = D3DAssemble(tests[i], strlen(tests[i]), NULL, @@ -1689,7 +1690,7 @@ static void d3dpreprocess_test(void) /* pInclude tests */ include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; - for (i = 0; i < sizeof(include_test_shaders) / sizeof(include_test_shaders[0]); ++i) + for (i = 0; i < ARRAY_SIZE(include_test_shaders); ++i) { shader = NULL; messages = NULL; diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index ba69abfb60..d99df825ee 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -171,7 +171,7 @@ static void test_get_blob_part(void) ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); ok(TAG_ISGN == *(dword+9), "ISGN got %#x, expected %#x.\n", *(dword+9), TAG_ISGN); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -202,7 +202,7 @@ static void test_get_blob_part(void) ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); ok(TAG_OSGN == *(dword+9), "OSGN got %#x, expected %#x.\n", *(dword+9), TAG_OSGN); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -234,7 +234,7 @@ static void test_get_blob_part(void) ok(TAG_ISGN == *(dword+10), "ISGN got %#x, expected %#x.\n", *(dword+10), TAG_ISGN); ok(TAG_OSGN == *(dword+32), "OSGN got %#x, expected %#x.\n", *(dword+32), TAG_OSGN); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -278,7 +278,7 @@ static void test_get_blob_part(void) dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { /* There isn't a full DXBC blob returned for D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -298,7 +298,7 @@ static void test_get_blob_part(void) dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { /* There isn't a full DXBC blob returned for D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -318,7 +318,7 @@ static void test_get_blob_part(void) dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { /* There isn't a full DXBC blob returned for D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -606,7 +606,7 @@ static void test_get_blob_part2(void) ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); ok(TAG_PCSG == *(dword+9), "PCSG got %#x, expected %#x.\n", *(dword+9), TAG_PCSG); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -639,7 +639,7 @@ static void test_get_blob_part2(void) ok(TAG_OSGN == *(dword+24), "OSGN got %#x, expected %#x.\n", *(dword+24), TAG_OSGN); ok(TAG_PCSG == *(dword+37), "PCSG got %#x, expected %#x.\n", *(dword+37), TAG_PCSG); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); @@ -673,7 +673,7 @@ static void test_get_blob_part2(void) dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); ok(TAG_DXBC != *dword, "DXBC failed got %#x.\n", *dword); - for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + for (i = 0; i < ARRAY_SIZE(parts); i++) { /* There isn't a full DXBC blob returned for D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 856a09c2c5..546a0e5d2e 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -320,7 +320,7 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); + probes, ARRAY_SIZE(probes), 1, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); @@ -363,7 +363,7 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo ID3DXConstantTable_SetFloat(constants, device, "$z", z); compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); + probes, ARRAY_SIZE(probes), 1, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); @@ -417,7 +417,7 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * if (pshader != NULL) { compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, - sizeof(if_greater_probes) / sizeof(*if_greater_probes), 32, 1, __LINE__); + ARRAY_SIZE(if_greater_probes), 32, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); @@ -427,7 +427,7 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * if (pshader != NULL) { compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, - sizeof(ternary_operator_probes) / sizeof(*ternary_operator_probes), 8, 1, __LINE__); + ARRAY_SIZE(ternary_operator_probes), 8, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); @@ -476,7 +476,7 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 if (pshader != NULL) { compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, - sizeof(vec4_indexing_test1_probes) / sizeof(*vec4_indexing_test1_probes), 1, 1, __LINE__); + ARRAY_SIZE(vec4_indexing_test1_probes), 1, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); @@ -488,7 +488,7 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 ID3DXConstantTable_SetInt(constants, device, "i", 2); compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, - sizeof(vec4_indexing_test2_probes) / sizeof(*vec4_indexing_test2_probes), 32, 1, __LINE__); + ARRAY_SIZE(vec4_indexing_test2_probes), 32, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); @@ -550,7 +550,7 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo if (pshader != NULL) { compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, sincos_probes, - sizeof(sincos_probes) / sizeof(*sincos_probes), 32, 1, __LINE__); + ARRAY_SIZE(sincos_probes), 32, 1, __LINE__); ID3DXConstantTable_Release(constants); IDirect3DPixelShader9_Release(pshader); diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 9d77d47938..5ca734e6bd 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -356,7 +356,7 @@ static void test_reflection_desc_vs(void) ok(ret == 0, "GetMovcInstructionCount failed, got %u, expected %u\n", ret, 0); /* GetIn/OutputParameterDesc */ - for (i = 0; i < sizeof(test_reflection_desc_vs_resultin)/sizeof(*test_reflection_desc_vs_resultin); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultin); ++i) { pdesc = &test_reflection_desc_vs_resultin[i]; @@ -381,7 +381,7 @@ static void test_reflection_desc_vs(void) i, desc.Stream, pdesc->ReadWriteMask); } - for (i = 0; i < sizeof(test_reflection_desc_vs_resultout)/sizeof(*test_reflection_desc_vs_resultout); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) { pdesc = &test_reflection_desc_vs_resultout[i]; @@ -656,7 +656,7 @@ static void test_reflection_desc_ps(void) ok(hr == E_INVALIDARG, "GetPatchConstantParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); /* GetIn/OutputParameterDesc */ - for (i = 0; i < sizeof(test_reflection_desc_ps_resultin)/sizeof(*test_reflection_desc_ps_resultin); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultin); ++i) { pdesc = &test_reflection_desc_ps_resultin[i]; @@ -681,7 +681,7 @@ static void test_reflection_desc_ps(void) i, desc.Stream, pdesc->ReadWriteMask); } - for (i = 0; i < sizeof(test_reflection_desc_ps_resultout)/sizeof(*test_reflection_desc_ps_resultout); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) { pdesc = &test_reflection_desc_ps_resultout[i]; @@ -899,7 +899,7 @@ static void test_reflection_desc_ps_output(void) const D3D11_SIGNATURE_PARAMETER_DESC *pdesc; unsigned int i; - for (i = 0; i < sizeof(test_reflection_desc_ps_output_result)/sizeof(*test_reflection_desc_ps_output_result); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_output_result); ++i) { hr = D3DReflect(test_reflection_desc_ps_output_blob[i], test_reflection_desc_ps_output_blob[i][6], &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "(%u): D3DReflect failed %x\n", i, hr); @@ -1036,7 +1036,7 @@ static void test_reflection_bound_resources(void) ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); /* GetResourceBindingDesc */ - for (i = 0; i < sizeof(test_reflection_bound_resources_result)/sizeof(*test_reflection_bound_resources_result); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_bound_resources_result); ++i) { pdesc = &test_reflection_bound_resources_result[i]; @@ -1062,7 +1062,7 @@ static void test_reflection_bound_resources(void) } /* GetResourceBindingDescByName */ - for (i = 0; i < sizeof(test_reflection_bound_resources_result)/sizeof(*test_reflection_bound_resources_result); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_bound_resources_result); ++i) { pdesc = &test_reflection_bound_resources_result[i]; @@ -1393,7 +1393,7 @@ static void test_reflection_constant_buffer(void) ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); /* constant buffers */ - for (i = 0; i < sizeof(test_reflection_constant_buffer_cb_result)/sizeof(*test_reflection_constant_buffer_cb_result); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_constant_buffer_cb_result); ++i) { pcbdesc = &test_reflection_constant_buffer_cb_result[i]; @@ -1416,7 +1416,7 @@ static void test_reflection_constant_buffer(void) } /* variables */ - for (i = 0; i < sizeof(test_reflection_constant_buffer_variable_result)/sizeof(*test_reflection_constant_buffer_variable_result); ++i) + for (i = 0; i < ARRAY_SIZE(test_reflection_constant_buffer_variable_result); ++i) { pvdesc = &test_reflection_constant_buffer_variable_result[i].desc; -- 2.14.4

2 1

[PATCH] ntprint/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntprint/tests/ntprint.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 1710220def..57caa49ab2 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -67,7 +67,7 @@ static void test_PSetupCreateMonitorInfo(VOID) { HANDLE mi; WCHAR buffer[1024] = {'\\','\\'}; - UINT len = sizeof(buffer) / sizeof(buffer[0]) - 2; + UINT len = ARRAY_SIZE(buffer) - 2; GetComputerNameW(buffer + 2, &len); SetLastError(0xdeadbeef); @@ -155,7 +155,7 @@ static void test_PSetupEnumMonitor(VOID) "and '> 0')\n", res, GetLastError(), minsize); - size = sizeof(buffer) / sizeof(buffer[0]); + size = ARRAY_SIZE(buffer); if ((minsize + 1) > size) { skip("overflow: %u\n", minsize); pPSetupDestroyMonitorInfo(mi); @@ -165,7 +165,7 @@ static void test_PSetupEnumMonitor(VOID) if (0) { /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */ SetLastError(0xdeadbeef); - size = sizeof(buffer) / sizeof(buffer[0]); + size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(NULL, 0, buffer, &size); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", @@ -175,7 +175,7 @@ static void test_PSetupEnumMonitor(VOID) if (0) { /* XP: Crash, w2k: Success (how can that work?) */ SetLastError(0xdeadbeef); - size = sizeof(buffer) / sizeof(buffer[0]); + size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(mi, 0, NULL, &size); trace("got %u with %u and %u\n", res, GetLastError(), size); } @@ -213,7 +213,7 @@ static void test_PSetupEnumMonitor(VOID) while (res && (index < 20)) { SetLastError(0xdeadbeef); buffer[0] = '\0'; - size = sizeof(buffer) / sizeof(buffer[0]); + size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(mi, index, buffer, &size); ok( res || (GetLastError() == ERROR_NO_MORE_ITEMS), "(%u) got %u with %u and %u (expected '!=0' or: '0' with " -- 2.14.4

1 0

[PATCH] oleacc/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleacc/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7a0737caff..c62fa79556 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -410,7 +410,7 @@ static void test_getroletext(void) memset(buff2W, 0, sizeof(buff2W)); ret = GetRoleTextW(role, NULL, 0); - GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR)); + GetRoleTextW(role, buff2W, ARRAY_SIZE(buff2W)); ok(ret == lstrlenW(buff2W), "GetRoleTextW: returned length doesn't match returned buffer for role %d\n", role); } -- 2.14.4

1 0

[PATCH] psapi/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 4adc82619b..0ff212c766 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -536,12 +536,12 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, sizeof(map_nameW)/sizeof(map_nameW[0])); + ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); todo_wine { ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); } - if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, sizeof(nt_map_name)/sizeof(nt_map_name[0]))) + if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, ARRAY_SIZE(nt_map_name))) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); @@ -658,7 +658,7 @@ static void test_GetProcessImageFileName(void) /* correct call */ memset(szImgPathW, 0xff, sizeof(szImgPathW)); - ret = pGetProcessImageFileNameW(hpQI, szImgPathW, sizeof(szImgPathW)/sizeof(WCHAR)); + ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); -- 2.14.4

1 0

[PATCH] quartz/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 6 +++--- dlls/quartz/tests/misc.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 8bafb14157..bc933d148d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -210,7 +210,7 @@ static void test_filesourcefilter(void) ret = GetTempFileNameW(temp, prefix, 0, path); ok(ret, "GetTempFileNameW failed with error %u\n", GetLastError()); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { trace("Running test for %s\n", tests[i].label); @@ -280,7 +280,7 @@ static WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a1ece9489f..85079d982d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -50,7 +50,7 @@ static WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); @@ -1500,14 +1500,14 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi pinInfo.pFilter = &pTestFilter->IBaseFilter_iface; if (pinInfo.dir == PINDIR_INPUT) { - lstrcpynW(pinInfo.achName, wcsInputPinName, sizeof(pinInfo.achName) / sizeof(pinInfo.achName[0])); + lstrcpynW(pinInfo.achName, wcsInputPinName, ARRAY_SIZE(pinInfo.achName)); hr = TestFilter_Pin_Construct(&TestFilter_InputPin_Vtbl, &pinInfo, &mt, &pTestFilter->csFilter, &pTestFilter->ppPins[i]); } else { - lstrcpynW(pinInfo.achName, wcsOutputPinName, sizeof(pinInfo.achName) / sizeof(pinInfo.achName[0])); + lstrcpynW(pinInfo.achName, wcsOutputPinName, ARRAY_SIZE(pinInfo.achName)); hr = TestFilter_Pin_Construct(&TestFilter_OutputPin_Vtbl, &pinInfo, &mt, &pTestFilter->csFilter, &pTestFilter->ppPins[i]); } diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 748c0f2cfd..16b6d40ce4 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -169,7 +169,7 @@ static void test_null_renderer_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_NullRenderer, IID_IReferenceClock, *iids[i]); } @@ -182,7 +182,7 @@ static void test_video_renderer_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_VideoRenderer, IID_IReferenceClock, *iids[i]); @@ -199,7 +199,7 @@ static void test_filter_graph_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_FilterGraph, IID_IReferenceClock, *iids[i]); @@ -213,7 +213,7 @@ static void test_filter_mapper_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_FilterMapper2, IID_IReferenceClock, *iids[i]); -- 2.14.4

1 0

[PATCH] rpcrt4/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/rpc.c | 6 ++---- dlls/rpcrt4/tests/server.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 606107fcfd..7bed308807 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -596,7 +596,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) #undef VTBL_PROXY_TEST #undef VTBL_PROXY_TEST_NOT_ZERO - for (i = 0; i < sizeof(interfaces)/sizeof(interfaces[0]); i++) + for (i = 0; i < ARRAY_SIZE(interfaces); i++) ok( proxy_vtbl[i]->header.piid == interfaces[i], "wrong proxy %u iid %p/%p\n", i, proxy_vtbl[i]->header.piid, interfaces[i] ); diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index f026e99de2..c9f2a4b721 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -149,10 +149,8 @@ static void TestDceErrorInqText (void) */ DWORD dwCount; - dwCount = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, - sizeof(bufferInvalid)/sizeof(bufferInvalid[0]), NULL); + dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, + RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL); /* A random sample of DceErrorInqText */ /* 0 is success */ diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index dfad1ed0f3..b35b71bcfd 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -313,7 +313,7 @@ void __cdecl s_get_number_array(int x[20], int *n) { int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; memcpy(x, c, sizeof(c)); - *n = sizeof(c)/sizeof(c[0]); + *n = ARRAY_SIZE(c); } int __cdecl s_sum_cs(cs_t *cs) -- 2.14.4

1 0

[PATCH] gdiplus/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 08 Jun '18

08 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 10 +++---- dlls/gdiplus/tests/graphicspath.c | 58 +++++++++++++++++++-------------------- dlls/gdiplus/tests/image.c | 40 +++++++++++++-------------- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6acc656c8f..ae75c0efc1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3721,7 +3721,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expect(UnitPixel, font_unit); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { GpImage *image; @@ -3799,7 +3799,7 @@ todo_wine expect(Ok, status); expect(unit, font_unit); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { REAL unit_scale; GpImage *image; @@ -3883,7 +3883,7 @@ todo_wine } /* Font with units = UnitWorld */ - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { GpPointF pt = {0.0, 100.0}; GpImage* image; @@ -3972,7 +3972,7 @@ static void test_transform(void) GpPointF ptf[2]; UINT i; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale, &image); ptf[0].X = td[i].in[0].X; @@ -4032,7 +4032,7 @@ static void test_pen_thickness(void) BitmapData bd; INT min, max, size; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { status = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat24bppRGB, NULL, &u.bitmap); expect(Ok, status); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index c5403cbe0e..096fbc600a 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -207,7 +207,7 @@ static void test_line2(void) status = GdipAddPathLine2(path, &(line2_points[6]), 3); expect(Ok, status); - ok_path(path, line2_path, sizeof(line2_path)/sizeof(path_test_t), FALSE); + ok_path(path, line2_path, ARRAY_SIZE(line2_path), FALSE); GdipDeletePath(path); } @@ -278,7 +278,7 @@ static void test_arc(void) status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 50.0, 0.0); expect(Ok, status); - ok_path(path, arc_path, sizeof(arc_path)/sizeof(path_test_t), FALSE); + ok_path(path, arc_path, ARRAY_SIZE(arc_path), FALSE); GdipDeletePath(path); } @@ -458,7 +458,7 @@ static void test_pathpath(void) status = GdipAddPathPath(path1, path2, TRUE); expect(Ok, status); - ok_path(path1, pathpath_path, sizeof(pathpath_path)/sizeof(path_test_t), FALSE); + ok_path(path1, pathpath_path, ARRAY_SIZE(pathpath_path), FALSE); GdipDeletePath(path1); GdipDeletePath(path2); @@ -529,7 +529,7 @@ static void test_ellipse(void) status = GdipAddPathEllipse(path, 10.0, 300.0, 0.0, 1.0); expect(Ok, status); - ok_path(path, ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t), FALSE); + ok_path(path, ellipse_path, ARRAY_SIZE(ellipse_path), FALSE); GdipDeletePath(path); } @@ -565,7 +565,7 @@ static void test_linei(void) status = GdipAddPathLineI(path, 35.0, 35.0, 36.0, 38.0); expect(Ok, status); - ok_path(path, linei_path, sizeof(linei_path)/sizeof(path_test_t), FALSE); + ok_path(path, linei_path, ARRAY_SIZE(linei_path), FALSE); GdipDeletePath(path); } @@ -614,7 +614,7 @@ static void test_polygon(void) status = GdipAddPathPolygon(path, points, 5); expect(Ok, status); /* check resulting path */ - ok_path(path, poly_path, sizeof(poly_path)/sizeof(path_test_t), FALSE); + ok_path(path, poly_path, ARRAY_SIZE(poly_path), FALSE); GdipDeletePath(path); } @@ -643,7 +643,7 @@ static void test_rect(void) status = GdipAddPathRectangle(path, 100.0, 50.0, 120.0, 30.0); expect(Ok, status); - ok_path(path, rect_path, sizeof(rect_path)/sizeof(path_test_t), FALSE); + ok_path(path, rect_path, ARRAY_SIZE(rect_path), FALSE); GdipDeletePath(path); @@ -661,7 +661,7 @@ static void test_rect(void) status = GdipAddPathRectangles(path, (GDIPCONST GpRectF*)&rects, 2); expect(Ok, status); - ok_path(path, rect_path, sizeof(rect_path)/sizeof(path_test_t), FALSE); + ok_path(path, rect_path, ARRAY_SIZE(rect_path), FALSE); GdipDeletePath(path); } @@ -756,7 +756,7 @@ static void test_addcurve(void) /* add to empty path */ status = GdipAddPathCurve2(path, points, 4, 1.0); expect(Ok, status); - ok_path(path, addcurve_path, sizeof(addcurve_path)/sizeof(path_test_t), FALSE); + ok_path(path, addcurve_path, ARRAY_SIZE(addcurve_path), FALSE); GdipDeletePath(path); /* add to notempty path and opened figure */ @@ -764,7 +764,7 @@ static void test_addcurve(void) GdipAddPathLine(path, 100.0, 120.0, 123.0, 10.0); status = GdipAddPathCurve2(path, points, 4, 1.0); expect(Ok, status); - ok_path(path, addcurve_path2, sizeof(addcurve_path2)/sizeof(path_test_t), FALSE); + ok_path(path, addcurve_path2, ARRAY_SIZE(addcurve_path2), FALSE); /* NULL args */ GdipResetPath(path); @@ -789,12 +789,12 @@ static void test_addcurve(void) /* use all points */ status = GdipAddPathCurve3(path, points, 4, 0, 3, 1.0); expect(Ok, status); - ok_path(path, addcurve_path, sizeof(addcurve_path)/sizeof(path_test_t), FALSE); + ok_path(path, addcurve_path, ARRAY_SIZE(addcurve_path), FALSE); GdipResetPath(path); status = GdipAddPathCurve3(path, points, 4, 1, 2, 1.0); expect(Ok, status); - ok_path(path, addcurve_path3, sizeof(addcurve_path3)/sizeof(path_test_t), FALSE); + ok_path(path, addcurve_path3, ARRAY_SIZE(addcurve_path3), FALSE); GdipDeletePath(path); } @@ -844,7 +844,7 @@ static void test_addclosedcurve(void) /* add to empty path */ status = GdipAddPathClosedCurve2(path, points, 4, 1.0); expect(Ok, status); - ok_path(path, addclosedcurve_path, sizeof(addclosedcurve_path)/sizeof(path_test_t), FALSE); + ok_path(path, addclosedcurve_path, ARRAY_SIZE(addclosedcurve_path), FALSE); GdipDeletePath(path); } @@ -886,7 +886,7 @@ static void test_reverse(void) status = GdipReversePath(path); expect(Ok, status); - ok_path(path, reverse_path, sizeof(reverse_path)/sizeof(path_test_t), FALSE); + ok_path(path, reverse_path, ARRAY_SIZE(reverse_path), FALSE); GdipDeletePath(path); } @@ -917,21 +917,21 @@ static void test_addpie(void) status = GdipAddPathPie(path, 0.0, 0.0, 100.0, 50.0, 10.0, 50.0); expect(Ok, status); - ok_path(path, addpie_path, sizeof(addpie_path)/sizeof(path_test_t), FALSE); + ok_path(path, addpie_path, ARRAY_SIZE(addpie_path), FALSE); status = GdipResetPath(path); expect(Ok, status); /* zero width base ellipse */ status = GdipAddPathPie(path, 0.0, 0.0, 0.0, 60.0, -90.0, 24.0); expect(InvalidParameter, status); - ok_path(path, addpie_path2, sizeof(addpie_path2)/sizeof(path_test_t), FALSE); + ok_path(path, addpie_path2, ARRAY_SIZE(addpie_path2), FALSE); status = GdipResetPath(path); expect(Ok, status); /* zero height base ellipse */ status = GdipAddPathPie(path, 0.0, 0.0, 60.0, 0.0 , -90.0, 24.0); expect(InvalidParameter, status); - ok_path(path, addpie_path3, sizeof(addpie_path3)/sizeof(path_test_t), FALSE); + ok_path(path, addpie_path3, ARRAY_SIZE(addpie_path3), FALSE); GdipDeletePath(path); } @@ -1020,7 +1020,7 @@ static void test_flatten(void) status = GdipFlattenPath(path, NULL, 1.0); expect(Ok, status); - ok_path(path, flattenellipse_path, sizeof(flattenellipse_path)/sizeof(path_test_t), TRUE); + ok_path(path, flattenellipse_path, ARRAY_SIZE(flattenellipse_path), TRUE); status = GdipResetPath(path); expect(Ok, status); @@ -1028,7 +1028,7 @@ static void test_flatten(void) expect(Ok, status); status = GdipFlattenPath(path, NULL, 1.0); expect(Ok, status); - ok_path(path, flattenline_path, sizeof(flattenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, flattenline_path, ARRAY_SIZE(flattenline_path), FALSE); status = GdipResetPath(path); expect(Ok, status); @@ -1036,7 +1036,7 @@ static void test_flatten(void) expect(Ok, status); status = GdipFlattenPath(path, NULL, 1.0); expect(Ok, status); - ok_path(path, flattenarc_path, sizeof(flattenarc_path)/sizeof(path_test_t), TRUE); + ok_path(path, flattenarc_path, ARRAY_SIZE(flattenarc_path), TRUE); /* easy case - quater of a full circle */ status = GdipResetPath(path); @@ -1045,7 +1045,7 @@ static void test_flatten(void) expect(Ok, status); status = GdipFlattenPath(path, NULL, 1.0); expect(Ok, status); - ok_path(path, flattenquater_path, sizeof(flattenquater_path)/sizeof(path_test_t), FALSE); + ok_path(path, flattenquater_path, ARRAY_SIZE(flattenquater_path), FALSE); GdipDeleteMatrix(m); GdipDeletePath(path); @@ -1119,7 +1119,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_path, ARRAY_SIZE(widenline_path), FALSE); /* horizontal 2x stretch */ status = GdipResetPath(path); @@ -1132,7 +1132,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_path, ARRAY_SIZE(widenline_path), FALSE); /* vertical 2x stretch */ status = GdipResetPath(path); @@ -1145,7 +1145,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_path, ARRAY_SIZE(widenline_path), FALSE); status = GdipScaleMatrix(m, 1.0, 0.5, MatrixOrderAppend); expect(Ok, status); @@ -1161,7 +1161,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_dash_path, sizeof(widenline_dash_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_dash_path, ARRAY_SIZE(widenline_dash_path), FALSE); status = GdipSetPenDashStyle(pen, DashStyleSolid); expect(Ok, status); @@ -1178,7 +1178,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_path, ARRAY_SIZE(widenline_path), FALSE); /* horizontal 2x stretch */ status = GdipResetPath(path); @@ -1191,7 +1191,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_path, ARRAY_SIZE(widenline_path), FALSE); /* vertical 2x stretch */ status = GdipResetPath(path); @@ -1204,7 +1204,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_wide_path, sizeof(widenline_wide_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_wide_path, ARRAY_SIZE(widenline_wide_path), FALSE); status = GdipScaleMatrix(m, 1.0, 0.5, MatrixOrderAppend); expect(Ok, status); @@ -1221,7 +1221,7 @@ static void test_widen(void) status = GdipWidenPath(path, pen, m, 1.0); expect(Ok, status); - ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + ok_path(path, widenline_path, ARRAY_SIZE(widenline_path), FALSE); /* pen width = 0 pixels - native fails to widen but can draw with this pen */ GdipDeletePen(pen); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4fd2744132..88d195f6c9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -55,10 +55,10 @@ static void expect_guid(REFGUID expected, REFGUID got, int line, BOOL todo) char buffer[39]; char buffer2[39]; - StringFromGUID2(got, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); - WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); - StringFromGUID2(expected, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); - WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer2, sizeof(buffer2), NULL, NULL); + StringFromGUID2(got, bufferW, ARRAY_SIZE(bufferW)); + WideCharToMultiByte(CP_ACP, 0, bufferW, ARRAY_SIZE(bufferW), buffer, sizeof(buffer), NULL, NULL); + StringFromGUID2(expected, bufferW, ARRAY_SIZE(bufferW)); + WideCharToMultiByte(CP_ACP, 0, bufferW, ARRAY_SIZE(bufferW), buffer2, sizeof(buffer2), NULL, NULL); todo_wine_if (todo) ok_(__FILE__, line)(IsEqualGUID(expected, got), "Expected %s, got %s\n", buffer2, buffer); } @@ -3311,7 +3311,7 @@ static void test_image_properties(void) char buf[256]; } item; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { image = load_image(td[i].image_data, td[i].image_size); if (!image) @@ -3629,9 +3629,9 @@ static void test_tiff_properties(void) prop_count = 0xdeadbeef; status = GdipGetPropertyCount(image, &prop_count); expect(Ok, status); - ok(prop_count == sizeof(td)/sizeof(td[0]) || - broken(prop_count == sizeof(td)/sizeof(td[0]) - 1) /* Win7 SP0 */, - "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + ok(prop_count == ARRAY_SIZE(td) || + broken(prop_count == ARRAY_SIZE(td) - 1) /* Win7 SP0 */, + "expected property count %u, got %u\n", (UINT) ARRAY_SIZE(td), prop_count); prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); @@ -3739,8 +3739,8 @@ static void test_GdipGetAllPropertyItems(void) prop_count = 0xdeadbeef; status = GdipGetPropertyCount(image, &prop_count); expect(Ok, status); - ok(prop_count == sizeof(td)/sizeof(td[0]), - "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + ok(prop_count == ARRAY_SIZE(td), + "expected property count %u, got %u\n", (UINT) ARRAY_SIZE(td), prop_count); prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); @@ -4014,7 +4014,7 @@ static void test_bitmapbits(void) } palette; ARGB *entries = palette.pal.Entries; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { BYTE pixels[sizeof(pixels_24)]; memcpy(pixels, pixels_24, sizeof(pixels_24)); @@ -4283,7 +4283,7 @@ static void test_image_format(void) BitmapData data; UINT i, ret; - for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt); i++) { status = GdipCreateBitmapFromScan0(1, 1, 0, fmt[i], NULL, &bitmap); ok(status == Ok || broken(status == InvalidParameter) /* before win7 */, @@ -4435,7 +4435,7 @@ static void test_DrawImage_scale(void) status = GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); expect(Ok, status); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { status = GdipSetPixelOffsetMode(graphics, td[i].pixel_offset_mode); expect(Ok, status); @@ -4541,10 +4541,10 @@ static void test_gif_properties(void) status = GdipGetPropertyCount(image, &prop_count); expect(Ok, status); - ok(prop_count == sizeof(td)/sizeof(td[0]) || broken(prop_count == 1) /* before win7 */, - "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + ok(prop_count == ARRAY_SIZE(td) || broken(prop_count == 1) /* before win7 */, + "expected property count %u, got %u\n", (UINT) ARRAY_SIZE(td), prop_count); - if (prop_count != sizeof(td)/sizeof(td[0])) + if (prop_count != ARRAY_SIZE(td)) { GdipDisposeImage(image); return; @@ -4818,7 +4818,7 @@ static void test_supported_encoders(void) status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bm); ok(status == Ok, "GdipCreateBitmapFromScan0 error %d\n", status); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { ret = get_encoder_clsid(td[i].mime, &format, &clsid); ok(ret, "%s encoder is not in the list\n", wine_dbgstr_w(td[i].mime)); @@ -4868,7 +4868,7 @@ static void test_createeffect(void) stat = pGdipCreateEffect(noneffect, &effect); todo_wine expect(Win32Error, stat); - for(i=0; i < sizeof(effectlist) / sizeof(effectlist[0]); i++) + for(i=0; i < ARRAY_SIZE(effectlist); i++) { stat = pGdipCreateEffect(*effectlist[i], &effect); todo_wine expect(Ok, stat); @@ -4981,7 +4981,7 @@ static void test_histogram(void) expect(Ok, stat); expect(256, num); - for (i = 0; i < sizeof(test_formats)/sizeof(test_formats[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_formats); i++) { num = 0; stat = pGdipBitmapGetHistogramSize(test_formats[i], &num); @@ -5131,7 +5131,7 @@ static void test_png_color_formats(void) UINT flags; int i; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { memcpy(buf, png_1x1_data, sizeof(png_1x1_data)); buf[24] = td[i].bit_depth; -- 2.14.4

2 1

[PATCH 4/4] wsdapi: Add initial support for reading messages; identify Probe message.
by Owen Rudge 08 Jun '18

08 Jun '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 340 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 6 +- 2 files changed, 341 insertions(+), 5 deletions(-)

3 4

[PATCH 5/5] mstask/tests: Add more tests for IEnumWorkItems interface.
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 75 +++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index d4766382ec..f61022575d 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -212,23 +212,88 @@ done: static void test_Enum(void) { + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k','1',0 }; ITaskScheduler *scheduler; + ITask *task; IEnumWorkItems *tasks; + WCHAR **names; + ULONG fetched; HRESULT hr; hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, Task1); + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); -if (0) { /* crashes on win2k */ hr = ITaskScheduler_Enum(scheduler, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); -} + ok(hr == E_INVALIDARG, "got %#x\n", hr); hr = ITaskScheduler_Enum(scheduler, &tasks); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got %#x\n", hr); + + names = (void *)0xdeadbeef; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 0, &names, &fetched); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(names == (void *)0xdeadbeef, "got %p\n", names); + ok(fetched == 0xdeadbeef, "got %#x\n", fetched); + + hr = IEnumWorkItems_Next(tasks, 1, NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + names = NULL; + hr = IEnumWorkItems_Next(tasks, 1, &names, NULL); + ok(hr == S_OK, "got %#x\n", hr); + ok(names != NULL, "got NULL\n"); + ok(names[0] != NULL, "got NULL\n"); + CoTaskMemFree(names[0]); + CoTaskMemFree(names); + + names = (void *)0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 2, &names, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(names == (void *)0xdeadbeef, "got %p\n", names); + + hr = IEnumWorkItems_Reset(tasks); + ok(hr == S_OK, "got %#x\n", hr); + + names = NULL; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); + ok(hr == S_OK, "got %#x\n", hr); + ok(names != NULL, "got NULL\n"); + ok(names[0] != NULL, "got NULL\n"); + ok(fetched == 1, "got %u\n", fetched); + CoTaskMemFree(names[0]); + CoTaskMemFree(names); + + while (IEnumWorkItems_Skip(tasks, 1) == S_OK) + /* do nothing*/; + + hr = IEnumWorkItems_Skip(tasks, 1); + ok(hr == S_FALSE, "got %#x\n", hr); + + names = (void *)0xdeadbeef; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(names == NULL, "got %p\n", names); + ok(fetched == 0, "got %u\n", fetched); + IEnumWorkItems_Release(tasks); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); } -- 2.16.3

1 0

[PATCH 4/5] mstask: Implement IEnumWorkItems::Skip().
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index ccb6d6c078..262dd0c49f 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -206,9 +206,17 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) { - EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); - FIXME("(%p)->(%u): stub\n", This, count); - return E_NOTIMPL; + LPWSTR *names; + ULONG fetched; + HRESULT hr; + + TRACE("(%p)->(%u)\n", iface, count); + + hr = EnumWorkItems_Next(iface, count, &names, &fetched); + if (SUCCEEDED(hr)) + free_list(names, fetched); + + return hr; } static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) -- 2.16.3

1 0

[PATCH 3/5] mstask: Implement IEnumWorkItems::Reset().
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 8db6e28b5e..ccb6d6c078 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -214,8 +214,16 @@ static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) { EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if (This->handle != INVALID_HANDLE_VALUE) + { + FindClose(This->handle); + This->handle = INVALID_HANDLE_VALUE; + } + + return S_OK; } static HRESULT WINAPI EnumWorkItems_Clone(IEnumWorkItems *iface, IEnumWorkItems **cloned) -- 2.16.3

1 0

[PATCH 1/5] mstask: Implement ITask::GetExitCode().
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 266029a58e..7499826937 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -685,8 +685,14 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) TRACE("(%p, %p)\n", iface, exit_code); + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + { + *exit_code = 0; + return SCHED_S_TASK_HAS_NOT_RUN; + } + *exit_code = This->exit_code; - return SCHED_S_TASK_HAS_NOT_RUN; /* FIXME */ + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) -- 2.16.3

1 0

[PATCH 3/3] schedsvc: Add support for running missed tasks at the service start.
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 24 ++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 1 + 3 files changed, 26 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index b5b8317ded..f6ea0f0e23 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -1039,6 +1039,30 @@ void check_task_time(void) LeaveCriticalSection(&at_job_list_section); } +void check_missed_task_time(void) +{ + FILETIME current_ft, last_ft; + struct job_t *job; + + GetSystemTimeAsFileTime(&current_ft); + FileTimeToLocalFileTime(&current_ft, &current_ft); + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (SystemTimeToFileTime(&job->data.last_runtime, &last_ft)) + { + if (job_runs_at(job, &last_ft, &current_ft)) + { + run_job(job); + } + } + } + + LeaveCriticalSection(&at_job_list_section); +} + void remove_job(const WCHAR *name) { struct job_t *job; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 10892d55ca..117c6f51ed 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -31,6 +31,7 @@ void update_process_status(DWORD pid) DECLSPEC_HIDDEN; BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; void check_task_time(void) DECLSPEC_HIDDEN; void load_at_tasks(void) DECLSPEC_HIDDEN; +void check_missed_task_time(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 2bba674b07..8e23a049db 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -54,6 +54,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) TRACE("Starting...\n"); load_at_tasks(); + check_missed_task_time(); htimer = CreateWaitableTimerW(NULL, FALSE, NULL); if (htimer == NULL) -- 2.16.3

1 0

[PATCH 2/3] schedsvc: Load job files at the service start up.
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 2 ++ 3 files changed, 44 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 597df34f2a..b5b8317ded 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -623,6 +623,47 @@ void add_job(const WCHAR *name) LeaveCriticalSection(&at_job_list_section); } +static inline BOOL is_file(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + +void load_at_tasks(void) +{ + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR allW[] = { '*',0 }; + WCHAR windir[MAX_PATH], path[MAX_PATH]; + WIN32_FIND_DATAW data; + HANDLE handle; + + GetWindowsDirectoryW(windir, MAX_PATH); + lstrcpyW(path, windir); + lstrcatW(path, tasksW); + lstrcatW(path, allW); + + handle = FindFirstFileW(path, &data); + if (handle == INVALID_HANDLE_VALUE) return; + + do + { + if (is_file(&data)) + { + lstrcpyW(path, windir); + lstrcatW(path, tasksW); + + if (lstrlenW(path) + lstrlenW(data.cFileName) < MAX_PATH) + { + lstrcatW(path, data.cFileName); + add_job(path); + } + else + FIXME("too long file name %s\n", debugstr_w(data.cFileName)); + } + } while (FindNextFileW(handle, &data)); + + FindClose(handle); +} + static BOOL write_signature(HANDLE hfile) { struct diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index d601030e78..10892d55ca 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -30,6 +30,7 @@ void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; void update_process_status(DWORD pid) DECLSPEC_HIDDEN; BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; void check_task_time(void) DECLSPEC_HIDDEN; +void load_at_tasks(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 0dfac818fd..2bba674b07 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -53,6 +53,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) TRACE("Starting...\n"); + load_at_tasks(); + htimer = CreateWaitableTimerW(NULL, FALSE, NULL); if (htimer == NULL) { -- 2.16.3

1 0

[PATCH 1/3] schedsvc: Add a sanity check when loading a .job file.
by Dmitry Timoshkov 08 Jun '18

08 Jun '18

There was no problem with this patchset, however I had a file in the c:\windows\tasks directory (dump_job.exe) that was leading to a crash in the job file loading code, this patch fixes it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 91ef3edca0..597df34f2a 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -394,6 +394,12 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("file_version %04x\n", fixed->file_version); TRACE("uuid %s\n", wine_dbgstr_guid(&fixed->uuid)); + if (fixed->file_version != 0x0001) + { + TRACE("invalid file version\n"); + return FALSE; + } + TRACE("name_size_offset %04x\n", fixed->name_size_offset); TRACE("trigger_offset %04x\n", fixed->trigger_offset); TRACE("error_retry_count %u\n", fixed->error_retry_count); -- 2.16.3

1 0

[PATCH] cdosys: Prefer native version.
by Alistair Leslie-Hughes 08 Jun '18

08 Jun '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/cdosys/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/cdosys/main.c b/dlls/cdosys/main.c index 1a9affe..4728229 100644 --- a/dlls/cdosys/main.c +++ b/dlls/cdosys/main.c @@ -41,6 +41,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); -- 1.9.1

1 0

[PATCH] kernel32/tests: Add tests for job object accounting
by Alistair Leslie-Hughes 08 Jun '18

08 Jun '18

From: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/process.c | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b1a4539..5324894 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2394,6 +2394,69 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError()); } +#define test_assigned_proc(job, ...) _test_assigned_proc(__LINE__, job, __VA_ARGS__) +static void _test_assigned_proc(int line, HANDLE job, int expected_count, ...) +{ + char buf[sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST) + sizeof(ULONG_PTR) * 20]; + PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; + DWORD ret_len, pid; + va_list valist; + int n; + BOOL ret; + + memset(buf, 0, sizeof(buf)); + ret = pQueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, sizeof(buf), &ret_len); + ok_(__FILE__, line)(ret, "QueryInformationJobObject error %u\n", GetLastError()); + if (ret) + { + todo_wine_if(expected_count) + ok_(__FILE__, line)(expected_count == pid_list->NumberOfAssignedProcesses, + "Expected NumberOfAssignedProcesses to be %d (expected_count) is %d\n", + expected_count, pid_list->NumberOfAssignedProcesses); + todo_wine_if(expected_count) + ok_(__FILE__, line)(expected_count == pid_list->NumberOfProcessIdsInList, + "Expected NumberOfProcessIdsInList to be %d (expected_count) is %d\n", + expected_count, pid_list->NumberOfProcessIdsInList); + + va_start(valist, expected_count); + for (n = 0; n < min(expected_count, pid_list->NumberOfProcessIdsInList); ++n) + { + pid = va_arg(valist, DWORD); + ok_(__FILE__, line)(pid == pid_list->ProcessIdList[n], + "Expected pid_list->ProcessIdList[%d] to be %x is %lx\n", + n, pid, pid_list->ProcessIdList[n]); + } + va_end(valist); + } +} + +#define test_accounting(job, total_proc, active_proc, terminated_proc) _test_accounting(__LINE__, job, total_proc, active_proc, terminated_proc) +static void _test_accounting(int line, HANDLE job, int total_proc, int active_proc, int terminated_proc) +{ + JOBOBJECT_BASIC_ACCOUNTING_INFORMATION basic_accounting; + DWORD ret_len; + BOOL ret; + + memset(&basic_accounting, 0, sizeof(basic_accounting)); + ret = pQueryInformationJobObject(job, JobObjectBasicAccountingInformation, &basic_accounting, sizeof(basic_accounting), &ret_len); + ok_(__FILE__, line)(ret, "QueryInformationJobObject error %u\n", GetLastError()); + if (ret) + { + /* Not going to check process times or page faults */ + + todo_wine_if(total_proc) + ok_(__FILE__, line)(total_proc == basic_accounting.TotalProcesses, + "Expected basic_accounting.TotalProcesses to be %d (total_proc) is %d\n", + total_proc, basic_accounting.TotalProcesses); + todo_wine_if(active_proc) + ok_(__FILE__, line)(active_proc == basic_accounting.ActiveProcesses, + "Expected basic_accounting.ActiveProcesses to be %d (active_proc) is %d\n", + active_proc, basic_accounting.ActiveProcesses); + ok_(__FILE__, line)(terminated_proc == basic_accounting.TotalTerminatedProcesses, + "Expected basic_accounting.TotalTerminatedProcesses to be %d (terminated_proc) is %d\n", + terminated_proc, basic_accounting.TotalTerminatedProcesses); + } +} static void test_IsProcessInJob(void) { @@ -2420,11 +2483,15 @@ static void test_IsProcessInJob(void) ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job, 0); + test_accounting(job, 0, 0, 0); out = TRUE; ret = pIsProcessInJob(pi.hProcess, job2, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job2, 0); + test_accounting(job2, 0, 0, 0); out = TRUE; ret = pIsProcessInJob(pi.hProcess, NULL, &out); @@ -2438,11 +2505,15 @@ static void test_IsProcessInJob(void) ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job, 1, pi.dwProcessId); + test_accounting(job, 1, 1, 0); out = TRUE; ret = pIsProcessInJob(pi.hProcess, job2, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job2, 0); + test_accounting(job2, 0, 0, 0); out = FALSE; ret = pIsProcessInJob(pi.hProcess, NULL, &out); @@ -2458,6 +2529,8 @@ static void test_IsProcessInJob(void) ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job, 0); + test_accounting(job, 1, 0, 0); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); @@ -2474,11 +2547,15 @@ static void test_TerminateJobObject(void) job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + test_assigned_proc(job, 0); + test_accounting(job, 0, 0, 0); create_process("wait", &pi); ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + test_assigned_proc(job, 1, pi.dwProcessId); + test_accounting(job, 1, 1, 0); ret = pTerminateJobObject(job, 123); ok(ret, "TerminateJobObject error %u\n", GetLastError()); @@ -2486,6 +2563,8 @@ static void test_TerminateJobObject(void) dwret = WaitForSingleObject(pi.hProcess, 1000); ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); + test_assigned_proc(job, 0); + test_accounting(job, 1, 0, 0); ret = GetExitCodeProcess(pi.hProcess, &dwret); ok(ret, "GetExitCodeProcess error %u\n", GetLastError()); @@ -2505,6 +2584,8 @@ static void test_TerminateJobObject(void) ret = pAssignProcessToJobObject(job, pi.hProcess); ok(!ret, "AssignProcessToJobObject unexpectedly succeeded\n"); expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); + test_assigned_proc(job, 0); + test_accounting(job, 1, 0, 0); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); @@ -2691,11 +2772,15 @@ static void test_KillOnJobClose(void) return; } ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + test_assigned_proc(job, 0); + test_accounting(job, 0, 0, 0); create_process("wait", &pi); ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + test_assigned_proc(job, 1, pi.dwProcessId); + test_accounting(job, 1, 1, 0); CloseHandle(job); @@ -2799,6 +2884,8 @@ static HANDLE test_AddSelfToJob(void) ret = pAssignProcessToJobObject(job, GetCurrentProcess()); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + test_assigned_proc(job, 1, GetCurrentProcessId()); + test_accounting(job, 1, 1, 0); return job; } @@ -2826,6 +2913,8 @@ static void test_jobInheritance(HANDLE job) ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job, 2, GetCurrentProcessId(), pi.dwProcessId); + test_accounting(job, 2, 2, 0); dwret = WaitForSingleObject(pi.hProcess, 1000); ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); @@ -2854,6 +2943,8 @@ static void test_BreakawayOk(HANDLE job) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); + test_assigned_proc(job, 1, GetCurrentProcessId()); + test_accounting(job, 2, 1, 0); if (ret) { @@ -2876,6 +2967,8 @@ static void test_BreakawayOk(HANDLE job) ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job, 1, GetCurrentProcessId()); + test_accounting(job, 2, 1, 0); dwret = WaitForSingleObject(pi.hProcess, 1000); ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); @@ -2893,6 +2986,8 @@ static void test_BreakawayOk(HANDLE job) ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + test_assigned_proc(job, 1, GetCurrentProcessId()); + test_accounting(job, 2, 1, 0); dwret = WaitForSingleObject(pi.hProcess, 1000); ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); -- 1.9.1

2 1

[PATCH] include: Updated enum AutomationIdentifierType values
by Alistair Leslie-Hughes 08 Jun '18

08 Jun '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/uiautomationcoreapi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 12c509f..1898fe9 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -45,7 +45,11 @@ enum AutomationIdentifierType AutomationIdentifierType_Pattern, AutomationIdentifierType_Event, AutomationIdentifierType_ControlType, - AutomationIdentifierType_TextAttribute + AutomationIdentifierType_TextAttribute, + AutomationIdentifierType_LandmarkType, + AutomationIdentifierType_Annotation, + AutomationIdentifierType_Changes, + AutomationIdentifierType_Style }; HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); -- 1.9.1

1 0

[PATCH 1/3] user32: Make RegisterPointerDeviceNotifications return TRUE to fake success
by Fabian Maurer 07 Jun '18

07 Jun '18

Fixes bug 45284. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index be4b71a4bc..c3f4030a90 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -843,7 +843,7 @@ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UIN BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) { FIXME("(%p %d): stub\n", hwnd, notifyrange); - return FALSE; + return TRUE; } static const WCHAR imeW[] = {'I','M','E',0}; -- 2.17.1

1 3

[PATCH v2 1/3] user32: Make RegisterPointerDeviceNotifications return TRUE to fake success
by Fabian Maurer 07 Jun '18

07 Jun '18

Fixes bug 45284. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index be4b71a4bc..c3f4030a90 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -843,7 +843,7 @@ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UIN BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) { FIXME("(%p %d): stub\n", hwnd, notifyrange); - return FALSE; + return TRUE; } static const WCHAR imeW[] = {'I','M','E',0}; -- 2.17.1

1 2

[PATCH] dinput/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 07 Jun '18

07 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/device.c | 4 ++-- dlls/dinput/tests/dinput.c | 20 ++++++++++---------- dlls/dinput/tests/joystick.c | 8 +++----- dlls/dinput/tests/keyboard.c | 10 +++++----- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 74940248ff..fa9b6f1436 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -51,7 +51,7 @@ static const DIDATAFORMAT data_format = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, 32, - sizeof(obj_data_format) / sizeof(obj_data_format[0]), + ARRAY_SIZE(obj_data_format), (LPDIOBJECTDATAFORMAT)obj_data_format }; @@ -94,7 +94,7 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) ok(cnt == cnt1, "Enum count changed from %d to %d\n", cnt, cnt1); /* Testing EnumObjects with different types of device objects */ - for (type_index=0; type_index < sizeof(obj_types)/sizeof(obj_types[0]); type_index++) + for (type_index=0; type_index < ARRAY_SIZE(obj_types); type_index++) { hr = IDirectInputDevice_EnumObjects(device, enum_type_callback, &obj_types[type_index], obj_types[type_index]); ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index a5f7c0cfce..7e2da9ff32 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -106,7 +106,7 @@ static void test_preinitialization(void) return; } - for (i = 0; i < sizeof(create_device_tests)/sizeof(create_device_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; hr = IDirectInput_CreateDevice(pDI, create_device_tests[i].rguid, @@ -117,7 +117,7 @@ static void test_preinitialization(void) ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); } - for (i = 0; i < sizeof(enum_devices_tests)/sizeof(enum_devices_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++) { hr = IDirectInput_EnumDevices(pDI, enum_devices_tests[i].dwDevType, enum_devices_tests[i].lpCallback, @@ -217,7 +217,7 @@ static void test_DirectInputCreateEx(void) return; } - for (i = 0; i < sizeof(invalid_param_list)/sizeof(invalid_param_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++) { if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL, @@ -230,7 +230,7 @@ static void test_DirectInputCreateEx(void) ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); @@ -238,7 +238,7 @@ static void test_DirectInputCreateEx(void) ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); @@ -249,9 +249,9 @@ static void test_DirectInputCreateEx(void) } /* Examine combinations of requested interfaces and version numbers. */ - for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++) { - for (j = 0; j < sizeof(iid_list)/sizeof(iid_list[0]); j++) + for (j = 0; j < ARRAY_SIZE(iid_list); j++) { pUnk = NULL; hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL); @@ -311,7 +311,7 @@ static void test_QueryInterface(void) hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL); ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk); @@ -320,7 +320,7 @@ static void test_QueryInterface(void) if (pUnk) IUnknown_Release(pUnk); } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); @@ -512,7 +512,7 @@ static void test_Initialize(void) hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe); ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); - for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++) { hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]); ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr); diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index b4ffba5c5d..69e95d0c2d 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -30,8 +30,6 @@ #include "wingdi.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - typedef struct tagUserData { IDirectInputA *pDI; DWORD version; @@ -62,7 +60,7 @@ static const DIDATAFORMAT c_dfDIJoystickTest = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystickTest), + ARRAY_SIZE(dfDIJoystickTest), (LPDIOBJECTDATAFORMAT)dfDIJoystickTest }; @@ -178,7 +176,7 @@ static const struct effect_id static const struct effect_id* effect_from_guid(const GUID *guid) { unsigned int i; - for (i = 0; i < sizeof(effect_conversion) / sizeof(effect_conversion[0]); i++) + for (i = 0; i < ARRAY_SIZE(effect_conversion); i++) if (IsEqualGUID(guid, effect_conversion[i].guid)) return &effect_conversion[i]; return NULL; @@ -504,7 +502,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) effect_data.eff.dwDuration = INFINITE; effect_data.eff.dwGain = DI_FFNOMINALMAX; effect_data.eff.dwTriggerButton = DIEB_NOTRIGGER; - effect_data.eff.cAxes = sizeof(axes) / sizeof(axes[0]); + effect_data.eff.cAxes = ARRAY_SIZE(axes); effect_data.eff.rgdwAxes = axes; effect_data.eff.rglDirection = direction; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 576a94cc7d..59411cbfa5 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -101,7 +101,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) df.dwObjSize = sizeof( DIOBJECTDATAFORMAT ); df.dwFlags = DIDF_RELAXIS; df.dwDataSize = sizeof( custom_state ); - df.dwNumObjs = sizeof( dodf )/sizeof( dodf[0] ); + df.dwNumObjs = ARRAY_SIZE(dodf); df.rgodf = dodf; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); @@ -139,7 +139,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) memset(custom_state, 0x56, sizeof(custom_state)); IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); - for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + for (i = 0; i < ARRAY_SIZE(custom_state); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); /* simulate some keyboard input */ @@ -160,7 +160,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState failed: %08x\n", hr); - for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + for (i = 0; i < ARRAY_SIZE(custom_state); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); } keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); @@ -316,7 +316,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) HKL hkl, hkl_orig; MSG msg; - for (i = 0; i < sizeof(expected)/sizeof(expected[0]); i++) + for (i = 0; i < ARRAY_SIZE(expected); i++) { if (expected[i].langid == langid) { @@ -340,7 +340,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) SetFocus(hwnd); pump_messages(); - for (i = 0; i < sizeof(key2dik_en)/sizeof(key2dik_en[0]); i++) + for (i = 0; i < ARRAY_SIZE(key2dik_en); i++) { BYTE kbd_state[256]; UINT n; -- 2.14.4

1 0

[PATCH] dinput8/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 07 Jun '18

07 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput8/tests/device.c | 12 ++++++------ dlls/dinput8/tests/dinput.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2b06f624c2..aaeddd9b7b 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -317,8 +317,8 @@ static void test_action_mapping(void) memset (&af, 0, sizeof(af)); af.dwSize = sizeof(af); af.dwActionSize = sizeof(DIACTIONA); - af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); - af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwDataSize = 4 * ARRAY_SIZE(actionMapping); + af.dwNumActions = ARRAY_SIZE(actionMapping); af.rgoAction = actionMapping; af.guidActionMap = ACTION_MAPPING_GUID; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ @@ -357,8 +357,8 @@ static void test_action_mapping(void) hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr); - af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); - af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwDataSize = 4 * ARRAY_SIZE(actionMapping); + af.dwNumActions = ARRAY_SIZE(actionMapping); /* test DIDSAM_NOUSER */ dps.diph.dwSize = sizeof(dps); @@ -448,8 +448,8 @@ static void test_save_settings(void) memset (&af, 0, sizeof(af)); af.dwSize = sizeof(af); af.dwActionSize = sizeof(DIACTIONA); - af.dwDataSize = 4 * sizeof(actions) / sizeof(actions[0]); - af.dwNumActions = sizeof(actions) / sizeof(actions[0]); + af.dwDataSize = 4 * ARRAY_SIZE(actions); + af.dwNumActions = ARRAY_SIZE(actions); af.rgoAction = actions; af.guidActionMap = mapping_guid; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index e16542ab13..b093437096 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -82,7 +82,7 @@ static void test_preinitialization(void) return; } - for (i = 0; i < sizeof(create_device_tests)/sizeof(create_device_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; hr = IDirectInput8_CreateDevice(pDI, create_device_tests[i].rguid, @@ -93,7 +93,7 @@ static void test_preinitialization(void) ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); } - for (i = 0; i < sizeof(enum_devices_tests)/sizeof(enum_devices_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++) { hr = IDirectInput8_EnumDevices(pDI, enum_devices_tests[i].dwDevType, enum_devices_tests[i].lpCallback, @@ -186,7 +186,7 @@ static void test_DirectInput8Create(void) IUnknown *pUnk; HRESULT hr; - for (i = 0; i < sizeof(invalid_param_list)/sizeof(invalid_param_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++) { if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; hr = DirectInput8Create(invalid_param_list[i].hinst ? hInstance : NULL, @@ -199,7 +199,7 @@ static void test_DirectInput8Create(void) ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); @@ -207,7 +207,7 @@ static void test_DirectInput8Create(void) ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); @@ -268,7 +268,7 @@ static void test_QueryInterface(void) hr = IDirectInput8_QueryInterface(pDI, &IID_IUnknown, NULL); ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr); - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = IDirectInput8_QueryInterface(pDI, iid_list[i], (void **)&pUnk); @@ -277,7 +277,7 @@ static void test_QueryInterface(void) if (pUnk) { int j; - for (j = 0; j < sizeof(iid_list)/sizeof(iid_list[0]); j++) + for (j = 0; j < ARRAY_SIZE(iid_list); j++) { IUnknown *pUnk1 = NULL; hr = IDirectInput8_QueryInterface(pUnk, iid_list[j], (void **)&pUnk1); @@ -289,7 +289,7 @@ static void test_QueryInterface(void) } } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); @@ -527,7 +527,7 @@ static void test_EnumDevicesBySemantics(void) memset (&diaf, 0, sizeof(diaf)); diaf.dwSize = sizeof(diaf); diaf.dwActionSize = sizeof(DIACTIONA); - diaf.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + diaf.dwNumActions = ARRAY_SIZE(actionMapping); diaf.dwDataSize = 4 * diaf.dwNumActions; diaf.rgoAction = actionMapping; diaf.guidActionMap = ACTION_MAPPING_GUID; -- 2.14.4

1 0

[PATCH] advpack/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 07 Jun '18

07 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/tests/advpack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index d5958769ab..8d7c5ebb48 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -134,8 +134,8 @@ static void delnode_test(void) /* Native DelNode apparently does not support relative paths, so we use absolute paths for testing */ - currDirLen = GetCurrentDirectoryA(sizeof(currDir) / sizeof(CHAR), currDir); - assert(currDirLen > 0 && currDirLen < sizeof(currDir) / sizeof(CHAR)); + currDirLen = GetCurrentDirectoryA(ARRAY_SIZE(currDir), currDir); + assert(currDirLen > 0 && currDirLen < ARRAY_SIZE(currDir)); if(currDir[currDirLen - 1] == '\\') currDir[--currDirLen] = 0; -- 2.14.4

1 0

[PATCH 1/5] wined3d: Declare the correct number and type of fragment shader color outputs.
by Matteo Bruni 07 Jun '18

07 Jun '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 116 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a99762b151f..bc714f8de78 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7613,6 +7613,53 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); } +static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct wined3d_shader *shader) +{ + const struct wined3d_shader_signature *output_signature = &shader->output_signature; + unsigned int i; + + if (output_signature->element_count) + { + for (i = 0; i < output_signature->element_count; ++i) + { + const struct wined3d_shader_signature_element *output = &output_signature->elements[i]; + + if (strncasecmp(output->semantic_name, "SV_Target", sizeof("SV_Target"))) + continue; + switch (output->component_type) + { + case WINED3D_TYPE_UINT: + shader_addline(buffer, "color_out%u = floatBitsToUint(ps_out[%u]);\n", + output->semantic_idx, output->semantic_idx); + break; + case WINED3D_TYPE_INT: + shader_addline(buffer, "color_out%u = floatBitsToInt(ps_out[%u]);\n", + output->semantic_idx, output->semantic_idx); + break; + + default: + FIXME("Unhandled type %#x.\n", output->component_type); + /* Fall through. */ + case WINED3D_TYPE_UNKNOWN: + case WINED3D_TYPE_FLOAT: + shader_addline(buffer, "color_out%u = ps_out[%u];\n", + output->semantic_idx, output->semantic_idx); + } + } + } + else + { + DWORD mask = shader->reg_maps.rt_mask; + + while (mask) + { + i = wined3d_bit_scan(&mask); + shader_addline(buffer, "color_out%u = ps_out[%u];\n", i, i); + } + } +} + static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, const struct wined3d_shader *shader, const struct ps_compile_args *args) @@ -7634,6 +7681,26 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in if (reg_maps->sample_mask) shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); + + if (!needs_legacy_glsl_syntax(gl_info)) + shader_glsl_generate_color_output(buffer, gl_info, shader); +} + +static const char *shader_glsl_get_ps_output_format(enum wined3d_component_type component_type) +{ + static const char formats[][6] = + { + "", /* WINED3D_TYPE_UNKNOWN */ + "uvec4", /* WINED3D_TYPE_UINT */ + "ivec4", /* WINED3D_TYPE_INT */ + "vec4", /* WINED3D_TYPE_FLOAT */ + }; + if (component_type < WINED3D_TYPE_UNKNOWN || component_type > WINED3D_TYPE_FLOAT) + { + WARN("Unexpected component_type %#x.\n", component_type); + return formats[WINED3D_TYPE_FLOAT]; + } + return formats[component_type]; } /* Context activation is done by the caller. */ @@ -7816,9 +7883,35 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context if (!needs_legacy_glsl_syntax(gl_info)) { - if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = 0) "); - shader_addline(buffer, "out vec4 ps_out[%u];\n", gl_info->limits.buffers); + const struct wined3d_shader_signature *output_signature = &shader->output_signature; + + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (output_signature->element_count) + { + for (i = 0; i < output_signature->element_count; ++i) + { + const struct wined3d_shader_signature_element *output = &output_signature->elements[i]; + + if (strncasecmp(output->semantic_name, "SV_Target", sizeof("SV_Target"))) + continue; + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + shader_addline(buffer, "out %s color_out%u;\n", + shader_glsl_get_ps_output_format(output->component_type), output->semantic_idx); + } + } + else + { + DWORD mask = reg_maps->rt_mask; + + while (mask) + { + i = wined3d_bit_scan(&mask); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = %u) ", i); + shader_addline(buffer, "out vec4 color_out%u;\n", i); + } + } } if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) @@ -9536,9 +9629,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (!needs_legacy_glsl_syntax(gl_info)) { + shader_addline(buffer, "vec4 ps_out[1];\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "layout(location = 0) "); - shader_addline(buffer, "out vec4 ps_out[1];\n"); + shader_addline(buffer, "out vec4 color_out0;\n"); } shader_addline(buffer, "vec4 tmp0, tmp1;\n"); @@ -9878,6 +9972,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_generate_fog_code(buffer, gl_info, settings->fog); shader_glsl_generate_alpha_test(buffer, gl_info, alpha_test_func); + if (!needs_legacy_glsl_syntax(gl_info)) + shader_addline(buffer, "color_out0 = ps_out[0];\n"); shader_addline(buffer, "}\n"); @@ -10419,13 +10515,17 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } } checkGLcall("glBindAttribLocation"); - string_buffer_release(&priv->string_buffers, tmp_name); if (!needs_legacy_glsl_syntax(gl_info)) { - GL_EXTCALL(glBindFragDataLocation(program_id, 0, "ps_out")); - checkGLcall("glBindFragDataLocation"); + for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) + { + string_buffer_sprintf(tmp_name, "color_out%u", i); + GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); + checkGLcall("glBindFragDataLocation"); + } } + string_buffer_release(&priv->string_buffers, tmp_name); } if (hshader) @@ -12793,6 +12893,8 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter shader_glsl_add_version_declaration(buffer, gl_info); shader_addline(buffer, "uniform sampler%s sampler;\n", tex_type); declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); + /* TODO: Declare the out variable with the correct type (and put it in the + * blitter args). */ if (!needs_legacy_glsl_syntax(gl_info)) shader_addline(buffer, "out vec4 ps_out[1];\n"); -- 2.16.1

6 17

[PATCH 3/4] wsdapi: Add stub for Probe message parsing, prepare notification sink message.
by Owen Rudge 07 Jun '18

07 Jun '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 52 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/soap.c | 6 +++++ dlls/wsdapi/wsdapi_internal.h | 5 +++++ 3 files changed, 62 insertions(+), 1 deletion(-)

3 2

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 07 Jun '18

07 Jun '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index fce90dcccf..d654e904f2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -12782,10 +12782,8 @@ msgid "Confirm Value Delete" msgstr "Vahvista arvon tuhoaminen" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Haluatko varmasti tuhota rekisteristä arvon '%1'?" +msgstr "Haluatko varmasti tuhota rekisteristä valitun arvon?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." -- 2.17.1

1 0

[PATCH] shellpath.c: Fix creation of HOME directory symbolic links
by Rob Walker 07 Jun '18

07 Jun '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=41668 (1) https://bugs.winehq.org/show_bug.cgi?id=28216 (2) (1) Introduces a "WINESYMLINK" env variable that allows a user to control what shell folder links are created to the HOME folder, when a WINEPREFIX is initially created. The Wineprefix Shell Folders, that Wine symlinks to the user's HOME directory, are only (re-)created on each Wine boot if they: do not pre-exist or are broken symbolic links. (2) The XDG Directory specification automatically falls back to the user HOME directory for any XDG_*_DIR that does not exist (xdg-user-dirs-update). The implemented solution is to block Wine from symlinking directly to HOME directory. Test on Gentoo GNU/Linux. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/shell32/shellpath.c | 554 ++++++++++++++++++++++++--------------- 1 file changed, 343 insertions(+), 211 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index a551e93aa8..b8c74273c6 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4326,252 +4326,259 @@ static HRESULT _SHRegisterCommonShellFolders(void) } /****************************************************************************** - * _SHAppendToUnixPath [Internal] + * append_to_unix_path [Internal] * - * Helper function for _SHCreateSymbolicLinks. Appends pwszSubPath (or the - * corresponding resource, if IS_INTRESOURCE) to the unix base path 'szBasePath' - * and replaces backslashes with slashes. + * Helper function for create_home_subdir_symbolic_link. + * Appends 'subpath', or the corresponding resource (if it is a + * resource identifier), to the Unix base path 'base_dir'. + * Replace backslashes with forward slashes. * * PARAMS - * szBasePath [IO] The unix base path, which will be appended to (CP_UNXICP). - * pwszSubPath [I] Sub-path or resource id (use MAKEINTRESOURCEW). + * base_dir [IO] The Unix base path, which will be appended to (CP_UNXICP). + * subpath [I] Sub-path or resource id (use MAKEINTRESOURCEW, pre-call). * * RETURNS - * Success: TRUE, + * Success: TRUE * Failure: FALSE */ -static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { - WCHAR wszSubPath[MAX_PATH]; - int cLen = strlen(szBasePath); - char *pBackslash; - - if (IS_INTRESOURCE(pwszSubPath)) { - if (!LoadStringW(shell32_hInstance, LOWORD(pwszSubPath), wszSubPath, MAX_PATH)) { - /* Fall back to hard coded defaults. */ - switch (LOWORD(pwszSubPath)) { - case IDS_PERSONAL: - lstrcpyW(wszSubPath, DocumentsW); - break; - case IDS_MYMUSIC: - lstrcpyW(wszSubPath, My_MusicW); - break; - case IDS_MYPICTURES: - lstrcpyW(wszSubPath, My_PicturesW); - break; - case IDS_MYVIDEOS: - lstrcpyW(wszSubPath, My_VideosW); - break; - default: - ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); - return FALSE; - } +static inline BOOL append_to_unix_path(char *base_dir, LPCWSTR subpath) +{ + WCHAR ws_subpath[MAX_PATH]; + int cLen = strlen(base_dir); + char *back_slash; + + if (!IS_INTRESOURCE(subpath)) + { + lstrcpyW(ws_subpath, subpath); + } + else if (!LoadStringW(shell32_hInstance, LOWORD(subpath), ws_subpath, MAX_PATH)) + { + /* Fall back to hard coded defaults. */ + switch (LOWORD(subpath)) { + case IDS_PERSONAL: + lstrcpyW(ws_subpath, DocumentsW); + break; + case IDS_MYMUSIC: + lstrcpyW(ws_subpath, My_MusicW); + break; + case IDS_MYPICTURES: + lstrcpyW(ws_subpath, My_PicturesW); + break; + case IDS_MYVIDEOS: + lstrcpyW(ws_subpath, My_VideosW); + break; + case IDS_DESKTOP: + lstrcpyW(ws_subpath, DesktopW); + break; + default: + ERR("LoadString(%d) failed!\n", LOWORD(subpath)); + return FALSE; } - } else { - lstrcpyW(wszSubPath, pwszSubPath); } - - if (szBasePath[cLen-1] != '/') szBasePath[cLen++] = '/'; - - if (!WideCharToMultiByte(CP_UNIXCP, 0, wszSubPath, -1, szBasePath + cLen, + + if (!cLen || (base_dir[cLen-1] != '/')) base_dir[cLen++] = '/'; + + if (!WideCharToMultiByte(CP_UNIXCP, 0, ws_subpath, -1, base_dir + cLen, FILENAME_MAX - cLen, NULL, NULL)) { return FALSE; } - - pBackslash = szBasePath + cLen; - while ((pBackslash = strchr(pBackslash, '\\'))) *pBackslash = '/'; - + + back_slash = base_dir + cLen; + while ((back_slash = strchr(back_slash, '\\'))) *back_slash = '/'; + return TRUE; } /****************************************************************************** - * _SHCreateSymbolicLinks [Internal] + * compare_pathft_to_bootft [Internal] * - * Sets up symbol links for various shell folders to point into the users home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we imply that the user - * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Videos' subfolders under '$HOME/My Documents', if those - * do not already exits. We put appropriate symbolic links in place for those, - * too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds fo 'My Pictures' and 'My Videos'. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + * Function to compare the FILETIME of ws_path (a Windows path) to the (estimated) + * Wine System boot time. + * + * PARAMS + * ws_path [I] The Windows path, for which provides the FS write time. + * time_difference [O] -1 Windows path last written before time of Wine boot. + * 0 Windows path last written at time of Wine boot. + * +1 Windows path last written after time of Wine boot. + * RETURNS + * Success: S_OK + * Failure: E_FAIL + * + * NOTES + * Pre-allocate storage for time_difference pointer variable externally. */ -static void _SHCreateSymbolicLinks(void) -{ - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; - const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; - int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; - static const unsigned int num = ARRAY_SIZE(xdg_dirs); - WCHAR wszTempPath[MAX_PATH]; - char szPersonalTarget[FILENAME_MAX], *pszPersonal; - char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; - char szDesktopTarget[FILENAME_MAX], *pszDesktop; - struct stat statFolder; - const char *pszHome; - HRESULT hr; - char ** xdg_results; - char * xdg_desktop_dir; - - /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) return; - pszPersonal = wine_get_unix_file_name(wszTempPath); - if (!pszPersonal) return; +static HRESULT compare_pathft_to_bootft(const WCHAR * ws_path, int * time_difference) +{ + static ULONG64 time_system_start = 0; + SYSTEMTIME system_time_st; + FILETIME dummy_ft, system_time_ft, last_write_ft; + ULONG64 tick_count, time_last_write; + HANDLE fhandle; + DWORD ft_errorc = 0; - hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); - if (FAILED(hr)) xdg_results = NULL; + if (!time_difference) return E_FAIL; - pszHome = getenv("HOME"); - if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) + if (!time_system_start) { - while (1) + tick_count = (ULONG64) GetTickCount64(); + GetSystemTime(&system_time_st); + if (!SystemTimeToFileTime( &system_time_st, &system_time_ft)) { - /* Check if there's already a Wine-specific 'My Documents' folder */ - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && - !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* '$HOME/My Documents' exists. Create 'My Pictures', - * 'My Videos' and 'My Music' subfolders or fail silently if - * they already exist. - */ - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) - { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } - break; - } - - /* Try to point to the XDG Documents folder */ - if (xdg_results && xdg_results[num-2] && - !stat(xdg_results[num-2], &statFolder) && - S_ISDIR(statFolder.st_mode)) - { - strcpy(szPersonalTarget, xdg_results[num-2]); - break; - } - - /* Or the hardcoded / OS X Documents folder */ - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, DocumentsW) && - !stat(szPersonalTarget, &statFolder) && - S_ISDIR(statFolder.st_mode)) - break; - - /* As a last resort point to $HOME. */ - strcpy(szPersonalTarget, pszHome); - break; + ERR("SystemTimeToFileTime call failed (%d)\n", GetLastError()); + return E_FAIL; } - - /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - remove(pszPersonal); - symlink(szPersonalTarget, pszPersonal); + time_system_start = (((ULONG64)system_time_ft.dwHighDateTime) << 32) + + system_time_ft.dwLowDateTime + - (tick_count * 10000); } - else + fhandle = CreateFileW( ws_path, 0, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (fhandle == INVALID_HANDLE_VALUE) { - /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs - * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ - pszHome = NULL; - strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < ARRAY_SIZE(aidsMyStuff); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); - } + ERR("Open file handle failed for path: %s (%d)\n", + debugstr_w(ws_path), GetLastError()); + return E_FAIL; } - - /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ - for (i=0; i < ARRAY_SIZE(aidsMyStuff); i++) + if (!GetFileTime(fhandle, &dummy_ft, &dummy_ft, &last_write_ft)) + ft_errorc = GetLastError(); + if (!CloseHandle(fhandle)) { - /* Create the current 'My Whatever' folder and get its unix path. */ - hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) continue; - - pszMyStuff = wine_get_unix_file_name(wszTempPath); - if (!pszMyStuff) continue; - - while (1) - { - /* Check for the Wine-specific '$HOME/My Documents' subfolder */ - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && - !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - break; + ERR("Close file handle failed: %p (%d)\n", + fhandle, GetLastError()); + return E_FAIL; + } + if (ft_errorc) + { + ERR("Get file time failed: %p (%d)\n", + fhandle, ft_errorc); + return E_FAIL; + } + time_last_write = (((ULONG64)last_write_ft.dwHighDateTime) << 32) + + last_write_ft.dwLowDateTime; + *time_difference = ((time_last_write > time_system_start) ? 1 : + ((time_last_write < time_system_start) ? -1 : + 0)); - /* Try the XDG_XXX_DIR folder */ - if (xdg_results && xdg_results[i]) - { - strcpy(szMyStuffTarget, xdg_results[i]); - break; - } + return S_OK; +} - /* Or the OS X folder (these are never localized) */ - if (pszHome) - { - strcpy(szMyStuffTarget, pszHome); - if (_SHAppendToUnixPath(szMyStuffTarget, MyOSXStuffW[i]) && - !stat(szMyStuffTarget, &statFolder) && - S_ISDIR(statFolder.st_mode)) - break; - } +/****************************************************************************** + * create_homedir_symbolic_link [Internal] + * + * Creates a symbolic link from the current Wineprefix to an appropriate + * HOME subdirectory (if one is found). + * + * Creates 'XXXX' directory in Wineprefix. + * Then create a 'My XXXX' symbolic link in Wineprefix: + * 1) If '$HOME/XXXX' (IDS directory) exists then target this. + * 2) If '$HOME/XXXX' (XDG_XXXX_DIR) exists then target this. + * 3) If '$HOME/XXXX' (MacOS XXXX media directory) exists then target this. + * + * PARAMS + * env_enabled [I] + * TRUE The user has enabled this Shell Folder to be symlinked (default). + * FALSE The user has chosen to disable symlinking this Shell Folder. + * The Shell Folder will be created, in the current Wineprefix (if not pre-existing). + * ids_dir [I] Windows Resource Identifier code for current Shell Folder. + * csidl_dir [I] Constant Special Item ID List identifier for current Shell Folder. + * xdg_dir [I] Full path of external Unix XDG directory corresponding to current Shell Folder. + * ws_osx_dir [I] Fallback directory name to use, corresponding to current Shell Folder (OSX specific). + * + */ +void create_homedir_symbolic_link(BOOL env_enabled, + UINT ids_dir, + int csidl_dir, + const char * xdg_dir, + const WCHAR * ws_osx_dir) +{ + static const char * env_homedir = NULL; + WCHAR ws_temp_path[MAX_PATH]; + char home_target[FILENAME_MAX], * prefix_dir; + struct stat stat_folder, stat_home_folder; + HRESULT hr; + BOOL target_ok; + int time_difference; - /* As a last resort point to the same location as 'My Documents' */ - strcpy(szMyStuffTarget, szPersonalTarget); - break; + hr = SHGetFolderPathW(NULL, csidl_dir, NULL, + SHGFP_TYPE_DEFAULT, ws_temp_path); + if (SUCCEEDED(hr)) + { + if (ids_dir != IDS_DESKTOPDIRECTORY) return; + + if ((compare_pathft_to_bootft(ws_temp_path, &time_difference) == S_OK) + && (time_difference < 0)) + { + TRACE("%s directory created before wineboot\n", + debugstr_w(ws_temp_path)); + return; } - remove(pszMyStuff); - symlink(szMyStuffTarget, pszMyStuff); - heap_free(pszMyStuff); } - - /* Last but not least, the Desktop folder */ - if (pszHome) - strcpy(szDesktopTarget, pszHome); + else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + hr = SHGetFolderPathW(NULL, csidl_dir|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, ws_temp_path); + if (FAILED(hr)) return; + } else - strcpy(szDesktopTarget, pszPersonal); - heap_free(pszPersonal); + { + ERR("Failed to get Wineprefix path corresponding to %d CSIDL\n", + csidl_dir); + return; + } + if (!env_enabled) return; + prefix_dir = wine_get_unix_file_name(ws_temp_path); + if (!prefix_dir) + { + ERR("Failed to get Unix Wineprefix directory for: %s\n", + debugstr_w(ws_temp_path)); + return; + } + if (!env_homedir) env_homedir = getenv("HOME"); + if (!(env_homedir + && (stat(env_homedir, &stat_home_folder) != 1) + && S_ISDIR(stat_home_folder.st_mode))) + { + if (prefix_dir) heap_free(prefix_dir); + return; + } - xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; - if (xdg_desktop_dir || - (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && - !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) + /* Check for: + * '$HOME/XXXX' (IDS directory) + * or '$HOME/XXXX' (XDG directory) + * or '$HOME/XXXX' (MacOS directory) + */ + target_ok = FALSE; + strcpy(home_target, env_homedir); + if (append_to_unix_path(home_target, MAKEINTRESOURCEW(ids_dir)) + && (stat(home_target, &stat_folder) != -1) + && S_ISDIR(stat_folder.st_mode)) { - hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) - { - remove(pszDesktop); - if (xdg_desktop_dir) - symlink(xdg_desktop_dir, pszDesktop); - else - symlink(szDesktopTarget, pszDesktop); - heap_free(pszDesktop); - } + target_ok = TRUE; + } + else if (xdg_dir && stat(xdg_dir, &stat_folder)) + { + strcpy(home_target, xdg_dir); + /* Only link to the XDG directory, if it does not point directly + * to the user's HOME directory (XDG specification fallback path). */ + target_ok = (stat_folder.st_ino != stat_home_folder.st_ino); + } + else + { + strcpy(home_target, env_homedir); + target_ok = append_to_unix_path(home_target, ws_osx_dir) + && (stat(home_target, &stat_folder) != -1) + && S_ISDIR(stat_folder.st_mode); } - /* Free resources allocated by XDG_UserDirLookup() */ - if (xdg_results) + if (target_ok) { - for (i = 0; i < num; i++) - heap_free(xdg_results[i]); - heap_free(xdg_results); + remove(prefix_dir); + symlink(home_target, prefix_dir); } + + + if (prefix_dir) heap_free(prefix_dir); } /****************************************************************************** @@ -6126,15 +6133,139 @@ static void register_system_knownfolders(void) } } +/****************************************************************************** + * parse_symlinks_env_variable [Internal] + * + * PARAMS + * xdg_dir [I] Unix XDG directory name (without "XDG_" prefix and "_DIR" suffix). + * + * RETURNS + * TRUE "WINESYMLINK" contains the specified XDG directory string. + * FALSE "WINESYMLINK" does not contain the specified XDG directory string. + * Any error condition. + * + * Note: "WINESYMLINK", defaults to "ALL", when unset. This enables all symlinks. + * "WINESYMLINK" can also be manually set to "ALL", enabling all symlinks. + * + */ +static BOOL parse_symlinks_env_variable(const char * xdg_dir) +{ + static const char * matchall_env_var = "ALL"; + static char env_var[MAX_PATH+1]; + static char * env_winesymlink = NULL; + char * sstr, * sstr_stop, * tstr, * word_start = NULL; + char seperator_ch = '\0'; + BOOL end_string, in_word = FALSE, matched = FALSE; + size_t slength = 0, matchall_length, xdg_dir_slength; + + if (!xdg_dir) return matched; + + if (!env_winesymlink) + { + env_winesymlink = getenv("WINESYMLINK"); + if (!env_winesymlink) env_winesymlink = (char*) matchall_env_var; + tstr = env_var; + sstr_stop = env_winesymlink + MAX_PATH; + for (sstr = env_winesymlink; *sstr && (sstr != sstr_stop); ++sstr) + { + if (!seperator_ch && (ispunct(*sstr) || isspace(*sstr))) + seperator_ch = *sstr; + if (!isalpha(*sstr)) continue; + + if (seperator_ch && in_word) + { + *tstr++ = seperator_ch; + ++slength; + } + in_word = TRUE; + seperator_ch = '\0'; + *tstr++ = toupper(*sstr); + ++slength; + } + env_var[slength] = '\0'; + } + + TRACE("processed env variable: %s\n", debugstr_a(&env_var[0])); + matchall_length = strlen(matchall_env_var); + xdg_dir_slength = strlen(xdg_dir); + end_string = !(env_var[0]); + for (sstr = &env_var[0]; !end_string; ++sstr) + { + end_string = !(*(sstr+1)); + in_word = isalpha(*sstr); + if (in_word && !word_start) word_start = sstr; + in_word = in_word && !end_string; + if (in_word || !word_start) continue; + + slength = ((size_t) (sstr-word_start))+(end_string ? 1 : 0); + matched = ( (slength == xdg_dir_slength) && (strncmp(word_start, xdg_dir, slength) == 0) ) + || ( (slength == matchall_length) && (strncmp(word_start, "ALL", slength) == 0) ); + if (matched) break; + + word_start = NULL; + } + TRACE("%s symlinking for %s\n", matched ? "Enabled" : "Disabled", debugstr_a(xdg_dir)); + + return matched; +} + +/****************************************************************************** + * create_homedir_symbolic_links [Internal] + * + * Parse WINESYMLINK env variable, for each XDG directory argument. To test if symlinking is + * enabled for that XDG directory / Wine Profile Folder. + * Then calls the function create_homedir_symbolic_link to potentially symlink from a Shell Folder, + * in the current Wineprefix, to a subdirectory of the current user's HOME directory. + * + * PARAMS + * xdg_dirnames [I] Pointer to an array of Unix XDG directory names + * (without "XDG_" prefix and "_DIR" suffix). + * xdg_dir_count [I] Item count of array (above). + * + */ +static void create_homedir_symbolic_links(const char * const xdg_dirnames[], const UINT xdg_dir_count) +{ + char ** xdg_dirs_array; + char * xdg_dir; + HRESULT hr; + UINT i; + BOOL env_enabled; + + if (!xdg_dirnames) return; + + hr = XDG_UserDirLookup(xdg_dirnames, xdg_dir_count, &xdg_dirs_array); + if (FAILED(hr)) xdg_dirs_array = NULL; + + for (i = 0; i < xdg_dir_count; ++i) + { + env_enabled = parse_symlinks_env_variable(xdg_dirnames[i]); + xdg_dir = xdg_dirs_array ? xdg_dirs_array[i] : NULL; + if (!strcmp(xdg_dirnames[i],"DOCUMENTS")) + create_homedir_symbolic_link(env_enabled, IDS_PERSONAL, CSIDL_PERSONAL, xdg_dir, DocumentsW); + else if (!strcmp(xdg_dirnames[i],"PICTURES")) + create_homedir_symbolic_link(env_enabled, IDS_MYPICTURES, CSIDL_MYPICTURES, xdg_dir, PicturesW); + else if (!strcmp(xdg_dirnames[i],"VIDEOS")) + create_homedir_symbolic_link(env_enabled, IDS_MYVIDEOS, CSIDL_MYVIDEO, xdg_dir, MoviesW); + else if (!strcmp(xdg_dirnames[i],"MUSIC")) + create_homedir_symbolic_link(env_enabled, IDS_MYMUSIC, CSIDL_MYMUSIC, xdg_dir, MusicW); + else if (!strcmp(xdg_dirnames[i],"DESKTOP")) + create_homedir_symbolic_link(env_enabled, IDS_DESKTOPDIRECTORY, CSIDL_DESKTOPDIRECTORY, xdg_dir, DesktopW); + else + ERR("XDG directory name specifier invalid: %s\n", debugstr_a(xdg_dirnames[i])); + if (xdg_dir) heap_free(xdg_dirs_array[i]); + } + if (xdg_dirs_array) heap_free(xdg_dirs_array); +} + HRESULT SHELL_RegisterShellFolders(void) { + static const char * const xdg_dirnames[] = { "DOCUMENTS", "PICTURES", "VIDEOS", "MUSIC", "DESKTOP" }; + const UINT xdg_dir_count = 5; HRESULT hr; - /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Videos', 'My Music' and 'Desktop' in advance, so that the - * _SHRegister*ShellFolders() functions will find everything nice and clean - * and thus will not attempt to create them in the profile directory. */ - _SHCreateSymbolicLinks(); + /* Early setup of symlinks from specific User Shell Folders, in + * current Wineprefix, to subdirecties of the user's HOME directory. */ + create_homedir_symbolic_links(xdg_dirnames, xdg_dir_count); hr = _SHRegisterUserShellFolders(TRUE); if (SUCCEEDED(hr)) @@ -6147,5 +6278,6 @@ HRESULT SHELL_RegisterShellFolders(void) hr = set_folder_attributes(); if (SUCCEEDED(hr)) register_system_knownfolders(); + return hr; } -- 2.17.1

3 3

[PATCH vkd3d] libs/vkd3d: Use VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT only if array size is >= 6.
by Józef Kucia 07 Jun '18

07 Jun '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index acd3bada63ec..2ccb84797514 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -132,7 +132,8 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ image_info.flags = 0; if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && dxgi_format_is_typeless(desc->Format)) image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D && desc->Width == desc->Height) + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D + && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); -- 2.16.4

3 3

[PATCH] ntoskrnl: Have MmIsAddressValid use IsBadReadPtr.
by Derek Lesho 07 Jun '18

07 Jun '18

Fixes an error inside EasyAntiCheat.sys, which uses MmIsAddressValid on ntoskrnl.exe, to find its base address. Wine will always return FALSE, because it checks for write access to ntoskrnl, when all the driver needs is read access Tested on Arch Linux Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 55027c5..e4c1c35 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2164,7 +2164,7 @@ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) { TRACE("(%p)\n", VirtualAddress); - return !IsBadWritePtr(VirtualAddress, 1); + return !IsBadReadPtr(VirtualAddress, 1); } /*********************************************************************** -- 2.7.4

3 5

[PATCH 3/4 v5] riched20: Support external HDC in ME_WrapMarkedParagraphs().
by Jactry Zeng 07 Jun '18

07 Jun '18

Superseded patch 146572. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 13 +++++++------ dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 10 +++++----- dlls/riched20/table.c | 4 ++-- dlls/riched20/wrap.c | 11 +++++++++-- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 820b0380c7..82132761f0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3028,6 +3028,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hWnd = NULL; ed->hwndParent = NULL; + ed->hdcDraw = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; ed->reOle = NULL; @@ -3494,7 +3495,7 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) } ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_MoveCaret(editor); return 0; } @@ -3645,7 +3646,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, cf.yHeight = size * 20; /* convert twips to points */ ME_SetSelectionCharFormat(editor, &cf); ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); @@ -3934,7 +3935,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); if (bRepaint) { - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); } @@ -3959,7 +3960,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETPARAFORMAT: { BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); ME_CommitUndo(editor); @@ -4054,7 +4055,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); if (bRepaint) ME_Repaint(editor); @@ -4714,7 +4715,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bDefaultFormatRect = TRUE; } ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); if (msg != EM_SETRECTNP) ME_Repaint(editor); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0f0e56ecd1..425a34f0c2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -182,7 +182,7 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDD void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ -BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; +BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor, HDC hdc) DECLSPEC_HIDDEN; void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 206ce85287..1d811e1c2a 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -383,6 +383,7 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { HWND hWnd, hwndParent; + HDC hdcDraw; ITextHost *texthost; IRichEditOle *reOle; BOOL bEmulateVersion10; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fcc4e105a3..f2429081fc 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -105,7 +105,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) void ME_Repaint(ME_TextEditor *editor) { - if (ME_WrapMarkedParagraphs(editor)) + if (ME_WrapMarkedParagraphs(editor, NULL)) { ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); @@ -118,7 +118,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) /* Should be called whenever the contents of the control have changed */ BOOL wrappedParagraphs; - wrappedParagraphs = ME_WrapMarkedParagraphs(editor); + wrappedParagraphs = ME_WrapMarkedParagraphs(editor, NULL); if (wrappedParagraphs) ME_UpdateScrollBar(editor); @@ -145,7 +145,7 @@ ME_RewrapRepaint(ME_TextEditor *editor) * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); } @@ -1163,7 +1163,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) SCROLLINFO si; BOOL bScrollBarWasVisible, bScrollBarWillBeVisible; - if (ME_WrapMarkedParagraphs(editor)) + if (ME_WrapMarkedParagraphs(editor, NULL)) FIXME("ME_UpdateScrollBar had to call ME_WrapMarkedParagraphs\n"); si.cbSize = sizeof(si); @@ -1336,7 +1336,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) there's no (inverted) area to be repainted, neither old nor new */ if (nStart == nEnd && editor->nLastSelStart == editor->nLastSelEnd) return; - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_GetSelectionParas(editor, &sel_start, &sel_end); assert(sel_start->type == diParagraph); assert(sel_end->type == diParagraph); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 4cd77eb399..5457935dfa 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -499,7 +499,7 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); return; } } @@ -544,7 +544,7 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); return; } } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e3a70f07d1..4c92252547 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -980,14 +980,21 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } -BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) +BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor, HDC hdc) { ME_DisplayItem *item; ME_Context c; int totalWidth = 0; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + if (!hdc) + hdc = ITextHost_TxGetDC(editor->texthost); + if (hdc != editor->hdcDraw) + { + ME_MarkAllForWrapping(editor); + editor->hdcDraw = hdc; + } + ME_InitContext(&c, editor, hdc); c.pt.x = 0; item = editor->pBuffer->pFirst->next; while(item != editor->pBuffer->pLast) { -- 2.17.1

2 1

[PATCH 1/4 v5] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().
by Jactry Zeng 07 Jun '18

07 Jun '18

Superseded patch 146570. ChangeLog: v5: - Use DrawTextW for calculating expected values; - Simplify format setting with EM_SETCHARFORMAT. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 125 +++++++++++++++++------------------ 1 file changed, 61 insertions(+), 64 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 88b5adf13c..6e61392dc5 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -697,81 +697,78 @@ static void test_TxSetText(void) ITextHost_Release(host); } +#define CHECK_TXGETNATURALSIZE(res,width,height,hdc,string) \ + _check_txgetnaturalsize(res, width, height, hdc, string, __LINE__) +static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hdc, LPCWSTR string, int line) +{ + RECT rect; + LONG expected_width, expected_height; + + GetClientRect(WindowFromDC(hdc), &rect); + DrawTextW(hdc, string, -1, &rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); + expected_width = rect.right - rect.left; + expected_height = rect.bottom - rect.top; + ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", res); + ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); + ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", + height, expected_height); +} + static void test_TxGetNaturalSize(void) { ITextServices *txtserv; ITextHost *host; HRESULT result; - BOOL ret; - - /* This value is used when calling TxGetNaturalSize. MSDN says - that this is not supported however a null pointer cannot be - used as it will cause a segmentation violation. The values in - the structure being pointed to are required to be INT_MAX - otherwise calculations can give wrong values. */ - const SIZEL psizelExtent = {INT_MAX,INT_MAX}; - - static const WCHAR oneA[] = {'A',0}; - - /* Results of measurements */ - LONG xdim, ydim; - - /* The device context to do the tests in */ + SIZEL psizelExtent = {-1,-1}; + static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + LONG width, height; HDC hdcDraw; - - /* Variables with the text metric information */ - INT charwidth_caps_text[26]; - TEXTMETRICA tmInfo_text; + HWND hwnd; + RECT rect; + CHARFORMAT2W cf; + LRESULT lresult; + HFONT hf; + LOGFONTW lf; if (!init_texthost(&txtserv, &host)) return; - hdcDraw = GetDC(NULL); - SaveDC(hdcDraw); - - /* Populate the metric strucs */ - SetMapMode(hdcDraw,MM_TEXT); - GetTextMetricsA(hdcDraw, &tmInfo_text); - SetLastError(0xdeadbeef); - ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("GetCharWidth32 is not available\n"); - goto cleanup; - } - - /* Make measurements in MM_TEXT */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 100, 100, 0, 0, 0, NULL); + hdcDraw = GetDC(hwnd); SetMapMode(hdcDraw,MM_TEXT); - xdim = 0; ydim = 0; - - result = ITextServices_TxSetText(txtserv, oneA); - ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); - if (result != S_OK) { - skip("Could not set text\n"); - goto cleanup; - } - - SetLastError(0xdeadbeef); - result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, - hdcDraw, NULL, NULL, - TXTNS_FITTOCONTENT, &psizelExtent, - &xdim, &ydim); - todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ - "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); - if (result == S_OK) { - todo_wine ok(ydim == tmInfo_text.tmHeight, - "Height calculated incorrectly (expected %d, got %d)\n", - tmInfo_text.tmHeight, ydim); - /* The native DLL adds one pixel extra when calculating widths. */ - todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, - "Width calculated incorrectly (expected %d {+1}, got %d)\n", - charwidth_caps_text[0], xdim); - } else - skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", - xdim, ydim, result, GetLastError()); - -cleanup: - RestoreDC(hdcDraw,1); - ReleaseDC(NULL,hdcDraw); + GetClientRect(hwnd, &rect); + + memset(&cf, 0, sizeof(cf)); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_ALL2; + hf = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(hf, sizeof(LOGFONTW), &lf); + lstrcpyW(cf.szFaceName, lf.lfFaceName); + cf.yHeight = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + if (lf.lfWeight > FW_NORMAL) cf.dwEffects |= CFE_BOLD; + if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; + if (lf.lfUnderline) cf.dwEffects |= CFE_UNDERLINE; + if (lf.lfStrikeOut) cf.dwEffects |= CFE_SUBSCRIPT; + cf.bPitchAndFamily = lf.lfPitchAndFamily; + cf.bCharSet = lf.lfCharSet; + result = ITextServices_TxSendMessage(txtserv, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + SelectObject(hdcDraw, hf); + + result = ITextServices_TxSetText(txtserv, test_text); + ok(result == S_OK, "ITextServices_TxSetText failed: 0x%08x.\n", result); + + psizelExtent.cx = -1; psizelExtent.cy = -1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, test_text); + + ReleaseDC(hwnd, hdcDraw); + DestroyWindow(hwnd); ITextServices_Release(txtserv); ITextHost_Release(host); } -- 2.17.1

3 4

[PATCH 2/4 v5] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng 07 Jun '18

07 Jun '18

Superseded patch 146571. ChangeLog: v5: - Remove an unnecessary newline. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 5 ++++ dlls/riched20/tests/txtsrv.c | 58 +++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..ffb017c123 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,6 +36,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; CHARFORMAT2W cf; + const CHARFORMATW *host_cf; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -44,6 +45,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Style *style; int eol_len; WCHAR cr_lf[] = {'\r','\n',0}; + HRESULT hr; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); @@ -73,6 +75,9 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) cf.bCharSet = lf.lfCharSet; cf.lcid = GetSystemDefaultLCID(); + hr = ITextHost_TxGetCharFormat(editor->texthost, (const CHARFORMATW **)&host_cf); + if (hr == S_OK && (host_cf->cbSize >= sizeof(CHARFORMATW))) + ME_ToCF2W(&cf, (CHARFORMAT2W *)host_cf); style = ME_MakeStyle(&cf); text->pDefaultStyle = style; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 6e61392dc5..ac06aa868e 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMATW char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = &This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -609,6 +611,8 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + LOGFONTW lf; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -617,6 +621,19 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_FACE | CFM_SIZE | CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT; + hf = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(hf, sizeof(LOGFONTW), &lf); + lstrcpyW(dummyTextHost->char_format.szFaceName, lf.lfFaceName); + dummyTextHost->char_format.yHeight = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + if (lf.lfWeight > FW_NORMAL) dummyTextHost->char_format.dwEffects |= CFE_BOLD; + if (lf.lfItalic) dummyTextHost->char_format.dwEffects |= CFE_ITALIC; + if (lf.lfUnderline) dummyTextHost->char_format.dwEffects |= CFE_UNDERLINE; + if (lf.lfStrikeOut) dummyTextHost->char_format.dwEffects |= CFE_SUBSCRIPT; + dummyTextHost->char_format.bPitchAndFamily = lf.lfPitchAndFamily; + dummyTextHost->char_format.bCharSet = lf.lfCharSet; /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -947,6 +964,44 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + HFONT hf; + LOGFONTW lf; + LONG expected_height; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + hf = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(hf, sizeof(LOGFONTW), &lf); + expected_height = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + ok(!lstrcmpW(lf.lfFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == expected_height, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, expected_height); + if (lf.lfWeight > FW_NORMAL) + ok(cf2.dwEffects & CFE_BOLD, "got dwEffects without CFE_BOLD: %x.\n", cf2.dwEffects); + if (lf.lfItalic) + ok(cf2.dwEffects & CFE_ITALIC, "got dwEffects without CFE_ITALIC: %x.\n", cf2.dwEffects); + if (lf.lfUnderline) + ok(cf2.dwEffects & CFE_UNDERLINE, "got dwEffects without CFE_UNDERLINE: %x.\n", cf2.dwEffects); + if (lf.lfStrikeOut) + ok(cf2.dwEffects & CFE_STRIKEOUT, "got dwEffects without CFE_STRIKEOUT: %x.\n", cf2.dwEffects); + ok(cf2.bPitchAndFamily == lf.lfPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, lf.lfPitchAndFamily); + ok(cf2.bCharSet == lf.lfCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, lf.lfCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -977,6 +1032,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.17.1

2 1

[PATCH 1/2] schedsvc: Load job files at the service start up.
by Dmitry Timoshkov 07 Jun '18

07 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 2 ++ 3 files changed, 44 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 91ef3edca0..da837d8a8e 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -617,6 +617,47 @@ void add_job(const WCHAR *name) LeaveCriticalSection(&at_job_list_section); } +static inline BOOL is_file(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + +void load_at_tasks(void) +{ + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR allW[] = { '*',0 }; + WCHAR windir[MAX_PATH], path[MAX_PATH]; + WIN32_FIND_DATAW data; + HANDLE handle; + + GetWindowsDirectoryW(windir, MAX_PATH); + lstrcpyW(path, windir); + lstrcatW(path, tasksW); + lstrcatW(path, allW); + + handle = FindFirstFileW(path, &data); + if (handle == INVALID_HANDLE_VALUE) return; + + do + { + if (is_file(&data)) + { + lstrcpyW(path, windir); + lstrcatW(path, tasksW); + + if (lstrlenW(path) + lstrlenW(data.cFileName) < MAX_PATH) + { + lstrcatW(path, data.cFileName); + add_job(path); + } + else + FIXME("too long file name %s\n", debugstr_w(data.cFileName)); + } + } while (FindNextFileW(handle, &data)); + + FindClose(handle); +} + static BOOL write_signature(HANDLE hfile) { struct diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index d601030e78..10892d55ca 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -30,6 +30,7 @@ void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; void update_process_status(DWORD pid) DECLSPEC_HIDDEN; BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; void check_task_time(void) DECLSPEC_HIDDEN; +void load_at_tasks(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 0dfac818fd..2bba674b07 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -53,6 +53,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) TRACE("Starting...\n"); + load_at_tasks(); + htimer = CreateWaitableTimerW(NULL, FALSE, NULL); if (htimer == NULL) { -- 2.16.3

1 1

[PATCH 1/4] wsdapi: Add support for listening for UDP multicast broadcasts.
by Owen Rudge 07 Jun '18

07 Jun '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 278 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/wsdapi_internal.h | 4 + 2 files changed, 281 insertions(+), 1 deletion(-)

2 1

[PATCH 2/2] schedsvc: Add support for running missed tasks at the service start.
by Dmitry Timoshkov 07 Jun '18

07 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 24 ++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 1 + 3 files changed, 26 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index da837d8a8e..6c6e3e109e 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -1033,6 +1033,30 @@ void check_task_time(void) LeaveCriticalSection(&at_job_list_section); } +void check_missed_task_time(void) +{ + FILETIME current_ft, last_ft; + struct job_t *job; + + GetSystemTimeAsFileTime(&current_ft); + FileTimeToLocalFileTime(&current_ft, &current_ft); + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (SystemTimeToFileTime(&job->data.last_runtime, &last_ft)) + { + if (job_runs_at(job, &last_ft, &current_ft)) + { + run_job(job); + } + } + } + + LeaveCriticalSection(&at_job_list_section); +} + void remove_job(const WCHAR *name) { struct job_t *job; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 10892d55ca..117c6f51ed 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -31,6 +31,7 @@ void update_process_status(DWORD pid) DECLSPEC_HIDDEN; BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; void check_task_time(void) DECLSPEC_HIDDEN; void load_at_tasks(void) DECLSPEC_HIDDEN; +void check_missed_task_time(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 2bba674b07..8e23a049db 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -54,6 +54,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) TRACE("Starting...\n"); load_at_tasks(); + check_missed_task_time(); htimer = CreateWaitableTimerW(NULL, FALSE, NULL); if (htimer == NULL) -- 2.16.3

1 0

[PATCH 1/4] testbot: Handle staging at the Job level and avoid race conditions.
by Francois Gouget 06 Jun '18

06 Jun '18

When a patch or executable is submitted for testing it is stored in the staging directory for two reasons, first because the corresponding Job does not exist yet, and second because the process may not have write permissions to the Job directory. So far transfering the file to the Job directory was the responsibility of the Step that needs it. However this breaks down when more than one Step needs that file (e.g. a Windows executable build Step and a Wine testing one). There is also a (very unlikely) race condition between the scheduler and the Job creation: the Scheduler could run the first saved Task, mark it and the Job as completed before the Job's other Steps and Tasks get saved to the database. Those would then never get run since the Jobs has completed. So this patch makes staging the responsibility of the Job and introduces a staging Status for it. It also introduces a new Status which indicates the Job is still being set up to avoid race conditions. Note that this patch preserves the Step-based staging mechanism for backward compatibility during the transition. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: * This requires updating the database schema and restarting the TestBot Engine and web server. * The following patches switch each Job creator to the new scheme. testbot/bin/CheckForWinetestUpdate.pl | 2 ++ testbot/ddl/update36.sql | 4 +++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Engine/Scheduler.pm | 30 ++++++++++++++++++++- testbot/lib/WineTestBot/Jobs.pm | 20 +++++++++++--- testbot/lib/WineTestBot/Patches.pm | 1 + testbot/web/Submit.pl | 1 + 7 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 testbot/ddl/update36.sql diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index f41148f12..17dab8236 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -200,6 +200,7 @@ sub AddJob($$$) # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); + $NewJob->Status("queued"); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); $NewJob->Remarks($Remarks); @@ -243,6 +244,7 @@ sub AddReconfigJob() # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); + $NewJob->Status("queued"); $NewJob->User(GetBatchUser()); $NewJob->Priority(3); $NewJob->Remarks($Remarks); diff --git a/testbot/ddl/update36.sql b/testbot/ddl/update36.sql new file mode 100644 index 000000000..2f4bf7fa2 --- /dev/null +++ b/testbot/ddl/update36.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Status ENUM('new', 'staging', 'queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 9a28385a9..1e7b1edd1 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -113,7 +113,7 @@ CREATE TABLE Jobs BranchName VARCHAR(20) NOT NULL, UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, - Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL, + Status ENUM('new', 'staging', 'queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL, Remarks VARCHAR(128) NULL, Submitted DATETIME NOT NULL, Ended DATETIME NULL, diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 10c0b70ed..85bc0f397 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -30,6 +30,8 @@ WineTestBot::Engine::Scheduler - Schedules the TestBot tasks use Exporter 'import'; our @EXPORT = qw(ScheduleJobs CheckJobs); +use File::Copy; + use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Jobs; @@ -524,11 +526,37 @@ sub _ScheduleTasks($) # Process the jobs in decreasing priority order my $JobRank; my $Jobs = CreateJobs($Sched->{VMs}); - $Jobs->AddFilter("Status", ["queued", "running"]); + $Jobs->AddFilter("Status", ["staging", "queued", "running"]); foreach my $Job (sort CompareJobPriority @{$Jobs->GetItems()}) { $JobRank++; + if ($Job->Status eq "staging") + { + # Move the file(s) from the staging directory to the job directory + my %Staged; + my $JobDir = $Job->CreateDir(); + foreach my $Step (@{$Job->Steps->Clone()->GetItems()}) + { + # Ignore steps that need a file provided by the previous step + next if ($Step->PreviousNo or !defined $Step->FileName); + # Skip the step if its file has already been staged + next if ($Staged{$Step->FileName}); + + my $StagingFile = "job". $Job->Id ."_". $Step->FileName; + if (move("$DataDir/staging/$StagingFile", "$JobDir/". $Step->FileName)) + { + $Staged{$Step->FileName} = 1; + } + else + { + LogMsg "Could not move the '$StagingFile' staging file: $!"; + } + } + $Job->Status("queued"); + $Job->Save(); + } + # The per-step lists of VMs that should be getting ready to run # before we prepare the next step my %StepVMs = ("" => []); # no dependency for the first step diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 13a389586..3fd78aaa2 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2017 Francois Gouget +# Copyright 2012-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 @@ -52,7 +52,19 @@ A Job's lifecycle is as follows: =over =item * -A Job is created with Status set to queued which means it is ready to run. +A Job is created with Status set to new. During this time the process setting +up the Job can add new Steps and Tasks to it. It can also put the required +input files into place in the staging directory with a name of the form +'job<JobID>_<FileName>' where <JobId> is the Id of the new Job, and FileName is +the name of a file a Step depends on. + +=item * +Once the Job set up is complete its Status is set to staging. This indicates +that the TestBot Engine can retrieve the files it depends on from the staging +directory and move them to the Job's directory. + +=item * +Then the Status is set to queued which indicates the Job is ready to run. =item * As soon as one of the Step starts running, the Job's Status field is set to @@ -93,7 +105,7 @@ sub InitializeNew($$) my ($self, $Collection) = @_; $self->Branch(CreateBranches()->GetDefaultBranch()); - $self->Status("queued"); + $self->Status("new"); $self->Submitted(time()); $self->SUPER::InitializeNew($Collection); @@ -446,7 +458,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), - CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), + CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['new', 'staging', 'queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d5be1b355..4f428133f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -166,6 +166,7 @@ sub Submit($$$) # Create a new job for this patch my $NewJob = $Jobs->Add(); + $NewJob->Status("queued"); $NewJob->User($User); $NewJob->Priority(6); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index ae69e7ce5..8e22621fd 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -774,6 +774,7 @@ sub OnSubmit($) # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); + $NewJob->Status("queued"); $NewJob->User($self->GetCurrentSession()->User); $NewJob->Priority(5); if ($self->GetParam("Remarks")) -- 2.17.0

1 3

[PATCH] testbot: Also mark the VM for maintenance if the reverts get stuck.
by Francois Gouget 06 Jun '18

06 Jun '18

When a VM takes a long time to revert the LibvirtTool.pl process typically remains stuck in the Sys::Virt::DomainSnapshot::revert_to() call and cannot enforce the timeout itself, thus causing the timeout to be detected at the TestBot Engine level. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Live QEmu snapshots are still unusable when when the clock is set to the LibVirt default, that is: <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> <timer name='hpet' present='no'/> </clock> testbot/lib/WineTestBot/Engine/Scheduler.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index a191f0e1c..10c0b70ed 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -267,8 +267,15 @@ sub _CheckAndClassifyVMs() { # The child process got stuck! $FoundVMErrors = 1; + my $NewStatus = "dirty"; + if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") + { + my $Errors = ($VM->Errors || 0) + 1; + $VM->Errors($Errors); + $NewStatus = "maintenance" if ($Errors >= $MaxVMErrors); + } + $VM->Status($NewStatus); $VM->KillChild(); - $VM->Status("dirty"); $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror stuck process"); $Sched->{lambvms}->{$VMKey} = 1; -- 2.17.0

1 0

[PATCH 2/4] wsdapi: Add critical section around notification sinks.
by Owen Rudge 06 Jun '18

06 Jun '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 1 + 2 files changed, 10 insertions(+)

1 0

[PATCH] comctl32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Same object is generated with or without this patch when adding "-g0 -DNDEBUG -DWINETEST_NO_LINE_NUMBERS" to the CFLAGS. dlls/comctl32/tests/combo.c | 4 ++-- dlls/comctl32/tests/edit.c | 6 +++--- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/tests/ipaddress.c | 4 ++-- dlls/comctl32/tests/listbox.c | 2 +- dlls/comctl32/tests/listview.c | 14 +++++++------- dlls/comctl32/tests/monthcal.c | 7 +++---- dlls/comctl32/tests/mru.c | 4 ++-- dlls/comctl32/tests/progress.c | 2 +- dlls/comctl32/tests/rebar.c | 4 ++-- dlls/comctl32/tests/status.c | 2 +- dlls/comctl32/tests/taskdialog.c | 3 +-- dlls/comctl32/tests/toolbar.c | 16 ++++++++-------- dlls/comctl32/tests/tooltips.c | 4 ++-- dlls/comctl32/tests/treeview.c | 14 +++++++------- dlls/comctl32/tests/updown.c | 12 ++++++------ 17 files changed, 51 insertions(+), 53 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 83b36f212f..5fee206fd1 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -264,7 +264,7 @@ static void test_comboex_WM_LBUTTONDOWN(void) WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, hComboExParentWnd, NULL, hMainHinst, NULL); - for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ + for (i = 0; i < ARRAY_SIZE(choices); i++){ COMBOBOXEXITEMW cbexItem; wsprintfW(buffer, stringFormat, choices[i]); @@ -1169,7 +1169,7 @@ static void test_combo_dropdown_size(DWORD style) {15, 50, 3}, }; - for (test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + for (test = 0; test < ARRAY_SIZE(info_height); test++) { const struct list_size_info *info_test = &info_height[test]; int height_item; /* Height of a list item */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7e9e7e7634..a5097d1cbb 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2969,7 +2969,7 @@ static void test_EM_GETLINE(void) hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); - for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + for (i = 0; i < ARRAY_SIZE(hwnd); i++) { static const WCHAR strW[] = {'t','e','x','t',0}; static const char *str = "text"; @@ -2994,13 +2994,13 @@ static void test_EM_GETLINE(void) ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); memset(buffW, 0, sizeof(buffW)); - *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + *(WORD *)buffW = ARRAY_SIZE(buffW); r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); memset(buffW, 0, sizeof(buffW)); - *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + *(WORD *)buffW = ARRAY_SIZE(buffW); r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 7ea80519a6..3428936cd7 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1130,7 +1130,7 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - for (i = 0; i < sizeof(item_texts)/sizeof(item_texts[0]); i++) + for (i = 0; i < ARRAY_SIZE(item_texts); i++) { hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; hdItem.pszText = (char*)item_texts[i]; @@ -1170,7 +1170,7 @@ static void test_hdm_index_messages(HWND hParent) hdItem.mask = HDI_TEXT | HDI_WIDTH; hdItem.pszText = buffA; - hdItem.cchTextMax = sizeof(buffA)/sizeof(buffA[0]); + hdItem.cchTextMax = ARRAY_SIZE(buffA); retVal = SendMessageA(hChild, HDM_GETITEMA, 0, (LPARAM) &hdItem); ok(retVal == TRUE, "Getting the 1st header item should return TRUE, got %d\n", retVal); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 1c307e4ed3..3bb7902a13 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1096,7 +1096,7 @@ static void image_list_init(HIMAGELIST himl, INT grow) check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, grow, ILC_COLOR24, "total 0"); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { image_list_add_bitmap(himl, td[i].grey, i + 1); check_iml_data(himl, td[i].cx, td[i].cy, td[i].cur, td[i].max, grow, td[i].bpp, td[i].comment); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 52581899a7..cc79b7bf11 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -50,12 +50,12 @@ static void test_get_set_text(void) } /* check text just after creation */ - r = GetWindowTextA(hwnd, ip, sizeof(ip)/sizeof(CHAR)); + r = GetWindowTextA(hwnd, ip, ARRAY_SIZE(ip)); expect(7, r); ok(strcmp(ip, "0.0.0.0") == 0, "Expected null IP address, got %s\n", ip); SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(127, 0, 0, 1)); - r = GetWindowTextA(hwnd, ip, sizeof(ip)/sizeof(CHAR)); + r = GetWindowTextA(hwnd, ip, ARRAY_SIZE(ip)); expect(9, r); ok(strcmp(ip, "127.0.0.1") == 0, "Expected 127.0.0.1, got %s\n", ip); diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 1513bea7f5..f44fdff77f 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -48,7 +48,7 @@ static int strcmp_aw(LPCWSTR strw, const char *stra) WCHAR buf[1024]; if (!stra) return 1; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c2d33c41f5..e9b715ee41 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2328,7 +2328,7 @@ static void test_multiselect(void) r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); ok(r == 0, "got %d\n", r); - for (i = 0; i < sizeof(task_list)/sizeof(task_list[0]); i++) { + for (i = 0; i < ARRAY_SIZE(task_list); i++) { DWORD selected_count; LVITEMA item; @@ -3481,7 +3481,7 @@ static void test_norecompute(void) item.mask = LVIF_TEXT | LVIF_NORECOMPUTE; item.iItem = 0; item.pszText = buff; - item.cchTextMax = sizeof(buff)/sizeof(CHAR); + item.cchTextMax = ARRAY_SIZE(buff); res = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, res); ok(lstrcmpA(buff, testA) == 0, "Expected (%s), got (%s)\n", testA, buff); @@ -3495,7 +3495,7 @@ static void test_norecompute(void) item.mask = LVIF_TEXT | LVIF_NORECOMPUTE; item.iItem = 1; item.pszText = buff; - item.cchTextMax = sizeof(buff)/sizeof(CHAR); + item.cchTextMax = ARRAY_SIZE(buff); flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); @@ -3520,7 +3520,7 @@ static void test_norecompute(void) item.mask = LVIF_TEXT | LVIF_NORECOMPUTE; item.iItem = 0; item.pszText = buff; - item.cchTextMax = sizeof(buff)/sizeof(CHAR); + item.cchTextMax = ARRAY_SIZE(buff); flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, res); @@ -4662,7 +4662,7 @@ static void test_canceleditlabel(void) ok(!IsWindow(hwndedit), "Expected edit control to be destroyed\n"); memset(&itema, 0, sizeof(itema)); itema.pszText = buff; - itema.cchTextMax = sizeof(buff)/sizeof(CHAR); + itema.cchTextMax = ARRAY_SIZE(buff); ret = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&itema); expect(5, ret); ok(strcmp(buff, test1) == 0, "Expected label text not to change\n"); @@ -5658,7 +5658,7 @@ static void test_dispinfo(void) g_disp_A_to_W = TRUE; item.pszText = (char*)buff; - item.cchTextMax = sizeof(buff)/sizeof(WCHAR); + item.cchTextMax = ARRAY_SIZE(buff); ret = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); ok(ret == sizeof(testA)-1, "got %d, expected 4\n", ret); g_disp_A_to_W = FALSE; @@ -6177,7 +6177,7 @@ static void test_state_image(void) }; int i; - for (i = 0; i < sizeof(styles)/sizeof(styles[0]); i++) + for (i = 0; i < ARRAY_SIZE(styles); i++) { static char text[] = "Item"; static char subtext[] = "Subitem"; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 85822a320c..7c78540333 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1216,7 +1216,7 @@ if (0) } else { title_index++; - if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) + if (ARRAY_SIZE(title_hits) <= title_index) break; todo_wine_if(title_hits[title_index].todo) @@ -1241,8 +1241,7 @@ if (0) todo_wine ok(month_count + year_count >= 1, "Not enough month and year items\n"); - ok(r.right <= x && title_index + 1 == sizeof(title_hits) / sizeof(title_hits[0]), - "Wrong title layout\n"); + ok(r.right <= x && title_index + 1 == ARRAY_SIZE(title_hits), "Wrong title layout\n"); DestroyWindow(hwnd); } @@ -2016,7 +2015,7 @@ static void test_sel_notify(void) }; int i; - for(i = 0; i < sizeof styles / sizeof styles[0]; i++) + for(i = 0; i < ARRAY_SIZE(styles); i++) { hwnd = create_monthcal_control(styles[i].val); SetWindowLongPtrA(hwnd, GWLP_ID, SEL_NOTIFY_TEST_ID); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index dfad6f859d..b3d3e7a265 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -118,7 +118,7 @@ static LSTATUS mru_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) dwMaxSubkeyLen++; dwMaxValueLen++; dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); - if (dwMaxLen > sizeof(szNameBuf)/sizeof(CHAR)) + if (dwMaxLen > ARRAY_SIZE(szNameBuf)) { /* Name too big: alloc a buffer for it */ if (!(lpszName = heap_alloc(dwMaxLen * sizeof(CHAR)))) @@ -480,7 +480,7 @@ static void test_CreateMRUListLazyA(void) return; } - for (i = 0; i < sizeof(create_lazyA)/sizeof(create_lazya_t); i++) + for (i = 0; i < ARRAY_SIZE(create_lazyA); i++) { const create_lazya_t *ptr = &create_lazyA[i]; HANDLE hMRU; diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index b911021be0..497cb47d3c 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -258,7 +258,7 @@ static void test_PBM_STEPIT(void) HWND progress; int i, j; - for (i = 0; i < sizeof(stepit_tests)/sizeof(stepit_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(stepit_tests); i++) { struct stepit_test *test = &stepit_tests[i]; LRESULT ret; diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 7dae3a7dbe..3b1be77497 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -826,7 +826,7 @@ static DWORD resize_numtests = 0; RECT r; \ int value; \ const rbresize_test_result_t *res = &resize_results[resize_numtests++]; \ - assert(resize_numtests <= sizeof(resize_results)/sizeof(resize_results[0])); \ + assert(resize_numtests <= ARRAY_SIZE(resize_results)); \ GetWindowRect(hRebar, &r); \ MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); \ if ((dwStyles[i] & (CCS_NOPARENTALIGN|CCS_NODIVIDER)) == CCS_NOPARENTALIGN) {\ @@ -853,7 +853,7 @@ static void test_resize(void) CCS_TOP | WS_BORDER, CCS_NOPARENTALIGN | CCS_NODIVIDER | WS_BORDER, CCS_NORESIZE | WS_BORDER, CCS_NOMOVEY | WS_BORDER}; - const int styles_count = sizeof(dwStyles) / sizeof(dwStyles[0]); + const int styles_count = ARRAY_SIZE(dwStyles); int i; for (i = 0; i < styles_count; i++) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 2308974761..d78bd20262 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -127,7 +127,7 @@ static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEXA *enumlf, NEWTEXTME if (type != TRUETYPE_FONTTYPE) facename = enumlf->elfLogFont.lfFaceName; - for (i = 0; i < sizeof(sizes)/sizeof(sizes[0]); i++) + for (i = 0; i < ARRAY_SIZE(sizes); i++) { HFONT hFont; TEXTMETRICA tm; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 432b89bd15..cca700cd18 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -152,8 +152,7 @@ static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct } #define run_test(info, expect_button, seq, context) \ - run_test_(info, expect_button, seq, context, \ - sizeof(seq)/sizeof(seq[0]) - 1, __FILE__, __LINE__) + run_test_(info, expect_button, seq, context, ARRAY_SIZE(seq) - 1, __FILE__, __LINE__) static void run_test_(TASKDIALOGCONFIG *info, int expect_button, const struct message_info *test_messages, const char *context, int test_messages_len, const char *file, int line) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 5fd6133e1f..41807258f4 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -387,7 +387,7 @@ static void basic_test(void) WS_CHILD | TBSTYLE_LIST, 100, 0, NULL, 0, - buttons, sizeof(buttons)/sizeof(buttons[0]), + buttons, ARRAY_SIZE(buttons), 0, 0, 20, 16, sizeof(TBBUTTON)); ok(hToolbar != NULL, "Toolbar creation\n"); SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000"); @@ -1315,7 +1315,7 @@ static DWORD tbsize_alt_numtests = 0; compare(buttonCount, res->nButtons, "%d"); \ for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ - if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ + if (broken(tbsize_alt_numtests < ARRAY_SIZE(tbsize_alt_results) && \ EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ @@ -1939,13 +1939,13 @@ static void test_setrows(void) | CCS_NOMOVEY | CCS_TOP, 0, 0, NULL, 0, - buttons, sizeof(buttons)/sizeof(buttons[0]), + buttons, ARRAY_SIZE(buttons), 20, 20, 0, 0, sizeof(TBBUTTON)); ok(hToolbar != NULL, "Toolbar creation\n"); ok(SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); /* test setting rows to each of 1-10 with bLarger true and false */ - for (i=0; i<(sizeof(tbrows_results) / sizeof(tbrows_result_t)); i++) { + for (i=0; i<ARRAY_SIZE(tbrows_results); i++) { RECT rc; int rows; @@ -2058,7 +2058,7 @@ static void test_get_set_style(void) WS_CHILD | TBSTYLE_LIST, 100, 0, NULL, 0, - buttons, sizeof(buttons)/sizeof(buttons[0]), + buttons, ARRAY_SIZE(buttons), 0, 0, 20, 16, sizeof(TBBUTTON)); ok(hToolbar != NULL, "Toolbar creation\n"); SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000"); @@ -2276,7 +2276,7 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void) return; } - for (i = 0; i < sizeof(extended_style_test)/sizeof(extended_style_t); i++) + for (i = 0; i < ARRAY_SIZE(extended_style_test); i++) { ptr = &extended_style_test[i]; @@ -2397,7 +2397,7 @@ static void test_save(void) params.pszValueName = value; rebuild_toolbar_with_buttons( &wnd ); - SendMessageW( wnd, TB_ADDBUTTONSW, sizeof(more_btns) / sizeof(more_btns[0]), (LPARAM)more_btns ); + SendMessageW(wnd, TB_ADDBUTTONSW, ARRAY_SIZE(more_btns), (LPARAM)more_btns); flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageW( wnd, TB_SAVERESTOREW, TRUE, (LPARAM)&params ); @@ -2423,7 +2423,7 @@ static void test_save(void) ok( res, "restoring failed\n" ); ok_sequence(sequences, PARENT_SEQ_INDEX, restore_parent_seq, "restore", FALSE); count = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); - ok( count == sizeof(expect_btns) / sizeof(expect_btns[0]), "got %d\n", count ); + ok( count == ARRAY_SIZE(expect_btns), "got %d\n", count ); for (i = 0; i < count; i++) { diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index af95a569bb..0cb7afd688 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -183,7 +183,7 @@ static void test_customdraw(void) { GetCursorPos(&orig_pos); for (iterationNumber = 0; - iterationNumber < sizeof(expectedResults)/sizeof(expectedResults[0]); + iterationNumber < ARRAY_SIZE(expectedResults); iterationNumber++) { HWND parent, hwndTip; @@ -821,7 +821,7 @@ static void test_longtextW(void) toolinfoW.hinst = GetModuleHandleW(NULL); toolinfoW.uFlags = 0; toolinfoW.uId = 0x1234ABCD; - MultiByteToWideChar(CP_ACP, 0, longtextA, -1, bufW, sizeof(bufW)/sizeof(bufW[0])); + MultiByteToWideChar(CP_ACP, 0, longtextA, -1, bufW, ARRAY_SIZE(bufW)); lenW = lstrlenW(bufW); toolinfoW.lpszText = bufW; toolinfoW.lParam = 0xdeadbeef; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5cf397f3af..33edaaf4b4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -527,7 +527,7 @@ static void test_callback(void) tvi.hItem = hRoot; tvi.mask = TVIF_TEXT; tvi.pszText = buf; - tvi.cchTextMax = sizeof(buf)/sizeof(buf[0]); + tvi.cchTextMax = ARRAY_SIZE(buf); ret = TreeView_GetItemA(hTree, &tvi); expect(TRUE, ret); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Callback item text mismatch %s vs %s\n", @@ -706,7 +706,7 @@ static void test_getitemtext(void) HWND hTree; CHAR szBuffer[80] = "Blah"; - int nBufferSize = sizeof(szBuffer)/sizeof(CHAR); + int nBufferSize = ARRAY_SIZE(szBuffer); hTree = create_treeview_control(0); fill_tree(hTree); @@ -1630,7 +1630,7 @@ static void test_itemedit(void) item.mask = TVIF_TEXT; item.hItem = hRoot; item.pszText = buffA; - item.cchTextMax = sizeof(buffA)/sizeof(CHAR); + item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); ok(!strcmp("x", buffA), "Expected item text to change\n"); @@ -1664,7 +1664,7 @@ static void test_itemedit(void) ok(IsWindow(edit), "Expected valid handle\n"); g_beginedit_alter_text = FALSE; - GetWindowTextA(edit, buffA, sizeof(buffA)/sizeof(CHAR)); + GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); ok(!strcmp(buffA, "<edittextaltered>"), "got string %s\n", buffA); DestroyWindow(hTree); @@ -1991,7 +1991,7 @@ static void test_TVS_SINGLEEXPAND(void) SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_SINGLEEXPAND); /* to avoid painting related notifications */ ShowWindow(hTree, SW_HIDE); - for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + for (i = 0; i < ARRAY_SIZE(items); i++) { ins.hParent = items[i].parent ? *items[i].parent : TVI_ROOT; ins.hInsertAfter = TVI_FIRST; @@ -2000,7 +2000,7 @@ static void test_TVS_SINGLEEXPAND(void) *items[i].handle = TreeView_InsertItemA(hTree, &ins); } - for (i = 0; i < sizeof(sequence_tests)/sizeof(sequence_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(sequence_tests); i++) { flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)(*sequence_tests[i].select)); @@ -2009,7 +2009,7 @@ static void test_TVS_SINGLEEXPAND(void) ok_sequence(sequences, PARENT_SEQ_INDEX, sequence_tests[i].sequence, context, FALSE); } - for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + for (i = 0; i < ARRAY_SIZE(items); i++) { ret = SendMessageA(hTree, TVM_GETITEMSTATE, (WPARAM)(*items[i].handle), 0xFFFF); ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index f549c41583..1f4e38f0eb 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -697,13 +697,13 @@ static void test_updown_base(void) r = SendMessageA(updown, UDM_SETPOS, 0, 10); expect(50, r); - GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); ok(lstrcmpA(text, "10") == 0, "Expected '10', got '%s'\n", text); r = SendMessageA(updown, UDM_SETBASE, 16, 0); expect(10, r); - GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); /* FIXME: currently hex output isn't properly formatted, but for this test only change from initial text matters */ ok(lstrcmpA(text, "10") != 0, "Expected '0x000A', got '%s'\n", text); @@ -837,20 +837,20 @@ static void test_UDS_SETBUDDYINT(void) style = GetWindowLongA(updown, GWL_STYLE); ok(style & UDS_SETBUDDYINT, "Expected UDS_SETBUDDY to be set\n"); SendMessageA(updown, UDM_SETPOS, 0, 20); - GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); ok(lstrlenA(text) == 0, "Expected empty string\n"); DestroyWindow(updown); /* creating with UDS_SETBUDDYINT */ updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT, g_edit); - GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); /* 50 is initial value here */ ok(lstrcmpA(text, "50") == 0, "Expected '50', got '%s'\n", text); /* now remove style flag */ style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style & ~UDS_SETBUDDYINT); SendMessageA(updown, UDM_SETPOS, 0, 20); - GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); ok(lstrcmpA(text, "20") == 0, "Expected '20', got '%s'\n", text); /* set edit text directly, check position */ strcpy(text, "10"); @@ -872,7 +872,7 @@ static void test_UDS_SETBUDDYINT(void) style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT); SendMessageA(updown, UDM_SETPOS, 0, 30); - GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); ok(lstrcmpA(text, "30") == 0, "Expected '30', got '%s'\n", text); DestroyWindow(updown); } -- 2.14.4

2 1

[PATCH] comctl32/taskdialog/tests: Add a basic taskdialog creator as interactive test
by Fabian Maurer 06 Jun '18

06 Jun '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/resources.h | 5 +++ dlls/comctl32/tests/rsrc.rc | 17 +++++++++ dlls/comctl32/tests/taskdialog.c | 62 ++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 3a89cd7baf..0e4ff6702c 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -48,4 +48,9 @@ #define IDC_PS_COMBO1 1020 #define IDC_PS_PUSHBUTTON1 1021 +#define IDC_TASKDIALOG_CREATE 1030 +#define IDC_TASKDIALOG_TEXT_TITLE 1031 +#define IDC_TASKDIALOG_TEXT_MAIN 1032 +#define IDC_TASKDIALOG_TEXT_CONTENT 1033 + #endif /* __WINE_COMCTL32_TEST_RESOURCES_H */ diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 959130e2f1..fad3f71858 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -173,3 +173,20 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN } + +TAKDIALOG_CREATOR DIALOG 0, 0, 600, 500 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Taskdialog Creator" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER + EDITTEXT IDC_TASKDIALOG_TEXT_TITLE, 75, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN + + LTEXT "Main Instruction:", -1, 5, 25, 70, 50, BS_CENTER + EDITTEXT IDC_TASKDIALOG_TEXT_MAIN, 75, 25, 450, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + + LTEXT "Content:", -1, 5, 80, 70, 50, BS_CENTER + EDITTEXT IDC_TASKDIALOG_TEXT_CONTENT, 75, 80, 450, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + + PUSHBUTTON "Create Taskdialog", IDC_TASKDIALOG_CREATE, 260, 460, 80, 30, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 432b89bd15..3b78f4fbf7 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -28,6 +28,7 @@ #include "wine/test.h" #include "v6util.h" #include "msg.h" +#include "resources.h" #define WM_TD_CALLBACK (WM_APP) /* Custom dummy message to wrap callback notifications */ @@ -374,6 +375,61 @@ static void test_timer(void) pTaskDialogIndirect(&info, NULL, NULL, NULL); } +/* Caller must free the buffer */ +static WCHAR* control_get_text(HWND hdlg, int id_control) +{ + HWND hwnd_control = GetDlgItem(hdlg, id_control); + int text_length = GetWindowTextLengthW(hwnd_control); + WCHAR *text = heap_alloc((text_length + 1) * sizeof(WCHAR)); + GetWindowTextW(hwnd_control, text, text_length + 1); + return text; +} + +static void taskdialog_creator_create(HWND hdlg) +{ + TASKDIALOGCONFIG info = { 0 }; + WCHAR *text_title; + WCHAR *text_main_instruction; + WCHAR *text_content; + + text_title = control_get_text(hdlg, IDC_TASKDIALOG_TEXT_TITLE); + text_main_instruction = control_get_text(hdlg, IDC_TASKDIALOG_TEXT_MAIN); + text_content = control_get_text(hdlg, IDC_TASKDIALOG_TEXT_CONTENT); + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.hwndParent = hdlg; + info.pszWindowTitle = text_title; + info.pszMainInstruction = text_main_instruction; + info.pszContent = text_content; + + pTaskDialogIndirect(&info, NULL, NULL, NULL); + + heap_free(text_title); + heap_free(text_main_instruction); + heap_free(text_content); +} + +static INT_PTR CALLBACK taskdialog_creator_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED && LOWORD(wparam) == IDC_TASKDIALOG_CREATE) + { + taskdialog_creator_create(hdlg); + } + break; + case WM_CLOSE: + EndDialog(hdlg, 0); + break; + + default: + break; + } + + return FALSE; +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -405,6 +461,12 @@ START_TEST(taskdialog) ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect); + if (winetest_interactive) + { + DialogBoxParamA(GetModuleHandleA(NULL), "TAKDIALOG_CREATOR", NULL, taskdialog_creator_proc, 0); + return; + } + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_invalid_parameters(); -- 2.17.1

3 4

[PATCH v2] comctl32/edit/tests: Add interactive test showing a rendering glitch
by Fabian Maurer 06 Jun '18

06 Jun '18

v2: Only run test when WINETEST_INTERACTIVE is set Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/edit.c | 35 +++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 12 ++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7e9e7e7634..fa8ded377d 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3094,6 +3094,36 @@ static void test_change_focus(void) DestroyWindow(hwnd); } +static INT_PTR CALLBACK dialog_proc_interactive(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED) + { + EndDialog(hdlg, LOWORD(wparam)); + } + break; + case WM_CLOSE: + EndDialog(hdlg, IDCANCEL); + break; + + default: + break; + } + + return FALSE; +} + +static void test_rendering_interactive(void) +{ + int button_clicked; + + button_clicked = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_OVERLAPPING_LABEL", NULL, dialog_proc_interactive, 0); + todo_wine + ok(button_clicked == IDOK, "Interactive test 'edit overlapping label' failed.\n"); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3139,6 +3169,11 @@ START_TEST(edit) test_wordbreak_proc(); test_change_focus(); + if (winetest_interactive) + { + test_rendering_interactive(); + } + UnregisterWindowClasses(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa225e1..959130e2f1 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,18 @@ FONT 8, "MS Shell Dlg" { } +EDIT_OVERLAPPING_LABEL DIALOG 0, 0, 200, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Does the edit box look alright?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER + EDITTEXT 1000, 60, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN + + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Broken", IDNO, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + STRINGTABLE { IDS_TBADD1 "abc" -- 2.17.1

3 4

[PATCH 2/2] kernel32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Just format_msg.c for now as the diff is huge. Same object is generated with or without this patch when adding "-g0 -DWINETEST_NO_LINE_NUMBERS" to the CFLAGS. dlls/kernel32/tests/format_msg.c | 408 ++++++++++++++++----------------------- 1 file changed, 164 insertions(+), 244 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 43e4d35c8a..57ee78af9e 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -136,8 +136,7 @@ static void test_message_from_string_wide(void) DWORD r, error; /* the basics */ - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); @@ -146,15 +145,13 @@ static void test_message_from_string_wide(void) { SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, out, ARRAY_SIZE(out), NULL); } /* empty string */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, empty, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, empty, 0, 0, out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==0, "succeeded: r=%d\n", r); @@ -163,8 +160,7 @@ static void test_message_from_string_wide(void) /* format placeholder with no specifier */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_null, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_null, 0, 0, out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be unchanged\n"); @@ -174,8 +170,7 @@ static void test_message_from_string_wide(void) /* test string with format placeholder with no specifier */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_tnull, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_tnull, 0, 0, out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(!memcmp(out, init_buf, sizeof(init_buf)) || broken(!memcmp(out, broken_buf, sizeof(broken_buf))), /* W2K3+ */ @@ -186,8 +181,7 @@ static void test_message_from_string_wide(void) /* insertion with no variadic arguments */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, 0, out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be unchanged\n"); @@ -197,7 +191,7 @@ static void test_message_from_string_wide(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + 0, out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be unchanged\n"); @@ -205,86 +199,72 @@ static void test_message_from_string_wide(void) ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); /* using the format feature */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1s, 0, - 0, out, sizeof(out)/sizeof(WCHAR), test); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1s, 0, 0, out, ARRAY_SIZE(out), test); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* no format */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, - 0, out, sizeof(out)/sizeof(WCHAR), test); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, 0, out, ARRAY_SIZE(out), test); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* two pieces */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_12, 0, - 0, out, sizeof(out)/sizeof(WCHAR), te, st); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_12, 0, 0, out, ARRAY_SIZE(out), te, st); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* three pieces */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123, 0, - 0, out, sizeof(out)/sizeof(WCHAR), t, s, e); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123, 0, 0, out, ARRAY_SIZE(out), t, s, e); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* s doesn't seem to work in format strings */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_s, 0, - 0, out, sizeof(out)/sizeof(WCHAR), test); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_s, 0, 0, out, ARRAY_SIZE(out), test); ok(!lstrcmpW(&fmt_s[1], out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==3, "failed: r=%d\n", r); /* nor ls */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_ls, 0, - 0, out, sizeof(out)/sizeof(WCHAR), test); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_ls, 0, 0, out, ARRAY_SIZE(out), test); ok(!lstrcmpW(&fmt_ls[1], out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); /* nor S */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_S, 0, - 0, out, sizeof(out)/sizeof(WCHAR), test); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_S, 0, 0, out, ARRAY_SIZE(out), test); ok(!lstrcmpW(&fmt_S[1], out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==3, "failed: r=%d\n", r); /* nor ws */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_ws, 0, - 0, out, sizeof(out)/sizeof(WCHAR), test); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_ws, 0, 0, out, ARRAY_SIZE(out), test); ok(!lstrcmpW(&fmt_ws[1], out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); /* as characters */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123c, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123c, 0, 0, out, ARRAY_SIZE(out), 't', 'e', 's'); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* lc is unicode */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123lc, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123lc, 0, 0, out, ARRAY_SIZE(out), 't', 'e', 's'); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* wc is unicode */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123wc, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123wc, 0, 0, out, ARRAY_SIZE(out), 't', 'e', 's'); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* C is unicode */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123C, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123C, 0, 0, out, ARRAY_SIZE(out), 't', 'e', 's'); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* some numbers */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123d, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 1, 2, 3); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123d, 0, 0, out, ARRAY_SIZE(out), 1, 2, 3); ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==3,"failed: r=%d\n", r); /* a single digit with some spacing */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 1); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, 0, out, ARRAY_SIZE(out), 1); ok(!lstrcmpW(s_14d, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); @@ -294,125 +274,105 @@ static void test_message_from_string_wide(void) ok(r==4,"failed: r=%d\n", r); /* two digit decimal number */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 11); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, 0, out, ARRAY_SIZE(out), 11); ok(!lstrcmpW(s_14d2, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* a hex number */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14x, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 11); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14x, 0, 0, out, ARRAY_SIZE(out), 11); ok(!lstrcmpW(s_14x, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* a hex number, upper case */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14X, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 11); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14X, 0, 0, out, ARRAY_SIZE(out), 11); ok(!lstrcmpW(s_14X, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* a hex number, upper case, left justified */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4X, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 11); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4X, 0, 0, out, ARRAY_SIZE(out), 11); ok(!lstrcmpW(s_1_4X, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* a long hex number, upper case */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14X, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 0x1ab); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14X, 0, 0, out, ARRAY_SIZE(out), 0x1ab); ok(!lstrcmpW(s_1AB, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* two percent... */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_2pct, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_2pct, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_2pct, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* periods are special cases */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_2dot1d, 0, - 0, out, sizeof(out)/sizeof(WCHAR), 0x1ab); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_2dot1d, 0, 0, out, ARRAY_SIZE(out), 0x1ab); ok(!lstrcmpW(s_2dot147, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==8,"failed: r=%d\n", r); /* %0 ends the line */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_t0t, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_t0t, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* %! prints an exclamation */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_yah, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_yah, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_yah, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* %space */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_space, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_space, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_space, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* %n yields \r\n, %r yields \r, %t yields \t */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_nrt, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_nrt, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_nrt, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* line feed */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_lf, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_lf, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_hi_crlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* carriage return line feed */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_crlf, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_crlf, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_hi_crlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* carriage return */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_cr, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_cr, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_crlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==2,"failed: r=%d\n", r); /* double carriage return line feed */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_crcrlf, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_crcrlf, 0, 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); /* null string as argument */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, - 0, out, sizeof(out)/sizeof(WCHAR), NULL); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, 0, out, ARRAY_SIZE(out), NULL); ok(!lstrcmpW(s_null, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==6,"failed: r=%d\n",r); /* precision and width */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, - 0, 0, out, sizeof(out)/sizeof(WCHAR), t ); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, 0, 0, out, ARRAY_SIZE(out), t ); ok(!lstrcmpW(s_spt, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==3, "failed: r=%d\n",r); - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1os, - 0, 0, out, sizeof(out)/sizeof(WCHAR), 4, t ); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1os, 0, 0, out, ARRAY_SIZE(out), 4, t ); ok(!lstrcmpW( s_sp3t, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n",r); - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_142u, - 0, 0, out, sizeof(out)/sizeof(WCHAR), 3 ); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_142u, 0, 0, out, ARRAY_SIZE(out), 3 ); ok(!lstrcmpW( s_sp03, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n",r); - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou, - 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1 ); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou, 0, 0, out, ARRAY_SIZE(out), 5, 3, 1 ); ok(!lstrcmpW( s_sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==5,"failed: r=%d\n",r); - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou1oou, - 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1, 4, 2 ); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou1oou, 0, 0, out, ARRAY_SIZE(out), + 5, 3, 1, 4, 2 ); ok(!lstrcmpW( s_sp001002, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==11,"failed: r=%d\n",r); - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou3oou, - 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1, 6, 4, 2 ); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou3oou, 0, 0, out, ARRAY_SIZE(out), + 5, 3, 1, 6, 4, 2 ); ok(!lstrcmpW( s_sp001sp002, out) || broken(!lstrcmpW(s_sp001004, out)), /* NT4/Win2k */ "failed out=[%s]\n", wine_dbgstr_w(out)); @@ -421,11 +381,11 @@ static void test_message_from_string_wide(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1oou1oou, - 0, 0, out, sizeof(out)/sizeof(WCHAR), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); ok(!lstrcmpW(s_sp002sp003, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==13,"failed: r=%d\n",r); r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1oou4oou, - 0, 0, out, sizeof(out)/sizeof(WCHAR), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); ok(!lstrcmpW(s_sp002sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==12,"failed: r=%d\n",r); } @@ -434,25 +394,25 @@ static void test_message_from_string_wide(void) /* line feed */ r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_hi_lf, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_hi_sp, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==3,"failed: r=%d\n", r); /* carriage return line feed */ r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_hi_crlf, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_hi_sp, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==3,"failed: r=%d\n", r); /* carriage return */ r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_cr, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_sp, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==1,"failed: r=%d\n", r); /* double carriage return line feed */ r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_crcrlf, 0, - 0, out, sizeof(out)/sizeof(WCHAR)); + 0, out, ARRAY_SIZE(out)); ok(!lstrcmpW(s_2sp, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==2,"failed: r=%d\n", r); } @@ -465,8 +425,7 @@ static void test_message_from_string(void) static const WCHAR szwTest[] = { 't','e','s','t',0}; /* the basics */ - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, - 0, out, sizeof(out)/sizeof(CHAR),NULL); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, 0, out, ARRAY_SIZE(out),NULL); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); @@ -475,15 +434,13 @@ static void test_message_from_string(void) { SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, out, ARRAY_SIZE(out), NULL); } /* empty string */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); ok(GetLastError()==0xdeadbeef, @@ -492,8 +449,7 @@ static void test_message_from_string(void) /* format placeholder with no specifier */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%", 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); @@ -503,8 +459,7 @@ static void test_message_from_string(void) /* test string with format placeholder with no specifier */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test%", 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test%", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); @@ -514,8 +469,7 @@ static void test_message_from_string(void) /* insertion with no variadic arguments */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%1", 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%1", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); ok(GetLastError()==ERROR_INVALID_PARAMETER, "last error %u\n", GetLastError()); @@ -523,194 +477,167 @@ static void test_message_from_string(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, "%1", 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); ok(GetLastError()==ERROR_INVALID_PARAMETER, "last error %u\n", GetLastError()); /* using the format feature */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, - 0, out, sizeof(out)/sizeof(CHAR), "test"); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* no format */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, - 0, out, sizeof(out)/sizeof(CHAR), "test"); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* two pieces */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1%2", 0, - 0, out, sizeof(out)/sizeof(CHAR), "te","st"); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1%2", 0, 0, out, ARRAY_SIZE(out), "te","st"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* three pieces */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1%3%2%1", 0, - 0, out, sizeof(out)/sizeof(CHAR), "t","s","e"); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1%3%2%1", 0, 0, out, ARRAY_SIZE(out), "t","s","e"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* s doesn't seem to work in format strings */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%!s!", 0, - 0, out, sizeof(out)/sizeof(CHAR), "test"); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%!s!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!strcmp("!s!", out),"failed out=[%s]\n",out); ok(r==3,"failed: r=%d\n",r); /* ls is unicode */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ls!", 0, - 0, out, sizeof(out)/sizeof(CHAR), szwTest); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ls!", 0, 0, out, ARRAY_SIZE(out), szwTest); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* S is unicode */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!S!", 0, - 0, out, sizeof(out)/sizeof(CHAR), szwTest); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!S!", 0, 0, out, ARRAY_SIZE(out), szwTest); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* ws is unicode */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ws!", 0, - 0, out, sizeof(out)/sizeof(CHAR), szwTest); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ws!", 0, 0, out, ARRAY_SIZE(out), szwTest); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* as characters */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!c!%2!c!%3!c!%1!c!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!c!%2!c!%3!c!%1!c!", 0, 0, out, ARRAY_SIZE(out), + 't','e','s'); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* lc is unicode */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!lc!%2!lc!%3!lc!%1!lc!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!lc!%2!lc!%3!lc!%1!lc!", 0, 0, out, ARRAY_SIZE(out), + 't','e','s'); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* wc is unicode */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!wc!%2!wc!%3!wc!%1!wc!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!wc!%2!wc!%3!wc!%1!wc!", 0, 0, out, ARRAY_SIZE(out), + 't','e','s'); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* C is unicode */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!C!%2!C!%3!C!%1!C!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!C!%2!C!%3!C!%1!C!", 0, 0, out, ARRAY_SIZE(out), + 't','e','s'); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* some numbers */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!d!%2!d!%3!d!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 1,2,3); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!d!%2!d!%3!d!", 0, 0, out, ARRAY_SIZE(out), 1,2,3); ok(!strcmp("123", out),"failed out=[%s]\n",out); ok(r==3,"failed: r=%d\n",r); /* a single digit with some spacing */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4d!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 1); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4d!", 0, 0, out, ARRAY_SIZE(out), 1); ok(!strcmp(" 1", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* a single digit, left justified */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!-4d!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 1); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!-4d!", 0, 0, out, ARRAY_SIZE(out), 1); ok(!strcmp("1 ", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* two digit decimal number */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4d!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 11); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4d!", 0, 0, out, ARRAY_SIZE(out), 11); ok(!strcmp(" 11", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* a hex number */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4x!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 11); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4x!", 0, 0, out, ARRAY_SIZE(out), 11); ok(!strcmp(" b", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* a hex number, upper case */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4X!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 11); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4X!", 0, 0, out, ARRAY_SIZE(out), 11); ok(!strcmp(" B", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* a hex number, upper case, left justified */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!-4X!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 11); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!-4X!", 0, 0, out, ARRAY_SIZE(out), 11); ok(!strcmp("B ", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* a long hex number, upper case */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4X!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 0x1ab); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4X!", 0, 0, out, ARRAY_SIZE(out), 0x1ab); ok(!strcmp(" 1AB", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* two percent... */ - r = doit(FORMAT_MESSAGE_FROM_STRING, " %%%% ", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, " %%%% ", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp(" %% ", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* periods are special cases */ - r = doit(FORMAT_MESSAGE_FROM_STRING, " %.%. %1!d!", 0, - 0, out, sizeof(out)/sizeof(CHAR), 0x1ab); + r = doit(FORMAT_MESSAGE_FROM_STRING, " %.%. %1!d!", 0, 0, out, ARRAY_SIZE(out), 0x1ab); ok(!strcmp(" .. 427", out),"failed out=[%s]\n",out); ok(r==7,"failed: r=%d\n",r); /* %0 ends the line */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "test%0test", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "test%0test", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* %! prints an exclamation */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "yah%!%0 ", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "yah%!%0 ", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("yah!", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* %space */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "% % ", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "% % ", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp(" ", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* %n yields \r\n, %r yields \r, %t yields \t */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%n%r%t", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%n%r%t", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("\r\n\r\t", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* line feed */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\n", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\n", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("hi\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* carriage return line feed */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\r\n", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\r\n", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("hi\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* carriage return */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "\r", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "\r", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("\r\n", out),"failed out=[%s]\n",out); ok(r==2,"failed: r=%d\n",r); /* double carriage return line feed */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "\r\r\n", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + r = doit(FORMAT_MESSAGE_FROM_STRING, "\r\r\n", 0, 0, out, ARRAY_SIZE(out)); ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* null string as argument */ - r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, - 0, out, sizeof(out)/sizeof(CHAR), NULL); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!strcmp("(null)", out),"failed out=[%s]\n",out); ok(r==6,"failed: r=%d\n",r); @@ -765,25 +692,25 @@ static void test_message_from_string(void) /* line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + 0, out, ARRAY_SIZE(out)); ok(!strcmp("hi ", out), "failed out=[%s]\n",out); ok(r==3, "failed: r=%d\n",r); /* carriage return line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + 0, out, ARRAY_SIZE(out)); ok(!strcmp("hi ", out),"failed out=[%s]\n",out); ok(r==3,"failed: r=%d\n",r); /* carriage return */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + 0, out, ARRAY_SIZE(out)); ok(!strcmp(" ", out),"failed out=[%s]\n",out); ok(r==1,"failed: r=%d\n",r); /* double carriage return line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r\r\n", 0, - 0, out, sizeof(out)/sizeof(CHAR)); + 0, out, ARRAY_SIZE(out)); ok(!strcmp(" ", out),"failed out=[%s]\n",out); ok(r==2,"failed: r=%d\n",r); } @@ -796,18 +723,18 @@ static void test_message_ignore_inserts(void) CHAR out[256]; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("test", out), "Expected output string \"test\", got %s\n", out); /* The %0 escape sequence is handled. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%0", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("test", out), "Expected output string \"test\", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%0test", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("test", out), "Expected output string \"test\", got %s\n", out); @@ -815,71 +742,67 @@ static void test_message_ignore_inserts(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%0test", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 17, "Expected FormatMessageA to return 17, got %d\n", ret); ok(!strcmp("test%1%2!*.*s!%99", out), "Expected output string \"test%%1%%2!*.*s!%%99\", got %s\n", out); /* Only the "%n", "%r", and "%t" escape sequences are processed. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%%% %.%!", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 8, "Expected FormatMessageA to return 8, got %d\n", ret); ok(!strcmp("%%% %.%!", out), "Expected output string \"%%%%%% %%.%%!\", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%n%r%t", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("\r\n\r\t", out), "Expected output string \"\\r\\n\\r\\t\", got %s\n", out); /* CRLF characters are processed normally. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "hi\n", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("hi\r\n", out), "Expected output string \"hi\\r\\n\", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "hi\r\n", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("hi\r\n", out), "Expected output string \"hi\\r\\n\", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "\r", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 2, "Expected FormatMessageA to return 2, got %d\n", ret); ok(!strcmp("\r\n", out), "Expected output string \"\\r\\n\", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "\r\r\n", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); ok(!strcmp("\r\n\r\n", out), "Expected output string \"\\r\\n\\r\\n\", got %s\n", out); /* The width parameter is handled the same also. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!strcmp("hi ", out), "Expected output string \"hi \", got %s\n", out); ok(ret == 3, "Expected FormatMessageA to return 3, got %d\n", ret); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\r\n", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 3, "Expected FormatMessageA to return 3, got %d\n", ret); ok(!strcmp("hi ", out), "Expected output string \"hi \", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 1, "Expected FormatMessageA to return 1, got %d\n", ret); ok(!strcmp(" ", out), "Expected output string \" \", got %s\n", out); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r\r\n", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r\r\n", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 2, "Expected FormatMessageA to return 2, got %d\n", ret); ok(!strcmp(" ", out), "Expected output string \" \", got %s\n", out); } @@ -911,89 +834,88 @@ static void test_message_ignore_inserts_wide(void) WCHAR out[256]; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(test, out), "Expected output string \"test\", got %s\n", wine_dbgstr_w(out)); /* The %0 escape sequence is handled. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t0, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(test, out), "Expected output string \"test\", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t0t, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(test, out), "Expected output string \"test\", got %s\n", wine_dbgstr_w(out)); /* While FormatMessageA returns 0 in this case, no last error code is set. */ SetLastError(0xdeadbeef); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_0t, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 17, "Expected FormatMessageW to return 17, got %d\n", ret); ok(!lstrcmpW(fmt_t12oos99, out), "Expected output string \"test%%1%%2!*.*s!%%99\", got %s\n", wine_dbgstr_w(out)); /* Only the "%n", "%r", and "%t" escape sequences are processed. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_pctspacedot, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 8, "Expected FormatMessageW to return 8, got %d\n", ret); ok(!lstrcmpW(fmt_pctspacedot, out), "Expected output string \"%%%%%% %%.%%!\", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_nrt, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(s_nrt, out), "Expected output string \"\\r\\n\\r\\t\", got %s\n", wine_dbgstr_w(out)); /* CRLF characters are processed normally. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_hi_lf, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(s_hi_crlf, out), "Expected output string \"hi\\r\\n\", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_hi_crlf, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(s_hi_crlf, out), "Expected output string \"hi\\r\\n\", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_cr, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 2, "Expected FormatMessageW to return 2, got %d\n", ret); ok(!lstrcmpW(s_crlf, out), "Expected output string \"\\r\\n\", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_crcrlf, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); ok(!lstrcmpW(s_crlfcrlf, out), "Expected output string \"\\r\\n\\r\\n\", got %s\n", wine_dbgstr_w(out)); /* The width parameter is handled the same also. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_hi_lf, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 3, "Expected FormatMessageW to return 3, got %d\n", ret); ok(!lstrcmpW(s_hi_sp, out), "Expected output string \"hi \", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_hi_crlf, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 3, "Expected FormatMessageW to return 3, got %d\n", ret); ok(!lstrcmpW(s_hi_sp, out), "Expected output string \"hi \", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_cr, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_cr, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 1, "Expected FormatMessageW to return 1, got %d\n", ret); ok(!lstrcmpW(s_sp, out), "Expected output string \" \", got %s\n", wine_dbgstr_w(out)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_crcrlf, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + ARRAY_SIZE(out), NULL); ok(ret == 2, "Expected FormatMessageW to return 2, got %d\n", ret); ok(!lstrcmpW(s_2sp, out), "Expected output string \" \", got %s\n", wine_dbgstr_w(out)); } @@ -1216,7 +1138,7 @@ static void test_message_insufficient_buffer(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, 0, out, sizeof(out)/sizeof(out[0]) - 1, NULL); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, 0, out, ARRAY_SIZE(out) - 1, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", @@ -1261,7 +1183,7 @@ static void test_message_insufficient_buffer_wide(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, sizeof(out)/sizeof(out[0]) - 1, NULL); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, ARRAY_SIZE(out) - 1, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", @@ -1487,7 +1409,7 @@ static void test_message_allocate_buffer_wide(void) buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, - test, 0, 0, (WCHAR *)&buf, sizeof(test)/sizeof(WCHAR) - 1, NULL); + test, 0, 0, (WCHAR *)&buf, ARRAY_SIZE(test) - 1, NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, "Expected output buffer pointer to be valid\n"); @@ -1500,7 +1422,7 @@ static void test_message_allocate_buffer_wide(void) buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, - test, 0, 0, (WCHAR *)&buf, sizeof(test)/sizeof(WCHAR), NULL); + test, 0, 0, (WCHAR *)&buf, ARRAY_SIZE(test), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, "Expected output buffer pointer to be valid\n"); @@ -1513,7 +1435,7 @@ static void test_message_allocate_buffer_wide(void) buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, - test, 0, 0, (WCHAR *)&buf, sizeof(test)/sizeof(WCHAR) + 1, NULL); + test, 0, 0, (WCHAR *)&buf, ARRAY_SIZE(test) + 1, NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, "Expected output buffer pointer to be valid\n"); @@ -1550,53 +1472,53 @@ static void test_message_from_hmodule(void) /*Test existing messageID; as the message strings from wine's kernel32 differ from windows' kernel32 we don't compare the strings but only test that FormatMessage doesn't return 0*/ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 7/*=ERROR_ARENA_TRASHED*/, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, TRUST_E_NOSIGNATURE, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); /* Test a message string with an insertion without passing any variadic arguments. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); ok(ret == 0, "FormatMessageA returned non-zero\n"); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, h, 193 /* ERROR_BAD_EXE_FORMAT */, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); ok(ret == 0, "FormatMessageA returned non-zero\n"); /*Test nonexistent messageID with varying language IDs Note: FormatMessageW behaves the same*/ SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND, "last error %u\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, - MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, - MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || @@ -1607,7 +1529,7 @@ static void test_message_from_hmodule(void) SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, - MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), out, sizeof(out)/sizeof(CHAR), NULL); + MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || @@ -1627,7 +1549,7 @@ static void test_message_invalid_flags(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageA(0, "test", 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); + ret = FormatMessageA(0, "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1646,7 +1568,7 @@ static void test_message_invalid_flags(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS, "test", 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); + ret = FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS, "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1656,7 +1578,7 @@ static void test_message_invalid_flags(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageA(FORMAT_MESSAGE_ARGUMENT_ARRAY, "test", 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); + ret = FormatMessageA(FORMAT_MESSAGE_ARGUMENT_ARRAY, "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1666,7 +1588,7 @@ static void test_message_invalid_flags(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageA(FORMAT_MESSAGE_MAX_WIDTH_MASK, "test", 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); + ret = FormatMessageA(FORMAT_MESSAGE_MAX_WIDTH_MASK, "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1680,22 +1602,21 @@ static void test_message_invalid_flags(void) memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_FROM_SYSTEM, - "test", 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); + "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); ok(!strcmp("test", out), "Expected the output buffer to be untouched\n"); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_FROM_HMODULE, - "test", 0, 0, out, sizeof(out)/sizeof(CHAR), NULL); + "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); ok(!strcmp("test", out), "Expected the output buffer to be untouched\n"); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_FROM_SYSTEM, "test", 0, 0, out, - sizeof(out)/sizeof(CHAR), NULL); + FORMAT_MESSAGE_FROM_SYSTEM, "test", 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); ok(!strcmp("test", out), "Expected the output buffer to be untouched\n"); @@ -1712,7 +1633,7 @@ static void test_message_invalid_flags_wide(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageW(0, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ret = FormatMessageW(0, test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1731,7 +1652,7 @@ static void test_message_invalid_flags_wide(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ret = FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1741,7 +1662,7 @@ static void test_message_invalid_flags_wide(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageW(FORMAT_MESSAGE_ARGUMENT_ARRAY, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ret = FormatMessageW(FORMAT_MESSAGE_ARGUMENT_ARRAY, test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1751,7 +1672,7 @@ static void test_message_invalid_flags_wide(void) SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); - ret = FormatMessageW(FORMAT_MESSAGE_MAX_WIDTH_MASK, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ret = FormatMessageW(FORMAT_MESSAGE_MAX_WIDTH_MASK, test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); @@ -1765,22 +1686,21 @@ static void test_message_invalid_flags_wide(void) memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_FROM_SYSTEM, - test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); + test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %u\n", ret); ok(!lstrcmpW(test, out), "Expected the output buffer to be untouched\n"); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_FROM_HMODULE, - test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); + test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %u\n", ret); ok(!lstrcmpW(test, out), "Expected the output buffer to be untouched\n"); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_FROM_SYSTEM, test, 0, 0, out, - sizeof(out)/sizeof(WCHAR), NULL); + FORMAT_MESSAGE_FROM_SYSTEM, test, 0, 0, out, ARRAY_SIZE(out), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %u\n", ret); ok(!lstrcmpW(test, out), "Expected the output buffer to be untouched\n"); @@ -1821,11 +1741,11 @@ static void test_message_from_64bit_number(void) }; int i; - for (i = 0; i < sizeof(unsigned_tests) / sizeof(unsigned_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(unsigned_tests); i++) { - r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, - 0, 0, outW, sizeof(outW) / sizeof(WCHAR), unsigned_tests[i].number); - MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, sizeof(expW) / sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, 0, 0, outW, ARRAY_SIZE(outW), + unsigned_tests[i].number); + MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); todo_wine { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, wine_dbgstr_w(outW)); @@ -1840,11 +1760,11 @@ todo_wine { } } - for (i = 0; i < sizeof(signed_tests) / sizeof(signed_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(signed_tests); i++) { - r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, - 0, 0, outW, sizeof(outW) / sizeof(WCHAR), signed_tests[i].number); - MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, sizeof(expW) / sizeof(WCHAR)); + r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, 0, 0, outW, ARRAY_SIZE(outW), + signed_tests[i].number); + MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); todo_wine { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, wine_dbgstr_w(outW)); -- 2.14.4

1 0

[PATCH 1/2] kernel32/tests: Correct the buffer size passed to FormatMessageW()
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 290bce9f71..43e4d35c8a 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -289,8 +289,7 @@ static void test_message_from_string_wide(void) ok(r==4,"failed: r=%d\n", r); /* a single digit, left justified */ - r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4d, 0, - 0, out, sizeof(out)/sizeof(CHAR), 1); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4d, 0, 0, out, ARRAY_SIZE(out), 1); ok(!lstrcmpW(s_1_4d, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); -- 2.14.4

1 0

[PATCH] include: Add an option to disable line numbers in the tests
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Two use cases for this: - No-op changes that change the line count will generate now the exact same object file. - While writing new tests that change the line count this allows for an easier diff between the two test runs. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 476b4d9847..e73f40d575 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -113,10 +113,17 @@ extern void __winetest_cdecl winetest_skip( const char *msg, ... ) WINETEST_PRIN extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); -#define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok -#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip -#define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip -#define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +#ifdef WINETEST_NO_LINE_NUMBERS +# define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace +#else +# define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +#endif #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__) -- 2.14.4

1 0

[PATCH v3 1/5] winnt.h: Add some WOW64 definitions.
by Zebediah Figura 06 Jun '18

06 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winnt.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 54bf11d..c41eff4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2112,6 +2112,96 @@ typedef CONTEXT *PCONTEXT; NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); +#define WOW64_CONTEXT_i386 0x00010000 +#define WOW64_CONTEXT_i486 0x00010000 +#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000001)) +#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000002)) +#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000004)) +#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) +#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) +#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) +#define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ + WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \ + WOW64_CONTEXT_DEBUG_REGISTERS | WOW64_CONTEXT_EXTENDED_REGISTERS) + +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) + +#define WOW64_CONTEXT_EXCEPTION_ACTIVE 0x08000000 +#define WOW64_CONTEXT_SERVICE_ACTIVE 0x10000000 +#define WOW64_CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define WOW64_CONTEXT_EXCEPTION_REPORTING 0x80000000 + +#define WOW64_SIZE_OF_80387_REGISTERS 80 +#define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512 + +typedef struct _WOW64_FLOATING_SAVE_AREA { + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + BYTE RegisterArea[WOW64_SIZE_OF_80387_REGISTERS]; + DWORD Cr0NpxState; +} WOW64_FLOATING_SAVE_AREA, *PWOW64_FLOATING_SAVE_AREA; + +#include "pshpack4.h" +typedef struct _WOW64_CONTEXT { + DWORD ContextFlags; + DWORD Dr0; + DWORD Dr1; + DWORD Dr2; + DWORD Dr3; + DWORD Dr6; + DWORD Dr7; + WOW64_FLOATING_SAVE_AREA FloatSave; + DWORD SegGs; + DWORD SegFs; + DWORD SegEs; + DWORD SegDs; + DWORD Edi; + DWORD Esi; + DWORD Ebx; + DWORD Edx; + DWORD Ecx; + DWORD Eax; + DWORD Ebp; + DWORD Eip; + DWORD SegCs; + DWORD EFlags; + DWORD Esp; + DWORD SegSs; + BYTE ExtendedRegisters[WOW64_MAXIMUM_SUPPORTED_EXTENSION]; +} WOW64_CONTEXT, *PWOW64_CONTEXT; +#include "poppack.h" + +typedef struct _WOW64_LDT_ENTRY { + WORD LimitLow; + WORD BaseLow; + union { + struct { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; +} WOW64_LDT_ENTRY, *PWOW64_LDT_ENTRY; + /* * Product types */ -- 2.7.4

1 4

[PATCH v2 1/5] winnt.h: Add some WOW64 definitions.
by Zebediah Figura 06 Jun '18

06 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winnt.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 54bf11d..c41eff4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2112,6 +2112,96 @@ typedef CONTEXT *PCONTEXT; NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); +#define WOW64_CONTEXT_i386 0x00010000 +#define WOW64_CONTEXT_i486 0x00010000 +#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000001)) +#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000002)) +#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000004)) +#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) +#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) +#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) +#define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ + WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \ + WOW64_CONTEXT_DEBUG_REGISTERS | WOW64_CONTEXT_EXTENDED_REGISTERS) + +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) + +#define WOW64_CONTEXT_EXCEPTION_ACTIVE 0x08000000 +#define WOW64_CONTEXT_SERVICE_ACTIVE 0x10000000 +#define WOW64_CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define WOW64_CONTEXT_EXCEPTION_REPORTING 0x80000000 + +#define WOW64_SIZE_OF_80387_REGISTERS 80 +#define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512 + +typedef struct _WOW64_FLOATING_SAVE_AREA { + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + BYTE RegisterArea[WOW64_SIZE_OF_80387_REGISTERS]; + DWORD Cr0NpxState; +} WOW64_FLOATING_SAVE_AREA, *PWOW64_FLOATING_SAVE_AREA; + +#include "pshpack4.h" +typedef struct _WOW64_CONTEXT { + DWORD ContextFlags; + DWORD Dr0; + DWORD Dr1; + DWORD Dr2; + DWORD Dr3; + DWORD Dr6; + DWORD Dr7; + WOW64_FLOATING_SAVE_AREA FloatSave; + DWORD SegGs; + DWORD SegFs; + DWORD SegEs; + DWORD SegDs; + DWORD Edi; + DWORD Esi; + DWORD Ebx; + DWORD Edx; + DWORD Ecx; + DWORD Eax; + DWORD Ebp; + DWORD Eip; + DWORD SegCs; + DWORD EFlags; + DWORD Esp; + DWORD SegSs; + BYTE ExtendedRegisters[WOW64_MAXIMUM_SUPPORTED_EXTENSION]; +} WOW64_CONTEXT, *PWOW64_CONTEXT; +#include "poppack.h" + +typedef struct _WOW64_LDT_ENTRY { + WORD LimitLow; + WORD BaseLow; + union { + struct { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; +} WOW64_LDT_ENTRY, *PWOW64_LDT_ENTRY; + /* * Product types */ -- 2.7.4

2 6

Out for a few days
by Alexandre Julliard 06 Jun '18

06 Jun '18

Folks, I'm going to be out from tomorrow until Sunday, so release 3.10 is going to be delayed until Monday. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH 1/3] winnt.h: Add some WOW64 definitions.
by Zebediah Figura 06 Jun '18

06 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winnt.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 54bf11d..c41eff4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2112,6 +2112,96 @@ typedef CONTEXT *PCONTEXT; NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); +#define WOW64_CONTEXT_i386 0x00010000 +#define WOW64_CONTEXT_i486 0x00010000 +#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000001)) +#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000002)) +#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000004)) +#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) +#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) +#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) +#define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ + WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \ + WOW64_CONTEXT_DEBUG_REGISTERS | WOW64_CONTEXT_EXTENDED_REGISTERS) + +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) + +#define WOW64_CONTEXT_EXCEPTION_ACTIVE 0x08000000 +#define WOW64_CONTEXT_SERVICE_ACTIVE 0x10000000 +#define WOW64_CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define WOW64_CONTEXT_EXCEPTION_REPORTING 0x80000000 + +#define WOW64_SIZE_OF_80387_REGISTERS 80 +#define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512 + +typedef struct _WOW64_FLOATING_SAVE_AREA { + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + BYTE RegisterArea[WOW64_SIZE_OF_80387_REGISTERS]; + DWORD Cr0NpxState; +} WOW64_FLOATING_SAVE_AREA, *PWOW64_FLOATING_SAVE_AREA; + +#include "pshpack4.h" +typedef struct _WOW64_CONTEXT { + DWORD ContextFlags; + DWORD Dr0; + DWORD Dr1; + DWORD Dr2; + DWORD Dr3; + DWORD Dr6; + DWORD Dr7; + WOW64_FLOATING_SAVE_AREA FloatSave; + DWORD SegGs; + DWORD SegFs; + DWORD SegEs; + DWORD SegDs; + DWORD Edi; + DWORD Esi; + DWORD Ebx; + DWORD Edx; + DWORD Ecx; + DWORD Eax; + DWORD Ebp; + DWORD Eip; + DWORD SegCs; + DWORD EFlags; + DWORD Esp; + DWORD SegSs; + BYTE ExtendedRegisters[WOW64_MAXIMUM_SUPPORTED_EXTENSION]; +} WOW64_CONTEXT, *PWOW64_CONTEXT; +#include "poppack.h" + +typedef struct _WOW64_LDT_ENTRY { + WORD LimitLow; + WORD BaseLow; + union { + struct { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; +} WOW64_LDT_ENTRY, *PWOW64_LDT_ENTRY; + /* * Product types */ -- 2.7.4

2 4

[PATCH] d3d8/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/stateblock.c | 14 +++---- dlls/d3d8/tests/visual.c | 88 ++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 3ad9c1c140..83f153a289 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1108,7 +1108,7 @@ const D3DRENDERSTATETYPE render_state_indices[] = struct render_state_data { - DWORD states[sizeof(render_state_indices) / sizeof(*render_state_indices)]; + DWORD states[ARRAY_SIZE(render_state_indices)]; }; struct render_state_arg @@ -1132,7 +1132,7 @@ static void render_state_apply_data(IDirect3DDevice8 *device, const struct state unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { hr = IDirect3DDevice8_SetRenderState(device, render_state_indices[i], rsdata->states[i]); ok(SUCCEEDED(hr), "SetRenderState returned %#x.\n", hr); @@ -1147,7 +1147,7 @@ static void render_state_check_data(IDirect3DDevice8 *device, const struct state unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { DWORD value = ctx->poison_data_buffer.states[i]; hr = IDirect3DDevice8_GetRenderState(device, render_state_indices[i], &value); @@ -1244,7 +1244,7 @@ static void render_state_poison_data_init(struct render_state_data *data) { unsigned int i; - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { data->states[i] = 0x1337c0de; } @@ -1423,10 +1423,10 @@ static HRESULT render_state_test_init(IDirect3DDevice8 *device, struct state_tes render_state_test_data_init(&ctx->test_data_all_buffer); render_state_poison_data_init(&ctx->poison_data_buffer); - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { ctx->test_data_vertex_buffer.states[i] = ctx->default_data_buffer.states[i]; - for (j = 0; j < sizeof(states_vertex) / sizeof(*states_vertex); ++j) + for (j = 0; j < ARRAY_SIZE(states_vertex); ++j) { if (render_state_indices[i] == states_vertex[j]) { @@ -1436,7 +1436,7 @@ static HRESULT render_state_test_init(IDirect3DDevice8 *device, struct state_tes } ctx->test_data_pixel_buffer.states[i] = ctx->default_data_buffer.states[i]; - for (j = 0; j < sizeof(states_pixel) / sizeof(*states_pixel); ++j) + for (j = 0; j < ARRAY_SIZE(states_pixel); ++j) { if (render_state_indices[i] == states_pixel[j]) { diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c2a4abfc04..bed70d8a17 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -494,7 +494,7 @@ static void lighting_test(void) hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); @@ -706,22 +706,14 @@ static void test_specular_lighting(void) } tests[] = { - {&directional, FALSE, 30.0f, expected_directional, - sizeof(expected_directional) / sizeof(expected_directional[0])}, - {&directional, TRUE, 30.0f, expected_directional_local, - sizeof(expected_directional_local) / sizeof(expected_directional_local[0])}, - {&point, FALSE, 30.0f, expected_point, - sizeof(expected_point) / sizeof(expected_point[0])}, - {&point, TRUE, 30.0f, expected_point_local, - sizeof(expected_point_local) / sizeof(expected_point_local[0])}, - {&spot, FALSE, 30.0f, expected_spot, - sizeof(expected_spot) / sizeof(expected_spot[0])}, - {&spot, TRUE, 30.0f, expected_spot_local, - sizeof(expected_spot_local) / sizeof(expected_spot_local[0])}, - {&point_range, FALSE, 30.0f, expected_point_range, - sizeof(expected_point_range) / sizeof(expected_point_range[0])}, - {&point_side, TRUE, 0.0f, expected_point_side, - sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, + {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, + {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, + {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, + {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, + {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, }; IDirect3DDevice8 *device; D3DMATERIAL8 material; @@ -795,7 +787,7 @@ static void test_specular_lighting(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_SetLight(device, 0, tests[i].light); ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); @@ -1480,7 +1472,7 @@ static void fog_with_shader_test(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); ok(hr == D3D_OK, "Setting fog end failed (%08x)\n", hr); - for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { hr = IDirect3DDevice8_SetVertexShader(device, vertex_shader[test_data[i].vshader]); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); @@ -2458,7 +2450,7 @@ static void test_scalar_instructions(void) goto done; } - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff336699, 0.0f, 0); ok(SUCCEEDED(hr), "%s: Failed to clear, hr %#x.\n", test_data[i].name, hr); @@ -3100,7 +3092,7 @@ static void texop_test(void) hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { if (!(caps.TextureOpCaps & test_data[i].caps_flag)) { @@ -3789,7 +3781,7 @@ static void intz_test(void) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); get_rt_readback(original_rt, &rb); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -3847,7 +3839,7 @@ static void intz_test(void) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); get_rt_readback(original_rt, &rb); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -3915,7 +3907,7 @@ static void intz_test(void) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); get_rt_readback(original_rt, &rb); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -4070,7 +4062,7 @@ static void shadow_test(void) D3DTTFF_COUNT4 | D3DTTFF_PROJECTED); ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { D3DFORMAT format = formats[i].format; IDirect3DTexture8 *texture; @@ -4132,7 +4124,7 @@ static void shadow_test(void) IDirect3DTexture8_Release(texture); get_rt_readback(original_rt, &rb); - for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) + for (j = 0; j < ARRAY_SIZE(expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, @@ -4459,7 +4451,7 @@ static void resz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -4544,7 +4536,7 @@ static void resz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -4891,7 +4883,7 @@ static void fog_special_test(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, conv.d); ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); @@ -5926,7 +5918,7 @@ static void test_fog_interpolation(void) hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &ident_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { if(!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) continue; @@ -6081,7 +6073,7 @@ static void test_negative_fixedfunction_fog(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) continue; @@ -6206,7 +6198,7 @@ static void test_table_fog_zw(void) hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -6414,7 +6406,7 @@ static void test_signed_formats(void) hr = IDirect3DDevice8_CreatePixelShader(device, shader_code_alpha, &shader_alpha); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) + for (i = 0; i < ARRAY_SIZE(formats); i++) { hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, formats[i].format); @@ -6424,7 +6416,7 @@ static void test_signed_formats(void) continue; } - for (j = 0; j < sizeof(tests) / sizeof(*tests); j++) + for (j = 0; j < ARRAY_SIZE(tests); j++) { texture_sysmem = NULL; hr = IDirect3DDevice8_CreateTexture(device, tests[j].width, 4, 1, 0, @@ -6661,7 +6653,7 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); ok(hr == D3D_OK, "Failed to set texture stage state, hr %#x.\n", hr); - for (t = 0; t < sizeof(texture_types) / sizeof(*texture_types); ++t) + for (t = 0; t < ARRAY_SIZE(texture_types); ++t) { if (!(caps.TextureCaps & texture_types[t].cap)) { @@ -6683,7 +6675,7 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_SetVertexShader(device, texture_types[t].fvf); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (tests[i].src_format == MAKEFOURCC('A','T','I','2') && !ati2n_supported) continue; @@ -7253,7 +7245,7 @@ static void test_pointsize(void) hr = IDirect3DDevice8_SetRenderTarget(device, rt, depthstencil); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); - for (i = 0; i < sizeof(test_setups) / sizeof(test_setups[0]); ++i) + for (i = 0; i < ARRAY_SIZE(test_setups); ++i) { if (caps.VertexShaderVersion < test_setups[i].vs->version || caps.PixelShaderVersion < test_setups[i].ps->version) @@ -7285,7 +7277,7 @@ static void test_pointsize(void) hr = IDirect3DDevice8_SetPixelShader(device, ps); ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - for (j = 0; j < sizeof(tests) / sizeof(tests[0]); ++j) + for (j = 0; j < ARRAY_SIZE(tests); ++j) { unsigned int size = tests[j].override_min ? 63 : tests[j].zero_size ? 0 : tests[j].scale ? test_setups[i].scaled_size : test_setups[i].nonscaled_size; @@ -8116,7 +8108,7 @@ static void test_flip(void) return; } - for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + for (i = 0; i < ARRAY_SIZE(back_buffers); ++i) { hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); @@ -8152,7 +8144,7 @@ static void test_flip(void) IDirect3DSurface8_Release(test_surface); /* Backbuffer surface pointers are unmodified */ - for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + for (i = 0; i < ARRAY_SIZE(back_buffers); ++i) { hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &test_surface); ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); @@ -8184,7 +8176,7 @@ static void test_flip(void) color = get_surface_color(back_buffers[0], 1, 1); ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); - for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + for (i = 0; i < ARRAY_SIZE(back_buffers); ++i) IDirect3DSurface8_Release(back_buffers[i]); refcount = IDirect3DDevice8_Release(device); @@ -8377,7 +8369,7 @@ static void test_uninitialized_varyings(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (caps.VertexShaderVersion < tests[i].vs_version || caps.PixelShaderVersion < tests[i].ps_version) @@ -8574,7 +8566,7 @@ static void test_shademode(void) /* Try it first with a TRIANGLESTRIP. Do it with different geometry because * the color fixups we have to do for FLAT shading will be dependent on that. */ - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (tests[i].vs->version) { @@ -9222,7 +9214,7 @@ static void test_texture_blending(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const struct test *current_test = &tests[i]; @@ -9413,7 +9405,7 @@ static void test_color_clamping(void) hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (caps.VertexShaderVersion < tests[i].vs_version || caps.PixelShaderVersion < tests[i].ps_version) @@ -10118,7 +10110,7 @@ static void test_map_synchronisation(void) } size = (tri_count + 2) * sizeof(*quad1.strip); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_CreateVertexBuffer(device, size, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); @@ -10228,7 +10220,7 @@ static void test_viewport(void) /* This crashes on Windows. */ /* hr = IDirect3DDevice8_SetViewport(device, NULL); */ - for (i = 0; i < sizeof(rt_sizes) / sizeof(rt_sizes[0]); ++i) + for (i = 0; i < ARRAY_SIZE(rt_sizes); ++i) { if (i) { @@ -10244,7 +10236,7 @@ static void test_viewport(void) ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); } - for (j = 0; j < sizeof(tests) / sizeof(tests[0]); ++j) + for (j = 0; j < ARRAY_SIZE(tests); ++j) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x (i %u, j %u).\n", hr, i, j); -- 2.14.4

2 1

[PATCH 0/4] winevulkan: Update to 1.0.76
by Roderick Colenbrander 06 Jun '18

06 Jun '18

Hi, Until now our Vulkan implementation was stuck at 1.0.51 due to licensing of vk.xml. Now that the license issues are resolved, we can migrate to a newer version. The patch series updates to latest vk.xml (1.1.76) and adds parsing for the new vk.xml version. They added 'alias' types to not have to duplicate information about data types and functions for functionality promoted to Vulkan 1.1 Core. This required a lot of changes. Along the way I found some bugs / parsing issues in the original script to simplify code review, I moved these earlier in the series as they are indepent. Vulkan 1.1 moved a lot of extensions into its Core including interop extensions for memory, fences and semaphores. These rely on platform specific functionality and would need some more implementation work to support. (It is also the question how we would deal with these. Probably needs to be implemented in winex11.drv to allow vkd3d to use them). For now to avoid having to deal with full 1.1 support, I'm leaving out 1.1 features and leave the patch version at 76. Essentially bringing us to 1.0.76. In practice support for updated extensions is what benefits most users as there are probably not many applications needing Core 1.1. Thanks, Roderick Roderick Colenbrander (4): winevulkan: Fix parsing of const function pointer members. winevulkan: Parse forward declared struct members. winevulkan: Parse extension require sections one by one. winevulkan: Update Vulkan support to 1.0.76. dlls/vulkan-1/vulkan-1.spec | 28 + dlls/winevulkan/make_vulkan | 319 +- dlls/winevulkan/vk.xml | 6448 ++++++++++++++++++++++++++------------- dlls/winevulkan/vulkan_thunks.c | 377 ++- dlls/winevulkan/vulkan_thunks.h | 156 +- dlls/winevulkan/winevulkan.spec | 28 + include/wine/vulkan.h | 1739 ++++++----- 7 files changed, 6219 insertions(+), 2876 deletions(-) -- 2.14.3

4 12

[PATCH 1/4] msi/tests: Test that some actions cause resolution of SourceDir.
by Zebediah Figura 06 Jun '18

06 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/install.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a4726d6..af37d93 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1316,6 +1316,28 @@ static const CHAR x64_directory_dat[] = "ProgramFiles64Folder\tTARGETDIR\t.\n" "TARGETDIR\t\tSourceDir"; +static const CHAR sr_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallValidate\t\t500\n" + "InstallInitialize\t\t600\n" + "sourcedir_unset\tSourceDir\t700\n" + "ResolveSource\tRESOLVE_SOURCE\t800\n" + "ProcessComponents\tPROCESS_COMPONENTS\t800\n" + "sourcedir_set\tNOT SourceDir\t900\n" + "InstallFinalize\t\t1000\n"; + +static const CHAR sr_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "sourcedir_unset\t19\t\tSourceDir should not be set\n" + "sourcedir_set\t19\t\tSourceDir should be set\n"; + static const msi_table tables[] = { ADD_TABLE(component), @@ -1984,6 +2006,19 @@ static const msi_table x64_tables[] = ADD_TABLE(install_exec_seq), }; +static const msi_table sr_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(sr_install_exec_seq), + ADD_TABLE(sr_custom_action), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6109,6 +6144,32 @@ error: DeleteFileA(msifile); } +/* Test what actions cause resolution of SourceDir when executed. */ +static void test_source_resolution(void) +{ + UINT r; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + + create_test_files(); + create_database(msifile, sr_tables, sizeof(sr_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "RESOLVE_SOURCE=1"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + delete_test_files(); + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6200,6 +6261,7 @@ START_TEST(install) test_feature_tree(); test_deferred_action(); test_wow64(); + test_source_resolution(); DeleteFileA(customdll); -- 2.7.4

3 9

[PATCH] imm32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index be3ddfce03..ee1aeb3965 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -26,8 +26,6 @@ #include "imm.h" #include "ddk/imm.h" -#define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) - static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -73,7 +71,7 @@ static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) MSG *msg = (MSG*)lParam; if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) { msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; @@ -94,7 +92,7 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) { memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); msg_spy.msgs[msg_spy.i_msg].post = FALSE; @@ -126,7 +124,7 @@ static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { msg_spy_pump_msg_queue(); - if (msg_spy.i_msg >= NUMELEMS(msg_spy.msgs)) + if (msg_spy.i_msg >= ARRAY_SIZE(msg_spy.msgs)) fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); @@ -1067,8 +1065,8 @@ static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && - !lstrcmpW(class_nameW, imeW)) { + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + { *ime_window = hWnd; return FALSE; } @@ -1229,7 +1227,7 @@ static void test_default_ime_window_creation(void) { FALSE, FALSE } }; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); -- 2.14.4

2 1

[PATCH] jscript/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 06 Jun '18

06 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 887b264d8f..77cd74ebb3 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1316,7 +1316,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_TESTARGTYPES: { VARIANT args[8], v; - DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; + DISPPARAMS dp = {args, NULL, ARRAY_SIZE(args), 0}; HRESULT hres; CHECK_EXPECT(global_testargtypes_i); -- 2.14.4

2 1

[PATCH 4/4] webservices: Fix handling of empty text field mappings.
by Hans Leidekker 06 Jun '18

06 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 355 +++++++++++++++++++--------------------- dlls/webservices/tests/reader.c | 150 +++++++++++++++++ 2 files changed, 314 insertions(+), 191 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 6925200a59..087ad0a9cc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4442,24 +4442,24 @@ static HRESULT text_to_bool( const WS_XML_TEXT *text, BOOL *val ) static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BOOL_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; - BOOL found, val = FALSE; + BOOL val = FALSE; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_bool( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_bool( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4468,7 +4468,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4476,7 +4476,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, { BOOL *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4524,25 +4524,24 @@ static HRESULT text_to_int8( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT8_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int8( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int8( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4551,7 +4550,7 @@ static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4559,7 +4558,7 @@ static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, { INT8 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4607,25 +4606,24 @@ static HRESULT text_to_int16( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT16_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int16( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int16( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4634,7 +4632,7 @@ static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4642,7 +4640,7 @@ static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, { INT16 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4688,25 +4686,24 @@ static HRESULT text_to_int32( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT32_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int32( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int32( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4715,7 +4712,7 @@ static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4723,7 +4720,7 @@ static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, { INT32 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4769,25 +4766,24 @@ static HRESULT text_to_int64( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT64_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int64( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int64( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4796,7 +4792,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4804,7 +4800,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, { INT64 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4851,25 +4847,24 @@ static HRESULT text_to_uint8( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT8_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint8( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint8( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4878,7 +4873,7 @@ static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4886,7 +4881,7 @@ static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT8 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4942,25 +4937,24 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT16_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint16( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint16( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4969,7 +4963,7 @@ static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4977,7 +4971,7 @@ static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT16 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5032,25 +5026,24 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT32_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint32( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint32( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5059,7 +5052,7 @@ static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5067,7 +5060,7 @@ static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT32 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5120,25 +5113,24 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT64_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint64( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint64( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5147,7 +5139,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5155,7 +5147,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT64 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5201,22 +5193,21 @@ static HRESULT text_to_float( const WS_XML_TEXT *text, float *val ) static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_FLOAT_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; float val = 0.0; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_float( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_float( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5225,7 +5216,7 @@ static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5233,7 +5224,7 @@ static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, { float *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5279,22 +5270,21 @@ static HRESULT text_to_double( const WS_XML_TEXT *text, double *val ) static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_DOUBLE_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; double val = 0.0; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_double( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_double( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5303,7 +5293,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5311,7 +5301,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, { double *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5343,20 +5333,19 @@ static HRESULT text_to_wsz( const WS_XML_TEXT *text, WS_HEAP *heap, WCHAR **ret static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_WSZ_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, WCHAR **ret, ULONG size ) + WS_HEAP *heap, WCHAR **ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; WCHAR *str = NULL; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_wsz( text, heap, &str )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_wsz( text, heap, &str )) != S_OK) return hr; switch (option) { @@ -5398,22 +5387,21 @@ static HRESULT get_enum_value( const WS_XML_TEXT *text, const WS_ENUM_DESCRIPTIO static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_ENUM_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; int val = 0; - BOOL found; if (!desc) return E_INVALIDARG; - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = get_enum_value( text, desc, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = get_enum_value( text, desc, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5422,7 +5410,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5430,7 +5418,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, { int *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5476,22 +5464,21 @@ static HRESULT text_to_datetime( const WS_XML_TEXT *text, WS_DATETIME *val ) static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_DATETIME_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; WS_DATETIME val = {0, WS_DATETIME_FORMAT_UTC}; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_datetime( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_datetime( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5500,7 +5487,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5508,7 +5495,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin { WS_DATETIME *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5554,22 +5541,21 @@ static HRESULT text_to_guid( const WS_XML_TEXT *text, GUID *val ) static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_GUID_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; GUID val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_guid( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_guid( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5578,7 +5564,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5586,7 +5572,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, { GUID *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5634,22 +5620,21 @@ static HRESULT text_to_unique_id( const WS_XML_TEXT *text, WS_HEAP *heap, WS_UNI static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UNIQUE_ID_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_UNIQUE_ID val = {{0}}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_unique_id( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_unique_id( text, heap, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5658,7 +5643,7 @@ static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mappi break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5666,7 +5651,7 @@ static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mappi { WS_UNIQUE_ID *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5714,17 +5699,16 @@ static HRESULT text_to_string( const WS_XML_TEXT *text, WS_HEAP *heap, WS_STRING static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_STRING val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_string( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_string( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5748,7 +5732,7 @@ static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_STRING *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5796,17 +5780,16 @@ static HRESULT text_to_bytes( const WS_XML_TEXT *text, WS_HEAP *heap, WS_BYTES * static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BYTES_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_BYTES val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_bytes( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_bytes( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5830,7 +5813,7 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_BYTES *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5856,17 +5839,16 @@ static HRESULT text_to_xml_string( const WS_XML_TEXT *text, WS_HEAP *heap, WS_XM static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_STRING_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_XML_STRING val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_xml_string( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_xml_string( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5890,7 +5872,7 @@ static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapp { WS_XML_STRING *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5941,12 +5923,11 @@ static HRESULT text_to_qname( struct reader *reader, const WS_XML_TEXT *text, WS static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_QNAME_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_XML_QNAME val = {{0}}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); @@ -5954,13 +5935,13 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, if ((hr = read_startelement( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_qname( reader, text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_qname( reader, text, heap, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5969,7 +5950,7 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5977,7 +5958,7 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_XML_QNAME *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -6224,7 +6205,7 @@ static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTIO static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, - void *, ULONG ); + void *, ULONG, BOOL * ); static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void **ret, ULONG *count ) @@ -6232,6 +6213,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO HRESULT hr; ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; WS_READ_OPTION option; + BOOL found; char *buf; if (!(option = get_field_read_option( desc->type, desc->options ))) return E_INVALIDARG; @@ -6257,7 +6239,6 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO if (desc->type == WS_UNION_TYPE) { - BOOL found; hr = read_type_union( reader, desc->typeDescription, heap, buf + offset, item_size, &found ); if (hr != S_OK) { @@ -6269,7 +6250,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO else { hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, - desc->typeDescription, option, heap, buf + offset, item_size ); + desc->typeDescription, option, heap, buf + offset, item_size, &found ); if (hr == WS_E_INVALID_FORMAT) break; if (hr != S_OK) { @@ -6301,18 +6282,22 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { + struct reader_pos pos; + BOOL found; HRESULT hr; + if (reader->current == reader->last) { - BOOL found; if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; if (!found) return WS_E_INVALID_FORMAT; } - if ((hr = read_next_node( reader )) != S_OK) return hr; - if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, - desc->typeDescription, option, heap, ret, size ); + save_reader_position( reader, &pos ); + if ((hr = read_next_node( reader )) != S_OK) return hr; + hr = read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, + desc->typeDescription, option, heap, ret, size, &found ); + if (hr == S_OK && !found) restore_reader_position( reader, &pos ); + return hr; } static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, @@ -6322,6 +6307,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO WS_READ_OPTION option; ULONG size; HRESULT hr; + BOOL found; if (!desc) return E_INVALIDARG; if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) @@ -6345,17 +6331,16 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO case WS_ATTRIBUTE_FIELD_MAPPING: hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, - desc->typeDescription, option, heap, ptr, size ); + desc->typeDescription, option, heap, ptr, size, &found ); break; case WS_ELEMENT_FIELD_MAPPING: hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->localName, desc->ns, - desc->typeDescription, option, heap, ptr, size ); + desc->typeDescription, option, heap, ptr, size, &found ); break; case WS_ELEMENT_CHOICE_FIELD_MAPPING: { - BOOL found; if (desc->type != WS_UNION_TYPE || !desc->typeDescription || (desc->options & (WS_FIELD_POINTER|WS_FIELD_NILLABLE))) return E_INVALIDARG; hr = read_type_union( reader, desc->typeDescription, heap, ptr, size, &found ); @@ -6406,7 +6391,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { ULONG i, offset; HRESULT hr; @@ -6481,6 +6466,8 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, struct node *parent = find_parent( reader ); parent->flags |= NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT; } + + *found = TRUE; return S_OK; } @@ -6576,7 +6563,7 @@ static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, - WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, BOOL *found ) { HRESULT hr; @@ -6585,114 +6572,94 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP if (mapping == WS_ELEMENT_TYPE_MAPPING && is_nil_element( &reader->current->hdr )) { if (option != WS_READ_NILLABLE_POINTER && option != WS_READ_NILLABLE_VALUE) return WS_E_INVALID_FORMAT; + *found = TRUE; return end_mapping( reader, mapping ); } switch (type) { case WS_BOOL_TYPE: - if ((hr = read_type_bool( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_bool( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT8_TYPE: - if ((hr = read_type_int8( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int8( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT16_TYPE: - if ((hr = read_type_int16( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int16( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT32_TYPE: - if ((hr = read_type_int32( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int32( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT64_TYPE: - if ((hr = read_type_int64( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int64( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT8_TYPE: - if ((hr = read_type_uint8( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint8( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT16_TYPE: - if ((hr = read_type_uint16( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint16( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT32_TYPE: - if ((hr = read_type_uint32( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint32( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT64_TYPE: - if ((hr = read_type_uint64( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint64( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_FLOAT_TYPE: - if ((hr = read_type_float( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_float( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_DOUBLE_TYPE: - if ((hr = read_type_double( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_double( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_DATETIME_TYPE: - if ((hr = read_type_datetime( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_datetime( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_GUID_TYPE: - if ((hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UNIQUE_ID_TYPE: - if ((hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_STRING_TYPE: - if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_WSZ_TYPE: - if ((hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_BYTES_TYPE: - if ((hr = read_type_bytes( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_bytes( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_XML_STRING_TYPE: - if ((hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_XML_QNAME_TYPE: - if ((hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_STRUCT_TYPE: - if ((hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_ENUM_TYPE: - if ((hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; default: @@ -6700,6 +6667,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return E_NOTIMPL; } + if (hr != S_OK) return hr; return end_mapping( reader, mapping ); } @@ -6711,6 +6679,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY ULONG size, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %u %u %p %u %p %p %u %p\n", handle, mapping, type, desc, option, heap, value, @@ -6727,7 +6696,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY return E_INVALIDARG; } - if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size )) != S_OK) + if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size, &found )) != S_OK) { LeaveCriticalSection( &reader->cs ); return hr; @@ -6754,6 +6723,7 @@ HRESULT read_header( WS_XML_READER *handle, const WS_XML_STRING *localname, cons ULONG size ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; EnterCriticalSection( &reader->cs ); @@ -6765,7 +6735,7 @@ HRESULT read_header( WS_XML_READER *handle, const WS_XML_STRING *localname, cons } hr = read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, type, localname, ns, desc, option, heap, - value, size ); + value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6779,6 +6749,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); @@ -6795,7 +6766,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->elementLocalName, - desc->elementNs, desc->typeDescription, option, heap, value, size ); + desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6809,6 +6780,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi { struct reader *reader = (struct reader *)handle; WS_TYPE type = map_value_type( value_type ); + BOOL found; HRESULT hr; TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); @@ -6825,7 +6797,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, type, NULL, NULL, NULL, WS_READ_REQUIRED_VALUE, - NULL, value, size ); + NULL, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6839,6 +6811,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); @@ -6861,7 +6834,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI } hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->attributeLocalName, - desc->attributeNs, desc->typeDescription, option, heap, value, size ); + desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7dd7979522..bd8a37cc52 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6539,6 +6539,155 @@ static void test_repeating_element_choice(void) WsFreeHeap( heap ); } +static void test_empty_text_field(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s; + struct test + { + WS_STRING str; + } *test; + struct test2 + { + WCHAR *str; + } *test2; + struct test3 + { + BOOL bool; + } *test3; + struct test4 + { + WS_XML_STRING str; + } *test4; + struct test5 + { + WS_BYTES bytes; + } *test5; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_STRING_TYPE; + f.offset = FIELD_OFFSET(struct test, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( !test->str.length, "got %u\n", test->str.length ); + todo_wine ok( test->str.chars != NULL, "chars not set\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + f.offset = FIELD_OFFSET(struct test2, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test2); + s.alignment = TYPE_ALIGNMENT(struct test2); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test2 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test2, sizeof(test2), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test2 != NULL, "test2 not set\n" ); + ok( test2->str != NULL, "str not set\n" ); + ok( !test2->str[0], "not empty\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_BOOL_TYPE; + f.offset = FIELD_OFFSET(struct test3, bool); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test3); + s.alignment = TYPE_ALIGNMENT(struct test3); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test3, sizeof(test3), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_XML_STRING_TYPE; + f.offset = FIELD_OFFSET(struct test4, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test4); + s.alignment = TYPE_ALIGNMENT(struct test4); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test4 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test4, sizeof(test4), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test4 != NULL, "test4 not set\n" ); + ok( !test4->str.length, "got %u\n", test4->str.length ); + todo_wine ok( test4->str.bytes != NULL, "bytes not set\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_BYTES_TYPE; + f.offset = FIELD_OFFSET(struct test5, bytes); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test5); + s.alignment = TYPE_ALIGNMENT(struct test5); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test5 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test5, sizeof(test5), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test5 != NULL, "test5 not set\n" ); + ok( !test5->bytes.length, "got %u\n", test5->bytes.length ); + todo_wine ok( test5->bytes.bytes != NULL, "bytes not set\n" ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} START_TEST(reader) { @@ -6588,4 +6737,5 @@ START_TEST(reader) test_union_type(); test_float(); test_repeating_element_choice(); + test_empty_text_field(); } -- 2.11.0

1 0

[PATCH 3/4] webservices: Handle WS_XML_TEXT_TYPE_INT64 in text_to_uint64.
by Hans Leidekker 06 Jun '18

06 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 79a1af63bf..6925200a59 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5095,6 +5095,13 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) hr = str_to_uint64( text_utf8->value.bytes, text_utf8->value.length, MAX_UINT64, val ); break; } + case WS_XML_TEXT_TYPE_INT64: + { + const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + *val = text_int64->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; -- 2.11.0

1 0

[PATCH 2/4] webservices/tests: Make test data local if it's only used in one place.
by Hans Leidekker 06 Jun '18

06 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 116 +++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7064cf0f82..7dd7979522 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -67,57 +67,6 @@ static const char data9[] = static const char data10[] = "<a></b>"; -static const char data11[] = - "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" - "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" - "" - "</o:services>" - "</o:OfficeConfig>"; - -static const char data11b[] = - "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" - "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" - "<trailing>content</trailing>" - "</o:OfficeConfig>"; - -static const char data12[] = - "<services>" - "<service><id>1</id></service>" - "<service><id>2</id></service>" - "</services>"; - -static const char data13[] = - "<services></services>"; - -static const char data14[] = - "<services>" - "<wrapper>" - "<service><id>1</id></service>" - "<service><id>2</id></service>" - "</wrapper>" - "</services>"; - -static const char data15[] = - "<services>" - "<wrapper>" - "<service>1</service>" - "<service>2</service>" - "</wrapper>" - "</services>"; - -static const char data16[] = - "<services>" - "<wrapper>" - "<service name='1'>1</service>" - "<service name='2'>2</service>" - "</wrapper>" - "</services>"; - -static const char data17[] = - "<services>" - "<service><name></name></service>" - "</services>"; - static void test_WsCreateError(void) { HRESULT hr; @@ -2997,6 +2946,17 @@ static void test_text_field_mapping(void) static void test_complex_struct_type(void) { + static const char data[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" + "" + "</o:services>" + "</o:OfficeConfig>"; + static const char data2[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" + "<trailing>content</trailing>" + "</o:OfficeConfig>"; static const WCHAR timestampW[] = {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; HRESULT hr; @@ -3035,7 +2995,7 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); /* element content type mapping */ - prepare_struct_type_test( reader, data11 ); + prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3112,7 +3072,7 @@ static void test_complex_struct_type(void) ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); /* element type mapping */ - prepare_struct_type_test( reader, data11 ); + prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3136,7 +3096,7 @@ static void test_complex_struct_type(void) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* trailing content */ - prepare_struct_type_test( reader, data11b ); + prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3149,7 +3109,7 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); - prepare_struct_type_test( reader, data11b ); + prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3165,6 +3125,38 @@ static void test_complex_struct_type(void) static void test_repeating_element(void) { + static const char data[] = + "<services>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</services>"; + static const char data2[] = + "<services></services>"; + static const char data3[] = + "<services>" + "<wrapper>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</wrapper>" + "</services>"; + static const char data4[] = + "<services>" + "<wrapper>" + "<service>1</service>" + "<service>2</service>" + "</wrapper>" + "</services>"; + static const char data5[] = + "<services>" + "<wrapper>" + "<service name='1'>1</service>" + "<service name='2'>2</service>" + "</wrapper>" + "</services>"; + static const char data6[] = + "<services>" + "<service><name></name></service>" + "</services>"; static const WCHAR oneW[] = {'1',0}, twoW[] = {'2',0}; WS_XML_STRING str_name = {4, (BYTE *)"name"}; WS_XML_STRING str_services = {8, (BYTE *)"services"}; @@ -3214,7 +3206,7 @@ static void test_repeating_element(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - prepare_struct_type_test( reader, data12 ); + prepare_struct_type_test( reader, data ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -3257,7 +3249,7 @@ static void test_repeating_element(void) ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); /* array of pointers */ - prepare_struct_type_test( reader, data12 ); + prepare_struct_type_test( reader, data ); f.options = WS_FIELD_POINTER; test4 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, @@ -3272,7 +3264,7 @@ static void test_repeating_element(void) } /* item range */ - prepare_struct_type_test( reader, data13 ); + prepare_struct_type_test( reader, data2 ); f.options = 0; range.minItemCount = 0; range.maxItemCount = 1; @@ -3286,7 +3278,7 @@ static void test_repeating_element(void) ok( !test->service_count, "got %u\n", test->service_count ); /* wrapper element */ - prepare_struct_type_test( reader, data14 ); + prepare_struct_type_test( reader, data3 ); f.itemRange = NULL; f.localName = &str_wrapper; f.ns = &str_ns; @@ -3301,7 +3293,7 @@ static void test_repeating_element(void) ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); /* repeating text field mapping */ - prepare_struct_type_test( reader, data15 ); + prepare_struct_type_test( reader, data4 ); f2.mapping = WS_TEXT_FIELD_MAPPING; f2.localName = NULL; f2.ns = NULL; @@ -3319,7 +3311,7 @@ static void test_repeating_element(void) ok( !lstrcmpW( test2->service[1].id, twoW ), "wrong data\n" ); /* repeating attribute field + text field mapping */ - prepare_struct_type_test( reader, data16 ); + prepare_struct_type_test( reader, data5 ); f2.offset = FIELD_OFFSET(struct service3, id); memset( &f3, 0, sizeof(f3) ); f3.mapping = WS_ATTRIBUTE_FIELD_MAPPING; @@ -3344,7 +3336,7 @@ static void test_repeating_element(void) ok( !lstrcmpW( test3->service[1].id, twoW ), "wrong data\n" ); /* empty text, item range */ - prepare_struct_type_test( reader, data17 ); + prepare_struct_type_test( reader, data6 ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; -- 2.11.0

1 0

[PATCH 1/4] webservices: Call WSACleanup when the dll is unloaded.
by Hans Leidekker 06 Jun '18

06 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/listener.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a178e276e4..357a1c6a53 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(webservices); +HINSTANCE webservices_instance; + static BOOL winsock_loaded; static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) @@ -48,6 +50,26 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +/****************************************************************** + * DllMain (webservices.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + webservices_instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (winsock_loaded) WSACleanup(); + break; + } + return TRUE; +} + static const struct prop_desc listener_props[] = { { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_LISTEN_BACKLOG */ -- 2.11.0

1 0

[PATCH] winevulkan: Add copyright headers to files generated from vk.xml.
by Józef Kucia 06 Jun '18

06 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This patch could be applied after 147041. --- dlls/vulkan-1/vulkan-1.spec | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 26 +++++++++++++++++++------- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 37 ++++++++++++++++++++++++++++++++++++- dlls/winevulkan/winevulkan.spec | 34 ++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 37 ++++++++++++++++++++++++++++++++++++- include/wine/vulkan_driver.h | 37 ++++++++++++++++++++++++++++++++++++- 7 files changed, 231 insertions(+), 11 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 3d457749b46a..0a4e85e96859 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -1,4 +1,38 @@ # Automatically generated from Vulkan vk.xml; DO NOT EDIT! +# +# This file is generated from Vulkan vk.xml file covered +# by the following copyright and permission notice: +# +# Copyright (c) 2015-2018 The Khronos Group Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ---- Exceptions to the Apache 2.0 License: ---- +# +# As an exception, if you use this Software to generate code and portions of +# this Software are embedded into the generated code as a result, you may +# redistribute such product without providing attribution as would otherwise +# be required by Sections 4(a), 4(b) and 4(d) of the License. +# +# In addition, if you combine or link code generated by this Software with +# software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 +# ("`Combined Software`") and if a court of competent jurisdiction determines +# that the patent provision (Section 3), the indemnity provision (Section 9) +# or other Section of the License conflicts with the conditions of the +# applicable GPL or LGPL license, you may retroactively and prospectively +# choose to deem waived or otherwise exclude such Section(s) of the License, +# but only in their entirety and only with respect to the Combined Software. +# @ stdcall vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) winevulkan.wine_vkAcquireNextImageKHR @ stdcall vkAllocateCommandBuffers(ptr ptr ptr) winevulkan.wine_vkAllocateCommandBuffers diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 69ea807389e7..ea64c052fa5f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1893,9 +1893,19 @@ class VkGenerator(object): if not any(s.name == conv.struct.name for s in self.host_structs): self.host_structs.append(conv.struct) - def generate_thunks_c(self, f, prefix): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + def _generate_copyright(self, f, spec_file=False): + c = "# " if spec_file else " * " + f.write("# " if spec_file else "/* ") + f.write("Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n") + lines = ["", "This file is generated from Vulkan vk.xml file covered", + "by the following copyright and permission notice:"] + lines.extend([l.rstrip(" ") for l in self.registry.copyright.splitlines()]) + for line in lines: + f.write("{0}{1}".format("# " if spec_file else " * ", line).rstrip(" ") + "\n") + f.write("\n" if spec_file else " */\n\n") + def generate_thunks_c(self, f, prefix): + self._generate_copyright(f) f.write("#include \"config.h\"\n") f.write("#include \"wine/port.h\"\n\n") @@ -2011,7 +2021,7 @@ class VkGenerator(object): f.write("}\n") def generate_thunks_h(self, f, prefix): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + self._generate_copyright(f) f.write("#ifndef __WINE_VULKAN_THUNKS_H\n") f.write("#define __WINE_VULKAN_THUNKS_H\n\n") @@ -2109,7 +2119,7 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n") def generate_vulkan_h(self, f): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + self._generate_copyright(f) f.write("#ifndef __WINE_VULKAN_H\n") f.write("#define __WINE_VULKAN_H\n\n") @@ -2203,7 +2213,7 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_H */\n") def generate_vulkan_driver_h(self, f): - f.write("/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */\n\n") + self._generate_copyright(f) f.write("#ifndef __WINE_VULKAN_DRIVER_H\n") f.write("#define __WINE_VULKAN_DRIVER_H\n\n") @@ -2231,7 +2241,7 @@ class VkGenerator(object): f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n") def generate_vulkan_spec(self, f): - f.write("# Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n\n") + self._generate_copyright(f, spec_file=True) f.write("@ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr\n") f.write("@ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion\n") @@ -2252,7 +2262,7 @@ class VkGenerator(object): f.write("@ stub {0}\n".format(func.name)) def generate_vulkan_loader_spec(self, f): - f.write("# Automatically generated from Vulkan vk.xml; DO NOT EDIT!\n\n") + self._generate_copyright(f, spec_file=True) # Export symbols for all Vulkan Core functions. for func in self.registry.funcs.values(): @@ -2303,6 +2313,8 @@ class VkRegistry(object): self._parse_features(root) self._parse_extensions(root) + self.copyright = root.find('./comment').text + def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" def mark_bitmask_dependencies(bitmask, types): diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index cdb229d7df32..2f89fdb5bde4 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #include "config.h" #include "wine/port.h" diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f193c4310761..55645afd4735 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 551c7fd89724..b923c6422518 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -1,4 +1,38 @@ # Automatically generated from Vulkan vk.xml; DO NOT EDIT! +# +# This file is generated from Vulkan vk.xml file covered +# by the following copyright and permission notice: +# +# Copyright (c) 2015-2018 The Khronos Group Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ---- Exceptions to the Apache 2.0 License: ---- +# +# As an exception, if you use this Software to generate code and portions of +# this Software are embedded into the generated code as a result, you may +# redistribute such product without providing attribution as would otherwise +# be required by Sections 4(a), 4(b) and 4(d) of the License. +# +# In addition, if you combine or link code generated by this Software with +# software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 +# ("`Combined Software`") and if a court of competent jurisdiction determines +# that the patent provision (Section 3), the indemnity provision (Section 9) +# or other Section of the License conflicts with the conditions of the +# applicable GPL or LGPL license, you may retroactively and prospectively +# choose to deem waived or otherwise exclude such Section(s) of the License, +# but only in their entirety and only with respect to the Combined Software. +# @ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 74ff22b52e08..93e0d0118ff8 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #ifndef __WINE_VULKAN_H #define __WINE_VULKAN_H diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 60d16dd52a24..c11cf33e9c88 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -1,4 +1,39 @@ -/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! */ +/* Automatically generated from Vulkan vk.xml; DO NOT EDIT! + * + * This file is generated from Vulkan vk.xml file covered + * by the following copyright and permission notice: + * + * Copyright (c) 2015-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ---- Exceptions to the Apache 2.0 License: ---- + * + * As an exception, if you use this Software to generate code and portions of + * this Software are embedded into the generated code as a result, you may + * redistribute such product without providing attribution as would otherwise + * be required by Sections 4(a), 4(b) and 4(d) of the License. + * + * In addition, if you combine or link code generated by this Software with + * software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 + * ("`Combined Software`") and if a court of competent jurisdiction determines + * that the patent provision (Section 3), the indemnity provision (Section 9) + * or other Section of the License conflicts with the conditions of the + * applicable GPL or LGPL license, you may retroactively and prospectively + * choose to deem waived or otherwise exclude such Section(s) of the License, + * but only in their entirety and only with respect to the Combined Software. + * + */ #ifndef __WINE_VULKAN_DRIVER_H #define __WINE_VULKAN_DRIVER_H -- 2.16.4

1 0

[PATCH 1/4 v4] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().
by Jactry Zeng 06 Jun '18

06 Jun '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/Makefile.in | 2 +- dlls/riched20/tests/txtsrv.c | 189 ++++++++++++++++++++++++++-------------- 2 files changed, 126 insertions(+), 65 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index 34c00afa7c..ca381d9dc2 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = riched20.dll -IMPORTS = ole32 oleaut32 user32 gdi32 +IMPORTS = ole32 oleaut32 user32 gdi32 usp10 C_SRCS = \ editor.c \ diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 88b5adf13c..76b4eb34f6 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -37,6 +37,7 @@ #include <wine/test.h> #include <oleauto.h> #include <limits.h> +#include <usp10.h> static HMODULE hmoduleRichEdit; static IID *pIID_ITextServices; @@ -697,81 +698,141 @@ static void test_TxSetText(void) ITextHost_Release(host); } +static void hf_from_cf(HFONT *hf, CHARFORMAT2W cf) +{ + LOGFONTW lf; + + memset(&lf, 0, sizeof(lf)); + lstrcpyW(lf.lfFaceName, cf.szFaceName); + lf.lfHeight = MulDiv(-cf.yHeight, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 1440); + lf.lfWeight = FW_NORMAL; + if (cf.dwEffects & cf.dwMask & CFM_BOLD) + lf.lfWeight = FW_BOLD; + if (cf.dwMask & CFM_WEIGHT) + lf.lfWeight = cf.wWeight; + if (cf.dwEffects & cf.dwMask & CFM_ITALIC) + lf.lfItalic = TRUE; + if ((cf.dwEffects & cf.dwMask & CFM_UNDERLINE) && + !(cf.dwEffects & CFE_LINK) && + cf.bUnderlineType == CFU_CF1UNDERLINE) + lf.lfUnderline = TRUE; + if (cf.dwEffects & cf.dwMask & CFM_STRIKEOUT) + lf.lfStrikeOut = TRUE; + if (cf.dwEffects & cf.dwMask & (CFM_SUBSCRIPT | CFM_SUPERSCRIPT)) + lf.lfHeight = (lf.lfHeight * 2) / 3; + if (cf.dwMask & CFM_FACE) + lf.lfPitchAndFamily = cf.bPitchAndFamily; + if (cf.dwMask & CFM_CHARSET) + lf.lfCharSet = cf.bCharSet; + *hf = CreateFontIndirectW(&lf); +} + +static LONG get_max_width(HDC hdc, LPCWSTR string, LONG avail_width, LONG *lines) +{ + SCRIPT_ITEM buf[16], *items = buf; + LONG items_passed = sizeof(buf) / sizeof(buf[0]), num_items; + SCRIPT_CONTROL control = {LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, + FALSE, FALSE, 0}; + SCRIPT_STATE state = {0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0}; + SCRIPT_CACHE script_cache = NULL; + LONG max_glyphs = 1.5 * lstrlenW(string) + 16; + LONG max_clusters = lstrlenW(string) * 2; + WORD *clusters = HeapAlloc(GetProcessHeap(), 0, max_clusters * sizeof(WORD)); + WORD *glyphs = HeapAlloc(GetProcessHeap(), 0, max_glyphs * + (sizeof(WORD) + sizeof(SCRIPT_VISATTR) + sizeof(LONG) + sizeof(GOFFSET))); + SCRIPT_VISATTR *vis_attrs = (SCRIPT_VISATTR *)((char *)glyphs + max_glyphs * sizeof(WORD)); + GOFFSET *offsets = (GOFFSET *)((char *)glyphs + max_glyphs * (sizeof(WORD) + sizeof(SCRIPT_VISATTR) + + sizeof(LONG))); + LONG num_glyphs = 0; + LONG *advances = (LONG *)((char *)glyphs + max_glyphs * (sizeof(WORD) + sizeof(SCRIPT_VISATTR))); + LONG i, width = 0, max_width = 0; + + ScriptItemize(string, lstrlenW(string), items_passed, &control, &state, items, &num_items); + ScriptShape(hdc, &script_cache, string, lstrlenW(string), max_glyphs, &items[0].a, glyphs, + clusters, vis_attrs, &num_glyphs); + ScriptPlace(hdc, &script_cache, glyphs, num_glyphs, vis_attrs, &items[0].a, advances, offsets, + NULL); + + *lines = 1; + for (i = 0; i < num_glyphs; i++) + { + width += advances[i]; + if (width >= avail_width) + { + (*lines)++; + width -= advances[i]; + if (width > max_width) + max_width = width; + width = advances[i]; + } + if (width > max_width) + max_width = width; + } + HeapFree(GetProcessHeap(), 0, clusters); + HeapFree(GetProcessHeap(), 0, glyphs); + return max_width; +} + +#define CHECK_TXGETNATURALSIZE(res,width,height,expected_width,expected_height) \ + _check_txgetnaturalsize(res, width, height, expected_width, expected_height, __LINE__) +static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, LONG expected_width, + LONG expected_height, int line) +{ + ok_(__FILE__,line)(res == S_OK, "TxGetNaturalSize failed: 0x%08x.\n", res); + ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); + ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", + height, expected_height); +} + static void test_TxGetNaturalSize(void) { ITextServices *txtserv; ITextHost *host; HRESULT result; - BOOL ret; - - /* This value is used when calling TxGetNaturalSize. MSDN says - that this is not supported however a null pointer cannot be - used as it will cause a segmentation violation. The values in - the structure being pointed to are required to be INT_MAX - otherwise calculations can give wrong values. */ - const SIZEL psizelExtent = {INT_MAX,INT_MAX}; - - static const WCHAR oneA[] = {'A',0}; - - /* Results of measurements */ - LONG xdim, ydim; - - /* The device context to do the tests in */ + SIZEL psizelExtent = {-1,-1}; + static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + LONG width, height, expected_width, expected_height, lines; HDC hdcDraw; - - /* Variables with the text metric information */ - INT charwidth_caps_text[26]; - TEXTMETRICA tmInfo_text; + HWND hwnd; + RECT rect; + CHARFORMAT2W cf; + LRESULT lresult; + HFONT hf, old_hf; + TEXTMETRICA tm; if (!init_texthost(&txtserv, &host)) return; - hdcDraw = GetDC(NULL); - SaveDC(hdcDraw); - - /* Populate the metric strucs */ - SetMapMode(hdcDraw,MM_TEXT); - GetTextMetricsA(hdcDraw, &tmInfo_text); - SetLastError(0xdeadbeef); - ret = GetCharWidth32A(hdcDraw,'A','Z',charwidth_caps_text); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("GetCharWidth32 is not available\n"); - goto cleanup; - } - - /* Make measurements in MM_TEXT */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 100, 100, 0, 0, 0, NULL); + hdcDraw = GetDC(hwnd); SetMapMode(hdcDraw,MM_TEXT); - xdim = 0; ydim = 0; - - result = ITextServices_TxSetText(txtserv, oneA); - ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); - if (result != S_OK) { - skip("Could not set text\n"); - goto cleanup; - } - - SetLastError(0xdeadbeef); - result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, - hdcDraw, NULL, NULL, - TXTNS_FITTOCONTENT, &psizelExtent, - &xdim, &ydim); - todo_wine ok(result == S_OK || broken(result == E_FAIL), /* WINXP Arabic Language */ - "TxGetNaturalSize gave unexpected return value (result = %x)\n", result); - if (result == S_OK) { - todo_wine ok(ydim == tmInfo_text.tmHeight, - "Height calculated incorrectly (expected %d, got %d)\n", - tmInfo_text.tmHeight, ydim); - /* The native DLL adds one pixel extra when calculating widths. */ - todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, - "Width calculated incorrectly (expected %d {+1}, got %d)\n", - charwidth_caps_text[0], xdim); - } else - skip("TxGetNaturalSize measurements not performed (xdim = %d, ydim = %d, result = %x, error = %x)\n", - xdim, ydim, result, GetLastError()); - -cleanup: - RestoreDC(hdcDraw,1); - ReleaseDC(NULL,hdcDraw); + GetClientRect(hwnd, &rect); + + result = ITextServices_TxSetText(txtserv, test_text); + ok(result == S_OK, "ITextServices_TxSetText failed: 0x%08x.\n", result); + + cf.cbSize = sizeof(cf); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + hf_from_cf(&hf, cf); + + old_hf = SelectObject(hdcDraw, hf); + expected_width = get_max_width(hdcDraw, test_text, rect.right - rect.left, &lines); + GetTextMetricsA(hdcDraw, &tm); + expected_height = (tm.tmAscent + tm.tmDescent) * lines; + SelectObject(hdcDraw, old_hf); + + psizelExtent.cx = -1; psizelExtent.cy = -1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + todo_wine CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); + + ReleaseDC(hwnd, hdcDraw); + DestroyWindow(hwnd); ITextServices_Release(txtserv); ITextHost_Release(host); } -- 2.15.1 (Apple Git-101)

3 2

[PATCH 4/4 v5] riched20: Partially implement ITextServices_TxGetNaturalSize().
by Jactry Zeng 06 Jun '18

06 Jun '18

Superseded patch 146573. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 54 ++++++++++++++++++++++++++++++++++-- dlls/riched20/txtsrv.c | 33 ++++++++++++++++++++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index ac06aa868e..f9c545938a 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -423,9 +423,10 @@ static HRESULT WINAPI ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWORD *pdwBits) { ITextHostTestImpl *This = impl_from_ITextHost(iface); + DWORD bits = TXTBIT_MULTILINE | TXTBIT_WORDWRAP; TRACECALL("Call to TxGetPropertyBits(%p, dwMask=0x%08x, pdwBits=%p)\n", This, dwMask, pdwBits); - *pdwBits = 0; + *pdwBits = bits & dwMask; return S_OK; } @@ -739,6 +740,13 @@ static void test_TxGetNaturalSize(void) HRESULT result; SIZEL psizelExtent = {-1,-1}; static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + static const WCHAR long_text[] = {'T','e','s','t','W','i','t','h','A','L','o','n','g', + 'L','i','n','e','S','t','r','i','n','g',0}; + static const WCHAR long_text1[] = {'T','e','s','t','W','i','t','h','Y','e','t','A','n', + 'o','t','h','o','r','L', 'o','n','g','L','i','n','e', + 'S','t','r','i','n','g','W','h','i','c','h','H','a', + 's','M','o','r','e','T','h','a','n','T','w','o','L', + 'i','n','e','s',0}; LONG width, height; HDC hdcDraw; HWND hwnd; @@ -782,7 +790,49 @@ static void test_TxGetNaturalSize(void) height = 0; result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); - todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, test_text); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, test_text); + + psizelExtent.cx = 1; psizelExtent.cy = 1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, test_text); + + psizelExtent.cx = 0; psizelExtent.cy = 0; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + ok(result == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", result); + ok(!width && !height, "got wrong width and height: (%d, %d) expected (0, 0).\n", width, height); + + psizelExtent.cx = 1; psizelExtent.cy = 1; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, NULL, NULL); + ok(result == E_INVALIDARG, "ITextServices_TxGetNaturalSize should fail: 0x%08x.\n", result); + + /* Test with a long line string */ + result = ITextServices_TxSetText(txtserv, long_text); + ok(result == S_OK, "ITextServices_TxSetText failed result: 0x%08x.\n", result); + + psizelExtent.cx = 1; psizelExtent.cy = 1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, long_text); + + /* Test with string which has more than two lines */ + result = ITextServices_TxSetText(txtserv, long_text1); + ok(result == S_OK, "ITextServices_TxSetText failed result: 0x%08x.\n", result); + + psizelExtent.cx = 1; psizelExtent.cy = 1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, long_text1); ReleaseDC(hwnd, hdcDraw); DestroyWindow(hwnd); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4eff6..f417f46ad1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -320,8 +320,37 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetNaturalSize(ITextServices *iface, { ITextServicesImpl *This = impl_from_ITextServices(iface); - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + if (!pwidth || !pheight) + return E_INVALIDARG; + + TRACE("(%p)->(%p, %x, %p, %p, %p, %x, %p, %p, %p\n)", This, iface, dwAspect, hdcDraw, + hicTargetDev, ptd, dwMode, psizelExtent, pwidth, pheight); + + if (dwAspect != DVASPECT_CONTENT) + FIXME("Unsupported aspect: %x\n", dwAspect); + if (hicTargetDev) + FIXME("Unsupported hicTargetDev: %p\n", hicTargetDev); + if (ptd) + FIXME("Unsupported ptd: %p\n", ptd); + if (dwMode != TXTNS_FITTOCONTENT) + FIXME("Unsupported mode: %x\n", dwMode); + + if (!psizelExtent->cy) + { + *pwidth = 0; + *pheight = 0; + return S_OK; + } + + SetRectEmpty(&This->editor->rcFormat); + This->editor->rcFormat.right = *pwidth; + This->editor->rcFormat.bottom = *pheight; + ME_MarkAllForWrapping(This->editor); + ME_WrapMarkedParagraphs(This->editor, hdcDraw); + *pwidth = This->editor->nTotalWidth; + *pheight = This->editor->nTotalLength; + + return S_OK; } DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget) -- 2.17.1

1 0

[PATCH 1/2] winevulkan: Remove vk.xml from repository.
by Józef Kucia 06 Jun '18

06 Jun '18

The make_vulkan script downloads vk.xml. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 12 +- dlls/winevulkan/vk.xml | 6514 ------------------------------------------- 2 files changed, 11 insertions(+), 6515 deletions(-) delete mode 100644 dlls/winevulkan/vk.xml diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 594ebdd5708c..8bd187674b1c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -20,8 +20,10 @@ import argparse import logging +import os import re import sys +import urllib.request import xml.etree.ElementTree as ET from collections import OrderedDict from collections.abc import Sequence @@ -62,6 +64,8 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) +VK_XML_VERSION = "1.0.51" + # Filenames to create. WINE_VULKAN_H = "../../include/wine/vulkan.h" WINE_VULKAN_DRIVER_H = "../../include/wine/vulkan_driver.h" @@ -2542,6 +2546,10 @@ class VkRegistry(object): self.handles = sorted(handles, key=lambda handle: handle.name) self.structs = sorted(structs, key=lambda struct: struct.name) +def download_vk_xml(filename): + url = "https://raw.github.com/KhronosGroup/Vulkan-Docs/v{0}-core/src/spec/vk.xml".format(VK_XML_VERSION) + if not os.path.isfile(filename): + urllib.request.urlretrieve(url, filename) def main(): parser = argparse.ArgumentParser() @@ -2555,7 +2563,9 @@ def main(): else: # > 1 LOGGER.setLevel(logging.DEBUG) - registry = VkRegistry("vk.xml") + vk_xml = "vk-{0}.xml".format(VK_XML_VERSION) + download_vk_xml(vk_xml) + registry = VkRegistry(vk_xml) generator = VkGenerator(registry) with open(WINE_VULKAN_H, "w") as f: diff --git a/dlls/winevulkan/vk.xml b/dlls/winevulkan/vk.xml deleted file mode 100644 index e013ce8b6035..000000000000 --- a/dlls/winevulkan/vk.xml +++ /dev/null @@ -1,6514 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<registry> - <comment> -Copyright (c) 2015-2017 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - ------------------------------------------------------------------------- - -This file, vk.xml, is the Vulkan API Registry. It is a critically important -and normative part of the Vulkan Specification, including a canonical -machine-readable definition of the API, parameter and member validation -language incorporated into the Specification and reference pages, and other -material which is registered by Khronos, such as tags used by extension and -layer authors. The only authoritative version of vk.xml is the one -maintained in the master branch of the Khronos Vulkan GitHub project. - </comment> - -  - <vendorids> - <vendorid name="KHR" id="0x10000" comment="This is the next available Khronos vendor ID"/> - <vendorid name="VIV" id="0x10001" comment="Vivante vendor ID"/> - <vendorid name="VSI" id="0x10002" comment="VeriSilicon vendor ID"/> - </vendorids> - -  - <tags> - <tag name="IMG" author="Imagination Technologies" contact="Michael Worcester @michaelworcester"/> - <tag name="AMD" author="Advanced Micro Devices, Inc." contact="Daniel Rakos @aqnuep"/> - <tag name="ARM" author="ARM Limited" contact="Jan-Harald Fredriksen @janharald"/> - <tag name="FSL" author="Freescale Semiconductor, Inc." contact="Norbert Nopper @FslNopper"/> - <tag name="BRCM" author="Broadcom Corporation" contact="Graeme Leese @gnl21"/> - <tag name="NXP" author="NXP Semiconductors N.V." contact="Norbert Nopper @FslNopper"/> - <tag name="NV" author="NVIDIA Corporation" contact="Daniel Koch @dgkoch"/> - <tag name="NVX" author="NVIDIA Corporation" contact="Daniel Koch @dgkoch"/> - <tag name="VIV" author="Vivante Corporation" contact="Yanjun Zhang @yanjunzhang"/> - <tag name="VSI" author="VeriSilicon Holdings Co., Ltd." contact="Yanjun Zhang @yanjunzhang"/> - <tag name="KDAB" author="KDAB" contact="Sean Harmer @seanharmer"/> - <tag name="ANDROID" author="Google, Inc." contact="Jesse Hall @jessehall"/> - <tag name="CHROMIUM" author="Google, Inc." contact="Jesse Hall @jessehall"/> - <tag name="GOOGLE" author="Google, Inc." contact="Jesse Hall @jessehall"/> - <tag name="QCOM" author="Qualcomm Technologies, Inc." contact="Maurice Ribble @mribble"/> - <tag name="LUNARG" author="LunarG, Inc." contact="Karen Ghavam @KarenGhavam"/> - <tag name="SAMSUNG" author="Samsung Electronics Co., Ltd." contact="Alon Or-bach @alonorbach"/> - <tag name="SEC" author="Samsung Electronics Co., Ltd." contact="Alon Or-bach @alonorbach"/> - <tag name="TIZEN" author="Samsung Electronics Co., Ltd." contact="Alon Or-bach @alonorbach"/> - <tag name="RENDERDOC" author="RenderDoc (renderdoc.org)" contact="baldurk(a)baldurk.org"/> - <tag name="NN" author="Nintendo Co., Ltd." contact="Yasuhiro Yoshioka @yoshioka_yasuhiro"/> - <tag name="MVK" author="The Brenwill Workshop Ltd." contact="Bill Hollings @billhollings"/> - <tag name="KHR" author="Khronos" contact="Tom Olson @tom.olson"/> - <tag name="EXT" author="Multivendor" contact="Jon Leech @oddhack"/> - <tag name="MESA" author="Mesa open source project" contact="Chad Versace @chadversary, Daniel Stone @fooishbar, David Airlie @airlied, Jason Ekstrand @jekstrand"/> - </tags> - -  - <types> - <type name="vk_platform" category="include">#include "vk_platform.h"</type> -  - <type category="include">#include "<name>vulkan.h</name>"</type> - <type category="include">#include <<name>X11/Xlib.h</name>></type> - <type category="include">#include <<name>X11/extensions/Xrandr.h</name>></type> - <type category="include">#include <<name>android/native_window.h</name>></type> - <type category="include">#include <<name>mir_toolkit/client_types.h</name>></type> - <type category="include">#include <<name>wayland-client.h</name>></type> - <type category="include">#include <<name>windows.h</name>></type> - <type category="include">#include <<name>xcb/xcb.h</name>></type> - - <type requires="X11/Xlib.h" name="Display"/> - <type requires="X11/Xlib.h" name="VisualID"/> - <type requires="X11/Xlib.h" name="Window"/> - <type requires="X11/extensions/Xrandr.h" name="RROutput"/> - <type requires="android/native_window.h" name="ANativeWindow"/> - <type requires="mir_toolkit/client_types.h" name="MirConnection"/> - <type requires="mir_toolkit/client_types.h" name="MirSurface"/> - <type requires="wayland-client.h" name="wl_display"/> - <type requires="wayland-client.h" name="wl_surface"/> - <type requires="windows.h" name="HINSTANCE"/> - <type requires="windows.h" name="HWND"/> - <type requires="windows.h" name="HANDLE"/> - <type requires="windows.h" name="SECURITY_ATTRIBUTES"/> - <type requires="windows.h" name="DWORD"/> - <type requires="windows.h" name="LPCWSTR"/> - <type requires="xcb/xcb.h" name="xcb_connection_t"/> - <type requires="xcb/xcb.h" name="xcb_visualid_t"/> - <type requires="xcb/xcb.h" name="xcb_window_t"/> - - <type category="define">#define <name>VK_MAKE_VERSION</name>(major, minor, patch) \ - (((major) << 22) | ((minor) << 12) | (patch))</type> - <type category="define">#define <name>VK_VERSION_MAJOR</name>(version) ((uint32_t)(version) >> 22)</type> - <type category="define">#define <name>VK_VERSION_MINOR</name>(version) (((uint32_t)(version) >> 12) & 0x3ff)</type> - <type category="define">#define <name>VK_VERSION_PATCH</name>(version) ((uint32_t)(version) & 0xfff)</type> - - <type category="define">// DEPRECATED: This define has been removed. Specific version defines (e.g. VK_API_VERSION_1_0), or the VK_MAKE_VERSION macro, should be used instead. -//#define <name>VK_API_VERSION</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)</type>  - <type category="define">// Vulkan 1.0 version number -#define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)</type>  - <type category="define">// Version of this file -#define <name>VK_HEADER_VERSION</name> 51</type> - - <type category="define"> -#define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type> - - <type category="define" name="VK_DEFINE_NON_DISPATCHABLE_HANDLE"> -#if !defined(VK_DEFINE_NON_DISPATCHABLE_HANDLE) -#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) - #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object; -#else - #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; -#endif -#endif - </type> - - <type category="define"> -#define <name>VK_NULL_HANDLE</name> 0 - </type> - - <type category="basetype">typedef <type>uint32_t</type> <name>VkSampleMask</name>;</type> - <type category="basetype">typedef <type>uint32_t</type> <name>VkBool32</name>;</type> - <type category="basetype">typedef <type>uint32_t</type> <name>VkFlags</name>;</type> - <type category="basetype">typedef <type>uint64_t</type> <name>VkDeviceSize</name>;</type> -  - <type requires="vk_platform" name="void"/> - <type requires="vk_platform" name="char"/> - <type requires="vk_platform" name="float"/> - <type requires="vk_platform" name="uint8_t"/> - <type requires="vk_platform" name="uint32_t"/> - <type requires="vk_platform" name="uint64_t"/> - <type requires="vk_platform" name="int32_t"/> - <type requires="vk_platform" name="size_t"/> - <type name="int"/> -  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkFramebufferCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPoolCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkRenderPassCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkSamplerCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineLayoutCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCacheCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDepthStencilStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDynamicStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineColorBlendStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineMultisampleStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineRasterizationStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineViewportStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineTessellationStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineInputAssemblyStateCreateFlags</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineVertexInputStateCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineShaderStageCreateFlags</name>;</type>  - <type requires="VkDescriptorSetLayoutCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorSetLayoutCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkBufferViewCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkInstanceCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceQueueCreateFlags</name>;</type>  - <type requires="VkQueueFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueueFlags</name>;</type>  - <type requires="VkMemoryPropertyFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryPropertyFlags</name>;</type>  - <type requires="VkMemoryHeapFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryHeapFlags</name>;</type>  - <type requires="VkAccessFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkAccessFlags</name>;</type>  - <type requires="VkBufferUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkBufferUsageFlags</name>;</type>  - <type requires="VkBufferCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkBufferCreateFlags</name>;</type>  - <type requires="VkShaderStageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkShaderStageFlags</name>;</type>  - <type requires="VkImageUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageUsageFlags</name>;</type>  - <type requires="VkImageCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkImageViewCreateFlags</name>;</type>  - <type requires="VkPipelineCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineCreateFlags</name>;</type>  - <type requires="VkColorComponentFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkColorComponentFlags</name>;</type>  - <type requires="VkFenceCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFenceCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkSemaphoreCreateFlags</name>;</type>  - <type requires="VkFormatFeatureFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkFormatFeatureFlags</name>;</type>  - <type requires="VkQueryControlFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryControlFlags</name>;</type>  - <type requires="VkQueryResultFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryResultFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkShaderModuleCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkEventCreateFlags</name>;</type>  - <type requires="VkCommandPoolCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolCreateFlags</name>;</type>  - <type requires="VkCommandPoolResetFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolResetFlags</name>;</type>  - <type requires="VkCommandBufferResetFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferResetFlags</name>;</type>  - <type requires="VkCommandBufferUsageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCommandBufferUsageFlags</name>;</type>  - <type requires="VkQueryPipelineStatisticFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkQueryPipelineStatisticFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryMapFlags</name>;</type>  - <type requires="VkImageAspectFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkImageAspectFlags</name>;</type>  - <type requires="VkSparseMemoryBindFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSparseMemoryBindFlags</name>;</type>  - <type requires="VkSparseImageFormatFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSparseImageFormatFlags</name>;</type>  - <type requires="VkSubpassDescriptionFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSubpassDescriptionFlags</name>;</type>  - <type requires="VkPipelineStageFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineStageFlags</name>;</type>  - <type requires="VkSampleCountFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkSampleCountFlags</name>;</type>  - <type requires="VkAttachmentDescriptionFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkAttachmentDescriptionFlags</name>;</type>  - <type requires="VkStencilFaceFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkStencilFaceFlags</name>;</type>  - <type requires="VkCullModeFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkCullModeFlags</name>;</type>  - <type requires="VkDescriptorPoolCreateFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorPoolCreateFlags</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorPoolResetFlags</name>;</type>  - <type requires="VkDependencyFlagBits" category="bitmask">typedef <type>VkFlags</type> <name>VkDependencyFlags</name>;</type>  - - <type requires="VkIndirectCommandsLayoutUsageFlagBitsNVX" category="bitmask">typedef <type>VkFlags</type> <name>VkIndirectCommandsLayoutUsageFlagsNVX</name>;</type>  - <type requires="VkObjectEntryUsageFlagBitsNVX" category="bitmask">typedef <type>VkFlags</type> <name>VkObjectEntryUsageFlagsNVX</name>;</type>  - - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDescriptorUpdateTemplateCreateFlagsKHR</name>;</type>  -  - <type requires="VkCompositeAlphaFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkCompositeAlphaFlagsKHR</name>;</type> - <type requires="VkDisplayPlaneAlphaFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkDisplayPlaneAlphaFlagsKHR</name>;</type> - <type requires="VkSurfaceTransformFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkSurfaceTransformFlagsKHR</name>;</type> - <type requires="VkSwapchainCreateFlagBitsKHR" category="bitmask">typedef <type>VkFlags</type> <name>VkSwapchainCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDisplayModeCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkDisplaySurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkAndroidSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkMirSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkViSurfaceCreateFlagsNN</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkWaylandSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkWin32SurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkXlibSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkXcbSurfaceCreateFlagsKHR</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkIOSSurfaceCreateFlagsMVK</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkMacOSSurfaceCreateFlagsMVK</name>;</type>  - <type requires="VkPeerMemoryFeatureFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkPeerMemoryFeatureFlagsKHX</name>;</type>  - <type requires="VkMemoryAllocateFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkMemoryAllocateFlagsKHX</name>;</type>  - <type requires="VkDeviceGroupPresentModeFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkDeviceGroupPresentModeFlagsKHX</name>;</type> - - <type requires="VkDebugReportFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkDebugReportFlagsEXT</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkCommandPoolTrimFlagsKHR</name>;</type> - <type requires="VkExternalMemoryHandleTypeFlagBitsNV" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryHandleTypeFlagsNV</name>;</type> - <type requires="VkExternalMemoryFeatureFlagBitsNV" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryFeatureFlagsNV</name>;</type> - <type requires="VkExternalMemoryHandleTypeFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryHandleTypeFlagsKHX</name>;</type> - <type requires="VkExternalMemoryFeatureFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalMemoryFeatureFlagsKHX</name>;</type> - <type requires="VkExternalSemaphoreHandleTypeFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalSemaphoreHandleTypeFlagsKHX</name>;</type> - <type requires="VkExternalSemaphoreFeatureFlagBitsKHX" category="bitmask">typedef <type>VkFlags</type> <name>VkExternalSemaphoreFeatureFlagsKHX</name>;</type> - <type requires="VkSurfaceCounterFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkSurfaceCounterFlagsEXT</name>;</type> - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineViewportSwizzleStateCreateFlagsNV</name>;</type>  - <type category="bitmask">typedef <type>VkFlags</type> <name>VkPipelineDiscardRectangleStateCreateFlagsEXT</name>;</type>  - -  - <type category="handle"><type>VK_DEFINE_HANDLE</type>(<name>VkInstance</name>)</type> - <type category="handle" parent="VkInstance"><type>VK_DEFINE_HANDLE</type>(<name>VkPhysicalDevice</name>)</type> - <type category="handle" parent="VkPhysicalDevice"><type>VK_DEFINE_HANDLE</type>(<name>VkDevice</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_HANDLE</type>(<name>VkQueue</name>)</type> - <type category="handle" parent="VkCommandPool"><type>VK_DEFINE_HANDLE</type>(<name>VkCommandBuffer</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDeviceMemory</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkCommandPool</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkBuffer</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkBufferView</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkImage</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkImageView</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkShaderModule</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkPipeline</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkPipelineLayout</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSampler</name>)</type> - <type category="handle" parent="VkDescriptorPool"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDescriptorSet</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDescriptorSetLayout</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDescriptorPool</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkFence</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSemaphore</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkEvent</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkQueryPool</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkFramebuffer</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkRenderPass</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkPipelineCache</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkObjectTableNVX</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkIndirectCommandsLayoutNVX</name>)</type> - <type category="handle" parent="VkDevice"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDescriptorUpdateTemplateKHR</name>)</type> - -  - <type category="handle"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDisplayKHR</name>)</type> - <type category="handle" parent="VkPhysicalDevice,VkDisplayKHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDisplayModeKHR</name>)</type> - <type category="handle" parent="VkInstance"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSurfaceKHR</name>)</type> - <type category="handle" parent="VkSurfaceKHR"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkSwapchainKHR</name>)</type> - <type category="handle" parent="VkInstance"><type>VK_DEFINE_NON_DISPATCHABLE_HANDLE</type>(<name>VkDebugReportCallbackEXT</name>)</type> - -  - <type name="VkAttachmentLoadOp" category="enum"/> - <type name="VkAttachmentStoreOp" category="enum"/> - <type name="VkBlendFactor" category="enum"/> - <type name="VkBlendOp" category="enum"/> - <type name="VkBorderColor" category="enum"/> - <type name="VkFramebufferCreateFlagBits" category="enum"/> - <type name="VkQueryPoolCreateFlagBits" category="enum"/> - <type name="VkRenderPassCreateFlagBits" category="enum"/> - <type name="VkSamplerCreateFlagBits" category="enum"/> - <type name="VkPipelineCacheHeaderVersion" category="enum"/> - <type name="VkPipelineLayoutCreateFlagBits" category="enum"/> - <type name="VkPipelineCacheCreateFlagBits" category="enum"/> - <type name="VkPipelineDepthStencilStateCreateFlagBits" category="enum"/> - <type name="VkPipelineDynamicStateCreateFlagBits" category="enum"/> - <type name="VkPipelineColorBlendStateCreateFlagBits" category="enum"/> - <type name="VkPipelineMultisampleStateCreateFlagBits" category="enum"/> - <type name="VkPipelineRasterizationStateCreateFlagBits" category="enum"/> - <type name="VkPipelineViewportStateCreateFlagBits" category="enum"/> - <type name="VkPipelineTessellationStateCreateFlagBits" category="enum"/> - <type name="VkPipelineInputAssemblyStateCreateFlagBits" category="enum"/> - <type name="VkPipelineVertexInputStateCreateFlagBits" category="enum"/> - <type name="VkPipelineShaderStageCreateFlagBits" category="enum"/> - <type name="VkDescriptorSetLayoutCreateFlagBits" category="enum"/> - <type name="VkBufferViewCreateFlagBits" category="enum"/> - <type name="VkInstanceCreateFlagBits" category="enum"/> - <type name="VkDeviceQueueCreateFlagBits" category="enum"/> - <type name="VkBufferCreateFlagBits" category="enum"/> - <type name="VkBufferUsageFlagBits" category="enum"/> - <type name="VkColorComponentFlagBits" category="enum"/> - <type name="VkComponentSwizzle" category="enum"/> - <type name="VkCommandPoolCreateFlagBits" category="enum"/> - <type name="VkCommandPoolResetFlagBits" category="enum"/> - <type name="VkCommandBufferResetFlagBits" category="enum"/> - <type name="VkCommandBufferLevel" category="enum"/> - <type name="VkCommandBufferUsageFlagBits" category="enum"/> - <type name="VkCompareOp" category="enum"/> - <type name="VkCullModeFlagBits" category="enum"/> - <type name="VkDescriptorType" category="enum"/> - <type name="VkDeviceCreateFlagBits" category="enum"/> - <type name="VkDynamicState" category="enum"/> - <type name="VkFenceCreateFlagBits" category="enum"/> - <type name="VkPolygonMode" category="enum"/> - <type name="VkFormat" category="enum"/> - <type name="VkFormatFeatureFlagBits" category="enum"/> - <type name="VkFrontFace" category="enum"/> - <type name="VkImageAspectFlagBits" category="enum"/> - <type name="VkImageCreateFlagBits" category="enum"/> - <type name="VkImageLayout" category="enum"/> - <type name="VkImageTiling" category="enum"/> - <type name="VkImageType" category="enum"/> - <type name="VkImageUsageFlagBits" category="enum"/> - <type name="VkImageViewType" category="enum"/> - <type name="VkSharingMode" category="enum"/> - <type name="VkIndexType" category="enum"/> - <type name="VkLogicOp" category="enum"/> - <type name="VkMemoryHeapFlagBits" category="enum"/> - <type name="VkAccessFlagBits" category="enum"/> - <type name="VkMemoryPropertyFlagBits" category="enum"/> - <type name="VkPhysicalDeviceType" category="enum"/> - <type name="VkPipelineBindPoint" category="enum"/> - <type name="VkPipelineCreateFlagBits" category="enum"/> - <type name="VkPrimitiveTopology" category="enum"/> - <type name="VkQueryControlFlagBits" category="enum"/> - <type name="VkQueryPipelineStatisticFlagBits" category="enum"/> - <type name="VkQueryResultFlagBits" category="enum"/> - <type name="VkQueryType" category="enum"/> - <type name="VkQueueFlagBits" category="enum"/> - <type name="VkSubpassContents" category="enum"/> - <type name="VkResult" category="enum"/> - <type name="VkShaderStageFlagBits" category="enum"/> - <type name="VkSparseMemoryBindFlagBits" category="enum"/> - <type name="VkStencilFaceFlagBits" category="enum"/> - <type name="VkStencilOp" category="enum"/> - <type name="VkStructureType" category="enum"/> - <type name="VkSystemAllocationScope" category="enum"/> - <type name="VkInternalAllocationType" category="enum"/> - <type name="VkSamplerAddressMode" category="enum"/> - <type name="VkFilter" category="enum"/> - <type name="VkSamplerMipmapMode" category="enum"/> - <type name="VkVertexInputRate" category="enum"/> - <type name="VkPipelineStageFlagBits" category="enum"/> - <type name="VkSparseImageFormatFlagBits" category="enum"/> - <type name="VkSampleCountFlagBits" category="enum"/> - <type name="VkAttachmentDescriptionFlagBits" category="enum"/> - <type name="VkDescriptorPoolCreateFlagBits" category="enum"/> - <type name="VkDependencyFlagBits" category="enum"/> - <type name="VkObjectType" category="enum"/> -  - <type name="VkIndirectCommandsLayoutUsageFlagBitsNVX" category="enum"/> - <type name="VkIndirectCommandsTokenTypeNVX" category="enum"/> - <type name="VkObjectEntryUsageFlagBitsNVX" category="enum"/> - <type name="VkObjectEntryTypeNVX" category="enum"/> - <type name="VkDescriptorUpdateTemplateTypeKHR" category="enum"/> - <type name="VkViewportCoordinateSwizzleNV" category="enum"/> - <type name="VkDiscardRectangleModeEXT" category="enum"/> - <type name="VkSubpassDescriptionFlagBits" category="enum"/> -  - <type name="VkColorSpaceKHR" category="enum"/> - <type name="VkCompositeAlphaFlagBitsKHR" category="enum"/> - <type name="VkDisplayPlaneAlphaFlagBitsKHR" category="enum"/> - <type name="VkPresentModeKHR" category="enum"/> - <type name="VkSurfaceTransformFlagBitsKHR" category="enum"/> - <type name="VkDebugReportFlagBitsEXT" category="enum"/> - <type name="VkDebugReportObjectTypeEXT" category="enum"/> - <type name="VkRasterizationOrderAMD" category="enum"/> - <type name="VkExternalMemoryHandleTypeFlagBitsNV" category="enum"/> - <type name="VkExternalMemoryFeatureFlagBitsNV" category="enum"/> - <type name="VkValidationCheckEXT" category="enum"/> - <type name="VkExternalMemoryHandleTypeFlagBitsKHX" category="enum"/> - <type name="VkExternalMemoryFeatureFlagBitsKHX" category="enum"/> - <type name="VkExternalSemaphoreHandleTypeFlagBitsKHX" category="enum"/> - <type name="VkExternalSemaphoreFeatureFlagBitsKHX" category="enum"/> - <type name="VkSurfaceCounterFlagBitsEXT" category="enum"/> - <type name="VkDisplayPowerStateEXT" category="enum"/> - <type name="VkDeviceEventTypeEXT" category="enum"/> - <type name="VkDisplayEventTypeEXT" category="enum"/> - <type name="VkPeerMemoryFeatureFlagBitsKHX" category="enum"/> - <type name="VkMemoryAllocateFlagBitsKHX" category="enum"/> - <type name="VkDeviceGroupPresentModeFlagBitsKHX" category="enum"/> - <type name="VkSwapchainCreateFlagBitsKHR" category="enum"/> - -  - <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkInternalAllocationNotification</name>)( - <type>void</type>* pUserData, - <type>size_t</type> size, - <type>VkInternalAllocationType</type> allocationType, - <type>VkSystemAllocationScope</type> allocationScope);</type> - <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkInternalFreeNotification</name>)( - <type>void</type>* pUserData, - <type>size_t</type> size, - <type>VkInternalAllocationType</type> allocationType, - <type>VkSystemAllocationScope</type> allocationScope);</type> - <type category="funcpointer">typedef void* (VKAPI_PTR *<name>PFN_vkReallocationFunction</name>)( - <type>void</type>* pUserData, - <type>void</type>* pOriginal, - <type>size_t</type> size, - <type>size_t</type> alignment, - <type>VkSystemAllocationScope</type> allocationScope);</type> - <type category="funcpointer">typedef void* (VKAPI_PTR *<name>PFN_vkAllocationFunction</name>)( - <type>void</type>* pUserData, - <type>size_t</type> size, - <type>size_t</type> alignment, - <type>VkSystemAllocationScope</type> allocationScope);</type> - <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkFreeFunction</name>)( - <type>void</type>* pUserData, - <type>void</type>* pMemory);</type> - -  - <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkVoidFunction</name>)(void);</type> - -  - <type category="funcpointer">typedef VkBool32 (VKAPI_PTR *<name>PFN_vkDebugReportCallbackEXT</name>)( - <type>VkDebugReportFlagsEXT</type> flags, - <type>VkDebugReportObjectTypeEXT</type> objectType, - <type>uint64_t</type> object, - <type>size_t</type> location, - <type>int32_t</type> messageCode, - const <type>char</type>* pLayerPrefix, - const <type>char</type>* pMessage, - <type>void</type>* pUserData);</type> - -  - <type category="struct" name="VkOffset2D"> - <member><type>int32_t</type> <name>x</name></member> - <member><type>int32_t</type> <name>y</name></member> - </type> - <type category="struct" name="VkOffset3D"> - <member><type>int32_t</type> <name>x</name></member> - <member><type>int32_t</type> <name>y</name></member> - <member><type>int32_t</type> <name>z</name></member> - </type> - <type category="struct" name="VkExtent2D"> - <member><type>uint32_t</type> <name>width</name></member> - <member><type>uint32_t</type> <name>height</name></member> - </type> - <type category="struct" name="VkExtent3D"> - <member><type>uint32_t</type> <name>width</name></member> - <member><type>uint32_t</type> <name>height</name></member> - <member><type>uint32_t</type> <name>depth</name></member> - </type> - <type category="struct" name="VkViewport"> - <member><type>float</type> <name>x</name></member> - <member><type>float</type> <name>y</name></member> - <member><type>float</type> <name>width</name></member> - <member><type>float</type> <name>height</name></member> - <member><type>float</type> <name>minDepth</name></member> - <member><type>float</type> <name>maxDepth</name></member> - </type> - <type category="struct" name="VkRect2D"> - <member><type>VkOffset2D</type> <name>offset</name></member> - <member><type>VkExtent2D</type> <name>extent</name></member> - </type> - <type category="struct" name="VkRect3D"> - <member><type>VkOffset3D</type> <name>offset</name></member> - <member><type>VkExtent3D</type> <name>extent</name></member> - </type> - <type category="struct" name="VkClearRect"> - <member><type>VkRect2D</type> <name>rect</name></member> - <member><type>uint32_t</type> <name>baseArrayLayer</name></member> - <member><type>uint32_t</type> <name>layerCount</name></member> - </type> - <type category="struct" name="VkComponentMapping"> - <member><type>VkComponentSwizzle</type> <name>r</name></member> - <member><type>VkComponentSwizzle</type> <name>g</name></member> - <member><type>VkComponentSwizzle</type> <name>b</name></member> - <member><type>VkComponentSwizzle</type> <name>a</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceProperties" returnedonly="true"> - <member><type>uint32_t</type> <name>apiVersion</name></member> - <member><type>uint32_t</type> <name>driverVersion</name></member> - <member><type>uint32_t</type> <name>vendorID</name></member> - <member><type>uint32_t</type> <name>deviceID</name></member> - <member><type>VkPhysicalDeviceType</type> <name>deviceType</name></member> - <member><type>char</type> <name>deviceName</name>[<enum>VK_MAX_PHYSICAL_DEVICE_NAME_SIZE</enum>]</member> - <member><type>uint8_t</type> <name>pipelineCacheUUID</name>[<enum>VK_UUID_SIZE</enum>]</member> - <member><type>VkPhysicalDeviceLimits</type> <name>limits</name></member> - <member><type>VkPhysicalDeviceSparseProperties</type> <name>sparseProperties</name></member> - </type> - <type category="struct" name="VkExtensionProperties" returnedonly="true"> - <member><type>char</type> <name>extensionName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>  - <member><type>uint32_t</type> <name>specVersion</name></member>  - </type> - <type category="struct" name="VkLayerProperties" returnedonly="true"> - <member><type>char</type> <name>layerName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member>  - <member><type>uint32_t</type> <name>specVersion</name></member>  - <member><type>uint32_t</type> <name>implementationVersion</name></member>  - <member><type>char</type> <name>description</name>[<enum>VK_MAX_DESCRIPTION_SIZE</enum>]</member>  - </type> - <type category="struct" name="VkApplicationInfo"> - <member values="VK_STRUCTURE_TYPE_APPLICATION_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true" len="null-terminated">const <type>char</type>* <name>pApplicationName</name></member> - <member><type>uint32_t</type> <name>applicationVersion</name></member> - <member optional="true" len="null-terminated">const <type>char</type>* <name>pEngineName</name></member> - <member><type>uint32_t</type> <name>engineVersion</name></member> - <member><type>uint32_t</type> <name>apiVersion</name></member> - </type> - <type category="struct" name="VkAllocationCallbacks"> - <member optional="true"><type>void</type>* <name>pUserData</name></member> - <member><type>PFN_vkAllocationFunction</type> <name>pfnAllocation</name></member> - <member><type>PFN_vkReallocationFunction</type> <name>pfnReallocation</name></member> - <member><type>PFN_vkFreeFunction</type> <name>pfnFree</name></member> - <member optional="true"><type>PFN_vkInternalAllocationNotification</type> <name>pfnInternalAllocation</name></member> - <member optional="true"><type>PFN_vkInternalFreeNotification</type> <name>pfnInternalFree</name></member> - </type> - <type category="struct" name="VkDeviceQueueCreateInfo"> - <member values="VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDeviceQueueCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>queueFamilyIndex</name></member> - <member><type>uint32_t</type> <name>queueCount</name></member> - <member len="queueCount">const <type>float</type>* <name>pQueuePriorities</name></member> - </type> - <type category="struct" name="VkDeviceCreateInfo"> - <member values="VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDeviceFeatures2KHR,VkPhysicalDeviceMultiviewFeaturesKHX,VkDeviceGroupDeviceCreateInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDeviceCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>queueCreateInfoCount</name></member> - <member len="queueCreateInfoCount">const <type>VkDeviceQueueCreateInfo</type>* <name>pQueueCreateInfos</name></member> - <member optional="true"><type>uint32_t</type> <name>enabledLayerCount</name></member> - <member len="enabledLayerCount,null-terminated">const <type>char</type>* const* <name>ppEnabledLayerNames</name></member>  - <member optional="true"><type>uint32_t</type> <name>enabledExtensionCount</name></member> - <member len="enabledExtensionCount,null-terminated">const <type>char</type>* const* <name>ppEnabledExtensionNames</name></member> - <member optional="true">const <type>VkPhysicalDeviceFeatures</type>* <name>pEnabledFeatures</name></member> - </type> - <type category="struct" name="VkInstanceCreateInfo"> - <member values="VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDebugReportCallbackCreateInfoEXT">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkInstanceCreateFlags</type> <name>flags</name></member>  - <member optional="true">const <type>VkApplicationInfo</type>* <name>pApplicationInfo</name></member> - <member optional="true"><type>uint32_t</type> <name>enabledLayerCount</name></member> - <member len="enabledLayerCount,null-terminated">const <type>char</type>* const* <name>ppEnabledLayerNames</name></member>  - <member optional="true"><type>uint32_t</type> <name>enabledExtensionCount</name></member> - <member len="enabledExtensionCount,null-terminated">const <type>char</type>* const* <name>ppEnabledExtensionNames</name></member>  - </type> - <type category="struct" name="VkQueueFamilyProperties" returnedonly="true"> - <member optional="true"><type>VkQueueFlags</type> <name>queueFlags</name></member>  - <member><type>uint32_t</type> <name>queueCount</name></member> - <member><type>uint32_t</type> <name>timestampValidBits</name></member> - <member><type>VkExtent3D</type> <name>minImageTransferGranularity</name></member>  - </type> - <type category="struct" name="VkPhysicalDeviceMemoryProperties" returnedonly="true"> - <member><type>uint32_t</type> <name>memoryTypeCount</name></member> - <member><type>VkMemoryType</type> <name>memoryTypes</name>[<enum>VK_MAX_MEMORY_TYPES</enum>]</member> - <member><type>uint32_t</type> <name>memoryHeapCount</name></member> - <member><type>VkMemoryHeap</type> <name>memoryHeaps</name>[<enum>VK_MAX_MEMORY_HEAPS</enum>]</member> - </type> - <type category="struct" name="VkMemoryAllocateInfo"> - <member values="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDedicatedAllocationMemoryAllocateInfoNV,VkMemoryAllocateFlagsInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDeviceSize</type> <name>allocationSize</name></member>  - <member><type>uint32_t</type> <name>memoryTypeIndex</name></member>  - </type> - <type category="struct" name="VkMemoryRequirements" returnedonly="true"> - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member><type>VkDeviceSize</type> <name>alignment</name></member>  - <member><type>uint32_t</type> <name>memoryTypeBits</name></member>  - </type> - <type category="struct" name="VkSparseImageFormatProperties" returnedonly="true"> - <member optional="true"><type>VkImageAspectFlags</type> <name>aspectMask</name></member> - <member><type>VkExtent3D</type> <name>imageGranularity</name></member> - <member optional="true"><type>VkSparseImageFormatFlags</type> <name>flags</name></member> - </type> - <type category="struct" name="VkSparseImageMemoryRequirements" returnedonly="true"> - <member><type>VkSparseImageFormatProperties</type> <name>formatProperties</name></member> - <member><type>uint32_t</type> <name>imageMipTailFirstLod</name></member> - <member><type>VkDeviceSize</type> <name>imageMipTailSize</name></member>  - <member><type>VkDeviceSize</type> <name>imageMipTailOffset</name></member>  - <member><type>VkDeviceSize</type> <name>imageMipTailStride</name></member>  - </type> - <type category="struct" name="VkMemoryType" returnedonly="true"> - <member optional="true"><type>VkMemoryPropertyFlags</type> <name>propertyFlags</name></member>  - <member><type>uint32_t</type> <name>heapIndex</name></member>  - </type> - <type category="struct" name="VkMemoryHeap" returnedonly="true"> - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member optional="true"><type>VkMemoryHeapFlags</type> <name>flags</name></member>  - </type> - <type category="struct" name="VkMappedMemoryRange"> - <member values="VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDeviceMemory</type> <name>memory</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - </type> - <type category="struct" name="VkFormatProperties" returnedonly="true"> - <member optional="true"><type>VkFormatFeatureFlags</type> <name>linearTilingFeatures</name></member>  - <member optional="true"><type>VkFormatFeatureFlags</type> <name>optimalTilingFeatures</name></member>  - <member optional="true"><type>VkFormatFeatureFlags</type> <name>bufferFeatures</name></member>  - </type> - <type category="struct" name="VkImageFormatProperties" returnedonly="true"> - <member><type>VkExtent3D</type> <name>maxExtent</name></member>  - <member><type>uint32_t</type> <name>maxMipLevels</name></member>  - <member><type>uint32_t</type> <name>maxArrayLayers</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampleCounts</name></member>  - <member><type>VkDeviceSize</type> <name>maxResourceSize</name></member>  - </type> - <type category="struct" name="VkDescriptorBufferInfo"> - <member><type>VkBuffer</type> <name>buffer</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>range</name></member>  - </type> - <type category="struct" name="VkDescriptorImageInfo"> - <member noautovalidity="true"><type>VkSampler</type> <name>sampler</name></member>  - <member noautovalidity="true"><type>VkImageView</type> <name>imageView</name></member>  - <member noautovalidity="true"><type>VkImageLayout</type> <name>imageLayout</name></member>  - </type> - <type category="struct" name="VkWriteDescriptorSet"> - <member values="VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member noautovalidity="true"><type>VkDescriptorSet</type> <name>dstSet</name></member>  - <member><type>uint32_t</type> <name>dstBinding</name></member>  - <member><type>uint32_t</type> <name>dstArrayElement</name></member>  - <member><type>uint32_t</type> <name>descriptorCount</name></member>  - <member><type>VkDescriptorType</type> <name>descriptorType</name></member>  - <member noautovalidity="true" len="descriptorCount">const <type>VkDescriptorImageInfo</type>* <name>pImageInfo</name></member>  - <member noautovalidity="true" len="descriptorCount">const <type>VkDescriptorBufferInfo</type>* <name>pBufferInfo</name></member>  - <member noautovalidity="true" len="descriptorCount">const <type>VkBufferView</type>* <name>pTexelBufferView</name></member>  - </type> - <type category="struct" name="VkCopyDescriptorSet"> - <member values="VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDescriptorSet</type> <name>srcSet</name></member>  - <member><type>uint32_t</type> <name>srcBinding</name></member>  - <member><type>uint32_t</type> <name>srcArrayElement</name></member>  - <member><type>VkDescriptorSet</type> <name>dstSet</name></member>  - <member><type>uint32_t</type> <name>dstBinding</name></member>  - <member><type>uint32_t</type> <name>dstArrayElement</name></member>  - <member><type>uint32_t</type> <name>descriptorCount</name></member>  - </type> - <type category="struct" name="VkBufferCreateInfo"> - <member values="VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDedicatedAllocationBufferCreateInfoNV">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkBufferCreateFlags</type> <name>flags</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member><type>VkBufferUsageFlags</type> <name>usage</name></member>  - <member><type>VkSharingMode</type> <name>sharingMode</name></member> - <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name></member> - <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name></member> - </type> - <type category="struct" name="VkBufferViewCreateInfo"> - <member values="VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkBufferViewCreateFlags</type><name>flags</name></member>  - <member><type>VkBuffer</type> <name>buffer</name></member> - <member><type>VkFormat</type> <name>format</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>range</name></member>  - </type> - <type category="struct" name="VkImageSubresource"> - <member><type>VkImageAspectFlags</type> <name>aspectMask</name></member> - <member><type>uint32_t</type> <name>mipLevel</name></member> - <member><type>uint32_t</type> <name>arrayLayer</name></member> - </type> - <type category="struct" name="VkImageSubresourceLayers"> - <member><type>VkImageAspectFlags</type> <name>aspectMask</name></member> - <member><type>uint32_t</type> <name>mipLevel</name></member> - <member><type>uint32_t</type> <name>baseArrayLayer</name></member> - <member><type>uint32_t</type> <name>layerCount</name></member> - </type> - <type category="struct" name="VkImageSubresourceRange"> - <member><type>VkImageAspectFlags</type> <name>aspectMask</name></member> - <member><type>uint32_t</type> <name>baseMipLevel</name></member> - <member><type>uint32_t</type> <name>levelCount</name></member> - <member><type>uint32_t</type> <name>baseArrayLayer</name></member> - <member><type>uint32_t</type> <name>layerCount</name></member> - </type> - <type category="struct" name="VkMemoryBarrier"> - <member values="VK_STRUCTURE_TYPE_MEMORY_BARRIER"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  - </type> - <type category="struct" name="VkBufferMemoryBarrier"> - <member values="VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  - <member><type>uint32_t</type> <name>srcQueueFamilyIndex</name></member>  - <member><type>uint32_t</type> <name>dstQueueFamilyIndex</name></member>  - <member><type>VkBuffer</type> <name>buffer</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - </type> - <type category="struct" name="VkImageMemoryBarrier"> - <member values="VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  - <member><type>VkImageLayout</type> <name>oldLayout</name></member>  - <member><type>VkImageLayout</type> <name>newLayout</name></member>  - <member><type>uint32_t</type> <name>srcQueueFamilyIndex</name></member>  - <member><type>uint32_t</type> <name>dstQueueFamilyIndex</name></member>  - <member><type>VkImage</type> <name>image</name></member>  - <member><type>VkImageSubresourceRange</type> <name>subresourceRange</name></member>  - </type> - <type category="struct" name="VkImageCreateInfo"> - <member values="VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDedicatedAllocationImageCreateInfoNV,VkImageSwapchainCreateInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImageCreateFlags</type> <name>flags</name></member>  - <member><type>VkImageType</type> <name>imageType</name></member> - <member><type>VkFormat</type> <name>format</name></member> - <member><type>VkExtent3D</type> <name>extent</name></member> - <member><type>uint32_t</type> <name>mipLevels</name></member> - <member><type>uint32_t</type> <name>arrayLayers</name></member> - <member><type>VkSampleCountFlagBits</type> <name>samples</name></member> - <member><type>VkImageTiling</type> <name>tiling</name></member> - <member><type>VkImageUsageFlags</type> <name>usage</name></member>  - <member><type>VkSharingMode</type> <name>sharingMode</name></member>  - <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name></member>  - <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name></member>  - <member><type>VkImageLayout</type> <name>initialLayout</name></member>  - </type> - <type category="struct" name="VkSubresourceLayout" returnedonly="true"> - <member><type>VkDeviceSize</type> <name>offset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member><type>VkDeviceSize</type> <name>rowPitch</name></member>  - <member><type>VkDeviceSize</type> <name>arrayPitch</name></member>  - <member><type>VkDeviceSize</type> <name>depthPitch</name></member>  - </type> - <type category="struct" name="VkImageViewCreateInfo"> - <member values="VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImageViewCreateFlags</type> <name>flags</name></member>  - <member><type>VkImage</type> <name>image</name></member> - <member><type>VkImageViewType</type> <name>viewType</name></member> - <member><type>VkFormat</type> <name>format</name></member> - <member><type>VkComponentMapping</type> <name>components</name></member> - <member><type>VkImageSubresourceRange</type> <name>subresourceRange</name></member> - </type> - <type category="struct" name="VkBufferCopy"> - <member><type>VkDeviceSize</type> <name>srcOffset</name></member>  - <member><type>VkDeviceSize</type> <name>dstOffset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - </type> - <type category="struct" name="VkSparseMemoryBind"> - <member><type>VkDeviceSize</type> <name>resourceOffset</name></member>  - <member><type>VkDeviceSize</type> <name>size</name></member>  - <member optional="true"><type>VkDeviceMemory</type> <name>memory</name></member> - <member><type>VkDeviceSize</type> <name>memoryOffset</name></member>  - <member optional="true"><type>VkSparseMemoryBindFlags</type><name>flags</name></member>  - </type> - <type category="struct" name="VkSparseImageMemoryBind"> - <member><type>VkImageSubresource</type> <name>subresource</name></member> - <member><type>VkOffset3D</type> <name>offset</name></member> - <member><type>VkExtent3D</type> <name>extent</name></member> - <member optional="true"><type>VkDeviceMemory</type> <name>memory</name></member> - <member><type>VkDeviceSize</type> <name>memoryOffset</name></member>  - <member optional="true"><type>VkSparseMemoryBindFlags</type><name>flags</name></member>  - </type> - <type category="struct" name="VkSparseBufferMemoryBindInfo"> - <member><type>VkBuffer</type> <name>buffer</name></member> - <member><type>uint32_t</type> <name>bindCount</name></member> - <member len="bindCount">const <type>VkSparseMemoryBind</type>* <name>pBinds</name></member> - </type> - <type category="struct" name="VkSparseImageOpaqueMemoryBindInfo"> - <member><type>VkImage</type> <name>image</name></member> - <member><type>uint32_t</type> <name>bindCount</name></member> - <member len="bindCount">const <type>VkSparseMemoryBind</type>* <name>pBinds</name></member> - </type> - <type category="struct" name="VkSparseImageMemoryBindInfo"> - <member><type>VkImage</type> <name>image</name></member> - <member><type>uint32_t</type> <name>bindCount</name></member> - <member len="bindCount">const <type>VkSparseImageMemoryBind</type>* <name>pBinds</name></member> - </type> - <type category="struct" name="VkBindSparseInfo"> - <member values="VK_STRUCTURE_TYPE_BIND_SPARSE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupBindSparseInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member> - <member len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></member> - <member optional="true"><type>uint32_t</type> <name>bufferBindCount</name></member> - <member len="bufferBindCount">const <type>VkSparseBufferMemoryBindInfo</type>* <name>pBufferBinds</name></member> - <member optional="true"><type>uint32_t</type> <name>imageOpaqueBindCount</name></member> - <member len="imageOpaqueBindCount">const <type>VkSparseImageOpaqueMemoryBindInfo</type>* <name>pImageOpaqueBinds</name></member> - <member optional="true"><type>uint32_t</type> <name>imageBindCount</name></member> - <member len="imageBindCount">const <type>VkSparseImageMemoryBindInfo</type>* <name>pImageBinds</name></member> - <member optional="true"><type>uint32_t</type> <name>signalSemaphoreCount</name></member> - <member len="signalSemaphoreCount">const <type>VkSemaphore</type>* <name>pSignalSemaphores</name></member> - </type> - <type category="struct" name="VkImageCopy"> - <member><type>VkImageSubresourceLayers</type> <name>srcSubresource</name></member> - <member><type>VkOffset3D</type> <name>srcOffset</name></member>  - <member><type>VkImageSubresourceLayers</type> <name>dstSubresource</name></member> - <member><type>VkOffset3D</type> <name>dstOffset</name></member>  - <member><type>VkExtent3D</type> <name>extent</name></member>  - </type> - <type category="struct" name="VkImageBlit"> - <member><type>VkImageSubresourceLayers</type> <name>srcSubresource</name></member> - <member><type>VkOffset3D</type> <name>srcOffsets</name>[2]</member>  - <member><type>VkImageSubresourceLayers</type> <name>dstSubresource</name></member> - <member><type>VkOffset3D</type> <name>dstOffsets</name>[2]</member>  - </type> - <type category="struct" name="VkBufferImageCopy"> - <member><type>VkDeviceSize</type> <name>bufferOffset</name></member>  - <member><type>uint32_t</type> <name>bufferRowLength</name></member>  - <member><type>uint32_t</type> <name>bufferImageHeight</name></member> - <member><type>VkImageSubresourceLayers</type> <name>imageSubresource</name></member> - <member><type>VkOffset3D</type> <name>imageOffset</name></member>  - <member><type>VkExtent3D</type> <name>imageExtent</name></member>  - </type> - <type category="struct" name="VkImageResolve"> - <member><type>VkImageSubresourceLayers</type> <name>srcSubresource</name></member> - <member><type>VkOffset3D</type> <name>srcOffset</name></member> - <member><type>VkImageSubresourceLayers</type> <name>dstSubresource</name></member> - <member><type>VkOffset3D</type> <name>dstOffset</name></member> - <member><type>VkExtent3D</type> <name>extent</name></member> - </type> - <type category="struct" name="VkShaderModuleCreateInfo"> - <member values="VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkShaderModuleCreateFlags</type> <name>flags</name></member>  - <member><type>size_t</type> <name>codeSize</name></member>  - <member len="latexmath:[codeSize \over 4]">const <type>uint32_t</type>* <name>pCode</name></member>  - </type> - <type category="struct" name="VkDescriptorSetLayoutBinding"> - <member><type>uint32_t</type> <name>binding</name></member>  - <member><type>VkDescriptorType</type> <name>descriptorType</name></member>  - <member optional="true"><type>uint32_t</type> <name>descriptorCount</name></member>  - <member noautovalidity="true"><type>VkShaderStageFlags</type> <name>stageFlags</name></member>  - <member noautovalidity="true" optional="true" len="descriptorCount">const <type>VkSampler</type>* <name>pImmutableSamplers</name></member>  - </type> - <type category="struct" name="VkDescriptorSetLayoutCreateInfo"> - <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDescriptorSetLayoutCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>bindingCount</name></member>  - <member len="bindingCount">const <type>VkDescriptorSetLayoutBinding</type>* <name>pBindings</name></member>  - </type> - <type category="struct" name="VkDescriptorPoolSize"> - <member><type>VkDescriptorType</type> <name>type</name></member> - <member><type>uint32_t</type> <name>descriptorCount</name></member> - </type> - <type category="struct" name="VkDescriptorPoolCreateInfo"> - <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDescriptorPoolCreateFlags</type> <name>flags</name></member> - <member><type>uint32_t</type> <name>maxSets</name></member> - <member><type>uint32_t</type> <name>poolSizeCount</name></member> - <member len="poolSizeCount">const <type>VkDescriptorPoolSize</type>* <name>pPoolSizes</name></member> - </type> - <type category="struct" name="VkDescriptorSetAllocateInfo"> - <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDescriptorPool</type> <name>descriptorPool</name></member> - <member><type>uint32_t</type> <name>descriptorSetCount</name></member> - <member len="descriptorSetCount">const <type>VkDescriptorSetLayout</type>* <name>pSetLayouts</name></member> - </type> - <type category="struct" name="VkSpecializationMapEntry"> - <member><type>uint32_t</type> <name>constantID</name></member>  - <member><type>uint32_t</type> <name>offset</name></member>  - <member><type>size_t</type> <name>size</name></member>  - </type> - <type category="struct" name="VkSpecializationInfo"> - <member optional="true"><type>uint32_t</type> <name>mapEntryCount</name></member>  - <member len="mapEntryCount" noautovalidity="true">const <type>VkSpecializationMapEntry</type>* <name>pMapEntries</name></member>  - <member optional="true"><type>size_t</type> <name>dataSize</name></member>  - <member len="dataSize">const <type>void</type>* <name>pData</name></member>  - </type> - <type category="struct" name="VkPipelineShaderStageCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineShaderStageCreateFlags</type> <name>flags</name></member>  - <member><type>VkShaderStageFlagBits</type> <name>stage</name></member>  - <member><type>VkShaderModule</type> <name>module</name></member>  - <member len="null-terminated">const <type>char</type>* <name>pName</name></member>  - <member optional="true">const <type>VkSpecializationInfo</type>* <name>pSpecializationInfo</name></member> - </type> - <type category="struct" name="VkComputePipelineCreateInfo"> - <member values="VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineCreateFlags</type> <name>flags</name></member>  - <member><type>VkPipelineShaderStageCreateInfo</type> <name>stage</name></member> - <member><type>VkPipelineLayout</type> <name>layout</name></member>  - <member noautovalidity="true" optional="true"><type>VkPipeline</type> <name>basePipelineHandle</name></member>  - <member><type>int32_t</type> <name>basePipelineIndex</name></member>  - </type> - <type category="struct" name="VkVertexInputBindingDescription"> - <member><type>uint32_t</type> <name>binding</name></member>  - <member><type>uint32_t</type> <name>stride</name></member>  - <member><type>VkVertexInputRate</type> <name>inputRate</name></member>  - </type> - <type category="struct" name="VkVertexInputAttributeDescription"> - <member><type>uint32_t</type> <name>location</name></member>  - <member><type>uint32_t</type> <name>binding</name></member>  - <member><type>VkFormat</type> <name>format</name></member>  - <member><type>uint32_t</type> <name>offset</name></member>  - </type> - <type category="struct" name="VkPipelineVertexInputStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineVertexInputStateCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>vertexBindingDescriptionCount</name></member>  - <member len="vertexBindingDescriptionCount">const <type>VkVertexInputBindingDescription</type>* <name>pVertexBindingDescriptions</name></member> - <member optional="true"><type>uint32_t</type> <name>vertexAttributeDescriptionCount</name></member>  - <member len="vertexAttributeDescriptionCount">const <type>VkVertexInputAttributeDescription</type>* <name>pVertexAttributeDescriptions</name></member> - </type> - <type category="struct" name="VkPipelineInputAssemblyStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineInputAssemblyStateCreateFlags</type> <name>flags</name></member>  - <member><type>VkPrimitiveTopology</type> <name>topology</name></member> - <member><type>VkBool32</type> <name>primitiveRestartEnable</name></member> - </type> - <type category="struct" name="VkPipelineTessellationStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineTessellationStateCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>patchControlPoints</name></member> - </type> - <type category="struct" name="VkPipelineViewportStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPipelineViewportWScalingStateCreateInfoNV">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineViewportStateCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>viewportCount</name></member> - <member noautovalidity="true" optional="true" len="viewportCount">const <type>VkViewport</type>* <name>pViewports</name></member> - <member><type>uint32_t</type> <name>scissorCount</name></member> - <member noautovalidity="true" optional="true" len="scissorCount">const <type>VkRect2D</type>* <name>pScissors</name></member> - </type> - <type category="struct" name="VkPipelineRasterizationStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPipelineRasterizationStateRasterizationOrderAMD">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineRasterizationStateCreateFlags</type> <name>flags</name></member>  - <member><type>VkBool32</type> <name>depthClampEnable</name></member> - <member><type>VkBool32</type> <name>rasterizerDiscardEnable</name></member> - <member><type>VkPolygonMode</type> <name>polygonMode</name></member>  - <member optional="true"><type>VkCullModeFlags</type> <name>cullMode</name></member> - <member><type>VkFrontFace</type> <name>frontFace</name></member> - <member><type>VkBool32</type> <name>depthBiasEnable</name></member> - <member><type>float</type> <name>depthBiasConstantFactor</name></member> - <member><type>float</type> <name>depthBiasClamp</name></member> - <member><type>float</type> <name>depthBiasSlopeFactor</name></member> - <member><type>float</type> <name>lineWidth</name></member> - </type> - <type category="struct" name="VkPipelineMultisampleStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineMultisampleStateCreateFlags</type> <name>flags</name></member>  - <member><type>VkSampleCountFlagBits</type> <name>rasterizationSamples</name></member>  - <member><type>VkBool32</type> <name>sampleShadingEnable</name></member>  - <member><type>float</type> <name>minSampleShading</name></member>  - <member optional="true" len="latexmath:[\lceil{\mathit{rasterizationSamples} \over 32}\rceil]">const <type>VkSampleMask</type>* <name>pSampleMask</name></member>  - <member><type>VkBool32</type> <name>alphaToCoverageEnable</name></member> - <member><type>VkBool32</type> <name>alphaToOneEnable</name></member> - </type> - <type category="struct" name="VkPipelineColorBlendAttachmentState"> - <member><type>VkBool32</type> <name>blendEnable</name></member> - <member><type>VkBlendFactor</type> <name>srcColorBlendFactor</name></member> - <member><type>VkBlendFactor</type> <name>dstColorBlendFactor</name></member> - <member><type>VkBlendOp</type> <name>colorBlendOp</name></member> - <member><type>VkBlendFactor</type> <name>srcAlphaBlendFactor</name></member> - <member><type>VkBlendFactor</type> <name>dstAlphaBlendFactor</name></member> - <member><type>VkBlendOp</type> <name>alphaBlendOp</name></member> - <member optional="true"><type>VkColorComponentFlags</type> <name>colorWriteMask</name></member> - </type> - <type category="struct" name="VkPipelineColorBlendStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineColorBlendStateCreateFlags</type> <name>flags</name></member>  - <member><type>VkBool32</type> <name>logicOpEnable</name></member> - <member noautovalidity="true"><type>VkLogicOp</type> <name>logicOp</name></member> - <member optional="true"><type>uint32_t</type> <name>attachmentCount</name></member>  - <member len="attachmentCount">const <type>VkPipelineColorBlendAttachmentState</type>* <name>pAttachments</name></member> - <member><type>float</type> <name>blendConstants</name>[4]</member> - </type> - <type category="struct" name="VkPipelineDynamicStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineDynamicStateCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>dynamicStateCount</name></member> - <member len="dynamicStateCount">const <type>VkDynamicState</type>* <name>pDynamicStates</name></member> - </type> - <type category="struct" name="VkStencilOpState"> - <member><type>VkStencilOp</type> <name>failOp</name></member> - <member><type>VkStencilOp</type> <name>passOp</name></member> - <member><type>VkStencilOp</type> <name>depthFailOp</name></member> - <member><type>VkCompareOp</type> <name>compareOp</name></member> - <member><type>uint32_t</type> <name>compareMask</name></member> - <member><type>uint32_t</type> <name>writeMask</name></member> - <member><type>uint32_t</type> <name>reference</name></member> - </type> - <type category="struct" name="VkPipelineDepthStencilStateCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineDepthStencilStateCreateFlags</type> <name>flags</name></member>  - <member><type>VkBool32</type> <name>depthTestEnable</name></member> - <member><type>VkBool32</type> <name>depthWriteEnable</name></member> - <member><type>VkCompareOp</type> <name>depthCompareOp</name></member> - <member><type>VkBool32</type> <name>depthBoundsTestEnable</name></member>  - <member><type>VkBool32</type> <name>stencilTestEnable</name></member> - <member><type>VkStencilOpState</type> <name>front</name></member> - <member><type>VkStencilOpState</type> <name>back</name></member> - <member><type>float</type> <name>minDepthBounds</name></member> - <member><type>float</type> <name>maxDepthBounds</name></member> - </type> - <type category="struct" name="VkGraphicsPipelineCreateInfo"> - <member values="VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>stageCount</name></member> - <member len="stageCount">const <type>VkPipelineShaderStageCreateInfo</type>* <name>pStages</name></member>  - <member>const <type>VkPipelineVertexInputStateCreateInfo</type>* <name>pVertexInputState</name></member> - <member>const <type>VkPipelineInputAssemblyStateCreateInfo</type>* <name>pInputAssemblyState</name></member> - <member noautovalidity="true" optional="true">const <type>VkPipelineTessellationStateCreateInfo</type>* <name>pTessellationState</name></member> - <member noautovalidity="true" optional="true">const <type>VkPipelineViewportStateCreateInfo</type>* <name>pViewportState</name></member> - <member>const <type>VkPipelineRasterizationStateCreateInfo</type>* <name>pRasterizationState</name></member> - <member noautovalidity="true" optional="true">const <type>VkPipelineMultisampleStateCreateInfo</type>* <name>pMultisampleState</name></member> - <member noautovalidity="true" optional="true">const <type>VkPipelineDepthStencilStateCreateInfo</type>* <name>pDepthStencilState</name></member> - <member noautovalidity="true" optional="true">const <type>VkPipelineColorBlendStateCreateInfo</type>* <name>pColorBlendState</name></member> - <member optional="true">const <type>VkPipelineDynamicStateCreateInfo</type>* <name>pDynamicState</name></member> - <member><type>VkPipelineLayout</type> <name>layout</name></member>  - <member><type>VkRenderPass</type> <name>renderPass</name></member> - <member><type>uint32_t</type> <name>subpass</name></member> - <member noautovalidity="true" optional="true"><type>VkPipeline</type> <name>basePipelineHandle</name></member>  - <member><type>int32_t</type> <name>basePipelineIndex</name></member>  - </type> - <type category="struct" name="VkPipelineCacheCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineCacheCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>size_t</type> <name>initialDataSize</name></member>  - <member len="initialDataSize">const <type>void</type>* <name>pInitialData</name></member>  - </type> - <type category="struct" name="VkPushConstantRange"> - <member><type>VkShaderStageFlags</type> <name>stageFlags</name></member>  - <member><type>uint32_t</type> <name>offset</name></member>  - <member><type>uint32_t</type> <name>size</name></member>  - </type> - <type category="struct" name="VkPipelineLayoutCreateInfo"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineLayoutCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>setLayoutCount</name></member>  - <member len="setLayoutCount">const <type>VkDescriptorSetLayout</type>* <name>pSetLayouts</name></member>  - <member optional="true"><type>uint32_t</type> <name>pushConstantRangeCount</name></member>  - <member len="pushConstantRangeCount">const <type>VkPushConstantRange</type>* <name>pPushConstantRanges</name></member>  - </type> - <type category="struct" name="VkSamplerCreateInfo"> - <member values="VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSamplerCreateFlags</type> <name>flags</name></member>  - <member><type>VkFilter</type> <name>magFilter</name></member>  - <member><type>VkFilter</type> <name>minFilter</name></member>  - <member><type>VkSamplerMipmapMode</type> <name>mipmapMode</name></member>  - <member><type>VkSamplerAddressMode</type> <name>addressModeU</name></member> - <member><type>VkSamplerAddressMode</type> <name>addressModeV</name></member> - <member><type>VkSamplerAddressMode</type> <name>addressModeW</name></member> - <member><type>float</type> <name>mipLodBias</name></member> - <member><type>VkBool32</type> <name>anisotropyEnable</name></member> - <member><type>float</type> <name>maxAnisotropy</name></member> - <member><type>VkBool32</type> <name>compareEnable</name></member> - <member noautovalidity="true"><type>VkCompareOp</type> <name>compareOp</name></member> - <member><type>float</type> <name>minLod</name></member> - <member><type>float</type> <name>maxLod</name></member> - <member noautovalidity="true"><type>VkBorderColor</type> <name>borderColor</name></member> - <member><type>VkBool32</type> <name>unnormalizedCoordinates</name></member> - </type> - <type category="struct" name="VkCommandPoolCreateInfo"> - <member values="VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkCommandPoolCreateFlags</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>queueFamilyIndex</name></member> - </type> - <type category="struct" name="VkCommandBufferAllocateInfo"> - <member values="VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkCommandPool</type> <name>commandPool</name></member> - <member><type>VkCommandBufferLevel</type> <name>level</name></member> - <member><type>uint32_t</type> <name>commandBufferCount</name></member> - </type> - <type category="struct" name="VkCommandBufferInheritanceInfo"> - <member values="VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true" noautovalidity="true"><type>VkRenderPass</type> <name>renderPass</name></member>  - <member><type>uint32_t</type> <name>subpass</name></member> - <member optional="true" noautovalidity="true"><type>VkFramebuffer</type> <name>framebuffer</name></member>  - <member><type>VkBool32</type> <name>occlusionQueryEnable</name></member>  - <member optional="true" noautovalidity="true"><type>VkQueryControlFlags</type> <name>queryFlags</name></member>  - <member optional="true" noautovalidity="true"><type>VkQueryPipelineStatisticFlags</type> <name>pipelineStatistics</name></member>  - </type> - <type category="struct" name="VkCommandBufferBeginInfo"> - <member values="VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupCommandBufferBeginInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkCommandBufferUsageFlags</type> <name>flags</name></member>  - <member optional="true" noautovalidity="true">const <type>VkCommandBufferInheritanceInfo</type>* <name>pInheritanceInfo</name></member>  - </type> - <type category="struct" name="VkRenderPassBeginInfo"> - <member values="VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupRenderPassBeginInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkRenderPass</type> <name>renderPass</name></member> - <member><type>VkFramebuffer</type> <name>framebuffer</name></member> - <member><type>VkRect2D</type> <name>renderArea</name></member> - <member optional="true"><type>uint32_t</type> <name>clearValueCount</name></member> - <member len="clearValueCount" noautovalidity="true">const <type>VkClearValue</type>* <name>pClearValues</name></member> - </type> - <type category="union" name="VkClearColorValue" comment="// Union allowing specification of floating point, integer, or unsigned integer color data. Actual value selected is based on image/attachment being cleared."> - <member><type>float</type> <name>float32</name>[4]</member> - <member><type>int32_t</type> <name>int32</name>[4]</member> - <member><type>uint32_t</type> <name>uint32</name>[4]</member> - </type> - <type category="struct" name="VkClearDepthStencilValue"> - <member><type>float</type> <name>depth</name></member> - <member><type>uint32_t</type> <name>stencil</name></member> - </type> - <type category="union" name="VkClearValue" comment="// Union allowing specification of color or depth and stencil values. Actual value selected is based on attachment being cleared."> - <member><type>VkClearColorValue</type> <name>color</name></member> - <member><type>VkClearDepthStencilValue</type> <name>depthStencil</name></member> - </type> - <type category="struct" name="VkClearAttachment"> - <member><type>VkImageAspectFlags</type> <name>aspectMask</name></member> - <member><type>uint32_t</type> <name>colorAttachment</name></member> - <member><type>VkClearValue</type> <name>clearValue</name></member> - </type> - <type category="struct" name="VkAttachmentDescription"> - <member optional="true"><type>VkAttachmentDescriptionFlags</type> <name>flags</name></member> - <member><type>VkFormat</type> <name>format</name></member> - <member><type>VkSampleCountFlagBits</type> <name>samples</name></member> - <member><type>VkAttachmentLoadOp</type> <name>loadOp</name></member>  - <member><type>VkAttachmentStoreOp</type> <name>storeOp</name></member>  - <member><type>VkAttachmentLoadOp</type> <name>stencilLoadOp</name></member>  - <member><type>VkAttachmentStoreOp</type> <name>stencilStoreOp</name></member>  - <member><type>VkImageLayout</type> <name>initialLayout</name></member> - <member><type>VkImageLayout</type> <name>finalLayout</name></member> - </type> - <type category="struct" name="VkAttachmentReference"> - <member><type>uint32_t</type> <name>attachment</name></member> - <member><type>VkImageLayout</type> <name>layout</name></member> - </type> - <type category="struct" name="VkSubpassDescription"> - <member optional="true"><type>VkSubpassDescriptionFlags</type> <name>flags</name></member> - <member><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></member>  - <member optional="true"><type>uint32_t</type> <name>inputAttachmentCount</name></member> - <member len="inputAttachmentCount">const <type>VkAttachmentReference</type>* <name>pInputAttachments</name></member> - <member optional="true"><type>uint32_t</type> <name>colorAttachmentCount</name></member> - <member len="colorAttachmentCount">const <type>VkAttachmentReference</type>* <name>pColorAttachments</name></member> - <member optional="true" len="colorAttachmentCount">const <type>VkAttachmentReference</type>* <name>pResolveAttachments</name></member> - <member optional="true">const <type>VkAttachmentReference</type>* <name>pDepthStencilAttachment</name></member> - <member optional="true"><type>uint32_t</type> <name>preserveAttachmentCount</name></member> - <member len="preserveAttachmentCount">const <type>uint32_t</type>* <name>pPreserveAttachments</name></member> - </type> - <type category="struct" name="VkSubpassDependency"> - <member><type>uint32_t</type> <name>srcSubpass</name></member> - <member><type>uint32_t</type> <name>dstSubpass</name></member> - <member><type>VkPipelineStageFlags</type> <name>srcStageMask</name></member> - <member><type>VkPipelineStageFlags</type> <name>dstStageMask</name></member> - <member optional="true"><type>VkAccessFlags</type> <name>srcAccessMask</name></member>  - <member optional="true"><type>VkAccessFlags</type> <name>dstAccessMask</name></member>  - <member optional="true"><type>VkDependencyFlags</type> <name>dependencyFlags</name></member> - </type> - <type category="struct" name="VkRenderPassCreateInfo"> - <member values="VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkRenderPassCreateFlags</type> <name>flags</name></member>  - <member optional="true"><type>uint32_t</type> <name>attachmentCount</name></member> - <member len="attachmentCount">const <type>VkAttachmentDescription</type>* <name>pAttachments</name></member> - <member><type>uint32_t</type> <name>subpassCount</name></member> - <member len="subpassCount">const <type>VkSubpassDescription</type>* <name>pSubpasses</name></member> - <member optional="true"><type>uint32_t</type> <name>dependencyCount</name></member> - <member len="dependencyCount">const <type>VkSubpassDependency</type>* <name>pDependencies</name></member> - </type> - <type category="struct" name="VkEventCreateInfo"> - <member values="VK_STRUCTURE_TYPE_EVENT_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkEventCreateFlags</type> <name>flags</name></member>  - </type> - <type category="struct" name="VkFenceCreateInfo"> - <member values="VK_STRUCTURE_TYPE_FENCE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkFenceCreateFlags</type> <name>flags</name></member>  - </type> - <type category="struct" name="VkPhysicalDeviceFeatures"> - <member><type>VkBool32</type> <name>robustBufferAccess</name></member>  - <member><type>VkBool32</type> <name>fullDrawIndexUint32</name></member>  - <member><type>VkBool32</type> <name>imageCubeArray</name></member>  - <member><type>VkBool32</type> <name>independentBlend</name></member>  - <member><type>VkBool32</type> <name>geometryShader</name></member>  - <member><type>VkBool32</type> <name>tessellationShader</name></member>  - <member><type>VkBool32</type> <name>sampleRateShading</name></member>  - <member><type>VkBool32</type> <name>dualSrcBlend</name></member>  - <member><type>VkBool32</type> <name>logicOp</name></member>  - <member><type>VkBool32</type> <name>multiDrawIndirect</name></member>  - <member><type>VkBool32</type> <name>drawIndirectFirstInstance</name></member>  - <member><type>VkBool32</type> <name>depthClamp</name></member>  - <member><type>VkBool32</type> <name>depthBiasClamp</name></member>  - <member><type>VkBool32</type> <name>fillModeNonSolid</name></member>  - <member><type>VkBool32</type> <name>depthBounds</name></member>  - <member><type>VkBool32</type> <name>wideLines</name></member>  - <member><type>VkBool32</type> <name>largePoints</name></member>  - <member><type>VkBool32</type> <name>alphaToOne</name></member>  - <member><type>VkBool32</type> <name>multiViewport</name></member>  - <member><type>VkBool32</type> <name>samplerAnisotropy</name></member>  - <member><type>VkBool32</type> <name>textureCompressionETC2</name></member>  - <member><type>VkBool32</type> <name>textureCompressionASTC_LDR</name></member>  - <member><type>VkBool32</type> <name>textureCompressionBC</name></member>  - <member><type>VkBool32</type> <name>occlusionQueryPrecise</name></member>  - <member><type>VkBool32</type> <name>pipelineStatisticsQuery</name></member>  - <member><type>VkBool32</type> <name>vertexPipelineStoresAndAtomics</name></member>  - <member><type>VkBool32</type> <name>fragmentStoresAndAtomics</name></member>  - <member><type>VkBool32</type> <name>shaderTessellationAndGeometryPointSize</name></member> - <member><type>VkBool32</type> <name>shaderImageGatherExtended</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageExtendedFormats</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageMultisample</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageReadWithoutFormat</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageWriteWithoutFormat</name></member>  - <member><type>VkBool32</type> <name>shaderUniformBufferArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderSampledImageArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderStorageBufferArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderStorageImageArrayDynamicIndexing</name></member>  - <member><type>VkBool32</type> <name>shaderClipDistance</name></member>  - <member><type>VkBool32</type> <name>shaderCullDistance</name></member>  - <member><type>VkBool32</type> <name>shaderFloat64</name></member>  - <member><type>VkBool32</type> <name>shaderInt64</name></member>  - <member><type>VkBool32</type> <name>shaderInt16</name></member>  - <member><type>VkBool32</type> <name>shaderResourceResidency</name></member>  - <member><type>VkBool32</type> <name>shaderResourceMinLod</name></member>  - <member><type>VkBool32</type> <name>sparseBinding</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyBuffer</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyImage2D</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyImage3D</name></member>  - <member><type>VkBool32</type> <name>sparseResidency2Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidency4Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidency8Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidency16Samples</name></member>  - <member><type>VkBool32</type> <name>sparseResidencyAliased</name></member>  - <member><type>VkBool32</type> <name>variableMultisampleRate</name></member>  - <member><type>VkBool32</type> <name>inheritedQueries</name></member>  - </type> - <type category="struct" name="VkPhysicalDeviceSparseProperties" returnedonly="true"> - <member><type>VkBool32</type> <name>residencyStandard2DBlockShape</name></member>  - <member><type>VkBool32</type> <name>residencyStandard2DMultisampleBlockShape</name></member>  - <member><type>VkBool32</type> <name>residencyStandard3DBlockShape</name></member>  - <member><type>VkBool32</type> <name>residencyAlignedMipSize</name></member>  - <member><type>VkBool32</type> <name>residencyNonResidentStrict</name></member>  - </type> - <type category="struct" name="VkPhysicalDeviceLimits" returnedonly="true"> -  - <member><type>uint32_t</type> <name>maxImageDimension1D</name></member>  - <member><type>uint32_t</type> <name>maxImageDimension2D</name></member>  - <member><type>uint32_t</type> <name>maxImageDimension3D</name></member>  - <member><type>uint32_t</type> <name>maxImageDimensionCube</name></member>  - <member><type>uint32_t</type> <name>maxImageArrayLayers</name></member>  - <member><type>uint32_t</type> <name>maxTexelBufferElements</name></member>  - <member><type>uint32_t</type> <name>maxUniformBufferRange</name></member>  - <member><type>uint32_t</type> <name>maxStorageBufferRange</name></member>  - <member><type>uint32_t</type> <name>maxPushConstantsSize</name></member>  -  - <member><type>uint32_t</type> <name>maxMemoryAllocationCount</name></member>  - <member><type>uint32_t</type> <name>maxSamplerAllocationCount</name></member>  - <member><type>VkDeviceSize</type> <name>bufferImageGranularity</name></member>  - <member><type>VkDeviceSize</type> <name>sparseAddressSpaceSize</name></member>  -  - <member><type>uint32_t</type> <name>maxBoundDescriptorSets</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorSamplers</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorUniformBuffers</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorStorageBuffers</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorSampledImages</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorStorageImages</name></member>  - <member><type>uint32_t</type> <name>maxPerStageDescriptorInputAttachments</name></member>  - <member><type>uint32_t</type> <name>maxPerStageResources</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetSamplers</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetUniformBuffers</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetUniformBuffersDynamic</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetStorageBuffers</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetStorageBuffersDynamic</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetSampledImages</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetStorageImages</name></member>  - <member><type>uint32_t</type> <name>maxDescriptorSetInputAttachments</name></member>  -  - <member><type>uint32_t</type> <name>maxVertexInputAttributes</name></member>  - <member><type>uint32_t</type> <name>maxVertexInputBindings</name></member>  - <member><type>uint32_t</type> <name>maxVertexInputAttributeOffset</name></member>  - <member><type>uint32_t</type> <name>maxVertexInputBindingStride</name></member>  - <member><type>uint32_t</type> <name>maxVertexOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxTessellationGenerationLevel</name></member>  - <member><type>uint32_t</type> <name>maxTessellationPatchSize</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlPerVertexInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlPerVertexOutputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlPerPatchOutputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationControlTotalOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxTessellationEvaluationInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxTessellationEvaluationOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxGeometryShaderInvocations</name></member>  - <member><type>uint32_t</type> <name>maxGeometryInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxGeometryOutputComponents</name></member>  - <member><type>uint32_t</type> <name>maxGeometryOutputVertices</name></member>  - <member><type>uint32_t</type> <name>maxGeometryTotalOutputComponents</name></member>  -  - <member><type>uint32_t</type> <name>maxFragmentInputComponents</name></member>  - <member><type>uint32_t</type> <name>maxFragmentOutputAttachments</name></member>  - <member><type>uint32_t</type> <name>maxFragmentDualSrcAttachments</name></member>  - <member><type>uint32_t</type> <name>maxFragmentCombinedOutputResources</name></member> -  - <member><type>uint32_t</type> <name>maxComputeSharedMemorySize</name></member>  - <member><type>uint32_t</type> <name>maxComputeWorkGroupCount</name>[3]</member>  - <member><type>uint32_t</type> <name>maxComputeWorkGroupInvocations</name></member>  - <member><type>uint32_t</type> <name>maxComputeWorkGroupSize</name>[3]</member>  - <member><type>uint32_t</type> <name>subPixelPrecisionBits</name></member>  - <member><type>uint32_t</type> <name>subTexelPrecisionBits</name></member>  - <member><type>uint32_t</type> <name>mipmapPrecisionBits</name></member>  - <member><type>uint32_t</type> <name>maxDrawIndexedIndexValue</name></member>  - <member><type>uint32_t</type> <name>maxDrawIndirectCount</name></member>  - <member><type>float</type> <name>maxSamplerLodBias</name></member>  - <member><type>float</type> <name>maxSamplerAnisotropy</name></member>  - <member><type>uint32_t</type> <name>maxViewports</name></member>  - <member><type>uint32_t</type> <name>maxViewportDimensions</name>[2]</member>  - <member><type>float</type> <name>viewportBoundsRange</name>[2]</member>  - <member><type>uint32_t</type> <name>viewportSubPixelBits</name></member>  - <member><type>size_t</type> <name>minMemoryMapAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>minTexelBufferOffsetAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>minUniformBufferOffsetAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>minStorageBufferOffsetAlignment</name></member>  - <member><type>int32_t</type> <name>minTexelOffset</name></member>  - <member><type>uint32_t</type> <name>maxTexelOffset</name></member>  - <member><type>int32_t</type> <name>minTexelGatherOffset</name></member>  - <member><type>uint32_t</type> <name>maxTexelGatherOffset</name></member>  - <member><type>float</type> <name>minInterpolationOffset</name></member>  - <member><type>float</type> <name>maxInterpolationOffset</name></member>  - <member><type>uint32_t</type> <name>subPixelInterpolationOffsetBits</name></member>  - <member><type>uint32_t</type> <name>maxFramebufferWidth</name></member>  - <member><type>uint32_t</type> <name>maxFramebufferHeight</name></member>  - <member><type>uint32_t</type> <name>maxFramebufferLayers</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferColorSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferDepthSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferStencilSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>framebufferNoAttachmentsSampleCounts</name></member>  - <member><type>uint32_t</type> <name>maxColorAttachments</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageColorSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageIntegerSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageDepthSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>sampledImageStencilSampleCounts</name></member>  - <member optional="true"><type>VkSampleCountFlags</type> <name>storageImageSampleCounts</name></member>  - <member><type>uint32_t</type> <name>maxSampleMaskWords</name></member>  - <member><type>VkBool32</type> <name>timestampComputeAndGraphics</name></member>  - <member><type>float</type> <name>timestampPeriod</name></member>  - <member><type>uint32_t</type> <name>maxClipDistances</name></member>  - <member><type>uint32_t</type> <name>maxCullDistances</name></member>  - <member><type>uint32_t</type> <name>maxCombinedClipAndCullDistances</name></member>  - <member><type>uint32_t</type> <name>discreteQueuePriorities</name></member>  - <member><type>float</type> <name>pointSizeRange</name>[2]</member>  - <member><type>float</type> <name>lineWidthRange</name>[2]</member>  - <member><type>float</type> <name>pointSizeGranularity</name></member>  - <member><type>float</type> <name>lineWidthGranularity</name></member>  - <member><type>VkBool32</type> <name>strictLines</name></member>  - <member><type>VkBool32</type> <name>standardSampleLocations</name></member>  - <member><type>VkDeviceSize</type> <name>optimalBufferCopyOffsetAlignment</name></member>  - <member><type>VkDeviceSize</type> <name>optimalBufferCopyRowPitchAlignment</name></member> - <member><type>VkDeviceSize</type> <name>nonCoherentAtomSize</name></member>  - </type> - <type category="struct" name="VkSemaphoreCreateInfo"> - <member values="VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSemaphoreCreateFlags</type> <name>flags</name></member>  - </type> - <type category="struct" name="VkQueryPoolCreateInfo"> - <member values="VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkQueryPoolCreateFlags</type> <name>flags</name></member>  - <member><type>VkQueryType</type> <name>queryType</name></member> - <member><type>uint32_t</type> <name>queryCount</name></member> - <member optional="true" noautovalidity="true"><type>VkQueryPipelineStatisticFlags</type> <name>pipelineStatistics</name></member>  - </type> - <type category="struct" name="VkFramebufferCreateInfo"> - <member values="VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkFramebufferCreateFlags</type> <name>flags</name></member>  - <member><type>VkRenderPass</type> <name>renderPass</name></member> - <member optional="true"><type>uint32_t</type> <name>attachmentCount</name></member> - <member len="attachmentCount">const <type>VkImageView</type>* <name>pAttachments</name></member> - <member><type>uint32_t</type> <name>width</name></member> - <member><type>uint32_t</type> <name>height</name></member> - <member><type>uint32_t</type> <name>layers</name></member> - </type> - <type category="struct" name="VkDrawIndirectCommand"> - <member><type>uint32_t</type> <name>vertexCount</name></member> - <member><type>uint32_t</type> <name>instanceCount</name></member> - <member><type>uint32_t</type> <name>firstVertex</name></member> - <member><type>uint32_t</type> <name>firstInstance</name></member> - </type> - <type category="struct" name="VkDrawIndexedIndirectCommand"> - <member><type>uint32_t</type> <name>indexCount</name></member> - <member><type>uint32_t</type> <name>instanceCount</name></member> - <member><type>uint32_t</type> <name>firstIndex</name></member> - <member><type>int32_t</type> <name>vertexOffset</name></member> - <member><type>uint32_t</type> <name>firstInstance</name></member> - </type> - <type category="struct" name="VkDispatchIndirectCommand"> - <member><type>uint32_t</type> <name>x</name></member> - <member><type>uint32_t</type> <name>y</name></member> - <member><type>uint32_t</type> <name>z</name></member> - </type> - <type category="struct" name="VkSubmitInfo"> - <member values="VK_STRUCTURE_TYPE_SUBMIT_INFO"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkWin32KeyedMutexAcquireReleaseInfoNV,VkWin32KeyedMutexAcquireReleaseInfoKHX,VkD3D12FenceSubmitInfoKHX,VkDeviceGroupSubmitInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member> - <member len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></member> - <member len="waitSemaphoreCount">const <type>VkPipelineStageFlags</type>* <name>pWaitDstStageMask</name></member> - <member optional="true"><type>uint32_t</type> <name>commandBufferCount</name></member> - <member len="commandBufferCount">const <type>VkCommandBuffer</type>* <name>pCommandBuffers</name></member> - <member optional="true"><type>uint32_t</type> <name>signalSemaphoreCount</name></member> - <member len="signalSemaphoreCount">const <type>VkSemaphore</type>* <name>pSignalSemaphores</name></member> - </type> -  - <type category="struct" name="VkDisplayPropertiesKHR" returnedonly="true"> - <member><type>VkDisplayKHR</type> <name>display</name></member>  - <member len="null-terminated">const <type>char</type>* <name>displayName</name></member>  - <member><type>VkExtent2D</type> <name>physicalDimensions</name></member>  - <member><type>VkExtent2D</type> <name>physicalResolution</name></member>  - <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name></member>  - <member><type>VkBool32</type> <name>planeReorderPossible</name></member>  - <member><type>VkBool32</type> <name>persistentContent</name></member>  - </type> - <type category="struct" name="VkDisplayPlanePropertiesKHR" returnedonly="true"> - <member><type>VkDisplayKHR</type> <name>currentDisplay</name></member>  - <member><type>uint32_t</type> <name>currentStackIndex</name></member>  - </type> - <type category="struct" name="VkDisplayModeParametersKHR"> - <member><type>VkExtent2D</type> <name>visibleRegion</name></member>  - <member><type>uint32_t</type> <name>refreshRate</name></member>  - </type> - <type category="struct" name="VkDisplayModePropertiesKHR" returnedonly="true"> - <member><type>VkDisplayModeKHR</type> <name>displayMode</name></member>  - <member><type>VkDisplayModeParametersKHR</type> <name>parameters</name></member>  - </type> - <type category="struct" name="VkDisplayModeCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDisplayModeCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>VkDisplayModeParametersKHR</type> <name>parameters</name></member>  - </type> - <type category="struct" name="VkDisplayPlaneCapabilitiesKHR" returnedonly="true"> - <member optional="true"><type>VkDisplayPlaneAlphaFlagsKHR</type> <name>supportedAlpha</name></member>  - <member><type>VkOffset2D</type> <name>minSrcPosition</name></member>  - <member><type>VkOffset2D</type> <name>maxSrcPosition</name></member> - <member><type>VkExtent2D</type> <name>minSrcExtent</name></member> - <member><type>VkExtent2D</type> <name>maxSrcExtent</name></member> - <member><type>VkOffset2D</type> <name>minDstPosition</name></member> - <member><type>VkOffset2D</type> <name>maxDstPosition</name></member> - <member><type>VkExtent2D</type> <name>minDstExtent</name></member> - <member><type>VkExtent2D</type> <name>maxDstExtent</name></member> - </type> - <type category="struct" name="VkDisplaySurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDisplaySurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>VkDisplayModeKHR</type> <name>displayMode</name></member>  - <member><type>uint32_t</type> <name>planeIndex</name></member>  - <member><type>uint32_t</type> <name>planeStackIndex</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>transform</name></member>  - <member><type>float</type> <name>globalAlpha</name></member>  - <member><type>VkDisplayPlaneAlphaFlagBitsKHR</type> <name>alphaMode</name></member>  - <member><type>VkExtent2D</type> <name>imageExtent</name></member>  - </type> - <type category="struct" name="VkDisplayPresentInfoKHR"> - <member values="VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkRect2D</type> <name>srcRect</name></member>  - <member><type>VkRect2D</type> <name>dstRect</name></member>  - <member><type>VkBool32</type> <name>persistent</name></member>  - </type> - <type category="struct" name="VkSurfaceCapabilitiesKHR" returnedonly="true"> - <member><type>uint32_t</type> <name>minImageCount</name></member>  - <member><type>uint32_t</type> <name>maxImageCount</name></member>  - <member><type>VkExtent2D</type> <name>currentExtent</name></member>  - <member><type>VkExtent2D</type> <name>minImageExtent</name></member>  - <member><type>VkExtent2D</type> <name>maxImageExtent</name></member>  - <member><type>uint32_t</type> <name>maxImageArrayLayers</name></member>  - <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>currentTransform</name></member>  - <member optional="true"><type>VkCompositeAlphaFlagsKHR</type> <name>supportedCompositeAlpha</name></member>  - <member optional="true"><type>VkImageUsageFlags</type> <name>supportedUsageFlags</name></member>  - </type> - <type category="struct" name="VkAndroidSurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkAndroidSurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member noautovalidity="true"><type>ANativeWindow</type>* <name>window</name></member> - </type> - <type category="struct" name="VkMirSurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkMirSurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member noautovalidity="true"><type>MirConnection</type>* <name>connection</name></member> - <member noautovalidity="true"><type>MirSurface</type>* <name>mirSurface</name></member> - </type> - <type category="struct" name="VkViSurfaceCreateInfoNN"> - <member values="VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkViSurfaceCreateFlagsNN</type> <name>flags</name></member>  - <member><type>void</type>* <name>window</name></member> - </type> - <type category="struct" name="VkWaylandSurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkWaylandSurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member noautovalidity="true">struct <type>wl_display</type>* <name>display</name></member> - <member noautovalidity="true">struct <type>wl_surface</type>* <name>surface</name></member> - </type> - <type category="struct" name="VkWin32SurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkWin32SurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>HINSTANCE</type> <name>hinstance</name></member> - <member><type>HWND</type> <name>hwnd</name></member> - </type> - <type category="struct" name="VkXlibSurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkXlibSurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member noautovalidity="true"><type>Display</type>* <name>dpy</name></member> - <member><type>Window</type> <name>window</name></member> - </type> - <type category="struct" name="VkXcbSurfaceCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkXcbSurfaceCreateFlagsKHR</type> <name>flags</name></member>  - <member noautovalidity="true"><type>xcb_connection_t</type>* <name>connection</name></member> - <member><type>xcb_window_t</type> <name>window</name></member> - </type> - <type category="struct" name="VkSurfaceFormatKHR" returnedonly="true"> - <member><type>VkFormat</type> <name>format</name></member>  - <member><type>VkColorSpaceKHR</type> <name>colorSpace</name></member>  - </type> - <type category="struct" name="VkSwapchainCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDeviceGroupSwapchainCreateInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSwapchainCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>VkSurfaceKHR</type> <name>surface</name></member>  - <member><type>uint32_t</type> <name>minImageCount</name></member>  - <member><type>VkFormat</type> <name>imageFormat</name></member>  - <member><type>VkColorSpaceKHR</type> <name>imageColorSpace</name></member>  - <member><type>VkExtent2D</type> <name>imageExtent</name></member>  - <member><type>uint32_t</type> <name>imageArrayLayers</name></member>  - <member><type>VkImageUsageFlags</type> <name>imageUsage</name></member>  - <member><type>VkSharingMode</type> <name>imageSharingMode</name></member>  - <member optional="true"><type>uint32_t</type> <name>queueFamilyIndexCount</name></member>  - <member noautovalidity="true" len="queueFamilyIndexCount">const <type>uint32_t</type>* <name>pQueueFamilyIndices</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>preTransform</name></member>  - <member><type>VkCompositeAlphaFlagBitsKHR</type> <name>compositeAlpha</name></member>  - <member><type>VkPresentModeKHR</type> <name>presentMode</name></member>  - <member><type>VkBool32</type> <name>clipped</name></member>  - <member optional="true"><type>VkSwapchainKHR</type> <name>oldSwapchain</name></member>  - </type> - <type category="struct" name="VkPresentInfoKHR"> - <member values="VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkDisplayPresentInfoKHR,VkPresentRegionsKHR,VkDeviceGroupPresentInfoKHX,VkPresentTimesInfoGOOGLE">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member>  - <member optional="true" len="waitSemaphoreCount">const <type>VkSemaphore</type>* <name>pWaitSemaphores</name></member>  - <member><type>uint32_t</type> <name>swapchainCount</name></member>  - <member len="swapchainCount">const <type>VkSwapchainKHR</type>* <name>pSwapchains</name></member>  - <member len="swapchainCount">const <type>uint32_t</type>* <name>pImageIndices</name></member>  - <member optional="true" len="swapchainCount"><type>VkResult</type>* <name>pResults</name></member>  - </type> - <type category="struct" name="VkDebugReportCallbackCreateInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDebugReportFlagsEXT</type> <name>flags</name></member>  - <member><type>PFN_vkDebugReportCallbackEXT</type> <name>pfnCallback</name></member>  - <member optional="true"><type>void</type>* <name>pUserData</name></member>  - </type> - <type category="struct" name="VkValidationFlagsEXT"> - <member values="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"><type>VkStructureType</type> <name>sType</name></member>  - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>disabledValidationCheckCount</name></member>  - <member len="disabledValidationCheckCount"><type>VkValidationCheckEXT</type>* <name>pDisabledValidationChecks</name></member>  - </type> - <type category="struct" name="VkPipelineRasterizationStateRasterizationOrderAMD"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkRasterizationOrderAMD</type> <name>rasterizationOrder</name></member>  - </type> - <type category="struct" name="VkDebugMarkerObjectNameInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></member>  - <member><type>uint64_t</type> <name>object</name></member>  - <member len="null-terminated">const <type>char</type>* <name>pObjectName</name></member>  - </type> - <type category="struct" name="VkDebugMarkerObjectTagInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></member>  - <member><type>uint64_t</type> <name>object</name></member>  - <member><type>uint64_t</type> <name>tagName</name></member>  - <member><type>size_t</type> <name>tagSize</name></member>  - <member len="tagSize">const <type>void</type>* <name>pTag</name></member>  - </type> - <type category="struct" name="VkDebugMarkerMarkerInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member len="null-terminated">const <type>char</type>* <name>pMarkerName</name></member>  - <member optional="true"><type>float</type> <name>color</name>[4]</member>  - </type> - <type category="struct" name="VkDedicatedAllocationImageCreateInfoNV"> - <member values="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>dedicatedAllocation</name></member>  - </type> - <type category="struct" name="VkDedicatedAllocationBufferCreateInfoNV"> - <member values="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>dedicatedAllocation</name></member>  - </type> - <type category="struct" name="VkDedicatedAllocationMemoryAllocateInfoNV"> - <member values="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImage</type> <name>image</name></member>  - <member optional="true"><type>VkBuffer</type> <name>buffer</name></member>  - </type> - <type category="struct" name="VkExternalImageFormatPropertiesNV" returnedonly="true"> - <member><type>VkImageFormatProperties</type> <name>imageFormatProperties</name></member> - <member optional="true"><type>VkExternalMemoryFeatureFlagsNV</type> <name>externalMemoryFeatures</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>exportFromImportedHandleTypes</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>compatibleHandleTypes</name></member> - </type> - <type category="struct" name="VkExternalMemoryImageCreateInfoNV"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkExportMemoryAllocateInfoNV"> - <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkImportMemoryWin32HandleInfoNV"> - <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleType</name></member> - <member optional="true"><type>HANDLE</type> <name>handle</name></member> - </type> - <type category="struct" name="VkExportMemoryWin32HandleInfoNV"> - <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> - <member optional="true"><type>DWORD</type> <name>dwAccess</name></member> - </type> - <type category="struct" name="VkWin32KeyedMutexAcquireReleaseInfoNV"> - <member values="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member> - <member optional="true"><type>uint32_t</type> <name>acquireCount</name></member> - <member len="acquireCount">const <type>VkDeviceMemory</type>* <name>pAcquireSyncs</name></member> - <member len="acquireCount">const <type>uint64_t</type>* <name>pAcquireKeys</name></member> - <member len="acquireCount">const <type>uint32_t</type>* <name>pAcquireTimeoutMilliseconds</name></member> - <member optional="true"><type>uint32_t</type> <name>releaseCount</name></member> - <member len="releaseCount">const <type>VkDeviceMemory</type>* <name>pReleaseSyncs</name></member> - <member len="releaseCount">const <type>uint64_t</type>* <name>pReleaseKeys</name></member> - </type> - <type category="struct" name="VkDeviceGeneratedCommandsFeaturesNVX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_FEATURES_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>VkBool32</type> <name>computeBindingPointSupport</name></member> - </type> - <type category="struct" name="VkDeviceGeneratedCommandsLimitsNVX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>uint32_t</type> <name>maxIndirectCommandsLayoutTokenCount</name></member> - <member><type>uint32_t</type> <name>maxObjectEntryCounts</name></member> - <member><type>uint32_t</type> <name>minSequenceCountBufferOffsetAlignment</name></member> - <member><type>uint32_t</type> <name>minSequenceIndexBufferOffsetAlignment</name></member> - <member><type>uint32_t</type> <name>minCommandsTokenBufferOffsetAlignment</name></member> - </type> - <type category="struct" name="VkIndirectCommandsTokenNVX"> - <member><type>VkIndirectCommandsTokenTypeNVX</type> <name>tokenType</name></member> - <member><type>VkBuffer</type> <name>buffer</name></member>  - <member><type>VkDeviceSize</type> <name>offset</name></member>  - </type> - <type category="struct" name="VkIndirectCommandsLayoutTokenNVX"> - <member><type>VkIndirectCommandsTokenTypeNVX</type> <name>tokenType</name></member> - <member><type>uint32_t</type> <name>bindingUnit</name></member>  - <member><type>uint32_t</type> <name>dynamicCount</name></member>  - <member><type>uint32_t</type> <name>divisor</name></member>  - </type> - <type category="struct" name="VkIndirectCommandsLayoutCreateInfoNVX"> - <member values="VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></member> - <member><type>VkIndirectCommandsLayoutUsageFlagsNVX</type> <name>flags</name></member> - <member><type>uint32_t</type> <name>tokenCount</name></member> - <member len="tokenCount">const <type>VkIndirectCommandsLayoutTokenNVX</type>* <name>pTokens</name></member> - </type> - <type category="struct" name="VkCmdProcessCommandsInfoNVX"> - <member values="VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member externsync="true"><type>VkObjectTableNVX</type> <name>objectTable</name></member> - <member><type>VkIndirectCommandsLayoutNVX</type> <name>indirectCommandsLayout</name></member> - <member><type>uint32_t</type> <name>indirectCommandsTokenCount</name></member> - <member len="indirectCommandsTokenCount">const <type>VkIndirectCommandsTokenNVX</type>* <name>pIndirectCommandsTokens</name></member> - <member><type>uint32_t</type> <name>maxSequencesCount</name></member> - <member optional="true" externsync="true"><type>VkCommandBuffer</type> <name>targetCommandBuffer</name></member> - <member optional="true"><type>VkBuffer</type> <name>sequencesCountBuffer</name></member> - <member optional="true"><type>VkDeviceSize</type> <name>sequencesCountOffset</name></member> - <member optional="true"><type>VkBuffer</type> <name>sequencesIndexBuffer</name></member> - <member optional="true"><type>VkDeviceSize</type> <name>sequencesIndexOffset</name></member> - </type> - <type category="struct" name="VkCmdReserveSpaceForCommandsInfoNVX"> - <member values="VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member externsync="true"><type>VkObjectTableNVX</type> <name>objectTable</name></member> - <member><type>VkIndirectCommandsLayoutNVX</type> <name>indirectCommandsLayout</name></member> - <member><type>uint32_t</type> <name>maxSequencesCount</name></member> - </type> - <type category="struct" name="VkObjectTableCreateInfoNVX"> - <member values="VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>uint32_t</type> <name>objectCount</name></member> - <member len="objectCount">const <type>VkObjectEntryTypeNVX</type>* <name>pObjectEntryTypes</name></member> - <member len="objectCount">const <type>uint32_t</type>* <name>pObjectEntryCounts</name></member> - <member len="objectCount">const <type>VkObjectEntryUsageFlagsNVX</type>* <name>pObjectEntryUsageFlags</name></member> - - <member><type>uint32_t</type> <name>maxUniformBuffersPerDescriptor</name></member> - <member><type>uint32_t</type> <name>maxStorageBuffersPerDescriptor</name></member> - <member><type>uint32_t</type> <name>maxStorageImagesPerDescriptor</name></member> - <member><type>uint32_t</type> <name>maxSampledImagesPerDescriptor</name></member> - <member><type>uint32_t</type> <name>maxPipelineLayouts</name></member> - </type> - <type category="struct" name="VkObjectTableEntryNVX"> - <member><type>VkObjectEntryTypeNVX</type> <name>type</name></member> - <member><type>VkObjectEntryUsageFlagsNVX</type> <name>flags</name></member> - </type> - <type category="struct" name="VkObjectTablePipelineEntryNVX"> - <member><type>VkObjectEntryTypeNVX</type> <name>type</name></member> - <member><type>VkObjectEntryUsageFlagsNVX</type> <name>flags</name></member> - <member><type>VkPipeline</type> <name>pipeline</name></member> - </type> - <type category="struct" name="VkObjectTableDescriptorSetEntryNVX"> - <member><type>VkObjectEntryTypeNVX</type> <name>type</name></member> - <member><type>VkObjectEntryUsageFlagsNVX</type> <name>flags</name></member> - <member><type>VkPipelineLayout</type> <name>pipelineLayout</name></member> - <member><type>VkDescriptorSet</type> <name>descriptorSet</name></member> - </type> - <type category="struct" name="VkObjectTableVertexBufferEntryNVX"> - <member><type>VkObjectEntryTypeNVX</type> <name>type</name></member> - <member><type>VkObjectEntryUsageFlagsNVX</type> <name>flags</name></member> - <member><type>VkBuffer</type> <name>buffer</name></member> - </type> - <type category="struct" name="VkObjectTableIndexBufferEntryNVX"> - <member><type>VkObjectEntryTypeNVX</type> <name>type</name></member> - <member><type>VkObjectEntryUsageFlagsNVX</type> <name>flags</name></member> - <member><type>VkBuffer</type> <name>buffer</name></member> - <member><type>VkIndexType</type> <name>indexType</name></member> - </type> - <type category="struct" name="VkObjectTablePushConstantEntryNVX"> - <member><type>VkObjectEntryTypeNVX</type> <name>type</name></member> - <member><type>VkObjectEntryUsageFlagsNVX</type> <name>flags</name></member> - <member><type>VkPipelineLayout</type> <name>pipelineLayout</name></member> - <member><type>VkShaderStageFlags</type> <name>stageFlags</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceFeatures2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDeviceMultiviewFeaturesKHX"><type>void</type>* <name>pNext</name></member>  - <member><type>VkPhysicalDeviceFeatures</type> <name>features</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDevicePushDescriptorPropertiesKHR,VkPhysicalDeviceIDPropertiesKHX,VkPhysicalDeviceMultiviewPropertiesKHX,VkPhysicalDeviceDiscardRectanglePropertiesEXT,VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX"><type>void</type>* <name>pNext</name></member>  - <member><type>VkPhysicalDeviceProperties</type> <name>properties</name></member> - </type> - <type category="struct" name="VkFormatProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkFormatProperties</type> <name>formatProperties</name></member> - </type> - <type category="struct" name="VkImageFormatProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkExternalImageFormatPropertiesKHX,VkTextureLODGatherFormatPropertiesAMD"><type>void</type>* <name>pNext</name></member>  - <member><type>VkImageFormatProperties</type> <name>imageFormatProperties</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceImageFormatInfo2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkPhysicalDeviceExternalImageFormatInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkFormat</type> <name>format</name></member> - <member><type>VkImageType</type> <name>type</name></member> - <member><type>VkImageTiling</type> <name>tiling</name></member> - <member><type>VkImageUsageFlags</type> <name>usage</name></member> - <member optional="true"><type>VkImageCreateFlags</type> <name>flags</name></member> - </type> - <type category="struct" name="VkQueueFamilyProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkQueueFamilyProperties</type> <name>queueFamilyProperties</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceMemoryProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkPhysicalDeviceMemoryProperties</type> <name>memoryProperties</name></member> - </type> - <type category="struct" name="VkSparseImageFormatProperties2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkSparseImageFormatProperties</type> <name>properties</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceSparseImageFormatInfo2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkFormat</type> <name>format</name></member> - <member><type>VkImageType</type> <name>type</name></member> - <member><type>VkSampleCountFlagBits</type> <name>samples</name></member> - <member><type>VkImageUsageFlags</type> <name>usage</name></member> - <member><type>VkImageTiling</type> <name>tiling</name></member> - </type> - <type category="struct" name="VkPhysicalDevicePushDescriptorPropertiesKHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>maxPushDescriptors</name></member> - </type> - <type category="struct" name="VkPresentRegionsKHR"> - <member values="VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>swapchainCount</name></member>  - <member len="swapchainCount" optional="true">const <type>VkPresentRegionKHR</type>* <name>pRegions</name></member>  - </type> - <type category="struct" name="VkPresentRegionKHR"> - <member optional="true"><type>uint32_t</type> <name>rectangleCount</name></member>  - <member optional="true" len="rectangleCount">const <type>VkRectLayerKHR</type>* <name>pRectangles</name></member>  - </type> - <type category="struct" name="VkRectLayerKHR"> - <member><type>VkOffset2D</type> <name>offset</name></member>  - <member><type>VkExtent2D</type> <name>extent</name></member>  - <member><type>uint32_t</type> <name>layer</name></member>  - </type> - <type category="struct" name="VkExternalMemoryPropertiesKHX" returnedonly="true"> - <member><type>VkExternalMemoryFeatureFlagsKHX</type> <name>externalMemoryFeatures</name></member> - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>exportFromImportedHandleTypes</name></member> - <member><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>compatibleHandleTypes</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceExternalImageFormatInfoKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - </type> - <type category="struct" name="VkExternalImageFormatPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalMemoryPropertiesKHX</type> <name>externalMemoryProperties</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceExternalBufferInfoKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkBufferCreateFlags</type> <name>flags</name></member> - <member><type>VkBufferUsageFlags</type> <name>usage</name></member> - <member><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - </type> - <type category="struct" name="VkExternalBufferPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalMemoryPropertiesKHX</type> <name>externalMemoryProperties</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceIDPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint8_t</type> <name>deviceUUID</name>[<enum>VK_UUID_SIZE</enum>]</member> - <member><type>uint8_t</type> <name>driverUUID</name>[<enum>VK_UUID_SIZE</enum>]</member> - <member><type>uint8_t</type> <name>deviceLUID</name>[<enum>VK_LUID_SIZE_KHX</enum>]</member> - <member><type>VkBool32</type> <name>deviceLUIDValid</name></member> - </type> - <type category="struct" name="VkExternalMemoryImageCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkExternalMemoryBufferCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkExportMemoryAllocateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkImportMemoryWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - <member><type>HANDLE</type> <name>handle</name></member> - </type> - <type category="struct" name="VkExportMemoryWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> - <member><type>DWORD</type> <name>dwAccess</name></member> - <member><type>LPCWSTR</type> <name>name</name></member> - </type> - <type category="struct" name="VkMemoryWin32HandlePropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>memoryTypeBits</name></member> - </type> - <type category="struct" name="VkImportMemoryFdInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - <member><type>int</type> <name>fd</name></member> - </type> - <type category="struct" name="VkMemoryFdPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>memoryTypeBits</name></member> - </type> - <type category="struct" name="VkWin32KeyedMutexAcquireReleaseInfoKHX"> - <member values="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>acquireCount</name></member> - <member len="acquireCount">const <type>VkDeviceMemory</type>* <name>pAcquireSyncs</name></member> - <member len="acquireCount">const <type>uint64_t</type>* <name>pAcquireKeys</name></member> - <member len="acquireCount">const <type>uint32_t</type>* <name>pAcquireTimeouts</name></member> - <member optional="true"><type>uint32_t</type> <name>releaseCount</name></member> - <member len="releaseCount">const <type>VkDeviceMemory</type>* <name>pReleaseSyncs</name></member> - <member len="releaseCount">const <type>uint64_t</type>* <name>pReleaseKeys</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceExternalSemaphoreInfoKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - </type> - <type category="struct" name="VkExternalSemaphorePropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>exportFromImportedHandleTypes</name></member> - <member><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>compatibleHandleTypes</name></member> - <member optional="true"><type>VkExternalSemaphoreFeatureFlagsKHX</type> <name>externalSemaphoreFeatures</name></member> - </type> - <type category="struct" name="VkExportSemaphoreCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>handleTypes</name></member> - </type> - <type category="struct" name="VkImportSemaphoreWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkSemaphore</type> <name>semaphore</name></member> - <member><type>VkExternalSemaphoreHandleTypeFlagsKHX</type> <name>handleType</name></member> - <member><type>HANDLE</type> <name>handle</name></member> - </type> - <type category="struct" name="VkExportSemaphoreWin32HandleInfoKHX"> - <member values="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true">const <type>SECURITY_ATTRIBUTES</type>* <name>pAttributes</name></member> - <member><type>DWORD</type> <name>dwAccess</name></member> - <member><type>LPCWSTR</type> <name>name</name></member> - </type> - <type category="struct" name="VkD3D12FenceSubmitInfoKHX"> - <member values="VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>waitSemaphoreValuesCount</name></member> - <member optional="true" len="waitSemaphoreValuesCount">const <type>uint64_t</type>* <name>pWaitSemaphoreValues</name></member> - <member optional="true"><type>uint32_t</type> <name>signalSemaphoreValuesCount</name></member> - <member optional="true" len="signalSemaphoreValuesCount">const <type>uint64_t</type>* <name>pSignalSemaphoreValues</name></member> - </type> - <type category="struct" name="VkImportSemaphoreFdInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkSemaphore</type> <name>semaphore</name></member> - <member><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></member> - <member><type>int</type> <name>fd</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceMultiviewFeaturesKHX"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true"><type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>multiview</name></member>  - <member><type>VkBool32</type> <name>multiviewGeometryShader</name></member>  - <member><type>VkBool32</type> <name>multiviewTessellationShader</name></member>  - </type> - <type category="struct" name="VkPhysicalDeviceMultiviewPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>maxMultiviewViewCount</name></member>  - <member><type>uint32_t</type> <name>maxMultiviewInstanceIndex</name></member>  - </type> - <type category="struct" name="VkRenderPassMultiviewCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>subpassCount</name></member> - <member len="subpassCount">const <type>uint32_t</type>* <name>pViewMasks</name></member> - <member optional="true"><type>uint32_t</type> <name>dependencyCount</name></member> - <member len="dependencyCount">const <type>int32_t</type>* <name>pViewOffsets</name></member> - <member optional="true"><type>uint32_t</type> <name>correlationMaskCount</name></member> - <member len="correlationMaskCount">const <type>uint32_t</type>* <name>pCorrelationMasks</name></member> - </type> - <type category="struct" name="VkSurfaceCapabilities2EXT" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member> - <member><type>uint32_t</type> <name>minImageCount</name></member>  - <member><type>uint32_t</type> <name>maxImageCount</name></member>  - <member><type>VkExtent2D</type> <name>currentExtent</name></member>  - <member><type>VkExtent2D</type> <name>minImageExtent</name></member>  - <member><type>VkExtent2D</type> <name>maxImageExtent</name></member>  - <member><type>uint32_t</type> <name>maxImageArrayLayers</name></member>  - <member optional="true"><type>VkSurfaceTransformFlagsKHR</type> <name>supportedTransforms</name></member>  - <member><type>VkSurfaceTransformFlagBitsKHR</type> <name>currentTransform</name></member>  - <member optional="true"><type>VkCompositeAlphaFlagsKHR</type> <name>supportedCompositeAlpha</name></member>  - <member optional="true"><type>VkImageUsageFlags</type> <name>supportedUsageFlags</name></member>  - <member optional="true"><type>VkSurfaceCounterFlagsEXT</type> <name>supportedSurfaceCounters</name></member> - </type> - <type category="struct" name="VkDisplayPowerInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DISPLAY_POWER_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>VkDisplayPowerStateEXT</type> <name>powerState</name></member> - </type> - <type category="struct" name="VkDeviceEventInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DEVICE_EVENT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>VkDeviceEventTypeEXT</type> <name>deviceEvent</name></member> - </type> - <type category="struct" name="VkDisplayEventInfoEXT"> - <member values="VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>VkDisplayEventTypeEXT</type> <name>displayEvent</name></member> - </type> - <type category="struct" name="VkSwapchainCounterCreateInfoEXT"> - <member values="VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member optional="true"><type>VkSurfaceCounterFlagsEXT</type> <name>surfaceCounters</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceGroupPropertiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>physicalDeviceCount</name></member> - <member><type>VkPhysicalDevice</type> <name>physicalDevices</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE_KHX</enum>]</member> - <member><type>VkBool32</type> <name>subsetAllocation</name></member> - </type> - <type category="struct" name="VkMemoryAllocateFlagsInfoKHX"> - <member values="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkMemoryAllocateFlagsKHX</type> <name>flags</name></member> - <member><type>uint32_t</type> <name>deviceMask</name></member> - </type> - <type category="struct" name="VkBindBufferMemoryInfoKHX"> - <member values="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>VkBuffer</type> <name>buffer</name></member> - <member><type>VkDeviceMemory</type> <name>memory</name></member> - <member><type>VkDeviceSize</type> <name>memoryOffset</name></member> - <member optional="true"><type>uint32_t</type> <name>deviceIndexCount</name></member> - <member len="deviceIndexCount">const <type>uint32_t</type>* <name>pDeviceIndices</name></member> - </type> - <type category="struct" name="VkBindImageMemoryInfoKHX"> - <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkBindImageMemorySwapchainInfoKHX">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkImage</type> <name>image</name></member> - <member><type>VkDeviceMemory</type> <name>memory</name></member> - <member><type>VkDeviceSize</type> <name>memoryOffset</name></member> - <member optional="true"><type>uint32_t</type> <name>deviceIndexCount</name></member> - <member len="deviceIndexCount">const <type>uint32_t</type>* <name>pDeviceIndices</name></member> - <member optional="true"><type>uint32_t</type> <name>SFRRectCount</name></member> - <member len="SFRRectCount">const <type>VkRect2D</type>* <name>pSFRRects</name></member> - </type> - <type category="struct" name="VkDeviceGroupRenderPassBeginInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>deviceMask</name></member> - <member optional="true"><type>uint32_t</type> <name>deviceRenderAreaCount</name></member> - <member len="deviceRenderAreaCount">const <type>VkRect2D</type>* <name>pDeviceRenderAreas</name></member> - </type> - <type category="struct" name="VkDeviceGroupCommandBufferBeginInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>deviceMask</name></member> - </type> - <type category="struct" name="VkDeviceGroupSubmitInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>waitSemaphoreCount</name></member> - <member len="waitSemaphoreCount">const <type>uint32_t</type>* <name>pWaitSemaphoreDeviceIndices</name></member> - <member optional="true"><type>uint32_t</type> <name>commandBufferCount</name></member> - <member len="commandBufferCount">const <type>uint32_t</type>* <name>pCommandBufferDeviceMasks</name></member> - <member optional="true"><type>uint32_t</type> <name>signalSemaphoreCount</name></member> - <member len="signalSemaphoreCount">const <type>uint32_t</type>* <name>pSignalSemaphoreDeviceIndices</name></member> - </type> - <type category="struct" name="VkDeviceGroupBindSparseInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>resourceDeviceIndex</name></member> - <member><type>uint32_t</type> <name>memoryDeviceIndex</name></member> - </type> - <type category="struct" name="VkDeviceGroupPresentCapabilitiesKHX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>presentMask</name>[<enum>VK_MAX_DEVICE_GROUP_SIZE_KHX</enum>]</member> - <member><type>VkDeviceGroupPresentModeFlagsKHX</type> <name>modes</name></member> - </type> - <type category="struct" name="VkImageSwapchainCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkSwapchainKHR</type> <name>swapchain</name></member> - </type> - <type category="struct" name="VkBindImageMemorySwapchainInfoKHX"> - <member values="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></member> - <member><type>uint32_t</type> <name>imageIndex</name></member> - </type> - <type category="struct" name="VkAcquireNextImageInfoKHX"> - <member values="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></member> - <member><type>uint64_t</type> <name>timeout</name></member> - <member optional="true" externsync="true"><type>VkSemaphore</type> <name>semaphore</name></member> - <member optional="true" externsync="true"><type>VkFence</type> <name>fence</name></member> - <member><type>uint32_t</type> <name>deviceMask</name></member> - </type> - <type category="struct" name="VkDeviceGroupPresentInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>swapchainCount</name></member> - <member len="swapchainCount">const <type>uint32_t</type>* <name>pDeviceMasks</name></member> - <member><type>VkDeviceGroupPresentModeFlagBitsKHX</type> <name>mode</name></member> - </type> - <type category="struct" name="VkDeviceGroupDeviceCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>uint32_t</type> <name>physicalDeviceCount</name></member> - <member len="physicalDeviceCount">const <type>VkPhysicalDevice</type>* <name>pPhysicalDevices</name></member> - </type> - <type category="struct" name="VkDeviceGroupSwapchainCreateInfoKHX"> - <member values="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHX"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkDeviceGroupPresentModeFlagsKHX</type> <name>modes</name></member> - </type> - <type category="struct" name="VkDescriptorUpdateTemplateEntryKHR"> - <member><type>uint32_t</type> <name>dstBinding</name></member>  - <member><type>uint32_t</type> <name>dstArrayElement</name></member>  - <member><type>uint32_t</type> <name>descriptorCount</name></member>  - <member><type>VkDescriptorType</type> <name>descriptorType</name></member>  - <member><type>size_t</type> <name>offset</name></member>  - <member><type>size_t</type> <name>stride</name></member>  - </type> - <type category="struct" name="VkDescriptorUpdateTemplateCreateInfoKHR"> - <member values="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkDescriptorUpdateTemplateCreateFlagsKHR</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>descriptorUpdateEntryCount</name></member>  - <member len="descriptorUpdateEntryCount">const <type>VkDescriptorUpdateTemplateEntryKHR</type>* <name>pDescriptorUpdateEntries</name></member>  - <member><type>VkDescriptorUpdateTemplateTypeKHR</type> <name>templateType</name></member> - <member optional="true"><type>VkDescriptorSetLayout</type> <name>descriptorSetLayout</name></member> - <member optional="true"><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></member> - <member optional="true"><type>VkPipelineLayout</type><name>pipelineLayout</name></member>  - <member optional="true"><type>uint32_t</type> <name>set</name></member> - </type> - <type category="struct" name="VkXYColorEXT"> -  - <member><type>float</type> <name>x</name></member> - <member><type>float</type> <name>y</name></member> - </type> - <type category="struct" name="VkHdrMetadataEXT"> -  - <member values="VK_STRUCTURE_TYPE_HDR_METADATA_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> -  - <member><type>VkXYColorEXT</type> <name>displayPrimaryRed</name></member>  - <member><type>VkXYColorEXT</type> <name>displayPrimaryGreen</name></member>  - <member><type>VkXYColorEXT</type> <name>displayPrimaryBlue</name></member>  - <member><type>VkXYColorEXT</type> <name>whitePoint</name></member>  - <member><type>float</type> <name>maxLuminance</name></member>  - <member><type>float</type> <name>minLuminance</name></member>  -  - <member><type>float</type> <name>maxContentLightLevel</name></member> - <member><type>float</type> <name>maxFrameAverageLightLevel</name></member> - </type> - <type category="struct" name="VkRefreshCycleDurationGOOGLE"> - <member><type>uint64_t</type> <name>refreshDuration</name></member>  - </type> - <type category="struct" name="VkPastPresentationTimingGOOGLE"> - <member><type>uint32_t</type> <name>presentID</name></member>  - <member><type>uint64_t</type> <name>desiredPresentTime</name></member>  - <member><type>uint64_t</type> <name>actualPresentTime</name></member>  - <member><type>uint64_t</type> <name>earliestPresentTime</name></member>  - <member><type>uint64_t</type> <name>presentMargin</name></member>  - </type> - <type category="struct" name="VkPresentTimesInfoGOOGLE"> - <member values="VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>swapchainCount</name></member>  - <member len="swapchainCount" optional="true">const <type>VkPresentTimeGOOGLE</type>* <name>pTimes</name></member>  - </type> - <type category="struct" name="VkPresentTimeGOOGLE"> - <member><type>uint32_t</type> <name>presentID</name></member>  - <member><type>uint64_t</type> <name>desiredPresentTime</name></member>  - </type> - <type category="struct" name="VkIOSSurfaceCreateInfoMVK"> - <member values="VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkIOSSurfaceCreateFlagsMVK</type> <name>flags</name></member>  - <member>const <type>void</type>* <name>pView</name></member> - </type> - <type category="struct" name="VkMacOSSurfaceCreateInfoMVK"> - <member values="VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkMacOSSurfaceCreateFlagsMVK</type> <name>flags</name></member>  - <member>const <type>void</type>* <name>pView</name></member> - </type> - <type category="struct" name="VkViewportWScalingNV"> - <member><type>float</type> <name>xcoeff</name></member> - <member><type>float</type> <name>ycoeff</name></member> - </type> - <type category="struct" name="VkPipelineViewportWScalingStateCreateInfoNV"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true">const <type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>viewportWScalingEnable</name></member> - <member><type>uint32_t</type> <name>viewportCount</name></member> - <member noautovalidity="true" len="viewportCount">const <type>VkViewportWScalingNV</type>* <name>pViewportWScalings</name></member> - </type> - <type category="struct" name="VkViewportSwizzleNV"> - <member><type>VkViewportCoordinateSwizzleNV</type> <name>x</name></member> - <member><type>VkViewportCoordinateSwizzleNV</type> <name>y</name></member> - <member><type>VkViewportCoordinateSwizzleNV</type> <name>z</name></member> - <member><type>VkViewportCoordinateSwizzleNV</type> <name>w</name></member> - </type> - <type category="struct" name="VkPipelineViewportSwizzleStateCreateInfoNV"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineViewportSwizzleStateCreateFlagsNV</type> <name>flags</name></member>  - <member><type>uint32_t</type> <name>viewportCount</name></member> - <member noautovalidity="true" optional="true" len="viewportCount">const <type>VkViewportSwizzleNV</type>* <name>pViewportSwizzles</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceDiscardRectanglePropertiesEXT"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>uint32_t</type> <name>maxDiscardRectangles</name></member>  - </type> - <type category="struct" name="VkPipelineDiscardRectangleStateCreateInfoEXT"> - <member values="VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkPipelineDiscardRectangleStateCreateFlagsEXT</type> <name>flags</name></member>  - <member><type>VkDiscardRectangleModeEXT</type> <name>discardRectangleMode</name></member> - <member optional="true"><type>uint32_t</type> <name>discardRectangleCount</name></member> - <member noautovalidity="true" optional="true" len="discardRectangleCount">const <type>VkRect2D</type>* <name>pDiscardRectangles</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>perViewPositionAllComponents</name></member> - </type> - <type category="struct" name="VkPhysicalDeviceSurfaceInfo2KHR"> - <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member>const <type>void</type>* <name>pNext</name></member> - <member><type>VkSurfaceKHR</type> <name>surface</name></member> - </type> - <type category="struct" name="VkSurfaceCapabilities2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member validextensionstructs="VkSharedPresentSurfaceCapabilitiesKHR"><type>void</type>* <name>pNext</name></member>  - <member><type>VkSurfaceCapabilitiesKHR</type> <name>surfaceCapabilities</name></member> - </type> - <type category="struct" name="VkSurfaceFormat2KHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member> - <member><type>VkSurfaceFormatKHR</type> <name>surfaceFormat</name></member> - </type> - <type category="struct" name="VkSharedPresentSurfaceCapabilitiesKHR" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR"><type>VkStructureType</type> <name>sType</name></member> - <member noautovalidity="true"><type>void</type>* <name>pNext</name></member>  - <member optional="true"><type>VkImageUsageFlags</type> <name>sharedPresentSupportedUsageFlags</name></member>  - </type> - <type category="struct" name="VkTextureLODGatherFormatPropertiesAMD" returnedonly="true"> - <member values="VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD"><type>VkStructureType</type> <name>sType</name></member> - <member><type>void</type>* <name>pNext</name></member>  - <member><type>VkBool32</type> <name>supportsTextureGatherLODBiasAMD</name></member> - </type> - </types> - -  - - <enums name="API Constants" comment="Misc. hardcoded constants - not an enumerated type"> -  - <enum value="256" name="VK_MAX_PHYSICAL_DEVICE_NAME_SIZE"/> - <enum value="16" name="VK_UUID_SIZE"/> - <enum value="8" name="VK_LUID_SIZE_KHX"/> - <enum value="256" name="VK_MAX_EXTENSION_NAME_SIZE"/> - <enum value="256" name="VK_MAX_DESCRIPTION_SIZE"/> - <enum value="32" name="VK_MAX_MEMORY_TYPES"/> - <enum value="16" name="VK_MAX_MEMORY_HEAPS"/>  - <enum value="1000.0f" name="VK_LOD_CLAMP_NONE"/> - <enum value="(~0U)" name="VK_REMAINING_MIP_LEVELS"/> - <enum value="(~0U)" name="VK_REMAINING_ARRAY_LAYERS"/> - <enum value="(~0ULL)" name="VK_WHOLE_SIZE"/> - <enum value="(~0U)" name="VK_ATTACHMENT_UNUSED"/> - <enum value="1" name="VK_TRUE"/> - <enum value="0" name="VK_FALSE"/> - <enum value="(~0U)" name="VK_QUEUE_FAMILY_IGNORED"/> - <enum value="(~0U-1)" name="VK_QUEUE_FAMILY_EXTERNAL_KHX"/> - <enum value="(~0U)" name="VK_SUBPASS_EXTERNAL"/> - <enum value="32" name="VK_MAX_DEVICE_GROUP_SIZE_KHX"/> - </enums> - -  - - <enums name="VkImageLayout" type="enum"> - <enum value="0" name="VK_IMAGE_LAYOUT_UNDEFINED" comment="Implicit layout an image is when its contents are undefined due to various reasons (e.g. right after creation)"/> - <enum value="1" name="VK_IMAGE_LAYOUT_GENERAL" comment="General layout when image can be used for any kind of access"/> - <enum value="2" name="VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL" comment="Optimal layout when image is only used for color attachment read/write"/> - <enum value="3" name="VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL" comment="Optimal layout when image is only used for depth/stencil attachment read/write"/> - <enum value="4" name="VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL" comment="Optimal layout when image is used for read only depth/stencil attachment and shader access"/> - <enum value="5" name="VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL" comment="Optimal layout when image is used for read only shader access"/> - <enum value="6" name="VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL" comment="Optimal layout when image is used only as source of transfer operations"/> - <enum value="7" name="VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL" comment="Optimal layout when image is used only as destination of transfer operations"/> - <enum value="8" name="VK_IMAGE_LAYOUT_PREINITIALIZED" comment="Initial layout used when the data is populated by the CPU"/> - </enums> - <enums name="VkAttachmentLoadOp" type="enum"> - <enum value="0" name="VK_ATTACHMENT_LOAD_OP_LOAD"/> - <enum value="1" name="VK_ATTACHMENT_LOAD_OP_CLEAR"/> - <enum value="2" name="VK_ATTACHMENT_LOAD_OP_DONT_CARE"/> - </enums> - <enums name="VkAttachmentStoreOp" type="enum"> - <enum value="0" name="VK_ATTACHMENT_STORE_OP_STORE"/> - <enum value="1" name="VK_ATTACHMENT_STORE_OP_DONT_CARE"/> - </enums> - <enums name="VkImageType" type="enum"> - <enum value="0" name="VK_IMAGE_TYPE_1D"/> - <enum value="1" name="VK_IMAGE_TYPE_2D"/> - <enum value="2" name="VK_IMAGE_TYPE_3D"/> - </enums> - <enums name="VkImageTiling" type="enum"> - <enum value="0" name="VK_IMAGE_TILING_OPTIMAL"/> - <enum value="1" name="VK_IMAGE_TILING_LINEAR"/> - </enums> - <enums name="VkImageViewType" type="enum"> - <enum value="0" name="VK_IMAGE_VIEW_TYPE_1D"/> - <enum value="1" name="VK_IMAGE_VIEW_TYPE_2D"/> - <enum value="2" name="VK_IMAGE_VIEW_TYPE_3D"/> - <enum value="3" name="VK_IMAGE_VIEW_TYPE_CUBE"/> - <enum value="4" name="VK_IMAGE_VIEW_TYPE_1D_ARRAY"/> - <enum value="5" name="VK_IMAGE_VIEW_TYPE_2D_ARRAY"/> - <enum value="6" name="VK_IMAGE_VIEW_TYPE_CUBE_ARRAY"/> - </enums> - <enums name="VkCommandBufferLevel" type="enum"> - <enum value="0" name="VK_COMMAND_BUFFER_LEVEL_PRIMARY"/> - <enum value="1" name="VK_COMMAND_BUFFER_LEVEL_SECONDARY"/> - </enums> - <enums name="VkComponentSwizzle" type="enum"> - <enum value="0" name="VK_COMPONENT_SWIZZLE_IDENTITY"/> - <enum value="1" name="VK_COMPONENT_SWIZZLE_ZERO"/> - <enum value="2" name="VK_COMPONENT_SWIZZLE_ONE"/> - <enum value="3" name="VK_COMPONENT_SWIZZLE_R"/> - <enum value="4" name="VK_COMPONENT_SWIZZLE_G"/> - <enum value="5" name="VK_COMPONENT_SWIZZLE_B"/> - <enum value="6" name="VK_COMPONENT_SWIZZLE_A"/> - </enums> - <enums name="VkDescriptorType" type="enum"> - <enum value="0" name="VK_DESCRIPTOR_TYPE_SAMPLER"/> - <enum value="1" name="VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER"/> - <enum value="2" name="VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE"/> - <enum value="3" name="VK_DESCRIPTOR_TYPE_STORAGE_IMAGE"/> - <enum value="4" name="VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER"/> - <enum value="5" name="VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER"/> - <enum value="6" name="VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER"/> - <enum value="7" name="VK_DESCRIPTOR_TYPE_STORAGE_BUFFER"/> - <enum value="8" name="VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC"/> - <enum value="9" name="VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC"/> - <enum value="10" name="VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT"/> - </enums> - <enums name="VkQueryType" type="enum"> - <enum value="0" name="VK_QUERY_TYPE_OCCLUSION"/> - <enum value="1" name="VK_QUERY_TYPE_PIPELINE_STATISTICS" comment="Optional"/> - <enum value="2" name="VK_QUERY_TYPE_TIMESTAMP"/> - </enums> - <enums name="VkBorderColor" type="enum"> - <enum value="0" name="VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK"/> - <enum value="1" name="VK_BORDER_COLOR_INT_TRANSPARENT_BLACK"/> - <enum value="2" name="VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK"/> - <enum value="3" name="VK_BORDER_COLOR_INT_OPAQUE_BLACK"/> - <enum value="4" name="VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE"/> - <enum value="5" name="VK_BORDER_COLOR_INT_OPAQUE_WHITE"/> - </enums> - <enums name="VkPipelineBindPoint" type="enum"> - <enum value="0" name="VK_PIPELINE_BIND_POINT_GRAPHICS"/> - <enum value="1" name="VK_PIPELINE_BIND_POINT_COMPUTE"/> - </enums> - <enums name="VkPipelineCacheHeaderVersion" type="enum"> - <enum value="1" name="VK_PIPELINE_CACHE_HEADER_VERSION_ONE"/> - </enums> - <enums name="VkPrimitiveTopology" type="enum"> - <enum value="0" name="VK_PRIMITIVE_TOPOLOGY_POINT_LIST"/> - <enum value="1" name="VK_PRIMITIVE_TOPOLOGY_LINE_LIST"/> - <enum value="2" name="VK_PRIMITIVE_TOPOLOGY_LINE_STRIP"/> - <enum value="3" name="VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST"/> - <enum value="4" name="VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP"/> - <enum value="5" name="VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN"/> - <enum value="6" name="VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY"/> - <enum value="7" name="VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY"/> - <enum value="8" name="VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY"/> - <enum value="9" name="VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY"/> - <enum value="10" name="VK_PRIMITIVE_TOPOLOGY_PATCH_LIST"/> - </enums> - <enums name="VkSharingMode" type="enum"> - <enum value="0" name="VK_SHARING_MODE_EXCLUSIVE"/> - <enum value="1" name="VK_SHARING_MODE_CONCURRENT"/> - </enums> - <enums name="VkIndexType" type="enum"> - <enum value="0" name="VK_INDEX_TYPE_UINT16"/> - <enum value="1" name="VK_INDEX_TYPE_UINT32"/> - </enums> - <enums name="VkFilter" type="enum"> - <enum value="0" name="VK_FILTER_NEAREST"/> - <enum value="1" name="VK_FILTER_LINEAR"/> - </enums> - <enums name="VkSamplerMipmapMode" type="enum"> - <enum value="0" name="VK_SAMPLER_MIPMAP_MODE_NEAREST" comment="Choose nearest mip level"/> - <enum value="1" name="VK_SAMPLER_MIPMAP_MODE_LINEAR" comment="Linear filter between mip levels"/> - </enums> - <enums name="VkSamplerAddressMode" type="enum"> - <enum value="0" name="VK_SAMPLER_ADDRESS_MODE_REPEAT"/> - <enum value="1" name="VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT"/> - <enum value="2" name="VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE"/> - <enum value="3" name="VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER"/> -  - </enums> - <enums name="VkCompareOp" type="enum"> - <enum value="0" name="VK_COMPARE_OP_NEVER"/> - <enum value="1" name="VK_COMPARE_OP_LESS"/> - <enum value="2" name="VK_COMPARE_OP_EQUAL"/> - <enum value="3" name="VK_COMPARE_OP_LESS_OR_EQUAL"/> - <enum value="4" name="VK_COMPARE_OP_GREATER"/> - <enum value="5" name="VK_COMPARE_OP_NOT_EQUAL"/> - <enum value="6" name="VK_COMPARE_OP_GREATER_OR_EQUAL"/> - <enum value="7" name="VK_COMPARE_OP_ALWAYS"/> - </enums> - <enums name="VkPolygonMode" type="enum"> - <enum value="0" name="VK_POLYGON_MODE_FILL"/> - <enum value="1" name="VK_POLYGON_MODE_LINE"/> - <enum value="2" name="VK_POLYGON_MODE_POINT"/> - </enums> - <enums name="VkCullModeFlagBits" type="bitmask"> - <enum value="0" name="VK_CULL_MODE_NONE"/> - <enum bitpos="0" name="VK_CULL_MODE_FRONT_BIT"/> - <enum bitpos="1" name="VK_CULL_MODE_BACK_BIT"/> - <enum value="0x00000003" name="VK_CULL_MODE_FRONT_AND_BACK"/> - </enums> - <enums name="VkFrontFace" type="enum"> - <enum value="0" name="VK_FRONT_FACE_COUNTER_CLOCKWISE"/> - <enum value="1" name="VK_FRONT_FACE_CLOCKWISE"/> - </enums> - <enums name="VkBlendFactor" type="enum"> - <enum value="0" name="VK_BLEND_FACTOR_ZERO"/> - <enum value="1" name="VK_BLEND_FACTOR_ONE"/> - <enum value="2" name="VK_BLEND_FACTOR_SRC_COLOR"/> - <enum value="3" name="VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR"/> - <enum value="4" name="VK_BLEND_FACTOR_DST_COLOR"/> - <enum value="5" name="VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR"/> - <enum value="6" name="VK_BLEND_FACTOR_SRC_ALPHA"/> - <enum value="7" name="VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA"/> - <enum value="8" name="VK_BLEND_FACTOR_DST_ALPHA"/> - <enum value="9" name="VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA"/> - <enum value="10" name="VK_BLEND_FACTOR_CONSTANT_COLOR"/> - <enum value="11" name="VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR"/> - <enum value="12" name="VK_BLEND_FACTOR_CONSTANT_ALPHA"/> - <enum value="13" name="VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA"/> - <enum value="14" name="VK_BLEND_FACTOR_SRC_ALPHA_SATURATE"/> - <enum value="15" name="VK_BLEND_FACTOR_SRC1_COLOR"/> - <enum value="16" name="VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR"/> - <enum value="17" name="VK_BLEND_FACTOR_SRC1_ALPHA"/> - <enum value="18" name="VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA"/> - </enums> - <enums name="VkBlendOp" type="enum"> - <enum value="0" name="VK_BLEND_OP_ADD"/> - <enum value="1" name="VK_BLEND_OP_SUBTRACT"/> - <enum value="2" name="VK_BLEND_OP_REVERSE_SUBTRACT"/> - <enum value="3" name="VK_BLEND_OP_MIN"/> - <enum value="4" name="VK_BLEND_OP_MAX"/> - </enums> - <enums name="VkStencilOp" type="enum"> - <enum value="0" name="VK_STENCIL_OP_KEEP"/> - <enum value="1" name="VK_STENCIL_OP_ZERO"/> - <enum value="2" name="VK_STENCIL_OP_REPLACE"/> - <enum value="3" name="VK_STENCIL_OP_INCREMENT_AND_CLAMP"/> - <enum value="4" name="VK_STENCIL_OP_DECREMENT_AND_CLAMP"/> - <enum value="5" name="VK_STENCIL_OP_INVERT"/> - <enum value="6" name="VK_STENCIL_OP_INCREMENT_AND_WRAP"/> - <enum value="7" name="VK_STENCIL_OP_DECREMENT_AND_WRAP"/> - </enums> - <enums name="VkLogicOp" type="enum"> - <enum value="0" name="VK_LOGIC_OP_CLEAR"/> - <enum value="1" name="VK_LOGIC_OP_AND"/> - <enum value="2" name="VK_LOGIC_OP_AND_REVERSE"/> - <enum value="3" name="VK_LOGIC_OP_COPY"/> - <enum value="4" name="VK_LOGIC_OP_AND_INVERTED"/> - <enum value="5" name="VK_LOGIC_OP_NO_OP"/> - <enum value="6" name="VK_LOGIC_OP_XOR"/> - <enum value="7" name="VK_LOGIC_OP_OR"/> - <enum value="8" name="VK_LOGIC_OP_NOR"/> - <enum value="9" name="VK_LOGIC_OP_EQUIVALENT"/> - <enum value="10" name="VK_LOGIC_OP_INVERT"/> - <enum value="11" name="VK_LOGIC_OP_OR_REVERSE"/> - <enum value="12" name="VK_LOGIC_OP_COPY_INVERTED"/> - <enum value="13" name="VK_LOGIC_OP_OR_INVERTED"/> - <enum value="14" name="VK_LOGIC_OP_NAND"/> - <enum value="15" name="VK_LOGIC_OP_SET"/> - </enums> - <enums name="VkInternalAllocationType" type="enum"> - <enum value="0" name="VK_INTERNAL_ALLOCATION_TYPE_EXECUTABLE"/> - </enums> - <enums name="VkSystemAllocationScope" type="enum"> - <enum value="0" name="VK_SYSTEM_ALLOCATION_SCOPE_COMMAND"/> - <enum value="1" name="VK_SYSTEM_ALLOCATION_SCOPE_OBJECT"/> - <enum value="2" name="VK_SYSTEM_ALLOCATION_SCOPE_CACHE"/> - <enum value="3" name="VK_SYSTEM_ALLOCATION_SCOPE_DEVICE"/> - <enum value="4" name="VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE"/> - </enums> - <enums name="VkPhysicalDeviceType" type="enum"> - <enum value="0" name="VK_PHYSICAL_DEVICE_TYPE_OTHER"/> - <enum value="1" name="VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU"/> - <enum value="2" name="VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU"/> - <enum value="3" name="VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU"/> - <enum value="4" name="VK_PHYSICAL_DEVICE_TYPE_CPU"/> - </enums> - <enums name="VkVertexInputRate" type="enum"> - <enum value="0" name="VK_VERTEX_INPUT_RATE_VERTEX"/> - <enum value="1" name="VK_VERTEX_INPUT_RATE_INSTANCE"/> - </enums> - <enums name="VkFormat" type="enum" comment="Vulkan format definitions"> - <enum value="0" name="VK_FORMAT_UNDEFINED"/> - <enum value="1" name="VK_FORMAT_R4G4_UNORM_PACK8"/> - <enum value="2" name="VK_FORMAT_R4G4B4A4_UNORM_PACK16"/> - <enum value="3" name="VK_FORMAT_B4G4R4A4_UNORM_PACK16"/> - <enum value="4" name="VK_FORMAT_R5G6B5_UNORM_PACK16"/> - <enum value="5" name="VK_FORMAT_B5G6R5_UNORM_PACK16"/> - <enum value="6" name="VK_FORMAT_R5G5B5A1_UNORM_PACK16"/> - <enum value="7" name="VK_FORMAT_B5G5R5A1_UNORM_PACK16"/> - <enum value="8" name="VK_FORMAT_A1R5G5B5_UNORM_PACK16"/> - <enum value="9" name="VK_FORMAT_R8_UNORM"/> - <enum value="10" name="VK_FORMAT_R8_SNORM"/> - <enum value="11" name="VK_FORMAT_R8_USCALED"/> - <enum value="12" name="VK_FORMAT_R8_SSCALED"/> - <enum value="13" name="VK_FORMAT_R8_UINT"/> - <enum value="14" name="VK_FORMAT_R8_SINT"/> - <enum value="15" name="VK_FORMAT_R8_SRGB"/> - <enum value="16" name="VK_FORMAT_R8G8_UNORM"/> - <enum value="17" name="VK_FORMAT_R8G8_SNORM"/> - <enum value="18" name="VK_FORMAT_R8G8_USCALED"/> - <enum value="19" name="VK_FORMAT_R8G8_SSCALED"/> - <enum value="20" name="VK_FORMAT_R8G8_UINT"/> - <enum value="21" name="VK_FORMAT_R8G8_SINT"/> - <enum value="22" name="VK_FORMAT_R8G8_SRGB"/> - <enum value="23" name="VK_FORMAT_R8G8B8_UNORM"/> - <enum value="24" name="VK_FORMAT_R8G8B8_SNORM"/> - <enum value="25" name="VK_FORMAT_R8G8B8_USCALED"/> - <enum value="26" name="VK_FORMAT_R8G8B8_SSCALED"/> - <enum value="27" name="VK_FORMAT_R8G8B8_UINT"/> - <enum value="28" name="VK_FORMAT_R8G8B8_SINT"/> - <enum value="29" name="VK_FORMAT_R8G8B8_SRGB"/> - <enum value="30" name="VK_FORMAT_B8G8R8_UNORM"/> - <enum value="31" name="VK_FORMAT_B8G8R8_SNORM"/> - <enum value="32" name="VK_FORMAT_B8G8R8_USCALED"/> - <enum value="33" name="VK_FORMAT_B8G8R8_SSCALED"/> - <enum value="34" name="VK_FORMAT_B8G8R8_UINT"/> - <enum value="35" name="VK_FORMAT_B8G8R8_SINT"/> - <enum value="36" name="VK_FORMAT_B8G8R8_SRGB"/> - <enum value="37" name="VK_FORMAT_R8G8B8A8_UNORM"/> - <enum value="38" name="VK_FORMAT_R8G8B8A8_SNORM"/> - <enum value="39" name="VK_FORMAT_R8G8B8A8_USCALED"/> - <enum value="40" name="VK_FORMAT_R8G8B8A8_SSCALED"/> - <enum value="41" name="VK_FORMAT_R8G8B8A8_UINT"/> - <enum value="42" name="VK_FORMAT_R8G8B8A8_SINT"/> - <enum value="43" name="VK_FORMAT_R8G8B8A8_SRGB"/> - <enum value="44" name="VK_FORMAT_B8G8R8A8_UNORM"/> - <enum value="45" name="VK_FORMAT_B8G8R8A8_SNORM"/> - <enum value="46" name="VK_FORMAT_B8G8R8A8_USCALED"/> - <enum value="47" name="VK_FORMAT_B8G8R8A8_SSCALED"/> - <enum value="48" name="VK_FORMAT_B8G8R8A8_UINT"/> - <enum value="49" name="VK_FORMAT_B8G8R8A8_SINT"/> - <enum value="50" name="VK_FORMAT_B8G8R8A8_SRGB"/> - <enum value="51" name="VK_FORMAT_A8B8G8R8_UNORM_PACK32"/> - <enum value="52" name="VK_FORMAT_A8B8G8R8_SNORM_PACK32"/> - <enum value="53" name="VK_FORMAT_A8B8G8R8_USCALED_PACK32"/> - <enum value="54" name="VK_FORMAT_A8B8G8R8_SSCALED_PACK32"/> - <enum value="55" name="VK_FORMAT_A8B8G8R8_UINT_PACK32"/> - <enum value="56" name="VK_FORMAT_A8B8G8R8_SINT_PACK32"/> - <enum value="57" name="VK_FORMAT_A8B8G8R8_SRGB_PACK32"/> - <enum value="58" name="VK_FORMAT_A2R10G10B10_UNORM_PACK32"/> - <enum value="59" name="VK_FORMAT_A2R10G10B10_SNORM_PACK32"/> - <enum value="60" name="VK_FORMAT_A2R10G10B10_USCALED_PACK32"/> - <enum value="61" name="VK_FORMAT_A2R10G10B10_SSCALED_PACK32"/> - <enum value="62" name="VK_FORMAT_A2R10G10B10_UINT_PACK32"/> - <enum value="63" name="VK_FORMAT_A2R10G10B10_SINT_PACK32"/> - <enum value="64" name="VK_FORMAT_A2B10G10R10_UNORM_PACK32"/> - <enum value="65" name="VK_FORMAT_A2B10G10R10_SNORM_PACK32"/> - <enum value="66" name="VK_FORMAT_A2B10G10R10_USCALED_PACK32"/> - <enum value="67" name="VK_FORMAT_A2B10G10R10_SSCALED_PACK32"/> - <enum value="68" name="VK_FORMAT_A2B10G10R10_UINT_PACK32"/> - <enum value="69" name="VK_FORMAT_A2B10G10R10_SINT_PACK32"/> - <enum value="70" name="VK_FORMAT_R16_UNORM"/> - <enum value="71" name="VK_FORMAT_R16_SNORM"/> - <enum value="72" name="VK_FORMAT_R16_USCALED"/> - <enum value="73" name="VK_FORMAT_R16_SSCALED"/> - <enum value="74" name="VK_FORMAT_R16_UINT"/> - <enum value="75" name="VK_FORMAT_R16_SINT"/> - <enum value="76" name="VK_FORMAT_R16_SFLOAT"/> - <enum value="77" name="VK_FORMAT_R16G16_UNORM"/> - <enum value="78" name="VK_FORMAT_R16G16_SNORM"/> - <enum value="79" name="VK_FORMAT_R16G16_USCALED"/> - <enum value="80" name="VK_FORMAT_R16G16_SSCALED"/> - <enum value="81" name="VK_FORMAT_R16G16_UINT"/> - <enum value="82" name="VK_FORMAT_R16G16_SINT"/> - <enum value="83" name="VK_FORMAT_R16G16_SFLOAT"/> - <enum value="84" name="VK_FORMAT_R16G16B16_UNORM"/> - <enum value="85" name="VK_FORMAT_R16G16B16_SNORM"/> - <enum value="86" name="VK_FORMAT_R16G16B16_USCALED"/> - <enum value="87" name="VK_FORMAT_R16G16B16_SSCALED"/> - <enum value="88" name="VK_FORMAT_R16G16B16_UINT"/> - <enum value="89" name="VK_FORMAT_R16G16B16_SINT"/> - <enum value="90" name="VK_FORMAT_R16G16B16_SFLOAT"/> - <enum value="91" name="VK_FORMAT_R16G16B16A16_UNORM"/> - <enum value="92" name="VK_FORMAT_R16G16B16A16_SNORM"/> - <enum value="93" name="VK_FORMAT_R16G16B16A16_USCALED"/> - <enum value="94" name="VK_FORMAT_R16G16B16A16_SSCALED"/> - <enum value="95" name="VK_FORMAT_R16G16B16A16_UINT"/> - <enum value="96" name="VK_FORMAT_R16G16B16A16_SINT"/> - <enum value="97" name="VK_FORMAT_R16G16B16A16_SFLOAT"/> - <enum value="98" name="VK_FORMAT_R32_UINT"/> - <enum value="99" name="VK_FORMAT_R32_SINT"/> - <enum value="100" name="VK_FORMAT_R32_SFLOAT"/> - <enum value="101" name="VK_FORMAT_R32G32_UINT"/> - <enum value="102" name="VK_FORMAT_R32G32_SINT"/> - <enum value="103" name="VK_FORMAT_R32G32_SFLOAT"/> - <enum value="104" name="VK_FORMAT_R32G32B32_UINT"/> - <enum value="105" name="VK_FORMAT_R32G32B32_SINT"/> - <enum value="106" name="VK_FORMAT_R32G32B32_SFLOAT"/> - <enum value="107" name="VK_FORMAT_R32G32B32A32_UINT"/> - <enum value="108" name="VK_FORMAT_R32G32B32A32_SINT"/> - <enum value="109" name="VK_FORMAT_R32G32B32A32_SFLOAT"/> - <enum value="110" name="VK_FORMAT_R64_UINT"/> - <enum value="111" name="VK_FORMAT_R64_SINT"/> - <enum value="112" name="VK_FORMAT_R64_SFLOAT"/> - <enum value="113" name="VK_FORMAT_R64G64_UINT"/> - <enum value="114" name="VK_FORMAT_R64G64_SINT"/> - <enum value="115" name="VK_FORMAT_R64G64_SFLOAT"/> - <enum value="116" name="VK_FORMAT_R64G64B64_UINT"/> - <enum value="117" name="VK_FORMAT_R64G64B64_SINT"/> - <enum value="118" name="VK_FORMAT_R64G64B64_SFLOAT"/> - <enum value="119" name="VK_FORMAT_R64G64B64A64_UINT"/> - <enum value="120" name="VK_FORMAT_R64G64B64A64_SINT"/> - <enum value="121" name="VK_FORMAT_R64G64B64A64_SFLOAT"/> - <enum value="122" name="VK_FORMAT_B10G11R11_UFLOAT_PACK32"/> - <enum value="123" name="VK_FORMAT_E5B9G9R9_UFLOAT_PACK32"/> - <enum value="124" name="VK_FORMAT_D16_UNORM"/> - <enum value="125" name="VK_FORMAT_X8_D24_UNORM_PACK32"/> - <enum value="126" name="VK_FORMAT_D32_SFLOAT"/> - <enum value="127" name="VK_FORMAT_S8_UINT"/> - <enum value="128" name="VK_FORMAT_D16_UNORM_S8_UINT"/> - <enum value="129" name="VK_FORMAT_D24_UNORM_S8_UINT"/> - <enum value="130" name="VK_FORMAT_D32_SFLOAT_S8_UINT"/> - <enum value="131" name="VK_FORMAT_BC1_RGB_UNORM_BLOCK"/> - <enum value="132" name="VK_FORMAT_BC1_RGB_SRGB_BLOCK"/> - <enum value="133" name="VK_FORMAT_BC1_RGBA_UNORM_BLOCK"/> - <enum value="134" name="VK_FORMAT_BC1_RGBA_SRGB_BLOCK"/> - <enum value="135" name="VK_FORMAT_BC2_UNORM_BLOCK"/> - <enum value="136" name="VK_FORMAT_BC2_SRGB_BLOCK"/> - <enum value="137" name="VK_FORMAT_BC3_UNORM_BLOCK"/> - <enum value="138" name="VK_FORMAT_BC3_SRGB_BLOCK"/> - <enum value="139" name="VK_FORMAT_BC4_UNORM_BLOCK"/> - <enum value="140" name="VK_FORMAT_BC4_SNORM_BLOCK"/> - <enum value="141" name="VK_FORMAT_BC5_UNORM_BLOCK"/> - <enum value="142" name="VK_FORMAT_BC5_SNORM_BLOCK"/> - <enum value="143" name="VK_FORMAT_BC6H_UFLOAT_BLOCK"/> - <enum value="144" name="VK_FORMAT_BC6H_SFLOAT_BLOCK"/> - <enum value="145" name="VK_FORMAT_BC7_UNORM_BLOCK"/> - <enum value="146" name="VK_FORMAT_BC7_SRGB_BLOCK"/> - <enum value="147" name="VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK"/> - <enum value="148" name="VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK"/> - <enum value="149" name="VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK"/> - <enum value="150" name="VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK"/> - <enum value="151" name="VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK"/> - <enum value="152" name="VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK"/> - <enum value="153" name="VK_FORMAT_EAC_R11_UNORM_BLOCK"/> - <enum value="154" name="VK_FORMAT_EAC_R11_SNORM_BLOCK"/> - <enum value="155" name="VK_FORMAT_EAC_R11G11_UNORM_BLOCK"/> - <enum value="156" name="VK_FORMAT_EAC_R11G11_SNORM_BLOCK"/> - <enum value="157" name="VK_FORMAT_ASTC_4x4_UNORM_BLOCK"/> - <enum value="158" name="VK_FORMAT_ASTC_4x4_SRGB_BLOCK"/> - <enum value="159" name="VK_FORMAT_ASTC_5x4_UNORM_BLOCK"/> - <enum value="160" name="VK_FORMAT_ASTC_5x4_SRGB_BLOCK"/> - <enum value="161" name="VK_FORMAT_ASTC_5x5_UNORM_BLOCK"/> - <enum value="162" name="VK_FORMAT_ASTC_5x5_SRGB_BLOCK"/> - <enum value="163" name="VK_FORMAT_ASTC_6x5_UNORM_BLOCK"/> - <enum value="164" name="VK_FORMAT_ASTC_6x5_SRGB_BLOCK"/> - <enum value="165" name="VK_FORMAT_ASTC_6x6_UNORM_BLOCK"/> - <enum value="166" name="VK_FORMAT_ASTC_6x6_SRGB_BLOCK"/> - <enum value="167" name="VK_FORMAT_ASTC_8x5_UNORM_BLOCK"/> - <enum value="168" name="VK_FORMAT_ASTC_8x5_SRGB_BLOCK"/> - <enum value="169" name="VK_FORMAT_ASTC_8x6_UNORM_BLOCK"/> - <enum value="170" name="VK_FORMAT_ASTC_8x6_SRGB_BLOCK"/> - <enum value="171" name="VK_FORMAT_ASTC_8x8_UNORM_BLOCK"/> - <enum value="172" name="VK_FORMAT_ASTC_8x8_SRGB_BLOCK"/> - <enum value="173" name="VK_FORMAT_ASTC_10x5_UNORM_BLOCK"/> - <enum value="174" name="VK_FORMAT_ASTC_10x5_SRGB_BLOCK"/> - <enum value="175" name="VK_FORMAT_ASTC_10x6_UNORM_BLOCK"/> - <enum value="176" name="VK_FORMAT_ASTC_10x6_SRGB_BLOCK"/> - <enum value="177" name="VK_FORMAT_ASTC_10x8_UNORM_BLOCK"/> - <enum value="178" name="VK_FORMAT_ASTC_10x8_SRGB_BLOCK"/> - <enum value="179" name="VK_FORMAT_ASTC_10x10_UNORM_BLOCK"/> - <enum value="180" name="VK_FORMAT_ASTC_10x10_SRGB_BLOCK"/> - <enum value="181" name="VK_FORMAT_ASTC_12x10_UNORM_BLOCK"/> - <enum value="182" name="VK_FORMAT_ASTC_12x10_SRGB_BLOCK"/> - <enum value="183" name="VK_FORMAT_ASTC_12x12_UNORM_BLOCK"/> - <enum value="184" name="VK_FORMAT_ASTC_12x12_SRGB_BLOCK"/> - </enums> - <enums name="VkStructureType" type="enum" comment="Structure type enumerant"> - <enum value="0" name="VK_STRUCTURE_TYPE_APPLICATION_INFO"/> - <enum value="1" name="VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO"/> - <enum value="2" name="VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO"/> - <enum value="3" name="VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO"/> - <enum value="4" name="VK_STRUCTURE_TYPE_SUBMIT_INFO"/> - <enum value="5" name="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO"/> - <enum value="6" name="VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE"/> - <enum value="7" name="VK_STRUCTURE_TYPE_BIND_SPARSE_INFO"/> - <enum value="8" name="VK_STRUCTURE_TYPE_FENCE_CREATE_INFO"/> - <enum value="9" name="VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO"/> - <enum value="10" name="VK_STRUCTURE_TYPE_EVENT_CREATE_INFO"/> - <enum value="11" name="VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO"/> - <enum value="12" name="VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO"/> - <enum value="13" name="VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO"/> - <enum value="14" name="VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO"/> - <enum value="15" name="VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO"/> - <enum value="16" name="VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO"/> - <enum value="17" name="VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO"/> - <enum value="18" name="VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO"/> - <enum value="19" name="VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO"/> - <enum value="20" name="VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO"/> - <enum value="21" name="VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO"/> - <enum value="22" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO"/> - <enum value="23" name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO"/> - <enum value="24" name="VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO"/> - <enum value="25" name="VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO"/> - <enum value="26" name="VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO"/> - <enum value="27" name="VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO"/> - <enum value="28" name="VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO"/> - <enum value="29" name="VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO"/> - <enum value="30" name="VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO"/> - <enum value="31" name="VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO"/> - <enum value="32" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO"/> - <enum value="33" name="VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO"/> - <enum value="34" name="VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO"/> - <enum value="35" name="VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET"/> - <enum value="36" name="VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET"/> - <enum value="37" name="VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO"/> - <enum value="38" name="VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO"/> - <enum value="39" name="VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO"/> - <enum value="40" name="VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO"/> - <enum value="41" name="VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO"/> - <enum value="42" name="VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO"/> - <enum value="43" name="VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO"/> - <enum value="44" name="VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER"/> - <enum value="45" name="VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER"/> - <enum value="46" name="VK_STRUCTURE_TYPE_MEMORY_BARRIER"/> - <enum value="47" name="VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"/>  - <enum value="48" name="VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"/>  - </enums> - <enums name="VkSubpassContents" type="enum"> - <enum value="0" name="VK_SUBPASS_CONTENTS_INLINE"/> - <enum value="1" name="VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS"/> - </enums> - <enums name="VkResult" type="enum" comment="Error and return codes"> -  - <enum value="0" name="VK_SUCCESS" comment="Command completed successfully"/> - <enum value="1" name="VK_NOT_READY" comment="A fence or query has not yet completed"/> - <enum value="2" name="VK_TIMEOUT" comment="A wait operation has not completed in the specified time"/> - <enum value="3" name="VK_EVENT_SET" comment="An event is signaled"/> - <enum value="4" name="VK_EVENT_RESET" comment="An event is unsignaled"/> - <enum value="5" name="VK_INCOMPLETE" comment="A return array was too small for the result"/> -  - <enum value="-1" name="VK_ERROR_OUT_OF_HOST_MEMORY" comment="A host memory allocation has failed"/> - <enum value="-2" name="VK_ERROR_OUT_OF_DEVICE_MEMORY" comment="A device memory allocation has failed"/> - <enum value="-3" name="VK_ERROR_INITIALIZATION_FAILED" comment="Initialization of a object has failed"/> - <enum value="-4" name="VK_ERROR_DEVICE_LOST" comment="The logical device has been lost. See <<devsandqueues-lost-device>>"/> - <enum value="-5" name="VK_ERROR_MEMORY_MAP_FAILED" comment="Mapping of a memory object has failed"/> - <enum value="-6" name="VK_ERROR_LAYER_NOT_PRESENT" comment="Layer specified does not exist"/> - <enum value="-7" name="VK_ERROR_EXTENSION_NOT_PRESENT" comment="Extension specified does not exist"/> - <enum value="-8" name="VK_ERROR_FEATURE_NOT_PRESENT" comment="Requested feature is not available on this device"/> - <enum value="-9" name="VK_ERROR_INCOMPATIBLE_DRIVER" comment="Unable to find a Vulkan driver"/> - <enum value="-10" name="VK_ERROR_TOO_MANY_OBJECTS" comment="Too many objects of the type have already been created"/> - <enum value="-11" name="VK_ERROR_FORMAT_NOT_SUPPORTED" comment="Requested format is not supported on this device"/> - <enum value="-12" name="VK_ERROR_FRAGMENTED_POOL" comment="A requested pool allocation has failed due to fragmentation of the pool's memory"/> - <unused start="-12"/> - </enums> - <enums name="VkDynamicState" type="enum"> - <enum value="0" name="VK_DYNAMIC_STATE_VIEWPORT"/> - <enum value="1" name="VK_DYNAMIC_STATE_SCISSOR"/> - <enum value="2" name="VK_DYNAMIC_STATE_LINE_WIDTH"/> - <enum value="3" name="VK_DYNAMIC_STATE_DEPTH_BIAS"/> - <enum value="4" name="VK_DYNAMIC_STATE_BLEND_CONSTANTS"/> - <enum value="5" name="VK_DYNAMIC_STATE_DEPTH_BOUNDS"/> - <enum value="6" name="VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK"/> - <enum value="7" name="VK_DYNAMIC_STATE_STENCIL_WRITE_MASK"/> - <enum value="8" name="VK_DYNAMIC_STATE_STENCIL_REFERENCE"/> - </enums> - <enums name="VkDescriptorUpdateTemplateTypeKHR" type="enum"> - <enum value="0" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR" comment="Create descriptor update template for descriptor set updates"/> - <enum value="1" name="VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR" comment="Create descriptor update template for pushed descriptor updates"/> - </enums> - <enums name="VkObjectType" type="enum" comment="Enums to track objects of various types"> - <enum value="0" name="VK_OBJECT_TYPE_UNKNOWN"/> - <enum value="1" name="VK_OBJECT_TYPE_INSTANCE" comment="VkInstance"/> - <enum value="2" name="VK_OBJECT_TYPE_PHYSICAL_DEVICE" comment="VkPhysicalDevice"/> - <enum value="3" name="VK_OBJECT_TYPE_DEVICE" comment="VkDevice"/> - <enum value="4" name="VK_OBJECT_TYPE_QUEUE" comment="VkQueue"/> - <enum value="5" name="VK_OBJECT_TYPE_SEMAPHORE" comment="VkSemaphore"/> - <enum value="6" name="VK_OBJECT_TYPE_COMMAND_BUFFER" comment="VkCommandBuffer"/> - <enum value="7" name="VK_OBJECT_TYPE_FENCE" comment="VkFence"/> - <enum value="8" name="VK_OBJECT_TYPE_DEVICE_MEMORY" comment="VkDeviceMemory"/> - <enum value="9" name="VK_OBJECT_TYPE_BUFFER" comment="VkBuffer"/> - <enum value="10" name="VK_OBJECT_TYPE_IMAGE" comment="VkImage"/> - <enum value="11" name="VK_OBJECT_TYPE_EVENT" comment="VkEvent"/> - <enum value="12" name="VK_OBJECT_TYPE_QUERY_POOL" comment="VkQueryPool"/> - <enum value="13" name="VK_OBJECT_TYPE_BUFFER_VIEW" comment="VkBufferView"/> - <enum value="14" name="VK_OBJECT_TYPE_IMAGE_VIEW" comment="VkImageView"/> - <enum value="15" name="VK_OBJECT_TYPE_SHADER_MODULE" comment="VkShaderModule"/> - <enum value="16" name="VK_OBJECT_TYPE_PIPELINE_CACHE" comment="VkPipelineCache"/> - <enum value="17" name="VK_OBJECT_TYPE_PIPELINE_LAYOUT" comment="VkPipelineLayout"/> - <enum value="18" name="VK_OBJECT_TYPE_RENDER_PASS" comment="VkRenderPass"/> - <enum value="19" name="VK_OBJECT_TYPE_PIPELINE" comment="VkPipeline"/> - <enum value="20" name="VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT" comment="VkDescriptorSetLayout"/> - <enum value="21" name="VK_OBJECT_TYPE_SAMPLER" comment="VkSampler"/> - <enum value="22" name="VK_OBJECT_TYPE_DESCRIPTOR_POOL" comment="VkDescriptorPool"/> - <enum value="23" name="VK_OBJECT_TYPE_DESCRIPTOR_SET" comment="VkDescriptorSet"/> - <enum value="24" name="VK_OBJECT_TYPE_FRAMEBUFFER" comment="VkFramebuffer"/> - <enum value="25" name="VK_OBJECT_TYPE_COMMAND_POOL" comment="VkCommandPool"/> - </enums> - -  - <enums name="VkQueueFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_QUEUE_GRAPHICS_BIT" comment="Queue supports graphics operations"/> - <enum bitpos="1" name="VK_QUEUE_COMPUTE_BIT" comment="Queue supports compute operations"/> - <enum bitpos="2" name="VK_QUEUE_TRANSFER_BIT" comment="Queue supports transfer operations"/> - <enum bitpos="3" name="VK_QUEUE_SPARSE_BINDING_BIT" comment="Queue supports sparse resource memory management operations"/> - </enums> - <enums name="VkMemoryPropertyFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT" comment="If otherwise stated, then allocate memory on device"/> - <enum bitpos="1" name="VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT" comment="Memory is mappable by host"/> - <enum bitpos="2" name="VK_MEMORY_PROPERTY_HOST_COHERENT_BIT" comment="Memory will have i/o coherency. If not set, application may need to use vkFlushMappedMemoryRanges and vkInvalidateMappedMemoryRanges to flush/invalidate host cache"/> - <enum bitpos="3" name="VK_MEMORY_PROPERTY_HOST_CACHED_BIT" comment="Memory will be cached by the host"/> - <enum bitpos="4" name="VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT" comment="Memory may be allocated by the driver when it is required"/> - </enums> - <enums name="VkMemoryHeapFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_MEMORY_HEAP_DEVICE_LOCAL_BIT" comment="If set, heap represents device memory"/> - </enums> - <enums name="VkAccessFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_ACCESS_INDIRECT_COMMAND_READ_BIT" comment="Controls coherency of indirect command reads"/> - <enum bitpos="1" name="VK_ACCESS_INDEX_READ_BIT" comment="Controls coherency of index reads"/> - <enum bitpos="2" name="VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT" comment="Controls coherency of vertex attribute reads"/> - <enum bitpos="3" name="VK_ACCESS_UNIFORM_READ_BIT" comment="Controls coherency of uniform buffer reads"/> - <enum bitpos="4" name="VK_ACCESS_INPUT_ATTACHMENT_READ_BIT" comment="Controls coherency of input attachment reads"/> - <enum bitpos="5" name="VK_ACCESS_SHADER_READ_BIT" comment="Controls coherency of shader reads"/> - <enum bitpos="6" name="VK_ACCESS_SHADER_WRITE_BIT" comment="Controls coherency of shader writes"/> - <enum bitpos="7" name="VK_ACCESS_COLOR_ATTACHMENT_READ_BIT" comment="Controls coherency of color attachment reads"/> - <enum bitpos="8" name="VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT" comment="Controls coherency of color attachment writes"/> - <enum bitpos="9" name="VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT" comment="Controls coherency of depth/stencil attachment reads"/> - <enum bitpos="10" name="VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT" comment="Controls coherency of depth/stencil attachment writes"/> - <enum bitpos="11" name="VK_ACCESS_TRANSFER_READ_BIT" comment="Controls coherency of transfer reads"/> - <enum bitpos="12" name="VK_ACCESS_TRANSFER_WRITE_BIT" comment="Controls coherency of transfer writes"/> - <enum bitpos="13" name="VK_ACCESS_HOST_READ_BIT" comment="Controls coherency of host reads"/> - <enum bitpos="14" name="VK_ACCESS_HOST_WRITE_BIT" comment="Controls coherency of host writes"/> - <enum bitpos="15" name="VK_ACCESS_MEMORY_READ_BIT" comment="Controls coherency of memory reads"/> - <enum bitpos="16" name="VK_ACCESS_MEMORY_WRITE_BIT" comment="Controls coherency of memory writes"/> - </enums> - <enums name="VkBufferUsageFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_BUFFER_USAGE_TRANSFER_SRC_BIT" comment="Can be used as a source of transfer operations"/> - <enum bitpos="1" name="VK_BUFFER_USAGE_TRANSFER_DST_BIT" comment="Can be used as a destination of transfer operations"/> - <enum bitpos="2" name="VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT" comment="Can be used as TBO"/> - <enum bitpos="3" name="VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT" comment="Can be used as IBO"/> - <enum bitpos="4" name="VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT" comment="Can be used as UBO"/> - <enum bitpos="5" name="VK_BUFFER_USAGE_STORAGE_BUFFER_BIT" comment="Can be used as SSBO"/> - <enum bitpos="6" name="VK_BUFFER_USAGE_INDEX_BUFFER_BIT" comment="Can be used as source of fixed-function index fetch (index buffer)"/> - <enum bitpos="7" name="VK_BUFFER_USAGE_VERTEX_BUFFER_BIT" comment="Can be used as source of fixed-function vertex fetch (VBO)"/> - <enum bitpos="8" name="VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT" comment="Can be the source of indirect parameters (e.g. indirect buffer, parameter buffer)"/> - </enums> - <enums name="VkBufferCreateFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_BUFFER_CREATE_SPARSE_BINDING_BIT" comment="Buffer should support sparse backing"/> - <enum bitpos="1" name="VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT" comment="Buffer should support sparse backing with partial residency"/> - <enum bitpos="2" name="VK_BUFFER_CREATE_SPARSE_ALIASED_BIT" comment="Buffer should support constent data access to physical memory ranges mapped into multiple locations of sparse buffers"/> - </enums> - <enums name="VkShaderStageFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_SHADER_STAGE_VERTEX_BIT"/> - <enum bitpos="1" name="VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT"/> - <enum bitpos="2" name="VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT"/> - <enum bitpos="3" name="VK_SHADER_STAGE_GEOMETRY_BIT"/> - <enum bitpos="4" name="VK_SHADER_STAGE_FRAGMENT_BIT"/> - <enum bitpos="5" name="VK_SHADER_STAGE_COMPUTE_BIT"/> - <enum value="0x0000001F" name="VK_SHADER_STAGE_ALL_GRAPHICS"/> - <enum value="0x7FFFFFFF" name="VK_SHADER_STAGE_ALL"/> - </enums> - <enums name="VkImageUsageFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_IMAGE_USAGE_TRANSFER_SRC_BIT" comment="Can be used as a source of transfer operations"/> - <enum bitpos="1" name="VK_IMAGE_USAGE_TRANSFER_DST_BIT" comment="Can be used as a destination of transfer operations"/> - <enum bitpos="2" name="VK_IMAGE_USAGE_SAMPLED_BIT" comment="Can be sampled from (SAMPLED_IMAGE and COMBINED_IMAGE_SAMPLER descriptor types)"/> - <enum bitpos="3" name="VK_IMAGE_USAGE_STORAGE_BIT" comment="Can be used as storage image (STORAGE_IMAGE descriptor type)"/> - <enum bitpos="4" name="VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT" comment="Can be used as framebuffer color attachment"/> - <enum bitpos="5" name="VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT" comment="Can be used as framebuffer depth/stencil attachment"/> - <enum bitpos="6" name="VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT" comment="Image data not needed outside of rendering"/> - <enum bitpos="7" name="VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT" comment="Can be used as framebuffer input attachment"/> - </enums> - <enums name="VkImageCreateFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_IMAGE_CREATE_SPARSE_BINDING_BIT" comment="Image should support sparse backing"/> - <enum bitpos="1" name="VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT" comment="Image should support sparse backing with partial residency"/> - <enum bitpos="2" name="VK_IMAGE_CREATE_SPARSE_ALIASED_BIT" comment="Image should support constent data access to physical memory ranges mapped into multiple locations of sparse images"/> - <enum bitpos="3" name="VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT" comment="Allows image views to have different format than the base image"/> - <enum bitpos="4" name="VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT" comment="Allows creating image views with cube type from the created image"/> - </enums> - <enums name="VkPipelineCreateFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT"/> - <enum bitpos="1" name="VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT"/> - <enum bitpos="2" name="VK_PIPELINE_CREATE_DERIVATIVE_BIT"/> - </enums> - <enums name="VkColorComponentFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_COLOR_COMPONENT_R_BIT"/> - <enum bitpos="1" name="VK_COLOR_COMPONENT_G_BIT"/> - <enum bitpos="2" name="VK_COLOR_COMPONENT_B_BIT"/> - <enum bitpos="3" name="VK_COLOR_COMPONENT_A_BIT"/> - </enums> - <enums name="VkFenceCreateFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_FENCE_CREATE_SIGNALED_BIT"/> - </enums> - <enums name="VkFormatFeatureFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" comment="Format can be used for sampled images (SAMPLED_IMAGE and COMBINED_IMAGE_SAMPLER descriptor types)"/> - <enum bitpos="1" name="VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT" comment="Format can be used for storage images (STORAGE_IMAGE descriptor type)"/> - <enum bitpos="2" name="VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT" comment="Format supports atomic operations in case it is used for storage images"/> - <enum bitpos="3" name="VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" comment="Format can be used for uniform texel buffers (TBOs)"/> - <enum bitpos="4" name="VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT" comment="Format can be used for storage texel buffers (IBOs)"/> - <enum bitpos="5" name="VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT" comment="Format supports atomic operations in case it is used for storage texel buffers"/> - <enum bitpos="6" name="VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT" comment="Format can be used for vertex buffers (VBOs)"/> - <enum bitpos="7" name="VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT" comment="Format can be used for color attachment images"/> - <enum bitpos="8" name="VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT" comment="Format supports blending in case it is used for color attachment images"/> - <enum bitpos="9" name="VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" comment="Format can be used for depth/stencil attachment images"/> - <enum bitpos="10" name="VK_FORMAT_FEATURE_BLIT_SRC_BIT" comment="Format can be used as the source image of blits with vkCmdBlitImage"/> - <enum bitpos="11" name="VK_FORMAT_FEATURE_BLIT_DST_BIT" comment="Format can be used as the destination image of blits with vkCmdBlitImage"/> - <enum bitpos="12" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT" comment="Format can be filtered with VK_FILTER_LINEAR when being sampled"/> - </enums> - <enums name="VkQueryControlFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_QUERY_CONTROL_PRECISE_BIT" comment="Require precise results to be collected by the query"/> - </enums> - <enums name="VkQueryResultFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_QUERY_RESULT_64_BIT" comment="Results of the queries are written to the destination buffer as 64-bit values"/> - <enum bitpos="1" name="VK_QUERY_RESULT_WAIT_BIT" comment="Results of the queries are waited on before proceeding with the result copy"/> - <enum bitpos="2" name="VK_QUERY_RESULT_WITH_AVAILABILITY_BIT" comment="Besides the results of the query, the availability of the results is also written"/> - <enum bitpos="3" name="VK_QUERY_RESULT_PARTIAL_BIT" comment="Copy the partial results of the query even if the final results are not available"/> - </enums> - <enums name="VkCommandBufferUsageFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT"/> - <enum bitpos="1" name="VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT"/> - <enum bitpos="2" name="VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT" comment="Command buffer may be submitted/executed more than once simultaneously"/> - </enums> - <enums name="VkQueryPipelineStatisticFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT" comment="Optional"/> - <enum bitpos="1" name="VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT" comment="Optional"/> - <enum bitpos="2" name="VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT" comment="Optional"/> - <enum bitpos="3" name="VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT" comment="Optional"/> - <enum bitpos="4" name="VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT" comment="Optional"/> - <enum bitpos="5" name="VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT" comment="Optional"/> - <enum bitpos="6" name="VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT" comment="Optional"/> - <enum bitpos="7" name="VK_QUERY_PIPELINE_STATISTIC_FRAGMENT_SHADER_INVOCATIONS_BIT" comment="Optional"/> - <enum bitpos="8" name="VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT" comment="Optional"/> - <enum bitpos="9" name="VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT" comment="Optional"/> - <enum bitpos="10" name="VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT" comment="Optional"/> - </enums> - <enums name="VkImageAspectFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_IMAGE_ASPECT_COLOR_BIT"/> - <enum bitpos="1" name="VK_IMAGE_ASPECT_DEPTH_BIT"/> - <enum bitpos="2" name="VK_IMAGE_ASPECT_STENCIL_BIT"/> - <enum bitpos="3" name="VK_IMAGE_ASPECT_METADATA_BIT"/> - </enums> - <enums name="VkSparseImageFormatFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT" comment="Image uses a single mip tail region for all array layers"/> - <enum bitpos="1" name="VK_SPARSE_IMAGE_FORMAT_ALIGNED_MIP_SIZE_BIT" comment="Image requires mip level dimensions to be an integer multiple of the sparse image block dimensions for non-tail mip levels."/> - <enum bitpos="2" name="VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT" comment="Image uses a non-standard sparse image block dimensions"/> - </enums> - <enums name="VkSparseMemoryBindFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_SPARSE_MEMORY_BIND_METADATA_BIT" comment="Operation binds resource metadata to memory"/> - </enums> - <enums name="VkPipelineStageFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT" comment="Before subsequent commands are processed"/> - <enum bitpos="1" name="VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT" comment="Draw/DispatchIndirect command fetch"/> - <enum bitpos="2" name="VK_PIPELINE_STAGE_VERTEX_INPUT_BIT" comment="Vertex/index fetch"/> - <enum bitpos="3" name="VK_PIPELINE_STAGE_VERTEX_SHADER_BIT" comment="Vertex shading"/> - <enum bitpos="4" name="VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT" comment="Tessellation control shading"/> - <enum bitpos="5" name="VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT" comment="Tessellation evaluation shading"/> - <enum bitpos="6" name="VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT" comment="Geometry shading"/> - <enum bitpos="7" name="VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT" comment="Fragment shading"/> - <enum bitpos="8" name="VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT" comment="Early fragment (depth and stencil) tests"/> - <enum bitpos="9" name="VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT" comment="Late fragment (depth and stencil) tests"/> - <enum bitpos="10" name="VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT" comment="Color attachment writes"/> - <enum bitpos="11" name="VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT" comment="Compute shading"/> - <enum bitpos="12" name="VK_PIPELINE_STAGE_TRANSFER_BIT" comment="Transfer/copy operations"/> - <enum bitpos="13" name="VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT" comment="After previous commands have completed"/> - <enum bitpos="14" name="VK_PIPELINE_STAGE_HOST_BIT" comment="Indicates host (CPU) is a source/sink of the dependency"/> - <enum bitpos="15" name="VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT" comment="All stages of the graphics pipeline"/> - <enum bitpos="16" name="VK_PIPELINE_STAGE_ALL_COMMANDS_BIT" comment="All stages supported on the queue"/> - </enums> - <enums name="VkCommandPoolCreateFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_COMMAND_POOL_CREATE_TRANSIENT_BIT" comment="Command buffers have a short lifetime"/> - <enum bitpos="1" name="VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT" comment="Command buffers may release their memory individually"/> - </enums> - <enums name="VkCommandPoolResetFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT" comment="Release resources owned by the pool"/> - </enums> - <enums name="VkCommandBufferResetFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT" comment="Release resources owned by the buffer"/> - </enums> - <enums name="VkSampleCountFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_SAMPLE_COUNT_1_BIT" comment="Sample count 1 supported"/> - <enum bitpos="1" name="VK_SAMPLE_COUNT_2_BIT" comment="Sample count 2 supported"/> - <enum bitpos="2" name="VK_SAMPLE_COUNT_4_BIT" comment="Sample count 4 supported"/> - <enum bitpos="3" name="VK_SAMPLE_COUNT_8_BIT" comment="Sample count 8 supported"/> - <enum bitpos="4" name="VK_SAMPLE_COUNT_16_BIT" comment="Sample count 16 supported"/> - <enum bitpos="5" name="VK_SAMPLE_COUNT_32_BIT" comment="Sample count 32 supported"/> - <enum bitpos="6" name="VK_SAMPLE_COUNT_64_BIT" comment="Sample count 64 supported"/> - </enums> - <enums name="VkAttachmentDescriptionFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT" comment="The attachment may alias physical memory of another attachment in the same render pass"/> - </enums> - <enums name="VkStencilFaceFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_STENCIL_FACE_FRONT_BIT" comment="Front face"/> - <enum bitpos="1" name="VK_STENCIL_FACE_BACK_BIT" comment="Back face"/> - <enum value="0x00000003" name="VK_STENCIL_FRONT_AND_BACK" comment="Front and back faces"/> - </enums> - <enums name="VkDescriptorPoolCreateFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT" comment="Descriptor sets may be freed individually"/> - </enums> - <enums name="VkDependencyFlagBits" type="bitmask"> - <enum bitpos="0" name="VK_DEPENDENCY_BY_REGION_BIT" comment="Dependency is per pixel region "/> - </enums> -  - <enums name="VkPresentModeKHR" type="enum"> - <enum value="0" name="VK_PRESENT_MODE_IMMEDIATE_KHR"/> - <enum value="1" name="VK_PRESENT_MODE_MAILBOX_KHR"/> - <enum value="2" name="VK_PRESENT_MODE_FIFO_KHR"/> - <enum value="3" name="VK_PRESENT_MODE_FIFO_RELAXED_KHR"/> - </enums> - <enums name="VkColorSpaceKHR" type="enum"> - <enum value="0" name="VK_COLOR_SPACE_SRGB_NONLINEAR_KHR"/> - </enums> - <enums name="VkDisplayPlaneAlphaFlagBitsKHR" type="bitmask"> - <enum bitpos="0" name="VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR"/> - <enum bitpos="1" name="VK_DISPLAY_PLANE_ALPHA_GLOBAL_BIT_KHR"/> - <enum bitpos="2" name="VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_BIT_KHR"/> - <enum bitpos="3" name="VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR"/> - </enums> - <enums name="VkCompositeAlphaFlagBitsKHR" type="bitmask"> - <enum bitpos="0" name="VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR"/> - <enum bitpos="1" name="VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR"/> - <enum bitpos="2" name="VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR"/> - <enum bitpos="3" name="VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR"/> - </enums> - <enums name="VkSurfaceTransformFlagBitsKHR" type="bitmask"> - <enum bitpos="0" name="VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR"/> - <enum bitpos="1" name="VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR"/> - <enum bitpos="2" name="VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR"/> - <enum bitpos="3" name="VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR"/> - <enum bitpos="4" name="VK_SURFACE_TRANSFORM_HORIZONTAL_MIRROR_BIT_KHR"/> - <enum bitpos="5" name="VK_SURFACE_TRANSFORM_HORIZONTAL_MIRROR_ROTATE_90_BIT_KHR"/> - <enum bitpos="6" name="VK_SURFACE_TRANSFORM_HORIZONTAL_MIRROR_ROTATE_180_BIT_KHR"/> - <enum bitpos="7" name="VK_SURFACE_TRANSFORM_HORIZONTAL_MIRROR_ROTATE_270_BIT_KHR"/> - <enum bitpos="8" name="VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR"/> - </enums> - <enums name="VkDebugReportFlagBitsEXT" type="bitmask"> - <enum bitpos="0" name="VK_DEBUG_REPORT_INFORMATION_BIT_EXT"/> - <enum bitpos="1" name="VK_DEBUG_REPORT_WARNING_BIT_EXT"/> - <enum bitpos="2" name="VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT"/> - <enum bitpos="3" name="VK_DEBUG_REPORT_ERROR_BIT_EXT"/> - <enum bitpos="4" name="VK_DEBUG_REPORT_DEBUG_BIT_EXT"/> - </enums> - <enums name="VkDebugReportObjectTypeEXT" type="enum"> - <enum value="0" name="VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT"/> - <enum value="1" name="VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT"/> - <enum value="2" name="VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT"/> - <enum value="3" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT"/> - <enum value="4" name="VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT"/> - <enum value="5" name="VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT"/> - <enum value="6" name="VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT"/> - <enum value="7" name="VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT"/> - <enum value="8" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT"/> - <enum value="9" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT"/> - <enum value="10" name="VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT"/> - <enum value="11" name="VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT"/> - <enum value="12" name="VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT"/> - <enum value="13" name="VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT"/> - <enum value="14" name="VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT"/> - <enum value="15" name="VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT"/> - <enum value="16" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT"/> - <enum value="17" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT"/> - <enum value="18" name="VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT"/> - <enum value="19" name="VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT"/> - <enum value="20" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT"/> - <enum value="21" name="VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT"/> - <enum value="22" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT"/> - <enum value="23" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT"/> - <enum value="24" name="VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT"/> - <enum value="25" name="VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT"/> - <enum value="26" name="VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT"/> - <enum value="27" name="VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT"/> - <enum value="28" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT"/> - <enum value="29" name="VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT"/> - <enum value="30" name="VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT"/> - <enum value="31" name="VK_DEBUG_REPORT_OBJECT_TYPE_OBJECT_TABLE_NVX_EXT"/> - <enum value="32" name="VK_DEBUG_REPORT_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX_EXT"/> - </enums> - <enums name="VkRasterizationOrderAMD" type="enum"> - <enum value="0" name="VK_RASTERIZATION_ORDER_STRICT_AMD"/>  - <enum value="1" name="VK_RASTERIZATION_ORDER_RELAXED_AMD"/>  - </enums> - <enums name="VkExternalMemoryHandleTypeFlagBitsNV" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_NV"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_NV"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_BIT_NV"/> - <enum bitpos="3" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_KMT_BIT_NV"/> - </enums> - <enums name="VkExternalMemoryFeatureFlagBitsNV" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_NV"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_NV"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_NV"/> - </enums> - <enums name="VkValidationCheckEXT" type="enum"> - <enum value="0" name="VK_VALIDATION_CHECK_ALL_EXT"/> - <enum value="1" name="VK_VALIDATION_CHECK_SHADERS_EXT"/> -  - </enums> - <enums name="VkIndirectCommandsLayoutUsageFlagBitsNVX" type="bitmask"> - <enum bitpos="0" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NVX"/>  - <enum bitpos="1" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_SPARSE_SEQUENCES_BIT_NVX"/>  - <enum bitpos="2" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EMPTY_EXECUTIONS_BIT_NVX"/>  - <enum bitpos="3" name="VK_INDIRECT_COMMANDS_LAYOUT_USAGE_INDEXED_SEQUENCES_BIT_NVX"/>  - </enums> - <enums name="VkObjectEntryUsageFlagBitsNVX" type="bitmask"> - <enum bitpos="0" name="VK_OBJECT_ENTRY_USAGE_GRAPHICS_BIT_NVX"/> - <enum bitpos="1" name="VK_OBJECT_ENTRY_USAGE_COMPUTE_BIT_NVX"/> - </enums> - <enums name="VkIndirectCommandsTokenTypeNVX" type="enum"> - <enum value="0" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_PIPELINE_NVX"/>  - <enum value="1" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DESCRIPTOR_SET_NVX"/>  - <enum value="2" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_INDEX_BUFFER_NVX"/>  - <enum value="3" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_VERTEX_BUFFER_NVX"/>  - <enum value="4" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_PUSH_CONSTANT_NVX"/>  - <enum value="5" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_INDEXED_NVX"/>  - <enum value="6" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DRAW_NVX"/>  - <enum value="7" name="VK_INDIRECT_COMMANDS_TOKEN_TYPE_DISPATCH_NVX"/>  - </enums> - <enums name="VkObjectEntryTypeNVX" type="enum"> - <enum value="0" name="VK_OBJECT_ENTRY_TYPE_DESCRIPTOR_SET_NVX"/> - <enum value="1" name="VK_OBJECT_ENTRY_TYPE_PIPELINE_NVX"/> - <enum value="2" name="VK_OBJECT_ENTRY_TYPE_INDEX_BUFFER_NVX"/> - <enum value="3" name="VK_OBJECT_ENTRY_TYPE_VERTEX_BUFFER_NVX"/> - <enum value="4" name="VK_OBJECT_ENTRY_TYPE_PUSH_CONSTANT_NVX"/> - </enums> - <enums name="VkDescriptorSetLayoutCreateFlagBits" type="bitmask"> - </enums> - <enums name="VkExternalMemoryHandleTypeFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHX"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHX"/> - <enum bitpos="3" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHX"/> - <enum bitpos="4" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHX"/> - <enum bitpos="5" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHX"/> - <enum bitpos="6" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHX"/> - </enums> - <enums name="VkExternalMemoryFeatureFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHX"/> - <enum bitpos="2" name="VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHX"/> - </enums> - <enums name="VkExternalSemaphoreHandleTypeFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHX"/> - <enum bitpos="2" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHX"/> - <enum bitpos="3" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHX"/> - <enum bitpos="4" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FENCE_FD_BIT_KHX"/> - </enums> - <enums name="VkExternalSemaphoreFeatureFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHX"/> - <enum bitpos="1" name="VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHX"/> - </enums> - <enums name="VkSurfaceCounterFlagBitsEXT" type="bitmask"> - <enum bitpos="0" name="VK_SURFACE_COUNTER_VBLANK_EXT"/> - </enums> - <enums name="VkDisplayPowerStateEXT" type="enum"> - <enum value="0" name="VK_DISPLAY_POWER_STATE_OFF_EXT"/> - <enum value="1" name="VK_DISPLAY_POWER_STATE_SUSPEND_EXT"/> - <enum value="2" name="VK_DISPLAY_POWER_STATE_ON_EXT"/> - </enums> - <enums name="VkDeviceEventTypeEXT" type="enum"> - <enum value="0" name="VK_DEVICE_EVENT_TYPE_DISPLAY_HOTPLUG_EXT"/> - </enums> - <enums name="VkDisplayEventTypeEXT" type="enum"> - <enum value="0" name="VK_DISPLAY_EVENT_TYPE_FIRST_PIXEL_OUT_EXT"/> - </enums> - <enums name="VkPeerMemoryFeatureFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT_KHX" comment="Can read with vkCmdCopy commands"/> - <enum bitpos="1" name="VK_PEER_MEMORY_FEATURE_COPY_DST_BIT_KHX" comment="Can write with vkCmdCopy commands"/> - <enum bitpos="2" name="VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT_KHX" comment="Can read with any access type/command"/> - <enum bitpos="3" name="VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT_KHX" comment="Can write with and access type/command"/> - </enums> - <enums name="VkMemoryAllocateFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT_KHX" comment="Force allocation on specific devices"/> - </enums> - <enums name="VkDeviceGroupPresentModeFlagBitsKHX" type="bitmask"> - <enum bitpos="0" name="VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHX" comment="Present from local memory"/> - <enum bitpos="1" name="VK_DEVICE_GROUP_PRESENT_MODE_REMOTE_BIT_KHX" comment="Present from remote memory"/> - <enum bitpos="2" name="VK_DEVICE_GROUP_PRESENT_MODE_SUM_BIT_KHX" comment="Present sum of local and/or remote memory"/> - <enum bitpos="3" name="VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHX" comment="Each physical device presents from local memory"/> - </enums> - <enums name="VkSwapchainCreateFlagBitsKHR" type="bitmask"> - </enums> - <enums name="VkViewportCoordinateSwizzleNV" type="enum"> - <enum value="0" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_X_NV"/> - <enum value="1" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_X_NV"/> - <enum value="2" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_Y_NV"/> - <enum value="3" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_Y_NV"/> - <enum value="4" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_Z_NV"/> - <enum value="5" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_Z_NV"/> - <enum value="6" name="VK_VIEWPORT_COORDINATE_SWIZZLE_POSITIVE_W_NV"/> - <enum value="7" name="VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_W_NV"/> - </enums> - <enums name="VkDiscardRectangleModeEXT" type="enum"> - <enum value="0" name="VK_DISCARD_RECTANGLE_MODE_INCLUSIVE_EXT"/> - <enum value="1" name="VK_DISCARD_RECTANGLE_MODE_EXCLUSIVE_EXT"/> - </enums> - <enums name="VkSubpassDescriptionFlagBits" type="bitmask"> - </enums> - - -  - <commands> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_LAYER_NOT_PRESENT,VK_ERROR_EXTENSION_NOT_PRESENT,VK_ERROR_INCOMPATIBLE_DRIVER"> - <proto><type>VkResult</type> <name>vkCreateInstance</name></proto> - <param>const <type>VkInstanceCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkInstance</type>* <name>pInstance</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyInstance</name></proto> - <param optional="true" externsync="true"><type>VkInstance</type> <name>instance</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED"> - <proto><type>VkResult</type> <name>vkEnumeratePhysicalDevices</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPhysicalDeviceCount</name></param> - <param optional="true" len="pPhysicalDeviceCount"><type>VkPhysicalDevice</type>* <name>pPhysicalDevices</name></param> - </command> - <command> - <proto><type>PFN_vkVoidFunction</type> <name>vkGetDeviceProcAddr</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param len="null-terminated">const <type>char</type>* <name>pName</name></param> - </command> - <command> - <proto><type>PFN_vkVoidFunction</type> <name>vkGetInstanceProcAddr</name></proto> - <param optional="true"><type>VkInstance</type> <name>instance</name></param> - <param len="null-terminated">const <type>char</type>* <name>pName</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceProperties</type>* <name>pProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceQueueFamilyProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pQueueFamilyPropertyCount</name></param> - <param optional="true" len="pQueueFamilyPropertyCount"><type>VkQueueFamilyProperties</type>* <name>pQueueFamilyProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceMemoryProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceMemoryProperties</type>* <name>pMemoryProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceFeatures</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceFeatures</type>* <name>pFeatures</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceFormatProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkFormatProperties</type>* <name>pFormatProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FORMAT_NOT_SUPPORTED"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceImageFormatProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkImageType</type> <name>type</name></param> - <param><type>VkImageTiling</type> <name>tiling</name></param> - <param><type>VkImageUsageFlags</type> <name>usage</name></param> - <param optional="true"><type>VkImageCreateFlags</type> <name>flags</name></param> - <param><type>VkImageFormatProperties</type>* <name>pImageFormatProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_EXTENSION_NOT_PRESENT,VK_ERROR_FEATURE_NOT_PRESENT,VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkCreateDevice</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkDeviceCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDevice</type>* <name>pDevice</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyDevice</name></proto> - <param optional="true" externsync="true"><type>VkDevice</type> <name>device</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkEnumerateInstanceLayerProperties</name></proto> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkLayerProperties</type>* <name>pProperties</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_LAYER_NOT_PRESENT"> - <proto><type>VkResult</type> <name>vkEnumerateInstanceExtensionProperties</name></proto> - <param optional="true" len="null-terminated">const <type>char</type>* <name>pLayerName</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkExtensionProperties</type>* <name>pProperties</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkEnumerateDeviceLayerProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkLayerProperties</type>* <name>pProperties</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_LAYER_NOT_PRESENT"> - <proto><type>VkResult</type> <name>vkEnumerateDeviceExtensionProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param optional="true" len="null-terminated">const <type>char</type>* <name>pLayerName</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkExtensionProperties</type>* <name>pProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetDeviceQueue</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - <param><type>uint32_t</type> <name>queueIndex</name></param> - <param><type>VkQueue</type>* <name>pQueue</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkQueueSubmit</name></proto> - <param externsync="true"><type>VkQueue</type> <name>queue</name></param> - <param optional="true"><type>uint32_t</type> <name>submitCount</name></param> - <param len="submitCount" externsync="pSubmits[].pWaitSemaphores[],pSubmits[].pSignalSemaphores[]">const <type>VkSubmitInfo</type>* <name>pSubmits</name></param> - <param optional="true" externsync="true"><type>VkFence</type> <name>fence</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkQueueWaitIdle</name></proto> - <param><type>VkQueue</type> <name>queue</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkDeviceWaitIdle</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <implicitexternsyncparams> - <param>all sname:VkQueue objects created from pname:device</param> - </implicitexternsyncparams> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkAllocateMemory</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkMemoryAllocateInfo</type>* <name>pAllocateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDeviceMemory</type>* <name>pMemory</name></param> - </command> - <command> - <proto><type>void</type> <name>vkFreeMemory</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkDeviceMemory</type> <name>memory</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_MEMORY_MAP_FAILED"> - <proto><type>VkResult</type> <name>vkMapMemory</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - <param><type>VkDeviceSize</type> <name>size</name></param> - <param optional="true"><type>VkMemoryMapFlags</type> <name>flags</name></param> - <param><type>void</type>** <name>ppData</name></param> - </command> - <command> - <proto><type>void</type> <name>vkUnmapMemory</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkDeviceMemory</type> <name>memory</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkFlushMappedMemoryRanges</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>memoryRangeCount</name></param> - <param len="memoryRangeCount">const <type>VkMappedMemoryRange</type>* <name>pMemoryRanges</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkInvalidateMappedMemoryRanges</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>memoryRangeCount</name></param> - <param len="memoryRangeCount">const <type>VkMappedMemoryRange</type>* <name>pMemoryRanges</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetDeviceMemoryCommitment</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkDeviceSize</type>* <name>pCommittedMemoryInBytes</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetBufferMemoryRequirements</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkMemoryRequirements</type>* <name>pMemoryRequirements</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBindBufferMemory</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkDeviceSize</type> <name>memoryOffset</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetImageMemoryRequirements</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param><type>VkMemoryRequirements</type>* <name>pMemoryRequirements</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBindImageMemory</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkImage</type> <name>image</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkDeviceSize</type> <name>memoryOffset</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetImageSparseMemoryRequirements</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pSparseMemoryRequirementCount</name></param> - <param optional="true" len="pSparseMemoryRequirementCount"><type>VkSparseImageMemoryRequirements</type>* <name>pSparseMemoryRequirements</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceSparseImageFormatProperties</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkImageType</type> <name>type</name></param> - <param><type>VkSampleCountFlagBits</type> <name>samples</name></param> - <param><type>VkImageUsageFlags</type> <name>usage</name></param> - <param><type>VkImageTiling</type> <name>tiling</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkSparseImageFormatProperties</type>* <name>pProperties</name></param> - </command> - <command queues="sparse_binding" successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkQueueBindSparse</name></proto> - <param externsync="true"><type>VkQueue</type> <name>queue</name></param> - <param optional="true"><type>uint32_t</type> <name>bindInfoCount</name></param> - <param len="bindInfoCount" externsync="pBindInfo[].pWaitSemaphores[],pBindInfo[].pSignalSemaphores[],pBindInfo[].pBufferBinds[].buffer,pBindInfo[].pImageOpaqueBinds[].image,pBindInfo[].pImageBinds[].image">const <type>VkBindSparseInfo</type>* <name>pBindInfo</name></param> - <param optional="true" externsync="true"><type>VkFence</type> <name>fence</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateFence</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkFenceCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkFence</type>* <name>pFence</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyFence</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkFence</type> <name>fence</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkResetFences</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>fenceCount</name></param> - <param len="fenceCount" externsync="true">const <type>VkFence</type>* <name>pFences</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_NOT_READY" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkGetFenceStatus</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkFence</type> <name>fence</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_TIMEOUT" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkWaitForFences</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>fenceCount</name></param> - <param len="fenceCount">const <type>VkFence</type>* <name>pFences</name></param> - <param><type>VkBool32</type> <name>waitAll</name></param> - <param><type>uint64_t</type> <name>timeout</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateSemaphore</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkSemaphoreCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSemaphore</type>* <name>pSemaphore</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroySemaphore</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkSemaphore</type> <name>semaphore</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateEvent</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkEventCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkEvent</type>* <name>pEvent</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyEvent</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkEvent</type> <name>event</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_EVENT_SET,VK_EVENT_RESET" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkGetEventStatus</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkEvent</type> <name>event</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkSetEvent</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkEvent</type> <name>event</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkResetEvent</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkEvent</type> <name>event</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateQueryPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkQueryPoolCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkQueryPool</type>* <name>pQueryPool</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyQueryPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkQueryPool</type> <name>queryPool</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_NOT_READY" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST"> - <proto><type>VkResult</type> <name>vkGetQueryPoolResults</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkQueryPool</type> <name>queryPool</name></param> - <param><type>uint32_t</type> <name>firstQuery</name></param> - <param><type>uint32_t</type> <name>queryCount</name></param> - <param><type>size_t</type> <name>dataSize</name></param> - <param len="dataSize"><type>void</type>* <name>pData</name></param> - <param><type>VkDeviceSize</type> <name>stride</name></param> - <param optional="true"><type>VkQueryResultFlags</type> <name>flags</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateBuffer</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkBufferCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkBuffer</type>* <name>pBuffer</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyBuffer</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkBuffer</type> <name>buffer</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateBufferView</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkBufferViewCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkBufferView</type>* <name>pView</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyBufferView</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkBufferView</type> <name>bufferView</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateImage</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkImageCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkImage</type>* <name>pImage</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyImage</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkImage</type> <name>image</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetImageSubresourceLayout</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param>const <type>VkImageSubresource</type>* <name>pSubresource</name></param> - <param><type>VkSubresourceLayout</type>* <name>pLayout</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateImageView</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkImageViewCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkImageView</type>* <name>pView</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyImageView</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkImageView</type> <name>imageView</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INVALID_SHADER_NV"> - <proto><type>VkResult</type> <name>vkCreateShaderModule</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkShaderModuleCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkShaderModule</type>* <name>pShaderModule</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyShaderModule</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkShaderModule</type> <name>shaderModule</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreatePipelineCache</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkPipelineCacheCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkPipelineCache</type>* <name>pPipelineCache</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyPipelineCache</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkPipelineCache</type> <name>pipelineCache</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetPipelineCacheData</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkPipelineCache</type> <name>pipelineCache</name></param> - <param optional="false,true"><type>size_t</type>* <name>pDataSize</name></param> - <param optional="true" len="pDataSize"><type>void</type>* <name>pData</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkMergePipelineCaches</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkPipelineCache</type> <name>dstCache</name></param> - <param><type>uint32_t</type> <name>srcCacheCount</name></param> - <param len="srcCacheCount">const <type>VkPipelineCache</type>* <name>pSrcCaches</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INVALID_SHADER_NV"> - <proto><type>VkResult</type> <name>vkCreateGraphicsPipelines</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true"><type>VkPipelineCache</type> <name>pipelineCache</name></param> - <param><type>uint32_t</type> <name>createInfoCount</name></param> - <param len="createInfoCount">const <type>VkGraphicsPipelineCreateInfo</type>* <name>pCreateInfos</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param len="createInfoCount"><type>VkPipeline</type>* <name>pPipelines</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INVALID_SHADER_NV"> - <proto><type>VkResult</type> <name>vkCreateComputePipelines</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true"><type>VkPipelineCache</type> <name>pipelineCache</name></param> - <param><type>uint32_t</type> <name>createInfoCount</name></param> - <param len="createInfoCount">const <type>VkComputePipelineCreateInfo</type>* <name>pCreateInfos</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param len="createInfoCount"><type>VkPipeline</type>* <name>pPipelines</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyPipeline</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkPipeline</type> <name>pipeline</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreatePipelineLayout</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkPipelineLayoutCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkPipelineLayout</type>* <name>pPipelineLayout</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyPipelineLayout</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkPipelineLayout</type> <name>pipelineLayout</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_TOO_MANY_OBJECTS"> - <proto><type>VkResult</type> <name>vkCreateSampler</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkSamplerCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSampler</type>* <name>pSampler</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroySampler</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkSampler</type> <name>sampler</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateDescriptorSetLayout</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkDescriptorSetLayoutCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDescriptorSetLayout</type>* <name>pSetLayout</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyDescriptorSetLayout</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkDescriptorSetLayout</type> <name>descriptorSetLayout</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateDescriptorPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkDescriptorPoolCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDescriptorPool</type>* <name>pDescriptorPool</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyDescriptorPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkDescriptorPool</type> <name>descriptorPool</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkResetDescriptorPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkDescriptorPool</type> <name>descriptorPool</name></param> - <param optional="true"><type>VkDescriptorPoolResetFlags</type> <name>flags</name></param> - <implicitexternsyncparams> - <param>any sname:VkDescriptorSet objects allocated from pname:descriptorPool</param> - </implicitexternsyncparams> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FRAGMENTED_POOL,VK_ERROR_OUT_OF_POOL_MEMORY_KHR"> - <proto><type>VkResult</type> <name>vkAllocateDescriptorSets</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pAllocateInfo::descriptorPool">const <type>VkDescriptorSetAllocateInfo</type>* <name>pAllocateInfo</name></param> - <param len="pAllocateInfo::descriptorSetCount"><type>VkDescriptorSet</type>* <name>pDescriptorSets</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkFreeDescriptorSets</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkDescriptorPool</type> <name>descriptorPool</name></param> - <param><type>uint32_t</type> <name>descriptorSetCount</name></param> - <param noautovalidity="true" externsync="true" len="descriptorSetCount">const <type>VkDescriptorSet</type>* <name>pDescriptorSets</name></param> - </command> - <command> - <proto><type>void</type> <name>vkUpdateDescriptorSets</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true"><type>uint32_t</type> <name>descriptorWriteCount</name></param> - <param len="descriptorWriteCount" externsync="pDescriptorWrites[].dstSet">const <type>VkWriteDescriptorSet</type>* <name>pDescriptorWrites</name></param> - <param optional="true"><type>uint32_t</type> <name>descriptorCopyCount</name></param> - <param len="descriptorCopyCount" externsync="pDescriptorCopies[].dstSet">const <type>VkCopyDescriptorSet</type>* <name>pDescriptorCopies</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateFramebuffer</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkFramebufferCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkFramebuffer</type>* <name>pFramebuffer</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyFramebuffer</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkFramebuffer</type> <name>framebuffer</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateRenderPass</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkRenderPassCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkRenderPass</type>* <name>pRenderPass</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyRenderPass</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkRenderPass</type> <name>renderPass</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetRenderAreaGranularity</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkRenderPass</type> <name>renderPass</name></param> - <param><type>VkExtent2D</type>* <name>pGranularity</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateCommandPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkCommandPoolCreateInfo</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkCommandPool</type>* <name>pCommandPool</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyCommandPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkCommandPool</type> <name>commandPool</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkResetCommandPool</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkCommandPool</type> <name>commandPool</name></param> - <param optional="true"><type>VkCommandPoolResetFlags</type> <name>flags</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkAllocateCommandBuffers</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pAllocateInfo::commandPool">const <type>VkCommandBufferAllocateInfo</type>* <name>pAllocateInfo</name></param> - <param len="pAllocateInfo::commandBufferCount"><type>VkCommandBuffer</type>* <name>pCommandBuffers</name></param> - </command> - <command> - <proto><type>void</type> <name>vkFreeCommandBuffers</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkCommandPool</type> <name>commandPool</name></param> - <param><type>uint32_t</type> <name>commandBufferCount</name></param> - <param noautovalidity="true" externsync="true" len="commandBufferCount">const <type>VkCommandBuffer</type>* <name>pCommandBuffers</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBeginCommandBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param>const <type>VkCommandBufferBeginInfo</type>* <name>pBeginInfo</name></param> - <implicitexternsyncparams> - <param>the sname:VkCommandPool that pname:commandBuffer was allocated from</param> - </implicitexternsyncparams> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkEndCommandBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <implicitexternsyncparams> - <param>the sname:VkCommandPool that pname:commandBuffer was allocated from</param> - </implicitexternsyncparams> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkResetCommandBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param optional="true"><type>VkCommandBufferResetFlags</type> <name>flags</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdBindPipeline</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></param> - <param><type>VkPipeline</type> <name>pipeline</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetViewport</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>firstViewport</name></param> - <param><type>uint32_t</type> <name>viewportCount</name></param> - <param len="viewportCount" noautovalidity="true">const <type>VkViewport</type>* <name>pViewports</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetScissor</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>firstScissor</name></param> - <param><type>uint32_t</type> <name>scissorCount</name></param> - <param len="scissorCount">const <type>VkRect2D</type>* <name>pScissors</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetLineWidth</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>float</type> <name>lineWidth</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetDepthBias</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>float</type> <name>depthBiasConstantFactor</name></param> - <param><type>float</type> <name>depthBiasClamp</name></param> - <param><type>float</type> <name>depthBiasSlopeFactor</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetBlendConstants</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param>const <type>float</type> <name>blendConstants</name>[4]</param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetDepthBounds</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>float</type> <name>minDepthBounds</name></param> - <param><type>float</type> <name>maxDepthBounds</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetStencilCompareMask</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkStencilFaceFlags</type> <name>faceMask</name></param> - <param><type>uint32_t</type> <name>compareMask</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetStencilWriteMask</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkStencilFaceFlags</type> <name>faceMask</name></param> - <param><type>uint32_t</type> <name>writeMask</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetStencilReference</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkStencilFaceFlags</type> <name>faceMask</name></param> - <param><type>uint32_t</type> <name>reference</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdBindDescriptorSets</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></param> - <param><type>VkPipelineLayout</type> <name>layout</name></param> - <param><type>uint32_t</type> <name>firstSet</name></param> - <param><type>uint32_t</type> <name>descriptorSetCount</name></param> - <param len="descriptorSetCount">const <type>VkDescriptorSet</type>* <name>pDescriptorSets</name></param> - <param optional="true"><type>uint32_t</type> <name>dynamicOffsetCount</name></param> - <param len="dynamicOffsetCount">const <type>uint32_t</type>* <name>pDynamicOffsets</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdBindIndexBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - <param><type>VkIndexType</type> <name>indexType</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdBindVertexBuffers</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>firstBinding</name></param> - <param><type>uint32_t</type> <name>bindingCount</name></param> - <param len="bindingCount">const <type>VkBuffer</type>* <name>pBuffers</name></param> - <param len="bindingCount">const <type>VkDeviceSize</type>* <name>pOffsets</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdDraw</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>vertexCount</name></param> - <param><type>uint32_t</type> <name>instanceCount</name></param> - <param><type>uint32_t</type> <name>firstVertex</name></param> - <param><type>uint32_t</type> <name>firstInstance</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdDrawIndexed</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>indexCount</name></param> - <param><type>uint32_t</type> <name>instanceCount</name></param> - <param><type>uint32_t</type> <name>firstIndex</name></param> - <param><type>int32_t</type> <name>vertexOffset</name></param> - <param><type>uint32_t</type> <name>firstInstance</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdDrawIndirect</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - <param><type>uint32_t</type> <name>drawCount</name></param> - <param><type>uint32_t</type> <name>stride</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdDrawIndexedIndirect</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - <param><type>uint32_t</type> <name>drawCount</name></param> - <param><type>uint32_t</type> <name>stride</name></param> - </command> - <command queues="compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="compute"> - <proto><type>void</type> <name>vkCmdDispatch</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>groupCountX</name></param> - <param><type>uint32_t</type> <name>groupCountY</name></param> - <param><type>uint32_t</type> <name>groupCountZ</name></param> - </command> - <command queues="compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="compute"> - <proto><type>void</type> <name>vkCmdDispatchIndirect</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdCopyBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>srcBuffer</name></param> - <param><type>VkBuffer</type> <name>dstBuffer</name></param> - <param><type>uint32_t</type> <name>regionCount</name></param> - <param len="regionCount">const <type>VkBufferCopy</type>* <name>pRegions</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdCopyImage</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkImage</type> <name>srcImage</name></param> - <param><type>VkImageLayout</type> <name>srcImageLayout</name></param> - <param><type>VkImage</type> <name>dstImage</name></param> - <param><type>VkImageLayout</type> <name>dstImageLayout</name></param> - <param><type>uint32_t</type> <name>regionCount</name></param> - <param len="regionCount">const <type>VkImageCopy</type>* <name>pRegions</name></param> - </command> - <command queues="graphics" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdBlitImage</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkImage</type> <name>srcImage</name></param> - <param><type>VkImageLayout</type> <name>srcImageLayout</name></param> - <param><type>VkImage</type> <name>dstImage</name></param> - <param><type>VkImageLayout</type> <name>dstImageLayout</name></param> - <param><type>uint32_t</type> <name>regionCount</name></param> - <param len="regionCount">const <type>VkImageBlit</type>* <name>pRegions</name></param> - <param><type>VkFilter</type> <name>filter</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdCopyBufferToImage</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>srcBuffer</name></param> - <param><type>VkImage</type> <name>dstImage</name></param> - <param><type>VkImageLayout</type> <name>dstImageLayout</name></param> - <param><type>uint32_t</type> <name>regionCount</name></param> - <param len="regionCount">const <type>VkBufferImageCopy</type>* <name>pRegions</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdCopyImageToBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkImage</type> <name>srcImage</name></param> - <param><type>VkImageLayout</type> <name>srcImageLayout</name></param> - <param><type>VkBuffer</type> <name>dstBuffer</name></param> - <param><type>uint32_t</type> <name>regionCount</name></param> - <param len="regionCount">const <type>VkBufferImageCopy</type>* <name>pRegions</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdUpdateBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>dstBuffer</name></param> - <param><type>VkDeviceSize</type> <name>dstOffset</name></param> - <param><type>VkDeviceSize</type> <name>dataSize</name></param> - <param len="dataSize">const <type>void</type>* <name>pData</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer" comment="transfer support is only available when VK_KHR_maintenance1 is enabled, as documented in valid usage language in the specification"> - <proto><type>void</type> <name>vkCmdFillBuffer</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>dstBuffer</name></param> - <param><type>VkDeviceSize</type> <name>dstOffset</name></param> - <param><type>VkDeviceSize</type> <name>size</name></param> - <param><type>uint32_t</type> <name>data</name></param> - </command> - <command queues="graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdClearColorImage</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param><type>VkImageLayout</type> <name>imageLayout</name></param> - <param>const <type>VkClearColorValue</type>* <name>pColor</name></param> - <param><type>uint32_t</type> <name>rangeCount</name></param> - <param len="rangeCount">const <type>VkImageSubresourceRange</type>* <name>pRanges</name></param> - </command> - <command queues="graphics" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdClearDepthStencilImage</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkImage</type> <name>image</name></param> - <param><type>VkImageLayout</type> <name>imageLayout</name></param> - <param>const <type>VkClearDepthStencilValue</type>* <name>pDepthStencil</name></param> - <param><type>uint32_t</type> <name>rangeCount</name></param> - <param len="rangeCount">const <type>VkImageSubresourceRange</type>* <name>pRanges</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdClearAttachments</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>attachmentCount</name></param> - <param len="attachmentCount">const <type>VkClearAttachment</type>* <name>pAttachments</name></param> - <param><type>uint32_t</type> <name>rectCount</name></param> - <param len="rectCount">const <type>VkClearRect</type>* <name>pRects</name></param> - </command> - <command queues="graphics" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdResolveImage</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkImage</type> <name>srcImage</name></param> - <param><type>VkImageLayout</type> <name>srcImageLayout</name></param> - <param><type>VkImage</type> <name>dstImage</name></param> - <param><type>VkImageLayout</type> <name>dstImageLayout</name></param> - <param><type>uint32_t</type> <name>regionCount</name></param> - <param len="regionCount">const <type>VkImageResolve</type>* <name>pRegions</name></param> - </command> - <command queues="graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetEvent</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkEvent</type> <name>event</name></param> - <param><type>VkPipelineStageFlags</type> <name>stageMask</name></param> - </command> - <command queues="graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdResetEvent</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkEvent</type> <name>event</name></param> - <param><type>VkPipelineStageFlags</type> <name>stageMask</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdWaitEvents</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>eventCount</name></param> - <param len="eventCount">const <type>VkEvent</type>* <name>pEvents</name></param> - <param><type>VkPipelineStageFlags</type> <name>srcStageMask</name></param> - <param><type>VkPipelineStageFlags</type> <name>dstStageMask</name></param> - <param optional="true"><type>uint32_t</type> <name>memoryBarrierCount</name></param> - <param len="memoryBarrierCount">const <type>VkMemoryBarrier</type>* <name>pMemoryBarriers</name></param> - <param optional="true"><type>uint32_t</type> <name>bufferMemoryBarrierCount</name></param> - <param len="bufferMemoryBarrierCount">const <type>VkBufferMemoryBarrier</type>* <name>pBufferMemoryBarriers</name></param> - <param optional="true"><type>uint32_t</type> <name>imageMemoryBarrierCount</name></param> - <param len="imageMemoryBarrierCount">const <type>VkImageMemoryBarrier</type>* <name>pImageMemoryBarriers</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdPipelineBarrier</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkPipelineStageFlags</type> <name>srcStageMask</name></param> - <param><type>VkPipelineStageFlags</type> <name>dstStageMask</name></param> - <param optional="true"><type>VkDependencyFlags</type> <name>dependencyFlags</name></param> - <param optional="true"><type>uint32_t</type> <name>memoryBarrierCount</name></param> - <param len="memoryBarrierCount">const <type>VkMemoryBarrier</type>* <name>pMemoryBarriers</name></param> - <param optional="true"><type>uint32_t</type> <name>bufferMemoryBarrierCount</name></param> - <param len="bufferMemoryBarrierCount">const <type>VkBufferMemoryBarrier</type>* <name>pBufferMemoryBarriers</name></param> - <param optional="true"><type>uint32_t</type> <name>imageMemoryBarrierCount</name></param> - <param len="imageMemoryBarrierCount">const <type>VkImageMemoryBarrier</type>* <name>pImageMemoryBarriers</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdBeginQuery</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkQueryPool</type> <name>queryPool</name></param> - <param><type>uint32_t</type> <name>query</name></param> - <param optional="true"><type>VkQueryControlFlags</type> <name>flags</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdEndQuery</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkQueryPool</type> <name>queryPool</name></param> - <param><type>uint32_t</type> <name>query</name></param> - </command> - <command queues="graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdResetQueryPool</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkQueryPool</type> <name>queryPool</name></param> - <param><type>uint32_t</type> <name>firstQuery</name></param> - <param><type>uint32_t</type> <name>queryCount</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdWriteTimestamp</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkPipelineStageFlagBits</type> <name>pipelineStage</name></param> - <param><type>VkQueryPool</type> <name>queryPool</name></param> - <param><type>uint32_t</type> <name>query</name></param> - </command> - <command queues="graphics,compute" renderpass="outside" cmdbufferlevel="primary,secondary" pipeline="transfer"> - <proto><type>void</type> <name>vkCmdCopyQueryPoolResults</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkQueryPool</type> <name>queryPool</name></param> - <param><type>uint32_t</type> <name>firstQuery</name></param> - <param><type>uint32_t</type> <name>queryCount</name></param> - <param><type>VkBuffer</type> <name>dstBuffer</name></param> - <param><type>VkDeviceSize</type> <name>dstOffset</name></param> - <param><type>VkDeviceSize</type> <name>stride</name></param> - <param optional="true"><type>VkQueryResultFlags</type> <name>flags</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdPushConstants</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkPipelineLayout</type> <name>layout</name></param> - <param><type>VkShaderStageFlags</type> <name>stageFlags</name></param> - <param><type>uint32_t</type> <name>offset</name></param> - <param><type>uint32_t</type> <name>size</name></param> - <param len="size">const <type>void</type>* <name>pValues</name></param> - </command> - <command queues="graphics" renderpass="outside" cmdbufferlevel="primary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdBeginRenderPass</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param>const <type>VkRenderPassBeginInfo</type>* <name>pRenderPassBegin</name></param> - <param><type>VkSubpassContents</type> <name>contents</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdNextSubpass</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkSubpassContents</type> <name>contents</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdEndRenderPass</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - </command> - <command queues="transfer,graphics,compute" renderpass="both" cmdbufferlevel="primary"> - <proto><type>void</type> <name>vkCmdExecuteCommands</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>commandBufferCount</name></param> - <param len="commandBufferCount">const <type>VkCommandBuffer</type>* <name>pCommandBuffers</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"> - <proto><type>VkResult</type> <name>vkCreateAndroidSurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkAndroidSurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceDisplayPropertiesKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkDisplayPropertiesKHR</type>* <name>pProperties</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceDisplayPlanePropertiesKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkDisplayPlanePropertiesKHR</type>* <name>pProperties</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetDisplayPlaneSupportedDisplaysKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>planeIndex</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pDisplayCount</name></param> - <param optional="true" len="pDisplayCount"><type>VkDisplayKHR</type>* <name>pDisplays</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetDisplayModePropertiesKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkDisplayKHR</type> <name>display</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkDisplayModePropertiesKHR</type>* <name>pProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED"> - <proto><type>VkResult</type> <name>vkCreateDisplayModeKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param externsync="true"><type>VkDisplayKHR</type> <name>display</name></param> - <param>const <type>VkDisplayModeCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDisplayModeKHR</type>* <name>pMode</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetDisplayPlaneCapabilitiesKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param externsync="true"><type>VkDisplayModeKHR</type> <name>mode</name></param> - <param><type>uint32_t</type> <name>planeIndex</name></param> - <param><type>VkDisplayPlaneCapabilitiesKHR</type>* <name>pCapabilities</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateDisplayPlaneSurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkDisplaySurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INCOMPATIBLE_DISPLAY_KHR,VK_ERROR_DEVICE_LOST,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkCreateSharedSwapchainsKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>swapchainCount</name></param> - <param len="swapchainCount" externsync="pCreateInfos[].surface,pCreateInfos[].oldSwapchain">const <type>VkSwapchainCreateInfoKHR</type>* <name>pCreateInfos</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param len="swapchainCount"><type>VkSwapchainKHR</type>* <name>pSwapchains</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateMirSurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkMirSurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command> - <proto><type>VkBool32</type> <name>vkGetPhysicalDeviceMirPresentationSupportKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - <param><type>MirConnection</type>* <name>connection</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroySurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param optional="true" externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceSupportKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - <param><type>VkSurfaceKHR</type> <name>surface</name></param> - <param><type>VkBool32</type>* <name>pSupported</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceCapabilitiesKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkSurfaceKHR</type> <name>surface</name></param> - <param><type>VkSurfaceCapabilitiesKHR</type>* <name>pSurfaceCapabilities</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceFormatsKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkSurfaceKHR</type> <name>surface</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pSurfaceFormatCount</name></param> - <param optional="true" len="pSurfaceFormatCount"><type>VkSurfaceFormatKHR</type>* <name>pSurfaceFormats</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfacePresentModesKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkSurfaceKHR</type> <name>surface</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPresentModeCount</name></param> - <param optional="true" len="pPresentModeCount"><type>VkPresentModeKHR</type>* <name>pPresentModes</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_SURFACE_LOST_KHR,VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"> - <proto><type>VkResult</type> <name>vkCreateSwapchainKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pCreateInfo.surface,pCreateInfo.oldSwapchain">const <type>VkSwapchainCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSwapchainKHR</type>* <name>pSwapchain</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroySwapchainKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetSwapchainImagesKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkSwapchainKHR</type> <name>swapchain</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pSwapchainImageCount</name></param> - <param optional="true" len="pSwapchainImageCount"><type>VkImage</type>* <name>pSwapchainImages</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_TIMEOUT,VK_NOT_READY,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkAcquireNextImageKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> - <param><type>uint64_t</type> <name>timeout</name></param> - <param optional="true" externsync="true"><type>VkSemaphore</type> <name>semaphore</name></param> - <param optional="true" externsync="true"><type>VkFence</type> <name>fence</name></param> - <param><type>uint32_t</type>* <name>pImageIndex</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkQueuePresentKHR</name></proto> - <param externsync="true"><type>VkQueue</type> <name>queue</name></param> - <param externsync="pPresentInfo.pWaitSemaphores[],pPresentInfo.pSwapchains[]">const <type>VkPresentInfoKHR</type>* <name>pPresentInfo</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"> - <proto><type>VkResult</type> <name>vkCreateViSurfaceNN</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkViSurfaceCreateInfoNN</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateWaylandSurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkWaylandSurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command> - <proto><type>VkBool32</type> <name>vkGetPhysicalDeviceWaylandPresentationSupportKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - <param>struct <type>wl_display</type>* <name>display</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateWin32SurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkWin32SurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command> - <proto><type>VkBool32</type> <name>vkGetPhysicalDeviceWin32PresentationSupportKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateXlibSurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkXlibSurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command> - <proto><type>VkBool32</type> <name>vkGetPhysicalDeviceXlibPresentationSupportKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - <param><type>Display</type>* <name>dpy</name></param> - <param><type>VisualID</type> <name>visualID</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateXcbSurfaceKHR</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkXcbSurfaceCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command> - <proto><type>VkBool32</type> <name>vkGetPhysicalDeviceXcbPresentationSupportKHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>uint32_t</type> <name>queueFamilyIndex</name></param> - <param><type>xcb_connection_t</type>* <name>connection</name></param> - <param><type>xcb_visualid_t</type> <name>visual_id</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateDebugReportCallbackEXT</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkDebugReportCallbackCreateInfoEXT</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDebugReportCallbackEXT</type>* <name>pCallback</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyDebugReportCallbackEXT</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param externsync="true"><type>VkDebugReportCallbackEXT</type> <name>callback</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDebugReportMessageEXT</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param><type>VkDebugReportFlagsEXT</type> <name>flags</name></param> - <param><type>VkDebugReportObjectTypeEXT</type> <name>objectType</name></param> - <param><type>uint64_t</type> <name>object</name></param> - <param><type>size_t</type> <name>location</name></param> - <param><type>int32_t</type> <name>messageCode</name></param> - <param len="null-terminated">const <type>char</type>* <name>pLayerPrefix</name></param> - <param len="null-terminated">const <type>char</type>* <name>pMessage</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkDebugMarkerSetObjectNameEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pNameInfo.object"><type>VkDebugMarkerObjectNameInfoEXT</type>* <name>pNameInfo</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkDebugMarkerSetObjectTagEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="pTagInfo.object"><type>VkDebugMarkerObjectTagInfoEXT</type>* <name>pTagInfo</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdDebugMarkerBeginEXT</name></proto> - <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdDebugMarkerEndEXT</name></proto> - <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdDebugMarkerInsertEXT</name></proto> - <param><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkDebugMarkerMarkerInfoEXT</type>* <name>pMarkerInfo</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FORMAT_NOT_SUPPORTED"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceExternalImageFormatPropertiesNV</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkImageType</type> <name>type</name></param> - <param><type>VkImageTiling</type> <name>tiling</name></param> - <param><type>VkImageUsageFlags</type> <name>usage</name></param> - <param optional="true"><type>VkImageCreateFlags</type> <name>flags</name></param> - <param optional="true"><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>externalHandleType</name></param> - <param><type>VkExternalImageFormatPropertiesNV</type>* <name>pExternalImageFormatProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetMemoryWin32HandleNV</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleType</name></param> - <param><type>HANDLE</type>* <name>pHandle</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdDrawIndirectCountAMD</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - <param><type>VkBuffer</type> <name>countBuffer</name></param> - <param><type>VkDeviceSize</type> <name>countBufferOffset</name></param> - <param><type>uint32_t</type> <name>maxDrawCount</name></param> - <param><type>uint32_t</type> <name>stride</name></param> - </command> - <command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics"> - <proto><type>void</type> <name>vkCmdDrawIndexedIndirectCountAMD</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkBuffer</type> <name>buffer</name></param> - <param><type>VkDeviceSize</type> <name>offset</name></param> - <param><type>VkBuffer</type> <name>countBuffer</name></param> - <param><type>VkDeviceSize</type> <name>countBufferOffset</name></param> - <param><type>uint32_t</type> <name>maxDrawCount</name></param> - <param><type>uint32_t</type> <name>stride</name></param> - </command> - <command queues="graphics,compute" renderpass="inside" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdProcessCommandsNVX</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param>const <type>VkCmdProcessCommandsInfoNVX</type>* <name>pProcessCommandsInfo</name></param> - </command> - <command queues="graphics,compute" renderpass="inside" cmdbufferlevel="secondary"> - <proto><type>void</type> <name>vkCmdReserveSpaceForCommandsNVX</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param>const <type>VkCmdReserveSpaceForCommandsInfoNVX</type>* <name>pReserveSpaceInfo</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateIndirectCommandsLayoutNVX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkIndirectCommandsLayoutCreateInfoNVX</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkIndirectCommandsLayoutNVX</type>* <name>pIndirectCommandsLayout</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyIndirectCommandsLayoutNVX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkIndirectCommandsLayoutNVX</type> <name>indirectCommandsLayout</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateObjectTableNVX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkObjectTableCreateInfoNVX</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkObjectTableNVX</type>* <name>pObjectTable</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyObjectTableNVX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkObjectTableNVX</type> <name>objectTable</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkRegisterObjectsNVX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkObjectTableNVX</type> <name>objectTable</name></param> - <param><type>uint32_t</type> <name>objectCount</name></param> - <param len="objectCount">const <type>VkObjectTableEntryNVX</type>* const* <name>ppObjectTableEntries</name></param> - <param len="objectCount">const <type>uint32_t</type>* <name>pObjectIndices</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkUnregisterObjectsNVX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkObjectTableNVX</type> <name>objectTable</name></param> - <param><type>uint32_t</type> <name>objectCount</name></param> - <param len="objectCount">const <type>VkObjectEntryTypeNVX</type>* <name>pObjectEntryTypes</name></param> - <param len="objectCount">const <type>uint32_t</type>* <name>pObjectIndices</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkDeviceGeneratedCommandsFeaturesNVX</type>* <name>pFeatures</name></param> - <param><type>VkDeviceGeneratedCommandsLimitsNVX</type>* <name>pLimits</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceFeatures2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceFeatures2KHR</type>* <name>pFeatures</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceProperties2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceProperties2KHR</type>* <name>pProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceFormatProperties2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkFormat</type> <name>format</name></param> - <param><type>VkFormatProperties2KHR</type>* <name>pFormatProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_FORMAT_NOT_SUPPORTED"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceImageFormatProperties2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceImageFormatInfo2KHR</type>* <name>pImageFormatInfo</name></param> - <param><type>VkImageFormatProperties2KHR</type>* <name>pImageFormatProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceQueueFamilyProperties2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pQueueFamilyPropertyCount</name></param> - <param optional="true" len="pQueueFamilyPropertyCount"><type>VkQueueFamilyProperties2KHR</type>* <name>pQueueFamilyProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceMemoryProperties2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkPhysicalDeviceMemoryProperties2KHR</type>* <name>pMemoryProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceSparseImageFormatProperties2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceSparseImageFormatInfo2KHR</type>* <name>pFormatInfo</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPropertyCount</name></param> - <param optional="true" len="pPropertyCount"><type>VkSparseImageFormatProperties2KHR</type>* <name>pProperties</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdPushDescriptorSetKHR</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkPipelineBindPoint</type> <name>pipelineBindPoint</name></param> - <param><type>VkPipelineLayout</type> <name>layout</name></param> - <param><type>uint32_t</type> <name>set</name></param> - <param><type>uint32_t</type> <name>descriptorWriteCount</name></param> - <param len="descriptorWriteCount">const <type>VkWriteDescriptorSet</type>* <name>pDescriptorWrites</name></param> - </command> - <command> - <proto><type>void</type> <name>vkTrimCommandPoolKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkCommandPool</type> <name>commandPool</name></param> - <param optional="true"><type>VkCommandPoolTrimFlagsKHR</type> <name>flags</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceExternalBufferPropertiesKHX</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceExternalBufferInfoKHX</type>* <name>pExternalBufferInfo</name></param> - <param><type>VkExternalBufferPropertiesKHX</type>* <name>pExternalBufferProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetMemoryWin32HandleKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> - <param><type>HANDLE</type>* <name>pHandle</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkGetMemoryWin32HandlePropertiesKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> - <param><type>HANDLE</type> <name>handle</name></param> - <param><type>VkMemoryWin32HandlePropertiesKHX</type>* <name>pMemoryWin32HandleProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetMemoryFdKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceMemory</type> <name>memory</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> - <param><type>int</type>* <name>pFd</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkGetMemoryFdPropertiesKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkExternalMemoryHandleTypeFlagBitsKHX</type> <name>handleType</name></param> - <param><type>int</type> <name>fd</name></param> - <param><type>VkMemoryFdPropertiesKHX</type>* <name>pMemoryFdProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetPhysicalDeviceExternalSemaphorePropertiesKHX</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceExternalSemaphoreInfoKHX</type>* <name>pExternalSemaphoreInfo</name></param> - <param><type>VkExternalSemaphorePropertiesKHX</type>* <name>pExternalSemaphoreProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetSemaphoreWin32HandleKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkSemaphore</type> <name>semaphore</name></param> - <param><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></param> - <param><type>HANDLE</type>* <name>pHandle</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkImportSemaphoreWin32HandleKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkImportSemaphoreWin32HandleInfoKHX</type>* <name>pImportSemaphoreWin32HandleInfo</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY"> - <proto><type>VkResult</type> <name>vkGetSemaphoreFdKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkSemaphore</type> <name>semaphore</name></param> - <param><type>VkExternalSemaphoreHandleTypeFlagBitsKHX</type> <name>handleType</name></param> - <param><type>int</type>* <name>pFd</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"> - <proto><type>VkResult</type> <name>vkImportSemaphoreFdKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkImportSemaphoreFdInfoKHX</type>* <name>pImportSemaphoreFdInfo</name></param> - </command> - <command successcodes="VK_SUCCESS"> - <proto><type>VkResult</type> <name>vkReleaseDisplayEXT</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkDisplayKHR</type> <name>display</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INITIALIZATION_FAILED"> - <proto><type>VkResult</type> <name>vkAcquireXlibDisplayEXT</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>Display</type>* <name>dpy</name></param> - <param><type>VkDisplayKHR</type> <name>display</name></param> - </command> - <command successcodes="VK_SUCCESS"> - <proto><type>VkResult</type> <name>vkGetRandROutputDisplayEXT</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>Display</type>* <name>dpy</name></param> - <param><type>RROutput</type> <name>rrOutput</name></param> - <param><type>VkDisplayKHR</type>* <name>pDisplay</name></param> - </command> - <command successcodes="VK_SUCCESS"> - <proto><type>VkResult</type> <name>vkDisplayPowerControlEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDisplayKHR</type> <name>display</name></param> - <param>const <type>VkDisplayPowerInfoEXT</type>* <name>pDisplayPowerInfo</name></param> - </command> - <command successcodes="VK_SUCCESS"> - <proto><type>VkResult</type> <name>vkRegisterDeviceEventEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkDeviceEventInfoEXT</type>* <name>pDeviceEventInfo</name></param> - <param>const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkFence</type>* <name>pFence</name></param> - </command> - <command successcodes="VK_SUCCESS"> - <proto><type>VkResult</type> <name>vkRegisterDisplayEventEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDisplayKHR</type> <name>display</name></param> - <param>const <type>VkDisplayEventInfoEXT</type>* <name>pDisplayEventInfo</name></param> - <param>const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkFence</type>* <name>pFence</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR"> - <proto><type>VkResult</type> <name>vkGetSwapchainCounterEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkSwapchainKHR</type> <name>swapchain</name></param> - <param><type>VkSurfaceCounterFlagBitsEXT</type> <name>counter</name></param> - <param><type>uint64_t</type>* <name>pCounterValue</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceCapabilities2EXT</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param><type>VkSurfaceKHR</type> <name>surface</name></param> - <param><type>VkSurfaceCapabilities2EXT</type>* <name>pSurfaceCapabilities</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED"> - <proto><type>VkResult</type> <name>vkEnumeratePhysicalDeviceGroupsKHX</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPhysicalDeviceGroupCount</name></param> - <param optional="true" len="pPhysicalDeviceGroupCount"><type>VkPhysicalDeviceGroupPropertiesKHX</type>* <name>pPhysicalDeviceGroupProperties</name></param> - </command> - <command> - <proto><type>void</type> <name>vkGetDeviceGroupPeerMemoryFeaturesKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>heapIndex</name></param> - <param><type>uint32_t</type> <name>localDeviceIndex</name></param> - <param><type>uint32_t</type> <name>remoteDeviceIndex</name></param> - <param><type>VkPeerMemoryFeatureFlagsKHX</type>* <name>pPeerMemoryFeatures</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBindBufferMemory2KHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>bindInfoCount</name></param> - <param len="bindInfoCount">const <type>VkBindBufferMemoryInfoKHX</type>* <name>pBindInfos</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkBindImageMemory2KHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>bindInfoCount</name></param> - <param len="bindInfoCount">const <type>VkBindImageMemoryInfoKHX</type>* <name>pBindInfos</name></param> - </command> - <command queues="graphics,compute,transfer" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetDeviceMaskKHX</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>deviceMask</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetDeviceGroupPresentCapabilitiesKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>VkDeviceGroupPresentCapabilitiesKHX</type>* <name>pDeviceGroupPresentCapabilities</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetDeviceGroupSurfacePresentModesKHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param> - <param><type>VkDeviceGroupPresentModeFlagsKHX</type>* <name>pModes</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_TIMEOUT,VK_NOT_READY,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkAcquireNextImage2KHX</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkAcquireNextImageInfoKHX</type>* <name>pAcquireInfo</name></param> - <param><type>uint32_t</type>* <name>pImageIndex</name></param> - </command> - <command queues="compute" renderpass="outside" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdDispatchBaseKHX</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>baseGroupX</name></param> - <param><type>uint32_t</type> <name>baseGroupY</name></param> - <param><type>uint32_t</type> <name>baseGroupZ</name></param> - <param><type>uint32_t</type> <name>groupCountX</name></param> - <param><type>uint32_t</type> <name>groupCountY</name></param> - <param><type>uint32_t</type> <name>groupCountZ</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkGetPhysicalDevicePresentRectanglesKHX</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param externsync="true"><type>VkSurfaceKHR</type> <name>surface</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pRectCount</name></param> - <param optional="true" len="pRectCount"><type>VkRect2D</type>* <name>pRects</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY"> - <proto><type>VkResult</type> <name>vkCreateDescriptorUpdateTemplateKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param>const <type>VkDescriptorUpdateTemplateCreateInfoKHR</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkDescriptorUpdateTemplateKHR</type>* <name>pDescriptorUpdateTemplate</name></param> - </command> - <command> - <proto><type>void</type> <name>vkDestroyDescriptorUpdateTemplateKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param optional="true" externsync="true"><type>VkDescriptorUpdateTemplateKHR</type> <name>descriptorUpdateTemplate</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - </command> - <command> - <proto><type>void</type> <name>vkUpdateDescriptorSetWithTemplateKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkDescriptorSet</type> <name>descriptorSet</name></param> - <param><type>VkDescriptorUpdateTemplateKHR</type> <name>descriptorUpdateTemplate</name></param> - <param>const <type>void</type>* <name>pData</name></param> - </command> - <command queues="graphics,compute" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdPushDescriptorSetWithTemplateKHR</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>VkDescriptorUpdateTemplateKHR</type> <name>descriptorUpdateTemplate</name></param> - <param><type>VkPipelineLayout</type> <name>layout</name></param> - <param><type>uint32_t</type> <name>set</name></param> - <param>const <type>void</type>* <name>pData</name></param> - </command> - <command> - <proto><type>void</type> <name>vkSetHdrMetadataEXT</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param><type>uint32_t</type> <name>swapchainCount</name></param>  - <param len="swapchainCount">const <type>VkSwapchainKHR</type>* <name>pSwapchains</name></param>  - <param len="swapchainCount">const <type>VkHdrMetadataEXT</type>* <name>pMetadata</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_SUBOPTIMAL_KHR" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetSwapchainStatusKHR</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_DEVICE_LOST,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetRefreshCycleDurationGOOGLE</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> - <param><type>VkRefreshCycleDurationGOOGLE</type>* <name>pDisplayTimingProperties</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_DEVICE_LOST,VK_ERROR_OUT_OF_DATE_KHR,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPastPresentationTimingGOOGLE</name></proto> - <param><type>VkDevice</type> <name>device</name></param> - <param externsync="true"><type>VkSwapchainKHR</type> <name>swapchain</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pPresentationTimingCount</name></param> - <param optional="true" len="pPresentationTimingCount"><type>VkPastPresentationTimingGOOGLE</type>* <name>pPresentationTimings</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"> - <proto><type>VkResult</type> <name>vkCreateIOSSurfaceMVK</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkIOSSurfaceCreateInfoMVK</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"> - <proto><type>VkResult</type> <name>vkCreateMacOSSurfaceMVK</name></proto> - <param><type>VkInstance</type> <name>instance</name></param> - <param>const <type>VkMacOSSurfaceCreateInfoMVK</type>* <name>pCreateInfo</name></param> - <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param> - <param><type>VkSurfaceKHR</type>* <name>pSurface</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetViewportWScalingNV</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>firstViewport</name></param> - <param><type>uint32_t</type> <name>viewportCount</name></param> - <param len="viewportCount" noautovalidity="true">const <type>VkViewportWScalingNV</type>* <name>pViewportWScalings</name></param> - </command> - <command queues="graphics" renderpass="both" cmdbufferlevel="primary,secondary"> - <proto><type>void</type> <name>vkCmdSetDiscardRectangleEXT</name></proto> - <param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param> - <param><type>uint32_t</type> <name>firstDiscardRectangle</name></param> - <param><type>uint32_t</type> <name>discardRectangleCount</name></param> - <param len="discardRectangleCount">const <type>VkRect2D</type>* <name>pDiscardRectangles</name></param> - </command> - <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceCapabilities2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceSurfaceInfo2KHR</type>* <name>pSurfaceInfo</name></param> - <param><type>VkSurfaceCapabilities2KHR</type>* <name>pSurfaceCapabilities</name></param> - </command> - <command successcodes="VK_SUCCESS,VK_INCOMPLETE" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_SURFACE_LOST_KHR"> - <proto><type>VkResult</type> <name>vkGetPhysicalDeviceSurfaceFormats2KHR</name></proto> - <param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param> - <param>const <type>VkPhysicalDeviceSurfaceInfo2KHR</type>* <name>pSurfaceInfo</name></param> - <param optional="false,true"><type>uint32_t</type>* <name>pSurfaceFormatCount</name></param> - <param optional="true" len="pSurfaceFormatCount"><type>VkSurfaceFormat2KHR</type>* <name>pSurfaceFormats</name></param> - </command> - </commands> - -  - <feature api="vulkan" name="VK_VERSION_1_0" number="1.0"> - <require comment="Header boilerplate"> - <type name="vk_platform"/> - </require> - <require comment="API version"> - <type name="VK_API_VERSION"/> - <type name="VK_API_VERSION_1_0"/> - <type name="VK_VERSION_MAJOR"/> - <type name="VK_VERSION_MINOR"/> - <type name="VK_VERSION_PATCH"/> - <type name="VK_HEADER_VERSION"/> - </require> - <require comment="API constants"> - <enum name="VK_LOD_CLAMP_NONE"/> - <enum name="VK_REMAINING_MIP_LEVELS"/> - <enum name="VK_REMAINING_ARRAY_LAYERS"/> - <enum name="VK_WHOLE_SIZE"/> - <enum name="VK_ATTACHMENT_UNUSED"/> - <enum name="VK_TRUE"/> - <enum name="VK_FALSE"/> - <type name="VK_NULL_HANDLE"/> - <enum name="VK_QUEUE_FAMILY_IGNORED"/> - <enum name="VK_SUBPASS_EXTERNAL"/> - <type name="VkPipelineCacheHeaderVersion"/> - </require> - <require comment="Device initialization"> - <command name="vkCreateInstance"/> - <command name="vkDestroyInstance"/> - <command name="vkEnumeratePhysicalDevices"/> - <command name="vkGetPhysicalDeviceFeatures"/> - <command name="vkGetPhysicalDeviceFormatProperties"/> - <command name="vkGetPhysicalDeviceImageFormatProperties"/> - <command name="vkGetPhysicalDeviceProperties"/> - <command name="vkGetPhysicalDeviceQueueFamilyProperties"/> - <command name="vkGetPhysicalDeviceMemoryProperties"/> - <command name="vkGetInstanceProcAddr"/> - <command name="vkGetDeviceProcAddr"/> - </require> - <require comment="Device commands"> - <command name="vkCreateDevice"/> - <command name="vkDestroyDevice"/> - </require> - <require comment="Extension discovery commands"> - <command name="vkEnumerateInstanceExtensionProperties"/> - <command name="vkEnumerateDeviceExtensionProperties"/> - </require> - <require comment="Layer discovery commands"> - <command name="vkEnumerateInstanceLayerProperties"/> - <command name="vkEnumerateDeviceLayerProperties"/> - </require> - <require comment="queue commands"> - <command name="vkGetDeviceQueue"/> - <command name="vkQueueSubmit"/> - <command name="vkQueueWaitIdle"/> - <command name="vkDeviceWaitIdle"/> - </require> - <require comment="Memory commands"> - <command name="vkAllocateMemory"/> - <command name="vkFreeMemory"/> - <command name="vkMapMemory"/> - <command name="vkUnmapMemory"/> - <command name="vkFlushMappedMemoryRanges"/> - <command name="vkInvalidateMappedMemoryRanges"/> - <command name="vkGetDeviceMemoryCommitment"/> - </require> - <require comment="Memory management API commands"> - <command name="vkBindBufferMemory"/> - <command name="vkBindImageMemory"/> - <command name="vkGetBufferMemoryRequirements"/> - <command name="vkGetImageMemoryRequirements"/> - </require> - <require comment="Sparse resource memory management API commands"> - <command name="vkGetImageSparseMemoryRequirements"/> - <command name="vkGetPhysicalDeviceSparseImageFormatProperties"/> - <command name="vkQueueBindSparse"/> - </require> - <require comment="Fence commands"> - <command name="vkCreateFence"/> - <command name="vkDestroyFence"/> - <command name="vkResetFences"/> - <command name="vkGetFenceStatus"/> - <command name="vkWaitForFences"/> - </require> - <require comment="Queue semaphore commands"> - <command name="vkCreateSemaphore"/> - <command name="vkDestroySemaphore"/> - </require> - <require comment="Event commands"> - <command name="vkCreateEvent"/> - <command name="vkDestroyEvent"/> - <command name="vkGetEventStatus"/> - <command name="vkSetEvent"/> - <command name="vkResetEvent"/> - </require> - <require comment="Query commands"> - <command name="vkCreateQueryPool"/> - <command name="vkDestroyQueryPool"/> - <command name="vkGetQueryPoolResults"/> - </require> - <require comment="Buffer commands"> - <command name="vkCreateBuffer"/> - <command name="vkDestroyBuffer"/> - </require> - <require comment="Buffer view commands"> - <command name="vkCreateBufferView"/> - <command name="vkDestroyBufferView"/> - </require> - <require comment="Image commands"> - <command name="vkCreateImage"/> - <command name="vkDestroyImage"/> - <command name="vkGetImageSubresourceLayout"/> - </require> - <require comment="Image view commands"> - <command name="vkCreateImageView"/> - <command name="vkDestroyImageView"/> - </require> - <require comment="Shader commands"> - <command name="vkCreateShaderModule"/> - <command name="vkDestroyShaderModule"/> - </require> - <require comment="Pipeline Cache commands"> - <command name="vkCreatePipelineCache"/> - <command name="vkDestroyPipelineCache"/> - <command name="vkGetPipelineCacheData"/> - <command name="vkMergePipelineCaches"/> - </require> - <require comment="Pipeline commands"> - <command name="vkCreateGraphicsPipelines"/> - <command name="vkCreateComputePipelines"/> - <command name="vkDestroyPipeline"/> - </require> - <require comment="Pipeline layout commands"> - <command name="vkCreatePipelineLayout"/> - <command name="vkDestroyPipelineLayout"/> - </require> - <require comment="Sampler commands"> - <command name="vkCreateSampler"/> - <command name="vkDestroySampler"/> - </require> - <require comment="Descriptor set commands"> - <command name="vkCreateDescriptorSetLayout"/> - <command name="vkDestroyDescriptorSetLayout"/> - <command name="vkCreateDescriptorPool"/> - <command name="vkDestroyDescriptorPool"/> - <command name="vkResetDescriptorPool"/> - <command name="vkAllocateDescriptorSets"/> - <command name="vkFreeDescriptorSets"/> - <command name="vkUpdateDescriptorSets"/> - </require> - <require comment="Pass commands"> - <command name="vkCreateFramebuffer"/> - <command name="vkDestroyFramebuffer"/> - <command name="vkCreateRenderPass"/> - <command name="vkDestroyRenderPass"/> - <command name="vkGetRenderAreaGranularity"/> - </require> - <require comment="Command pool commands"> - <command name="vkCreateCommandPool"/> - <command name="vkDestroyCommandPool"/> - <command name="vkResetCommandPool"/> - </require> - <require comment="Command buffer commands"> - <command name="vkAllocateCommandBuffers"/> - <command name="vkFreeCommandBuffers"/> - <command name="vkBeginCommandBuffer"/> - <command name="vkEndCommandBuffer"/> - <command name="vkResetCommandBuffer"/> - </require> - <require comment="Command buffer building commands"> - <command name="vkCmdBindPipeline"/> - <command name="vkCmdSetViewport"/> - <command name="vkCmdSetScissor"/> - <command name="vkCmdSetLineWidth"/> - <command name="vkCmdSetDepthBias"/> - <command name="vkCmdSetBlendConstants"/> - <command name="vkCmdSetDepthBounds"/> - <command name="vkCmdSetStencilCompareMask"/> - <command name="vkCmdSetStencilWriteMask"/> - <command name="vkCmdSetStencilReference"/> - <command name="vkCmdBindDescriptorSets"/> - <command name="vkCmdBindIndexBuffer"/> - <command name="vkCmdBindVertexBuffers"/> - <command name="vkCmdDraw"/> - <command name="vkCmdDrawIndexed"/> - <command name="vkCmdDrawIndirect"/> - <command name="vkCmdDrawIndexedIndirect"/> - <command name="vkCmdDispatch"/> - <command name="vkCmdDispatchIndirect"/> - <command name="vkCmdCopyBuffer"/> - <command name="vkCmdCopyImage"/> - <command name="vkCmdBlitImage"/> - <command name="vkCmdCopyBufferToImage"/> - <command name="vkCmdCopyImageToBuffer"/> - <command name="vkCmdUpdateBuffer"/> - <command name="vkCmdFillBuffer"/> - <command name="vkCmdClearColorImage"/> - <command name="vkCmdClearDepthStencilImage"/> - <command name="vkCmdClearAttachments"/> - <command name="vkCmdResolveImage"/> - <command name="vkCmdSetEvent"/> - <command name="vkCmdResetEvent"/> - <command name="vkCmdWaitEvents"/> - <command name="vkCmdPipelineBarrier"/> - <command name="vkCmdBeginQuery"/> - <command name="vkCmdEndQuery"/> - <command name="vkCmdResetQueryPool"/> - <command name="vkCmdWriteTimestamp"/> - <command name="vkCmdCopyQueryPoolResults"/> - <command name="vkCmdPushConstants"/> - <command name="vkCmdBeginRenderPass"/> - <command name="vkCmdNextSubpass"/> - <command name="vkCmdEndRenderPass"/> - <command name="vkCmdExecuteCommands"/> - </require> - <require comment="Types not directly used by the API"> -  - <type name="VkBufferMemoryBarrier"/> - <type name="VkDispatchIndirectCommand"/> - <type name="VkDrawIndexedIndirectCommand"/> - <type name="VkDrawIndirectCommand"/> - <type name="VkImageMemoryBarrier"/> - <type name="VkMemoryBarrier"/> - <type name="VkObjectType"/> - </require> - </feature> - -  - <extensions> -  - <extension name="VK_KHR_surface" number="1" type="instance" supported="vulkan"> - <require> - <enum value="25" name="VK_KHR_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_surface"" name="VK_KHR_SURFACE_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_SURFACE_LOST_KHR"/> - <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"/> - <enum value="VK_COLOR_SPACE_SRGB_NONLINEAR_KHR" name="VK_COLORSPACE_SRGB_NONLINEAR_KHR"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_SURFACE_KHR" comment="VkSurfaceKHR"/> - <command name="vkDestroySurfaceKHR"/> - <command name="vkGetPhysicalDeviceSurfaceSupportKHR"/> - <command name="vkGetPhysicalDeviceSurfaceCapabilitiesKHR"/> - <command name="vkGetPhysicalDeviceSurfaceFormatsKHR"/> - <command name="vkGetPhysicalDeviceSurfacePresentModesKHR"/> - </require> - </extension> - <extension name="VK_KHR_swapchain" number="2" type="device" requires="VK_KHR_surface" supported="vulkan"> - <require> - <enum value="68" name="VK_KHR_SWAPCHAIN_SPEC_VERSION"/> - <enum value=""VK_KHR_swapchain"" name="VK_KHR_SWAPCHAIN_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_INFO_KHR"/> - <enum offset="2" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_PRESENT_SRC_KHR"/> - <enum offset="3" extends="VkResult" name="VK_SUBOPTIMAL_KHR"/> - <enum offset="4" dir="-" extends="VkResult" name="VK_ERROR_OUT_OF_DATE_KHR"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_SWAPCHAIN_KHR" comment="VkSwapchainKHR"/> - <command name="vkCreateSwapchainKHR"/> - <command name="vkDestroySwapchainKHR"/> - <command name="vkGetSwapchainImagesKHR"/> - <command name="vkAcquireNextImageKHR"/> - <command name="vkQueuePresentKHR"/> - </require> - </extension> - <extension name="VK_KHR_display" number="3" type="instance" requires="VK_KHR_surface" supported="vulkan"> - <require> - <enum value="21" name="VK_KHR_DISPLAY_SPEC_VERSION"/> - <enum value=""VK_KHR_display"" name="VK_KHR_DISPLAY_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DISPLAY_KHR" comment="VkDisplayKHR"/> - <enum offset="1" extends="VkObjectType" name="VK_OBJECT_TYPE_DISPLAY_MODE_KHR" comment="VkDisplayModeKHR"/> - <type name="VkDisplayPlaneAlphaFlagsKHR"/> - <type name="VkDisplayPlaneAlphaFlagBitsKHR"/> - <type name="VkDisplayPropertiesKHR"/> - <type name="VkDisplayModeParametersKHR"/> - <type name="VkDisplayModePropertiesKHR"/> - <type name="VkDisplayModeCreateInfoKHR"/> - <type name="VkDisplayPlaneCapabilitiesKHR"/> - <type name="VkDisplayPlanePropertiesKHR"/> - <type name="VkDisplaySurfaceCreateInfoKHR"/> - <command name="vkGetPhysicalDeviceDisplayPropertiesKHR"/> - <command name="vkGetPhysicalDeviceDisplayPlanePropertiesKHR"/> - <command name="vkGetDisplayPlaneSupportedDisplaysKHR"/> - <command name="vkGetDisplayModePropertiesKHR"/> - <command name="vkCreateDisplayModeKHR"/> - <command name="vkGetDisplayPlaneCapabilitiesKHR"/> - <command name="vkCreateDisplayPlaneSurfaceKHR"/> - </require> - </extension> - <extension name="VK_KHR_display_swapchain" number="4" type="device" requires="VK_KHR_swapchain,VK_KHR_display" supported="vulkan"> - <require> - <enum value="9" name="VK_KHR_DISPLAY_SWAPCHAIN_SPEC_VERSION"/> - <enum value=""VK_KHR_display_swapchain"" name="VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR"/> - <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_INCOMPATIBLE_DISPLAY_KHR"/> - <type name="VkDisplayPresentInfoKHR"/> - <command name="vkCreateSharedSwapchainsKHR"/> - </require> - </extension> - <extension name="VK_KHR_xlib_surface" number="5" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_XLIB_KHR" supported="vulkan"> - <require> - <enum value="6" name="VK_KHR_XLIB_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_xlib_surface"" name="VK_KHR_XLIB_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR"/> - <type name="VkXlibSurfaceCreateFlagsKHR"/> - <type name="VkXlibSurfaceCreateInfoKHR"/> - <command name="vkCreateXlibSurfaceKHR"/> - <command name="vkGetPhysicalDeviceXlibPresentationSupportKHR"/> - </require> - </extension> - <extension name="VK_KHR_xcb_surface" number="6" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_XCB_KHR" supported="vulkan"> - <require> - <enum value="6" name="VK_KHR_XCB_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_xcb_surface"" name="VK_KHR_XCB_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR"/> - <type name="VkXcbSurfaceCreateFlagsKHR"/> - <type name="VkXcbSurfaceCreateInfoKHR"/> - <command name="vkCreateXcbSurfaceKHR"/> - <command name="vkGetPhysicalDeviceXcbPresentationSupportKHR"/> - </require> - </extension> - <extension name="VK_KHR_wayland_surface" number="7" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_WAYLAND_KHR" supported="vulkan"> - <require> - <enum value="6" name="VK_KHR_WAYLAND_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_wayland_surface"" name="VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR"/> - <type name="VkWaylandSurfaceCreateFlagsKHR"/> - <type name="VkWaylandSurfaceCreateInfoKHR"/> - <command name="vkCreateWaylandSurfaceKHR"/> - <command name="vkGetPhysicalDeviceWaylandPresentationSupportKHR"/> - </require> - </extension> - <extension name="VK_KHR_mir_surface" number="8" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_MIR_KHR" supported="vulkan"> - <require> - <enum value="4" name="VK_KHR_MIR_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_mir_surface"" name="VK_KHR_MIR_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR"/> - <type name="VkMirSurfaceCreateFlagsKHR"/> - <type name="VkMirSurfaceCreateInfoKHR"/> - <command name="vkCreateMirSurfaceKHR"/> - <command name="vkGetPhysicalDeviceMirPresentationSupportKHR"/> - </require> - </extension> - <extension name="VK_KHR_android_surface" number="9" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_ANDROID_KHR" supported="vulkan"> - <require> - <enum value="6" name="VK_KHR_ANDROID_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_android_surface"" name="VK_KHR_ANDROID_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR"/> - <type name="VkAndroidSurfaceCreateFlagsKHR"/> - <type name="VkAndroidSurfaceCreateInfoKHR"/> - <command name="vkCreateAndroidSurfaceKHR"/> - </require> - </extension> - <extension name="VK_KHR_win32_surface" number="10" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> - <require> - <enum value="6" name="VK_KHR_WIN32_SURFACE_SPEC_VERSION"/> - <enum value=""VK_KHR_win32_surface"" name="VK_KHR_WIN32_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR"/> - <type name="VkWin32SurfaceCreateFlagsKHR"/> - <type name="VkWin32SurfaceCreateInfoKHR"/> - <command name="vkCreateWin32SurfaceKHR"/> - <command name="vkGetPhysicalDeviceWin32PresentationSupportKHR"/> - </require> - </extension> - <extension name="VK_ANDROID_native_buffer" number="11" supported="disabled"> - <require> - <enum value="4" name="VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION"/> - <enum value="11" name="VK_ANDROID_NATIVE_BUFFER_NUMBER"/> - <enum value=""VK_ANDROID_native_buffer"" name="VK_ANDROID_NATIVE_BUFFER_NAME"/> - </require> - </extension> - <extension name="VK_EXT_debug_report" number="12" type="instance" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtney" supported="vulkan"> - <require> - <enum value="8" name="VK_EXT_DEBUG_REPORT_SPEC_VERSION"/> - <enum value=""VK_EXT_debug_report"" name="VK_EXT_DEBUG_REPORT_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT"/> - <enum offset="1" dir="-" extends="VkResult" name="VK_ERROR_VALIDATION_FAILED_EXT"/> - <enum value="VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT" name="VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT" comment="VkDebugReportCallbackEXT"/> - <enum value="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT"/> - <type name="VkDebugReportObjectTypeEXT"/> - <type name="VkDebugReportCallbackCreateInfoEXT"/> - <command name="vkCreateDebugReportCallbackEXT"/> - <command name="vkDestroyDebugReportCallbackEXT"/> - <command name="vkDebugReportMessageEXT"/> - </require> - </extension> - <extension name="VK_NV_glsl_shader" number="13" type="device" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_GLSL_SHADER_SPEC_VERSION"/> - <enum value=""VK_NV_glsl_shader"" name="VK_NV_GLSL_SHADER_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_INVALID_SHADER_NV"/> - </require> - </extension> - <extension name="VK_NV_extension_1" number="14" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_1_SPEC_VERSION"/> - <enum value=""VK_NV_extension_1"" name="VK_NV_EXTENSION_1_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_NV_EXTENSION_1_ERROR"/> - </require> - </extension> - <extension name="VK_KHR_sampler_mirror_clamp_to_edge" type="device" number="15" author="KHR" contact="Tobias Hector @tobias" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION"/> - <enum value=""VK_KHR_sampler_mirror_clamp_to_edge"" name="VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME"/> - <enum value="4" extends="VkSamplerAddressMode" name="VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE" comment="Note that this defines what was previously a core enum, and so uses the 'value' attribute rather than 'offset', and does not have a suffix. This is a special case, and should not be repeated"/> - </require> - </extension> - <extension name="VK_IMG_filter_cubic" number="16" type="device" author="IMG" contact="Tobias Hector @tobias" supported="vulkan"> - <require> - <enum value="1" name="VK_IMG_FILTER_CUBIC_SPEC_VERSION"/> - <enum value=""VK_IMG_filter_cubic"" name="VK_IMG_FILTER_CUBIC_EXTENSION_NAME"/> - <enum offset="0" extends="VkFilter" name="VK_FILTER_CUBIC_IMG"/> - <enum bitpos="13" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG" comment="Format can be filtered with VK_FILTER_CUBIC_IMG when being sampled"/> - </require> - </extension> - <extension name="VK_AMD_extension_17" number="17" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_17_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_17"" name="VK_AMD_EXTENSION_17_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_18" number="18" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_18_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_18"" name="VK_AMD_EXTENSION_18_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_rasterization_order" number="19" type="device" author="AMD" contact="Daniel Rakos @aqnuep" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_RASTERIZATION_ORDER_SPEC_VERSION"/> - <enum value=""VK_AMD_rasterization_order"" name="VK_AMD_RASTERIZATION_ORDER_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD"/> - <type name="VkRasterizationOrderAMD"/> - <type name="VkPipelineRasterizationStateRasterizationOrderAMD"/> - </require> - </extension> - <extension name="VK_AMD_extension_20" number="20" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_20_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_20"" name="VK_AMD_EXTENSION_20_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_shader_trinary_minmax" number="21" type="device" author="AMD" contact="quentin.lin(a)amd.com" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_SHADER_TRINARY_MINMAX_SPEC_VERSION"/> - <enum value=""VK_AMD_shader_trinary_minmax"" name="VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_shader_explicit_vertex_parameter" number="22" type="device" author="AMD" contact="quentin.lin(a)amd.com" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_SPEC_VERSION"/> - <enum value=""VK_AMD_shader_explicit_vertex_parameter"" name="VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_debug_marker" number="23" type="device" requires="VK_EXT_debug_report" author="Baldur Karlsson" contact="baldurk(a)baldurk.org" supported="vulkan"> - <require> - <enum value="4" name="VK_EXT_DEBUG_MARKER_SPEC_VERSION"/> - <enum value=""VK_EXT_debug_marker"" name="VK_EXT_DEBUG_MARKER_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT"/> - <type name="VkDebugReportObjectTypeEXT"/> - <type name="VkDebugMarkerObjectNameInfoEXT"/> - <type name="VkDebugMarkerObjectTagInfoEXT"/> - <type name="VkDebugMarkerMarkerInfoEXT"/> - <command name="vkDebugMarkerSetObjectTagEXT"/> - <command name="vkDebugMarkerSetObjectNameEXT"/> - <command name="vkCmdDebugMarkerBeginEXT"/> - <command name="vkCmdDebugMarkerEndEXT"/> - <command name="vkCmdDebugMarkerInsertEXT"/> - </require> - </extension> - <extension name="VK_AMD_extension_24" number="24" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_24_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_24"" name="VK_AMD_EXTENSION_24_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_25" number="25" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_25_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_25"" name="VK_AMD_EXTENSION_25_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_gcn_shader" number="26" type="device" author="AMD" contact="dominik.witczak(a)amd.com" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_GCN_SHADER_SPEC_VERSION"/> - <enum value=""VK_AMD_gcn_shader"" name="VK_AMD_GCN_SHADER_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_dedicated_allocation" number="27" type="device" author="NVIDIA" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION"/> - <enum value=""VK_NV_dedicated_allocation"" name="VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV"/> - <type name="VkDedicatedAllocationImageCreateInfoNV"/> - <type name="VkDedicatedAllocationBufferCreateInfoNV"/> - <type name="VkDedicatedAllocationMemoryAllocateInfoNV"/> - </require> - </extension> - <extension name="VK_EXT_extension_28" number="28" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="disabled"> - <require> - <enum value="0" name="VK_EXT_EXTENSION_28_SPEC_VERSION"/> - <enum value=""VK_NV_extension_28"" name="VK_EXT_EXTENSION_28_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_extension_29" number="29" author="NVIDIA" contact="Jeff Juliano @jjuliano" supported="disabled"> - <require> - <enum value="0" name="VK_NVX_EXTENSION_29_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_29"" name="VK_NVX_EXTENSION_29_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_extension_30" number="30" author="NVIDIA" contact="Jeff Juliano @jjuliano" supported="disabled"> - <require> - <enum value="0" name="VK_NVX_EXTENSION_30_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_30"" name="VK_NVX_EXTENSION_30_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_extension_31" number="31" author="NVIDIA" contact="Jeff Juliano @jjuliano" supported="disabled"> - <require> - <enum value="0" name="VK_NVX_EXTENSION_31_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_31"" name="VK_NVX_EXTENSION_31_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_32" number="32" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_32_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_32"" name="VK_AMD_EXTENSION_32_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_33" number="33" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_33_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_33"" name="VK_AMD_EXTENSION_33_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_draw_indirect_count" number="34" type="device" author="AMD" contact="Daniel Rakos @aqnuep" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION"/> - <enum value=""VK_AMD_draw_indirect_count"" name="VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME"/> - <command name="vkCmdDrawIndirectCountAMD"/> - <command name="vkCmdDrawIndexedIndirectCountAMD"/> - </require> - </extension> - <extension name="VK_AMD_extension_35" number="35" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_35_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_35"" name="VK_AMD_EXTENSION_35_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_negative_viewport_height" number="36" type="device" author="AMD" contact="Matthaeus G. Chajdas @anteru" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_SPEC_VERSION"/> - <enum value=""VK_AMD_negative_viewport_height"" name="VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_gpu_shader_half_float" number="37" type="device" author="AMD" contact="Dominik Witczak @dominikwitczak_amd" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_GPU_SHADER_HALF_FLOAT_SPEC_VERSION"/> - <enum value=""VK_AMD_gpu_shader_half_float"" name="VK_AMD_GPU_SHADER_HALF_FLOAT_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_shader_ballot" number="38" type="device" author="AMD" contact="Dominik Witczak @dominikwitczak_amd" supported="vulkan"> - <require> - <enum value="1" name="VK_AMD_SHADER_BALLOT_SPEC_VERSION"/> - <enum value=""VK_AMD_shader_ballot"" name="VK_AMD_SHADER_BALLOT_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_39" number="39" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_39_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_39"" name="VK_AMD_EXTENSION_39_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_40" number="40" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_40_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_40"" name="VK_AMD_EXTENSION_40_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_41" number="41" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_41_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_41"" name="VK_AMD_EXTENSION_41_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_texture_gather_bias_lod" number="42" author="AMD" contact="Rex Xu @amdrexu" supported="vulkan" type="device" requires="VK_KHR_get_physical_device_properties2"> - <require> - <enum value="1" name="VK_AMD_TEXTURE_GATHER_BIAS_LOD_SPEC_VERSION"/> - <enum value=""VK_AMD_texture_gather_bias_lod"" name="VK_AMD_TEXTURE_GATHER_BIAS_LOD_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD"/> - <type name="VkTextureLODGatherFormatPropertiesAMD"/> - </require> - </extension> - <extension name="VK_AMD_extension_43" number="43" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_43_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_43"" name="VK_AMD_EXTENSION_43_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_44" number="44" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_44_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_44"" name="VK_AMD_EXTENSION_44_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_45" number="45" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_45_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_45"" name="VK_AMD_EXTENSION_45_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_46" number="46" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_46_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_46"" name="VK_AMD_EXTENSION_46_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_47" number="47" author="AMD" contact="Daniel Rakos @aqnuep" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_47_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_47"" name="VK_AMD_EXTENSION_47_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_extension_48" number="48" author="NVIDIA" contact="James Jones @cubanismo" supported="disabled"> - <require> - <enum value="0" name="VK_NVX_EXTENSION_48_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_48"" name="VK_NVX_EXTENSION_48_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_GOOGLE_extension_49" number="49" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> - <require> - <enum value="0" name="VK_GOOGLE_EXTENSION_49_SPEC_VERSION"/> - <enum value=""VK_GOOGLE_extension_49"" name="VK_GOOGLE_EXTENSION_49_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_GOOGLE_extension_50" number="50" author="GOOGLE" contact="Jean-Francois Roy @jfroy" supported="disabled"> - <require> - <enum value="0" name="VK_GOOGLE_EXTENSION_50_SPEC_VERSION"/> - <enum value=""VK_GOOGLE_extension_50"" name="VK_GOOGLE_EXTENSION_50_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_extension_51" number="51" author="NVIDIA" contact="James Jones @cubanismo" supported="disabled"> - <require> - <enum value="0" name="VK_NVX_EXTENSION_51_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_51"" name="VK_NVX_EXTENSION_51_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_extension_52" number="52" author="NVIDIA" contact="James Jones @cubanismo" supported="disabled"> - <require> - <enum value="0" name="VK_NVX_EXTENSION_52_SPEC_VERSION"/> - <enum value=""VK_NVX_extension_52"" name="VK_NVX_EXTENSION_52_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_53" number="53" author="NVIDIA" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_53_SPEC_VERSION"/> - <enum value=""VK_NV_extension_53"" name="VK_NV_EXTENSION_53_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHX_multiview" number="54" type="device" author="NVIDIA" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_MULTIVIEW_SPEC_VERSION"/> - <enum value=""VK_KHX_multiview"" name="VK_KHX_MULTIVIEW_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX"/> - <enum bitpos="1" extends="VkDependencyFlagBits" name="VK_DEPENDENCY_VIEW_LOCAL_BIT_KHX"/> - <type name="VkRenderPassMultiviewCreateInfoKHX"/> - <type name="VkPhysicalDeviceMultiviewFeaturesKHX"/> - <type name="VkPhysicalDeviceMultiviewPropertiesKHX"/> - </require> - </extension> - <extension name="VK_IMG_format_pvrtc" number="55" type="device" author="IMG" contact="Tobias Hector @tobias" supported="vulkan"> - <require> - <enum value="1" name="VK_IMG_FORMAT_PVRTC_SPEC_VERSION"/> - <enum value=""VK_IMG_format_pvrtc"" name="VK_IMG_FORMAT_PVRTC_EXTENSION_NAME"/> - <enum offset="0" extends="VkFormat" name="VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG"/> - <enum offset="1" extends="VkFormat" name="VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG"/> - <enum offset="2" extends="VkFormat" name="VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG"/> - <enum offset="3" extends="VkFormat" name="VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG"/> - <enum offset="4" extends="VkFormat" name="VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG"/> - <enum offset="5" extends="VkFormat" name="VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG"/> - <enum offset="6" extends="VkFormat" name="VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG"/> - <enum offset="7" extends="VkFormat" name="VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG"/> - </require> - </extension> - <extension name="VK_NV_external_memory_capabilities" number="56" type="instance" author="NVIDIA" contact="James jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION"/> - <enum value=""VK_NV_external_memory_capabilities"" name="VK_NV_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME"/> - <type name="VkExternalMemoryHandleTypeFlagsNV"/> - <type name="VkExternalMemoryHandleTypeFlagBitsNV"/> - <type name="VkExternalMemoryFeatureFlagsNV"/> - <type name="VkExternalMemoryFeatureFlagBitsNV"/> - <type name="VkExternalImageFormatPropertiesNV"/> - <command name="vkGetPhysicalDeviceExternalImageFormatPropertiesNV"/> - </require> - </extension> - <extension name="VK_NV_external_memory" number="57" type="device" requires="VK_NV_external_memory_capabilities" author="NVIDIA" contact="James jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_EXTERNAL_MEMORY_SPEC_VERSION"/> - <enum value=""VK_NV_external_memory"" name="VK_NV_EXTERNAL_MEMORY_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV"/> - <type name="VkExternalMemoryImageCreateInfoNV"/> - <type name="VkExportMemoryAllocateInfoNV"/> - </require> - </extension> - <extension name="VK_NV_external_memory_win32" number="58" type="device" requires="VK_NV_external_memory_capabilities,VK_NV_external_memory" author="NVIDIA" contact="James jones @cubanismo" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_EXTERNAL_MEMORY_WIN32_SPEC_VERSION"/> - <enum value=""VK_NV_external_memory_win32"" name="VK_NV_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV"/> - <type name="VkImportMemoryWin32HandleInfoNV"/> - <type name="VkExportMemoryWin32HandleInfoNV"/> - <command name="vkGetMemoryWin32HandleNV"/> - </require> - </extension> - <extension name="VK_NV_win32_keyed_mutex" number="59" type="device" requires="VK_NV_external_memory_capabilities,VK_NV_external_memory_win32" author="NVIDIA" contact="Carsten Rohde" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION"/> - <enum value=""VK_NV_win32_keyed_mutex"" name="VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV"/> - <type name="VkWin32KeyedMutexAcquireReleaseInfoNV"/> - </require> - </extension> - <extension name="VK_KHR_get_physical_device_properties2" number="60" type="instance" author="KHR" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION"/> - <enum value=""VK_KHR_get_physical_device_properties2"" name="VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR"/> - <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR"/> - <enum offset="6" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR"/> - <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR"/> - <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR"/> - <type name="VkPhysicalDeviceFeatures2KHR"/> - <type name="VkPhysicalDeviceProperties2KHR"/> - <type name="VkFormatProperties2KHR"/> - <type name="VkImageFormatProperties2KHR"/> - <type name="VkPhysicalDeviceImageFormatInfo2KHR"/> - <type name="VkQueueFamilyProperties2KHR"/> - <type name="VkPhysicalDeviceMemoryProperties2KHR"/> - <type name="VkSparseImageFormatProperties2KHR"/> - <type name="VkPhysicalDeviceSparseImageFormatInfo2KHR"/> - <command name="vkGetPhysicalDeviceFeatures2KHR"/> - <command name="vkGetPhysicalDeviceProperties2KHR"/> - <command name="vkGetPhysicalDeviceFormatProperties2KHR"/> - <command name="vkGetPhysicalDeviceImageFormatProperties2KHR"/> - <command name="vkGetPhysicalDeviceQueueFamilyProperties2KHR"/> - <command name="vkGetPhysicalDeviceMemoryProperties2KHR"/> - <command name="vkGetPhysicalDeviceSparseImageFormatProperties2KHR"/> - </require> - </extension> - <extension name="VK_KHX_device_group" number="61" type="device" author="KHX" requires="VK_KHR_swapchain" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_DEVICE_GROUP_SPEC_VERSION"/> - <enum value=""VK_KHX_device_group"" name="VK_KHX_DEVICE_GROUP_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHX"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHX"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHX"/> - <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHX"/> - <enum offset="6" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHX"/> - <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHX"/> - <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHX"/> - <enum offset="9" extends="VkStructureType" name="VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHX"/> - <enum offset="10" extends="VkStructureType" name="VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHX"/> - <enum offset="11" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHX"/> - <enum offset="12" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHX"/> - <type name="VkPeerMemoryFeatureFlagsKHX"/> - <type name="VkPeerMemoryFeatureFlagBitsKHX"/> - <type name="VkMemoryAllocateFlagsKHX"/> - <type name="VkMemoryAllocateFlagBitsKHX"/> - <type name="VkDeviceGroupPresentModeFlagBitsKHX"/> - <type name="VkDeviceGroupPresentModeFlagsKHX"/> - <type name="VkMemoryAllocateFlagsInfoKHX"/> - <type name="VkBindBufferMemoryInfoKHX"/> - <type name="VkBindImageMemoryInfoKHX"/> - <type name="VkDeviceGroupRenderPassBeginInfoKHX"/> - <type name="VkDeviceGroupCommandBufferBeginInfoKHX"/> - <type name="VkDeviceGroupSubmitInfoKHX"/> - <type name="VkDeviceGroupBindSparseInfoKHX"/> - <type name="VkDeviceGroupPresentCapabilitiesKHX"/> - <type name="VkImageSwapchainCreateInfoKHX"/> - <type name="VkBindImageMemorySwapchainInfoKHX"/> - <type name="VkAcquireNextImageInfoKHX"/> - <type name="VkDeviceGroupPresentInfoKHX"/> - <type name="VkDeviceGroupSwapchainCreateInfoKHX"/> - <command name="vkGetDeviceGroupPeerMemoryFeaturesKHX"/> - <command name="vkBindBufferMemory2KHX"/> - <command name="vkBindImageMemory2KHX"/> - <command name="vkCmdSetDeviceMaskKHX"/> - <command name="vkGetDeviceGroupPresentCapabilitiesKHX"/> - <command name="vkGetDeviceGroupSurfacePresentModesKHX"/> - <command name="vkAcquireNextImage2KHX"/> - <command name="vkCmdDispatchBaseKHX"/> - <command name="vkGetPhysicalDevicePresentRectanglesKHX"/> - <enum bitpos="6" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_BIND_SFR_BIT_KHX" comment="Allows using VkBindImageMemoryInfoKHX::pSFRRects when binding memory to the image"/> - <enum bitpos="3" extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHX"/> - <enum bitpos="4" extends="VkPipelineCreateFlagBits" name="VK_PIPELINE_CREATE_DISPATCH_BASE_KHX"/> - <enum bitpos="2" extends="VkDependencyFlagBits" name="VK_DEPENDENCY_DEVICE_GROUP_BIT_KHX" comment="Dependency is across devices"/> - <enum bitpos="0" extends="VkSwapchainCreateFlagBitsKHR" name="VK_SWAPCHAIN_CREATE_BIND_SFR_BIT_KHX" comment="Allow images with VK_IMAGE_CREATE_BIND_SFR_BIT_KHX"/> - </require> - </extension> - <extension name="VK_EXT_validation_flags" number="62" type="instance" author="GOOGLE" contact="Tobin Ehlis @tobine" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_VALIDATION_FLAGS_SPEC_VERSION"/> - <enum value=""VK_EXT_validation_flags"" name="VK_EXT_VALIDATION_FLAGS_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"/> - <type name="VkValidationFlagsEXT"/> - </require> - </extension> - <extension name="VK_NN_vi_surface" number="63" type="instance" author="NN" contact="Mathias Heyer @mheyer" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_VI_NN" supported="vulkan"> - <require> - <enum value="1" name="VK_NN_VI_SURFACE_SPEC_VERSION"/> - <enum value=""VK_NN_vi_surface"" name="VK_NN_VI_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN"/> - <type name="VkViSurfaceCreateFlagsNN"/> - <type name="VkViSurfaceCreateInfoNN"/> - <command name="vkCreateViSurfaceNN"/> - </require> - </extension> - <extension name="VK_KHR_shader_draw_parameters" number="64" type="device" author="KHR" contact="Daniel Koch @dgkoch" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION"/> - <enum value=""VK_KHR_shader_draw_parameters"" name="VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_shader_subgroup_ballot" number="65" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_SHADER_SUBGROUP_BALLOT_SPEC_VERSION"/> - <enum value=""VK_EXT_shader_subgroup_ballot"" name="VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_shader_subgroup_vote" number="66" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_SHADER_SUBGROUP_VOTE_SPEC_VERSION"/> - <enum value=""VK_EXT_shader_subgroup_vote"" name="VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_ARM_extension_01" number="67" type="device" author="ARM" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> - <require> - <enum value="0" name="VK_ARM_EXTENSION_01_SPEC_VERSION"/> - <enum value=""VK_ARM_extension_01"" name="VK_ARM_EXTENSION_01_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_ARM_extension_02" number="68" type="device" author="ARM" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> - <require> - <enum value="0" name="VK_ARM_EXTENSION_02_SPEC_VERSION"/> - <enum value=""VK_ARM_extension_02"" name="VK_ARM_EXTENSION_02_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_IMG_extension_69" number="69" type="device" author="IMG" contact="Tobias Hector @tobias" supported="disabled"> - <require> - <enum value="0" name="VK_IMG_EXTENSION_69_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_69"" name="VK_IMG_EXTENSION_69_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_maintenance1" number="70" type="device" author="KHR" contact="Piers Daniell @pdaniell" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_MAINTENANCE1_SPEC_VERSION"/> - <enum value=""VK_KHR_maintenance1"" name="VK_KHR_MAINTENANCE1_EXTENSION_NAME"/> - <enum offset="0" dir="-" extends="VkResult" name="VK_ERROR_OUT_OF_POOL_MEMORY_KHR"/> - <enum bitpos="14" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR" comment="Format can be used as the source image of image transfer commands"/> - <enum bitpos="15" extends="VkFormatFeatureFlagBits" name="VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR" comment="Format can be used as the destination image of image transfer commands"/> - <enum bitpos="5" extends="VkImageCreateFlagBits" name="VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR" comment="The 3D image can be viewed as a 2D or 2D array image"/> - <command name="vkTrimCommandPoolKHR"/> - </require> - </extension> - <extension name="VK_KHX_device_group_creation" number="71" type="instance" author="KHX" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_DEVICE_GROUP_CREATION_SPEC_VERSION"/> - <enum value=""VK_KHX_device_group_creation"" name="VK_KHX_DEVICE_GROUP_CREATION_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHX"/> - <enum name="VK_MAX_DEVICE_GROUP_SIZE_KHX"/> - <type name="VkPhysicalDeviceGroupPropertiesKHX"/> - <type name="VkDeviceGroupDeviceCreateInfoKHX"/> - <command name="vkEnumeratePhysicalDeviceGroupsKHX"/> - <enum bitpos="1" extends="VkMemoryHeapFlagBits" name="VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHX" comment="If set, heap allocations allocate multiple instances by default"/> - </require> - </extension> - <extension name="VK_KHX_external_memory_capabilities" number="72" type="instance" author="KHX" requires="VK_KHR_get_physical_device_properties2" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory_capabilities"" name="VK_KHX_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX"/> - <enum name="VK_LUID_SIZE_KHX"/> - <type name="VkExternalMemoryHandleTypeFlagsKHX"/> - <type name="VkExternalMemoryHandleTypeFlagBitsKHX"/> - <type name="VkExternalMemoryFeatureFlagsKHX"/> - <type name="VkExternalMemoryFeatureFlagBitsKHX"/> - <type name="VkExternalMemoryPropertiesKHX"/> - <type name="VkPhysicalDeviceExternalImageFormatInfoKHX"/> - <type name="VkExternalImageFormatPropertiesKHX"/> - <type name="VkPhysicalDeviceExternalBufferInfoKHX"/> - <type name="VkExternalBufferPropertiesKHX"/> - <type name="VkPhysicalDeviceIDPropertiesKHX"/> - <command name="vkGetPhysicalDeviceExternalBufferPropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_memory" number="73" type="device" requires="VK_KHX_external_memory_capabilities" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory"" name="VK_KHX_EXTERNAL_MEMORY_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHX"/> - <enum offset="3" dir="-" extends="VkResult" name="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX"/> - <enum name="VK_QUEUE_FAMILY_EXTERNAL_KHX"/> - <type name="VkExternalMemoryImageCreateInfoKHX"/> - <type name="VkExternalMemoryBufferCreateInfoKHX"/> - <type name="VkExportMemoryAllocateInfoKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_memory_win32" number="74" type="device" requires="VK_KHX_external_memory_capabilities,VK_KHX_external_memory" author="KHX" contact="James Jones @cubanismo" protect="VK_USE_PLATFORM_WIN32_KHX" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_WIN32_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory_win32"" name="VK_KHX_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHX"/> - <type name="VkImportMemoryWin32HandleInfoKHX"/> - <type name="VkExportMemoryWin32HandleInfoKHX"/> - <type name="VkMemoryWin32HandlePropertiesKHX"/> - <command name="vkGetMemoryWin32HandleKHX"/> - <command name="vkGetMemoryWin32HandlePropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_memory_fd" number="75" type="device" requires="VK_KHX_external_memory_capabilities,VK_KHX_external_memory" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_MEMORY_FD_SPEC_VERSION"/> - <enum value=""VK_KHX_external_memory_fd"" name="VK_KHX_EXTERNAL_MEMORY_FD_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHX"/> - <type name="VkImportMemoryFdInfoKHX"/> - <type name="VkMemoryFdPropertiesKHX"/> - <command name="vkGetMemoryFdKHX"/> - <command name="vkGetMemoryFdPropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_win32_keyed_mutex" number="76" type="device" requires="VK_KHX_external_memory_capabilities,VK_KHX_external_memory,VK_KHX_external_memory_win32" author="KHX" contact="Carsten Rohde" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_WIN32_KEYED_MUTEX_SPEC_VERSION"/> - <enum value=""VK_KHX_win32_keyed_mutex"" name="VK_KHX_WIN32_KEYED_MUTEX_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHX"/> - <type name="VkWin32KeyedMutexAcquireReleaseInfoKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore_capabilities" number="77" type="instance" author="KHX" requires="VK_KHR_get_physical_device_properties2" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore_capabilities"" name="VK_KHX_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHX"/> - <enum name="VK_LUID_SIZE_KHX"/> - <type name="VkExternalSemaphoreHandleTypeFlagsKHX"/> - <type name="VkExternalSemaphoreHandleTypeFlagBitsKHX"/> - <type name="VkExternalSemaphoreFeatureFlagsKHX"/> - <type name="VkExternalSemaphoreFeatureFlagBitsKHX"/> - <type name="VkPhysicalDeviceExternalSemaphoreInfoKHX"/> - <type name="VkExternalSemaphorePropertiesKHX"/> - <type name="VkPhysicalDeviceIDPropertiesKHX"/> - <command name="vkGetPhysicalDeviceExternalSemaphorePropertiesKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore" number="78" type="device" requires="VK_KHX_external_semaphore_capabilities" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore"" name="VK_KHX_EXTERNAL_SEMAPHORE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHX"/> - <type name="VkExportSemaphoreCreateInfoKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore_win32" number="79" type="device" requires="VK_KHX_external_semaphore_capabilities,VK_KHX_external_semaphore" author="KHX" contact="James Jones @cubanismo" protect="VK_USE_PLATFORM_WIN32_KHX" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_WIN32_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore_win32"" name="VK_KHX_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHX"/> - <type name="VkImportSemaphoreWin32HandleInfoKHX"/> - <type name="VkExportSemaphoreWin32HandleInfoKHX"/> - <type name="VkD3D12FenceSubmitInfoKHX"/> - <command name="vkImportSemaphoreWin32HandleKHX"/> - <command name="vkGetSemaphoreWin32HandleKHX"/> - </require> - </extension> - <extension name="VK_KHX_external_semaphore_fd" number="80" type="device" requires="VK_KHX_external_semaphore_capabilities,VK_KHX_external_semaphore" author="KHX" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHX_EXTERNAL_SEMAPHORE_FD_SPEC_VERSION"/> - <enum value=""VK_KHX_external_semaphore_fd"" name="VK_KHX_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHX"/> - <type name="VkImportSemaphoreFdInfoKHX"/> - <command name="vkImportSemaphoreFdKHX"/> - <command name="vkGetSemaphoreFdKHX"/> - </require> - </extension> - <extension name="VK_KHR_push_descriptor" number="81" type="device" author="KHR" requires="VK_KHR_get_physical_device_properties2" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION"/> - <enum value=""VK_KHR_push_descriptor"" name="VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR"/> - <enum bitpos="0" extends="VkDescriptorSetLayoutCreateFlagBits" name="VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR" comment="Descriptors are pushed via flink:vkCmdPushDescriptorSetKHR"/> - <command name="vkCmdPushDescriptorSetKHR"/> - <type name="VkPhysicalDevicePushDescriptorPropertiesKHR"/> - </require> - </extension> - <extension name="VK_KHR_extension_82" number="82" author="KHR" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_82_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_82"" name="VK_KHR_EXTENSION_82_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_83" number="83" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_83_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_83"" name="VK_KHR_EXTENSION_83_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_84" number="84" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_84_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_84"" name="VK_KHR_EXTENSION_84_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_incremental_present" number="85" type="device" author="KHR" requires="VK_KHR_swapchain" contact="Ian Elliott ianelliott(a)google.com" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION"/> - <enum value=""VK_KHR_incremental_present"" name="VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR"/> - <type name="VkPresentRegionsKHR"/> - <type name="VkPresentRegionKHR"/> - <type name="VkRectLayerKHR"/> - </require> - </extension> - <extension name="VK_KHR_descriptor_update_template" number="86" type="device" author="KHR" contact="Markus Tavenrath @mtavenrath" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION"/> - <enum value=""VK_KHR_descriptor_update_template"" name="VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR"/> - <enum offset="0" extends="VkDebugReportObjectTypeEXT" name="VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR" comment="VkDescriptorUpdateTemplateKHR"/> - <command name="vkCreateDescriptorUpdateTemplateKHR"/> - <command name="vkDestroyDescriptorUpdateTemplateKHR"/> - <command name="vkUpdateDescriptorSetWithTemplateKHR"/> - <command name="vkCmdPushDescriptorSetWithTemplateKHR"/> - <type name="VkDescriptorUpdateTemplateKHR"/> - <type name="VkDescriptorUpdateTemplateCreateFlagsKHR"/> - <type name="VkDescriptorUpdateTemplateTypeKHR"/> - <type name="VkDescriptorUpdateTemplateEntryKHR"/> - <type name="VkDescriptorUpdateTemplateCreateInfoKHR"/> - </require> - </extension> - <extension name="VK_NVX_device_generated_commands" number="87" type="device" author="NVIDIA" contact="Christoph Kubisch @pixeljetstream" supported="vulkan"> - <require> - <enum value="1" name="VK_NVX_DEVICE_GENERATED_COMMANDS_SPEC_VERSION"/> - <enum value=""VK_NVX_device_generated_commands"" name="VK_NVX_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX"/> - <enum offset="4" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX"/> - <enum offset="5" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_FEATURES_NVX"/> - <enum bitpos="17" extends="VkPipelineStageFlagBits" name="VK_PIPELINE_STAGE_COMMAND_PROCESS_BIT_NVX"/> - <enum bitpos="17" extends="VkAccessFlagBits" name="VK_ACCESS_COMMAND_PROCESS_READ_BIT_NVX"/> - <enum bitpos="18" extends="VkAccessFlagBits" name="VK_ACCESS_COMMAND_PROCESS_WRITE_BIT_NVX"/> - <enum offset="0" extends="VkObjectType" name="VK_OBJECT_TYPE_OBJECT_TABLE_NVX" comment="VkobjectTableNVX"/> - <enum offset="1" extends="VkObjectType" name="VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX" comment="VkIndirectCommandsLayoutNVX"/> - <type name="VkObjectTableNVX"/> - <type name="VkIndirectCommandsLayoutNVX"/> - <type name="VkIndirectCommandsLayoutUsageFlagsNVX"/> - <type name="VkObjectEntryUsageFlagsNVX"/> - <type name="VkIndirectCommandsLayoutUsageFlagBitsNVX"/> - <type name="VkIndirectCommandsTokenTypeNVX"/> - <type name="VkObjectEntryUsageFlagBitsNVX"/> - <type name="VkObjectEntryTypeNVX"/> - <type name="VkDeviceGeneratedCommandsFeaturesNVX"/> - <type name="VkDeviceGeneratedCommandsLimitsNVX"/> - <type name="VkIndirectCommandsTokenNVX"/> - <type name="VkIndirectCommandsLayoutTokenNVX"/> - <type name="VkIndirectCommandsLayoutCreateInfoNVX"/> - <type name="VkCmdProcessCommandsInfoNVX"/> - <type name="VkCmdReserveSpaceForCommandsInfoNVX"/> - <type name="VkObjectTableCreateInfoNVX"/> - <type name="VkObjectTableEntryNVX"/> - <type name="VkObjectTablePipelineEntryNVX"/> - <type name="VkObjectTableDescriptorSetEntryNVX"/> - <type name="VkObjectTableVertexBufferEntryNVX"/> - <type name="VkObjectTableIndexBufferEntryNVX"/> - <type name="VkObjectTablePushConstantEntryNVX"/> - <command name="vkCmdProcessCommandsNVX"/> - <command name="vkCmdReserveSpaceForCommandsNVX"/> - <command name="vkCreateIndirectCommandsLayoutNVX"/> - <command name="vkDestroyIndirectCommandsLayoutNVX"/> - <command name="vkCreateObjectTableNVX"/> - <command name="vkDestroyObjectTableNVX"/> - <command name="vkRegisterObjectsNVX"/> - <command name="vkUnregisterObjectsNVX"/> - <command name="vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX"/> - </require> - </extension> - <extension name="VK_NV_clip_space_w_scaling" number="88" type="device" author="NV" contact="Eric Werness @ewerness" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_CLIP_SPACE_W_SCALING_SPEC_VERSION"/> - <enum value=""VK_NV_clip_space_w_scaling"" name="VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV"/> - <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV"/> - <type name="VkViewportWScalingNV"/> - <type name="VkPipelineViewportWScalingStateCreateInfoNV"/> - <command name="vkCmdSetViewportWScalingNV"/> - </require> - </extension> - <extension name="VK_EXT_direct_mode_display" number="89" type="instance" requires="VK_KHR_display" author="NVIDIA" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_DIRECT_MODE_DISPLAY_SPEC_VERSION"/> - <enum value=""VK_EXT_direct_mode_display"" name="VK_EXT_DIRECT_MODE_DISPLAY_EXTENSION_NAME"/> - <command name="vkReleaseDisplayEXT"/> - </require> - </extension> - <extension name="VK_EXT_acquire_xlib_display" number="90" type="instance" requires="VK_EXT_direct_mode_display,VK_KHR_display" author="NVIDIA" contact="James Jones @cubanismo" protect="VK_USE_PLATFORM_XLIB_XRANDR_EXT" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION"/> - <enum value=""VK_EXT_acquire_xlib_display"" name="VK_EXT_ACQUIRE_XLIB_DISPLAY_EXTENSION_NAME"/> - <command name="vkAcquireXlibDisplayEXT"/> - <command name="vkGetRandROutputDisplayEXT"/> - </require> - </extension> - <extension name="VK_EXT_display_surface_counter" number="91" type="instance" requires="VK_KHR_display" author="NVIDIA" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_DISPLAY_SURFACE_COUNTER_SPEC_VERSION"/> - <enum value=""VK_EXT_display_surface_counter"" name="VK_EXT_DISPLAY_SURFACE_COUNTER_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT"/> - <type name="VkSurfaceCounterFlagsEXT"/> - <type name="VkSurfaceCounterFlagBitsEXT"/> - <type name="VkSurfaceCapabilities2EXT"/> - <command name="vkGetPhysicalDeviceSurfaceCapabilities2EXT"/> - </require> - </extension> - <extension name="VK_EXT_display_control" number="92" type="device" requires="VK_KHR_display,VK_EXT_display_surface_counter,VK_KHR_swapchain" author="NVIDIA" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_DISPLAY_CONTROL_SPEC_VERSION"/> - <enum value=""VK_EXT_display_control"" name="VK_EXT_DISPLAY_CONTROL_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_POWER_INFO_EXT"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DEVICE_EVENT_INFO_EXT"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT"/> - <enum offset="3" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT"/> - <type name="VkDisplayPowerStateEXT"/> - <type name="VkDeviceEventTypeEXT"/> - <type name="VkDisplayEventTypeEXT"/> - <type name="VkDisplayPowerInfoEXT"/> - <type name="VkDeviceEventInfoEXT"/> - <type name="VkDisplayEventInfoEXT"/> - <type name="VkSwapchainCounterCreateInfoEXT"/> - <command name="vkDisplayPowerControlEXT"/> - <command name="vkRegisterDeviceEventEXT"/> - <command name="vkRegisterDisplayEventEXT"/> - <command name="vkGetSwapchainCounterEXT"/> - </require> - </extension> - <extension name="VK_GOOGLE_display_timing" number="93" type="device" author="GOOGLE" requires="VK_KHR_swapchain" contact="Ian Elliott ianelliott(a)google.com" supported="vulkan"> - <require> - <enum value="1" name="VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION"/> - <enum value=""VK_GOOGLE_display_timing"" name="VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE"/> - <type name="VkRefreshCycleDurationGOOGLE"/> - <type name="VkPastPresentationTimingGOOGLE"/> - <type name="VkPresentTimesInfoGOOGLE"/> - <type name="VkPresentTimeGOOGLE"/> - <command name="vkGetRefreshCycleDurationGOOGLE"/> - <command name="vkGetPastPresentationTimingGOOGLE"/> - </require> - </extension> - <extension name="VK_KHR_extension_94" number="94" author="Codeplay" contact="Neil Henning @neil_henning" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_94_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_94"" name="VK_KHR_EXTENSION_94_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_sample_mask_override_coverage" number="95" type="device" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION"/> - <enum value=""VK_NV_sample_mask_override_coverage"" name="VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_geometry_shader_passthrough" number="96" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_GEOMETRY_SHADER_PASSTHROUGH_SPEC_VERSION"/> - <enum value=""VK_NV_geometry_shader_passthrough"" name="VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_viewport_array2" number="97" type="device" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION"/> - <enum value=""VK_NV_viewport_array2"" name="VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NVX_multiview_per_view_attributes" number="98" type="device" author="NVIDIA" contact="Jeff Bolz @jbolz" supported="vulkan"> - <require> - <enum value="1" name="VK_NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_SPEC_VERSION"/> - <enum value=""VK_NVX_multiview_per_view_attributes"" name="VK_NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX"/> - <enum bitpos="0" extends="VkSubpassDescriptionFlagBits" name="VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX"/> - <enum bitpos="1" extends="VkSubpassDescriptionFlagBits" name="VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX"/> - <type name="VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX"/> - </require> - </extension> - <extension name="VK_NV_viewport_swizzle" number="99" type="device" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> - <require> - <enum value="1" name="VK_NV_VIEWPORT_SWIZZLE_SPEC_VERSION"/> - <enum value=""VK_NV_viewport_swizzle"" name="VK_NV_VIEWPORT_SWIZZLE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV"/> - <type name="VkViewportSwizzleNV"/> - <type name="VkViewportCoordinateSwizzleNV"/> - <type name="VkPipelineViewportSwizzleStateCreateInfoNV"/> - <type name="VkPipelineViewportSwizzleStateCreateFlagsNV"/> - </require> - </extension> - <extension name="VK_EXT_discard_rectangles" number="100" type="device" requires="VK_KHR_get_physical_device_properties2" author="NVIDIA" contact="Piers Daniell @pdaniell" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION"/> - <enum value=""VK_EXT_discard_rectangles"" name="VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT"/> - <enum offset="0" extends="VkDynamicState" name="VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT"/> - <type name="VkPhysicalDeviceDiscardRectanglePropertiesEXT"/> - <type name="VkPipelineDiscardRectangleStateCreateInfoEXT"/> - <type name="VkPipelineDiscardRectangleStateCreateFlagsEXT"/> - <type name="VkDiscardRectangleModeEXT"/> - <command name="vkCmdSetDiscardRectangleEXT"/> - </require> - </extension> - <extension name="VK_NV_extension_101" number="101" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_101_SPEC_VERSION"/> - <enum value=""VK_NV_extension_101"" name="VK_NV_EXTENSION_101_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_102" number="102" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_102_SPEC_VERSION"/> - <enum value=""VK_NV_extension_102"" name="VK_NV_EXTENSION_102_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_103" number="103" author="NVIDIA" contact="Daniel Koch @dgkoch" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_103_SPEC_VERSION"/> - <enum value=""VK_NV_extension_103"" name="VK_NV_EXTENSION_103_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_104" number="104" author="NVIDIA" contact="Mathias Schott @mschott" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_104_SPEC_VERSION"/> - <enum value=""VK_NV_extension_104"" name="VK_NV_EXTENSION_104_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_swapchain_colorspace" number="105" type="instance" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtneygo" requires="VK_KHR_surface" supported="vulkan"> - <require> - <enum value="2" name="VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION"/> - <enum value=""VK_EXT_swapchain_colorspace"" name="VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME"/> - <enum offset="1" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT"/> - <enum offset="2" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT"/> - <enum offset="3" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DCI_P3_LINEAR_EXT"/> - <enum offset="4" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT"/> - <enum offset="5" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT709_LINEAR_EXT"/> - <enum offset="6" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT709_NONLINEAR_EXT"/> - <enum offset="7" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_BT2020_LINEAR_EXT"/> - <enum offset="8" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_HDR10_ST2084_EXT"/> - <enum offset="9" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_DOLBYVISION_EXT"/> - <enum offset="10" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_HDR10_HLG_EXT"/> - <enum offset="11" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT"/> - <enum offset="12" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT"/> - <enum offset="13" extends="VkColorSpaceKHR" name="VK_COLOR_SPACE_PASS_THROUGH_EXT"/> - </require> - </extension> - <extension name="VK_EXT_hdr_metadata" number="106" type="device" author="GOOGLE" contact="Courtney Goeltzenleuchter @courtneygo" supported="vulkan"> - <require> - <enum value="1" name="VK_EXT_HDR_METADATA_SPEC_VERSION"/> - <enum value=""VK_EXT_hdr_metadata"" name="VK_EXT_HDR_METADATA_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_HDR_METADATA_EXT"/> - <type name="VkHdrMetadataEXT"/> - <type name="VkXYColorEXT"/> - <command name="vkSetHdrMetadataEXT"/> - </require> - </extension> - <extension name="VK_IMG_extension_107" number="107" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_IMG_EXTENSION_107_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_107"" name="VK_IMG_EXTENSION_107_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_IMG_extension_108" number="108" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_IMG_EXTENSION_108_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_108"" name="VK_IMG_EXTENSION_108_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_IMG_extension_109" number="109" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_IMG_EXTENSION_109_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_109"" name="VK_IMG_EXTENSION_109_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_IMG_extension_110" number="110" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_IMG_EXTENSION_110_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_110"" name="VK_IMG_EXTENSION_110_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_IMG_extension_111" number="111" author="IMG" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_IMG_EXTENSION_111_SPEC_VERSION"/> - <enum value=""VK_IMG_extension_111"" name="VK_IMG_EXTENSION_111_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_shared_presentable_image" number="112" type="device" requires="VK_KHR_surface,VK_KHR_swapchain,VK_KHR_get_physical_device_properties2,VK_KHR_get_surface_capabilities2" author="KHR" contact="Alon Or-bach @alonorbach" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION"/> - <enum value=""VK_KHR_shared_presentable_image"" name="VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR"/> - <enum offset="0" extends="VkPresentModeKHR" name="VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR"/> - <enum offset="1" extends="VkPresentModeKHR" name="VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR"/> - <enum offset="0" extends="VkImageLayout" name="VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR"/> - <type name="VkSharedPresentSurfaceCapabilitiesKHR"/> - <command name="vkGetSwapchainStatusKHR"/> - </require> - </extension> - <extension name="VK_KHR_extension_113" number="113" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_113_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_113"" name="VK_KHR_EXTENSION_113_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_114" number="114" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_114_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_114"" name="VK_KHR_EXTENSION_114_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_115" number="115" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_115_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_115"" name="VK_KHR_EXTENSION_115_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_116" number="116" author="KHX" contact="Cass Everitt @casseveritt" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_116_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_116"" name="VK_KHR_EXTENSION_116_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_117" number="117" author="KHR" contact="Kenneth Benzie @kbenzie" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_117_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_117"" name="VK_KHR_EXTENSION_117_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_118" number="118" author="KHR" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_118_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_118"" name="VK_KHR_EXTENSION_118_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_119" number="119" author="KHR" contact="Michael Worcester @michaelworcester" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_119_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_119"" name="VK_KHR_EXTENSION_119_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_get_surface_capabilities2" number="120" type="instance" requires="VK_KHR_surface" author="KHR" contact="James Jones @cubanismo" supported="vulkan"> - <require> - <enum value="1" name="VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION"/> - <enum value=""VK_KHR_get_surface_capabilities2"" name="VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR"/> - <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR"/> - <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR"/> - <type name="VkPhysicalDeviceSurfaceInfo2KHR"/> - <type name="VkSurfaceCapabilities2KHR"/> - <type name="VkSurfaceFormat2KHR"/> - <command name="vkGetPhysicalDeviceSurfaceCapabilities2KHR"/> - <command name="vkGetPhysicalDeviceSurfaceFormats2KHR"/> - </require> - </extension> - <extension name="VK_KHR_variable_pointers" number="121" author="KHR" contact="John Kessenich @johnk" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_variable_pointers_SPEC_VERSION"/> - <enum value=""VK_KHR_variable_pointers"" name="VK_KHR_variable_pointers_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_122" number="122" author="KHR" contact="James Jones @cubanismo" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_122_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_122"" name="VK_KHR_EXTENSION_122_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_MVK_ios_surface" number="123" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_IOS_MVK" supported="vulkan" author="MVK" contact="Bill Hollings @billhollings"> - <require> - <enum value="2" name="VK_MVK_IOS_SURFACE_SPEC_VERSION"/> - <enum value=""VK_MVK_ios_surface"" name="VK_MVK_IOS_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK"/> - <type name="VkIOSSurfaceCreateFlagsMVK"/> - <type name="VkIOSSurfaceCreateInfoMVK"/> - <command name="vkCreateIOSSurfaceMVK"/> - </require> - </extension> - <extension name="VK_MVK_macos_surface" number="124" type="instance" requires="VK_KHR_surface" protect="VK_USE_PLATFORM_MACOS_MVK" supported="vulkan" author="MVK" contact="Bill Hollings @billhollings"> - <require> - <enum value="2" name="VK_MVK_MACOS_SURFACE_SPEC_VERSION"/> - <enum value=""VK_MVK_macos_surface"" name="VK_MVK_MACOS_SURFACE_EXTENSION_NAME"/> - <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK"/> - <type name="VkMacOSSurfaceCreateFlagsMVK"/> - <type name="VkMacOSSurfaceCreateInfoMVK"/> - <command name="vkCreateMacOSSurfaceMVK"/> - </require> - </extension> - <extension name="VK_MVK_moltenvk" number="125" type="instance" author="MVK" contact="Bill Hollings @billhollings" supported="disabled"> - <require> - <enum value="0" name="VK_MVK_MOLTENVK_SPEC_VERSION"/> - <enum value=""VK_MVK_moltenvk"" name="VK_MVK_MOLTENVK_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_MESA_extension_126" number="126" author="MESA" contact="Chad Versace @chadversary" supported="disabled"> - <require> - <enum value="0" name="VK_MESA_EXTENSION_126_SPEC_VERSION"/> - <enum value=""VK_MESA_extension_126"" name="VK_MESA_EXTENSION_126_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_MESA_extension_127" number="127" author="MESA" contact="Chad Versace @chadversary" supported="disabled"> - <require> - <enum value="0" name="VK_MESA_EXTENSION_127_SPEC_VERSION"/> - <enum value=""VK_MESA_extension_127"" name="VK_MESA_EXTENSION_127_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_128" number="128" author="KHR" contact="James Jones @cubanismo" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_128_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_128"" name="VK_KHR_EXTENSION_128_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_extension_129" number="129" author="LUNARG" contact="Mark Young @MarkY_LunarG" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_129_SPEC_VERSION"/> - <enum value=""VK_EXT_extension_129"" name="VK_KHR_EXTENSION_129_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_130" number="130" author="KHR" contact="Jesse Hall @jessehall" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_130_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_130"" name="VK_KHR_EXTENSION_130_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_131" number="131" author="KHR" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_131_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_131"" name="VK_KHR_EXTENSION_131_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_132" number="132" author="KHR" contact="Jan-Harald Fredriksen @janharald" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_132_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_132"" name="VK_KHR_EXTENSION_132_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_133" number="133" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_133_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_133"" name="VK_AMD_EXTENSION_133_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_134" number="134" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_134_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_134"" name="VK_AMD_EXTENSION_134_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_135" number="135" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_135_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_135"" name="VK_AMD_EXTENSION_135_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_136" number="136" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_136_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_136"" name="VK_AMD_EXTENSION_136_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_137" number="137" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_137_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_137"" name="VK_AMD_EXTENSION_137_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_138" number="138" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_138_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_138"" name="VK_AMD_EXTENSION_138_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_139" number="139" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_139_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_139"" name="VK_AMD_EXTENSION_139_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_140" number="140" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_140_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_140"" name="VK_AMD_EXTENSION_140_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_141" number="141" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_141_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_141"" name="VK_AMD_EXTENSION_141_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_142" number="142" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_142_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_142"" name="VK_AMD_EXTENSION_142_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_143" number="143" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_143_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_143"" name="VK_AMD_EXTENSION_143_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_AMD_extension_144" number="144" author="AMD" contact="Mais Alnasser @malnasse" supported="disabled"> - <require> - <enum value="0" name="VK_AMD_EXTENSION_144_SPEC_VERSION"/> - <enum value=""VK_AMD_extension_144"" name="VK_AMD_EXTENSION_144_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_relaxed_block_layout" number="145" author="KHR" contact="John Kessenich @johnk" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_relaxed_block_layout_SPEC_VERSION"/> - <enum value=""VK_KHR_relaxed_block_layout"" name="VK_KHR_relaxed_block_layout_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_146" number="146" author="KHR" contact="Bill Licea-Kane @billl" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_extension_146_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_146"" name="VK_KHR_extension_146_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_147" number="147" author="KHR" contact="Jason Ekstrand @jekstrand" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_extension_147_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_147"" name="VK_KHR_extension_147_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_extension_148" number="148" author="EXT" contact="Jason Ekstrand @jekstrand" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_148_SPEC_VERSION"/> - <enum value=""VK_EXT_extension_148"" name="VK_KHR_EXTENSION_148_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_149" number="149" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_149_SPEC_VERSION"/> - <enum value=""VK_NV_extension_149"" name="VK_NV_EXTENSION_149_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_150" number="150" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_150_SPEC_VERSION"/> - <enum value=""VK_NV_extension_150"" name="VK_NV_EXTENSION_150_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_151" number="151" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_151_SPEC_VERSION"/> - <enum value=""VK_NV_extension_151"" name="VK_NV_EXTENSION_151_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_152" number="152" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_152_SPEC_VERSION"/> - <enum value=""VK_NV_extension_152"" name="VK_NV_EXTENSION_152_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_153" number="153" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_153_SPEC_VERSION"/> - <enum value=""VK_NV_extension_153"" name="VK_NV_EXTENSION_153_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_154" number="154" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_154_SPEC_VERSION"/> - <enum value=""VK_NV_extension_154"" name="VK_NV_EXTENSION_154_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_155" number="155" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_155_SPEC_VERSION"/> - <enum value=""VK_NV_extension_155"" name="VK_NV_EXTENSION_155_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_NV_extension_156" number="156" author="NV" contact="Jeff Bolz @jbolz" supported="disabled"> - <require> - <enum value="0" name="VK_NV_EXTENSION_156_SPEC_VERSION"/> - <enum value=""VK_NV_extension_156"" name="VK_NV_EXTENSION_156_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_157" number="157" author="KHR" contact="Andrew Garrard @fluppeteer" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_157_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_157"" name="VK_KHR_EXTENSION_157_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_KHR_extension_158" number="158" author="KHR" contact="Tobias Hector @tobias" supported="disabled"> - <require> - <enum value="0" name="VK_KHR_EXTENSION_158_SPEC_VERSION"/> - <enum value=""VK_KHR_extension_158"" name="VK_KHR_EXTENSION_158_EXTENSION_NAME"/> - </require> - </extension> - <extension name="VK_EXT_extension_159" number="159" author="EXT" contact="Chad Versace @chadversary" supported="disabled"> - <require> - <enum value="0" name="VK_EXT_EXTENSION_159_SPEC_VERSION"/> - <enum value=""VK_EXT_extension_159"" name="VK_EXT_EXTENSION_159_EXTENSION_NAME"/> - </require> - </extension> - </extensions> -</registry> -- 2.16.4

1 1

[PATCH 2/2] schedsvc: Add support for running tasks at specified time.
by Dmitry Timoshkov 06 Jun '18

06 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 263 +++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 2 + dlls/schedsvc/svc_main.c | 35 +++++- 3 files changed, 296 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 8f6cf03936..91ef3edca0 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "atsvc.h" #include "mstask.h" @@ -90,6 +91,235 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; +static void filetime_add_ms(FILETIME *ft, LONGLONG ms) +{ + union u_ftll + { + FILETIME ft; + LONGLONG ll; + } *ftll = (union u_ftll *)ft; + + ftll->ll += ms * (ULONGLONG)10000; +} + +static void filetime_add_minutes(FILETIME *ft, LONG minutes) +{ + filetime_add_ms(ft, (LONGLONG)minutes * 60 * 1000); +} + +static void filetime_add_hours(FILETIME *ft, LONG hours) +{ + filetime_add_minutes(ft, (LONGLONG)hours * 60); +} + +static void filetime_add_days(FILETIME *ft, LONG days) +{ + filetime_add_hours(ft, (LONGLONG)days * 24); +} + +static void filetime_add_weeks(FILETIME *ft, ULONG weeks) +{ + filetime_add_days(ft, (LONGLONG)weeks * 7); +} + +static void get_begin_time(const TASK_TRIGGER *trigger, FILETIME *ft) +{ + SYSTEMTIME st; + + st.wYear = trigger->wBeginYear; + st.wMonth = trigger->wBeginMonth; + st.wDay = trigger->wBeginDay; + st.wDayOfWeek = 0; + st.wHour = 0; + st.wMinute = 0; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, ft); +} + +static void get_end_time(const TASK_TRIGGER *trigger, FILETIME *ft) +{ + SYSTEMTIME st; + + if (!(trigger->rgFlags & TASK_TRIGGER_FLAG_HAS_END_DATE)) + { + ft->dwHighDateTime = ~0u; + ft->dwLowDateTime = ~0u; + return; + } + + st.wYear = trigger->wEndYear; + st.wMonth = trigger->wEndMonth; + st.wDay = trigger->wEndDay; + st.wDayOfWeek = 0; + st.wHour = 0; + st.wMinute = 0; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, ft); +} + +static BOOL trigger_get_next_runtime(const TASK_TRIGGER *trigger, const FILETIME *current_ft, FILETIME *rt) +{ + SYSTEMTIME st, current_st; + FILETIME begin_ft, end_ft, trigger_ft; + + if (trigger->rgFlags & TASK_TRIGGER_FLAG_DISABLED) + return FALSE; + + FileTimeToSystemTime(current_ft, &current_st); + + get_begin_time(trigger, &begin_ft); + get_end_time(trigger, &end_ft); + + switch (trigger->TriggerType) + { + case TASK_EVENT_TRIGGER_ON_IDLE: + case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: + case TASK_EVENT_TRIGGER_AT_LOGON: + return FALSE; + + case TASK_TIME_TRIGGER_ONCE: + st = current_st; + st.wHour = trigger->wStartHour; + st.wMinute = trigger->wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &trigger_ft); + if (CompareFileTime(&begin_ft, &trigger_ft) <= 0 && CompareFileTime(&trigger_ft, &end_ft) < 0) + { + *rt = trigger_ft; + return TRUE; + } + break; + + case TASK_TIME_TRIGGER_DAILY: + st = current_st; + st.wHour = trigger->wStartHour; + st.wMinute = trigger->wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &trigger_ft); + while (CompareFileTime(&trigger_ft, &end_ft) < 0) + { + if (CompareFileTime(&trigger_ft, &begin_ft) >= 0) + { + *rt = trigger_ft; + return TRUE; + } + + filetime_add_days(&trigger_ft, trigger->Type.Daily.DaysInterval); + } + break; + + case TASK_TIME_TRIGGER_WEEKLY: + if (!trigger->Type.Weekly.rgfDaysOfTheWeek) + break; /* avoid infinite loop */ + + st = current_st; + st.wHour = trigger->wStartHour; + st.wMinute = trigger->wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &trigger_ft); + while (CompareFileTime(&trigger_ft, &end_ft) < 0) + { + FileTimeToSystemTime(&trigger_ft, &st); + + if (CompareFileTime(&trigger_ft, &begin_ft) >= 0) + { + if (trigger->Type.Weekly.rgfDaysOfTheWeek & (1 << st.wDayOfWeek)) + { + *rt = trigger_ft; + return TRUE; + } + } + + if (st.wDayOfWeek == 0 && trigger->Type.Weekly.WeeksInterval > 1) /* Sunday, goto next week */ + filetime_add_weeks(&trigger_ft, trigger->Type.Weekly.WeeksInterval - 1); + else /* check next weekday */ + filetime_add_days(&trigger_ft, 1); + } + break; + + default: + FIXME("trigger type %u is not handled\n", trigger->TriggerType); + break; + } + + return FALSE; +} + +static BOOL job_get_next_runtime(struct job_t *job, FILETIME *current_ft, FILETIME *next_rt) +{ + FILETIME trigger_rt; + BOOL have_next_rt = FALSE; + USHORT i; + + for (i = 0; i < job->trigger_count; i++) + { + if (trigger_get_next_runtime(&job->trigger[i], current_ft, &trigger_rt)) + { + if (!have_next_rt || CompareFileTime(&trigger_rt, next_rt) < 0) + { + *next_rt = trigger_rt; + have_next_rt = TRUE; + } + } + } + + return have_next_rt; +} + +/* Returns next runtime in UTC */ +BOOL get_next_runtime(LARGE_INTEGER *rt) +{ + FILETIME current_ft, job_rt, next_job_rt; + BOOL have_next_rt = FALSE; + struct job_t *job; + + GetSystemTimeAsFileTime(&current_ft); + FileTimeToLocalFileTime(&current_ft, &current_ft); + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (job_get_next_runtime(job, &current_ft, &job_rt)) + { + if (!have_next_rt || CompareFileTime(&job_rt, &next_job_rt) < 0) + { + next_job_rt = job_rt; + have_next_rt = TRUE; + } + } + } + + LeaveCriticalSection(&at_job_list_section); + + if (have_next_rt) + { + LocalFileTimeToFileTime(&next_job_rt, &next_job_rt); + rt->u.LowPart = next_job_rt.dwLowDateTime; + rt->u.HighPart = next_job_rt.dwHighDateTime; + } + + return have_next_rt; +} + +static BOOL job_runs_at(struct job_t *job, FILETIME *begin_ft, FILETIME *end_ft) +{ + FILETIME job_ft; + + if (job_get_next_runtime(job, begin_ft, &job_ft)) + { + if (CompareFileTime(&job_ft, end_ft) < 0) + return TRUE; + } + + return FALSE; +} + static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *job) { DWORD i, data_size = 0; @@ -729,6 +959,39 @@ void check_task_state(void) LeaveCriticalSection(&at_job_list_section); } +static void run_job(struct job_t *job) +{ + job->data.flags |= 0x04000000; + update_job_status(job); +} + +void check_task_time(void) +{ + FILETIME current_ft, begin_ft, end_ft; + struct job_t *job; + + GetSystemTimeAsFileTime(&current_ft); + FileTimeToLocalFileTime(&current_ft, &current_ft); + + /* Give -1/+1 minute margin */ + begin_ft = current_ft; + filetime_add_minutes(&begin_ft, -1); + end_ft = current_ft; + filetime_add_minutes(&end_ft, 1); + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (job_runs_at(job, &begin_ft, &end_ft)) + { + run_job(job); + } + } + + LeaveCriticalSection(&at_job_list_section); +} + void remove_job(const WCHAR *name) { struct job_t *job; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index f5cec2a7cb..d601030e78 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -28,6 +28,8 @@ void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; void check_task_state(void) DECLSPEC_HIDDEN; void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; void update_process_status(DWORD pid) DECLSPEC_HIDDEN; +BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; +void check_task_time(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 2298926193..0dfac818fd 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -46,12 +46,20 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) { static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; WCHAR path[MAX_PATH]; - HANDLE htasks, hport; + HANDLE htasks, hport, htimer; JOBOBJECT_ASSOCIATE_COMPLETION_PORT info; OVERLAPPED ov; + LARGE_INTEGER period; TRACE("Starting...\n"); + htimer = CreateWaitableTimerW(NULL, FALSE, NULL); + if (htimer == NULL) + { + ERR("CreateWaitableTimer failed\n"); + return -1; + } + GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); @@ -98,7 +106,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FILE_NOTIFY_INFORMATION data; WCHAR name_buffer[MAX_PATH]; } info; - HANDLE events[3]; + HANDLE events[4]; DWORD ret; /* the buffer must be DWORD aligned */ @@ -115,12 +123,22 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FIXME("got multiple entries\n"); events[0] = done_event; - events[1] = ov.hEvent; + events[1] = htimer; events[2] = hport; + events[3] = ov.hEvent; - ret = WaitForMultipleObjects(3, events, FALSE, INFINITE); + ret = WaitForMultipleObjects(4, events, FALSE, INFINITE); + /* Done event */ if (ret == WAIT_OBJECT_0) break; + /* Next runtime timer */ + if (ret == WAIT_OBJECT_0 + 1) + { + check_task_time(); + continue; + } + + /* Job queue */ if (ret == WAIT_OBJECT_0 + 2) { DWORD msg; @@ -139,6 +157,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) continue; } + /* Directory change notification */ info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; switch (info.data.Action) @@ -176,8 +195,16 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) } check_task_state(); + + if (get_next_runtime(&period)) + { + if (!SetWaitableTimer(htimer, &period, 0, NULL, NULL, FALSE)) + ERR("SetWaitableTimer failed\n"); + } } + CancelWaitableTimer(htimer); + CloseHandle(htimer); CloseHandle(ov.hEvent); CloseHandle(hport); CloseHandle(hjob_queue); -- 2.16.3

1 0

[PATCH 1/2] schedsvc: Read triggers when loading a job file.
by Dmitry Timoshkov 06 Jun '18

06 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 61 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 9497c900a7..8f6cf03936 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -64,6 +64,8 @@ struct job_t AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; + USHORT trigger_count; + TASK_TRIGGER *trigger; }; struct running_job_t @@ -143,7 +145,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT triggers_count, i; + USHORT i; const USHORT *signature; const TASK_TRIGGER *trigger; @@ -202,11 +204,10 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("no space for triggers count\n"); return FALSE; } - triggers_count = *(const USHORT *)(data + fixed->trigger_offset); - TRACE("triggers_count %u\n", triggers_count); + info->trigger_count = *(const USHORT *)(data + fixed->trigger_offset); + TRACE("trigger_count %u\n", info->trigger_count); triggers_size = size - fixed->trigger_offset - sizeof(USHORT); TRACE("triggers_size %u\n", triggers_size); - trigger = (const TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); data += fixed->name_size_offset + unicode_strings_size; size -= fixed->name_size_offset + unicode_strings_size; @@ -249,42 +250,51 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) /* Trigger Data */ TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER))); + (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); - triggers_count = *(const USHORT *)data; - TRACE("triggers_count %u\n", triggers_count); + info->trigger_count = *(const USHORT *)data; + TRACE("trigger_count %u\n", info->trigger_count); trigger = (const TASK_TRIGGER *)(data + sizeof(USHORT)); - if (triggers_count * sizeof(TASK_TRIGGER) > triggers_size) + if (info->trigger_count * sizeof(TASK_TRIGGER) > triggers_size) { TRACE("no space for triggers data\n"); return FALSE; } - for (i = 0; i < triggers_count; i++) + info->trigger = heap_alloc(info->trigger_count * sizeof(info->trigger[0])); + if (!info->trigger) + { + TRACE("not enough memory for trigger data\n"); + return FALSE; + } + + for (i = 0; i < info->trigger_count; i++) { TRACE("%u: cbTriggerSize = %#x\n", i, trigger[i].cbTriggerSize); if (trigger[i].cbTriggerSize != sizeof(TASK_TRIGGER)) TRACE("invalid cbTriggerSize\n"); TRACE("Reserved1 = %#x\n", trigger[i].Reserved1); - TRACE("wBeginYear = %u\n", trigger->wBeginYear); - TRACE("wBeginMonth = %u\n", trigger->wBeginMonth); - TRACE("wBeginDay = %u\n", trigger->wBeginDay); - TRACE("wEndYear = %u\n", trigger->wEndYear); - TRACE("wEndMonth = %u\n", trigger->wEndMonth); - TRACE("wEndDay = %u\n", trigger->wEndDay); - TRACE("wStartHour = %u\n", trigger->wStartHour); - TRACE("wStartMinute = %u\n", trigger->wStartMinute); - TRACE("MinutesDuration = %u\n", trigger->MinutesDuration); - TRACE("MinutesInterval = %u\n", trigger->MinutesInterval); - TRACE("rgFlags = %u\n", trigger->rgFlags); - TRACE("TriggerType = %u\n", trigger->TriggerType); - TRACE("Reserved2 = %u\n", trigger->Reserved2); - TRACE("wRandomMinutesInterval = %u\n", trigger->wRandomMinutesInterval); + TRACE("wBeginYear = %u\n", trigger[i].wBeginYear); + TRACE("wBeginMonth = %u\n", trigger[i].wBeginMonth); + TRACE("wBeginDay = %u\n", trigger[i].wBeginDay); + TRACE("wEndYear = %u\n", trigger[i].wEndYear); + TRACE("wEndMonth = %u\n", trigger[i].wEndMonth); + TRACE("wEndDay = %u\n", trigger[i].wEndDay); + TRACE("wStartHour = %u\n", trigger[i].wStartHour); + TRACE("wStartMinute = %u\n", trigger[i].wStartMinute); + TRACE("MinutesDuration = %u\n", trigger[i].MinutesDuration); + TRACE("MinutesInterval = %u\n", trigger[i].MinutesInterval); + TRACE("rgFlags = %u\n", trigger[i].rgFlags); + TRACE("TriggerType = %u\n", trigger[i].TriggerType); + TRACE("Reserved2 = %u\n", trigger[i].Reserved2); + TRACE("wRandomMinutesInterval = %u\n", trigger[i].wRandomMinutesInterval); + + info->trigger[i] = trigger[i]; } - size -= sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); - data += sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); + size -= sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER); if (size < 2 * sizeof(USHORT) + 64) { @@ -353,6 +363,7 @@ static void free_job(struct job_t *job) heap_free(job->name); heap_free(job->params); heap_free(job->curdir); + heap_free(job->trigger); heap_free(job); } -- 2.16.3

1 0

[PATCH] netapi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netapi32/tests/access.c | 8 ++++---- dlls/netapi32/tests/wksta.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f095d77320..a284b65401 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -74,7 +74,7 @@ static BOOL init_access_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name)/sizeof(WCHAR); + dwSize = ARRAY_SIZE(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { @@ -84,7 +84,7 @@ static BOOL init_access_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name)/sizeof(WCHAR); + dwSize = ARRAY_SIZE(computer_name); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return TRUE; } @@ -521,7 +521,7 @@ static void test_DavGetHTTPFromUNCPath(void) ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); ok( size == 12, "got %u\n", size ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { buf[0] = 0; size = tests[i].size; @@ -685,7 +685,7 @@ static void test_DavGetUNCFromHTTPPath(void) ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); ok( size == 25, "got %u\n", size ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { buf[0] = 0; size = tests[i].size; diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 418a1ad626..ba4a7f9aa0 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -50,7 +50,7 @@ static BOOL init_wksta_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name)/sizeof(user_name[0]); + dwSize = ARRAY_SIZE(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); @@ -59,7 +59,7 @@ static BOOL init_wksta_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name)/sizeof(computer_name[0]); + dwSize = ARRAY_SIZE(computer_name); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return TRUE; } -- 2.14.4

1 0

[PATCH] msvfw32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/tests/drawdib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 0a59d82621..92e60df264 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -138,7 +138,7 @@ static void test_DrawDib_sizeimage(void) hdd = DrawDibOpen(); ok(hdd != NULL, "DrawDibOpen failed\n"); - for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) { + for (i = 0; i < ARRAY_SIZE(test_data); i++) { char *hash; memset(dst_bits, 0xff, dst_dib_size); init_bmi(&src_info, test_data[i].width, test_data[i].height, test_data[i].size); -- 2.14.4

1 0

[PATCH] credui/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/credui/tests/credui.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 01d657d580..13fbd41c07 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -58,20 +58,20 @@ static void test_CredUIPromptForCredentials(void) username[0] = '\0'; password[0] = '\0'; ret = CredUIPromptForCredentialsW(NULL, NULL, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI); ok(ret == ERROR_INVALID_FLAGS, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret); ret = CredUIPromptForCredentialsW(NULL, NULL, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS); ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX); ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); @@ -86,8 +86,8 @@ static void test_CredUIPromptForCredentials(void) 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) @@ -97,10 +97,9 @@ static void test_CredUIPromptForCredentials(void) } credui_info.pszCaptionText = wszCaption1; - ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, - ERROR_ACCESS_DENIED, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, ERROR_ACCESS_DENIED, + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) @@ -111,8 +110,8 @@ static void test_CredUIPromptForCredentials(void) credui_info.pszCaptionText = wszCaption2; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) @@ -125,8 +124,8 @@ static void test_CredUIPromptForCredentials(void) save = TRUE; credui_info.pszCaptionText = wszCaption3; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); ok(save, "save flag should have been untouched\n"); @@ -134,8 +133,8 @@ static void test_CredUIPromptForCredentials(void) save = FALSE; credui_info.pszCaptionText = wszCaption4; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); ok(!save, "save flag should have been untouched\n"); -- 2.14.4

1 0

[PATCH 2/2] d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[]
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The formatting of the array initialization was inconsistent. So I've made it consitent by placing the arrays and their size on one line. All lines are below < 120 chars in length. Initially I've tried to just stick to a line length of 100 or 120 but that made the data look ugly. To verify that the diff is a no-op I have added 77 empty lines as padding after the whole registerset_data array initialization. That produced the exact same object file as without this patch. dlls/d3dx9_36/tests/shader.c | 383 +++++++++++++++++-------------------------- 1 file changed, 153 insertions(+), 230 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c2b41cfdc7..1086e5e9d6 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5675,267 +5675,190 @@ static const struct registerset_data[] = { /* scalar */ - {"float", "f", 0, D3DXRS_FLOAT4, registerset_blob_scalar, registerset_test_scalar_float, - sizeof(registerset_test_scalar_float) / sizeof(*registerset_test_scalar_float), - registerset_constants_scalar_float, - sizeof(registerset_constants_scalar_float) / sizeof(*registerset_constants_scalar_float)}, - {"int", "n", 0, D3DXRS_INT4, registerset_blob_scalar, registerset_test_scalar_int, - sizeof(registerset_test_scalar_int) / sizeof(*registerset_test_scalar_int), - registerset_constants_scalar_int, - sizeof(registerset_constants_scalar_int) / sizeof(*registerset_constants_scalar_int)}, - {"int float", "nf", 4, D3DXRS_FLOAT4, registerset_blob_scalar, registerset_test_scalar_int_float, - sizeof(registerset_test_scalar_int_float) / sizeof(*registerset_test_scalar_int_float), - registerset_constants_scalar_int_float, - sizeof(registerset_constants_scalar_int_float) / sizeof(*registerset_constants_scalar_int_float)}, - {"bool float", "bf", 8, D3DXRS_FLOAT4, registerset_blob_scalar, registerset_test_scalar_bool_float, - sizeof(registerset_test_scalar_bool_float) / sizeof(*registerset_test_scalar_bool_float), - registerset_constants_scalar_bool_float, - sizeof(registerset_constants_scalar_bool_float) / sizeof(*registerset_constants_scalar_bool_float)}, - {"bool", "b", 0, D3DXRS_BOOL, registerset_blob_scalar, registerset_test_scalar_bool, - sizeof(registerset_test_scalar_bool) / sizeof(*registerset_test_scalar_bool), - registerset_constants_scalar_bool, - sizeof(registerset_constants_scalar_bool) / sizeof(*registerset_constants_scalar_bool)}, + {"float", "f", 0, D3DXRS_FLOAT4, registerset_blob_scalar, + registerset_test_scalar_float, ARRAY_SIZE(registerset_test_scalar_float), + registerset_constants_scalar_float, ARRAY_SIZE(registerset_constants_scalar_float)}, + {"int", "n", 0, D3DXRS_INT4, registerset_blob_scalar, + registerset_test_scalar_int, ARRAY_SIZE(registerset_test_scalar_int), + registerset_constants_scalar_int, ARRAY_SIZE(registerset_constants_scalar_int)}, + {"int float", "nf", 4, D3DXRS_FLOAT4, registerset_blob_scalar, + registerset_test_scalar_int_float, ARRAY_SIZE(registerset_test_scalar_int_float), + registerset_constants_scalar_int_float, ARRAY_SIZE(registerset_constants_scalar_int_float)}, + {"bool float", "bf", 8, D3DXRS_FLOAT4, registerset_blob_scalar, + registerset_test_scalar_bool_float, ARRAY_SIZE(registerset_test_scalar_bool_float), + registerset_constants_scalar_bool_float, ARRAY_SIZE(registerset_constants_scalar_bool_float)}, + {"bool", "b", 0, D3DXRS_BOOL, registerset_blob_scalar, + registerset_test_scalar_bool, ARRAY_SIZE(registerset_test_scalar_bool), + registerset_constants_scalar_bool, ARRAY_SIZE(registerset_constants_scalar_bool)}, /* scalar array */ - {"float [2]", "af", 0, D3DXRS_FLOAT4, registerset_blob_scalar_array, registerset_test_scalar_array_float, - sizeof(registerset_test_scalar_array_float) / sizeof(*registerset_test_scalar_array_float), - registerset_constants_scalar_array_float, - sizeof(registerset_constants_scalar_array_float) / sizeof(*registerset_constants_scalar_array_float)}, - {"int [2]", "an", 0, D3DXRS_INT4, registerset_blob_scalar_array, registerset_test_scalar_array_int, - sizeof(registerset_test_scalar_array_int) / sizeof(*registerset_test_scalar_array_int), - registerset_constants_scalar_array_int, - sizeof(registerset_constants_scalar_array_int) / sizeof(*registerset_constants_scalar_array_int)}, - {"bool [2]", "ab", 0, D3DXRS_BOOL, registerset_blob_scalar_array, registerset_test_scalar_array_bool, - sizeof(registerset_test_scalar_array_bool) / sizeof(*registerset_test_scalar_array_bool), - registerset_constants_scalar_array_bool, - sizeof(registerset_constants_scalar_array_bool) / sizeof(*registerset_constants_scalar_array_bool)}, + {"float [2]", "af", 0, D3DXRS_FLOAT4, registerset_blob_scalar_array, + registerset_test_scalar_array_float, ARRAY_SIZE(registerset_test_scalar_array_float), + registerset_constants_scalar_array_float, ARRAY_SIZE(registerset_constants_scalar_array_float)}, + {"int [2]", "an", 0, D3DXRS_INT4, registerset_blob_scalar_array, + registerset_test_scalar_array_int, ARRAY_SIZE(registerset_test_scalar_array_int), + registerset_constants_scalar_array_int, ARRAY_SIZE(registerset_constants_scalar_array_int)}, + {"bool [2]", "ab", 0, D3DXRS_BOOL, registerset_blob_scalar_array, + registerset_test_scalar_array_bool, ARRAY_SIZE(registerset_test_scalar_array_bool), + registerset_constants_scalar_array_bool, ARRAY_SIZE(registerset_constants_scalar_array_bool)}, {"int float [2]", "anf", 8, D3DXRS_FLOAT4, registerset_blob_scalar_array, - registerset_test_scalar_array_int_float, - sizeof(registerset_test_scalar_array_int_float) / sizeof(*registerset_test_scalar_array_int_float), - registerset_constants_scalar_array_int_float, - sizeof(registerset_constants_scalar_array_int_float) / sizeof(*registerset_constants_scalar_array_int_float)}, + registerset_test_scalar_array_int_float, ARRAY_SIZE(registerset_test_scalar_array_int_float), + registerset_constants_scalar_array_int_float, ARRAY_SIZE(registerset_constants_scalar_array_int_float)}, {"bool float [2]", "abf", 16, D3DXRS_FLOAT4, registerset_blob_scalar_array, - registerset_test_scalar_array_bool_float, - sizeof(registerset_test_scalar_array_bool_float) / sizeof(*registerset_test_scalar_array_bool_float), - registerset_constants_scalar_array_bool_float, - sizeof(registerset_constants_scalar_array_bool_float) / sizeof(*registerset_constants_scalar_array_bool_float)}, + registerset_test_scalar_array_bool_float, ARRAY_SIZE(registerset_test_scalar_array_bool_float), + registerset_constants_scalar_array_bool_float, ARRAY_SIZE(registerset_constants_scalar_array_bool_float)}, /* vector */ - {"float 3", "vf", 0, D3DXRS_FLOAT4, registerset_blob_vector, registerset_test_vector_float, - sizeof(registerset_test_vector_float) / sizeof(*registerset_test_vector_float), - registerset_constants_vector_float, - sizeof(registerset_constants_vector_float) / sizeof(*registerset_constants_vector_float)}, - {"int 3", "vn", 0, D3DXRS_INT4, registerset_blob_vector, registerset_test_vector_int, - sizeof(registerset_test_vector_int) / sizeof(*registerset_test_vector_int), - registerset_constants_vector_int, - sizeof(registerset_constants_vector_int) / sizeof(*registerset_constants_vector_int)}, - {"bool 3", "vb", 0, D3DXRS_BOOL, registerset_blob_vector, registerset_test_vector_bool, - sizeof(registerset_test_vector_bool) / sizeof(*registerset_test_vector_bool), - registerset_constants_vector_bool, - sizeof(registerset_constants_vector_bool) / sizeof(*registerset_constants_vector_bool)}, - {"bool float 3", "vbf", 8, D3DXRS_FLOAT4, registerset_blob_vector, registerset_test_vector_bool_float, - sizeof(registerset_test_vector_bool_float) / sizeof(*registerset_test_vector_bool_float), - registerset_constants_vector_bool_float, - sizeof(registerset_constants_vector_bool_float) / sizeof(*registerset_constants_vector_bool_float)}, - {"int float 3", "vnf", 4, D3DXRS_FLOAT4, registerset_blob_vector, registerset_test_vector_int_float, - sizeof(registerset_test_vector_int_float) / sizeof(*registerset_test_vector_int_float), - registerset_constants_vector_int_float, - sizeof(registerset_constants_vector_int_float) / sizeof(*registerset_constants_vector_int_float)}, + {"float 3", "vf", 0, D3DXRS_FLOAT4, registerset_blob_vector, + registerset_test_vector_float, ARRAY_SIZE(registerset_test_vector_float), + registerset_constants_vector_float, ARRAY_SIZE(registerset_constants_vector_float)}, + {"int 3", "vn", 0, D3DXRS_INT4, registerset_blob_vector, + registerset_test_vector_int, ARRAY_SIZE(registerset_test_vector_int), + registerset_constants_vector_int, ARRAY_SIZE(registerset_constants_vector_int)}, + {"bool 3", "vb", 0, D3DXRS_BOOL, registerset_blob_vector, + registerset_test_vector_bool, ARRAY_SIZE(registerset_test_vector_bool), + registerset_constants_vector_bool, ARRAY_SIZE(registerset_constants_vector_bool)}, + {"bool float 3", "vbf", 8, D3DXRS_FLOAT4, registerset_blob_vector, + registerset_test_vector_bool_float, ARRAY_SIZE(registerset_test_vector_bool_float), + registerset_constants_vector_bool_float, ARRAY_SIZE(registerset_constants_vector_bool_float)}, + {"int float 3", "vnf", 4, D3DXRS_FLOAT4, registerset_blob_vector, + registerset_test_vector_int_float, ARRAY_SIZE(registerset_test_vector_int_float), + registerset_constants_vector_int_float, ARRAY_SIZE(registerset_constants_vector_int_float)}, /* vector array */ - {"float 3 [2]", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_vector_array, registerset_test_vector_array_float, - sizeof(registerset_test_vector_array_float) / sizeof(*registerset_test_vector_array_float), - registerset_constants_vector_array_float, - sizeof(registerset_constants_vector_array_float) / sizeof(*registerset_constants_vector_array_float)}, - {"int 3 [2]", "van", 0, D3DXRS_INT4, registerset_blob_vector_array, registerset_test_vector_array_int, - sizeof(registerset_test_vector_array_int) / sizeof(*registerset_test_vector_array_int), - registerset_constants_vector_array_int, - sizeof(registerset_constants_vector_array_int) / sizeof(*registerset_constants_vector_array_int)}, - {"bool 3 [2]", "vab", 0, D3DXRS_BOOL, registerset_blob_vector_array, registerset_test_vector_array_bool, - sizeof(registerset_test_vector_array_bool) / sizeof(*registerset_test_vector_array_bool), - registerset_constants_vector_array_bool, - sizeof(registerset_constants_vector_array_bool) / sizeof(*registerset_constants_vector_array_bool)}, + {"float 3 [2]", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_vector_array, + registerset_test_vector_array_float, ARRAY_SIZE(registerset_test_vector_array_float), + registerset_constants_vector_array_float, ARRAY_SIZE(registerset_constants_vector_array_float)}, + {"int 3 [2]", "van", 0, D3DXRS_INT4, registerset_blob_vector_array, + registerset_test_vector_array_int, ARRAY_SIZE(registerset_test_vector_array_int), + registerset_constants_vector_array_int, ARRAY_SIZE(registerset_constants_vector_array_int)}, + {"bool 3 [2]", "vab", 0, D3DXRS_BOOL, registerset_blob_vector_array, + registerset_test_vector_array_bool, ARRAY_SIZE(registerset_test_vector_array_bool), + registerset_constants_vector_array_bool, ARRAY_SIZE(registerset_constants_vector_array_bool)}, {"bool float 3 [2]", "vabf", 16, D3DXRS_FLOAT4, registerset_blob_vector_array, - registerset_test_vector_array_bool_float, - sizeof(registerset_test_vector_array_bool_float) / sizeof(*registerset_test_vector_array_bool_float), - registerset_constants_vector_array_bool_float, - sizeof(registerset_constants_vector_array_bool_float) / sizeof(*registerset_constants_vector_array_bool_float)}, + registerset_test_vector_array_bool_float, ARRAY_SIZE(registerset_test_vector_array_bool_float), + registerset_constants_vector_array_bool_float, ARRAY_SIZE(registerset_constants_vector_array_bool_float)}, {"int float 3 [2]", "vanf", 8, D3DXRS_FLOAT4, registerset_blob_vector_array, - registerset_test_vector_array_int_float, - sizeof(registerset_test_vector_array_int_float) / sizeof(*registerset_test_vector_array_int_float), - registerset_constants_vector_array_int_float, - sizeof(registerset_constants_vector_array_int_float) / sizeof(*registerset_constants_vector_array_int_float)}, + registerset_test_vector_array_int_float, ARRAY_SIZE(registerset_test_vector_array_int_float), + registerset_constants_vector_array_int_float, ARRAY_SIZE(registerset_constants_vector_array_int_float)}, /* matrix column */ - {"float c3x2", "cf", 0, D3DXRS_FLOAT4, registerset_blob_column, registerset_test_column_float, - sizeof(registerset_test_column_float) / sizeof(*registerset_test_column_float), - registerset_constants_column_float, - sizeof(registerset_constants_column_float) / sizeof(*registerset_constants_column_float)}, - {"int c3x2", "cn", 0, D3DXRS_INT4, registerset_blob_column, registerset_test_column_int, - sizeof(registerset_test_column_int) / sizeof(*registerset_test_column_int), - registerset_constants_column_int, - sizeof(registerset_constants_column_int) / sizeof(*registerset_constants_column_int)}, - {"bool c3x2", "cb", 0, D3DXRS_BOOL, registerset_blob_column, registerset_test_column_bool, - sizeof(registerset_test_column_bool) / sizeof(*registerset_test_column_bool), - registerset_constants_column_bool, - sizeof(registerset_constants_column_bool) / sizeof(*registerset_constants_column_bool)}, + {"float c3x2", "cf", 0, D3DXRS_FLOAT4, registerset_blob_column, + registerset_test_column_float, ARRAY_SIZE(registerset_test_column_float), + registerset_constants_column_float, ARRAY_SIZE(registerset_constants_column_float)}, + {"int c3x2", "cn", 0, D3DXRS_INT4, registerset_blob_column, + registerset_test_column_int, ARRAY_SIZE(registerset_test_column_int), + registerset_constants_column_int, ARRAY_SIZE(registerset_constants_column_int)}, + {"bool c3x2", "cb", 0, D3DXRS_BOOL, registerset_blob_column, + registerset_test_column_bool, ARRAY_SIZE(registerset_test_column_bool), + registerset_constants_column_bool, ARRAY_SIZE(registerset_constants_column_bool)}, {"bool float c3x2", "cbf", 8, D3DXRS_FLOAT4, registerset_blob_column, - registerset_test_column_bool_float, - sizeof(registerset_test_column_bool_float) / sizeof(*registerset_test_column_bool_float), - registerset_constants_column_bool_float, - sizeof(registerset_constants_column_bool_float) / sizeof(*registerset_constants_column_bool_float)}, + registerset_test_column_bool_float, ARRAY_SIZE(registerset_test_column_bool_float), + registerset_constants_column_bool_float, ARRAY_SIZE(registerset_constants_column_bool_float)}, {"int float c3x2", "cnf", 16, D3DXRS_FLOAT4, registerset_blob_column, - registerset_test_column_int_float, - sizeof(registerset_test_column_int_float) / sizeof(*registerset_test_column_int_float), - registerset_constants_column_int_float, - sizeof(registerset_constants_column_int_float) / sizeof(*registerset_constants_column_int_float)}, + registerset_test_column_int_float, ARRAY_SIZE(registerset_test_column_int_float), + registerset_constants_column_int_float, ARRAY_SIZE(registerset_constants_column_int_float)}, /* matrix column array */ - {"float c3x2 [2]", "caf", 0, D3DXRS_FLOAT4, registerset_blob_column_array, registerset_test_column_array_float, - sizeof(registerset_test_column_array_float) / sizeof(*registerset_test_column_array_float), - registerset_constants_column_array_float, - sizeof(registerset_constants_column_array_float) / sizeof(*registerset_constants_column_array_float)}, - {"int c3x2 [2]", "can", 0, D3DXRS_INT4, registerset_blob_column_array, registerset_test_column_array_int, - sizeof(registerset_test_column_array_int) / sizeof(*registerset_test_column_array_int), - registerset_constants_column_array_int, - sizeof(registerset_constants_column_array_int) / sizeof(*registerset_constants_column_array_int)}, - {"bool c3x2 [2]", "cab", 0, D3DXRS_BOOL, registerset_blob_column_array, registerset_test_column_array_bool, - sizeof(registerset_test_column_array_bool) / sizeof(*registerset_test_column_array_bool), - registerset_constants_column_array_bool, - sizeof(registerset_constants_column_array_bool) / sizeof(*registerset_constants_column_array_bool)}, + {"float c3x2 [2]", "caf", 0, D3DXRS_FLOAT4, registerset_blob_column_array, + registerset_test_column_array_float, ARRAY_SIZE(registerset_test_column_array_float), + registerset_constants_column_array_float, ARRAY_SIZE(registerset_constants_column_array_float)}, + {"int c3x2 [2]", "can", 0, D3DXRS_INT4, registerset_blob_column_array, + registerset_test_column_array_int, ARRAY_SIZE(registerset_test_column_array_int), + registerset_constants_column_array_int, ARRAY_SIZE(registerset_constants_column_array_int)}, + {"bool c3x2 [2]", "cab", 0, D3DXRS_BOOL, registerset_blob_column_array, + registerset_test_column_array_bool, ARRAY_SIZE(registerset_test_column_array_bool), + registerset_constants_column_array_bool, ARRAY_SIZE(registerset_constants_column_array_bool)}, {"bool float c3x2 [2]", "cabf", 16, D3DXRS_FLOAT4, registerset_blob_column_array, - registerset_test_column_array_bool_float, - sizeof(registerset_test_column_array_bool_float) / sizeof(*registerset_test_column_array_bool_float), - registerset_constants_column_array_bool_float, - sizeof(registerset_constants_column_array_bool_float) / sizeof(*registerset_constants_column_array_bool_float)}, + registerset_test_column_array_bool_float, ARRAY_SIZE(registerset_test_column_array_bool_float), + registerset_constants_column_array_bool_float, ARRAY_SIZE(registerset_constants_column_array_bool_float)}, {"int float c3x2 [2]", "canf", 32, D3DXRS_FLOAT4, registerset_blob_column_array, - registerset_test_column_array_int_float, - sizeof(registerset_test_column_array_int_float) / sizeof(*registerset_test_column_array_int_float), - registerset_constants_column_array_int_float, - sizeof(registerset_constants_column_array_int_float) / sizeof(*registerset_constants_column_array_int_float)}, + registerset_test_column_array_int_float, ARRAY_SIZE(registerset_test_column_array_int_float), + registerset_constants_column_array_int_float, ARRAY_SIZE(registerset_constants_column_array_int_float)}, /* matrix row */ - {"float r3x2", "rf", 0, D3DXRS_FLOAT4, registerset_blob_row, registerset_test_row_float, - sizeof(registerset_test_row_float) / sizeof(*registerset_test_row_float), - registerset_constants_row_float, - sizeof(registerset_constants_row_float) / sizeof(*registerset_constants_row_float)}, - {"int r3x2", "rn", 0, D3DXRS_INT4, registerset_blob_row, registerset_test_row_int, - sizeof(registerset_test_row_int) / sizeof(*registerset_test_row_int), - registerset_constants_row_int, - sizeof(registerset_constants_row_int) / sizeof(*registerset_constants_row_int)}, - {"bool r3x2", "rb", 0, D3DXRS_BOOL, registerset_blob_row, registerset_test_row_bool, - sizeof(registerset_test_row_bool) / sizeof(*registerset_test_row_bool), - registerset_constants_row_bool, - sizeof(registerset_constants_row_bool) / sizeof(*registerset_constants_row_bool)}, + {"float r3x2", "rf", 0, D3DXRS_FLOAT4, registerset_blob_row, + registerset_test_row_float, ARRAY_SIZE(registerset_test_row_float), + registerset_constants_row_float, ARRAY_SIZE(registerset_constants_row_float)}, + {"int r3x2", "rn", 0, D3DXRS_INT4, registerset_blob_row, + registerset_test_row_int, ARRAY_SIZE(registerset_test_row_int), + registerset_constants_row_int, ARRAY_SIZE(registerset_constants_row_int)}, + {"bool r3x2", "rb", 0, D3DXRS_BOOL, registerset_blob_row, + registerset_test_row_bool, ARRAY_SIZE(registerset_test_row_bool), + registerset_constants_row_bool, ARRAY_SIZE(registerset_constants_row_bool)}, {"bool float r3x2", "rbf", 12, D3DXRS_FLOAT4, registerset_blob_row, - registerset_test_row_bool_float, - sizeof(registerset_test_row_bool_float) / sizeof(*registerset_test_row_bool_float), - registerset_constants_row_bool_float, - sizeof(registerset_constants_row_bool_float) / sizeof(*registerset_constants_row_bool_float)}, + registerset_test_row_bool_float, ARRAY_SIZE(registerset_test_row_bool_float), + registerset_constants_row_bool_float, ARRAY_SIZE(registerset_constants_row_bool_float)}, {"int float r3x2", "rnf", 24, D3DXRS_FLOAT4, registerset_blob_row, - registerset_test_row_int_float, - sizeof(registerset_test_row_int_float) / sizeof(*registerset_test_row_int_float), - registerset_constants_row_int_float, - sizeof(registerset_constants_row_int_float) / sizeof(*registerset_constants_row_int_float)}, + registerset_test_row_int_float, ARRAY_SIZE(registerset_test_row_int_float), + registerset_constants_row_int_float, ARRAY_SIZE(registerset_constants_row_int_float)}, /* matrix row array */ - {"float 3x2 [2]", "raf", 0, D3DXRS_FLOAT4, registerset_blob_row_array, registerset_test_row_array_float, - sizeof(registerset_test_row_array_float) / sizeof(*registerset_test_row_array_float), - registerset_constants_row_array_float, - sizeof(registerset_constants_row_array_float) / sizeof(*registerset_constants_row_array_float)}, - {"int 3x2 [2]", "ran", 0, D3DXRS_INT4, registerset_blob_row_array, registerset_test_row_array_int, - sizeof(registerset_test_row_array_int) / sizeof(*registerset_test_row_array_int), - registerset_constants_row_array_int, - sizeof(registerset_constants_row_array_int) / sizeof(*registerset_constants_row_array_int)}, - {"bool 3x2 [2]", "rab", 0, D3DXRS_BOOL, registerset_blob_row_array, registerset_test_row_array_bool, - sizeof(registerset_test_row_array_bool) / sizeof(*registerset_test_row_array_bool), - registerset_constants_row_array_bool, - sizeof(registerset_constants_row_array_bool) / sizeof(*registerset_constants_row_array_bool)}, + {"float 3x2 [2]", "raf", 0, D3DXRS_FLOAT4, registerset_blob_row_array, + registerset_test_row_array_float, ARRAY_SIZE(registerset_test_row_array_float), + registerset_constants_row_array_float, ARRAY_SIZE(registerset_constants_row_array_float)}, + {"int 3x2 [2]", "ran", 0, D3DXRS_INT4, registerset_blob_row_array, + registerset_test_row_array_int, ARRAY_SIZE(registerset_test_row_array_int), + registerset_constants_row_array_int, ARRAY_SIZE(registerset_constants_row_array_int)}, + {"bool 3x2 [2]", "rab", 0, D3DXRS_BOOL, registerset_blob_row_array, + registerset_test_row_array_bool, ARRAY_SIZE(registerset_test_row_array_bool), + registerset_constants_row_array_bool, ARRAY_SIZE(registerset_constants_row_array_bool)}, {"bool float 3x2 [2]", "rabf", 24, D3DXRS_FLOAT4, registerset_blob_row_array, - registerset_test_row_array_bool_float, - sizeof(registerset_test_row_array_bool_float) / sizeof(*registerset_test_row_array_bool_float), - registerset_constants_row_array_bool_float, - sizeof(registerset_constants_row_array_bool_float) / sizeof(*registerset_constants_row_array_bool_float)}, + registerset_test_row_array_bool_float, ARRAY_SIZE(registerset_test_row_array_bool_float), + registerset_constants_row_array_bool_float, ARRAY_SIZE(registerset_constants_row_array_bool_float)}, {"int float 3x2 [2]", "ranf", 48, D3DXRS_FLOAT4, registerset_blob_row_array, - registerset_test_row_array_int_float, - sizeof(registerset_test_row_array_int_float) / sizeof(*registerset_test_row_array_int_float), - registerset_constants_row_array_int_float, - sizeof(registerset_constants_row_array_int_float) / sizeof(*registerset_constants_row_array_int_float)}, + registerset_test_row_array_int_float, ARRAY_SIZE(registerset_test_row_array_int_float), + registerset_constants_row_array_int_float, ARRAY_SIZE(registerset_constants_row_array_int_float)}, /* struct */ - {"struct float", "sf", 0, D3DXRS_FLOAT4, registerset_blob_struct, registerset_test_struct_float, - sizeof(registerset_test_struct_float) / sizeof(*registerset_test_struct_float), - registerset_constants_struct_float, - sizeof(registerset_constants_struct_float) / sizeof(*registerset_constants_struct_float)}, - {"struct int", "sn", 0, D3DXRS_INT4, registerset_blob_struct, registerset_test_struct_int, - sizeof(registerset_test_struct_int) / sizeof(*registerset_test_struct_int), - registerset_constants_struct_int, - sizeof(registerset_constants_struct_int) / sizeof(*registerset_constants_struct_int)}, - {"struct bool", "sb", 0, D3DXRS_BOOL, registerset_blob_struct, registerset_test_struct_bool, - sizeof(registerset_test_struct_bool) / sizeof(*registerset_test_struct_bool), - registerset_constants_struct_bool, - sizeof(registerset_constants_struct_bool) / sizeof(*registerset_constants_struct_bool)}, + {"struct float", "sf", 0, D3DXRS_FLOAT4, registerset_blob_struct, + registerset_test_struct_float, ARRAY_SIZE(registerset_test_struct_float), + registerset_constants_struct_float, ARRAY_SIZE(registerset_constants_struct_float)}, + {"struct int", "sn", 0, D3DXRS_INT4, registerset_blob_struct, + registerset_test_struct_int, ARRAY_SIZE(registerset_test_struct_int), + registerset_constants_struct_int, ARRAY_SIZE(registerset_constants_struct_int)}, + {"struct bool", "sb", 0, D3DXRS_BOOL, registerset_blob_struct, + registerset_test_struct_bool, ARRAY_SIZE(registerset_test_struct_bool), + registerset_constants_struct_bool, ARRAY_SIZE(registerset_constants_struct_bool)}, {"struct bool float", "sbf", 16, D3DXRS_FLOAT4, registerset_blob_struct, - registerset_test_struct_bool_float, - sizeof(registerset_test_struct_bool_float) / sizeof(*registerset_test_struct_bool_float), - registerset_constants_struct_bool_float, - sizeof(registerset_constants_struct_bool_float) / sizeof(*registerset_constants_struct_bool_float)}, + registerset_test_struct_bool_float, ARRAY_SIZE(registerset_test_struct_bool_float), + registerset_constants_struct_bool_float, ARRAY_SIZE(registerset_constants_struct_bool_float)}, {"struct int float", "snf", 8, D3DXRS_FLOAT4, registerset_blob_struct, - registerset_test_struct_int_float, - sizeof(registerset_test_struct_int_float) / sizeof(*registerset_test_struct_int_float), - registerset_constants_struct_int_float, - sizeof(registerset_constants_struct_int_float) / sizeof(*registerset_constants_struct_int_float)}, + registerset_test_struct_int_float, ARRAY_SIZE(registerset_test_struct_int_float), + registerset_constants_struct_int_float, ARRAY_SIZE(registerset_constants_struct_int_float)}, /* struct array */ - {"struct float [2]", "saf", 0, D3DXRS_FLOAT4, registerset_blob_struct_array, registerset_test_struct_array_float, - sizeof(registerset_test_struct_array_float) / sizeof(*registerset_test_struct_array_float), - registerset_constants_struct_array_float, - sizeof(registerset_constants_struct_array_float) / sizeof(*registerset_constants_struct_array_float)}, - {"struct int [2]", "san", 0, D3DXRS_INT4, registerset_blob_struct_array, registerset_test_struct_array_int, - sizeof(registerset_test_struct_array_int) / sizeof(*registerset_test_struct_array_int), - registerset_constants_struct_array_int, - sizeof(registerset_constants_struct_array_int) / sizeof(*registerset_constants_struct_array_int)}, - {"struct bool [2]", "sab", 0, D3DXRS_BOOL, registerset_blob_struct_array, registerset_test_struct_array_bool, - sizeof(registerset_test_struct_array_bool) / sizeof(*registerset_test_struct_array_bool), - registerset_constants_struct_array_bool, - sizeof(registerset_constants_struct_array_bool) / sizeof(*registerset_constants_struct_array_bool)}, + {"struct float [2]", "saf", 0, D3DXRS_FLOAT4, registerset_blob_struct_array, + registerset_test_struct_array_float, ARRAY_SIZE(registerset_test_struct_array_float), + registerset_constants_struct_array_float, ARRAY_SIZE(registerset_constants_struct_array_float)}, + {"struct int [2]", "san", 0, D3DXRS_INT4, registerset_blob_struct_array, + registerset_test_struct_array_int, ARRAY_SIZE(registerset_test_struct_array_int), + registerset_constants_struct_array_int, ARRAY_SIZE(registerset_constants_struct_array_int)}, + {"struct bool [2]", "sab", 0, D3DXRS_BOOL, registerset_blob_struct_array, + registerset_test_struct_array_bool, ARRAY_SIZE(registerset_test_struct_array_bool), + registerset_constants_struct_array_bool, ARRAY_SIZE(registerset_constants_struct_array_bool)}, {"struct bool float [2]", "sabf", 32, D3DXRS_FLOAT4, registerset_blob_struct_array, - registerset_test_struct_array_bool_float, - sizeof(registerset_test_struct_array_bool_float) / sizeof(*registerset_test_struct_array_bool_float), - registerset_constants_struct_array_bool_float, - sizeof(registerset_constants_struct_array_bool_float) / sizeof(*registerset_constants_struct_array_bool_float)}, + registerset_test_struct_array_bool_float, ARRAY_SIZE(registerset_test_struct_array_bool_float), + registerset_constants_struct_array_bool_float, ARRAY_SIZE(registerset_constants_struct_array_bool_float)}, {"struct int float [2]", "sanf", 16, D3DXRS_FLOAT4, registerset_blob_struct_array, - registerset_test_struct_array_int_float, - sizeof(registerset_test_struct_array_int_float) / sizeof(*registerset_test_struct_array_int_float), - registerset_constants_struct_array_int_float, - sizeof(registerset_constants_struct_array_int_float) / sizeof(*registerset_constants_struct_array_int_float)}, + registerset_test_struct_array_int_float, ARRAY_SIZE(registerset_test_struct_array_int_float), + registerset_constants_struct_array_int_float, ARRAY_SIZE(registerset_constants_struct_array_int_float)}, /* struct struct */ - {"struct struct float", "ssf", 0, D3DXRS_FLOAT4, registerset_blob_struct_struct, registerset_test_struct_struct_float, - sizeof(registerset_test_struct_struct_float) / sizeof(*registerset_test_struct_struct_float), - registerset_constants_struct_struct_float, - sizeof(registerset_constants_struct_struct_float) / sizeof(*registerset_constants_struct_struct_float)}, - {"struct struct int", "ssn", 0, D3DXRS_INT4, registerset_blob_struct_struct, registerset_test_struct_struct_int, - sizeof(registerset_test_struct_struct_int) / sizeof(*registerset_test_struct_struct_int), - registerset_constants_struct_struct_int, - sizeof(registerset_constants_struct_struct_int) / sizeof(*registerset_constants_struct_struct_int)}, - {"struct struct bool", "ssb", 0, D3DXRS_BOOL, registerset_blob_struct_struct, registerset_test_struct_struct_bool, - sizeof(registerset_test_struct_struct_bool) / sizeof(*registerset_test_struct_struct_bool), - registerset_constants_struct_struct_bool, - sizeof(registerset_constants_struct_struct_bool) / sizeof(*registerset_constants_struct_struct_bool)}, + {"struct struct float", "ssf", 0, D3DXRS_FLOAT4, registerset_blob_struct_struct, + registerset_test_struct_struct_float, ARRAY_SIZE(registerset_test_struct_struct_float), + registerset_constants_struct_struct_float, ARRAY_SIZE(registerset_constants_struct_struct_float)}, + {"struct struct int", "ssn", 0, D3DXRS_INT4, registerset_blob_struct_struct, + registerset_test_struct_struct_int, ARRAY_SIZE(registerset_test_struct_struct_int), + registerset_constants_struct_struct_int, ARRAY_SIZE(registerset_constants_struct_struct_int)}, + {"struct struct bool", "ssb", 0, D3DXRS_BOOL, registerset_blob_struct_struct, + registerset_test_struct_struct_bool, ARRAY_SIZE(registerset_test_struct_struct_bool), + registerset_constants_struct_struct_bool, ARRAY_SIZE(registerset_constants_struct_struct_bool)}, {"struct struct bool float", "ssbf", 32, D3DXRS_FLOAT4, registerset_blob_struct_struct, - registerset_test_struct_struct_bool_float, - sizeof(registerset_test_struct_struct_bool_float) / sizeof(*registerset_test_struct_struct_bool_float), - registerset_constants_struct_struct_bool_float, - sizeof(registerset_constants_struct_struct_bool_float) / sizeof(*registerset_constants_struct_struct_bool_float)}, + registerset_test_struct_struct_bool_float, ARRAY_SIZE(registerset_test_struct_struct_bool_float), + registerset_constants_struct_struct_bool_float, ARRAY_SIZE(registerset_constants_struct_struct_bool_float)}, {"struct struct int float", "ssnf", 16, D3DXRS_FLOAT4, registerset_blob_struct_struct, - registerset_test_struct_struct_int_float, - sizeof(registerset_test_struct_struct_int_float) / sizeof(*registerset_test_struct_struct_int_float), - registerset_constants_struct_struct_int_float, - sizeof(registerset_constants_struct_struct_int_float) / sizeof(*registerset_constants_struct_struct_int_float)}, + registerset_test_struct_struct_int_float, ARRAY_SIZE(registerset_test_struct_struct_int_float), + registerset_constants_struct_struct_int_float, ARRAY_SIZE(registerset_constants_struct_struct_int_float)}, /* special */ {"int ran", "ran", 0, D3DXRS_INT4, registerset_blob_special_int, NULL, 0, - registerset_constants_special_int, - sizeof(registerset_constants_special_int) / sizeof(*registerset_constants_special_int)}, - {"bigvec", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_bigvec, registerset_test_bigvec_float, - sizeof(registerset_test_bigvec_float) / sizeof(*registerset_test_bigvec_float), - registerset_constants_bigvec_float, - sizeof(registerset_constants_bigvec_float) / sizeof(*registerset_constants_bigvec_float)}, + registerset_constants_special_int, ARRAY_SIZE(registerset_constants_special_int)}, + {"bigvec", "vaf", 0, D3DXRS_FLOAT4, registerset_blob_bigvec, + registerset_test_bigvec_float, ARRAY_SIZE(registerset_test_bigvec_float), + registerset_constants_bigvec_float, ARRAY_SIZE(registerset_constants_bigvec_float)}, {"cf", "cf", 0, D3DXRS_FLOAT4, registerset_blob_matrix_column_clamp, - registerset_test_matrix_column_clamp, - sizeof(registerset_test_matrix_column_clamp) / sizeof(*registerset_test_matrix_column_clamp), - registerset_constants_matrix_column_clamp, - sizeof(registerset_constants_matrix_column_clamp) / sizeof(*registerset_constants_matrix_column_clamp)}, + registerset_test_matrix_column_clamp, ARRAY_SIZE(registerset_test_matrix_column_clamp), + registerset_constants_matrix_column_clamp, ARRAY_SIZE(registerset_constants_matrix_column_clamp)}, }; static void registerset_clear(IDirect3DDevice9 *device) -- 2.14.4

2 1

[PATCH 1/2] d3dx9/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This is the trivial in-place stuff. The generated object files with or without this patch are identical. dlls/d3dx9_36/tests/core.c | 8 ++++---- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/d3dx9_36/tests/shader.c | 22 +++++++++++----------- dlls/d3dx9_36/tests/surface.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 90b678fdf7..75d33c1e0d 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -552,7 +552,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); - for(i = 0; i < sizeof(texture_tests) / sizeof(texture_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(texture_tests); i++) { HDC hdc; DWORD ret; HRESULT hr; @@ -617,7 +617,7 @@ static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = D3DXCreateRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, &render); @@ -1024,7 +1024,7 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) check_release((IUnknown *)render, 0); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, TRUE); check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, FALSE); @@ -1052,7 +1052,7 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN }, { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN } } }; - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { const D3DXRTE_DESC *parameters = &tests[i].parameters; const D3DXRTE_DESC *expected = &tests[i].expected_values; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4f26b63a13..d9ff11eaea 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -991,7 +991,7 @@ struct test_effect_parameter_value_result test_effect_parameter_value_result_spe test_effect_parameter_value_blob_ ## x,\ sizeof(test_effect_parameter_value_blob_ ## x),\ test_effect_parameter_value_result_ ## x,\ - sizeof(test_effect_parameter_value_result_ ## x)/sizeof(*test_effect_parameter_value_result_ ## x),\ + ARRAY_SIZE(test_effect_parameter_value_result_ ## x),\ } static const struct diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46e42..c2b41cfdc7 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -649,17 +649,17 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, static void test_constant_tables(void) { test_constant_table("test_basic", ctab_basic, ctab_basic_expected, - sizeof(ctab_basic_expected)/sizeof(*ctab_basic_expected)); + ARRAY_SIZE(ctab_basic_expected)); test_constant_table("test_matrices", ctab_matrices, ctab_matrices_expected, - sizeof(ctab_matrices_expected)/sizeof(*ctab_matrices_expected)); + ARRAY_SIZE(ctab_matrices_expected)); test_constant_table("test_matrices2", ctab_matrices2, ctab_matrices2_expected, - sizeof(ctab_matrices2_expected)/sizeof(*ctab_matrices2_expected)); + ARRAY_SIZE(ctab_matrices2_expected)); test_constant_table("test_arrays", ctab_arrays, ctab_arrays_expected, - sizeof(ctab_arrays_expected)/sizeof(*ctab_arrays_expected)); + ARRAY_SIZE(ctab_arrays_expected)); test_constant_table("test_default_values", ctab_with_default_values, ctab_with_default_values_expected, - sizeof(ctab_with_default_values_expected)/sizeof(*ctab_with_default_values_expected)); + ARRAY_SIZE(ctab_with_default_values_expected)); test_constant_table("test_samplers", ctab_samplers, ctab_samplers_expected, - sizeof(ctab_samplers_expected)/sizeof(*ctab_samplers_expected)); + ARRAY_SIZE(ctab_samplers_expected)); } static void test_setting_basic_table(IDirect3DDevice9 *device) @@ -1844,7 +1844,7 @@ static void test_get_shader_constant_variables(void) ctab = ID3DXConstantTable_GetBufferPointer(ctable); ok(ctab[0] == test_get_shader_constant_variables_blob[3], "ID3DXConstantTable_GetBufferPointer failed\n"); - for (i = 0; i < sizeof(test_get_shader_constant_variables_data) / sizeof(*test_get_shader_constant_variables_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_get_shader_constant_variables_data); ++i) { const char *fullname = test_get_shader_constant_variables_data[i].fullname; const D3DXCONSTANT_DESC *expected_desc = &test_get_shader_constant_variables_data[i].desc; @@ -6025,7 +6025,7 @@ static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXRE D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; UINT err = 0, i; - for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + for (i = 0; i < ARRAY_SIZE(regsets); i++) { if (regset == regsets[i]) err += registerset_compare(device, is_vs, regset, start, in_count, expected); @@ -6137,7 +6137,7 @@ static void test_registerset(void) return; } - for (k = 0; k < sizeof(registerset_data) / sizeof(*registerset_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_data); ++k) { const char *tablename = registerset_data[k].name; const char *name = registerset_data[k].var; @@ -6442,7 +6442,7 @@ static void test_registerset_defaults(void) return; } - for (k = 0; k < sizeof(registerset_defaults_data) / sizeof(*registerset_defaults_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_defaults_data); ++k) { const char *tablename = registerset_defaults_data[k].name; ID3DXConstantTable *ctable; @@ -6616,7 +6616,7 @@ static void test_shader_semantics(void) hr = D3DXGetShaderInputSemantics(vs_1_1, semantics, NULL); ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const DWORD *shader = tests[i].shader; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 324e2af3eb..37c488b5ad 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -398,7 +398,7 @@ static void test_dds_header_handling(void) return; } - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + tests[i].pixel_data_size; assert(file_size <= sizeof(*dds)); -- 2.14.4

2 1

[PATCH vkd3d 1/4] libs/vkd3d-shader: Factor out shader_dump_version().
by Józef Kucia 05 Jun '18

05 Jun '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 58 +++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index faa009e03a4c..ce8db46b6f21 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1234,58 +1234,62 @@ static void shader_dump_interpolation_mode(struct vkd3d_string_buffer *buffer, } } -void vkd3d_shader_trace(void *data) +static void shader_dump_version(struct vkd3d_string_buffer *buffer, + const struct vkd3d_shader_version *shader_version) { - struct vkd3d_shader_version shader_version; - struct vkd3d_string_buffer buffer; - const char *type_prefix; - const char *p, *q; - const DWORD *ptr; - DWORD i; + const char *prefix; - if (!string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return; - } - - shader_sm4_read_header(data, &ptr, &shader_version); - - TRACE("Parsing %p.\n", ptr); - - switch (shader_version.type) + switch (shader_version->type) { case VKD3D_SHADER_TYPE_VERTEX: - type_prefix = "vs"; + prefix = "vs"; break; case VKD3D_SHADER_TYPE_HULL: - type_prefix = "hs"; + prefix = "hs"; break; case VKD3D_SHADER_TYPE_DOMAIN: - type_prefix = "ds"; + prefix = "ds"; break; case VKD3D_SHADER_TYPE_GEOMETRY: - type_prefix = "gs"; + prefix = "gs"; break; case VKD3D_SHADER_TYPE_PIXEL: - type_prefix = "ps"; + prefix = "ps"; break; case VKD3D_SHADER_TYPE_COMPUTE: - type_prefix = "cs"; + prefix = "cs"; break; default: - FIXME("Unhandled shader type %#x.\n", shader_version.type); - type_prefix = "unknown"; + FIXME("Unhandled shader type %#x.\n", shader_version->type); + prefix = "unknown"; break; } - shader_addline(&buffer, "%s_%u_%u\n", type_prefix, shader_version.major, shader_version.minor); + shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); +} + +void vkd3d_shader_trace(void *data) +{ + struct vkd3d_shader_version shader_version; + struct vkd3d_string_buffer buffer; + const char *p, *q; + const DWORD *ptr; + DWORD i; + + if (!string_buffer_init(&buffer)) + { + ERR("Failed to initialize string buffer.\n"); + return; + } + + shader_sm4_read_header(data, &ptr, &shader_version); + shader_dump_version(&buffer, &shader_version); while (!shader_sm4_is_end(data, &ptr)) { -- 2.16.4

2 7

How to install Windows Installer 4.5 on WINE
by mrt303xx＠aol.com 05 Jun '18

05 Jun '18

I am running Fedora 28 and I need to install an MSI, but Windows Install fails to create a directory. It's like the installer needs sudo access but wine like running as root. HELP! I'm trying to prove a development concept with WINE Tarie

1 0

[PATCH] ntdsapi/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdsapi/tests/ntdsapi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index 3d95d1bd0e..b6dc1856a4 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -45,39 +45,39 @@ static void test_DsMakeSpn(void) spn[0] = '\0'; - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(NULL, NULL, NULL, 0, NULL, &spn_length, spn); ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(NULL, wszServiceHost, NULL, 0, NULL, &spn_length, spn); ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, NULL, 0, NULL, &spn_length, spn); ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn1), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn1) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn1) + 1, spn_length); - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 0, NULL, &spn_length, spn); ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn2), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn2) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn2) + 1, spn_length); - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 555, NULL, &spn_length, spn); ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn3), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn3) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn3) + 1, spn_length); - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 555, wszReferrer, &spn_length, spn); ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn4), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); ok(spn_length == lstrlenW(wszSpn4) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn4) + 1, spn_length); - spn_length = sizeof(spn)/sizeof(spn[0]); + spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, NULL, 555, wszReferrer, &spn_length, spn); ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); ok(!lstrcmpW(spn, wszSpn5), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); @@ -106,7 +106,7 @@ static void test_DsClientMakeSpnForTargetServer(void) ok( ret == ERROR_BUFFER_OVERFLOW, "got %u\n", ret ); ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); buf[0] = 0; ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, buf ); ok( ret == ERROR_SUCCESS, "got %u\n", ret ); -- 2.14.4

1 0

[PATCH] msrle32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msrle32/tests/msrle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 14ddddb342..4a442a0b90 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -129,7 +129,7 @@ static void test_raw_decompress(void) outbits = HeapAlloc(GetProcessHeap(), 0, bih->biSizeImage); ok(outbits != NULL, "Expected non-NULL value\n"); - for (i = 0; i < sizeof(codecs) / sizeof(codecs[0]); i++) + for (i = 0; i < ARRAY_SIZE(codecs); i++) { memset(bits, i + 0xAF, bih->biSizeImage); -- 2.14.4

1 0

[PATCH] kernelbase/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/tests/path.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7c8851357f..cdba51bf3f 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -102,7 +102,7 @@ static void test_PathCchCombineEx(void) "Combination of %s + %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); - for (i = 0; i < sizeof(combine_test)/sizeof(combine_test[0]); i++) + for (i = 0; i < ARRAY_SIZE(combine_test); i++) { MultiByteToWideChar(CP_ACP, 0, combine_test[i].path1, -1, p1, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, combine_test[i].path2, -1, p2, MAX_PATH); @@ -168,16 +168,16 @@ static void test_PathCchAddBackslash(void) ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); ok(pathW[0] == 0, "Unexpected path.\n"); - for (i = 0; i < sizeof(addbackslash_tests)/sizeof(addbackslash_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(addbackslash_tests); i++) { const struct addbackslash_test *test = &addbackslash_tests[i]; char path[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, ARRAY_SIZE(pathW)); hr = pPathCchAddBackslash(pathW, test->size); ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); - WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, sizeof(path)/sizeof(path[0]), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, ARRAY_SIZE(path), NULL, NULL); ok(!strcmp(path, test->result), "%u: unexpected resulting path %s.\n", i, path); } } @@ -215,21 +215,21 @@ static void test_PathCchAddBackslashEx(void) ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); ok(pathW[0] == 0, "Unexpected path.\n"); - for (i = 0; i < sizeof(addbackslash_tests)/sizeof(addbackslash_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(addbackslash_tests); i++) { const struct addbackslash_test *test = &addbackslash_tests[i]; char path[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, ARRAY_SIZE(pathW)); hr = pPathCchAddBackslashEx(pathW, test->size, NULL, NULL); ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); - WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, sizeof(path)/sizeof(path[0]), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, ARRAY_SIZE(path), NULL, NULL); ok(!strcmp(path, test->result), "%u: unexpected resulting path %s.\n", i, path); ptrW = (void *)0xdeadbeef; remaining = 123; - MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, ARRAY_SIZE(pathW)); hr = pPathCchAddBackslashEx(pathW, test->size, &ptrW, &remaining); ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); if (SUCCEEDED(hr)) -- 2.14.4

1 0

[PATCH] itss/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/tests/protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 3028da4337..a41916b192 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -501,18 +501,18 @@ static void test_its_protocol_info(IInternetProtocol *protocol) for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { if(i != PARSE_CANONICALIZE && i != PARSE_SECURITY_URL) { hres = IInternetProtocolInfo_ParseUrl(info, blank_url1, i, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); } } - for(i=0; i < sizeof(combine_tests)/sizeof(combine_tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(combine_tests); i++) { size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", i, hres, combine_tests[i].hres); ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1 -- 2.14.4

1 0

[PATCH] iphlpapi/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index ba7d7f103b..d5613d7b4b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1459,7 +1459,7 @@ static void test_GetAdaptersAddresses(void) S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength); ua = ua->Next; } - for (i = 0, temp[0] = '\0'; i < sizeof(aa->ZoneIndices) / sizeof(aa->ZoneIndices[0]); i++) + for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++) sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); trace("status %u index %u zone %s\n", aa->OperStatus, aa->Ipv6IfIndex, temp ); prefix = aa->FirstPrefix; @@ -1836,7 +1836,7 @@ static void test_interface_identifier_conversion(void) ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); nameW[0] = 0; - len = sizeof(nameW)/sizeof(nameW[0]); + len = ARRAY_SIZE(nameW); ret = pConvertInterfaceLuidToNameW( &luid, nameW, len ); ok( !ret, "got %u\n", ret ); ok( nameW[0], "name not set\n" ); @@ -1855,7 +1855,7 @@ static void test_interface_identifier_conversion(void) ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); nameA[0] = 0; - len = sizeof(nameA)/sizeof(nameA[0]); + len = ARRAY_SIZE(nameA); ret = pConvertInterfaceLuidToNameA( &luid, nameA, len ); ok( !ret, "got %u\n", ret ); ok( nameA[0], "name not set\n" ); -- 2.14.4

1 0

[PATCH] inetmib1/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetmib1/tests/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 057cc6e744..32785fcc3f 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -123,7 +123,7 @@ if (0) /* crashes on native */ /* Oddly enough, this "succeeds," even though the OID is clearly * unsupported. */ - vars[0].name.idLength = sizeof(bogus) / sizeof(bogus[0]); + vars[0].name.idLength = ARRAY_SIZE(bogus); vars[0].name.ids = bogus; vars[0].value.asnType = 0; list.len = 1; @@ -146,7 +146,7 @@ if (0) /* crashes on native */ "expected 1.2.3.4, got %s\n", SnmpUtilOidToA(&vars[0].name)); /* The table is not an accessible variable, so it fails */ - vars[0].name.idLength = sizeof(mib2IfTable) / sizeof(mib2IfTable[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2IfTable); vars[0].name.ids = mib2IfTable; SetLastError(0xdeadbeef); error = 0xdeadbeef; @@ -161,13 +161,11 @@ if (0) /* crashes on native */ /* A Get fails on something that specifies a table (but not a particular * entry in it)... */ - vars[0].name.idLength = sizeof(mib2IfDescr) / sizeof(mib2IfDescr[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2IfDescr); vars[0].name.ids = mib2IfDescr; - vars[1].name.idLength = - sizeof(mib2IfAdminStatus) / sizeof(mib2IfAdminStatus[0]); + vars[1].name.idLength = ARRAY_SIZE(mib2IfAdminStatus); vars[1].name.ids = mib2IfAdminStatus; - vars[2].name.idLength = - sizeof(mib2IfOperStatus) / sizeof(mib2IfOperStatus[0]); + vars[2].name.idLength = ARRAY_SIZE(mib2IfOperStatus); vars[2].name.ids = mib2IfOperStatus; list.len = 3; SetLastError(0xdeadbeef); @@ -270,7 +268,7 @@ if (0) /* crashes on native */ * variables, on recent systems (at least Win2k) the first variable it * returns a value for is the first interface. */ - vars[0].name.idLength = sizeof(mib2System) / sizeof(mib2System[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2System); vars[0].name.ids = mib2System; SnmpUtilOidCpy(&vars2[0].name, &vars[0].name); vars2[0].value.asnType = 0; @@ -282,7 +280,7 @@ if (0) /* crashes on native */ ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); - vars3[0].name.idLength = sizeof(mib2If) / sizeof(mib2If[0]); + vars3[0].name.idLength = ARRAY_SIZE(mib2If); vars3[0].name.ids = mib2If; ok(!SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength) || !SnmpUtilOidNCmp(&vars2[0].name, &vars3[0].name, vars3[0].name.idLength), @@ -291,7 +289,7 @@ if (0) /* crashes on native */ SnmpUtilVarBindFree(&vars2[0]); /* Check the type and OIDs of the IP address table */ - vars[0].name.idLength = sizeof(mib2IpAddr) / sizeof(mib2IpAddr[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2IpAddr); vars[0].name.ids = mib2IpAddr; SnmpUtilOidCpy(&vars2[0].name, &vars[0].name); vars2[0].value.asnType = 0; -- 2.14.4

1 0

[PATCH] inetcomm/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 4c40c1189f..02b93e9911 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -129,7 +129,7 @@ static WCHAR *a2w(const char *str) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -1430,7 +1430,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CloseHandle(file); sprintf(urla, test->url, file_name); - MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, ARRAY_SIZE(test_url)); hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres); @@ -1514,13 +1514,13 @@ static void test_mhtml_protocol_info(void) &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); - for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) { + for(i = 0; i < ARRAY_SIZE(combine_tests); i++) { base_url = a2w(combine_tests[i].base_url); relative_url = a2w(combine_tests[i].relative_url); combined_len = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); if(SUCCEEDED(hres)) { @@ -1541,7 +1541,7 @@ static void test_mhtml_protocol_info(void) } hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); IInternetProtocolInfo_Release(protocol_info); @@ -1605,7 +1605,7 @@ static void test_mhtml_protocol(void) if(!broken_mhtml_resolver) test_mhtml_protocol_info(); - for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++) + for(i = 0; i < ARRAY_SIZE(binding_tests); i++) test_mhtml_protocol_binding(binding_tests + i); } @@ -1628,7 +1628,7 @@ static void test_MimeOleObjectFromMoniker(void) {"../test.mht", "mhtml:../test.mht"} }; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) { + for(i = 0; i < ARRAY_SIZE(tests); i++) { url = a2w(tests[i].url); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); -- 2.14.4

1 0

[PATCH] imagehlp/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 05 Jun '18

05 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imagehlp/tests/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 65f59700e3..c0a26c39dc 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -225,7 +225,7 @@ static const struct expected_blob b1[] = { {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn} }; -static const struct expected_update_accum a1 = { sizeof(b1) / sizeof(b1[0]), b1, TRUE }; +static const struct expected_update_accum a1 = { ARRAY_SIZE(b1), b1, TRUE }; static const struct expected_blob b2[] = { {FILE_PE_START, &bin}, @@ -235,7 +235,7 @@ static const struct expected_blob b2[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {FILE_TOTAL-FILE_IDATA, &bin.idata_section} }; -static const struct expected_update_accum a2 = { sizeof(b2) / sizeof(b2[0]), b2, FALSE }; +static const struct expected_update_accum a2 = { ARRAY_SIZE(b2), b2, FALSE }; /* Creates a test file and returns a handle to it. The file's path is returned * in temp_file, which must be at least MAX_PATH characters in length. -- 2.14.4

1 0

[PATCH 2/2 v2] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Piotr Caban 05 Jun '18

05 Jun '18

From: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix whitespace errors - remove todo_wine from tests after skip - fix memory leaks dlls/msvcp120/tests/msvcp120.c | 155 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] msvcp120: Fix _Getcvt tests when zh_CN system locale is used
by Piotr Caban 05 Jun '18

05 Jun '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH] ole32/tests: Store GUIDs by reference.
by Thomas Faber 05 Jun '18

05 Jun '18

Fixes MSVC build. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- This is an alternative to "ole32/tests: Fix MSVC build.", suggested by Dmitry. dlls/ole32/tests/marshal.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..39867394fb5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -560,12 +560,12 @@ static IPSFactoryBuffer PSFactoryBuffer = { &PSFactoryBufferVtbl }; struct host_object_data { IStream *stream; - IID iid; + const IID *iid; IUnknown *object; MSHLFLAGS marshal_flags; IMessageFilter *filter; IUnknown *register_object; - CLSID register_clsid; + const CLSID *register_clsid; HANDLE marshal_event; }; @@ -581,7 +581,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if(data->register_object) { - hr = CoRegisterClassObject(&data->register_clsid, data->register_object, + hr = CoRegisterClassObject(data->register_clsid, data->register_object, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &registration_key); ok(hr == S_OK, "CoRegisterClassObject failed: %08x\n", hr); } @@ -594,7 +594,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) ok_ole_success(hr, CoRegisterMessageFilter); } - hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + hr = CoMarshalInterface(data->stream, data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ @@ -639,7 +639,7 @@ static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *th static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + struct host_object_data object_data = { stream, riid, object, marshal_flags }; return start_host_object2(&object_data, thread); } @@ -1254,9 +1254,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, &IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + &CLSID_WineTestPSFactoryBuffer }; cLocks = 0; external_connections = 0; @@ -2321,7 +2321,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4213,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

2 1

[PATCH] ole32/tests: Fix MSVC build.
by Thomas Faber 05 Jun '18

05 Jun '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/ole32/tests/marshal.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 42049032196..b989c746c16 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -60,6 +60,8 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} + DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -1254,9 +1256,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IOleClientSite), (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + GUID_MEMBERS(CLSID_WineTestPSFactoryBuffer) }; cLocks = 0; external_connections = 0; @@ -2321,7 +2323,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4213,7 +4215,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, GUID_MEMBERS(IID_IClassFactory), (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); -- 2.16.1.windows.2

2 3

[PATCH 1/5] wined3d: Slightly improve formatting of generated GLSL shader interfaces.
by Matteo Bruni 05 Jun '18

05 Jun '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3692a276518..d6615d7c605 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2174,9 +2174,9 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte switch (mode) { case WINED3DSIM_CONSTANT: - return "flat"; + return "flat "; case WINED3DSIM_LINEAR_NOPERSPECTIVE: - return "noperspective"; + return "noperspective "; default: FIXME("Unhandled interpolation mode %#x.\n", mode); case WINED3DSIM_NONE: @@ -2207,7 +2207,7 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i for (i = 0; i < element_count; ++i) { mode = wined3d_extract_interpolation_mode(interpolation_mode, i); - shader_addline(buffer, "%s vec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); + shader_addline(buffer, " %svec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); } shader_addline(buffer, "} shader_in;\n"); } @@ -2242,7 +2242,7 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ mode = wined3d_extract_interpolation_mode(interpolation_mode, i); interpolation_qualifiers = shader_glsl_interpolation_qualifiers(mode); } - shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); + shader_addline(buffer, " %svec4 reg%u;\n", interpolation_qualifiers, i); } shader_addline(buffer, "} shader_out;\n"); } -- 2.16.1

4 10

[PATCH] testbot: Make Step::FileName and FileType optional.
by Francois Gouget 05 Jun '18

05 Jun '18

Some steps don't have an input filename (like the Reconfig tasks) so it makes no sense to force setting FileName or FileType to a dummy value. However enum fields cannot be left undefined so add a 'none' value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the database schema and then restarting the TestBot Engine and website. testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/ddl/update35.sql | 5 +++++ testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 11 +++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- testbot/web/JobDetails.pl | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update35.sql diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a79f60c71..f41148f12 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,8 +251,7 @@ sub AddReconfigJob() my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); $NewStep->Type("reconfig"); - $NewStep->FileName("-"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("none"); $NewStep->InStaging(!1); # Add a task for the build VM diff --git a/testbot/ddl/update35.sql b/testbot/ddl/update35.sql new file mode 100644 index 000000000..3ca3023f3 --- /dev/null +++ b/testbot/ddl/update35.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileName VARCHAR(100) NULL, + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 9ec428c04..9a28385a9 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -132,8 +132,8 @@ CREATE TABLE Steps PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, - FileName VARCHAR(100) NOT NULL, - FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, + FileName VARCHAR(100) NULL, + FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 977419474..aea1aee04 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -89,6 +89,7 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); + $self->FileType("none"); $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -117,6 +118,10 @@ sub Validate($) { return ("PreviousNo", "The previous step number must be less than this one's."); } + if (defined $self->FileName and $self->FileType eq "none") + { + return ("FileType", "A file has been specified but no FileType"); + } return $self->SUPER::Validate(); } @@ -146,6 +151,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -256,8 +263,8 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index b9f70d768..84c5a005f 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -44,6 +44,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -189,7 +191,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6bf4a12e8..3e638f717 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -486,7 +486,7 @@ sub GenerateDataCell($$$$$) elsif ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); - if (-r $FileName) + if ($FileName and -r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo); -- 2.17.0

1 0

[PATCH] testbot: Log errors that happen when updating a Job's status.
by Francois Gouget 05 Jun '18

05 Jun '18

Such errors are important as they can prevent the Jobs from ever being marked as completed. So trace them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This helps diagnose issues where the database schema and the TestBot's ORM database model are out of sync. testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b1ffd3e48..13a389586 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -243,7 +243,12 @@ sub UpdateStatus($) { $self->Ended(time); } - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if (defined $ErrMessage) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not update job status: $ErrMessage\n"); + } last; } } -- 2.17.0

1 0

[PATCH] testbot: Add proper command line options to CheckForWinetestUpdate.pl.
by Francois Gouget 05 Jun '18

05 Jun '18

The options make it possible to test a specific job/task creation without having to way for a new WineTest binary download each time. Also it is now possible to specify the exact task type to create and if none is given the script will now handle all of them. This way the crontab commands don't need to be updated when new task types are added. Also the script now prints the error messages to stderr by default to make it easier to figure things out when running it on the command line. The --log-only option can be used when that's not desired. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the crontab entries. Typically they can both be replaced with a single command that will create all the relevant jobs: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only testbot/bin/CheckForWinetestUpdate.pl | 273 +++++++++++++++++++------- testbot/doc/INSTALL.txt | 3 +- 2 files changed, 199 insertions(+), 77 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 20eacec63..a79f60c71 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -6,6 +6,7 @@ # runs the full test suite on the standard Windows test VMs. # # Copyright 2009 Ge van Geldorp +# Copyright 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 @@ -37,6 +38,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Basename; use File::Compare; @@ -60,11 +63,112 @@ my %WineTestUrls = ( 64 => "http://test.winehq.org/builds/winetest64-latest.exe" ); +my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1); + + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +=pod +=over 12 + +=item C<UpdateWineTest()> + +Downloads the latest WineTest executable. + +Returns 1 if the executable was updated, 0 if it was not, and -1 if an +error occurred. + +=back +=cut + +sub UpdateWineTest($$) +{ + my ($OptCreate, $Bits) = @_; + + my $BitsSuffix = ($Bits == 64 ? "64" : ""); + my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + if ($OptCreate) + { + return (1, $LatestBaseName) if (-r $LatestFileName); + Debug("$LatestBaseName is missing\n"); + } + + # See if the online WineTest executable is newer + my $UA = LWP::UserAgent->new(); + $UA->agent("WineTestBot"); + my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); + if (-r $LatestFileName) + { + my $Since = gmtime((stat $LatestFileName)[9]); + $Request->header("If-Modified-Since" => "$Since GMT"); + } + Debug("Checking $WineTestUrls{$Bits}\n"); + my $Response = $UA->request($Request); + if ($Response->code == RC_NOT_MODIFIED) + { + Debug("$LatestBaseName is already up to date\n"); + return (0, $LatestBaseName); # Already up to date + } + if ($Response->code != RC_OK) + { + Error "Unexpected HTTP response code ", $Response->code, "\n"; + return (-1, undef); + } + + # Download the WineTest executable + Debug("Downloading $LatestBaseName\n"); + umask 002; + mkdir "$DataDir/staging"; + my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); + if (!$fh) + { + Error "Could not create staging file: $!\n"; + return (-1, undef); + } + print $fh $Response->decoded_content(); + close($fh); + + if (-r $LatestFileName and compare($StagingFileName, $LatestFileName) == 0) + { + Debug("$LatestBaseName did not change\n"); + unlink($StagingFileName); + return (0, $LatestBaseName); # No change after all + } + + # Save the WineTest executable to the latest directory for the next round + mkdir "$DataDir/latest"; + if (!move($StagingFileName, $LatestFileName)) + { + Error "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; + unlink($StagingFileName); + return (-1, undef); + } + utime time, $Response->last_modified, $LatestFileName; + + return (1, $LatestBaseName); +} sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $Remarks = ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other"); + $Remarks = "WineTest: $Remarks VMs"; + Debug("Creating the '$Remarks' job\n"); + my $VMs = CreateVMs(); if ($Bits == 64) { @@ -84,6 +188,7 @@ sub AddJob($$$) if ($VMs->GetItemsCount() == 0) { # There is nothing to do + Debug(" Found no VM\n"); return 1; } @@ -97,9 +202,7 @@ sub AddJob($$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); - $NewJob->Remarks("WineTest: " . - ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . - " VMs"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -114,6 +217,7 @@ sub AddJob($$$) my $Tasks = $NewStep->Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { + Debug(" $VMKey\n"); my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); @@ -123,7 +227,7 @@ sub AddJob($$$) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save job: $ErrMessage\n"; + Error "Failed to save job: $ErrMessage\n"; unlink($StagingFileName); return 0; } @@ -133,12 +237,15 @@ sub AddJob($$$) sub AddReconfigJob() { + my $Remarks = "Update Wine to latest git"; + Debug("Creating the '$Remarks' job\n"); + # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3); - $NewJob->Remarks("Update Wine to latest git"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -153,6 +260,7 @@ sub AddReconfigJob() $VMs->AddFilter("Type", ["build"]); $VMs->AddFilter("Role", ["base"]); my $BuildVM = ${$VMs->GetItems()}[0]; + Debug(" ", $BuildVM->GetKey(), "\n"); my $Task = $NewStep->Tasks->Add(); $Task->VM($BuildVM); $Task->Timeout($ReconfigTimeout); @@ -161,97 +269,112 @@ sub AddReconfigJob() my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save reconfig job: $ErrMessage\n"; + Error "Failed to save reconfig job: $ErrMessage\n"; return 0; } } -my $Bits = $ARGV[0]; -if (!$Bits) -{ - die "Usage: CheckForWinetestUpdate.pl <bits>"; -} -if ($Bits =~ m/^(32|64)$/) + +# +# Command line processing +# + +my ($OptCreate, %OptTypes, $Usage); +while (@ARGV) { - $Bits = $1; + my $Arg = shift @ARGV; + if ($Arg eq "--create") + { + $OptCreate = 1; + } + elsif ($TaskTypes{$Arg}) + { + $OptTypes{$Arg} = 1; + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } } -else + +# Check parameters +if (!defined $Usage) { - die "Invalid number of bits $Bits"; + map { $OptTypes{$_} = 1 } keys %TaskTypes if (!%OptTypes); } -my $BitsSuffix = ($Bits == 64 ? "64" : ""); - -# Download the winetest executable if new -my $UA = LWP::UserAgent->new(); -$UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); -my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; -my $LatestFileName = "$DataDir/latest/$LatestBaseName"; -if (-r $LatestFileName) +if (defined $Usage) { - my $Since = gmtime((stat $LatestFileName)[9]); - $Request->header("If-Modified-Since" => "$Since GMT"); + print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; + print "\n"; + print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + exit $Usage; } -my $Response = $UA->request($Request); -if ($Response->code != RC_OK) + + +# +# Create the 32 bit tasks +# + +my $Rc = 0; +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32}) { - if ($Response->code != RC_NOT_MODIFIED) + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 32); + if ($Create < 0) { - LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; - exit 1; + $Rc = 1; + } + elsif ($Create == 1) + { + # A new executable means there have been commits so update Wine. Create + # this job first purely to make the WineTestBot job queue look nice, and + # arbitrarily do it only for 32-bit executables to avoid redundant updates. + $Rc = 1 if ($OptTypes{build} and !AddReconfigJob()); + $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, 32)); + $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, 32)); } - exit 0; } -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# verify that it truly is new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -umask 002; -mkdir "$DataDir/staging"; -my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); -if (!$fh) -{ - LogMsg "Could not create staging file: $!\n"; - exit 1; -} -print $fh $Response->decoded_content(); -close($fh); -my $NewFile = 1; -if (-r $LatestFileName) -{ - $NewFile = compare($StagingFileName, $LatestFileName) != 0; -} -if (!$NewFile) -{ - # Nothing to do - unlink($StagingFileName); - exit 0; -} +# +# Create the 64 bit tasks +# -# Save the WineTest executable in the latest directory for the next round -mkdir "$DataDir/latest"; -if (!move($StagingFileName, $LatestFileName)) +if ($OptTypes{all64}) { - LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; - unlink($StagingFileName); - exit 1; + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 64); + if ($Create < 0) + { + $Rc = 1; + } + elsif ($Create == 1) + { + $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, 64)); + } } -utime time, $Response->last_modified, $LatestFileName; - -# A new executable means there have been commits so update Wine. Create this -# job first purely to make the WineTestBot job queue look nice, and arbitrarily -# do it only for 32-bit executables to avoid redundant updates. -my $rc = 0; -$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - -$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); -$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit $rc; +exit $Rc; diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 8827c227d..cb7c31b97 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -86,8 +86,7 @@ Setup for Wine's patches site: Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. -- 2.17.0

1 0

[PATCH v2 2/2] wbemdisp/tests: Add ISWbemSecurity tests
by Hans Leidekker 05 Jun '18

05 Jun '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Add more tests for default settings. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/tests/wbemdisp.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91edb4..1ce045697a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -265,7 +265,10 @@ static void test_locator(void) ISWbemObject *object; ISWbemPropertySet *prop_set; ISWbemProperty *prop; + ISWbemSecurity *security; VARIANT var; + WbemImpersonationLevelEnum imp_level; + WbemAuthenticationLevelEnum auth_level; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,34 @@ static void test_locator(void) SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + hr = ISWbemLocator_get_Security_( locator, &security ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelAnonymous ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelAnonymous, "got %u\n", imp_level ); + + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + todo_wine { + ok( hr == WBEM_E_FAILED, "got %x\n", hr ); + ok( auth_level == 0xdeadbeef, "got %u\n", auth_level ); + } + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelNone ); + ok( hr == S_OK, "got %x\n", hr ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelNone, "got %u\n", auth_level ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +349,18 @@ static void test_locator(void) ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); + hr = ISWbemServices_get_Security_( services, &security ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelPktPrivacy, "got %u\n", auth_level ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); -- 2.11.0

1 0

[PATCH v2 1/2] wbemdisp: Add ISWbemSecurity stub interface.
by Hans Leidekker 05 Jun '18

05 Jun '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e782d1f523..cdc0ab4479 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); enum type_id { @@ -47,6 +48,7 @@ enum type_id ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, + ISWbemSecurity_tid, last_tid }; @@ -60,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemObjectSet, &IID_ISWbemProperty, &IID_ISWbemPropertySet, - &IID_ISWbemServices + &IID_ISWbemServices, + &IID_ISWbemSecurity }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -1873,8 +1876,12 @@ static HRESULT WINAPI services_get_Security_( ISWbemServices *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "\n" ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemServicesVtbl services_vtbl = @@ -2128,8 +2135,12 @@ static HRESULT WINAPI locator_get_Security_( ISWbemLocator *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "%p, %p\n", iface, objWbemSecurity ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemLocatorVtbl locator_vtbl = @@ -2160,3 +2171,231 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct security +{ + ISWbemSecurity ISWbemSecurity_iface; + LONG refs; + WbemImpersonationLevelEnum implevel; + WbemAuthenticationLevelEnum authlevel; +}; + +static inline struct security *impl_from_ISWbemSecurity( ISWbemSecurity *iface ) +{ + return CONTAINING_RECORD( iface, struct security, ISWbemSecurity_iface ); +} + +static ULONG WINAPI security_AddRef( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + return InterlockedIncrement( &security->refs ); +} + +static ULONG WINAPI security_Release( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + LONG refs = InterlockedDecrement( &security->refs ); + if (!refs) + { + TRACE( "destroying %p\n", security ); + heap_free( security ); + } + return refs; +} + +static HRESULT WINAPI security_QueryInterface( + ISWbemSecurity *iface, + REFIID riid, + void **ppvObject ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %s, %p\n", security, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemSecurity ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemSecurity_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfoCount( + ISWbemSecurity *iface, + UINT *count ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %p\n", security, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfo( + ISWbemSecurity *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + + return get_typeinfo( ISWbemSecurity_tid, info ); +} + +static HRESULT WINAPI security_GetIDsOfNames( + ISWbemSecurity *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_Invoke( + ISWbemSecurity *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &security->ISWbemSecurity_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_get_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum *impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, impersonation_level ); + + if (!impersonation_level) + return E_INVALIDARG; + + *impersonation_level = security->implevel; + return S_OK; +} + +static HRESULT WINAPI security_put_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, impersonation_level ); + + security->implevel = impersonation_level; + return S_OK; +} + +static HRESULT WINAPI security_get_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum *authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, authentication_level ); + + if (!authentication_level) + return E_INVALIDARG; + + *authentication_level = security->authlevel; + return S_OK; +} + +static HRESULT WINAPI security_put_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, authentication_level ); + + security->authlevel = authentication_level; + return S_OK; +} + +static HRESULT WINAPI security_get_Privileges( + ISWbemSecurity *iface, + ISWbemPrivilegeSet **privilege_set ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, privilege_set ); + + if (!privilege_set) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const ISWbemSecurityVtbl security_vtbl = +{ + security_QueryInterface, + security_AddRef, + security_Release, + security_GetTypeInfoCount, + security_GetTypeInfo, + security_GetIDsOfNames, + security_Invoke, + security_get_ImpersonationLevel, + security_put_ImpersonationLevel, + security_get_AuthenticationLevel, + security_put_AuthenticationLevel, + security_get_Privileges +}; + +static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) +{ + struct security *security; + + TRACE( "%p\n", obj ); + + if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; + security->refs = 1; + security->implevel = wbemImpersonationLevelImpersonate; + security->authlevel = wbemAuthenticationLevelPktPrivacy; + + *obj = &security->ISWbemSecurity_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.11.0

1 0

[PATCH 1/3] msi: Only delete empty registry keys in delete_key().
by Zebediah Figura 05 Jun '18

05 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/action.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7197bca..ddd676d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2981,12 +2981,27 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } +static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path) +{ + DWORD subkeys, values; + HKEY key; + LONG res; + + key = open_key(comp, root, path, FALSE, get_registry_view(comp) | KEY_READ); + if (!key) return 0; + + res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0); + RegCloseKey(key); + + return !res && !subkeys && !values; +} + static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { + LONG res = ERROR_SUCCESS; REGSAM access = 0; WCHAR *subkey, *p; HKEY hkey; - LONG res; access |= get_registry_view( comp ); @@ -2999,10 +3014,15 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) if (!p[1]) continue; /* trailing backslash */ hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); if (!hkey) break; + if (!is_key_empty(comp, hkey, p + 1)) + { + RegCloseKey(hkey); + break; + } res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); } - else + else if (is_key_empty(comp, root, subkey)) res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) { @@ -3017,17 +3037,14 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path { LONG res; HKEY hkey; - DWORD num_subkeys, num_values; if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); - res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, - NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); - if (!res && !num_subkeys && !num_values) + if (is_key_empty(comp, root, path)) { TRACE("removing empty key %s\n", debugstr_w(path)); delete_key( comp, root, path ); -- 2.7.4

3 6

[PATCH v2 1/2] stdole2.idl: Use more accurate sizes for Automation types.
by Zebediah Figura 05 Jun '18

05 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/stdole2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 18c402a..d372384 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -32,15 +32,15 @@ ] library stdole { - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - + /* These typedefs need to have the same size as their real counterparts. */ typedef short VARIANT_BOOL; - typedef long BSTR; + typedef void *BSTR; typedef double CURRENCY; typedef unsigned long HRESULT; - typedef void *VARIANT; + typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; + } VARIANT; typedef unsigned long SCODE; typedef struct GUID { -- 2.7.4

2 3

Re: [PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Zhiyi Zhang 05 Jun '18

05 Jun '18

On Tue 6 5 14:39, Hua Meng wrote: > Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> > --- > dlls/msvcp120/tests/msvcp120.c | 120 +++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 117 insertions(+), 3 deletions(-) > mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c Hi, I don't think you need to change the file permission from 644 to 755. And there are some style inconsistencies. Thanks, Zhiyi Zhang > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > old mode 100644 > new mode 100755 > index dfd2d06..84e20bd > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -35,6 +35,7 @@ struct expect_struct { > DEFINE_EXPECT(queue_char__Move_item); > DEFINE_EXPECT(queue_char__Copy_item); > DEFINE_EXPECT(queue_char__Assign_and_destroy_item); > + DEFINE_EXPECT(concurrent_vector_int_alloc); > }; > > #define SET_EXPECT(func) \ > @@ -105,6 +106,8 @@ struct thiscall_thunk > > static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); > static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); > +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, > + const void *b ); > > static void init_thiscall_thunk(void) > { > @@ -117,17 +120,19 @@ static void init_thiscall_thunk(void) > thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ > call_thiscall_func1 = (void *)thunk; > call_thiscall_func2 = (void *)thunk; > + call_thiscall_func3 = (void *)thunk; > } > > #define call_func1(func,_this) call_thiscall_func1(func,_this) > #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) > - > +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ > + (const void*)(b)) > #else > > #define init_thiscall_thunk() > #define call_func1(func,_this) func(_this) > #define call_func2(func,_this,a) func(_this,a) > - > +#define call_func3(func,_this,a,b) func(_this,a,b) > #endif /* __i386__ */ > > static inline float __port_infinity(void) > @@ -360,6 +365,19 @@ static void (__thiscall *p_queue_base_v4__Internal_move_push)(queue_base_v4*, vo > static MSVCP_bool (__thiscall *p_queue_base_v4__Internal_pop_if_present)(queue_base_v4*, void*); > static void (__thiscall *p_queue_base_v4__Internal_finish_clear)(queue_base_v4*); > > +typedef struct vector_base_v4 > +{ > + void* (__cdecl *allocator)(struct vector_base_v4 *, size_t); > + void *storage[3]; > + size_t first_block; > + size_t early_size; > + void **segment; > +} vector_base_v4; > + > +static void (__thiscall *p_vector_base_v4_dtor)(vector_base_v4*); > +static size_t (__thiscall *p_vector_base_v4__Internal_capacity)(vector_base_v4*); > +static void* (__thiscall *p_vector_base_v4__Internal_push_back)(vector_base_v4*, size_t, size_t*); > + > static HMODULE msvcp; > #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) > #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) > @@ -493,7 +511,13 @@ static BOOL init(void) > "?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IEAA_NPEAX@Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear@_Concurrent_queue_base_v4@details@Concurrency@@IEAAXXZ"); > - } else { > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4@details@Concurrency@@IEAA@XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IEBA_KXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back@_Concurrent_vector_base_v4@details@Concurrency@@IEAAPEAX_KAEA_K@Z"); > +} else { > SET(p_tr2_sys__File_size, > "?_File_size@sys@tr2@std@@YA_KPBD@Z"); > SET(p_tr2_sys__File_size_wchar, > @@ -596,6 +620,12 @@ static BOOL init(void) > "?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IAE_NPAX@Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear@_Concurrent_queue_base_v4@details@Concurrency@@IAEXXZ"); > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4@details@Concurrency@@IAE@XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IBEIXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back@_Concurrent_vector_base_v4@details@Concurrency@@IAEPAXIAAI@Z"); > #else > SET(p__Thrd_current, > "_Thrd_current"); > @@ -627,6 +657,12 @@ static BOOL init(void) > "?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IAA_NPAX@Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear@_Concurrent_queue_base_v4@details@Concurrency@@IAAXXZ"); > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4@details@Concurrency@@IAA@XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IBAIXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back@_Concurrent_vector_base_v4@details@Concurrency@@IAAPAXIAAI@Z"); > #endif > } > SET(p__Thrd_equal, > @@ -2396,6 +2432,83 @@ static DWORD WINAPI queue_pop_thread(void*arg) > return 0; > } > > +static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) > +{ > + CHECK_EXPECT(concurrent_vector_int_alloc); > + return malloc(n*sizeof(int)); > +} > + > +static void concurrent_vector_int_ctor(vector_base_v4 *this) > +{ > + memset(this, 0, sizeof(*this)); > + this->allocator = concurrent_vector_int_alloc; > + this->segment = &this->storage[0]; > +} > + > +static void test_vector_base_v4(void) > +{ > + vector_base_v4 vector; > + size_t idx; > + size_t size; > + int *data; > + > + /* test for concurrent_vector_base_v4__Internal_push_back and _Internal_capacity */ > + concurrent_vector_int_ctor(&vector); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 0, "size of vector got %ld expected %d\n", (long)size, 0); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + if(!data){ > + skip("_Internal_capacity not yet implemented\n"); > + return; > + } > + todo_wine ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); > + *data = 1; > + todo_wine ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 1, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 1); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); > + > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + todo_wine ok(idx == 1, "idx got %ld expected %d\n", (long)idx, 1); > + *data = 2; > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 2, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 2); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + todo_wine ok(idx == 2, "idx got %ld expected %d\n", (long)idx, 2); > + *data = 3; > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 3, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 3); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); > + > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 8, "size of vector got %ld expected %d\n", (long)size, 8); > + > + call_func1(p_vector_base_v4_dtor, &vector); > +} > static void test_queue_base_v4(void) > { > queue_base_v4 queue; > @@ -2626,6 +2739,7 @@ START_TEST(msvcp120) > > test_vector_base_v4__Segment_index_of(); > test_queue_base_v4(); > + test_vector_base_v4(); > > test_vbtable_size_exports(); > >

1 0

[PATCH] netapi32: NetUserGetInfo should return Admin privilege - wine users run as Administrators
by Jeff Latimer 05 Jun '18

05 Jun '18

Resend to wine-devel. --- dlls/netapi32/netapi32.c | 11 +++++++---- dlls/netapi32/tests/access.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-)

2 1

Re: netapi32/tests: Fix a memory leak
by Marvin 05 Jun '18

05 Jun '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38962 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: netapi32: NetUserGetInfo should return Admin priviledge - wine users run as Administrators
by Marvin 05 Jun '18

05 Jun '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38961 Your paranoid android. === wxppro (32 bit access) === 0b40:access: unhandled exception c0000005 at 004025C6 === w2003std (32 bit access) === 06ac:access: unhandled exception c0000005 at 004025C6 === wvistau64 (32 bit access) === 072c:access: unhandled exception c0000005 at 004025C6 === wvistau64_zh_CN (32 bit access) === 0bbc:access: unhandled exception c0000005 at 004025C6 === wvistau64_fr (32 bit access) === 072c:access: unhandled exception c0000005 at 004025C6 === wvistau64_he (32 bit access) === 0bd8:access: unhandled exception c0000005 at 004025C6 === w2008s64 (32 bit access) === 086c:access: unhandled exception c0000005 at 004025C6 === w7u (32 bit access) === 0e48:access: unhandled exception c0000005 at 004025C6 === w7pro64 (32 bit access) === 0be0:access: unhandled exception c0000005 at 004025C6 === w8 (32 bit access) === 0d48:access: unhandled exception c0000005 at 004025C6 === w864 (32 bit access) === 0ad8:access: unhandled exception c0000005 at 004025C6 === w1064 (32 bit access) === 0784:access: unhandled exception c0000005 at 004025C6 === wvistau64 (64 bit access) === 073c:access: unhandled exception c0000005 at 00000000004022FB === w2008s64 (64 bit access) === 086c:access: unhandled exception c0000005 at 00000000004022FB === w7pro64 (64 bit access) === 0ab4:access: unhandled exception c0000005 at 00000000004022FB The previous 1 run(s) terminated abnormally === w864 (64 bit access) === 0264:access: unhandled exception c0000005 at 00000000004022FB === w1064 (64 bit access) === 0138:access: unhandled exception c0000005 at 00000000004022FB

1 0

Re: [PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Marvin 05 Jun '18

05 Jun '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38960 Your paranoid android. === wvistau64_zh_CN (32 bit msvcp120) === msvcp120.c:846: Test failed: cvtvec.isleadbyte[16] = fe msvcp120.c:846: Test failed: cvtvec.isleadbyte[17] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[18] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[19] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[20] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[21] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[22] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[23] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[24] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[25] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[26] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[27] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[28] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[29] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[30] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[31] = 7f

1 0

[PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Hua Meng 05 Jun '18

05 Jun '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 120 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c old mode 100644 new mode 100755 index dfd2d06..84e20bd --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -35,6 +35,7 @@ struct expect_struct { DEFINE_EXPECT(queue_char__Move_item); DEFINE_EXPECT(queue_char__Copy_item); DEFINE_EXPECT(queue_char__Assign_and_destroy_item); + DEFINE_EXPECT(concurrent_vector_int_alloc); }; #define SET_EXPECT(func) \ @@ -105,6 +106,8 @@ struct thiscall_thunk static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, + const void *b ); static void init_thiscall_thunk(void) { @@ -117,17 +120,19 @@ static void init_thiscall_thunk(void) thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; + call_thiscall_func3 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) - +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ + (const void*)(b)) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) - +#define call_func3(func,_this,a,b) func(_this,a,b) #endif /* __i386__ */ static inline float __port_infinity(void) @@ -360,6 +365,19 @@ static void (__thiscall *p_queue_base_v4__Internal_move_push)(queue_base_v4*, vo static MSVCP_bool (__thiscall *p_queue_base_v4__Internal_pop_if_present)(queue_base_v4*, void*); static void (__thiscall *p_queue_base_v4__Internal_finish_clear)(queue_base_v4*); +typedef struct vector_base_v4 +{ + void* (__cdecl *allocator)(struct vector_base_v4 *, size_t); + void *storage[3]; + size_t first_block; + size_t early_size; + void **segment; +} vector_base_v4; + +static void (__thiscall *p_vector_base_v4_dtor)(vector_base_v4*); +static size_t (__thiscall *p_vector_base_v4__Internal_capacity)(vector_base_v4*); +static void* (__thiscall *p_vector_base_v4__Internal_push_back)(vector_base_v4*, size_t, size_t*); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -493,7 +511,13 @@ static BOOL init(void) "?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IEAA_NPEAX@Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear@_Concurrent_queue_base_v4@details@Concurrency@@IEAAXXZ"); - } else { + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4@details@Concurrency@@IEAA@XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IEBA_KXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back@_Concurrent_vector_base_v4@details@Concurrency@@IEAAPEAX_KAEA_K@Z"); +} else { SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPBD@Z"); SET(p_tr2_sys__File_size_wchar, @@ -596,6 +620,12 @@ static BOOL init(void) "?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IAE_NPAX@Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear@_Concurrent_queue_base_v4@details@Concurrency@@IAEXXZ"); + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4@details@Concurrency@@IAE@XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IBEIXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back@_Concurrent_vector_base_v4@details@Concurrency@@IAEPAXIAAI@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -627,6 +657,12 @@ static BOOL init(void) "?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IAA_NPAX@Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear@_Concurrent_queue_base_v4@details@Concurrency@@IAAXXZ"); + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4@details@Concurrency@@IAA@XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity@_Concurrent_vector_base_v4@details@Concurrency@@IBAIXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back@_Concurrent_vector_base_v4@details@Concurrency@@IAAPAXIAAI@Z"); #endif } SET(p__Thrd_equal, @@ -2396,6 +2432,83 @@ static DWORD WINAPI queue_pop_thread(void*arg) return 0; } +static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) +{ + CHECK_EXPECT(concurrent_vector_int_alloc); + return malloc(n*sizeof(int)); +} + +static void concurrent_vector_int_ctor(vector_base_v4 *this) +{ + memset(this, 0, sizeof(*this)); + this->allocator = concurrent_vector_int_alloc; + this->segment = &this->storage[0]; +} + +static void test_vector_base_v4(void) +{ + vector_base_v4 vector; + size_t idx; + size_t size; + int *data; + + /* test for concurrent_vector_base_v4__Internal_push_back and _Internal_capacity */ + concurrent_vector_int_ctor(&vector); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 0, "size of vector got %ld expected %d\n", (long)size, 0); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + if(!data){ + skip("_Internal_capacity not yet implemented\n"); + return; + } + todo_wine ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); + *data = 1; + todo_wine ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 1, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 1); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); + + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + todo_wine ok(idx == 1, "idx got %ld expected %d\n", (long)idx, 1); + *data = 2; + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 2, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 2); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + todo_wine ok(idx == 2, "idx got %ld expected %d\n", (long)idx, 2); + *data = 3; + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 3, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 3); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); + + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 8, "size of vector got %ld expected %d\n", (long)size, 8); + + call_func1(p_vector_base_v4_dtor, &vector); +} static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2626,6 +2739,7 @@ START_TEST(msvcp120) test_vector_base_v4__Segment_index_of(); test_queue_base_v4(); + test_vector_base_v4(); test_vbtable_size_exports(); -- 2.11.0

1 0

[PATCH 2/2] wbemdisp/tests: Add ISWbemSecurity tests
by Alistair Leslie-Hughes 05 Jun '18

05 Jun '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemdisp/tests/wbemdisp.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91e..b8cd5c8 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -265,7 +265,10 @@ static void test_locator(void) ISWbemObject *object; ISWbemPropertySet *prop_set; ISWbemProperty *prop; + ISWbemSecurity *security; VARIANT var; + WbemImpersonationLevelEnum level; + WbemAuthenticationLevelEnum authenication; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,21 @@ static void test_locator(void) SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + hr = ISWbemLocator_get_Security_( locator, &security ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelImpersonate ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_ImpersonationLevel( security, &level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( level == wbemImpersonationLevelImpersonate, "got %d\n", level ); + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelPktPrivacy ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_AuthenticationLevel( security, &authenication ); + ok( hr == S_OK, "got %x\n", hr ); + ok( authenication == wbemAuthenticationLevelPktPrivacy, "got %d\n", authenication ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +336,16 @@ static void test_locator(void) ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); + hr = ISWbemServices_get_Security_( services, &security ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_ImpersonationLevel( security, &level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( level == wbemImpersonationLevelImpersonate, "got %d\n", level ); + hr = ISWbemSecurity_get_AuthenticationLevel( security, &authenication ); + ok( hr == S_OK, "got %x\n", hr ); + ok( authenication == wbemAuthenticationLevelPktPrivacy, "got %d\n", authenication ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); -- 1.9.1

1 0

[PATCH 1/2] wbemdisp: Add ISWbemSecurity stub interface.
by Alistair Leslie-Hughes 05 Jun '18

05 Jun '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemdisp/locator.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e782d1f..cdc0ab4 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); enum type_id { @@ -47,6 +48,7 @@ enum type_id ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, + ISWbemSecurity_tid, last_tid }; @@ -60,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemObjectSet, &IID_ISWbemProperty, &IID_ISWbemPropertySet, - &IID_ISWbemServices + &IID_ISWbemServices, + &IID_ISWbemSecurity }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -1873,8 +1876,12 @@ static HRESULT WINAPI services_get_Security_( ISWbemServices *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "\n" ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemServicesVtbl services_vtbl = @@ -2128,8 +2135,12 @@ static HRESULT WINAPI locator_get_Security_( ISWbemLocator *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "%p, %p\n", iface, objWbemSecurity ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemLocatorVtbl locator_vtbl = @@ -2160,3 +2171,231 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct security +{ + ISWbemSecurity ISWbemSecurity_iface; + LONG refs; + WbemImpersonationLevelEnum implevel; + WbemAuthenticationLevelEnum authlevel; +}; + +static inline struct security *impl_from_ISWbemSecurity( ISWbemSecurity *iface ) +{ + return CONTAINING_RECORD( iface, struct security, ISWbemSecurity_iface ); +} + +static ULONG WINAPI security_AddRef( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + return InterlockedIncrement( &security->refs ); +} + +static ULONG WINAPI security_Release( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + LONG refs = InterlockedDecrement( &security->refs ); + if (!refs) + { + TRACE( "destroying %p\n", security ); + heap_free( security ); + } + return refs; +} + +static HRESULT WINAPI security_QueryInterface( + ISWbemSecurity *iface, + REFIID riid, + void **ppvObject ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %s, %p\n", security, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemSecurity ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemSecurity_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfoCount( + ISWbemSecurity *iface, + UINT *count ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %p\n", security, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfo( + ISWbemSecurity *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + + return get_typeinfo( ISWbemSecurity_tid, info ); +} + +static HRESULT WINAPI security_GetIDsOfNames( + ISWbemSecurity *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_Invoke( + ISWbemSecurity *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &security->ISWbemSecurity_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_get_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum *impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, impersonation_level ); + + if (!impersonation_level) + return E_INVALIDARG; + + *impersonation_level = security->implevel; + return S_OK; +} + +static HRESULT WINAPI security_put_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, impersonation_level ); + + security->implevel = impersonation_level; + return S_OK; +} + +static HRESULT WINAPI security_get_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum *authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, authentication_level ); + + if (!authentication_level) + return E_INVALIDARG; + + *authentication_level = security->authlevel; + return S_OK; +} + +static HRESULT WINAPI security_put_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, authentication_level ); + + security->authlevel = authentication_level; + return S_OK; +} + +static HRESULT WINAPI security_get_Privileges( + ISWbemSecurity *iface, + ISWbemPrivilegeSet **privilege_set ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, privilege_set ); + + if (!privilege_set) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const ISWbemSecurityVtbl security_vtbl = +{ + security_QueryInterface, + security_AddRef, + security_Release, + security_GetTypeInfoCount, + security_GetTypeInfo, + security_GetIDsOfNames, + security_Invoke, + security_get_ImpersonationLevel, + security_put_ImpersonationLevel, + security_get_AuthenticationLevel, + security_put_AuthenticationLevel, + security_get_Privileges +}; + +static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) +{ + struct security *security; + + TRACE( "%p\n", obj ); + + if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; + security->refs = 1; + security->implevel = wbemImpersonationLevelImpersonate; + security->authlevel = wbemAuthenticationLevelPktPrivacy; + + *obj = &security->ISWbemSecurity_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 1.9.1

1 0

[PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.
by Zebediah Figura 04 Jun '18

04 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 66 ++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f4ad8f9..e4fe91e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3964,6 +3964,38 @@ static char *print_size(BSTR name, TYPEATTR *attr) return buf; } +static char *print_align(BSTR name, TYPEATTR *attr) +{ + static char buf[256]; + + switch (attr->typekind) + { + case TKIND_DISPATCH: + case TKIND_INTERFACE: + sprintf(buf, "TYPE_ALIGNMENT(%s*)", dump_string(name)); + break; + + case TKIND_RECORD: + sprintf(buf, "TYPE_ALIGNMENT(struct %s)", dump_string(name)); + break; + + case TKIND_UNION: + sprintf(buf, "TYPE_ALIGNMENT(union %s)", dump_string(name)); + break; + + case TKIND_ENUM: + case TKIND_ALIAS: + sprintf(buf, "4"); + break; + + default: + assert(0); + return NULL; + } + + return buf; +} + static const char *dump_param_flags(DWORD flags) { static char buf[256]; @@ -4072,10 +4104,10 @@ static void test_dump_typelib(const char *name) printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); - printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %d, /*size*/ %s,\n" + printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n" " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d", map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags), - attr->cbAlignment, print_size(name, attr), + print_align(name, attr), print_size(name, attr), help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs); @@ -4175,13 +4207,13 @@ static const type_info info[] = { { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct g), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(test_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4203,7 +4235,7 @@ static const type_info info[] = { { "parent_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(parent_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4225,7 +4257,7 @@ static const type_info info[] = { { "child_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(child_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, { { @@ -4245,7 +4277,7 @@ static const type_info info[] = { { "_n", "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _n), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4263,7 +4295,7 @@ static const type_info info[] = { { "_m", "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _m), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4281,7 +4313,7 @@ static const type_info info[] = { { "IDualIface", "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", - /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4, /*size*/ sizeof(IDualIface*), + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, { { @@ -4423,7 +4455,7 @@ static const type_info info[] = { { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ISimpleIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, { { @@ -4443,13 +4475,13 @@ static const type_info info[] = { { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_struct2", "{4029f190-ca4a-4611-aeb9-673983cb96de}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4533,13 +4565,13 @@ static const type_info info[] = { { "_e", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct _e), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ee", "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct ee), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4551,19 +4583,19 @@ static const type_info info[] = { { "_f", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union _f), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ff", "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union ff), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ITestIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, { { -- 2.7.4

4 8

[PATCH 1/5] dbghelp: Read the ELF program header corresponding to the target's architecture.
by Zebediah Figura 04 Jun '18

04 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 31 ++++++++++++++++++++++++------- dlls/dbghelp/image_private.h | 2 -- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8049210..f84df83 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -332,7 +332,6 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; unsigned int i; - Elf_Phdr phdr; size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; @@ -429,13 +428,31 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + if (fmap->addr_size == 32) { - tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; - if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; - if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + Elf32_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } + } + else + { + Elf64_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } } } /* if non relocatable ELF, then remove fixed address from computation diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 42781e4..3951464 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,12 +59,10 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t -- 2.7.4

1 4

[PATCH] jscript: Fix MSVC build.
by Thomas Faber 04 Jun '18

04 Jun '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9b47368cf89..65ca47a5151 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1793,6 +1793,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) { - property_desc_t prop_desc = { flags, flags, TRUE, value }; + property_desc_t prop_desc = { flags, flags, TRUE }; + prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); } -- 2.16.1.windows.2

2 1

[PATCH] dism: add stub program
by Austin English 04 Jun '18

04 Jun '18

For https://bugs.winehq.org/show_bug.cgi?id=43509 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + programs/dism/Makefile.in | 4 ++++ programs/dism/dism.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 programs/dism/Makefile.in create mode 100644 programs/dism/dism.c diff --git a/configure.ac b/configure.ac index 600cb63b9f..469fa8d729 100644 --- a/configure.ac +++ b/configure.ac @@ -3869,6 +3869,7 @@ WINE_CONFIG_MAKEFILE(programs/cmd/tests) WINE_CONFIG_MAKEFILE(programs/conhost) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) +WINE_CONFIG_MAKEFILE(programs/dism) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in new file mode 100644 index 0000000000..834d1439a8 --- /dev/null +++ b/programs/dism/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dism.exe +APPMODE = -mconsole -municode + +C_SRCS = dism.c diff --git a/programs/dism/dism.c b/programs/dism/dism.c new file mode 100644 index 0000000000..86d5d2e6a3 --- /dev/null +++ b/programs/dism/dism.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dism); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.16.1

1 0

[PATCH 1/2] testbot: Make sure optional enum properties are not used.
by Francois Gouget 04 Jun '18

04 Jun '18

They are not supported and trying to set them to an undefined value will trigger errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index d5850698e..d8f0d391b 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -42,6 +42,10 @@ sub _initialize($$) $self->{Class} = "Enum"; $self->{Values} = $Values; + if (!$self->{IsRequired}) + { + die "Optional enum properties are not supported\n"; + } $self->SUPER::_initialize(); } -- 2.17.0

1 1

[PATCH] user32: add stub for RegisterPointerDeviceNotifications
by Louis Lenders 04 Jun '18

04 Jun '18

See https://bugs.winehq.org/show_bug.cgi?id=45284 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 895ccce312..be4b71a4bc 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -837,6 +837,15 @@ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UIN return ERROR_NOT_SUPPORTED; } +/********************************************************************** + * RegisterPointerDeviceNotifications [USER32.@] + */ +BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) +{ + FIXME("(%p %d): stub\n", hwnd, notifyrange); + return FALSE; +} + static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index eb71e3b00b..2e5b203a85 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -598,6 +598,7 @@ @ stdcall RegisterLogonProcess(long long) # @ stub RegisterMessagePumpHook @ stub RegisterNetworkCapabilities +@ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) diff --git a/include/winuser.h b/include/winuser.h index 8e9e91bf65..648efbe0e2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4004,6 +4004,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD); WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); #define RegisterDeviceNotification WINELIB_NAME_AW(RegisterDeviceNotification) WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); -- 2.17.0

1 0

[PATCH 2/2] user32: Respect margins more in DrawTextExW().
by Zhiyi Zhang 04 Jun '18

04 Jun '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 286c4f52d0..118dbeb559 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -943,6 +943,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, { lmargin = dtp->iLeftMargin; rmargin = dtp->iRightMargin; + width -= lmargin + rmargin; if (!(flags & (DT_CENTER | DT_RIGHT))) x += lmargin; dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */ @@ -978,9 +979,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, retstr, tabwidth, &prefix_offset, &ellip); - if (flags & DT_CENTER) x = (rect->left + rect->right - - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; + if (flags & DT_CENTER) + x = (rect->left + lmargin + rect->right - rmargin - size.cx) / 2; + else if (flags & DT_RIGHT) + x = rect->right - size.cx - rmargin; if (flags & DT_SINGLELINE) { -- 2.17.0

2 1

[PATCH 1/2] user32: Return 1 in DrawTextEx() when calculated offset is 0.
by Zhiyi Zhang 04 Jun '18

04 Jun '18

The return value 0 in DrawTextEx() indicates failure. Should the offset from the bottom of the drawn text to top of the rectangle happens to be 0, return 1 instead. So that it doesn't indicate failure incidentally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 15 +++++++++++++++ dlls/user32/text.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..c5bcd50716 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -277,6 +277,21 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); + /* When offset to top is zero, return 1 */ + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRect(&rect, 0, 100, 0, 100); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_TOP, NULL); + /* Set top to text height and bottom zero, so bottom of drawn text to top is zero when DT_VCENTER is used */ + SetRect(&rect, 0, textheight, 0, 0); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_VCENTER, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); /* invalid dtp size test */ dtp.cbSize = -1; /* Invalid */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 8a2c247d8d..286c4f52d0 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1064,6 +1064,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) memcpy(str, retstr, size_retstr); ret = y - rect->top; + if (ret == 0) ret = 1; done: heap_free(retstr); return ret; -- 2.17.0

2 1

[PATCH] mmdevapi/tests: Remove an ARRAY_SIZE()-like macro
by Michael Stefaniuc 04 Jun '18

04 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d3e8617b9..a4e94b15e0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = { {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; - for(i = 0; i < NB_WIN_FORMATS; i++) { + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); -- 2.14.4

2 1

[PATCH] testbot: Improve Job file storage.
by Francois Gouget 04 Jun '18

04 Jun '18

So far files needed by a Step were stored in that Step's directory. This means the files produced by a Step are stored in the directory of the Step that needs them. Since multiple Steps may need the same file this can result in duplication (and also in retrieving the same file multiple times). This duplication is also needed for staging files if they are needed by more than one Step. This patch changes file storage so that files produced by a Step are stored in that Step's directory. Conversely files needed by a Step are found in the PreviousNo Step's directory, or in the Job's directory if PreviousNo is not set. This avoids duplication both when retrieving files from a VM and for staged files. To simplify the code Step::GetFullFileName() converts Step::FileName to an absolute path pointing to the Step's file. To ensure backward compatibility with existing Jobs it supports both the old and the new schemes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 13 ++++++------- testbot/bin/WineRunTask.pl | 5 ++--- testbot/lib/WineTestBot/Steps.pm | 25 +++++++++++++++++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 18 ++++++++++++++++++ testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 2 +- 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 27b8be0e0..7a474e76d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -354,11 +354,10 @@ if (!defined $BaseName) # Run the build # -my $StepDir = $Step->GetDir(); -my $FileName = $Step->FileName; +my $FileName = $Step->GetFullFileName(); my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", "staging/patch.diff", 0)) +Debug(Elapsed($Start), " Sending '$FileName'\n"); +if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) { FatalTAError($TA, "Could not copy the patch to the VM"); } @@ -461,6 +460,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Don't try copying the test executables if the build step failed if ($NewStatus eq "completed") { + my $StepDir = $Step->CreateDir(); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { next if ($OtherStep->No == $StepNo); @@ -480,12 +480,11 @@ if ($NewStatus eq "completed") } Debug(Elapsed($Start), " Retrieving '$OtherFileName'\n"); - my $OtherStepDir = $OtherStep->CreateDir(); - if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) + if (!$TA->GetFile($TestExecutable, "$StepDir/$OtherFileName")) { FatalTAError($TA, "Could not retrieve '$OtherFileName'"); } - chmod 0664, "$OtherStepDir/$OtherFileName"; + chmod 0664, "$StepDir/$OtherFileName"; } } $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 231f34e0c..d75741757 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -388,10 +388,9 @@ if ($FileType ne "exe32" && $FileType ne "exe64") { FatalError("Unexpected file type $FileType found\n"); } -my $StepDir = $Step->GetDir(); my $FileName = $Step->FileName; -Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", $FileName, 0)) +Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); +if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) { FatalTAError($TA, "Could not copy the test executable to the VM"); } diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 4dc45690e..977419474 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -57,6 +57,12 @@ the Step was running, and to skipped if it was queued. =back +If FileName is set it identifies a file that the Step needs for its operation. +That file will either be in the directory of the PreviousNo Step that produced +it, or in the directory of the job if it was provided by the user. +Conversely a Step's Task(s) may produce one or more files. These are all stored +in that Step's directory and may be used by one or more Steps. + Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, or to reset their PreviousNo fields beforehand. @@ -136,6 +142,21 @@ sub RmTree($) rmtree($Dir); } +sub GetFullFileName($) +{ + my ($self) = @_; + + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; + # FIXME: Remove legacy support once no such job remains (so after + # $JobPurgeDays). + my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; + return $LegacyPath if (-f $LegacyPath); + + my $Path = "$DataDir/jobs/$JobId/"; + $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); + return $Path . $self->FileName; +} + sub HandleStaging($$) { my ($self) = @_; @@ -150,13 +171,13 @@ sub HandleStaging($$) return "Can't split staging filename"; } my $BaseName = $1; + $self->FileName($BaseName); my $StagingFileName = "$DataDir/staging/$FileName"; - if (!move($StagingFileName, "$StepDir/$BaseName")) + if (!move($StagingFileName, $self->GetFullFileName())) { return "Could not move the staging file: $!"; } - $self->FileName($BaseName); $self->InStaging(!1); my ($ErrProperty, $ErrMessage) = $self->Save(); diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index db0cc0667..b9f70d768 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -39,6 +39,22 @@ sub GetStepDir($) return "$DataDir/jobs/$JobId/". $self->StepNo; } +# See WineTestBot::Step::GetFullFileName() +sub GetFullFileName($) +{ + my ($self) = @_; + + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; + # FIXME: Remove legacy support once no such job remains (so after + # $JobPurgeDays). + my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; + return $LegacyPath if (-f $LegacyPath); + + my $Path = "$DataDir/jobs/$JobId/"; + $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); + return $Path . $self->FileName; +} + sub GetTaskDir($) { my ($self) = @_; @@ -121,6 +137,7 @@ sub _initialize($$) my $StepTask = $self->CreateItem(); $StepTask->Id(100 * $Step->No + $Task->No); $StepTask->StepNo($Step->No); + $StepTask->PreviousNo($Step->PreviousNo); $StepTask->TaskNo($Task->No); $StepTask->Type($Step->Type); $StepTask->Status($Task->Status); @@ -166,6 +183,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a178cca42..7e274a8bf 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -52,7 +52,7 @@ sub GetFile($$$) return !1; } - my $FileName = $Step->GetDir() ."/". $Step->FileName; + my $FileName = $Step->GetFullFileName(); if (! sysopen(FILE, $FileName, O_RDONLY)) { return !1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 4d9a77a57..6bf4a12e8 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -485,7 +485,7 @@ sub GenerateDataCell($$$$$) } elsif ($PropertyName eq "FileName") { - my $FileName = $StepTask->GetStepDir() ."/". $StepTask->FileName; + my $FileName = $StepTask->GetFullFileName(); if (-r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . -- 2.17.0

1 0

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.
by Francois Gouget 04 Jun '18

04 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

1 0

[PATCH] ole32: Don't try to unregister window class if it was never registered.
by Jacek Caban 04 Jun '18

04 Jun '18

UnregisterClass may load display driver, which is may be problematic inside DLL_PROCESS_DETACH (esp. in Android drivers, which imports ole32 itself). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/compobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

2 1

[PATCH v2] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)
by Alex Henrie 04 Jun '18

04 Jun '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Also free the paths in pStrokes dlls/gdi32/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 41cab60515..49e270c4fe 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + for(i = 0; i < numStrokes; i++) free_gdi_path(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } } -- 2.17.0

2 1

[PATCH] msctf/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 03 Jun '18

03 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a02f95117..4a52432aa5 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -981,7 +981,8 @@ static void test_Register(void) ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); - hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); + hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, + &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2088,7 +2089,7 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + StringFromGUID2(&g,str,ARRAY_SIZE(str)); WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g)) -- 2.14.4

1 0

[PATCH] mpr/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 03 Jun '18

03 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 041afbf130..fc067d98c4 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -60,7 +60,7 @@ static void test_WNetGetUniversalName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) @@ -132,7 +132,7 @@ static void test_WNetGetRemoteName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) -- 2.14.4

1 0

[PATCH] mapi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 03 Jun '18

03 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mapi32/tests/prop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 4e099318f5..4d7fd7be43 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -135,7 +135,7 @@ static void test_PropCopyMore(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { lpSrc->ulPropTag = ptTypes[i]; @@ -453,11 +453,11 @@ static void test_FPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(FPCProp_Results)/sizeof(FPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(FPCProp_Results); j++) { SHORT lVal = FPCProp_Results[j].lVal; SHORT rVal = FPCProp_Results[j].rVal; @@ -583,11 +583,11 @@ static void test_LPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(LPCProp_Results)/sizeof(LPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(LPCProp_Results); j++) { SHORT lVal = LPCProp_Results[j].lVal; SHORT rVal = LPCProp_Results[j].rVal; @@ -684,7 +684,7 @@ static void test_PpropFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = ptTypes[i]; @@ -923,7 +923,7 @@ static void test_LpValFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); -- 2.14.4

1 0

[PATCH] localui/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 03 Jun '18

03 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/tests/localui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index b0b51e338c..f051880fd1 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -310,7 +310,7 @@ START_TEST(localui) while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; sprintf(bufferA, fmt_lptA, id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); @@ -321,7 +321,7 @@ START_TEST(localui) while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; sprintf(bufferA, fmt_comA, id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); -- 2.14.4

1 0

[resend PATCH 1/2] include: Add ID2D1DeviceContext definition.
by Nikolay Sivov 03 Jun '18

03 Jun '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Same patch, resending. include/d2d1_1.idl | 284 ++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 20 ++++ 2 files changed, 304 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4b6224afe3..4d30f6fd34 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -27,7 +27,18 @@ interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; interface IWICImagingFactory; +interface IWICColorContext; interface ID2D1ColorContext; +interface ID2D1Effect; +interface ID2D1GradientStopCollection1; +interface ID2D1ImageBrush; +interface ID2D1BitmapBrush1; +interface ID2D1CommandList; + +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __dwrite_h__ */") typedef enum D2D1_DEVICE_CONTEXT_OPTIONS { @@ -96,7 +107,63 @@ typedef enum D2D1_MAP_OPTIONS D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff, } D2D1_MAP_OPTIONS; +typedef enum D2D1_BUFFER_PRECISION +{ + D2D1_BUFFER_PRECISION_UNKNOWN = 0, + D2D1_BUFFER_PRECISION_8BPC_UNORM = 1, + D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB = 2, + D2D1_BUFFER_PRECISION_16BPC_UNORM = 3, + D2D1_BUFFER_PRECISION_16BPC_FLOAT = 4, + D2D1_BUFFER_PRECISION_32BPC_FLOAT = 5, + D2D1_BUFFER_PRECISION_FORCE_DWORD = 0xffffffff, +} D2D1_BUFFER_PRECISION; + +typedef enum D2D1_COLOR_INTERPOLATION_MODE +{ + D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0, + D2D1_COLOR_INTERPOLATION_MODE_PREMULTIPLIED = 1, + D2D1_COLOR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_INTERPOLATION_MODE; + +typedef enum D2D1_INTERPOLATION_MODE +{ + D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_INTERPOLATION_MODE_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC, + D2D1_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR, + D2D1_INTERPOLATION_MODE_ANISOTROPIC = D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC, + D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC, + D2D1_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_MODE +{ + D2D1_COMPOSITE_MODE_SOURCE_OVER = 0, + D2D1_COMPOSITE_MODE_DESTINATION_OVER = 1, + D2D1_COMPOSITE_MODE_SOURCE_IN = 2, + D2D1_COMPOSITE_MODE_DESTINATION_IN = 3, + D2D1_COMPOSITE_MODE_SOURCE_OUT = 4, + D2D1_COMPOSITE_MODE_DESTINATION_OUT = 5, + D2D1_COMPOSITE_MODE_SOURCE_ATOP = 6, + D2D1_COMPOSITE_MODE_DESTINATION_ATOP = 7, + D2D1_COMPOSITE_MODE_XOR = 8, + D2D1_COMPOSITE_MODE_PLUS = 9, + D2D1_COMPOSITE_MODE_SOURCE_COPY = 10, + D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY = 11, + D2D1_COMPOSITE_MODE_MASK_INVERT = 12, + D2D1_COMPOSITE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMPOSITE_MODE; + +typedef enum D2D1_LAYER_OPTIONS1 +{ + D2D1_LAYER_OPTIONS1_NONE = 0, + D2D1_LAYER_OPTIONS1_INITIALIZE_FROM_BACKGROUND = 1, + D2D1_LAYER_OPTIONS1_IGNORE_ALPHA = 2, + D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, +} D2D1_LAYER_OPTIONS1; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { @@ -134,6 +201,54 @@ typedef struct D2D1_MAPPED_RECT BYTE *bits; } D2D1_MAPPED_RECT; +typedef struct D2D1_BITMAP_PROPERTIES1 +{ + D2D1_PIXEL_FORMAT pixelFormat; + float dpiX; + float dpiY; + D2D1_BITMAP_OPTIONS bitmapOptions; + ID2D1ColorContext *colorContext; +} D2D1_BITMAP_PROPERTIES1; + +typedef struct D2D1_IMAGE_BRUSH_PROPERTIES +{ + D2D1_RECT_F sourceRectangle; + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_IMAGE_BRUSH_PROPERTIES; + +typedef struct D2D1_BITMAP_BRUSH_PROPERTIES1 +{ + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_BITMAP_BRUSH_PROPERTIES1; + +typedef struct D2D1_RENDERING_CONTROLS +{ + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_SIZE_U tileSize; +} D2D1_RENDERING_CONTROLS; + +typedef struct D2D1_LAYER_PARAMETERS1 +{ + D2D1_RECT_F contentBounds; + ID2D1Geometry *geometricMask; + D2D1_ANTIALIAS_MODE maskAntialiasMode; + D2D1_MATRIX_3X2_F maskTransform; + float opacity; + ID2D1Brush *opacityBrush; + D2D1_LAYER_OPTIONS1 layerOptions; +} D2D1_LAYER_PARAMETERS1; + +typedef struct D2D1_EFFECT_INPUT_DESCRIPTION +{ + ID2D1Effect *effect; + UINT32 inputIndex; + D2D1_RECT_F inputRectangle; +} D2D1_EFFECT_INPUT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ @@ -183,6 +298,175 @@ interface ID2D1Device : ID2D1Resource ); } +[ + object, + uuid(e8f7fe7a-191c-466d-ad95-975678bda998), + local, +] +interface ID2D1DeviceContext : ID2D1RenderTarget +{ + HRESULT CreateBitmap( + [in] D2D1_SIZE_U size, + [in] const void *src_data, + [in] UINT32 pitch, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateBitmapFromWicBitmap( + [in] IWICBitmapSource *bitmap_source, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateBitmapFromDxgiSurface( + [in] IDXGISurface *surface, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateEffect( + [in] REFCLSID effect_id, + [out] ID2D1Effect **effect + ); + HRESULT CreateGradientStopCollection( + [in] const D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count, + [in] D2D1_COLOR_SPACE preinterpolation_space, + [in] D2D1_COLOR_SPACE postinterpolation_space, + [in] D2D1_BUFFER_PRECISION buffer_precision, + [in] D2D1_EXTEND_MODE extend_mode, + [in] D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, + [out] ID2D1GradientStopCollection1 **gradient + ); + HRESULT CreateImageBrush( + [in] ID2D1Image *image, + [in] const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1ImageBrush **brush + ); + HRESULT CreateBitmapBrush( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1BitmapBrush1 **bitmap_brush + ); + HRESULT CreateCommandList( + [out] ID2D1CommandList **command_list + ); + BOOL IsDxgiFormatSupported( + [in] DXGI_FORMAT format + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION buffer_precision + ); + void GetImageLocalBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *local_bounds + ); + HRESULT GetImageWorldBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *world_bounds + ); + HRESULT GetGlyphRunWorldBounds( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [out] D2D1_RECT_F *bounds + ); + void GetDevice( + [out] ID2D1Device **device + ); + void SetTarget( + [in] ID2D1Image *target + ); + void GetTarget( + [out] ID2D1Image **target + ); + void SetRenderingControls( + [in] const D2D1_RENDERING_CONTROLS *rendering_controls + ); + void GetRenderingControls( + [out] D2D1_RENDERING_CONTROLS *rendering_controls + ); + void SetPrimitiveBlend( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); + D2D1_PRIMITIVE_BLEND GetPrimitiveBlend(); + void SetUnitMode( + [in] D2D1_UNIT_MODE unit_mode + ); + D2D1_UNIT_MODE GetUnitMode(); + void DrawGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, + [in] ID2D1Brush *brush, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawImage( + [in] ID2D1Image *image, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_COMPOSITE_MODE composite_mode + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *metafile, + [in] const D2D1_POINT_2F *target_offset + ); + void DrawBitmap( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_F *dst_rect, + [in] float opacity, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] const D2D1_RECT_F *src_rect, + [in] const D2D1_MATRIX_4X4_F *perspective_transform + ); + void PushLayer( + [in] const D2D1_LAYER_PARAMETERS1 *layer_parameters, + [in] ID2D1Layer *layer + ); + HRESULT InvalidateEffectInputRectangle( + [in] ID2D1Effect *effect, + [in] UINT32 input, + [in] const D2D1_RECT_F *input_rect + ); + HRESULT GetEffectInvalidRectangleCount( + [in] ID2D1Effect *effect, + [out] UINT32 *rect_count + ); + HRESULT GetEffectInvalidRectangles( + [in] ID2D1Effect *effect, + [out] D2D1_RECT_F *rectangles, + [in] UINT32 rect_count + ); + HRESULT GetEffectRequiredInputRectangles( + [in] ID2D1Effect *effect, + [in] const D2D1_RECT_F *image_rect, + [in] const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + [out] D2D1_RECT_F *input_rect, + [in] UINT32 input_count + ); + void FillOpacityMask( + [in] ID2D1Bitmap *mask, + [in] ID2D1Brush *brush, + [in] const D2D1_RECT_F *dst_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), diff --git a/include/dcommon.idl b/include/dcommon.idl index db5055d202..e651a75d0e 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -61,3 +61,23 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; + +typedef struct D2D_MATRIX_4X4_F +{ + float _11; + float _12; + float _13; + float _14; + float _21; + float _22; + float _23; + float _24; + float _31; + float _32; + float _33; + float _34; + float _41; + float _42; + float _43; + float _44; +} D2D_MATRIX_4X4_F; -- 2.17.0

3 5

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.
by Francois Gouget 03 Jun '18

03 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

1 0

Help with running Wine
by mrt303xx＠aol.com 02 Jun '18

02 Jun '18

I installed Wine, built and compiled Wine 3.9, and ran Winetricks to add the MS dependencies but nothing runs, not even a basic "Hello World" Windows app with NO MFC. Can somebody point me in the right direction?

1 0

[PATCH] propsys/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/tests/propsys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a6c7023527..e899ff9dc4 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -133,7 +133,7 @@ static void test_PSStringFromPropertyKey(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].psz) memcpy(testcases[i].psz, fillerW, PKEYSTR_MAX * sizeof(WCHAR)); @@ -413,7 +413,7 @@ static void test_PSPropertyKeyFromString(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].pkey) *testcases[i].pkey = out_init; @@ -480,7 +480,7 @@ static void test_InitPropVariantFromGUIDAsString(void) InitVariantFromGUIDAsString(&IID_NULL, NULL); } - for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + for(i=0; i < ARRAY_SIZE(testcases); i++) { memset(&propvar, 0, sizeof(PROPVARIANT)); hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); -- 2.14.4

1 0

[PATCH] pdh/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pdh/tests/pdh.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 573bcc3a10..0a17906afb 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -700,21 +700,21 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(processor_time), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || ret == PDH_MORE_DATA, /* win2k3 */ "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(uptime), "PdhLookupPerfNameByIndexW failed %d\n", size); } static void test_PdhValidatePathA( void ) -- 2.14.4

1 0

[PATCH] packager/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1f81cb5404..1ce54eda7e 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -457,7 +457,7 @@ static void test_packager(void) ok(hr == S_OK, "Load failed: %08x\n", hr); if(extended){ - len = GetTempPathW(sizeof(filename) / sizeof(*filename), filename); + len = GetTempPathW(ARRAY_SIZE(filename), filename); lstrcpyW(filename + len, filename3W); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, -- 2.14.4

1 0

[PATCH] opengl32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8126fbf96d..b69d91caf9 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -525,7 +525,7 @@ static void test_colorbits(HDC hdc) { const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; BOOL res; @@ -545,8 +545,8 @@ static void test_colorbits(HDC hdc) return; } - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), iAttribList, + iAttribRet); if(res == FALSE) { skip("wglGetPixelFormatAttribivARB failed\n"); @@ -560,7 +560,7 @@ static void test_colorbits(HDC hdc) static void test_gdi_dbuf(HDC hdc) { const int iAttribList[] = { WGL_SUPPORT_GDI_ARB, WGL_DOUBLE_BUFFER_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; BOOL res; @@ -574,9 +574,8 @@ static void test_gdi_dbuf(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1;iPixelFormat <= nFormats;iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; @@ -588,7 +587,7 @@ static void test_gdi_dbuf(HDC hdc) static void test_acceleration(HDC hdc) { const int iAttribList[] = { WGL_ACCELERATION_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; int res; @@ -603,9 +602,8 @@ static void test_acceleration(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; -- 2.14.4

1 0

[PATCH] oledlg/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledlg/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 5d452f1b09..cef55eb9ca 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -385,7 +385,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STATE|MIIM_ID|MIIM_STRING|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 3, TRUE, &info); ok(ret, "got %d\n", ret); ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); @@ -406,7 +406,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STRING|MIIM_STATE|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, @@ -462,7 +462,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); buffW[0] = 0; - GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + GetMenuStringW(hMenu, 0, buffW, ARRAY_SIZE(buffW), MF_BYPOSITION); ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); verbmenu = NULL; @@ -475,7 +475,7 @@ static void test_OleUIAddVerbMenu(void) info.fMask = MIIM_STRING|MIIM_STATE; buffW[0] = 0; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); -- 2.14.4

1 0

[PATCH] oledb32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/tests/convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 08256242fd..441624048a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -221,8 +221,8 @@ static void test_canconvert(void) return; } - for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) - for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) + for(src_idx = 0; src_idx < ARRAY_SIZE(simple_convert); src_idx++) + for(dst_idx = 0; dst_idx < ARRAY_SIZE(simple_convert); dst_idx++) { BOOL expect, simple_expect; simple_expect = (simple_convert[src_idx].can_convert_to >> dst_idx) & 1; @@ -1479,7 +1479,7 @@ static void test_converttowstr(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %ld\n", dst_len); ok(!lstrcmpW(hexunpacked_w, dst), "got %s\n", wine_dbgstr_w(dst)); - ok(dst[sizeof(hexpacked_w)/sizeof(WCHAR) * 4 + 1] == 0xcccc, "clobbered buffer\n"); + ok(dst[ARRAY_SIZE(hexpacked_w) * 4 + 1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); @@ -2045,7 +2045,7 @@ static void test_converttostr(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_a) * 2, "got %ld\n", dst_len); ok(!lstrcmpA(hexunpacked_a, dst), "got %s\n", dst); - ok(dst[sizeof(hexpacked_a)/sizeof(char) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); + ok(dst[ARRAY_SIZE(hexpacked_a) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); -- 2.14.4

1 0

[PATCH] hlink/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 01 Jun '18

01 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/tests/hlink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 265dea3f45..52b5c57f9e 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -120,7 +120,7 @@ static void test_HlinkIsShortcut(void) {NULL, E_INVALIDARG} }; - for(i=0; i<sizeof(shortcut_test)/sizeof(shortcut_test[0]); i++) { + for (i=0; i < ARRAY_SIZE(shortcut_test); i++) { hres = HlinkIsShortcut(shortcut_test[i].file); ok(hres == shortcut_test[i].hres, "[%d] HlinkIsShortcut returned %08x, expected %08x\n", i, hres, shortcut_test[i].hres); @@ -651,7 +651,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, winehq_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(winehq_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(winehq_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); @@ -667,7 +667,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, clsid_nameW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(clsid_nameW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(clsid_nameW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_IsSystemMoniker(mon, &issys); @@ -678,7 +678,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, invalid_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(invalid_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(invalid_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); @@ -694,7 +694,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, file_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(file_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(file_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); -- 2.14.4

1 0

[PATCH v3 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Zebediah Figura 01 Jun '18

01 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 12 +----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..4857d29 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,7 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

2 1

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Zebediah Figura 01 Jun '18

01 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..ea5dffe 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

2 1

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Zebediah Figura 01 Jun '18

01 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..ea5dffe 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

1 0

[PATCH 1/2] msvcrt: Avoid using inline assembly in __ExceptionPtrDestroy().
by Zebediah Figura 01 Jun '18

01 Jun '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 07cde75..3402d13 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1718,10 +1718,12 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) } #ifdef __i386__ -static inline void call_dtor(const cxx_exception_type *type, void *func, void *object) -{ - __asm__ __volatile__("call *%0" : : "m" (func), "c" (object) : "eax", "edx", "memory"); -} +extern void call_dtor(const cxx_exception_type *type, void *func, void *object); + +__ASM_GLOBAL_FUNC( call_dtor, + "movl 12(%esp),%ecx\n\t" + "call *8(%esp)\n\t" + "ret" ); #elif __x86_64__ static inline void call_dtor(const cxx_exception_type *type, unsigned int dtor, void *object) { -- 2.7.4

3 4

[PATCH 1/5] dxgi: Translate VkResults to HRESULTs.
by Józef Kucia 01 Jun '18

01 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..a775df2446e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -847,6 +847,21 @@ struct dxgi_vk_funcs PFN_vkDestroyFence p_vkDestroyFence; }; +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + return E_OUTOFMEMORY; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + struct d3d12_swapchain { IDXGISwapChain3 IDXGISwapChain3_iface; @@ -1187,18 +1202,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) < 0) + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { - ERR("Failed to wait for fences, vr %d.\n", vr); - return E_FAIL; + ERR("Failed to wait for fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) { ERR("Failed to reset fence, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } return S_OK; @@ -1574,7 +1589,7 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, { WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); heap_free(formats); - return DXGI_ERROR_INVALID_CALL; + return hresult_from_vk_result(vr); } for (i = 0; i < format_count; ++i) @@ -1612,11 +1627,11 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkInstance vk_instance; - HRESULT hr = E_FAIL; VkBool32 supported; VkDevice vk_device; VkFormat vk_format; VkResult vr; + HRESULT hr; swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1; @@ -1674,6 +1689,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) { WARN("Failed to create Vulkan surface, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1682,17 +1698,18 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI queue_family_index, vk_surface, &supported)) < 0 || !supported) { FIXME("Queue family does not support presentation, vr %d.\n", vr); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) goto fail; - hr = E_FAIL; if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, vk_surface, &surface_caps)) < 0) { WARN("Failed to get surface capabilities, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1701,6 +1718,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1718,6 +1736,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1743,6 +1762,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) { WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1752,21 +1772,27 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); if (image_count > ARRAY_SIZE(vk_images)) + { + hr = E_FAIL; goto fail; + } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } -- 2.16.4

3 10

[PATCH] dxgi: Fix a trailing '\n' in a FIXME() trace.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b..5f151a86579 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1037,7 +1037,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain3 *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!n", iface, fullscreen, target); + FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); return E_NOTIMPL; } -- 2.17.0

2 1

[PATCH v2] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)
by Alex Henrie 01 Jun '18

01 Jun '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Moved the declaration of WCHAR into the if statement to be with all the other declarations dlls/gdi32/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..9f47578a70 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2823,6 +2823,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, UINT cp; int len; char mbchs[2]; + WCHAR wChar = 0; cp = GdiGetCodePage(hdc); if (IsDBCSLeadByteEx(cp, uChar >> 8)) { @@ -2833,8 +2834,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

1 0

[PATCH] winevulkan: Introduce WINE_VK_HOST to explicitly request 'host' Vulkan headers.
by Józef Kucia 01 Jun '18

01 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 2 +- dlls/dxgi/swapchain.c | 3 +-- dlls/winevulkan/make_vulkan | 7 ++++++- dlls/winex11.drv/vulkan.c | 3 +-- include/wine/vulkan.h | 7 ++++++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 91525b49a790..be0bd7acdf74 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -23,7 +23,7 @@ #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..080541c90462 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -24,11 +24,10 @@ #ifdef SONAME_LIBVKD3D #define VK_NO_PROTOTYPES -#define VKAPI_CALL #define VKD3D_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/library.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f0583b400385..2265ddc80b7d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2009,6 +2009,12 @@ class VkGenerator(object): f.write("#include <windef.h>\n") f.write("#include <stdint.h>\n\n") + f.write("/* Define WINE_VK_HOST to get 'host' headers. */\n") + f.write("#ifdef WINE_VK_HOST\n") + f.write("#define VKAPI_CALL\n") + f.write('#define WINE_VK_ALIGN(x)\n') + f.write("#endif\n\n") + f.write("#ifndef VKAPI_CALL\n") f.write("#define VKAPI_CALL __stdcall\n") f.write("#endif\n\n") @@ -2017,7 +2023,6 @@ class VkGenerator(object): f.write("#define VKAPI_PTR VKAPI_CALL\n") f.write("#endif\n\n") - f.write("/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */\n") f.write("#ifndef WINE_VK_ALIGN\n") f.write("#define WINE_VK_ALIGN DECLSPEC_ALIGN\n") f.write("#endif\n\n") diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index a72be33be341..7e252326b5ac 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -31,9 +31,8 @@ #include "wine/library.h" #include "x11drv.h" -/* We only want host compatible structures and don't need alignment. */ -#define WINE_VK_ALIGN(x) #define VK_NO_PROTOTYPES +#define WINE_VK_HOST #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7c938cd88fb2..d44687fabf7b 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -6,6 +6,12 @@ #include <windef.h> #include <stdint.h> +/* Define WINE_VK_HOST to get 'host' headers. */ +#ifdef WINE_VK_HOST +#define VKAPI_CALL +#define WINE_VK_ALIGN(x) +#endif + #ifndef VKAPI_CALL #define VKAPI_CALL __stdcall #endif @@ -14,7 +20,6 @@ #define VKAPI_PTR VKAPI_CALL #endif -/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */ #ifndef WINE_VK_ALIGN #define WINE_VK_ALIGN DECLSPEC_ALIGN #endif -- 2.16.4

1 0

[PATCH] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)
by Alex Henrie 01 Jun '18

01 Jun '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- CID 713109 (#1 of 1): Reliance on integer endianness (INCOMPATIBLE_CAST) incompatible_cast: Pointer &uChar points to an object whose effective type is unsigned int (32 bits, unsigned) but is dereferenced as a narrower unsigned short (16 bits, unsigned). This may lead to unexpected results depending on machine endianness. dlls/gdi32/font.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..3347c9208c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2817,6 +2817,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm, DWORD cbBuffer, LPVOID lpBuffer, const MAT2 *lpmat2 ) { + WCHAR wChar; + if (!lpmat2) return GDI_ERROR; if(!(fuFormat & GGO_GLYPH_INDEX)) { @@ -2833,8 +2835,9 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + wChar = 0; + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

2 3

[PATCH] wsdapi/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/tests/discovery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index cfdd41fe83c..96c2ead7f9a 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -540,7 +540,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, "pSoap->Header.Action == '%s'\n", wine_dbgstr_w(pSoap->Header.Action)); - ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL\n"); /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) -- 2.17.0

1 0

[PATCH] schedsvc: Add a trailing '\n' to some ERR() messages.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/schedsvc/svc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 9342b50e4b9..22989261935 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -39,7 +39,7 @@ static HANDLE done_event, hjob_queue; void add_process_to_queue(HANDLE process) { if (!AssignProcessToJobObject(hjob_queue, process)) - ERR("AssignProcessToJobObject failed"); + ERR("AssignProcessToJobObject failed\n"); } static DWORD WINAPI tasks_monitor_thread(void *arg) @@ -69,14 +69,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) hjob_queue = CreateJobObjectW(NULL, NULL); if (!hjob_queue) { - ERR("CreateJobObject failed"); + ERR("CreateJobObject failed\n"); return -1; } hport = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); if (!hport) { - ERR("CreateIoCompletionPort failed"); + ERR("CreateIoCompletionPort failed\n"); return -1; } @@ -84,7 +84,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) info.CompletionPort = hport; if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) { - ERR("SetInformationJobObject failed"); + ERR("SetInformationJobObject failed\n"); return -1; } -- 2.17.0

1 0

[PATCH] shell32: Fix a typo in a comment.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e18d53..04ac0b6fd3c 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -502,7 +502,7 @@ static INT_PTR CALLBACK file_properties_proc(HWND hwndDlg, UINT uMsg, WPARAM wPa ERR("failed to update file attributes of %s\n", debugstr_w(props->path)); } - /* Update filename it it was changed */ + /* Update filename if it was changed */ if (GetDlgItemTextW(hwndDlg, IDC_FPROP_PATH, newname, ARRAY_SIZE(newname)) && strcmpW(props->filename, newname) && strlenW(props->dir) + strlenW(newname) + 2 < ARRAY_SIZE(newpath)) -- 2.17.0

1 0

[PATCH] dwrite: Fix typos in a couple of idl parameter names.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/dwrite_3.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index de14b910ee3..5958e6fb1bc 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -281,7 +281,7 @@ interface IDWriteFontSet1 : IDWriteFontSet UINT32 *actual_num_ranges); HRESULT GetFontFaceReference( UINT32 index, - IDWriteFontFaceReference1 **referece); + IDWriteFontFaceReference1 **reference); HRESULT CreateFontResource( UINT32 index, IDWriteFontResource **resource); @@ -651,7 +651,7 @@ interface IDWriteFontSetBuilder2 : IDWriteFontSetBuilder1 DWRITE_FONT_AXIS_RANGE const *axis_ranges, UINT32 num_ranges, DWRITE_FONT_PROPERTY const *props, - UINT32 num_properies); + UINT32 num_properties); HRESULT AddFontFile(const WCHAR *filepath); } -- 2.17.0

1 0

[PATCH] wscript/tests: Fix a typo in the WScript.BuildVersion check.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/wscript/tests/run.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 5a5539b1734..a812a85c9e0 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -27,7 +27,7 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); -ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuildVersion) = " + typeof(WScript.BuildVersion)); ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); -- 2.17.0

1 0

[PATCH] Revert "testbot/web: Tweak VMDetails.pl to save the Item directly."
by Francois Gouget 01 Jun '18

01 Jun '18

Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the VMDetails page is also used to create new VMs so we have no choice but to go through the collection. This reverts commit 71a9602bb6eab2b54e930080b8ef728064d6a664. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 057147157..9603e346a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -62,7 +62,8 @@ sub Save($) } } - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + my $ErrKey; + ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); return ! defined($self->{ErrMessage}); } -- 2.17.0

1 0

[PATCH] dbghelp: Add a missing include to fix the build.
by Huw Davies 01 Jun '18

01 Jun '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4018c9dbf2..7c40801d89 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -51,6 +51,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #include "image_private.h" #ifdef HAVE_MACH_O_LOADER_H -- 2.16.2

1 0

[PATCH] testbot/web: Fix the Submit.pl TestExecutable validation.
by Francois Gouget 01 Jun '18

01 Jun '18

Fix the parentheses and also make sure it does not contain a path. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2a4521edc..757efd1f5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -476,12 +476,13 @@ sub Validate($) elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { if (($self->GetParam("FileType") eq "patchdlls" && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+_test\.exe/)) || - ($self->GetParam("FileType") eq "patchprograms") && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+\.exe_test\.exe/)) + $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || + ($self->GetParam("FileType") eq "patchprograms" && + $self->GetParam("TestExecutable") !~ m/^[\w_.]+\.exe_test\.exe$/) || + ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) { - $self->{ErrMessage} = "Invalid name for Test executable"; $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "Invalid test executable filename"; return !1; } -- 2.17.0

1 0

[PATCH] testbot/web: Don't trust the Submit.pl File / FileName field.
by Francois Gouget 01 Jun '18

01 Jun '18

Make sure the filename does not contain a path. Rename the variable to $BaseName to make that clearer. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 68 +++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 757efd1f5..ae69e7ce5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -506,6 +506,33 @@ sub Validate($) return $self->SUPER::Validate(); } +sub ValidateAndGetFileName($$) +{ + my ($self, $FieldName) = @_; + + my $FileName = $self->GetParam($FieldName); + if (!$FileName) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "You must provide a file to test"; + return undef; + } + if ($FileName =~ m=[/\\]=) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is invalid"; + return undef; + } + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is too long"; + return undef; + } + return $FileName; +} + sub DetermineFileType($$) { my ($self, $FileName) = @_; @@ -594,29 +621,13 @@ sub OnPage1Next($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); - if (! $FileName) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Must be entered"; - return !1; - } + my $BaseName = $self->ValidateAndGetFileName("File"); + return !1 if (!$BaseName); + my $Fh = $self->CGI->upload("File"); if (defined($Fh)) { - if ($FileName =~ /(\\|\/)/) - { - $FileName =~ m/^.*(\\|\/)(.*)/; - $FileName = $2; - } - my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); - if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "The filename is too long"; - return !1; - } - my $StagingFile = $self->GetTmpStagingFullPath($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($BaseName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -648,7 +659,7 @@ sub OnPage1Next($) return !1; } - $self->{FileName} = $FileName; + $self->{FileName} = $BaseName; $self->{FileType} = $FileType; if (defined($DllBaseName)) { @@ -706,10 +717,11 @@ sub OnPage2Prev($) { my ($self) = @_; - my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); - if ($StagingFileName) + my $FileName = $self->GetParam("File"); + if ($FileName) { - unlink($StagingFileName); + my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); + unlink($StagingFileName) if ($StagingFileName); } $self->{Page} = 1; @@ -737,16 +749,14 @@ sub OnSubmit($) { my ($self) = @_; - if (! $self->Validate()) - { - return !1; - } + return !1 if (!$self->Validate()); + my $BaseName = $self->ValidateAndGetFileName("FileName"); + return !1 if (!$BaseName); # Store the file in the staging directory until the relevant Job and Step # IDs are known and it can be moved to the jobs directory tree. But rename # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. - my $BaseName = $self->GetParam("FileName"); my $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); -- 2.17.0

1 0

[PATCH] testbot/build: Document the Reconfig.pl commands.
by Francois Gouget 01 Jun '18

01 Jun '18

The information messages mirror those of Build.pl. They also add empty lines in the log, improving readability. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 6f461144e..f84c80458 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -41,6 +41,17 @@ sub BEGIN use WineTestBot::Config; +sub InfoMsg(@) +{ + my $OldUMask = umask(002); + if (open LOGFILE, ">>$LogDir/Reconfig.log") + { + print LOGFILE @_; + close LOGFILE; + } + umask($OldUMask); +} + sub LogMsg(@) { my $OldUMask = umask(002); @@ -61,6 +72,7 @@ sub FatalError(@) sub GitPull() { + InfoMsg "Updating the Wine source\n"; system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -105,6 +117,7 @@ sub BuildTestAgentd() # so don't rebuild it. if (! -x "$BinDir/build/testagentd") { + InfoMsg "\nBuilding the native testagentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -115,6 +128,7 @@ sub BuildTestAgentd() } } + InfoMsg "\nRebuilding the Windows TestAgentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -129,6 +143,7 @@ sub BuildTestAgentd() sub BuildTestLauncher() { + InfoMsg "\nRebuilding TestLauncher\n"; system("( cd $::RootDir/src/TestLauncher && set -x && " . " time make -j$ncpus" . ") >>$LogDir/Reconfig.log 2>&1"); @@ -146,6 +161,7 @@ sub BuildNative() mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . @@ -169,6 +185,7 @@ sub BuildCross($) mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding the $Bits-bit test executables\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . -- 2.17.0

1 0

[PATCH] testbot/build: Tweak the Build.pl information messages for readability.
by Francois Gouget 01 Jun '18

01 Jun '18

Add an empty line before the information messages to make the log more readable. Also tweak the native tools build message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 03733cef6..77bc9ca9d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -89,7 +89,7 @@ sub ApplyPatch($) my $Impacts = GetPatchImpact($PatchFile, "nounits"); if ($Impacts->{Makefiles}) { - InfoMsg "Running make_makefiles\n"; + InfoMsg "\nRunning make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . " ./tools/make_makefiles " . ") >> $LogDir/Build.log 2>&1"); @@ -102,7 +102,7 @@ sub ApplyPatch($) if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { - InfoMsg "Running autoconf\n"; + InfoMsg "\nRunning autoconf\n"; system("( cd $DataDir/wine && set -x && " . " autoconf " . ") >>$LogDir/Build.log 2>&1"); @@ -131,6 +131,8 @@ sub CountCPUs() sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); @@ -157,7 +159,7 @@ sub BuildTestExecutable($$$) $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "Building the $Bits-bit test executable\n"; + InfoMsg "\nBuilding the $Bits-bit test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " time make -j$ncpus $TestsDir " . ") >>$LogDir/Build.log 2>&1"); @@ -256,7 +258,6 @@ if (!ApplyPatch($PatchFile)) CountCPUs(); -InfoMsg "Building tools\n"; if (!BuildNative()) { exit(1); -- 2.17.0

1 0

[PATCH] testbot: Remove a debug function from PatchUtils.pm.
by Francois Gouget 01 Jun '18

01 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 611d883e4..b05fe0aa4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -109,12 +109,6 @@ sub _AddTest($$$) $Tests->{$Module}->{Files}->{$File} = $Change; } -sub dumpstr($) -{ - my ($Str) = @_; - return defined $Str ? "[$Str]" : "<undef>"; -} - =pod =over 12 -- 2.17.0

1 0

[PATCH 1/4] dbghelp: Don't enforce child architecture in elf_map_file().
by Zebediah Figura 31 May '18

31 May '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e047a7f..e4689a7 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -346,12 +346,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* /* and check for an ELF header */ if (memcmp(fmap->u.elf.elfhdr.e_ident, elf_signature, sizeof(elf_signature))) goto done; - /* and check 32 vs 64 size according to current machine */ -#ifdef _WIN64 - if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS64) goto done; -#else - if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS32) goto done; -#endif + fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); -- 2.7.4

1 3

[PATCH 12/17] shdocvw/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 31 May '18

31 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shdocvw/tests/shdocvw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index 7b4eccf27c..d54cf1613a 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -207,7 +207,7 @@ static void test_ParseURLFromOutsideSourceA(void) return; } - for(i = 0; i < sizeof(ParseURL_table)/sizeof(ParseURL_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ParseURL_table); i++) { memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; len = sizeof(buffer); @@ -306,7 +306,7 @@ static void test_ParseURLFromOutsideSourceW(void) MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, INTERNET_MAX_URL_LENGTH); /* len is in characters */ - len = sizeof(bufferW)/sizeof(bufferW[0]); + len = ARRAY_SIZE(bufferW); dummy = 0; res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL); -- 2.14.3

2 1

[PATCH] comctl32/edit/tests: Add interactive test showing a rendering glitch
by Fabian Maurer 31 May '18

31 May '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 12 ++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7e9e7e7634..76397ac92f 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3094,6 +3094,36 @@ static void test_change_focus(void) DestroyWindow(hwnd); } +static INT_PTR CALLBACK dialog_proc_interactive(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED) + { + EndDialog(hdlg, LOWORD(wparam)); + } + break; + case WM_CLOSE: + EndDialog(hdlg, IDCANCEL); + break; + + default: + break; + } + + return FALSE; +} + +static void test_rendering_interactive(void) +{ + int button_clicked; + + button_clicked = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_OVERLAPPING_LABEL", NULL, dialog_proc_interactive, 0); + todo_wine + ok(button_clicked == IDOK, "Interactive test 'edit overlapping label' failed.\n"); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3139,6 +3169,8 @@ START_TEST(edit) test_wordbreak_proc(); test_change_focus(); + test_rendering_interactive(); + UnregisterWindowClasses(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa225e1..959130e2f1 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,18 @@ FONT 8, "MS Shell Dlg" { } +EDIT_OVERLAPPING_LABEL DIALOG 0, 0, 200, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Does the edit box look alright?" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER + EDITTEXT 1000, 60, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN + + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Broken", IDNO, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + STRINGTABLE { IDS_TBADD1 "abc" -- 2.17.1

2 2

[PATCH 1/2] fc: Add stub program
by Fabian Maurer 31 May '18

31 May '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 26 ++++++++------------------ configure.ac | 1 + programs/fc/Makefile.in | 4 ++++ programs/fc/fc.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 programs/fc/Makefile.in create mode 100644 programs/fc/fc.c diff --git a/configure b/configure index 2960b34c93..ea2d353e5f 100755 --- a/configure +++ b/configure @@ -800,7 +800,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1672,6 +1671,7 @@ enable_eject enable_expand enable_explorer enable_extrac32 +enable_fc enable_findstr enable_fsutil enable_hh @@ -1859,7 +1859,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2112,15 +2111,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2258,7 +2248,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2411,7 +2401,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6623,7 +6612,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6669,7 +6658,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6693,7 +6682,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6738,7 +6727,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6762,7 +6751,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -19373,6 +19362,7 @@ wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 +wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index 3a6a3a1762..a9fffc17c5 100644 --- a/configure.ac +++ b/configure.ac @@ -3875,6 +3875,7 @@ WINE_CONFIG_MAKEFILE(programs/eject) WINE_CONFIG_MAKEFILE(programs/expand) WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) +WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in new file mode 100644 index 0000000000..96d878a410 --- /dev/null +++ b/programs/fc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = fc.exe +APPMODE = -mconsole -municode + +C_SRCS = fc.c diff --git a/programs/fc/fc.c b/programs/fc/fc.c new file mode 100644 index 0000000000..ba3b04bda2 --- /dev/null +++ b/programs/fc/fc.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fc); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.17.1

1 1

[PATCH] d3dx10/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 31 May '18

31 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 9c84a76e79..2bf92cdb58 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -269,8 +269,8 @@ float4 main(float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePixelShader(device, simple_ps, sizeof(simple_ps), &ps); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), - simple_vs, sizeof(simple_vs), &input_layout); + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), simple_vs, + sizeof(simple_vs), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); blend_desc.AlphaToCoverageEnable = FALSE; -- 2.14.3

2 1

[PATCH v2 1/8] dxgi: Create Vulkan swapchains for D3D12.
by Józef Kucia 31 May '18

31 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Load libvkd3d just before creating a Direct3D 12 swapchain. --- dlls/d3d12/d3d12_main.c | 16 ++ dlls/dxgi/Makefile.in | 3 +- dlls/dxgi/swapchain.c | 502 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 498 insertions(+), 23 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 71eb1f97a73e..91525b49a790 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -34,6 +34,8 @@ #include <vkd3d.h> +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + WINE_DEFAULT_DEBUG_CHANNEL(d3d12); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -113,6 +115,16 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe struct vkd3d_device_create_info device_create_info; const struct vulkan_funcs *vk_funcs; + static const char * const instance_extensions[] = + { + VK_KHR_SURFACE_EXTENSION_NAME, + VK_KHR_WIN32_SURFACE_EXTENSION_NAME, + }; + static const char * const device_extensions[] = + { + VK_KHR_SWAPCHAIN_EXTENSION_NAME, + }; + TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", adapter, minimum_feature_level, debugstr_guid(iid), device); @@ -132,11 +144,15 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.pfn_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; + instance_create_info.instance_extensions = instance_extensions; + instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance_create_info = &instance_create_info; + device_create_info.device_extensions = device_extensions; + device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); return vkd3d_create_device(&device_create_info, iid, device); } diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index ce76b8eecc61..c21cb18d8ffc 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -1,6 +1,7 @@ MODULE = dxgi.dll IMPORTLIB = dxgi -IMPORTS = dxguid uuid wined3d user32 +IMPORTS = gdi32 dxguid uuid wined3d user32 +EXTRAINCL = $(VKD3D_CFLAGS) C_SRCS = \ adapter.c \ diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ca4e59004ef2..23731e0dd07b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -22,7 +22,21 @@ #include "dxgi_private.h" +#ifdef SONAME_LIBVKD3D +#define VK_NO_PROTOTYPES +#define VKAPI_CALL +#define VKD3D_NO_PROTOTYPES +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES +#define WINE_VK_ALIGN(x) +#include "wine/library.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" +#include <vkd3d.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { @@ -797,12 +811,59 @@ HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_ return S_OK; } +#ifdef SONAME_LIBVKD3D + +static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; +static PFN_vkd3d_create_image_resource vkd3d_create_image_resource; +static PFN_vkd3d_get_vk_device vkd3d_get_vk_device; +static PFN_vkd3d_get_vk_format vkd3d_get_vk_format; +static PFN_vkd3d_get_vk_physical_device vkd3d_get_vk_physical_device; +static PFN_vkd3d_get_vk_queue_family_index vkd3d_get_vk_queue_family_index; +static PFN_vkd3d_instance_from_device vkd3d_instance_from_device; +static PFN_vkd3d_instance_get_vk_instance vkd3d_instance_get_vk_instance; +static PFN_vkd3d_release_vk_queue vkd3d_release_vk_queue; +static PFN_vkd3d_resource_decref vkd3d_resource_decref; +static PFN_vkd3d_resource_incref vkd3d_resource_incref; + +struct dxgi_vk_funcs +{ + PFN_vkAcquireNextImageKHR p_vkAcquireNextImageKHR; + PFN_vkCreateSwapchainKHR p_vkCreateSwapchainKHR; + PFN_vkCreateWin32SurfaceKHR p_vkCreateWin32SurfaceKHR; + PFN_vkDestroySurfaceKHR p_vkDestroySurfaceKHR; + PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; + PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; + PFN_vkGetInstanceProcAddr p_vkGetInstanceProcAddr; + PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; + PFN_vkGetPhysicalDeviceSurfaceFormatsKHR p_vkGetPhysicalDeviceSurfaceFormatsKHR; + PFN_vkGetPhysicalDeviceSurfacePresentModesKHR p_vkGetPhysicalDeviceSurfacePresentModesKHR; + PFN_vkGetPhysicalDeviceSurfaceSupportKHR p_vkGetPhysicalDeviceSurfaceSupportKHR; + PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR p_vkGetPhysicalDeviceWin32PresentationSupportKHR; + PFN_vkGetSwapchainImagesKHR p_vkGetSwapchainImagesKHR; + PFN_vkQueuePresentKHR p_vkQueuePresentKHR; + PFN_vkCreateFence p_vkCreateFence; + PFN_vkWaitForFences p_vkWaitForFences; + PFN_vkResetFences p_vkResetFences; + PFN_vkDestroyFence p_vkDestroyFence; +}; + struct d3d12_swapchain { IDXGISwapChain3 IDXGISwapChain3_iface; LONG refcount; struct wined3d_private_store private_store; + VkSwapchainKHR vk_swapchain; + VkSurfaceKHR vk_surface; + VkFence vk_fence; + VkInstance vk_instance; + VkDevice vk_device; + ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + unsigned int buffer_count; + + uint32_t current_buffer_index; + struct dxgi_vk_funcs vk_funcs; + ID3D12CommandQueue *command_queue; ID3D12Device *device; IWineDXGIFactory *factory; @@ -855,7 +916,9 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; ULONG refcount = InterlockedDecrement(&swapchain->refcount); + unsigned int i; TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); @@ -866,6 +929,15 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) wined3d_private_store_cleanup(&swapchain->private_store); + for (i = 0; i < swapchain->buffer_count; ++i) + { + vkd3d_resource_decref(swapchain->buffers[i]); + } + + vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); + vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + vk_funcs->p_vkDestroySurfaceKHR(swapchain->vk_instance, swapchain->vk_surface, NULL); + ID3D12Device_Release(swapchain->device); heap_free(swapchain); @@ -1295,45 +1367,419 @@ static const struct IDXGISwapChain3Vtbl d3d12_swapchain_vtbl = d3d12_swapchain_ResizeBuffers1, }; +static const struct vulkan_funcs *get_vk_funcs(void) +{ + const struct vulkan_funcs *vk_funcs; + HDC hdc; + + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); + return vk_funcs; +} + +static BOOL load_vkd3d_functions(void *vkd3d_handle) +{ +#define LOAD_FUNCPTR(f) if (!(f = wine_dlsym(vkd3d_handle, #f, NULL, 0))) return FALSE; + LOAD_FUNCPTR(vkd3d_acquire_vk_queue) + LOAD_FUNCPTR(vkd3d_create_image_resource) + LOAD_FUNCPTR(vkd3d_get_vk_device) + LOAD_FUNCPTR(vkd3d_get_vk_format) + LOAD_FUNCPTR(vkd3d_get_vk_physical_device) + LOAD_FUNCPTR(vkd3d_get_vk_queue_family_index) + LOAD_FUNCPTR(vkd3d_instance_from_device) + LOAD_FUNCPTR(vkd3d_instance_get_vk_instance) + LOAD_FUNCPTR(vkd3d_release_vk_queue) + LOAD_FUNCPTR(vkd3d_resource_decref) + LOAD_FUNCPTR(vkd3d_resource_incref) +#undef LOAD_FUNCPTR + + return TRUE; +} + +static BOOL init_vkd3d(void) +{ + static void *vkd3d_handle; + + if (vkd3d_handle) + return TRUE; + + TRACE("Loading vkd3d %s.\n", SONAME_LIBVKD3D); + + if (!(vkd3d_handle = wine_dlopen(SONAME_LIBVKD3D, RTLD_NOW, NULL, 0))) + return FALSE; + + if (!load_vkd3d_functions(vkd3d_handle)) + { + ERR("Failed to load vkd3d functions.\n"); + wine_dlclose(vkd3d_handle, NULL, 0); + vkd3d_handle = NULL; + return FALSE; + } + + return TRUE; +} + +static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) +{ + const struct vulkan_funcs *vk; + + if (!(vk = get_vk_funcs())) + { + ERR_(winediag)("Failed to load Wine Vulkan driver.\n"); + return FALSE; + } + + dxgi->p_vkAcquireNextImageKHR = vk->p_vkAcquireNextImageKHR; + dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; + dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; + dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; + dxgi->p_vkDestroySwapchainKHR = vk->p_vkDestroySwapchainKHR; + dxgi->p_vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vk->p_vkGetDeviceProcAddr; + dxgi->p_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk->p_vkGetInstanceProcAddr; + dxgi->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = vk->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; + dxgi->p_vkGetPhysicalDeviceSurfaceFormatsKHR = vk->p_vkGetPhysicalDeviceSurfaceFormatsKHR; + dxgi->p_vkGetPhysicalDeviceSurfacePresentModesKHR = vk->p_vkGetPhysicalDeviceSurfacePresentModesKHR; + dxgi->p_vkGetPhysicalDeviceSurfaceSupportKHR = vk->p_vkGetPhysicalDeviceSurfaceSupportKHR; + dxgi->p_vkGetPhysicalDeviceWin32PresentationSupportKHR = vk->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; + dxgi->p_vkGetSwapchainImagesKHR = vk->p_vkGetSwapchainImagesKHR; + dxgi->p_vkQueuePresentKHR = vk->p_vkQueuePresentKHR; + +#define LOAD_DEVICE_PFN(name) \ + if (!(dxgi->p_##name = vk->p_vkGetDeviceProcAddr(vk_device, #name))) \ + { \ + ERR("Failed to get device proc "#name".\n"); \ + return FALSE; \ + } + LOAD_DEVICE_PFN(vkCreateFence) + LOAD_DEVICE_PFN(vkWaitForFences) + LOAD_DEVICE_PFN(vkResetFences) + LOAD_DEVICE_PFN(vkDestroyFence) +#undef LOAD_DEVICE_PFN + + return TRUE; +} + +static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, + VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) +{ + VkSurfaceFormatKHR *formats; + uint32_t format_count; + VkFormat format; + unsigned int i; + VkResult vr; + + *vk_format = VK_FORMAT_UNDEFINED; + + format = vkd3d_get_vk_format(swapchain_desc->Format); + if (format == VK_FORMAT_UNDEFINED) + return DXGI_ERROR_INVALID_CALL; + + vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, vk_surface, &format_count, NULL); + if (vr < 0 || !format_count) + { + WARN("Failed to get supported surface formats, vr %d.\n", vr); + return DXGI_ERROR_INVALID_CALL; + } + + if (!(formats = heap_calloc(format_count, sizeof(*formats)))) + return E_OUTOFMEMORY; + + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, + vk_surface, &format_count, formats)) < 0) + { + WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); + heap_free(formats); + return DXGI_ERROR_INVALID_CALL; + } + + for (i = 0; i < format_count; ++i) + { + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + break; + } + heap_free(formats); + + if (i == format_count) + { + FIXME("Failed to find suitable format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); + return DXGI_ERROR_INVALID_CALL; + } + + *vk_format = format; + return S_OK; +} + +static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, + ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + struct vkd3d_image_resource_create_info resource_info; + struct VkSwapchainCreateInfoKHR vk_swapchain_desc; + struct VkWin32SurfaceCreateInfoKHR surface_desc; + VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE; + VkSurfaceKHR vk_surface = VK_NULL_HANDLE; + VkSurfaceCapabilitiesKHR surface_caps; + VkPhysicalDevice vk_physical_device; + VkFence vk_fence = VK_NULL_HANDLE; + unsigned int image_count, i, j; + VkFenceCreateInfo fence_desc; + uint32_t queue_family_index; + VkInstance vk_instance; + HRESULT hr = E_FAIL; + VkBool32 supported; + VkDevice vk_device; + VkFormat vk_format; + VkResult vr; + + swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; + swapchain->refcount = 1; + + swapchain->window = window; + swapchain->desc = *swapchain_desc; + swapchain->fullscreen_desc = *fullscreen_desc; + + switch (swapchain_desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); + break; + default: + WARN("Invalid swap effect %#x.\n", swapchain_desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } + + if (!init_vkd3d()) + { + ERR_(winediag)("libvkd3d could not be loaded.\n"); + return DXGI_ERROR_UNSUPPORTED; + } + + if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) + FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (swapchain_desc->Flags) + FIXME("Ignoring swapchain flags %#x.\n", swapchain_desc->Flags); + + FIXME("Ignoring refresh rate.\n"); + if (fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); + if (!fullscreen_desc->Windowed) + FIXME("Fullscreen not supported yet.\n"); + + vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(device)); + vk_physical_device = vkd3d_get_vk_physical_device(device); + vk_device = vkd3d_get_vk_device(device); + + if (!init_vk_funcs(&swapchain->vk_funcs, vk_device)) + return E_FAIL; + + surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; + surface_desc.pNext = NULL; + surface_desc.flags = 0; + surface_desc.hinstance = GetModuleHandleA("dxgi.dll"); + surface_desc.hwnd = window; + if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) + { + WARN("Failed to create Vulkan surface, vr %d.\n", vr); + goto fail; + } + + queue_family_index = vkd3d_get_vk_queue_family_index(queue); + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR(vk_physical_device, + queue_family_index, vk_surface, &supported)) < 0 || !supported) + { + FIXME("Queue family does not support presentation, vr %d.\n", vr); + goto fail; + } + + if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) + goto fail; + hr = E_FAIL; + + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, + vk_surface, &surface_caps)) < 0) + { + WARN("Failed to get surface capabilities, vr %d.\n", vr); + goto fail; + } + + if (surface_caps.maxImageCount && (swapchain_desc->BufferCount > surface_caps.maxImageCount + || swapchain_desc->BufferCount < surface_caps.minImageCount)) + { + WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, + surface_caps.minImageCount, surface_caps.maxImageCount); + goto fail; + } + + if (swapchain_desc->Width > surface_caps.maxImageExtent.width + || swapchain_desc->Width < surface_caps.minImageExtent.width + || swapchain_desc->Height > surface_caps.maxImageExtent.height + || swapchain_desc->Height < surface_caps.minImageExtent.height) + { + FIXME("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", + swapchain_desc->Width, swapchain_desc->Height, + surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, + surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); + } + + if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) + { + FIXME("Unsupported alpha mode.\n"); + goto fail; + } + + vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; + vk_swapchain_desc.pNext = NULL; + vk_swapchain_desc.flags = 0; + vk_swapchain_desc.surface = vk_surface; + vk_swapchain_desc.minImageCount = swapchain_desc->BufferCount; + vk_swapchain_desc.imageFormat = vk_format; + vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; + vk_swapchain_desc.imageExtent.width = swapchain_desc->Width; + vk_swapchain_desc.imageExtent.height = swapchain_desc->Height; + vk_swapchain_desc.imageArrayLayers = 1; + vk_swapchain_desc.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; + vk_swapchain_desc.queueFamilyIndexCount = 0; + vk_swapchain_desc.pQueueFamilyIndices = NULL; + vk_swapchain_desc.preTransform = surface_caps.currentTransform; + vk_swapchain_desc.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + vk_swapchain_desc.presentMode = VK_PRESENT_MODE_FIFO_KHR; + vk_swapchain_desc.clipped = VK_TRUE; + vk_swapchain_desc.oldSwapchain = VK_NULL_HANDLE; + if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) + { + WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); + goto fail; + } + + fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_desc.pNext = NULL; + fence_desc.flags = 0; + if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) + { + WARN("Failed to create Vulkan fence, vr %d.\n", vr); + goto fail; + } + + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + goto fail; + } + if (image_count != swapchain_desc->BufferCount) + FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); + if (image_count > ARRAY_SIZE(vk_images)) + goto fail; + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + goto fail; + } + + swapchain->vk_swapchain = vk_swapchain; + swapchain->vk_surface = vk_surface; + swapchain->vk_fence = vk_fence; + swapchain->vk_instance = vk_instance; + swapchain->vk_device = vk_device; + + vk_funcs->p_vkAcquireNextImageKHR(vk_device, vk_swapchain, UINT64_MAX, + VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index); + vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); + vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence); + + resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_info.next = NULL; + resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_info.desc.Alignment = 0; + resource_info.desc.Width = swapchain_desc->Width; + resource_info.desc.Height = swapchain_desc->Height; + resource_info.desc.DepthOrArraySize = 1; + resource_info.desc.MipLevels = 1; + resource_info.desc.Format = swapchain_desc->Format; + resource_info.desc.SampleDesc.Count = 1; + resource_info.desc.SampleDesc.Quality = 0; + resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; + resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; + for (i = 0; i < image_count; ++i) + { + resource_info.vk_image = vk_images[i]; + if (SUCCEEDED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) + { + vkd3d_resource_incref(swapchain->buffers[i]); + ID3D12Resource_Release(swapchain->buffers[i]); + } + else + { + ERR("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); + for (j = 0; j < i; ++j) + { + vkd3d_resource_decref(swapchain->buffers[j]); + } + goto fail; + } + } + swapchain->buffer_count = image_count; + + wined3d_private_store_init(&swapchain->private_store); + + ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); + ID3D12Device_AddRef(swapchain->device = device); + IWineDXGIFactory_AddRef(swapchain->factory = factory); + + return S_OK; + +fail: + vk_funcs->p_vkDestroyFence(vk_device, vk_fence, NULL); + vk_funcs->p_vkDestroySwapchainKHR(vk_device, vk_swapchain, NULL); + vk_funcs->p_vkDestroySurfaceKHR(vk_instance, vk_surface, NULL); + return hr; +} + HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) { + DXGI_SWAP_CHAIN_FULLSCREEN_DESC default_fullscreen_desc; struct d3d12_swapchain *object; ID3D12Device *device; HRESULT hr; - if (FAILED(hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&device))) + if (!fullscreen_desc) { - ERR("Failed to get D3D12 device, hr %#x.\n", hr); - return hr; + memset(&default_fullscreen_desc, 0, sizeof(default_fullscreen_desc)); + default_fullscreen_desc.Windowed = TRUE; + fullscreen_desc = &default_fullscreen_desc; } if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ID3D12Device_Release(device); return E_OUTOFMEMORY; - } - - object->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; - object->refcount = 1; - - wined3d_private_store_init(&object->private_store); - ID3D12CommandQueue_AddRef(object->command_queue = queue); - object->device = device; - IWineDXGIFactory_AddRef(object->factory = factory); - - object->window = window; - object->desc = *swapchain_desc; - if (fullscreen_desc) + if (FAILED(hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&device))) { - object->fullscreen_desc = *fullscreen_desc; + ERR("Failed to get D3D12 device, hr %#x.\n", hr); + heap_free(object); + return hr; } - else + + hr = d3d12_swapchain_init(object, factory, device, queue, window, swapchain_desc, fullscreen_desc); + ID3D12Device_Release(device); + if (FAILED(hr)) { - memset(&object->fullscreen_desc, 0, sizeof(object->fullscreen_desc)); - object->fullscreen_desc.Windowed = TRUE; + heap_free(object); + return hr; } TRACE("Created swapchain %p.\n", object); @@ -1342,3 +1788,15 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu return S_OK; } + +#else + +HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, + IDXGISwapChain1 **swapchain) +{ + ERR_(winediag)("Wine was built without Direct3D 12 support.\n"); + return DXGI_ERROR_UNSUPPORTED; +} + +#endif /* SONAME_LIBVKD3D */ -- 2.16.1

3 17

[PATCH] winex11.drv: Request _NET_ACTIVE_WINDOW in SetFocus().
by Zebediah Figura 31 May '18

31 May '18

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Fixes https://bugs.winehq.org/show_bug.cgi?id=2155. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Changes from Staging patch: send message inside of SetFocus() handler instead of adding a new driver message. dlls/winex11.drv/event.c | 30 ++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 33 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..873f0db 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -818,6 +818,8 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (!focus_win) { + x11drv_thread_data()->active_window = 0; + /* Abey : 6-Oct-99. Check again if the focus out window is the Foreground window, because in most cases the messages sent above must have already changed the foreground window, in which @@ -1380,6 +1382,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1395,6 +1398,33 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + if (data->mapped && data->managed && thread_data->active_window != hwnd) + { + struct x11drv_win_data *active = get_win_data( thread_data->active_window ); + DWORD timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time( 0 ); + XEvent xev; + + TRACE("setting _NET_ACTIVE_WINDOW to %p/%lx, current active %p/%lx\n", + data->hwnd, data->whole_window, active ? active->hwnd : NULL, active ? active->whole_window : 0 ); + + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_ACTIVE_WINDOW); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + + xev.xclient.data.l[0] = 1; /* source: application */ + xev.xclient.data.l[1] = timestamp; + xev.xclient.data.l[2] = active ? active->whole_window : 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + XSendEvent( data->display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + + if (active) release_win_data( active ); + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 85a05a9..3ad4ffe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -325,6 +325,7 @@ struct x11drv_thread_data Display *display; XEvent *current_event; /* event currently being processed */ HWND grab_hwnd; /* window that currently grabs the mouse */ + HWND active_window; /* active window */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ @@ -433,6 +434,7 @@ enum x11drv_atoms XATOM_DndSelection, XATOM__ICC_PROFILE, XATOM__MOTIF_WM_HINTS, + XATOM__NET_ACTIVE_WINDOW, XATOM__NET_STARTUP_INFO_BEGIN, XATOM__NET_STARTUP_INFO, XATOM__NET_SUPPORTED, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c0..4654556 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -128,6 +128,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "DndSelection", "_ICC_PROFILE", "_MOTIF_WM_HINTS", + "_NET_ACTIVE_WINDOW", "_NET_STARTUP_INFO_BEGIN", "_NET_STARTUP_INFO", "_NET_SUPPORTED", -- 2.7.4

2 6

[PATCH] ntdll: Partly implement RtlDosPathNameToRelativeNtPathName_U_WithStatus (resend 2nd)
by Stefan Leichter 31 May '18

31 May '18

Re-diffed/send with some (more) blanks in the subject Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 6 ++++++ dlls/ntdll/path.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+)

1 0

[PATCH v2 1/3] dbghelp: Add a helper to check if a given module is the Wine loader.
by Zebediah Figura 31 May '18

31 May '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: check WINELOADER dlls/dbghelp/module.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9f90d5e..7a23812 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -29,6 +29,7 @@ #include "psapi.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -75,9 +76,42 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) return ++ptr; } +static BOOL is_wine_loader(const WCHAR *module) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR suffixW[] = {'6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + const char *ptr, *p; + BOOL ret = FALSE; + WCHAR *buffer; + DWORD len; + + if ((ptr = getenv("WINELOADER"))) + { + if ((p = strrchr(ptr, '/'))) ptr = p + 1; + len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + buffer = heap_alloc( len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); + } + else + { + buffer = heap_alloc( sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } + + if (!strcmpW( filename, buffer )) + ret = TRUE; + + strcatW( buffer, suffixW ); + if (!strcmpW( filename, buffer )) + ret = TRUE; + + heap_free( buffer ); + return ret; +} + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -87,7 +121,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) + else if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -455,8 +489,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int loader_len, len = strlenW(name); - const WCHAR *loader; + int len = strlenW(name); /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -491,10 +524,7 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - loader = get_wine_loader_name(); - loader_len = strlenW( loader ); - if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && - !strcmpiW(name + len - loader_len, loader)) + if (is_wine_loader(name)) { #ifdef __APPLE__ return DMT_MACHO; -- 2.7.4

1 2

[PATCH resend 1/3] dbghelp: Add a helper to check if a given module is the Wine loader.
by Zebediah Figura 31 May '18

31 May '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/module.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9f90d5e..64dbd5a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -75,9 +75,16 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) return ++ptr; } +static BOOL is_wine_loader(const WCHAR *module) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR wine64W[] = {'w','i','n','e','6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + return !strcmpW(filename, wineW) || !strcmpW(filename, wine64W); +} + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -87,7 +94,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) + else if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -455,8 +462,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int loader_len, len = strlenW(name); - const WCHAR *loader; + int len = strlenW(name); /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -491,10 +497,7 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - loader = get_wine_loader_name(); - loader_len = strlenW( loader ); - if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && - !strcmpiW(name + len - loader_len, loader)) + if (is_wine_loader(name)) { #ifdef __APPLE__ return DMT_MACHO; -- 2.7.4

2 4

[PATCH v2] winex11.drv: Request _NET_ACTIVE_WINDOW in SetFocus().
by Zebediah Figura 31 May '18

31 May '18

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winex11.drv/event.c | 32 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 35 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0bfe05..c23521e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -818,6 +818,8 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (!focus_win) { + x11drv_thread_data()->active_window = 0; + /* Abey : 6-Oct-99. Check again if the focus out window is the Foreground window, because in most cases the messages sent above must have already changed the foreground window, in which @@ -1380,6 +1382,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1395,6 +1398,35 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + if (data->mapped && data->managed && thread_data->active_window != hwnd) + { + struct x11drv_win_data *active = get_win_data( thread_data->active_window ); + DWORD timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time( 0 ); + XEvent xev; + + TRACE("setting _NET_ACTIVE_WINDOW to %p/%lx, current active %p/%lx\n", + data->hwnd, data->whole_window, active ? active->hwnd : NULL, active ? active->whole_window : 0 ); + + thread_data->active_window = hwnd; + + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_ACTIVE_WINDOW); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + + xev.xclient.data.l[0] = 1; /* source: application */ + xev.xclient.data.l[1] = timestamp; + xev.xclient.data.l[2] = active ? active->whole_window : 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + XSendEvent( data->display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + + if (active) release_win_data( active ); + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 85a05a9..3ad4ffe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -325,6 +325,7 @@ struct x11drv_thread_data Display *display; XEvent *current_event; /* event currently being processed */ HWND grab_hwnd; /* window that currently grabs the mouse */ + HWND active_window; /* active window */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ @@ -433,6 +434,7 @@ enum x11drv_atoms XATOM_DndSelection, XATOM__ICC_PROFILE, XATOM__MOTIF_WM_HINTS, + XATOM__NET_ACTIVE_WINDOW, XATOM__NET_STARTUP_INFO_BEGIN, XATOM__NET_STARTUP_INFO, XATOM__NET_SUPPORTED, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c0..4654556 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -128,6 +128,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "DndSelection", "_ICC_PROFILE", "_MOTIF_WM_HINTS", + "_NET_ACTIVE_WINDOW", "_NET_STARTUP_INFO_BEGIN", "_NET_STARTUP_INFO", "_NET_SUPPORTED", -- 2.7.4

1 0

Test if button is drawn properly
by Fabian Maurer 31 May '18

31 May '18

Hello, I'm currently investigating https://bugs.winehq.org/show_bug.cgi?id=45246. in comctl32/button.c in BUTTON_CalcLabelRect: > if ((infoPtr->u.image && bm.bmWidth == 0 && bm.bmHeight == 0) > || (text == NULL || text[0] == '\0')) This causes the button not to render when an image is set, but the text is null. AFAIK a button can have only an image though - handling it like that fixes a rendering issue. But how can I write a test for that, to document that behavior? Regards, Fabian Maurer

2 2

[PATCH v2] winex11: Make get_vulkan_driver() thread-safe.
by Józef Kucia 31 May '18

31 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Handle wine_dlsym() errors in a better way. --- dlls/winex11.drv/vulkan.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 148908b5117d..a72be33be341 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -86,21 +86,17 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) return (struct wine_vk_surface *)(uintptr_t)handle; } -static BOOL wine_vk_init(void) -{ - static BOOL init_done = FALSE; - static void *vulkan_handle; - - if (init_done) return (vulkan_handle != NULL); - init_done = TRUE; +static void *vulkan_handle; +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) +{ if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) { ERR("Failed to load %s\n", SONAME_LIBVULKAN); - return FALSE; + return TRUE; } -#define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; +#define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) goto fail; LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) @@ -121,6 +117,11 @@ static BOOL wine_vk_init(void) #undef LOAD_FUNCPTR return TRUE; + +fail: + wine_dlclose(vulkan_handle, NULL, 0); + vulkan_handle = NULL; + return TRUE; } /* Helper function for converting between win32 and X11 compatible VkInstanceCreateInfo. @@ -558,13 +559,16 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n const struct vulkan_funcs *get_vulkan_driver(UINT version) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + if (version != WINE_VULKAN_DRIVER_VERSION) { ERR("version mismatch, vulkan wants %u but driver has %u\n", version, WINE_VULKAN_DRIVER_VERSION); return NULL; } - if (wine_vk_init()) + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); + if (vulkan_handle) return &vulkan_funcs; return NULL; -- 2.16.1

1 0

[PATCH] xaudio2/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 31 May '18

31 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ccc415afaa..66097532c5 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1004,7 +1004,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) } if(pCreateFX){ - for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ hr = pCreateFX(const_clsids[i].clsid, &fx_unk); todo_wine_if(const_clsids[i].todo) ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); @@ -1090,7 +1090,7 @@ static void test_xapo_creation_modern(const char *module) } if(pCreateFX){ - for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ hr = pCreateFX(const_clsids[i].clsid, &fx_unk, NULL, 0); todo_wine_if(const_clsids[i].todo) ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); -- 2.14.3

2 1

[PATCH] winex11: Make get_vulkan_driver() thread-safe.
by Józef Kucia 31 May '18

31 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 148908b5117d..8437dae4ca93 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -86,18 +86,14 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) return (struct wine_vk_surface *)(uintptr_t)handle; } -static BOOL wine_vk_init(void) -{ - static BOOL init_done = FALSE; - static void *vulkan_handle; - - if (init_done) return (vulkan_handle != NULL); - init_done = TRUE; +static void *vulkan_handle; +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) +{ if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) { ERR("Failed to load %s\n", SONAME_LIBVULKAN); - return FALSE; + return TRUE; } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; @@ -558,13 +554,16 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n const struct vulkan_funcs *get_vulkan_driver(UINT version) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + if (version != WINE_VULKAN_DRIVER_VERSION) { ERR("version mismatch, vulkan wants %u but driver has %u\n", version, WINE_VULKAN_DRIVER_VERSION); return NULL; } - if (wine_vk_init()) + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); + if (vulkan_handle) return &vulkan_funcs; return NULL; -- 2.16.1

1 0

[PATCH] msi/tests: Remove duplicate service tests.
by Hans Leidekker 31 May '18

31 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/install.c | 86 +++--------------------------------------------- 1 file changed, 5 insertions(+), 81 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f0e4857fe1..a4726d631c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -84,8 +84,7 @@ static const CHAR component_dat[] = "Component\tComponentId\tDirectory_\tAttribu "Three\t{010B6ADD-B27D-4EDD-9B3D-34C4F7D61684}\tCHANGEDDIR\t2\t\tthree.txt\n" "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" - "component\t\tMSITESTDIR\t0\t1\tfile\n" - "service_comp\t\tMSITESTDIR\t0\t1\tservice_file"; + "component\t\tMSITESTDIR\t0\t1\tfile\n"; static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -106,8 +105,7 @@ static const CHAR feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\t "One\t\tOne\tThe One Feature\t1\t3\tMSITESTDIR\t0\n" "Three\t\tThree\tThe Three Feature\t3\t3\tCHANGEDDIR\t0\n" "Two\t\tTwo\tThe Two Feature\t2\t3\tFIRSTDIR\t0\n" - "feature\t\t\t\t2\t1\tTARGETDIR\t0\n" - "service_feature\t\t\t\t2\t1\tTARGETDIR\t0"; + "feature\t\t\t\t2\t1\tTARGETDIR\t0\n"; static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -117,8 +115,7 @@ static const CHAR feature_comp_dat[] = "Feature_\tComponent_\n" "One\tOne\n" "Three\tThree\n" "Two\tTwo\n" - "feature\tcomponent\n" - "service_feature\tservice_comp\n"; + "feature\tcomponent\n"; static const CHAR file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -128,8 +125,7 @@ static const CHAR file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tL "one.txt\tOne\tone.txt\t1000\t\t\t0\t1\n" "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" - "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" - "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + "file\tcomponent\tfilename\t100\t\t\t8192\t1\n"; static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -144,7 +140,6 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "DuplicateFiles\t\t4500\n" "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" - "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" "InstallValidate\t\t1400\n" @@ -177,8 +172,6 @@ static const CHAR property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "MSIFASTINSTALL\t1\n"; static const CHAR aup_property_dat[] = "Property\tValue\n" @@ -201,8 +194,6 @@ static const CHAR aup_property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "MSIFASTINSTALL\t1\n"; static const CHAR aup2_property_dat[] = "Property\tValue\n" @@ -225,8 +216,6 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "MSIFASTINSTALL\t1\n"; static const CHAR icon_property_dat[] = "Property\tValue\n" @@ -248,8 +237,6 @@ static const CHAR icon_property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "MSIFASTINSTALL\t1\n"; static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" @@ -281,8 +268,6 @@ static const CHAR up_property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "RemovePreviousVersions\t1\n" "MSIFASTINSTALL\t1\n"; @@ -305,8 +290,6 @@ static const CHAR up2_property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "MSIFASTINSTALL\t1\n"; static const CHAR up3_property_dat[] = "Property\tValue\n" @@ -328,8 +311,6 @@ static const CHAR up3_property_dat[] = "Property\tValue\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" - "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n" "RemovePreviousVersions\t1\n" "MSIFASTINSTALL\t1\n"; @@ -341,17 +322,6 @@ static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_ "regdata\t1\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n" "OrderTest\t1\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent"; -static const CHAR service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" - "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" - "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" - "ServiceInstall\tServiceInstall\n" - "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t"; - -static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" - "s72\tl255\ti2\tL255\tI2\ts72\n" - "ServiceControl\tServiceControl\n" - "ServiceControl\tTestService\t8\t\t0\tservice_comp"; - /* tables for test_continuouscabs */ static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -859,8 +829,7 @@ static const CHAR ai_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "one.txt\tOne\tone.txt\t1000\t\t\t16384\t1\n" "three.txt\tThree\tthree.txt\t1000\t\t\t16384\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t16384\t2\n" - "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" - "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + "file\tcomponent\tfilename\t100\t\t\t8192\t1\n"; static const CHAR ip_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -1358,8 +1327,6 @@ static const msi_table tables[] = ADD_TABLE(media), ADD_TABLE(property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table sc_tables[] = @@ -1399,8 +1366,6 @@ static const msi_table up_tables[] = ADD_TABLE(media), ADD_TABLE(up_property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table up2_tables[] = @@ -1414,8 +1379,6 @@ static const msi_table up2_tables[] = ADD_TABLE(media), ADD_TABLE(up2_property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table up3_tables[] = @@ -1429,8 +1392,6 @@ static const msi_table up3_tables[] = ADD_TABLE(media), ADD_TABLE(up3_property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table up4_tables[] = @@ -1444,8 +1405,6 @@ static const msi_table up4_tables[] = ADD_TABLE(media), ADD_TABLE(property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table up5_tables[] = @@ -1459,8 +1418,6 @@ static const msi_table up5_tables[] = ADD_TABLE(media), ADD_TABLE(up_property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table up6_tables[] = @@ -1474,8 +1431,6 @@ static const msi_table up6_tables[] = ADD_TABLE(media), ADD_TABLE(up2_property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table up7_tables[] = @@ -1489,8 +1444,6 @@ static const msi_table up7_tables[] = ADD_TABLE(media), ADD_TABLE(up3_property), ADD_TABLE(registry), - ADD_TABLE(service_install), - ADD_TABLE(service_control) }; static const msi_table cc_tables[] = @@ -2409,7 +2362,6 @@ static void create_test_files(void) create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); create_file("msitest\\filename", 100); - create_file("msitest\\service.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -2487,7 +2439,6 @@ static void delete_test_files(void) DeleteFileA("msitest\\second\\three.txt"); DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); - DeleteFileA("msitest\\service.exe"); DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\second"); RemoveDirectoryA("msitest\\first"); @@ -2506,7 +2457,6 @@ static void delete_pf_files(void) ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } @@ -2656,24 +2606,6 @@ void create_database_wordcount(const CHAR *name, const msi_table *tables, int nu HeapFree( GetProcessHeap(), 0, nameW ); } -static void check_service_is_installed(void) -{ - SC_HANDLE scm, service; - BOOL res; - - scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); - ok(scm != NULL, "Failed to open the SC Manager\n"); - - service = OpenServiceA(scm, "TestService", SC_MANAGER_ALL_ACCESS); - ok(service != NULL, "Failed to open TestService\n"); - - res = DeleteService(service); - ok(res, "Failed to delete TestService\n"); - - CloseServiceHandle(service); - CloseServiceHandle(scm); -} - static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status) { RESTOREPOINTINFOA spec; @@ -2777,8 +2709,6 @@ static void test_MsiInstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(!lstrcmpA(path, "OrderTestValue"), "Expected OrderTestValue, got %s\n", path); - check_service_is_installed(); - delete_key(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", access); /* not published, reinstall */ @@ -4823,7 +4753,6 @@ static void test_adminimage(void) create_file("msitest\\cabout\\four.txt", 100); create_file("msitest\\cabout\\new\\five.txt", 100); create_file("msitest\\filename", 100); - create_file("msitest\\service.exe", 100); create_database_wordcount(msifile, ai_tables, sizeof(ai_tables) / sizeof(msi_table), @@ -4849,7 +4778,6 @@ error: DeleteFileA("msitest\\second\\three.txt"); DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); - DeleteFileA("msitest\\service.exe"); DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\cabout\\new"); RemoveDirectoryA("msitest\\cabout"); @@ -5049,7 +4977,6 @@ static void test_preselected(void) ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); - ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); r = MsiInstallProductA(msifile, NULL); @@ -5065,7 +4992,6 @@ static void test_preselected(void) ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); - ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -6162,7 +6088,6 @@ static void test_wow64(void) ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); - ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); ok(!delete_pf("msitest", FALSE), "Directory created\n"); ok(delete_pf_native("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); @@ -6175,7 +6100,6 @@ static void test_wow64(void) ok(delete_pf_native("msitest\\first", FALSE), "Directory not created\n"); ok(delete_pf_native("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf_native("msitest\\filename", TRUE), "File not installed\n"); - ok(delete_pf_native("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf_native("msitest", FALSE), "Directory not created\n"); pWow64RevertWow64FsRedirection(cookie); -- 2.11.0

1 0

[PATCH] testbot/web: Move some Submit.pl variables closer to the usage.
by Francois Gouget 31 May '18

31 May '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 6451745a9..2b4e5ec14 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -509,15 +509,12 @@ sub DetermineFileType($$) { my ($self, $FileName) = @_; - my $ErrMessage = undef; - my $FileType = "unknown"; - my $DllBaseName = undef; - my $TestUnit = undef; if (! sysopen(FH, $FileName, O_RDONLY)) { return ("Unable to open $FileName", "unknown", undef, undef); } + my $FileType = "unknown"; my $Buffer; if (sysread(FH, $Buffer, 0x40)) { @@ -563,6 +560,7 @@ sub DetermineFileType($$) close FH; + my ($ErrMessage, $DllBaseName, $TestUnit); if ($FileType eq "unknown") { my $Impacts = GetPatchImpact($FileName); -- 2.17.0

1 0

[PATCH] testbot: Update the Job, Step and Task documentation.
by Francois Gouget 31 May '18

31 May '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 24 ++++++++++++++++++++--- testbot/lib/WineTestBot/Steps.pm | 33 +++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Tasks.pm | 31 ++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ef0d98e24..b1ffd3e48 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -28,13 +28,14 @@ WineTestBot::Job - A job submitted by a user =head1 DESCRIPTION A Job is created when a WineTestBot::User asks for something to be tested -(for automatically generated Jobs this would be the batch user). There are many +(for automatically generated Jobs this would be the batch user). A Job is +composed of one or more WineTestBot::Step objects. There are many paths that can result in the creation of a job: =over =item * -A use submits a patch or binary to test. +A user submits a patch or binary to test. =item * WineTestBot finds a patch to test on the mailing list (and has all the pieces @@ -47,7 +48,24 @@ Job. =back -A Job is composed of multiple WineTestBot::Step objects. +A Job's lifecycle is as follows: +=over + +=item * +A Job is created with Status set to queued which means it is ready to run. + +=item * +As soon as one of the Step starts running, the Job's Status field is set to +running. + +=item * +Once all the Steps have completed the Job's Status is updated to reflect the +overall result: completed, badpatch, etc. + +=item * +If the Job is canceled by the user, then the Status field is set to canceled. + +=back =cut diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 635092d1a..4dc45690e 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -26,9 +26,36 @@ WineTestBot::Step - A Job's Step =head1 DESCRIPTION -A Job is composed of multiple Steps that each do a specific operation: build -the test executable, or run a given test, etc. A Step is in turn composed of -a WineTestBot::Task object for each VM it should be run on. +A Job is composed of one or more Steps that each perform one operation. A +Step is in turn composed of one WineTestBot::Task object for each VM that the +Step should be run on. + +A Step's lifecyle is as follows: +=over + +=item * +A Step is created with Status set to queued which means it is ready to be run +as soon as the PreviousNo Step has completed, or immediately if PreviousNo is +not set. + +=item * +Once one of the Step's Task is running the Step's Status is changed to +running. + +=item * +Once all the Tasks in the Step have completed, the Step's Status is set to one +of the "completion" Status values according to the overall success of its +Tasks: completed, badpatch, etc. + +=item * +If the PreviousNo Step failed then the Status field and that of all its Tasks +is set to skip; and the Step will not be run. + +=item * +If a Step is canceled by the user, then the Status field is set to canceled if +the Step was running, and to skipped if it was queued. + +=back Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 69d551b84..afd4fb4d3 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -31,6 +31,37 @@ performing that Step in a WineTestBot::VM virtual machine. For instance a Step responsible for running a given test would have one Task object for each virtual machine that the test must be performed in. +A Task's lifecyle is as follows: +=over + +=item * +A Task is created with Status set to queued which means it is ready to be run +as soon as long as the Step itself is runnable (see the WineTestBot::Step +documentation). + +=item * +Once the Task is running on the corresponding VM the Status field is set to +running. + +=item * +If running the Task fails due to a transient error the TestFailure field +is checked. If it is lower than a configurable threshold the Status is +reset to queued and the TestFailure field is incremented. Otherwise the +Status is set to boterror and the Task is considered to have completed. + +=item * +If the Task completes normally the Status field is set to the appropriate +value based on the result: completed, badpatch, etc. + +=item * +If the Task is canceled by the user its Status is set to canceled. + +=item * +If the Task's Step cannot be run because the Step it depends on failed, then +Status is set to skipped. + +=back + =cut use WineTestBot::WineTestBotObjects; -- 2.17.0

1 0

[PATCH] testbot/web: Remove pointless 'cleanup' Submit.pl code.
by Francois Gouget 31 May '18

31 May '18

Objects are freed when they get out of scope. So there is no point setting $Jobs to undef. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2b4e5ec14..2a4521edc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -871,21 +871,17 @@ sub OnSubmit($) return !1; } - # Clean up, but save the key of the new job - my $JobKey = $NewJob->GetKey(); - $Jobs = undef; - # Notify engine my $ErrMessage = RescheduleJobs(); if (defined $ErrMessage) { $self->{ErrMessage} = $ErrMessage; $self->{Page} = 4; - $self->{JobKey} = $JobKey; + $self->{JobKey} = $NewJob->GetKey(); return !1; } - $self->Redirect("/JobDetails.pl?Key=$JobKey"); # does not return + $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return exit; } -- 2.17.0

1 0

[PATCH] testbot/web: Don't hardcode the Submit.pl maximum filename length.
by Francois Gouget 31 May '18

31 May '18

Also check it before even starting the upload. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cf850788d..6451745a9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -33,9 +33,10 @@ use File::Basename; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Branches; use WineTestBot::Config; -use WineTestBot::Jobs; use WineTestBot::Engine::Notify; +use WineTestBot::Jobs; use WineTestBot::PatchUtils; +use WineTestBot::Steps; use WineTestBot::Utils; use WineTestBot::VMs; @@ -609,10 +610,11 @@ sub OnPage1Next($) $FileName =~ m/^.*(\\|\/)(.*)/; $FileName = $2; } - if (100 - 32 - 1 < length($FileName)) + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) { $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Name is too long"; + $self->{ErrMessage} = "The filename is too long"; return !1; } my $StagingFile = $self->GetTmpStagingFullPath($FileName); -- 2.17.0

1 0

[PATCH] testbot: Adjust the StepsTasks fields.
by Francois Gouget 31 May '18

31 May '18

The StepTask class duplicates the Step and Task classes and its fields are mostly used in read-only mode so we don't care about their exact type too much, particularly for enums. Still, try to specify valid lengths so we don't get errors one day if Validate() is called. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/StepsTasks.pm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index ff94b1452..db0cc0667 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -162,20 +162,21 @@ sub CreateItem($) return WineTestBot::StepTask->new($self); } +# Note: To simplify maintenance replace enums with simple string fields. my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), - CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), - CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), - CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), + CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), ); sub CreateStepsTasks(;$$) -- 2.17.0

1 0

[PATCH 1/4] msi/tests: Simplify and combine environment variable tests.
by Zebediah Figura 31 May '18

31 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 416 ++++++++---------------------------------------- 1 file changed, 64 insertions(+), 352 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ac94c38..5747c935 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -143,7 +143,6 @@ static const char install_exec_seq_dat[] = "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" "DuplicateFiles\t\t4500\n" - "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" @@ -186,7 +185,24 @@ static const char property_dat[] = "MSIFASTINSTALL\t1\n" "regdata15\t#x01\n"; -static const char environment_dat[] = +static const char env_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "CostFinalize\t\t300\n" + "InstallValidate\t\t400\n" + "InstallInitialize\t\t500\n" + "ProcessComponents\t\t600\n" + "WriteEnvironmentStrings\t\t700\n" + "RemoveEnvironmentStrings\t\t800\n" + "RegisterProduct\t\t900\n" + "PublishFeatures\t\t1000\n" + "PublishProduct\t\t1100\n" + "InstallFinalize\t\t1200\n"; + +static const char env_environment_dat[] = "Environment\tName\tValue\tComponent_\n" "s72\tl255\tL255\ts72\n" "Environment\tEnvironment\n" @@ -216,7 +232,9 @@ static const char environment_dat[] = "Var24\t+-MSITESTVAR19\t[~]2\tOne\n" "Var25\t+-MSITESTVAR20\t1\tOne\n" "Var26\t+-MSITESTVAR20\t2[~]\tOne\n" - "Var27\t+-MSITESTVAR21\t[~];1\tOne\n"; + "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" + "Var28\t-MSITESTVAR22\t1\tOne\n" + "Var29\t-MSITESTVAR23\t2\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -1428,65 +1446,6 @@ static const char riv_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; -static const char res_file_dat[] = - "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "envvar.txt\tenvvar\tenvvar.txt\t1000\t\t\t8192\t1\n"; - -static const char res_feature_dat[] = - "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" - "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" - "Feature\tFeature\n" - "envvar\t\t\tenvvar feature\t1\t2\tMSITESTDIR\t0\n"; - -static const char res_feature_comp_dat[] = - "Feature_\tComponent_\n" - "s38\ts72\n" - "FeatureComponents\tFeature_\tComponent_\n" - "envvar\tenvvar\n"; - -static const char res_component_dat[] = - "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "envvar\t{45EE9AF4-E5D1-445F-8BB7-B22D4EEBD29E}\tMSITESTDIR\t0\t\tenvvar.txt\n"; - -static const char res_environment_dat[] = - "Environment\tName\tValue\tComponent_\n" - "s72\tl255\tL255\ts72\n" - "Environment\tEnvironment\n" - "var1\t=-MSITESTVAR1\t1\tenvvar\n" - "var2\t=+-MSITESTVAR2\t1\tenvvar\n" - "var3\t=MSITESTVAR3\t1\tenvvar\n" - "var4\t=-MSITESTVAR4\t\tenvvar\n" - "var5\t=MSITESTVAR5\t\tenvvar\n" - "Var6\t-MSITESTVAR6\t1;[~]\tenvvar\n" - "Var7\t-MSITESTVAR7\t[~];1\tenvvar\n" - "Var8\t-MSITESTVAR8\t1;[~]\tenvvar\n" - "Var9\t-MSITESTVAR9\t[~];1\tenvvar\n" - "Var10\t-MSITESTVAR10\t1\tenvvar\n" - "Var11\t-MSITESTVAR11\t2\tenvvar\n"; - -static const char res_install_exec_seq_dat[] = - "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "LaunchConditions\t\t100\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "CostFinalize\t\t1000\n" - "InstallValidate\t\t1400\n" - "InstallInitialize\t\t1500\n" - "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RemoveEnvironmentStrings\t\t3000\n" - "RegisterProduct\t\t5000\n" - "PublishFeatures\t\t5100\n" - "PublishProduct\t\t5200\n" - "InstallFinalize\t\t6000\n"; - static const char rci_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1990,10 +1949,10 @@ static const msi_table env_tables[] = ADD_TABLE(feature), ADD_TABLE(feature_comp), ADD_TABLE(file), - ADD_TABLE(install_exec_seq), + ADD_TABLE(env_install_exec_seq), ADD_TABLE(media), ADD_TABLE(property), - ADD_TABLE(environment) + ADD_TABLE(env_environment) }; static const msi_table pp_tables[] = @@ -2287,19 +2246,6 @@ static const msi_table riv_tables[] = ADD_TABLE(property) }; -static const msi_table res_tables[] = -{ - ADD_TABLE(directory), - ADD_TABLE(res_component), - ADD_TABLE(res_feature), - ADD_TABLE(res_feature_comp), - ADD_TABLE(res_file), - ADD_TABLE(res_environment), - ADD_TABLE(res_install_exec_seq), - ADD_TABLE(media), - ADD_TABLE(property) -}; - static const msi_table rci_tables[] = { ADD_TABLE(directory), @@ -4969,27 +4915,10 @@ error: static void test_envvar(void) { - static const char *results[] = - { - "1;2", /* MSITESTVAR11 */ - "1", /* MSITESTVAR12 */ - "1;2", /* MSITESTVAR13 */ - ";1;", /* MSITESTVAR14 */ - ";;1;;", /* MSITESTVAR15 */ - " 1 ", /* MSITESTVAR16 */ - ";;2;;1", /* MSITESTVAR17 */ - "1;;2;;", /* MSITESTVAR18 */ - "1", /* MSITESTVAR19 */ - "1", /* MSITESTVAR20 */ - "1", /* MSITESTVAR21 */ - NULL - }; - UINT r; + char buffer[16]; + UINT r, i; HKEY env; LONG res; - DWORD type, size; - char buffer[16]; - UINT i; if (is_process_limited()) { @@ -4997,7 +4926,6 @@ static void test_envvar(void) return; } - create_test_files(); create_database(msifile, env_tables, sizeof(env_tables) / sizeof(msi_table)); res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); @@ -5022,33 +4950,10 @@ static void test_envvar(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - type = REG_NONE; - size = sizeof(buffer); - buffer[0] = 0; - res = RegQueryValueExA(env, "MSITESTVAR1", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "Expected \"1\", got %s\n", buffer); - - res = RegDeleteValueA(env, "MSITESTVAR1"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - - type = REG_NONE; - size = sizeof(buffer); - buffer[0] = 0; - res = RegQueryValueExA(env, "MSITESTVAR2", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "Expected \"1\", got %s\n", buffer); - - res = RegDeleteValueA(env, "MSITESTVAR2"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - - res = RegDeleteValueA(env, "MSITESTVAR3"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - - res = RegDeleteValueA(env, "MSITESTVAR4"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(env, "MSITESTVAR1", "1"); + CHECK_REG_STR(env, "MSITESTVAR2", "1"); + CHECK_REG_STR(env, "MSITESTVAR3", "1"); + CHECK_REG_STR(env, "MSITESTVAR4", "1"); res = RegDeleteValueA(env, "MSITESTVAR5"); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); @@ -5068,46 +4973,50 @@ static void test_envvar(void) res = RegDeleteValueA(env, "MSITESTVAR10"); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - i = 11; - while (results[i - 11]) + CHECK_REG_STR(env, "MSITESTVAR11", "1;2"); + CHECK_REG_STR(env, "MSITESTVAR12", "1"); + CHECK_REG_STR(env, "MSITESTVAR13", "1;2"); + CHECK_REG_STR(env, "MSITESTVAR14", ";1;"); + CHECK_REG_STR(env, "MSITESTVAR15", ";;1;;"); + CHECK_REG_STR(env, "MSITESTVAR16", " 1 "); + CHECK_REG_STR(env, "MSITESTVAR17", ";;2;;1"); + CHECK_REG_STR(env, "MSITESTVAR18", "1;;2;;"); + CHECK_REG_STR(env, "MSITESTVAR19", "1"); + CHECK_REG_STR(env, "MSITESTVAR20", "1"); + CHECK_REG_STR(env, "MSITESTVAR21", "1"); + + res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(!r, "got %u\n", r); + + CHECK_DEL_REG_STR(env, "MSITESTVAR13", "1;2"); + CHECK_DEL_REG_STR(env, "MSITESTVAR14", ";1;"); + CHECK_DEL_REG_STR(env, "MSITESTVAR15", ";;1;;"); + CHECK_DEL_REG_STR(env, "MSITESTVAR16", " 1 "); +todo_wine { + CHECK_DEL_REG_STR(env, "MSITESTVAR17", "1"); + CHECK_DEL_REG_STR(env, "MSITESTVAR18", "1"); +} + CHECK_DEL_REG_STR(env, "MSITESTVAR23", "1"); + + for (i = 1; i <= 23; i++) { - char name[20]; - sprintf(name, "MSITESTVAR%d", i); - - type = REG_NONE; - size = sizeof(buffer); - buffer[0] = 0; - res = RegQueryValueExA(env, name, NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "%d: Expected ERROR_SUCCESS, got %d\n", i, res); - ok(type == REG_SZ, "%d: Expected REG_SZ, got %u\n", i, type); - ok(!lstrcmpA(buffer, results[i - 11]), "%d: Expected %s, got %s\n", i, results[i - 11], buffer); - - res = RegDeleteValueA(env, name); - ok(res == ERROR_SUCCESS, "%d: Expected ERROR_SUCCESS, got %d\n", i, res); - i++; + sprintf(buffer, "MSITESTVAR%i", i); + res = RegDeleteValueA(env, buffer); + ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res); } - delete_pf("msitest\\cabout\\new\\five.txt", TRUE); - delete_pf("msitest\\cabout\\new", FALSE); - delete_pf("msitest\\cabout\\four.txt", TRUE); - delete_pf("msitest\\cabout", FALSE); - delete_pf("msitest\\changed\\three.txt", TRUE); - delete_pf("msitest\\changed", FALSE); - delete_pf("msitest\\first\\two.txt", TRUE); - delete_pf("msitest\\first", FALSE); - delete_pf("msitest\\filename", TRUE); - delete_pf("msitest\\one.txt", TRUE); - delete_pf("msitest\\service.exe", TRUE); - delete_pf("msitest\\service2.exe", TRUE); - delete_pf("msitest", FALSE); - error: RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR2"); RegDeleteValueA(env, "MSITESTVAR21"); RegCloseKey(env); - delete_test_files(); DeleteFileA(msifile); } @@ -6127,202 +6036,6 @@ error: DeleteFileA(msifile); } -static void test_remove_env_strings(void) -{ - UINT r; - LONG res; - HKEY key; - DWORD type, size; - char buffer[0x10]; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - create_test_files(); - create_file("msitest\\envvar.txt", 1000); - create_database(msifile, res_tables, sizeof(res_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - - res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); - ok(!res, "failed to open environment key %d\n", res); - - RegSetValueExA(key, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR3", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR4", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR5", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR6", 0, REG_SZ, (const BYTE *)"1;2", 4); - RegSetValueExA(key, "MSITESTVAR7", 0, REG_SZ, (const BYTE *)"1;2", 4); - RegSetValueExA(key, "MSITESTVAR8", 0, REG_SZ, (const BYTE *)"2;1;0", 6); - RegSetValueExA(key, "MSITESTVAR9", 0, REG_SZ, (const BYTE *)"0;1;2", 6); - RegSetValueExA(key, "MSITESTVAR10", 0, REG_SZ, (const BYTE *)"1", 2); - RegSetValueExA(key, "MSITESTVAR11", 0, REG_SZ, (const BYTE *)"1", 2); - - RegCloseKey(key); - - r = MsiInstallProductA(msifile, NULL); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); - ok(!res, "failed to open environment key %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR1", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR2", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR3", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR4", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR5", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - - RegCloseKey(key); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); - ok(!res, "failed to open environment key %d\n", res); - - res = RegQueryValueExA(key, "MSITESTVAR1", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - res = RegQueryValueExA(key, "MSITESTVAR2", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR3", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR3"); - - res = RegQueryValueExA(key, "MSITESTVAR4", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR5", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR5"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR6", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR6"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR7", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR7"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR8", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "2;0"), "expected \"2;0\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR8"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR9", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "0;2"), "expected \"0;2\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR9"); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR10", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - - type = REG_NONE; - buffer[0] = 0; - size = sizeof(buffer); - res = RegQueryValueExA(key, "MSITESTVAR11", NULL, &type, (LPBYTE)buffer, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); - ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); - RegDeleteValueA(key, "MSITESTVAR11"); - - ok(!delete_pf("msitest\\envvar.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - -error: - RegDeleteValueA(key, "MSITESTVAR1"); - RegDeleteValueA(key, "MSITESTVAR2"); - RegDeleteValueA(key, "MSITESTVAR3"); - RegDeleteValueA(key, "MSITESTVAR4"); - RegDeleteValueA(key, "MSITESTVAR5"); - RegDeleteValueA(key, "MSITESTVAR6"); - RegDeleteValueA(key, "MSITESTVAR7"); - RegDeleteValueA(key, "MSITESTVAR8"); - RegDeleteValueA(key, "MSITESTVAR9"); - RegDeleteValueA(key, "MSITESTVAR10"); - RegDeleteValueA(key, "MSITESTVAR11"); - RegCloseKey(key); - - DeleteFileA("msitest\\envvar.txt"); - delete_test_files(); - DeleteFileA(msifile); -} - static void test_register_class_info(void) { UINT r; @@ -6933,7 +6646,6 @@ START_TEST(action) test_remove_registry_values(); test_find_related_products(); test_remove_ini_values(); - test_remove_env_strings(); test_register_class_info(); test_register_extension_info(); test_register_progid_info(); -- 2.7.4

3 9

[PATCH 02/17] wbemdisp/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 31 May '18

31 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemdisp/tests/wbemdisp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 0c426c569a..171a91edb4 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -56,10 +56,10 @@ static void test_ParseDisplayName(void) ULONG eaten; } tests[] = { - { name1, S_OK, &IID_ISWbemServices, sizeof(name1)/sizeof(name1[0]) - 1 }, - { name2, S_OK, &IID_ISWbemServices, sizeof(name2)/sizeof(name2[0]) - 1 }, - { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, - { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } + { name1, S_OK, &IID_ISWbemServices, ARRAY_SIZE( name1 ) - 1 }, + { name2, S_OK, &IID_ISWbemServices, ARRAY_SIZE( name2 ) - 1 }, + { name3, S_OK, &IID_ISWbemObject, ARRAY_SIZE( name3 ) - 1 }, + { name4, S_OK, &IID_ISWbemObject, ARRAY_SIZE( name4 ) - 1 } }; IParseDisplayName *displayname; IBindCtx *ctx; @@ -79,7 +79,7 @@ static void test_ParseDisplayName(void) hr = CreateBindCtx( 0, &ctx ); ok( hr == S_OK, "got %x\n", hr ); - for (i =0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i =0; i < ARRAY_SIZE( tests ); i++) { str = SysAllocString( tests[i].name ); eaten = 0xdeadbeef; -- 2.14.3

2 1

[PATCH 01/17] wbemprox/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 31 May '18

31 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/tests/query.c | 10 +++++----- dlls/wbemprox/tests/services.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d95fdd970b..cb911d7927 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -141,7 +141,7 @@ static void test_select( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); @@ -168,7 +168,7 @@ static void test_associators( IWbemServices *services ) IEnumWbemClassObject *result; UINT i; - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); @@ -433,7 +433,7 @@ static void test_Win32_Process( IWbemServices *services ) out = NULL; method = SysAllocString( getownerW ); - class = SysAllocStringLen( NULL, sizeof(fmtW)/sizeof(fmtW[0]) + 10 ); + class = SysAllocStringLen( NULL, ARRAY_SIZE( fmtW ) + 10 ); wsprintfW( class, fmtW, GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); @@ -524,13 +524,13 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) WCHAR username[128]; DWORD len, count; - len = sizeof(compname) / sizeof(compname[0]); + len = ARRAY_SIZE( compname ); if (!GetComputerNameW( compname, &len )) compname[0] = 0; lstrcpyW( username, compname ); lstrcatW( username, backslashW ); - len = sizeof(username) / sizeof(username[0]) - lstrlenW( username ); + len = ARRAY_SIZE( username ) - lstrlenW( username ); if (!GetUserNameW( username + lstrlenW( username ), &len )) username[0] = 0; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index a6774751f3..da10e72fe1 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -164,7 +164,7 @@ static void test_IWbemLocator(void) } ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); - for (i = 0; i < sizeof(test) / sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { resource = SysAllocString( test[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); -- 2.14.3

2 1

[PATCH] testbot: Fix handling of test unit additions/removals in patch series.
by Francois Gouget 31 May '18

31 May '18

The TestBot used to only analyse the last patch in the series to determine whether it impacts the tests or not. However patches to resource files and helper dlls require having an up-to-date list of the test units, and that list may be impacted by previous patches in the series. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 19 +++++++++++++++++-- testbot/lib/WineTestBot/Patches.pm | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a466df359..611d883e4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -127,9 +127,9 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$) +sub GetPatchImpact($;$$) { - my ($PatchFileName, $NoUnits) = @_; + my ($PatchFileName, $NoUnits, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); @@ -138,6 +138,21 @@ sub GetPatchImpact($;$) NoUnits => $NoUnits, Tests => {}, }; + + if ($PastImpacts) + { + foreach my $PastInfo (values %{$PastImpacts->{Tests}}) + { + if ($PastInfo->{Files}) + { + foreach my $File (keys %{$PastInfo->{Files}}) + { + _AddTest($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); + } + } + } + } my ($Path, $Change); while (my $Line = <$fh>) { diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d4a5e0b17..71d735b08 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -132,7 +132,9 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id); + my $PastImpacts; + $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { $self->Disposition(($IsSet ? "Set" : "Patch") . -- 2.17.0

1 0

[PATCH] testbot/build: Tell Wine not to rebuild the WineTest executable.
by Francois Gouget 31 May '18

31 May '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 322638eb1..6f461144e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -148,7 +148,7 @@ sub BuildNative() # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -171,8 +171,8 @@ sub BuildCross($) # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " time make -j$ncpus programs/winetest " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . + " time make -j$ncpus buildtests" . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { -- 2.17.0

1 0

[PATCH] testbot: Fix the "Set doesn't affect tests" message.
by Francois Gouget 31 May '18

31 May '18

There is no need to rerun the tests for part N of a patch set if it does not impact the tests: the results would be the same as those already obtained from the combined part 1 .. part N patch. So adjust the message to better convey this. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 71d735b08..d5be1b355 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -137,7 +137,7 @@ sub Submit($$$) my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { - $self->Disposition(($IsSet ? "Set" : "Patch") . + $self->Disposition(($IsSet ? "Part" : "Patch") . " doesn't affect tests"); return undef; } -- 2.17.0

1 0

[PATCH] dplayx: Prevent out-of-bounds access to lpMemArea.
by Huw Davies 31 May '18

31 May '18

Based on a patch by Andrey Gusev. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dplayx/dplayx_global.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 14c53a0c8d..bc087c8b33 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -120,9 +120,9 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) /* Find blank area */ uBlockUsed = 0; - while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; } + while( uBlockUsed < dwMaxBlock && lpMemArea[ uBlockUsed ].used ) { uBlockUsed++; } - if( uBlockUsed <= dwMaxBlock ) + if( uBlockUsed < dwMaxBlock ) { /* Set the area used */ lpMemArea[ uBlockUsed ].used = TRUE; -- 2.16.2

2 1

[PATCH 4/4] schedsvc: Add support for executing tasks.
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 182 ++++++++++++++++++++++++++++++++++++--- dlls/schedsvc/schedsvc_private.h | 3 + dlls/schedsvc/svc_main.c | 60 ++++++++++++- 3 files changed, 230 insertions(+), 15 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 05335de3f3..9497c900a7 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -66,9 +66,19 @@ struct job_t USHORT instance_count; }; +struct running_job_t +{ + struct list entry; + UUID uuid; + HANDLE process; + DWORD pid; +}; + static LONG current_jobid = 1; static struct list at_job_list = LIST_INIT(at_job_list); +static struct list running_job_list = LIST_INIT(running_job_list); + static CRITICAL_SECTION at_job_list_section; static CRITICAL_SECTION_DEBUG cs_debug = { @@ -359,11 +369,6 @@ void add_job(const WCHAR *name) return; } - if (job->data.flags & 0x08000000) - FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); - else if (job->data.flags & 0x04000000) - FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); - EnterCriticalSection(&at_job_list_section); job->name = heap_strdupW(name); job->info.JobId = current_jobid++; @@ -545,25 +550,180 @@ failed: return ret; } -static struct job_t *find_job(DWORD jobid, const WCHAR *name) +static struct job_t *find_job(DWORD jobid, const WCHAR *name, const UUID *id) { struct job_t *job; LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) { - if ((name && !lstrcmpiW(job->name, name)) || job->info.JobId == jobid) + if (job->info.JobId == jobid || (name && !lstrcmpiW(job->name, name)) || (id && IsEqualGUID(&job->data.uuid, id))) return job; } return NULL; } +static void update_job_status(struct job_t *job) +{ + HANDLE hfile; + DWORD try, size; +#include "pshpack2.h" + struct + { + UINT exit_code; + UINT status; + UINT flags; + SYSTEMTIME last_runtime; + WORD instance_count; + } state; +#include "poppack.h" + + try = 1; + for (;;) + { + hfile = CreateFileW(job->name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (hfile != INVALID_HANDLE_VALUE) break; + + if (try++ >= 3) + { + ERR("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + return; + } + Sleep(100); + } + + if (SetFilePointer(hfile, FIELD_OFFSET(FIXDLEN_DATA, exit_code), NULL, FILE_BEGIN) != INVALID_SET_FILE_POINTER) + { + state.exit_code = job->data.exit_code; + state.status = job->data.status; + state.flags = job->data.flags; + state.last_runtime = job->data.last_runtime; + state.instance_count = job->instance_count; + WriteFile(hfile, &state, sizeof(state), &size, NULL); + } + + CloseHandle(hfile); +} + +void update_process_status(DWORD pid) +{ + struct running_job_t *runjob; + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(runjob, &running_job_list, struct running_job_t, entry) + { + if (runjob->pid == pid) + { + struct job_t *job = find_job(0, NULL, &runjob->uuid); + if (job) + { + DWORD exit_code = STILL_ACTIVE; + + GetExitCodeProcess(runjob->process, &exit_code); + + if (exit_code != STILL_ACTIVE) + { + CloseHandle(runjob->process); + list_remove(&runjob->entry); + heap_free(runjob); + + job->data.exit_code = exit_code; + job->data.status = SCHED_S_TASK_TERMINATED; + job->data.flags &= ~0x0c000000; + job->instance_count = 0; + update_job_status(job); + } + } + break; + } + } + + LeaveCriticalSection(&at_job_list_section); +} + +void check_task_state(void) +{ + struct job_t *job; + struct running_job_t *runjob; + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (job->data.flags & 0x08000000) + { + TRACE("terminating process %s\n", debugstr_w(job->info.Command)); + + LIST_FOR_EACH_ENTRY(runjob, &running_job_list, struct running_job_t, entry) + { + if (IsEqualGUID(&job->data.uuid, &runjob->uuid)) + { + TerminateProcess(runjob->process, 0); + update_process_status(runjob->pid); + break; + } + } + } + else if (job->data.flags & 0x04000000) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + TRACE("running process %s\n", debugstr_w(job->info.Command)); + + if (job->instance_count) + FIXME("process %s is already running\n", debugstr_w(job->info.Command)); + + runjob = heap_alloc(sizeof(*runjob)); + if (runjob) + { + static WCHAR winsta0[] = { 'W','i','n','S','t','a','0',0 }; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + /* FIXME: if (job->data.flags & TASK_FLAG_INTERACTIVE) */ + si.lpDesktop = winsta0; + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_SHOWNORMAL; + TRACE("executing %s %s at %s\n", debugstr_w(job->info.Command), debugstr_w(job->params), debugstr_w(job->curdir)); + if (CreateProcessW(job->info.Command, job->params, NULL, NULL, FALSE, 0, NULL, job->curdir, &si, &pi)) + { + CloseHandle(pi.hThread); + + GetLocalTime(&job->data.last_runtime); + job->data.exit_code = 0; + job->data.status = SCHED_S_TASK_RUNNING; + job->instance_count = 1; + + runjob->uuid = job->data.uuid; + runjob->process = pi.hProcess; + runjob->pid = pi.dwProcessId; + list_add_tail(&running_job_list, &runjob->entry); + add_process_to_queue(pi.hProcess); + } + else + { + WARN("failed to execute %s\n", debugstr_w(job->info.Command)); + job->data.status = SCHED_S_TASK_HAS_NOT_RUN; + job->instance_count = 0; + } + } + + job->data.flags &= ~0x0c000000; + update_job_status(job); + } + } + + LeaveCriticalSection(&at_job_list_section); +} + void remove_job(const WCHAR *name) { struct job_t *job; EnterCriticalSection(&at_job_list_section); - job = find_job(0, name); + job = find_job(0, name, NULL); if (job) { list_remove(&job->entry); @@ -596,7 +756,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) for (i = 0; i < 5; i++) { EnterCriticalSection(&at_job_list_section); - job = find_job(0, task_name); + job = find_job(0, task_name, NULL); LeaveCriticalSection(&at_job_list_section); if (job) @@ -640,7 +800,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo for (jobid = min_jobid; jobid <= max_jobid; jobid++) { - struct job_t *job = find_job(jobid, NULL); + struct job_t *job = find_job(jobid, NULL, NULL); if (!job) { @@ -735,7 +895,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in EnterCriticalSection(&at_job_list_section); - job = find_job(jobid, NULL); + job = find_job(jobid, NULL, NULL); if (job) { AT_INFO *info_ret = heap_alloc(sizeof(*info_ret)); diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 215bba003e..f5cec2a7cb 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,6 +25,9 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; +void check_task_state(void) DECLSPEC_HIDDEN; +void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; +void update_process_status(DWORD pid) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index f021d63b98..9342b50e4b 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -34,13 +34,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; static SERVICE_STATUS_HANDLE schedsvc_handle; -static HANDLE done_event; +static HANDLE done_event, hjob_queue; + +void add_process_to_queue(HANDLE process) +{ + if (!AssignProcessToJobObject(hjob_queue, process)) + ERR("AssignProcessToJobObject failed"); +} static DWORD WINAPI tasks_monitor_thread(void *arg) { static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; WCHAR path[MAX_PATH]; - HANDLE htasks; + HANDLE htasks, hport; + JOBOBJECT_ASSOCIATE_COMPLETION_PORT info; OVERLAPPED ov; TRACE("Starting...\n"); @@ -59,6 +66,28 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) return -1; } + hjob_queue = CreateJobObjectW(NULL, NULL); + if (!hjob_queue) + { + ERR("CreateJobObject failed"); + return -1; + } + + hport = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); + if (!hport) + { + ERR("CreateIoCompletionPort failed"); + return -1; + } + + info.CompletionKey = hjob_queue; + info.CompletionPort = hport; + if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) + { + ERR("SetInformationJobObject failed"); + return -1; + } + memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -69,7 +98,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FILE_NOTIFY_INFORMATION data; WCHAR name_buffer[MAX_PATH]; } info; - HANDLE events[2]; + HANDLE events[3]; DWORD ret; /* the buffer must be DWORD aligned */ @@ -87,10 +116,29 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) events[0] = done_event; events[1] = ov.hEvent; + events[2] = hport; - ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); + ret = WaitForMultipleObjects(3, events, FALSE, INFINITE); if (ret == WAIT_OBJECT_0) break; + if (ret == WAIT_OBJECT_0 + 2) + { + DWORD msg; + ULONG_PTR dummy, pid; + + if (GetQueuedCompletionStatus(hport, &msg, &dummy, (OVERLAPPED **)&pid, 0)) + { + if (msg == JOB_OBJECT_MSG_EXIT_PROCESS) + { + TRACE("got message: process %#lx has terminated\n", pid); + update_process_status(pid); + } + else + FIXME("got message %#x from the job\n", msg); + } + continue; + } + info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; switch (info.data.Action) @@ -126,9 +174,13 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break; } + + check_task_state(); } CloseHandle(ov.hEvent); + CloseHandle(hport); + CloseHandle(hjob_queue); CloseHandle(htasks); TRACE("Finished.\n"); -- 2.16.3

1 0

[PATCH 3/4] mstask: Retry with a timeout if opening a job file has failed.
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 91d2cb6209..266029a58e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi TaskImpl *This = impl_from_IPersistFile(iface); HRESULT hr; HANDLE file, mapping; - DWORD access, sharing, size; + DWORD access, sharing, size, try; void *data; TRACE("(%p, %s, 0x%08x)\n", iface, debugstr_w(file_name), mode); @@ -1432,11 +1432,18 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi break; } - file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) + try = 1; + for (;;) { - TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); - return HRESULT_FROM_WIN32(GetLastError()); + file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); + if (file != INVALID_HANDLE_VALUE) break; + + if (try++ >= 3) + { + TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + Sleep(100); } size = GetFileSize(file, NULL); -- 2.16.3

1 0

[PATCH 2/4] schedsvc: Read parameters and current directory from the job file.
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 542dfc3701..05335de3f3 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -59,6 +59,8 @@ struct job_t { struct list entry; WCHAR *name; + WCHAR *params; + WCHAR *curdir; AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; @@ -76,7 +78,7 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; -static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) +static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *job) { DWORD i, data_size = 0; USHORT len; @@ -101,8 +103,23 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); - if (i == 0) - info->Command = heap_strdupW((const WCHAR *)data); + switch (i) + { + case 0: + job->info.Command = heap_strdupW((const WCHAR *)data); + break; + + case 1: + job->params = heap_strdupW((const WCHAR *)data); + break; + + case 2: + job->curdir = heap_strdupW((const WCHAR *)data); + break; + + default: + break; + } data += len * sizeof(WCHAR); data_size += len * sizeof(WCHAR); @@ -162,7 +179,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("instance count %u\n", info->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) - unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, &info->info); + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); else { TRACE("invalid name_size_offset\n"); @@ -324,6 +341,8 @@ static void free_job(struct job_t *job) { free_job_info(&job->info); heap_free(job->name); + heap_free(job->params); + heap_free(job->curdir); heap_free(job); } -- 2.16.3

1 0

[PATCH 1/4] mstask: Implement ITask::GetMostRecentRunTime().
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58be83ecb6..91d2cb6209 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -63,6 +63,7 @@ typedef struct HRESULT status; WORD idle_minutes, deadline_minutes; DWORD flags, priority, maxRunTime, exit_code; + SYSTEMTIME last_runtime; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -654,10 +655,18 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, st); + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, st); + + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + { + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_HAS_NOT_RUN; + } - memset(st, 0, sizeof(*st)); - return SCHED_S_TASK_HAS_NOT_RUN; + *st = This->last_runtime; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) @@ -1262,8 +1271,9 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); This->flags = fixed->flags; + This->last_runtime = fixed->last_runtime; st = &fixed->last_runtime; - TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", + TRACE("last_runtime %u/%u/%u wday %u %u:%02u:%02u.%03u\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); @@ -1617,7 +1627,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; fixed.flags = This->flags; - memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); + fixed.last_runtime = This->last_runtime; try = 1; for (;;) @@ -1855,6 +1865,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + memset(&This->last_runtime, 0, sizeof(This->last_runtime)); CoCreateGuid(&This->uuid); /* Default time is 3 days = 259200000 ms */ -- 2.16.3

1 0

[PATCH 1/3] include: Add virtdisk.h.
by Gijs Vermeulen 31 May '18

31 May '18

Based on a patch by Louis Lenders. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This patchset fixes: https://bugs.winehq.org/show_bug.cgi?id=42577 include/Makefile.in | 1 + include/virtdisk.h | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 include/virtdisk.h diff --git a/include/Makefile.in b/include/Makefile.in index 78ab095d77..900e326653 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -631,6 +631,7 @@ SOURCES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ + virtdisk.h \ vmr9.idl \ vmrender.idl \ vss.idl \ diff --git a/include/virtdisk.h b/include/virtdisk.h new file mode 100644 index 0000000000..0e79bf8b2d --- /dev/null +++ b/include/virtdisk.h @@ -0,0 +1,200 @@ +/* + * Copyright 2017 Louis Lenders + * Copyright 2018 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_VIRTDISK_DLL_H +#define __WINE_VIRTDISK_DLL_H + +#include <windows.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 +#define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 + +typedef enum _ATTACH_VIRTUAL_DISK_FLAG { + ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000, + ATTACH_VIRTUAL_DISK_FLAG_READ_ONLY = 0x00000001, + ATTACH_VIRTUAL_DISK_FLAG_NO_DRIVE_LETTER = 0x00000002, + ATTACH_VIRTUAL_DISK_FLAG_PERMANENT_LIFETIME = 0x00000004, + ATTACH_VIRTUAL_DISK_FLAG_NO_LOCAL_HOST = 0x00000008 +} ATTACH_VIRTUAL_DISK_FLAG; + +typedef enum _ATTACH_VIRTUAL_DISK_VERSION { + ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + ATTACH_VIRTUAL_DISK_VERSION_1 = 1 +} ATTACH_VIRTUAL_DISK_VERSION; + +typedef enum _COMPACT_VIRTUAL_DISK_FLAG { + COMPACT_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} COMPACT_VIRTUAL_DISK_FLAG; + +typedef enum _COMPACT_VIRTUAL_DISK_VERSION { + COMPACT_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + COMPACT_VIRTUAL_DISK_VERSION_1 = 1 +} COMPACT_VIRTUAL_DISK_VERSION; + +typedef enum _DEPENDENT_DISK_FLAG +{ + DEPENDENT_DISK_FLAG_NONE = 0x00000000, + DEPENDENT_DISK_FLAG_MULT_BACKING_FILES = 0x00000001, + DEPENDENT_DISK_FLAG_FULLY_ALLOCATED = 0x00000002, + DEPENDENT_DISK_FLAG_READ_ONLY = 0x00000004, + DEPENDENT_DISK_FLAG_REMOTE = 0x00000008, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME = 0x00000010, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME_PARENT = 0x00000020, + DEPENDENT_DISK_FLAG_REMOVABLE = 0x00000040, + DEPENDENT_DISK_FLAG_NO_DRIVE_LETTER = 0x00000080, + DEPENDENT_DISK_FLAG_PARENT = 0x00000100, + DEPENDENT_DISK_FLAG_NO_HOST_DISK = 0x00000200, + DEPENDENT_DISK_FLAG_PERMANENT_LIFETIME = 0x00000400 +} DEPENDENT_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_VERSION { + EXPAND_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + EXPAND_VIRTUAL_DISK_VERSION_1 = 1 +} EXPAND_VIRTUAL_DISK_VERSION; + +typedef enum _DETACH_VIRTUAL_DISK_FLAG { + DETACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} DETACH_VIRTUAL_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_FLAG { + EXPAND_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} EXPAND_VIRTUAL_DISK_FLAG; + +typedef enum _GET_STORAGE_DEPENDENCY_FLAG +{ + GET_STORAGE_DEPENDENCY_FLAG_NONE = 0x00000000, + GET_STORAGE_DEPENDENCY_FLAG_HOST_VOLUMES = 0x00000001, + GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE = 0x00000002 +} GET_STORAGE_DEPENDENCY_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_FLAG { + MIRROR_VIRTUAL_DISK_FLAG_NONE = 0x00000000, + MIRROR_VIRTUAL_DISK_FLAG_EXISTING_FILE = 0x00000001 +} MIRROR_VIRTUAL_DISK_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_VERSION { + MIRROR_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + MIRROR_VIRTUAL_DISK_VERSION_1 = 1 +} MIRROR_VIRTUAL_DISK_VERSION; + +typedef enum _MERGE_VIRTUAL_DISK_FLAG { + MERGE_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} MERGE_VIRTUAL_DISK_FLAG; + +typedef enum _STORAGE_DEPENDENCY_INFO_VERSION +{ + STORAGE_DEPENDENCY_INFO_VERSION_UNSPECIFIED = 0x0, + STORAGE_DEPENDENCY_INFO_VERSION_1 = 0x1, + STORAGE_DEPENDENCY_INFO_VERSION_2 = 0x2 +} STORAGE_DEPENDENCY_INFO_VERSION; + +typedef enum _VIRTUAL_DISK_ACCESS_MASK { + VIRTUAL_DISK_ACCESS_NONE = 0x00000000, + VIRTUAL_DISK_ACCESS_ATTACH_RO = 0x00010000, + VIRTUAL_DISK_ACCESS_ATTACH_RW = 0x00020000, + VIRTUAL_DISK_ACCESS_DETACH = 0x00040000, + VIRTUAL_DISK_ACCESS_GET_INFO = 0x00080000, + VIRTUAL_DISK_ACCESS_CREATE = 0x00100000, + VIRTUAL_DISK_ACCESS_METAOPS = 0x00200000, + VIRTUAL_DISK_ACCESS_READ = 0x000d0000, + VIRTUAL_DISK_ACCESS_ALL = 0x003f0000, + VIRTUAL_DISK_ACCESS_WRITABLE = 0x00320000 +} VIRTUAL_DISK_ACCESS_MASK; + +typedef struct _VIRTUAL_STORAGE_TYPE +{ + ULONG DeviceId; + GUID VendorId; +} VIRTUAL_STORAGE_TYPE, *PVIRTUAL_STORAGE_TYPE; + +typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS { + ATTACH_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} ATTACH_VIRTUAL_DISK_PARAMETERS, *PATTACH_VIRTUAL_DISK_PARAMETERS; + +typedef struct _COMPACT_VIRTUAL_DISK_PARAMETERS { + COMPACT_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} COMPACT_VIRTUAL_DISK_PARAMETERS, *PCOMPACT_VIRTUAL_DISK_PARAMETERS; + +typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { + EXPAND_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONGLONG NewSize; + } Version1; + } DUMMYUNIONNAME; +} EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; +} STORAGE_DEPENDENCY_INFO_TYPE_1, *PSTORAGE_DEPENDENCY_INFO_TYPE_1; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_2 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; + ULONG AncestorLevel; + PWSTR DependencyDeviceName; + PWSTR HostVolumeName; + PWSTR DependentVolumeName; + PWSTR DependentVolumeRelativePath; +} STORAGE_DEPENDENCY_INFO_TYPE_2, *PSTORAGE_DEPENDENCY_INFO_TYPE_2; + +typedef struct _STORAGE_DEPENDENCY_INFO +{ + STORAGE_DEPENDENCY_INFO_VERSION Version; + ULONG NumberEntries; + __C89_NAMELESS union + { + STORAGE_DEPENDENCY_INFO_TYPE_1 Version1Entries[1]; + STORAGE_DEPENDENCY_INFO_TYPE_2 Version2Entries[1]; + } __C89_NAMELESSUNIONNAME; +} STORAGE_DEPENDENCY_INFO, *PSTORAGE_DEPENDENCY_INFO; + +typedef struct _VIRTUAL_DISK_PROGRESS { + DWORD OperationStatus; + ULONGLONG CurrentValue; + ULONGLONG CompletionValue; +} VIRTUAL_DISK_PROGRESS, *PVIRTUAL_DISK_PROGRESS; + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_VIRTDISK_DLL_H */ -- 2.13.6

4 8

[PATCH 15/17] scrrun/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 6 +++--- dlls/scrrun/tests/filesystem.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 658dd66086..cda288b1bb 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -368,7 +368,7 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "got %d\n", V_I4(&hash)); - for (i = 0; i < sizeof(str_hash_tests)/sizeof(str_hash_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(str_hash_tests); i++) { expected = get_str_hash(str_hash_tests[i], BinaryCompare); hr = IDictionary_put_CompareMode(dict, BinaryCompare); @@ -461,7 +461,7 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); - for (i = 0; i < sizeof(int_hash_tests)/sizeof(int_hash_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(int_hash_tests); i++) { SHORT i2; BYTE ui1; LONG i4; @@ -597,7 +597,7 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); - for (i = 0; i < sizeof(float_hash_tests)/sizeof(float_hash_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(float_hash_tests); i++) { double dbl; FLOAT flt; DATE date; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d0c448c085..29ee73f243 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -375,7 +375,7 @@ static void test_GetFileVersion(void) BSTR path, version; HRESULT hr; - GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); lstrcpyW(filenameW, pathW); lstrcatW(filenameW, k32W); @@ -438,7 +438,7 @@ static void test_GetParentFolderName(void) hr = IFileSystem3_GetParentFolderName(fs3, NULL, NULL); ok(hr == E_POINTER, "GetParentFolderName returned %x, expected E_POINTER\n", hr); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetParentFolderName(fs3, path, &result); @@ -481,7 +481,7 @@ static void test_GetFileName(void) hr = IFileSystem3_GetFileName(fs3, NULL, NULL); ok(hr == E_POINTER, "GetFileName returned %x, expected E_POINTER\n", hr); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetFileName(fs3, path, &result); @@ -527,7 +527,7 @@ static void test_GetBaseName(void) hr = IFileSystem3_GetBaseName(fs3, NULL, NULL); ok(hr == E_POINTER, "GetBaseName returned %x, expected E_POINTER\n", hr); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetBaseName(fs3, path, &result); @@ -1521,7 +1521,7 @@ static void test_CreateTextFile(void) /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1569,7 +1569,7 @@ static void test_WriteLine(void) ret = ReadFile(file, buffA, sizeof(buffA), &r, NULL); ok(ret && r, "read %d, got %d, %d\n", r, ret, GetLastError()); - len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, sizeof(buffW)/sizeof(WCHAR)); + len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, ARRAY_SIZE(buffW)); buffW[len] = 0; lstrcpyW(buff2W, nameW); lstrcatW(buff2W, crlfW); @@ -1655,7 +1655,7 @@ static void test_ReadAll(void) hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1801,7 +1801,7 @@ static void test_Read(void) ok(hr == S_OK, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); @@ -2151,7 +2151,7 @@ static void test_GetExtensionName(void) HRESULT hr; int i; - for (i = 0; i < sizeof(extension_tests)/sizeof(extension_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(extension_tests); i++) { path = SysAllocString(extension_tests[i].path); ext = NULL; @@ -2190,7 +2190,7 @@ static void test_GetSpecialFolder(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFolder_get_Path(folder, &path); ok(hr == S_OK, "got 0x%08x\n", hr); - GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); SysFreeString(path); IFolder_Release(folder); @@ -2199,7 +2199,7 @@ static void test_GetSpecialFolder(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFolder_get_Path(folder, &path); ok(hr == S_OK, "got 0x%08x\n", hr); - GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); SysFreeString(path); IFolder_Release(folder); @@ -2208,7 +2208,7 @@ static void test_GetSpecialFolder(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFolder_get_Path(folder, &path); ok(hr == S_OK, "got 0x%08x\n", hr); - ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + ret = GetTempPathW(ARRAY_SIZE(pathW), pathW); if (ret && pathW[ret-1] == '\\') pathW[ret-1] = 0; -- 2.14.3

2 2

[PATCH 1/3] dbghelp: Add a helper to check if a given module is the Wine loader.
by Zebediah Figura 30 May '18

30 May '18

--- dlls/dbghelp/module.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9f90d5e..64dbd5a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -75,9 +75,16 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) return ++ptr; } +static BOOL is_wine_loader(const WCHAR *module) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR wine64W[] = {'w','i','n','e','6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + return !strcmpW(filename, wineW) || !strcmpW(filename, wine64W); +} + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -87,7 +94,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) + else if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -455,8 +462,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int loader_len, len = strlenW(name); - const WCHAR *loader; + int len = strlenW(name); /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -491,10 +497,7 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - loader = get_wine_loader_name(); - loader_len = strlenW( loader ); - if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && - !strcmpiW(name + len - loader_len, loader)) + if (is_wine_loader(name)) { #ifdef __APPLE__ return DMT_MACHO; -- 2.7.4

1 2

[PATCH 17/17] rsaenh/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index bc8e798cdd..df31aeb54b 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1815,7 +1815,7 @@ static void test_hmac(void) { 0xcf, 0x10, 0x6b, 0xb6, 0x7d, 0x0f, 0x13, 0x32 }; int i; - for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i; + for (i=0; i < ARRAY_SIZE(abData); i++) abData[i] = (BYTE)i; if (!derive_key(CALG_RC2, &hKey, 56)) return; @@ -1829,7 +1829,7 @@ static void test_hmac(void) { result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); - dwLen = sizeof(abData)/sizeof(BYTE); + dwLen = ARRAY_SIZE(abData); result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result, "%08x\n", GetLastError()); @@ -1855,8 +1855,8 @@ static void test_mac(void) { static const BYTE mac_40[8] = { 0xb7, 0xa2, 0x46, 0xe9, 0x11, 0x31, 0xe0, 0xad}; int i; - for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i; - for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abEnc[i] = (BYTE)i; + for (i=0; i < ARRAY_SIZE(abData); i++) abData[i] = (BYTE)i; + for (i=0; i < ARRAY_SIZE(abData); i++) abEnc[i] = (BYTE)i; if (!derive_key(CALG_RC2, &hKey, 40)) return; @@ -1871,7 +1871,7 @@ static void test_mac(void) { result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); - dwLen = sizeof(abData)/sizeof(BYTE); + dwLen = ARRAY_SIZE(abData); result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result && dwLen == 8, "%08x, dwLen: %d\n", GetLastError(), dwLen); @@ -2725,7 +2725,7 @@ static void test_import_hmac(void) }; DWORD i; - for (i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) + for (i = 0; i < ARRAY_SIZE(cases); i++) { const struct rfc2202_test_case *test_case = &cases[i]; DWORD size = sizeof(BLOBHEADER) + sizeof(DWORD) + test_case->key_len; @@ -3822,13 +3822,13 @@ static void test_key_derivation(const char *prov) }, }; /* Due to differences between encryption from <= 2000 and >= XP some tests need to be skipped */ - int old_broken[sizeof(tests)/sizeof(tests[0])]; + int old_broken[ARRAY_SIZE(tests)]; memset(old_broken, 0, sizeof(old_broken)); old_broken[3] = old_broken[4] = old_broken[15] = old_broken[16] = 1; old_broken[27] = old_broken[28] = old_broken[39] = old_broken[40] = 1; uniquecontainer(NULL); - for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) + for (i=0; i < ARRAY_SIZE(tests); i++) { if (win2k && old_broken[i]) continue; @@ -3886,7 +3886,7 @@ err: START_TEST(rsaenh) { - for (iProv = 0; iProv < sizeof(szProviders) / sizeof(szProviders[0]); iProv++) + for (iProv = 0; iProv < ARRAY_SIZE(szProviders); iProv++) { if (!init_base_environment(szProviders[iProv], 0)) continue; -- 2.14.3

1 0

[PATCH 16/17] schedsvc/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index a383538220..4aaafb60f1 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -159,7 +159,7 @@ START_TEST(rpcapi) hr = SchRpcCreateFolder(Wine, NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); path = NULL; info = NULL; @@ -168,7 +168,7 @@ START_TEST(rpcapi) ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); - for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { path = NULL; info = NULL; @@ -207,7 +207,7 @@ START_TEST(rpcapi) ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); - for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(open_existing_task); i++) { path = NULL; info = NULL; -- 2.14.3

1 0

[PATCH 14/17] secure32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 6 +++--- dlls/secur32/tests/secur32.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index b9fdf6f237..6b1249d201 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1165,7 +1165,7 @@ static void testSignSeal(void) trace("Testing with more than one buffer.\n"); - crypt.cBuffers = sizeof(complex_data)/sizeof(complex_data[0]); + crypt.cBuffers = ARRAY_SIZE(complex_data); crypt.pBuffers = complex_data; complex_data[0].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM; @@ -1436,7 +1436,7 @@ static void test_cred_multiple_use(void) getSecError(ret)); buffer_desc.ulVersion = SECBUFFER_VERSION; - buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + buffer_desc.cBuffers = ARRAY_SIZE(buffers); buffer_desc.pBuffers = buffers; ret = pInitializeSecurityContextA(&cred, NULL, NULL, ISC_REQ_CONNECTION, @@ -1487,7 +1487,7 @@ static void test_null_auth_data(void) buffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, buffers[0].cbBuffer); buffer_desc.ulVersion = SECBUFFER_VERSION; - buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + buffer_desc.cBuffers = ARRAY_SIZE(buffers); buffer_desc.pBuffers = buffers; size = sizeof(user); diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 40c272ada3..2d2c2a6925 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -67,7 +67,7 @@ static void testGetComputerObjectNameA(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = 0; SetLastError(0xdeadbeef); rc = pGetComputerObjectNameA(formats[i], NULL, &size); @@ -112,7 +112,7 @@ static void testGetComputerObjectNameW(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = 0; SetLastError(0xdeadbeef); rc = pGetComputerObjectNameW(formats[i], NULL, &size); @@ -134,7 +134,7 @@ static void testGetComputerObjectNameW(void) if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; - size = sizeof(nameW)/sizeof(nameW[0]); + size = ARRAY_SIZE(nameW); SetLastError(0xdeadbeef); rc = pGetComputerObjectNameW(formats[i], nameW, &size); switch (formats[i]) @@ -158,7 +158,7 @@ static void testGetUserNameExA(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = sizeof(name); ZeroMemory(name, sizeof(name)); rc = pGetUserNameExA(formats[i], name, &size); @@ -205,7 +205,7 @@ static void testGetUserNameExW(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = sizeof(nameW); ZeroMemory(nameW, sizeof(nameW)); rc = pGetUserNameExW(formats[i], nameW, &size); -- 2.14.3

1 0

[PATCH 13/17] serialui/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/serialui/tests/confdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index 4606a75b60..bd541cda2b 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -165,7 +165,7 @@ static void test_drvCommConfigDialogW(void) /* test ports "com1" - "com4" */ for (i = 1; i < 5 ; i++) { sprintf(bufferA, fmt_comA, i); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); @@ -346,7 +346,7 @@ static void test_drvGetDefaultCommConfigW(void) /* test ports "com0" - "com10" */ for (i = 0; i < 11 ; i++) { sprintf(bufferA, fmt_comA, i); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); -- 2.14.3

1 0

[PATCH 11/17] snmpapi/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/snmpapi/tests/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 0c517c1738..0eb88165e0 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -211,7 +211,7 @@ static void test_SnmpUtilOidCpyFree(void) { INT ret; static UINT ids[] = { 1, 3, 6, 1, 4, 1, 311 }; - static AsnObjectIdentifier dst, src = { sizeof(ids) / sizeof(ids[0]), ids }; + static AsnObjectIdentifier dst, src = { ARRAY_SIZE(ids), ids }; /* These crashes under win98 */ if(0) -- 2.14.3

1 0

[PATCH 10/17] sxs/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sxs/tests/cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index d0c4817c72..19dd4b865e 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -155,12 +155,12 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = sizeof(path)/sizeof(path[0]); + info.cchBuf = ARRAY_SIZE( path ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, comctlW, &info ); ok( hr == S_OK, "got %08x\n", hr ); ok( info.dwAssemblyFlags == 1, "got %08x\n", info.dwAssemblyFlags ); ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); - ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf ); + ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( path[0], "empty path\n" ); memset( &info, 0, sizeof(info) ); @@ -193,13 +193,13 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = sizeof(path)/sizeof(path[0]); + info.cchBuf = ARRAY_SIZE( path ); path[0] = 0; hr = IAssemblyCache_QueryAssemblyInfo( cache, 2, comctlW, &info ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); ok( !info.dwAssemblyFlags, "got %08x\n", info.dwAssemblyFlags ); ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); - ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf ); + ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( !path[0], "got %s\n", wine_dbgstr_w(path) ); IAssemblyCache_Release( cache ); -- 2.14.3

1 0

[PATCH 09/17] taskschd/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 12c30e8db3..5fc3aab595 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -66,7 +66,7 @@ static void test_Connect(void) /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ - len = sizeof(comp_name)/sizeof(comp_name[0]); + len = ARRAY_SIZE(comp_name); GetComputerNameW(comp_name, &len); V_VT(&v_null) = VT_NULL; @@ -486,7 +486,7 @@ static void test_FolderCollection(void) hr = ITaskFolderCollection_get_Item(folders, idx, NULL); ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); - for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt); i++) { set_var(vt[i], &idx, 1); hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); @@ -774,9 +774,9 @@ static void test_GetTask(void) ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); - for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); @@ -810,7 +810,7 @@ todo_wine hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); - for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(open_existing_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); @@ -841,7 +841,7 @@ todo_wine hr = ITaskFolder_RegisterTask(folder, Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskFolder_RegisterTask(folder, Task2, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -1262,7 +1262,7 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); ok(start_boundary == NULL, "start_boundary not set\n"); - for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) + for (i = 0; i < ARRAY_SIZE(start_test); i++) { start_boundary = SysAllocString(start_test[i].str); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); @@ -1569,33 +1569,33 @@ static void test_TaskDefinition(void) hr = ITaskDefinition_put_XmlText(taskdef, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); todo_wine ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); todo_wine ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); @@ -1604,7 +1604,7 @@ todo_wine ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); /* test registration info */ - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); hr = ITaskDefinition_get_RegistrationInfo(taskdef, &reginfo); @@ -1697,7 +1697,7 @@ if (hr == S_OK) IRegistrationInfo_Release(reginfo); - MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); hr = ITaskDefinition_get_RegistrationInfo(taskdef, &reginfo); -- 2.14.3

1 0

[PATCH 08/17] twain_32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/twain_32/tests/dsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index ab6e84fd6a..1e9764dccb 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -663,7 +663,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) UINT16 *u = (UINT16 *) a->ItemList; trace("%d Capabilities:\n", a->NumItems); for (i = 0; i < a->NumItems; i++) - if (u[i] < sizeof(capabilities) / sizeof(capabilities[0])) + if (u[i] < ARRAY_SIZE(capabilities)) { capabilities[u[i]] = 1; trace(" %d: 0x%x\n", i, u[i]); -- 2.14.3

1 0

[PATCH 07/17] ucrtbase/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 6 +++--- dlls/ucrtbase/tests/printf.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2bb221b84e..18838a3d77 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -703,7 +703,7 @@ static void test_math_errors(void) /* necessary so that exp(1e100)==INFINITY on glibc, we can remove this if we change our implementation */ p_fesetround(FE_TONEAREST); - for(i = 0; i < sizeof(testsd)/sizeof(testsd[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testsd); i++) { p_funcd = (void*)GetProcAddress(module, testsd[i].func); *p_errno() = -1; exception.type = -1; @@ -717,7 +717,7 @@ static void test_math_errors(void) "%s(%f) got exception arg1 %f\n", testsd[i].func, testsd[i].x, exception.arg1); } - for(i = 0; i < sizeof(tests2d)/sizeof(tests2d[0]); i++) { + for(i = 0; i < ARRAY_SIZE(tests2d); i++) { p_func2d = (void*)GetProcAddress(module, tests2d[i].func); *p_errno() = -1; exception.type = -1; @@ -733,7 +733,7 @@ static void test_math_errors(void) "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); } - for(i = 0; i < sizeof(testsdl)/sizeof(testsdl[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testsdl); i++) { p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); *p_errno() = -1; exception.type = -1; diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 0e3800371f..41bb6a335e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -171,7 +171,7 @@ static void test_snprintf (void) unsigned int i; /* Legacy _snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); const int n = vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); @@ -184,7 +184,7 @@ static void test_snprintf (void) } /* C99 snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt); const int n = vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); @@ -199,7 +199,7 @@ static void test_snprintf (void) } /* swprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); @@ -242,11 +242,11 @@ static void test_swprintf (void) wchar_t buffer[8]; char narrow[8], narrow_fmt[16]; - const int bufsiz = sizeof buffer / sizeof buffer[0]; + const int bufsiz = ARRAY_SIZE(buffer); unsigned int i; /* Legacy _snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); const int n = vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); @@ -261,7 +261,7 @@ static void test_swprintf (void) } /* C99 snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt); const int n = vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); @@ -278,7 +278,7 @@ static void test_swprintf (void) } /* swprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) >= bufsiz ? -2 : wcslen(fmt); const int n = vswprintf_wrapper (0, buffer, bufsiz, fmt); @@ -411,12 +411,12 @@ static void test_fwprintf(void) p_fclose(fp); fp = p_fopen(file_name, "rb"); - p_fgetws(bufw, sizeof(bufw)/sizeof(bufw[0]), fp); + p_fgetws(bufw, ARRAY_SIZE(bufw), fp); ret = p_ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ok(!wcscmp(bufw, simple), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fgetws(bufw, sizeof(bufw)/sizeof(bufw[0]), fp); + p_fgetws(bufw, ARRAY_SIZE(bufw), fp); ret = p_ftell(fp); ok(ret == 52, "ret = %d\n", ret); ok(!memcmp(bufw, cont, 28), "buf = %s\n", wine_dbgstr_w(bufw)); -- 2.14.3

1 0

[PATCH 06/17] userenv/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/userenv/tests/userenv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 5647cf340b..79b4d59a61 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -158,7 +158,7 @@ static void test_create_env(void) } /* Test for common environment variables (NT4 and higher) */ - for (i = 0; i < sizeof(common_vars)/sizeof(common_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_vars); i++) { for (j = 0; j < 4; j++) { @@ -175,7 +175,7 @@ static void test_create_env(void) } else { - for (i = 0; i < sizeof(common_post_nt4_vars)/sizeof(common_post_nt4_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_post_nt4_vars); i++) { for (j = 0; j < 4; j++) { @@ -190,7 +190,7 @@ static void test_create_env(void) pIsWow64Process(GetCurrentProcess(), &is_wow64); if (sizeof(void*)==8 || is_wow64) { - for (i = 0; i < sizeof(common_win64_vars)/sizeof(common_win64_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_win64_vars); i++) { for (j=0; j<4; j++) { @@ -215,7 +215,7 @@ static void test_create_env(void) expect(TRUE, r); if (r) HeapFree(GetProcessHeap(), 0, st); - for (i = 0; i < sizeof(env) / sizeof(env[0]); i++) + for (i = 0; i < ARRAY_SIZE(env); i++) { r = DestroyEnvironmentBlock(env[i]); expect(TRUE, r); -- 2.14.3

1 0

[PATCH 05/17] uxtheme/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/tests/system.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c71eaa2cb4..b3a861eaa6 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -443,9 +443,8 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The same is true if the number of characters is too small for Color and/or Size */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, 2, - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, 2, + currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) todo_wine ok(hRes == E_NOT_SUFFICIENT_BUFFER || @@ -455,7 +454,7 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Given number of characters is correct */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else @@ -471,26 +470,23 @@ static void test_GetCurrentThemeName(void) "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The too large case is only for the theme name, not for color name or size name */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentTheme), - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + sizeof(currentTheme), currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentTheme) / sizeof(WCHAR), - currentSize, sizeof(currentSize)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + ARRAY_SIZE(currentTheme), currentSize, sizeof(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Correct call */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else -- 2.14.3

1 0

[PATCH 03/17] version/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/version/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b99a335d81..44e7511d8b 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -548,7 +548,7 @@ static void test_VerQueryValueA(void) ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); - for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(value_name); i++) { sprintf(buf, "\\StringFileInfo\\%08x\\%s", translation, value_name[i]); p = (char *)0xdeadbeef; @@ -692,7 +692,7 @@ static void test_GetFileVersionInfoEx(void) return; } - for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_flags); i++) { size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError()); -- 2.14.3

1 0

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