June 2018 - Wine-Devel - list.winehq.org

[PATCH 2/3] user32: Add stub for GetPointerDevices

by Fabian Maurer

Fixes bug 45302. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/misc.c | 17 ++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 20 +++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 72cfe3d954..3a043dc9c2 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -4,7 +4,7 @@ @ stub GetPointerDevice @ stub GetPointerDeviceProperties @ stub GetPointerDeviceRects -@ stub GetPointerDevices +@ stdcall GetPointerDevices(ptr ptr) user32.GetPointerDevices @ stub GetPointerFrameInfo @ stub GetPointerFrameInfoHistory @ stub GetPointerFramePenInfo diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index c3f4030a90..4cc54df412 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -846,6 +846,23 @@ BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) return TRUE; } +/********************************************************************** + * GetPointerDevices [USER32.@] + */ +BOOL WINAPI GetPointerDevices(UINT32 *device_count, POINTER_DEVICE_INFO *devices) +{ + FIXME("(%p %p): stub\n", device_count, devices); + + if (!device_count) + return FALSE; + + if (!devices) + *device_count = 0; + + return TRUE; +} + + 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 2e5b203a85..7f652ee722 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -354,6 +354,7 @@ @ stdcall GetOpenClipboardWindow() @ stdcall GetParent(long) @ stdcall GetPhysicalCursorPos(ptr) +@ stdcall GetPointerDevices(ptr ptr) @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) diff --git a/include/winuser.h b/include/winuser.h index 648efbe0e2..f546a4a1f3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3357,6 +3357,26 @@ typedef struct tagGESTUREINFO { } GESTUREINFO, *PGESTUREINFO; typedef GESTUREINFO const * PCGESTUREINFO; +#define POINTER_DEVICE_PRODUCT_STRING_MAX 520 + +typedef enum tagPOINTER_DEVICE_TYPE { + POINTER_DEVICE_TYPE_INTEGRATED_PEN = 0x00000001, + POINTER_DEVICE_TYPE_EXTERNAL_PEN = 0x00000002, + POINTER_DEVICE_TYPE_TOUCH = 0x00000003, + POINTER_DEVICE_TYPE_TOUCH_PAD = 0x00000004, + POINTER_DEVICE_TYPE_MAX = 0xFFFFFFFF +} POINTER_DEVICE_TYPE; + +typedef struct tagPOINTER_DEVICE_INFO { + DWORD displayOrientation; + HANDLE device; + POINTER_DEVICE_TYPE pointerDeviceType; + HMONITOR monitor; + ULONG startingCursorId; + USHORT maxActiveContacts; + WCHAR productString[POINTER_DEVICE_PRODUCT_STRING_MAX]; +} POINTER_DEVICE_INFO; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); -- 2.17.1

June 7, 2018

[PATCH 1/3] user32: Make RegisterPointerDeviceNotifications return TRUE to fake success

by Fabian Maurer

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

June 7, 2018

Re: [PATCH 4/4] wsdapi: Add initial support for reading messages; identify Probe message.

by Owen Rudge

On 07/06/2018 08:56, Huw Davies wrote: >> +static BOOL move_to_element(WS_XML_READER *reader, const char *element_name, WS_XML_STRING *uri) > > return HRESULT > >> +static BOOL ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContext *context, WSDXML_ELEMENT *parent_element) > > and here. > >> int read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg) > > This is also looking like a good contender to return HRESULT and > take an [out] int *type parameter. As per the previous patch, the HRESULT is not ultimately used, and I can't see that there's a great benefit in passing it along. I do understand it for the other functions that ultimately return a value to the caller, but these functions are all called by the listener thread, and a simple identification of the message type is all we require. If you think it would be beneficial, I can modify these functions to return HRESULT, but it would be good to understand the benefits of doing so. >> - ok(any != NULL, "%s: any == NULL\n", debug_prefix); >> + todo_wine ok(any != NULL, "%s: any == NULL\n", debug_prefix); > > You'll need to have a really good reason for doing this. Can you > re-order things so you don't break the tests? This will be fixed in the next patchset; I didn't want to include any more code in what's already quite a large patch. There's probably an extra 40 or so lines of code needed to avoid this breakage. There's not really a way I can re-order this that I can think of. If preferred though, I can submit the patch that will fix this as part of this patchset, so the net result once the set is committed involves no extra todos. Thanks, Owen

June 7, 2018

Re: [PATCH 3/4] wsdapi: Add stub for Probe message parsing, prepare notification sink message.

by Owen Rudge

On 07/06/2018 08:45, Huw Davies wrote: >> +static void process_received_message(listener_thread_params *params, char *message, int message_len, >> + SOCKADDR_STORAGE *source_addr) > > This should return HRESULT. There's not really anything that can be done with that result. If an unknown message is received, I can add a trace for it, but an error reading the message is not a reason to, for instance, stop listening on the socket, so I'm not sure what purpose having a return value here would serve. Cheers, Owen

June 7, 2018

[PATCH] po: Update Finnish translation.

by Lauri Kenttä

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

June 7, 2018

Re: [PATCH] shellpath.c: Fix creation of HOME directory symbolic links

by Huw Davies

On 7 Jun 2018, at 16:11, Bob Wya <bob.mt.wya(a)gmail.com> wrote: > Thanks for the valuable feedback! I think I spent quite a bit of time fiddling with this, > so I've probably "lost the wood for the trees" a bit... :-) > > Just to clarify a style point, for the re-factored patches... > > If I still want to split the _SHCreateSymbolicLinks() function into a re-factored > implementation that has an iterative wrapper function, is it OK to call them: > > _SHCreateSymbolicLink() > _SHCreateSymbolicLinks() > > ?? > This would introduce a new "Camel Case" style function name... But would obviously > be more consistent... For new functions you’d avoid CamelCase and use something like create_symbolic_link(). If might be ok to rename existing functions if the patch is small enough. The problem at the moment is that the patch is much too large. Huw.

June 7, 2018

Re: [PATCH] shellpath.c: Fix creation of HOME directory symbolic links

by Bob Wya

On 7 June 2018 at 11:57, Huw Davies <huw(a)codeweavers.com> wrote: > On Wed, Jun 06, 2018 at 08:46:49AM +0100, Rob Walker wrote: > > 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. > > Hi Rob, > > There's an awful lot going on in this patch which makes it very > difficult to review. Please avoid re-naming and re-indenting > existing functions so that we can actually see the real changes. > > Then please split the changes into separate patches. A clue > that you're not doing this is that you have a list of two > items in the commit message. If the patch is doing two > things, it should be two patches. > > Huw. > > Hi Huw, Thanks for the valuable feedback! I think I spent quite a bit of time fiddling with this, so I've probably "lost the wood for the trees" a bit... :-) Just to clarify a style point, for the re-factored patches... If I still want to split the _SHCreateSymbolicLinks() function into a re-factored implementation that has an iterative wrapper function, is it OK to call them: _SHCreateSymbolicLink() _SHCreateSymbolicLinks() ?? This would introduce a new "Camel Case" style function name... But would obviously be more consistent... Thanks Rob > > > > 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 > > > > > > >

June 7, 2018

Re: [PATCH 1/5] wined3d: Declare the correct number and type of fragment shader color outputs.

by Henri Verbeet

On 6 June 2018 at 00:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/wined3d/glsl_shader.c | 116 ++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 109 insertions(+), 7 deletions(-) > This fails the tests here: ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M d3d10core.dll -p d3d10core_test.exe.so device && touch device.ok device.c:11300: Test failed: Got 0xff0000ff, expected 0xff00ff00 at (0, 0), sub-resource 0. device.c:11307: Test failed: Got 0xff0000ff, expected 0xff00ff00 at (0, 0), sub-resource 0. ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M d3d11.dll -p d3d11_test.exe.so d3d11 && touch d3d11.ok d3d11.c:14777: Test failed: Got 0xff0000ff, expected 0xff00ff00 at (0, 0, 0), sub-resource 0. d3d11.c:14784: Test failed: Got 0xff0000ff, expected 0xff00ff00 at (0, 0, 0), sub-resource 0. d3d11.c:20644: Tests skipped: Raw buffers are not supported. d3d11.c:20644: Tests skipped: Raw buffers are not supported.

June 7, 2018

Re: [PATCH vkd3d] libs/vkd3d: Use VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT only if array size is >= 6.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 7, 2018

Re: [PATCH vkd3d] libs/vkd3d: Use VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT only if array size is >= 6.

by Józef Kucia

On Thu, Jun 7, 2018 at 4:03 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 7 June 2018 at 15:52, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >> + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D >> + && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) >> image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; > Should that be a multiple of 6? I.e., are partial cubemap arrays a > thing in Direct3D 12? I think you can create a cube shader resource view for 2D textures, even if the array size is not a multiple of 6. At least, it works that way in Direct3D 11. We have some tests in test_create_shader_resource_view().

June 7, 2018

Re: [PATCH vkd3d] libs/vkd3d: Use VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT only if array size is >= 6.

by Henri Verbeet

On 7 June 2018 at 15:52, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D > + && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) > image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; Should that be a multiple of 6? I.e., are partial cubemap arrays a thing in Direct3D 12?

June 7, 2018

[PATCH vkd3d] libs/vkd3d: Use VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT only if array size is >= 6.

by Józef Kucia

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

June 7, 2018

Re: [PATCH v2 1/4] kernel32: Return BIOS info from GetSystemFirmwareTable on Linux

by Huw Davies

On Mon, May 28, 2018 at 10:05:26PM -0600, Alex Henrie wrote: > /*********************************************************************** > * GetSystemFirmwareTable (KERNEL32.@) > */ > UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) > { > - FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); > + FIXME("(%08x %08x %p %d): semi-stub\n", provider, id, buffer, size); This should probably be forwarded to NtQuerySystemInformation(SystemFirmwareTableInformation, ...). Huw.

June 7, 2018

Re: [PATCH] shellpath.c: Fix creation of HOME directory symbolic links

by Huw Davies

On Wed, Jun 06, 2018 at 08:46:49AM +0100, Rob Walker wrote: > 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. Hi Rob, There's an awful lot going on in this patch which makes it very difficult to review. Please avoid re-naming and re-indenting existing functions so that we can actually see the real changes. Then please split the changes into separate patches. A clue that you're not doing this is that you have a list of two items in the commit message. If the patch is doing two things, it should be two patches. Huw. > > 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 > > >

June 7, 2018

Re: [PATCH] ntoskrnl: Have MmIsAddressValid use IsBadReadPtr.

by Thomas Faber

On 2018-06-06 17:11, Derek Lesho wrote: > Hi Thomas, in your example, does &Base refer to the base of > ntoskrnl.exe? If so, why are you allocating a buffer there, wouldn't > that corrupt the memory of ntoskrnl, or am I misunderstanding what > your code is doing. On windows, do drivers have access to change the > memory of ntoskrnl? My intention was to simply make a user mode memory allocation, so there should be a "Base = NULL;" before the call to ZwAllocateVirtualMemory. This function cannot allocate kernel address space (or overwrite loaded modules), so it wouldn't do anything unexpected. I was just suggesting it to demonstrate behavior with NOACCESS/READONLY/READWRITE pages. As for your actual use case, I'd assume ntoskrnl's code is most likely write-protected on Windows as well, much like you encountered on Wine, but I haven't verified. Since your patch was committed I don't know if you're still interested in adding the test. If you are, I'd suggest to go with the simpler second version, since like I said the "full test" won't be very useful in Wine. > On Wed, Jun 6, 2018 at 3:51 AM, Thomas Faber <thomas.faber(a)reactos.org> wrote: >> void test_function() >> { >> ok(MmIsAddressValid((void*)test_function), ...); // fails in master, succeeds with patch? >> ptr = ExAllocatePoolWithTag(NonPagedPool, ...) >> ok(MmIsAddressValid(ptr), ...); >> ExFreePoolWithTag... >> ok(!MmIsAddressValid(NULL), ...); >> } Perhaps also ok(MmIsAddressValid((void*)MmIsAddressValid), ...); to specifically test ntoskrnl instead of the test driver's binary. -Thomas

June 7, 2018

Re: [PATCH 3/4 v5] riched20: Support external HDC in ME_WrapMarkedParagraphs().

by Huw Davies

On Wed, Jun 06, 2018 at 05:24:31PM +0800, Jactry Zeng wrote: > 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) { Unfortunately it's more complicated than this because the styles cache font metrics and uniscribe data. These will need to be recalculated for a new hdc. We'll probably also want to re-think how the windowed and window-less controls handle hdcs in general. Huw.

June 7, 2018

Re: [PATCH 1/4 v5] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().

by Huw Davies

On Thu, Jun 07, 2018 at 05:21:25PM +0800, Jactry Zeng wrote: > Huw Davies <huw(a)codeweavers.com> 于2018年6月7日周四下午4:54写道： > > > > On Wed, Jun 06, 2018 at 05:24:13PM +0800, Jactry Zeng wrote: > > > Superseded patch 146570. > > > > > > > + LONG expected_width, expected_height; > > > + > > > + GetClientRect(WindowFromDC(hdc), &rect); > > > + DrawTextW(hdc, string, -1, &rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); > > > > Why can't you use GetTextExtentPointW() here? This would avoid the > > GetClientRect() call too. > > > > In 0003 there are some tests about multiline support. It seems that > using DrawText can make it more simple or we will need to compute > a max width of it by ourselves. Ok, then please pass the client rect to CHECK_TXGETNATURALSIZE so that it doesn't need to be queried from there. Also, this patch series seems out-of-order. Perhaps move 0001 after 0002 and 0003 (or put 0004 before 0002 and 0003). Huw.

June 7, 2018

Re: [PATCH 2/4 v5] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.

by Huw Davies

On Wed, Jun 06, 2018 at 05:24:22PM +0800, Jactry Zeng wrote: > 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); Hmm, you need to use the return value of ME_ToCF2W() is this case. However, ME_ToCF2W() and ME_ToCFAny() should be cleaned up. They should both do the copy even if the from argument is of the correct type (basically what ME_CopyToCFAny() does). Something like: BOOL cfany_to_cf2w(CHARFORMAT2W *dst, const *CHARFORMAT2W *src); BOOL cf2w_to_cfany(CHARFORMAT2W *dst, const *CHARFORMAT2W *src); > 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); No cast. > + 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; You do the same thing in the previous patch, so this should be a helper function. > /* 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); Rather than getting the font here, why not call ITextHost_GetCharFormat() ? > + 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 > > > >

June 7, 2018

Re: [PATCH 1/4 v5] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().

by Jactry Zeng

Jactry Zeng <jactry92(a)gmail.com> 于2018年6月7日周四下午5:21写道： > > > In 0003 there are some tests about multiline support. It seems that > using DrawText can make it more simple or we will need to compute > a max width of it by ourselves. Sorry, it is in 0004. > -- > Regards, > Jactry Zeng -- Regards, Jactry Zeng

June 7, 2018

Re: [PATCH 1/4 v5] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().

by Jactry Zeng

Huw Davies <huw(a)codeweavers.com> 于2018年6月7日周四下午4:54写道： > > On Wed, Jun 06, 2018 at 05:24:13PM +0800, Jactry Zeng wrote: > > Superseded patch 146570. > > > > + LONG expected_width, expected_height; > > + > > + GetClientRect(WindowFromDC(hdc), &rect); > > + DrawTextW(hdc, string, -1, &rect, DT_LEFT | DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL | DT_WORDBREAK); > > Why can't you use GetTextExtentPointW() here? This would avoid the > GetClientRect() call too. > In 0003 there are some tests about multiline support. It seems that using DrawText can make it more simple or we will need to compute a max width of it by ourselves. -- Regards, Jactry Zeng

June 7, 2018

Re: [PATCH 1/2] schedsvc: Load job files at the service start up.

by Dmitry Timoshkov

There is a problem with this patchset, please ignore it for now. -- Dmitry.

June 7, 2018

Re: [PATCH 1/4 v5] riched20/tests: Rewrite tests for ITextServices_TxGetNaturalSize().

by Huw Davies

On Wed, Jun 06, 2018 at 05:24:13PM +0800, Jactry Zeng wrote: > 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); Why can't you use GetTextExtentPointW() here? This would avoid the GetClientRect() call too. > + 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}; Let's just call this 'extent'; > + 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); No need for cast. > + 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; This is already initialised. > + 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 > > > >

June 7, 2018

Re: [PATCH 4/4] wsdapi: Add initial support for reading messages; identify Probe message.

by Huw Davies

On Wed, Jun 06, 2018 at 09:58:52PM +0100, Owen Rudge wrote: > 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(-) > > > diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c > index 4e191a5c82..2bc974f111 100644 > --- a/dlls/wsdapi/soap.c > +++ b/dlls/wsdapi/soap.c > @@ -45,6 +45,13 @@ static const WCHAR actionHello[] = { > 'd','i','s','c','o','v','e','r','y','/', > 'H','e','l','l','o', 0 }; > > +static const WCHAR actionProbe[] = { > + 'h','t','t','p',':','/','/', > + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', > + 'w','s','/','2','0','0','5','/','0','4','/', > + 'd','i','s','c','o','v','e','r','y','/', > + 'P','r','o','b','e', 0 }; > + > static const WCHAR actionBye[] = { > 'h','t','t','p',':','/','/', > 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', > @@ -98,6 +105,27 @@ struct discovered_namespace > LPCWSTR uri; > }; > > +static LPWSTR utf8_to_wide(void *parent, const char *utf8_str, int length) > +{ > + int utf8_str_len = 0, chars_needed = 0, bytes_needed = 0; > + LPWSTR new_str = NULL; > + > + if (utf8_str == NULL) return NULL; > + > + utf8_str_len = (length < 0) ? lstrlenA(utf8_str) : length; > + chars_needed = MultiByteToWideChar(CP_UTF8, 0, utf8_str, utf8_str_len, NULL, 0); > + > + if (chars_needed <= 0) return NULL; > + > + bytes_needed = sizeof(WCHAR) * (chars_needed + 1); > + new_str = WSDAllocateLinkedMemory(parent, bytes_needed); > + > + MultiByteToWideChar(CP_UTF8, 0, utf8_str, utf8_str_len, new_str, chars_needed); > + new_str[chars_needed] = 0; > + > + return new_str; > +} > + > static char *wide_to_utf8(LPCWSTR wide_string, int *length) > { > char *new_string = NULL; > @@ -1081,8 +1109,316 @@ cleanup: > return ret; > } > > +static LPWSTR xml_text_to_wide_string(void *parent_memory, WS_XML_TEXT *text) > +{ > + if (text->textType == WS_XML_TEXT_TYPE_UTF8) > + { > + WS_XML_UTF8_TEXT *utf8_text = (WS_XML_UTF8_TEXT *) text; > + return utf8_to_wide(parent_memory, (const char *) utf8_text->value.bytes, utf8_text->value.length); > + } > + else if (text->textType == WS_XML_TEXT_TYPE_UTF16) > + { > + WS_XML_UTF16_TEXT *utf_16_text = (WS_XML_UTF16_TEXT *) text; > + return duplicate_string(parent_memory, (LPCWSTR) utf_16_text->bytes); > + } > + > + FIXME("Support for text type %d not implemented.\n", text->textType); > + return NULL; > +} > + > +static BOOL move_to_element(WS_XML_READER *reader, const char *element_name, WS_XML_STRING *uri) return HRESULT > +{ > + WS_XML_STRING envelope; > + BOOL found = FALSE; > + > + envelope.bytes = (BYTE *) element_name; > + envelope.length = strlen(element_name); > + envelope.dictionary = NULL; > + envelope.id = 0; > + > + return SUCCEEDED(WsReadToStartElement(reader, &envelope, uri, &found, NULL)) && found; > +} > + > +static BOOL ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContext *context, WSDXML_ELEMENT *parent_element) and here. > +{ > + WSDXML_ATTRIBUTE *cur_wsd_attrib = NULL, *new_wsd_attrib = NULL; > + const WS_XML_ELEMENT_NODE *element_node = NULL; > + WSDXML_ELEMENT *cur_element = parent_element; > + const WS_XML_TEXT_NODE *text_node = NULL; > + LPWSTR uri = NULL, element_name = NULL; > + WS_XML_STRING *ns_string = NULL; > + WS_XML_ATTRIBUTE *attrib = NULL; > + WSDXML_ELEMENT *element = NULL; > + const WS_XML_NODE *node = NULL; > + WSDXML_NAME *name = NULL; > + WSDXML_TEXT *text = NULL; > + HRESULT ret; > + int i; > + > + for (;;) > + { > + if (cur_element == NULL) break; > + > + ret = WsReadNode(reader, NULL); > + if (FAILED(ret)) goto cleanup; > + > + ret = WsGetReaderNode(reader, &node, NULL); > + if (FAILED(ret)) goto cleanup; > + > + switch (node->nodeType) > + { > + case WS_XML_NODE_TYPE_ELEMENT: > + element_node = (const WS_XML_ELEMENT_NODE *) node; > + > + uri = utf8_to_wide(NULL, (const char *) element_node->ns->bytes, element_node->ns->length); > + if (uri == NULL) goto cleanup; > + > + /* Link element_name to uri so they will be freed at the same time */ > + element_name = utf8_to_wide(uri, (const char *) element_node->localName->bytes, > + element_node->localName->length); > + if (element_name == NULL) goto cleanup; > + > + if (FAILED(IWSDXMLContext_AddNameToNamespace(context, uri, element_name, &name))) goto cleanup; > + > + WSDFreeLinkedMemory(uri); > + uri = NULL; > + > + if (FAILED(WSDXMLBuildAnyForSingleElement(name, NULL, &element))) goto cleanup; > + WSDXMLAddChild(cur_element, element); > + > + cur_wsd_attrib = NULL; > + > + /* Add attributes */ > + for (i = 0; i < element_node->attributeCount; i++) > + { > + attrib = element_node->attributes[i]; > + if (attrib->isXmlNs) continue; > + > + new_wsd_attrib = WSDAllocateLinkedMemory(element, sizeof(WSDXML_ATTRIBUTE)); > + if (new_wsd_attrib == NULL) goto cleanup; > + > + ns_string = attrib->ns; > + if (ns_string->length == 0) ns_string = element_node->ns; > + > + uri = utf8_to_wide(NULL, (const char *) ns_string->bytes, ns_string->length); > + if (uri == NULL) goto cleanup; > + > + /* Link element_name to uri so they will be freed at the same time */ > + element_name = utf8_to_wide(uri, (const char *) attrib->localName->bytes, attrib->localName->length); > + if (element_name == NULL) goto cleanup; > + > + if (FAILED(IWSDXMLContext_AddNameToNamespace(context, uri, element_name, &name))) goto cleanup; > + > + WSDFreeLinkedMemory(uri); > + uri = NULL; > + > + new_wsd_attrib->Value = xml_text_to_wide_string(new_wsd_attrib, attrib->value); > + if (new_wsd_attrib->Value == NULL) goto cleanup; > + > + new_wsd_attrib->Name = name; > + new_wsd_attrib->Element = cur_element; > + new_wsd_attrib->Next = NULL; > + > + if (cur_wsd_attrib == NULL) > + element->FirstAttribute = new_wsd_attrib; > + else > + cur_wsd_attrib->Next = new_wsd_attrib; > + > + cur_wsd_attrib = new_wsd_attrib; > + } > + > + cur_element = element; > + break; > + > + case WS_XML_NODE_TYPE_TEXT: > + text_node = (const WS_XML_TEXT_NODE *) node; > + > + if (cur_element == NULL) > + { > + WARN("No parent element open but encountered text element!\n"); > + continue; > + } > + > + if (cur_element->FirstChild != NULL) > + { > + WARN("Text node encountered but parent already has child!\n"); > + continue; > + } > + > + text = WSDAllocateLinkedMemory(element, sizeof(WSDXML_TEXT)); > + if (text == NULL) goto cleanup; > + > + text->Node.Parent = element; > + text->Node.Next = NULL; > + text->Node.Type = TextType; > + text->Text = xml_text_to_wide_string(text, text_node->text); > + > + if (text->Text == NULL) > + { > + WARN("Text node returned null string.\n"); > + WSDFreeLinkedMemory(text); > + continue; > + } > + > + cur_element->FirstChild = (WSDXML_NODE *) text; > + break; > + > + case WS_XML_NODE_TYPE_END_ELEMENT: > + /* Go up a level to the parent element */ > + cur_element = cur_element->Node.Parent; > + break; > + > + default: > + break; > + } > + } > + > + return TRUE; > + > +cleanup: > + /* Free uri and element_name if applicable */ > + WSDFreeLinkedMemory(uri); > + return FALSE; > +} > + > +static WSDXML_ELEMENT *find_element(WSDXML_ELEMENT *parent, LPCWSTR name, LPCWSTR ns_uri) > +{ > + WSDXML_ELEMENT *cur = (WSDXML_ELEMENT *) parent->FirstChild; > + > + while (cur != NULL) > + { > + if ((lstrcmpW(cur->Name->LocalName, name) == 0) && (lstrcmpW(cur->Name->Space->Uri, ns_uri) == 0)) > + return cur; > + > + cur = (WSDXML_ELEMENT *) cur->Node.Next; > + } > + > + return NULL; > +} > + > int read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg) This is also looking like a good contender to return HRESULT and take an [out] int *type parameter. > { > - /* TODO: Parse and read message */ > - return MSGTYPE_UNKNOWN; > + WSDXML_ELEMENT *envelope = NULL, *header_element, *body_element; > + WS_XML_READER_TEXT_ENCODING encoding; > + WS_XML_ELEMENT_NODE *envelope_node; > + WSD_SOAP_MESSAGE *soap_msg = NULL; > + WS_XML_READER_BUFFER_INPUT input; > + WS_XML_ATTRIBUTE *attrib = NULL; > + IWSDXMLContext *context = NULL; > + WS_XML_STRING *soap_uri = NULL; > + const WS_XML_NODE *node; > + WS_XML_READER *reader; > + LPCWSTR value = NULL; > + int i, message_type; > + LPWSTR uri, prefix; > + WS_HEAP *heap; > + HRESULT ret; > + > + message_type = MSGTYPE_UNKNOWN; > + > + ret = WsCreateHeap(16384, 4096, NULL, 0, &heap, NULL); > + if (FAILED(ret)) goto cleanup; > + > + ret = WsCreateReader(NULL, 0, &reader, NULL); > + if (FAILED(ret)) goto cleanup; > + > + encoding.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; > + encoding.charSet = WS_CHARSET_AUTO; > + > + input.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; > + input.encodedData = (char *) xml; > + input.encodedDataSize = xml_length; > + > + ret = WsSetInput(reader, (WS_XML_READER_ENCODING *) &encoding, (WS_XML_READER_INPUT *) &input, NULL, 0, NULL); > + if (FAILED(ret)) goto cleanup; > + > + soap_uri = populate_xml_string(envelopeNsUri); > + if (soap_uri == NULL) goto cleanup; > + > + if (!move_to_element(reader, "Envelope", soap_uri)) goto cleanup; > + > + ret = WsGetReaderNode(reader, &node, NULL); > + if (FAILED(ret)) goto cleanup; > + > + if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) goto cleanup; > + > + envelope_node = (WS_XML_ELEMENT_NODE *) node; > + > + if (FAILED(WSDXMLCreateContext(&context))) goto cleanup; > + > + /* Find XML namespaces from the envelope element's attributes */ > + for (i = 0; i < envelope_node->attributeCount; i++) > + { > + attrib = envelope_node->attributes[i]; > + > + if (attrib->isXmlNs) > + { > + uri = utf8_to_wide(NULL, (const char *) attrib->ns->bytes, attrib->ns->length); > + if (uri == NULL) continue; > + > + prefix = utf8_to_wide(uri, (const char *) attrib->localName->bytes, attrib->localName->length); > + > + if (prefix == NULL) > + { > + WSDFreeLinkedMemory(uri); > + continue; > + } > + > + IWSDXMLContext_AddNamespace(context, uri, prefix, NULL); > + WSDFreeLinkedMemory(uri); > + } > + } > + > + /* Create the SOAP message to return to the caller */ > + soap_msg = WSDAllocateLinkedMemory(NULL, sizeof(WSD_SOAP_MESSAGE)); > + if (soap_msg == NULL) goto cleanup; > + > + ZeroMemory(soap_msg, sizeof(WSD_SOAP_MESSAGE)); > + > + envelope = WSDAllocateLinkedMemory(soap_msg, sizeof(WSDXML_ELEMENT)); > + if (envelope == NULL) goto cleanup; > + > + ZeroMemory(envelope, sizeof(WSDXML_ELEMENT)); > + > + if (!ws_element_to_wsdxml_element(reader, context, envelope)) goto cleanup; > + > + /* Find the header element */ > + header_element = find_element(envelope, headerString, envelopeNsUri); > + if (header_element == NULL) goto cleanup; > + > + if (FAILED(WSDXMLGetValueFromAny(addressingNsUri, actionString, (WSDXML_ELEMENT *) header_element->FirstChild, > + &value))) goto cleanup; > + soap_msg->Header.Action = duplicate_string(soap_msg, value); > + if (soap_msg->Header.Action == NULL) goto cleanup; > + > + if (FAILED(WSDXMLGetValueFromAny(addressingNsUri, toString, (WSDXML_ELEMENT *) header_element->FirstChild, > + &value))) goto cleanup; > + soap_msg->Header.To = duplicate_string(soap_msg, value); > + if (soap_msg->Header.To == NULL) goto cleanup; > + > + if (FAILED(WSDXMLGetValueFromAny(addressingNsUri, messageIdString, (WSDXML_ELEMENT *) header_element->FirstChild, > + &value))) goto cleanup; > + soap_msg->Header.MessageID = duplicate_string(soap_msg, value); > + if (soap_msg->Header.MessageID == NULL) goto cleanup; > + > + /* Find the body element */ > + body_element = find_element(envelope, bodyString, envelopeNsUri); > + if (body_element == NULL) goto cleanup; > + > + /* Now figure out which message we've been sent */ > + if (lstrcmpW(soap_msg->Header.Action, actionProbe) == 0) > + { > + /* TODO: Parse the Probe message */ > + > + *out_msg = soap_msg; > + soap_msg = NULL; /* caller will clean this up */ > + message_type = MSGTYPE_PROBE; > + } > + > +cleanup: > + free_xml_string(soap_uri); > + WSDFreeLinkedMemory(soap_msg); > + if (context != NULL) IWSDXMLContext_Release(context); > + > + return message_type; > } > diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c > index 96c2ead7f9..0599123a46 100644 > --- a/dlls/wsdapi/tests/discovery.c > +++ b/dlls/wsdapi/tests/discovery.c > @@ -491,7 +491,7 @@ static void verify_wsdxml_any_text(const char *debug_prefix, WSDXML_ELEMENT *any > { > WSDXML_TEXT *child; > > - ok(any != NULL, "%s: any == NULL\n", debug_prefix); > + todo_wine ok(any != NULL, "%s: any == NULL\n", debug_prefix); You'll need to have a really good reason for doing this. Can you re-order things so you don't break the tests? > if (any == NULL) return; > > child = (WSDXML_TEXT *) any->FirstChild; > @@ -534,7 +534,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP > static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; > WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; > > - ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); > + todo_wine ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); > ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, > "pSoap->Header.To == '%s'\n", wine_dbgstr_w(pSoap->Header.To)); > ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, > @@ -939,7 +939,7 @@ after_publish_test: > sprintf(probe_message, testProbeMessage, probe_uuid_str); > > ok(send_udp_multicast_of_type(probe_message, strlen(probe_message), AF_INET) == TRUE, "Sending Probe message failed\n"); > - todo_wine ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); > + ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); > > RpcStringFreeA(&probe_uuid_str); > } > >

June 7, 2018

Re: [PATCH 3/4] wsdapi: Add stub for Probe message parsing, prepare notification sink message.

by Huw Davies

On Wed, Jun 06, 2018 at 09:58:49PM +0100, Owen Rudge wrote: > 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(-) > > > diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c > index 3e7509bfa3..7f6cee3ab0 100644 > --- a/dlls/wsdapi/network.c > +++ b/dlls/wsdapi/network.c > @@ -292,6 +292,56 @@ typedef struct listener_thread_params > BOOL ipv6; > } listener_thread_params; > > +static void process_received_message(listener_thread_params *params, char *message, int message_len, > + SOCKADDR_STORAGE *source_addr) This should return HRESULT. > +{ > + IWSDUdpMessageParameters *msg_params = NULL; > + IWSDUdpAddress *remote_addr = NULL; > + struct notificationSink *sink; > + WSD_SOAP_MESSAGE *msg = NULL; > + int msg_type; > + > + msg_type = read_message(message, message_len, &msg); > + > + switch (msg_type) > + { > + case MSGTYPE_PROBE: > + TRACE("Received probe message\n"); > + > + if (FAILED(WSDCreateUdpMessageParameters(&msg_params))) > + { > + ERR("Unable to create IWSDUdpMessageParameters, not processing message.\n"); > + goto cleanup; > + } > + > + if (FAILED(WSDCreateUdpAddress(&remote_addr))) > + { > + ERR("Unable to create IWSDUdpAddress, not processing message.\n"); > + goto cleanup; > + } > + > + IWSDUdpAddress_SetSockaddr(remote_addr, source_addr); > + IWSDUdpMessageParameters_SetRemoteAddress(msg_params, (IWSDAddress *)remote_addr); > + > + EnterCriticalSection(&params->impl->notification_sink_critical_section); > + > + LIST_FOR_EACH_ENTRY(sink, &params->impl->notificationSinks, struct notificationSink, entry) > + { > + IWSDiscoveryPublisherNotify_ProbeHandler(sink->notificationSink, msg, (IWSDMessageParameters *)msg_params); > + } > + > + LeaveCriticalSection(&params->impl->notification_sink_critical_section); > + > + break; > + } > + > +cleanup: > + WSDFreeLinkedMemory(msg); > + > + if (remote_addr != NULL) IWSDUdpAddress_Release(remote_addr); > + if (msg_params != NULL) IWSDUdpMessageParameters_Release(msg_params); > +} > + > #define RECEIVE_BUFFER_SIZE 65536 > > static DWORD WINAPI listening_thread(LPVOID params) > @@ -321,7 +371,7 @@ static DWORD WINAPI listening_thread(LPVOID params) > } > else > { > - /* TODO: Process received message */ > + process_received_message(parameter, buffer, bytes_received, &source_addr); > } > } > > diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c > index d0fb0afb0c..4e191a5c82 100644 > --- a/dlls/wsdapi/soap.c > +++ b/dlls/wsdapi/soap.c > @@ -1080,3 +1080,9 @@ cleanup: > > return ret; > } > + > +int read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg) > +{ > + /* TODO: Parse and read message */ > + return MSGTYPE_UNKNOWN; > +} > diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h > index 3e5e163f3a..5c62627bba 100644 > --- a/dlls/wsdapi/wsdapi_internal.h > +++ b/dlls/wsdapi/wsdapi_internal.h > @@ -72,6 +72,11 @@ HRESULT send_bye_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLONG > > HRESULT register_namespaces(IWSDXMLContext *xml_context); > > +int read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg); > + > +#define MSGTYPE_UNKNOWN 0 > +#define MSGTYPE_PROBE 1 > + > /* xml.c */ > > LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); > >

June 7, 2018

Re: [PATCH 1/4] wsdapi: Add support for listening for UDP multicast broadcasts.

by Huw Davies

On Wed, Jun 06, 2018 at 09:58:45PM +0100, Owen Rudge wrote: > 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(-) > > > diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c > index f86b3b4a3e..3e7509bfa3 100644 > --- a/dlls/wsdapi/network.c > +++ b/dlls/wsdapi/network.c > @@ -231,11 +231,278 @@ BOOL send_udp_multicast(IWSDiscoveryPublisherImpl *impl, char *data, int length, > return TRUE; > } > > +static int join_multicast_group(SOCKET s, SOCKADDR_STORAGE *group, SOCKADDR_STORAGE *iface) > +{ > + int level, optname, optlen; > + struct ipv6_mreq mreqv6; > + struct ip_mreq mreqv4; > + char *optval; > + > + if (iface->ss_family == AF_INET6) > + { > + level = IPPROTO_IPV6; > + optname = IPV6_ADD_MEMBERSHIP; > + optval = (char *)&mreqv6; > + optlen = sizeof(mreqv6); > + > + mreqv6.ipv6mr_multiaddr = ((SOCKADDR_IN6 *)group)->sin6_addr; > + mreqv6.ipv6mr_interface = ((SOCKADDR_IN6 *)iface)->sin6_scope_id; > + } > + else > + { > + level = IPPROTO_IP; > + optname = IP_ADD_MEMBERSHIP; > + optval = (char *)&mreqv4; > + optlen = sizeof(mreqv4); > + > + mreqv4.imr_multiaddr.s_addr = ((SOCKADDR_IN *)group)->sin_addr.s_addr; > + mreqv4.imr_interface.s_addr = ((SOCKADDR_IN *)iface)->sin_addr.s_addr; > + } > + > + return setsockopt(s, level, optname, optval, optlen); > +} > + > +static int set_send_interface(SOCKET s, SOCKADDR_STORAGE *iface) > +{ > + int level, optname, optlen; > + char *optval = NULL; > + > + if (iface->ss_family == AF_INET6) > + { > + level = IPPROTO_IPV6; > + optname = IPV6_MULTICAST_IF; > + optval = (char *) &((SOCKADDR_IN6 *)iface)->sin6_scope_id; > + optlen = sizeof(((SOCKADDR_IN6 *)iface)->sin6_scope_id); > + } > + else > + { > + level = IPPROTO_IP; > + optname = IP_MULTICAST_IF; > + optval = (char *) &((SOCKADDR_IN *)iface)->sin_addr.s_addr; > + optlen = sizeof(((SOCKADDR_IN *)iface)->sin_addr.s_addr); > + } > + > + return setsockopt(s, level, optname, optval, optlen); > +} > + > +typedef struct listener_thread_params > +{ > + IWSDiscoveryPublisherImpl *impl; > + SOCKET listening_socket; > + BOOL ipv6; > +} listener_thread_params; > + > +#define RECEIVE_BUFFER_SIZE 65536 > + > +static DWORD WINAPI listening_thread(LPVOID params) > +{ > + listener_thread_params *parameter = (listener_thread_params *)params; > + int bytes_received, address_len, err; > + SOCKADDR_STORAGE source_addr; > + char *buffer; > + > + buffer = heap_alloc(RECEIVE_BUFFER_SIZE); > + address_len = parameter->ipv6 ? sizeof(SOCKADDR_IN6) : sizeof(SOCKADDR_IN); > + > + while (parameter->impl->publisherStarted) > + { > + bytes_received = recvfrom(parameter->listening_socket, buffer, RECEIVE_BUFFER_SIZE, 0, > + (LPSOCKADDR) &source_addr, &address_len); > + > + if (bytes_received == SOCKET_ERROR) > + { > + err = WSAGetLastError(); > + > + if (err != WSAETIMEDOUT) > + { > + WARN("Received error when trying to read from socket: %d. Stopping listener.\n", err); > + return 0; > + } > + } > + else > + { > + /* TODO: Process received message */ > + } > + } > + > + /* The publisher has been stopped */ > + closesocket(parameter->listening_socket); > + > + heap_free(buffer); > + heap_free(parameter); > + > + return 0; > +} > + > +static void start_listening(IWSDiscoveryPublisherImpl *impl, SOCKADDR_STORAGE *bind_address) This should probably return an indication of success (even if it's not possible for the caller to do something sensible with the result). > +{ > + SOCKADDR_STORAGE multicast_addr, bind_addr, interface_addr; > + listener_thread_params *parameter = NULL; > + const DWORD receive_timeout = 5000; > + const UINT reuse_addr = 1; > + HANDLE thread_handle; > + int address_length; > + SOCKET s = 0; > + > + TRACE("(%p, %p) family %d\n", impl, bind_address, bind_address->ss_family); > + > + /* Populate the multicast address */ > + ZeroMemory(&multicast_addr, sizeof(SOCKADDR_STORAGE)); > + > + if (bind_address->ss_family == AF_INET) > + { > + SOCKADDR_IN *sockaddr4 = (SOCKADDR_IN *)&multicast_addr; > + > + sockaddr4->sin_port = htons(SEND_PORT); > + sockaddr4->sin_addr.S_un.S_addr = htonl(SEND_ADDRESS_IPV4); > + address_length = sizeof(SOCKADDR_IN); > + } > + else > + { > + SOCKADDR_IN6 *sockaddr6 = (SOCKADDR_IN6 *)&multicast_addr; > + > + sockaddr6->sin6_port = htons(SEND_PORT); > + memcpy(&sockaddr6->sin6_addr, &send_address_ipv6, sizeof(send_address_ipv6)); > + address_length = sizeof(SOCKADDR_IN6); > + } > + > + /* Update the port for the binding address */ > + memcpy(&bind_addr, bind_address, address_length); > + ((SOCKADDR_IN *)&bind_addr)->sin_port = htons(SEND_PORT); > + > + /* Update the port for the interface address */ > + memcpy(&interface_addr, bind_address, address_length); > + ((SOCKADDR_IN *)&interface_addr)->sin_port = htons(0); > + > + /* Create the socket */ > + s = socket(bind_address->ss_family, SOCK_DGRAM, IPPROTO_UDP); > + > + if (s == INVALID_SOCKET) > + { > + WARN("socket() failed (error %d)\n", WSAGetLastError()); > + goto cleanup; > + } > + > + /* Ensure the socket can be reused */ > + if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&reuse_addr, sizeof(reuse_addr)) == SOCKET_ERROR) > + { > + WARN("setsockopt(SO_REUSEADDR) failed (error %d)\n", WSAGetLastError()); > + goto cleanup; > + } > + > + /* Bind the socket to the local interface so we can receive data */ > + if (bind(s, (struct sockaddr *)&bind_addr, address_length) == SOCKET_ERROR) > + { > + WARN("bind() failed (error %d)\n", WSAGetLastError()); > + goto cleanup; > + } > + > + /* Join the multicast group */ > + if (join_multicast_group(s, &multicast_addr, &interface_addr) == SOCKET_ERROR) > + { > + WARN("Unable to join multicast group (error %d)\n", WSAGetLastError()); > + goto cleanup; > + } > + > + /* Set the outgoing interface */ > + if (set_send_interface(s, &interface_addr) == SOCKET_ERROR) > + { > + WARN("Unable to set outgoing interface (error %d)\n", WSAGetLastError()); > + goto cleanup; > + } > + > + /* Set a 5-second receive timeout */ > + if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (const char *)&receive_timeout, sizeof(receive_timeout)) == SOCKET_ERROR) > + { > + WARN("setsockopt(SO_RCVTIME0) failed (error %d)\n", WSAGetLastError()); > + goto cleanup; > + } > + > + /* Allocate memory for thread parameters */ > + parameter = heap_alloc(sizeof(listener_thread_params)); > + > + parameter->impl = impl; > + parameter->listening_socket = s; > + parameter->ipv6 = (bind_address->ss_family == AF_INET6); > + > + thread_handle = CreateThread(NULL, 0, listening_thread, parameter, 0, NULL); > + > + if (thread_handle == NULL) > + { > + WARN("CreateThread failed (error %d)\n", GetLastError()); > + goto cleanup; > + } > + > + impl->thread_handles[impl->num_thread_handles] = thread_handle; > + impl->num_thread_handles++; > + > + return; > + > +cleanup: > + closesocket(s); > + heap_free(parameter); > +} > + > +static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, ULONG family) > +{ > + IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_address; > + ULONG bufferSize = 0; > + ULONG ret; > + > + ret = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); /* family should be AF_INET or AF_INET6 */ > + > + if (ret != ERROR_BUFFER_OVERFLOW) > + { > + WARN("GetAdaptorsAddresses failed with error %08x\n", ret); > + return FALSE; > + } > + > + /* Get size of buffer for adapters */ > + adapter_addresses = (IP_ADAPTER_ADDRESSES *)heap_alloc(bufferSize); > + > + if (adapter_addresses == NULL) > + { > + WARN("Out of memory allocating space for adapter information\n"); > + return FALSE; > + } > + > + /* Get list of adapters */ > + ret = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); > + > + if (ret != ERROR_SUCCESS) > + { > + WARN("GetAdaptorsAddresses failed with error %08x\n", ret); > + goto cleanup; > + } > + > + for (adapter_address = adapter_addresses; adapter_address != NULL; adapter_address = adapter_address->Next) > + { > + if (impl->num_thread_handles >= MAX_WSD_THREADS) > + { > + WARN("Exceeded maximum number of supported listener threads; too many network interfaces."); > + goto cleanup; > + } > + > + if (adapter_address->FirstUnicastAddress == NULL) > + { > + TRACE("No address found for adaptor '%s' (%p)\n", adapter_address->AdapterName, adapter_address); > + continue; > + } > + > + start_listening(impl, (SOCKADDR_STORAGE *)adapter_address->FirstUnicastAddress->Address.lpSockaddr); > + } > + > +cleanup: > + heap_free(adapter_addresses); > + return ret == ERROR_SUCCESS; > +} > + > void terminate_networking(IWSDiscoveryPublisherImpl *impl) > { > BOOL needsCleanup = impl->publisherStarted; > > impl->publisherStarted = FALSE; > + WaitForMultipleObjects(impl->num_thread_handles, impl->thread_handles, TRUE, INFINITE); > > if (needsCleanup) > WSACleanup(); > @@ -254,6 +521,15 @@ BOOL init_networking(IWSDiscoveryPublisherImpl *impl) > > impl->publisherStarted = TRUE; > > - /* TODO: Start listening */ > + if ((impl->addressFamily & WSDAPI_ADDRESSFAMILY_IPV4) && (!start_listening_on_all_addresses(impl, AF_INET))) > + goto cleanup; > + > + if ((impl->addressFamily & WSDAPI_ADDRESSFAMILY_IPV6) && (!start_listening_on_all_addresses(impl, AF_INET6))) > + goto cleanup; > + > return TRUE; > + > +cleanup: > + terminate_networking(impl); > + return FALSE; > } > diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h > index 45d54c2ef1..f88822d5ef 100644 > --- a/dlls/wsdapi/wsdapi_internal.h > +++ b/dlls/wsdapi/wsdapi_internal.h > @@ -40,6 +40,8 @@ struct notificationSink > IWSDiscoveryPublisherNotify *notificationSink; > }; > > +#define MAX_WSD_THREADS 20 > + > typedef struct IWSDiscoveryPublisherImpl { > IWSDiscoveryPublisher IWSDiscoveryPublisher_iface; > LONG ref; > @@ -47,6 +49,8 @@ typedef struct IWSDiscoveryPublisherImpl { > DWORD addressFamily; > struct list notificationSinks; > BOOL publisherStarted; > + HANDLE thread_handles[MAX_WSD_THREADS]; > + int num_thread_handles; > } IWSDiscoveryPublisherImpl; > > /* network.c */ > >

June 7, 2018

[PATCH 2/2] schedsvc: Add support for running missed tasks at the service start.

by Dmitry Timoshkov

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

June 7, 2018

[PATCH 1/2] schedsvc: Load job files at the service start up.

by Dmitry Timoshkov

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

June 7, 2018

[PATCH 4/4] testbot: Switch Patches::Submit() to the new job staging standard.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 4f428133f..e349dfe88 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -166,7 +166,6 @@ 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"); @@ -181,11 +180,9 @@ sub Submit($$$) # Add build step to the job my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); - # Create a link to the patch file in the staging dir - my $StagingFileName = CreateNewLink($PatchFileName, "$DataDir/staging", "_patch.diff"); - $NewStep->FileName(basename($StagingFileName)); + $NewStep->FileName("patch.diff"); $NewStep->FileType($TestInfo->{Type}); - $NewStep->InStaging(1); + $NewStep->InStaging(!1); $NewStep->Type("build"); $NewStep->DebugLevel(0); @@ -198,7 +195,7 @@ sub Submit($$$) $Task->VM($BuildVM); $Task->Timeout($BuildTimeout); - # Save this step (&job+task) so the others can reference it + # Save the build step so other steps can reference it my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { @@ -206,6 +203,13 @@ sub Submit($$$) return $ErrMessage; } + # Stage the patch so it can be picked up by the job + if (!link($PatchFileName, "$DataDir/staging/job". $NewJob->Id ."_patch.diff")) + { + $self->Disposition("Failed to prepare patch file"); + return $!; + } + foreach my $Unit (sort keys %{$TestInfo->{Units}}) { # Add 32 and 64-bit tasks @@ -217,7 +221,7 @@ sub Submit($$$) if (@{$VMs->GetKeys()}) { # Create the corresponding Step - $NewStep = $Steps->Add(); + my $NewStep = $Steps->Add(); $NewStep->PreviousNo(1); my $FileName = $TestInfo->{ExeBase}; $FileName .= "64" if ($Bits eq "64"); @@ -240,13 +244,23 @@ sub Submit($$$) } } + # Save it all ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) + if (defined $ErrMessage) { $self->Disposition("Failed to submit job"); return $ErrMessage; } + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + $self->Disposition("Failed to submit job (staging)"); + return $ErrMessage; + } + if ($First) { $First = !1; -- 2.17.0

June 6, 2018

[PATCH 3/4] testbot/web: Switch Submit to the new job staging standard.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 63 ++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8e22621fd..d5265a3b3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -753,28 +753,11 @@ sub OnSubmit($) 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 $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); - - my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - if ($StagingFileName and !rename($TmpStagingFullPath, $StagingFileName)) - { - $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$StagingFileName': $!\n"; - unlink($StagingFileName); - $StagingFileName = undef; - } - # If needed fall back to the existing staging file and hope for the best. - $StagingFileName = basename($StagingFileName || $TmpStagingFullPath); - # See also Patches::Submit() in lib/WineTestBot/Patches.pm # 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")) @@ -792,15 +775,15 @@ sub OnSubmit($) } my $Steps = $NewJob->Steps; + my $BuildStep; my $FileType = $self->GetParam("FileType"); - my $BuildStepNo; if ($FileType eq "patchdlls" || $FileType eq "patchprograms") { # This is a patch so add a build step... - my $BuildStep = $Steps->Add(); - $BuildStep->FileName($StagingFileName); + $BuildStep = $Steps->Add(); + $BuildStep->FileName($BaseName); $BuildStep->FileType($FileType); - $BuildStep->InStaging(1); + $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -813,14 +796,13 @@ sub OnSubmit($) $Task->VM($BuildVM); $Task->Timeout($BuildTimeout); - # Save this step (&job+task) so the others can reference it + # Save the build step so the others can reference it my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { $self->{ErrMessage} = $ErrMessage; return !1; } - $BuildStepNo = 1; } # Add steps and tasks for the 32 and 64-bit tests @@ -844,22 +826,18 @@ sub OnSubmit($) { # First create the test step my $TestStep = $Steps->Add(); - $TestStep->PreviousNo($BuildStepNo); if ($FileType eq "patchdlls" || $FileType eq "patchprograms") { - my $FileName=$self->GetParam("TestExecutable"); - if ($Bits eq "64") - { - $FileName =~ s/_test\.exe$/_test64.exe/; - } - $TestStep->FileName($FileName); - $TestStep->InStaging(!1); + $TestStep->PreviousNo($BuildStep->No); + my $TestExe = basename($self->GetParam("TestExecutable")); + $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); + $TestStep->FileName($TestExe); } else { - $TestStep->FileName($StagingFileName); - $TestStep->InStaging(1); + $TestStep->FileName($BaseName); } + $TestStep->InStaging(!1); $TestStep->FileType("exe$Bits"); $TestStep->Type("single"); $TestStep->DebugLevel($self->GetParam("DebugLevel")); @@ -875,7 +853,7 @@ sub OnSubmit($) } } - # Now save the whole thing (or whatever's left to save) + # Now save it all (or whatever's left to save) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { @@ -883,6 +861,23 @@ sub OnSubmit($) return !1; } + # Stage the test patch/executable so the job can pick it up + my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); + if (!rename($TmpStagingFullPath, "$DataDir/staging/job". $NewJob->Id ."_$BaseName")) + { + $self->{ErrMessage} = "Could not stage '$BaseName': $!\n"; + return !1; + } + + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined($ErrMessage)) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + # Notify engine my $ErrMessage = RescheduleJobs(); if (defined $ErrMessage) -- 2.17.0

June 6, 2018

[PATCH 2/4] testbot: Switch CheckForWinetestUpdate.pl to the new job staging standard.

by Francois Gouget

The new approach ensures there is no race condition with the TestBot Engine between saving the job and saving the steps. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++++++++-------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 17dab8236..137db572c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -192,15 +192,9 @@ sub AddJob($$$) 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", - "$DataDir/staging", "_$LatestBaseName"); - # 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); @@ -210,9 +204,9 @@ sub AddJob($$$) my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName(basename($StagingFileName)); + $NewStep->FileName($LatestBaseName); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); - $NewStep->InStaging(1); + $NewStep->InStaging(!1); # Add a task for each VM my $Tasks = $NewStep->Tasks; @@ -224,12 +218,28 @@ sub AddJob($$$) $Task->Timeout($SuiteTimeout); } - # Now save the whole thing + # Save it all my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - Error "Failed to save job: $ErrMessage\n"; - unlink($StagingFileName); + LogMsg "Failed to save the $LatestBaseName job: $ErrMessage\n"; + return 0; + } + + # Stage the test file so it can be picked up by the job + if (!link("$DataDir/latest/$LatestBaseName", + "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName")) + { + Error "Failed to stage $LatestBaseName: $!\n"; + return 0; + } + + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + Error "Failed to save the $LatestBaseName job (staging): $ErrMessage\n"; return 0; } @@ -244,7 +254,6 @@ 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); @@ -266,11 +275,20 @@ sub AddReconfigJob() $Task->VM($BuildVM); $Task->Timeout($ReconfigTimeout); - # Now save the whole thing + # Save it all my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - Error "Failed to save reconfig job: $ErrMessage\n"; + Error "Failed to save the Reconfig job: $ErrMessage\n"; + return 0; + } + + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + Error "Failed to save the Reconfig job (staging): $ErrMessage\n"; return 0; } } -- 2.17.0

June 6, 2018

[PATCH 1/4] testbot: Handle staging at the Job level and avoid race conditions.

by Francois Gouget

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

June 6, 2018

[PATCH] testbot: Also mark the VM for maintenance if the reverts get stuck.

by Francois Gouget

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

June 6, 2018

[PATCH 4/4] wsdapi: Add initial support for reading messages; identify Probe message.

by Owen Rudge

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(-)

June 6, 2018

[PATCH 3/4] wsdapi: Add stub for Probe message parsing, prepare notification sink message.

by Owen Rudge

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(-)

June 6, 2018

[PATCH 2/4] wsdapi: Add critical section around notification sinks.

by Owen Rudge

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(+)

June 6, 2018

[PATCH 1/4] wsdapi: Add support for listening for UDP multicast broadcasts.

by Owen Rudge

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(-)

June 6, 2018

Re: [PATCH] comctl32/tests: Use the available ARRAY_SIZE() macro

by Marvin

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=39020 Your paranoid android. === wvistau64_zh_CN (32 bit ipaddress) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === wvistau64 (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_zh_CN (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_fr (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_he (32 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64_zh_CN (32 bit edit) === edit.c:1542: Test failed: 0: got 2, 1 edit.c:1563: Test failed: 0: got 2, 1 edit.c:1577: Test failed: 0: got 2, 1 edit.c:1591: Test failed: 0: got 2, 1 edit.c:1717: Test failed: got 1 edit.c:1718: Test failed: got 1 edit.c:1724: Test failed: got 1 edit.c:1740: Test failed: got 2 edit.c:1763: Test failed: got 1

June 6, 2018

Re: [PATCH] comctl32/taskdialog/tests: Add a basic taskdialog creator as interactive test

by Fabian Maurer

> Personally I don't think this is useful, because it won't run > automatically and detect any problems. I figured it'd be useful for interactive testing, I mean all interactive tests don't run automatically. And I don't see a better way for visual testing here. > If you want to see what it looks > like or interact with it, it's trivial to make any taskdialog test not > to close the dialog automatically. That sounds hacky, I'd prefer real tests for that. Isn't that what interactvie tests are for? I mean sure, we could add a bunch of special tests that we then pause when we want to see what it looks like, but it's a lot easier to do visual checks with the creator I proposed - without having to edit any code. Regards, Fabian Maurer

June 6, 2018

Re: [PATCH v2] comctl32/edit/tests: Add interactive test showing a rendering glitch

by Fabian Maurer

On Mittwoch, 6. Juni 2018 12:23:48 CEST Nikolay Sivov wrote: > Do you know what's going on there? Is this about Edit painting logic, or > about Edit being used in a dialog? I don't know what exactly causes this issue, but it seems comctl32 specific. Probably unrelated to a dialog, but I noticed it while working on my interactive taskdialog-creator. Regards, Fabian Maurer

June 6, 2018

[PATCH 2/2] kernel32/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

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

June 6, 2018

[PATCH 1/2] kernel32/tests: Correct the buffer size passed to FormatMessageW()

by Michael Stefaniuc

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

June 6, 2018

[PATCH] comctl32/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

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

June 6, 2018

[PATCH] include: Add an option to disable line numbers in the tests

by Michael Stefaniuc

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

June 6, 2018

[PATCH v3 5/5] kernel32: Implement Wow64SetThreadContext().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 17 +++++++++++++++++ include/winbase.h | 1 + include/winternl.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1cb0b54..de6f007 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1603,7 +1603,7 @@ @ stdcall Wow64GetThreadContext(long ptr) # @ stub Wow64GetThreadSelectorEntry @ stdcall Wow64RevertWow64FsRedirection(ptr) -# @ stub Wow64SetThreadContext +@ stdcall Wow64SetThreadContext(long ptr) # @ stub Wow64SuspendThread @ stdcall WriteConsoleA(long ptr long ptr ptr) @ stdcall WriteConsoleInputA(long ptr long ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 3aa2887..eb304dc 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -236,6 +236,23 @@ BOOL WINAPI SetThreadContext( HANDLE handle, /* [in] Handle to thread /*********************************************************************** + * Wow64SetThreadContext [KERNEL32.@] + */ +BOOL WINAPI Wow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context) +{ +#ifdef __i386__ + NTSTATUS status = NtSetContextThread( handle, (const CONTEXT *)context ); +#elif defined(_WIN64) + NTSTATUS status = RtlWow64SetThreadContext( handle, context ); +#else + NTSTATUS status = STATUS_NOT_IMPLEMENTED; + FIXME("not implemented on this platform\n"); +#endif + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + +/*********************************************************************** * GetThreadContext [KERNEL32.@] Retrieves context of thread. * * RETURNS diff --git a/include/winbase.h b/include/winbase.h index f7239b8..667df96 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2708,6 +2708,7 @@ WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); WINBASEAPI BOOL WINAPI Wow64GetThreadContext(HANDLE, WOW64_CONTEXT *); WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); +WINBASEAPI BOOL WINAPI Wow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); WINADVAPI DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC,PVOID,PVOID); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); diff --git a/include/winternl.h b/include/winternl.h index 9361825..9341c40 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2838,6 +2838,7 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); #ifdef _WIN64 NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *); +NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); #endif NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); -- 2.7.4

June 6, 2018

[PATCH v3 4/5] kernel32: Implement Wow64GetThreadContext().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 18 ++++++++++++++++++ include/winbase.h | 1 + include/winternl.h | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9ed5dfb..1cb0b54 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1600,7 +1600,7 @@ @ stdcall WinExec(str long) @ stdcall Wow64EnableWow64FsRedirection(long) @ stdcall Wow64DisableWow64FsRedirection(ptr) -# @ stub Wow64GetThreadContext +@ stdcall Wow64GetThreadContext(long ptr) # @ stub Wow64GetThreadSelectorEntry @ stdcall Wow64RevertWow64FsRedirection(ptr) # @ stub Wow64SetThreadContext diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b6ca9f260..3aa2887 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -251,6 +251,24 @@ BOOL WINAPI GetThreadContext( HANDLE handle, /* [in] Handle to thread with } +/*********************************************************************** + * Wow64GetThreadContext [KERNEL32.@] + */ +BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) +{ +#ifdef __i386__ + NTSTATUS status = NtGetContextThread( handle, (CONTEXT *)context ); +#elif defined(_WIN64) + NTSTATUS status = RtlWow64GetThreadContext( handle, context ); +#else + NTSTATUS status = STATUS_NOT_IMPLEMENTED; + FIXME("not implemented on this platform\n"); +#endif + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + /********************************************************************** * SuspendThread [KERNEL32.@] Suspends a thread. * diff --git a/include/winbase.h b/include/winbase.h index 4ddc1d3..f7239b8 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2706,6 +2706,7 @@ WINBASEAPI VOID WINAPI WakeConditionVariable(PCONDITION_VARIABLE); WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); +WINBASEAPI BOOL WINAPI Wow64GetThreadContext(HANDLE, WOW64_CONTEXT *); WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); WINADVAPI DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC,PVOID,PVOID); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); diff --git a/include/winternl.h b/include/winternl.h index 3ecd068..9361825 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2836,6 +2836,9 @@ NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); +#ifdef _WIN64 +NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *); +#endif NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); -- 2.7.4

June 6, 2018

[PATCH v3 3/5] ntdll: Implement RtlWow64SetThreadContext().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 6 +++ dlls/ntdll/thread.c | 96 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 93 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f1dd6ed..77cc1ae 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -978,6 +978,7 @@ @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) +@ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9310297..e30cd59 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -150,6 +150,7 @@ static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); +static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); static VOID (CDECL *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif @@ -2520,6 +2521,9 @@ static void test_wow64_context(void) ok(*(WORD *)ctx.ExtendedRegisters == 0x27f, "got SSE control word %04x\n", *(WORD *)ctx.ExtendedRegisters); + ret = pRtlWow64SetThreadContext( pi.hThread, &ctx ); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + pNtTerminateProcess(pi.hProcess, 0); } @@ -3163,6 +3167,8 @@ START_TEST(exception) "RtlUnwindEx" ); pRtlWow64GetThreadContext = (void *)GetProcAddress( hntdll, "RtlWow64GetThreadContext" ); + pRtlWow64SetThreadContext = (void *)GetProcAddress( hntdll, + "RtlWow64SetThreadContext" ); p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index df04b33..52c7953 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -851,23 +851,16 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) return NtCurrentTeb()->ActiveFrame; } - -/*********************************************************************** - * set_thread_context - */ -NTSTATUS set_thread_context( HANDLE handle, const CONTEXT *context, BOOL *self ) +static NTSTATUS set_server_context( HANDLE handle, const context_t *context, BOOL *self ) { NTSTATUS ret; DWORD dummy, i; - context_t server_context; - - context_to_server( &server_context, context ); SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); req->suspend = 1; - wine_server_add_data( req, &server_context, sizeof(server_context) ); + wine_server_add_data( req, context, sizeof(*context) ); ret = wine_server_call( req ); *self = reply->self; } @@ -881,7 +874,7 @@ NTSTATUS set_thread_context( HANDLE handle, const CONTEXT *context, BOOL *self ) { req->handle = wine_server_obj_handle( handle ); req->suspend = 0; - wine_server_add_data( req, &server_context, sizeof(server_context) ); + wine_server_add_data( req, context, sizeof(*context) ); ret = wine_server_call( req ); } SERVER_END_REQ; @@ -900,6 +893,12 @@ NTSTATUS set_thread_context( HANDLE handle, const CONTEXT *context, BOOL *self ) return ret; } +NTSTATUS set_thread_context( HANDLE handle, const CONTEXT *context, BOOL *self ) +{ + context_t server_context; + context_to_server( &server_context, context ); + return set_server_context( handle, &server_context, self ); +} /* convert CPU-specific flags to generic server flags */ static inline unsigned int get_server_context_flags( DWORD flags ) @@ -978,6 +977,83 @@ NTSTATUS get_thread_context( HANDLE handle, CONTEXT *context, BOOL *self) } #ifdef _WIN64 +static NTSTATUS wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) +{ + DWORD flags = from->ContextFlags & ~WOW64_CONTEXT_i386; /* get rid of CPU id */ + + memset( to, 0, sizeof(*to) ); + to->cpu = CPU_x86; + + if (flags & WOW64_CONTEXT_CONTROL) + { + to->flags |= SERVER_CTX_CONTROL; + to->ctl.i386_regs.ebp = from->Ebp; + to->ctl.i386_regs.esp = from->Esp; + to->ctl.i386_regs.eip = from->Eip; + to->ctl.i386_regs.cs = from->SegCs; + to->ctl.i386_regs.ss = from->SegSs; + to->ctl.i386_regs.eflags = from->EFlags; + } + if (flags & WOW64_CONTEXT_INTEGER) + { + to->flags |= SERVER_CTX_INTEGER; + to->integer.i386_regs.eax = from->Eax; + to->integer.i386_regs.ebx = from->Ebx; + to->integer.i386_regs.ecx = from->Ecx; + to->integer.i386_regs.edx = from->Edx; + to->integer.i386_regs.esi = from->Esi; + to->integer.i386_regs.edi = from->Edi; + } + if (flags & WOW64_CONTEXT_SEGMENTS) + { + to->flags |= SERVER_CTX_SEGMENTS; + to->seg.i386_regs.ds = from->SegDs; + to->seg.i386_regs.es = from->SegEs; + to->seg.i386_regs.fs = from->SegFs; + to->seg.i386_regs.gs = from->SegGs; + } + if (flags & WOW64_CONTEXT_FLOATING_POINT) + { + to->flags |= SERVER_CTX_FLOATING_POINT; + to->fp.i386_regs.ctrl = from->FloatSave.ControlWord; + to->fp.i386_regs.status = from->FloatSave.StatusWord; + to->fp.i386_regs.tag = from->FloatSave.TagWord; + to->fp.i386_regs.err_off = from->FloatSave.ErrorOffset; + to->fp.i386_regs.err_sel = from->FloatSave.ErrorSelector; + to->fp.i386_regs.data_off = from->FloatSave.DataOffset; + to->fp.i386_regs.data_sel = from->FloatSave.DataSelector; + to->fp.i386_regs.cr0npx = from->FloatSave.Cr0NpxState; + memcpy( to->fp.i386_regs.regs, from->FloatSave.RegisterArea, sizeof(to->fp.i386_regs.regs) ); + } + if (flags & WOW64_CONTEXT_DEBUG_REGISTERS) + { + to->flags |= SERVER_CTX_DEBUG_REGISTERS; + to->debug.i386_regs.dr0 = from->Dr0; + to->debug.i386_regs.dr1 = from->Dr1; + to->debug.i386_regs.dr2 = from->Dr2; + to->debug.i386_regs.dr3 = from->Dr3; + to->debug.i386_regs.dr6 = from->Dr6; + to->debug.i386_regs.dr7 = from->Dr7; + } + if (flags & WOW64_CONTEXT_EXTENDED_REGISTERS) + { + to->flags |= SERVER_CTX_EXTENDED_REGISTERS; + memcpy( to->ext.i386_regs, from->ExtendedRegisters, sizeof(to->ext.i386_regs) ); + } + return STATUS_SUCCESS; +} + +/****************************************************************************** + * RtlWow64SetThreadContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context ) +{ + BOOL self; + context_t server_context; + wow64_context_to_server( &server_context, context ); + return set_server_context( handle, &server_context, &self ); +} + /* convert CPU-specific flags to generic server flags */ static inline unsigned int wow64_get_server_context_flags( DWORD flags ) { -- 2.7.4

June 6, 2018

[PATCH v3 2/5] ntdll: Implement RtlWow64GetThreadContext().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: fix test failures on Vista dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 36 ++++++++++++++ dlls/ntdll/thread.c | 114 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 143 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c0f5d6f..f1dd6ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -977,6 +977,7 @@ @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) +@ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c47c8cb..9310297 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -149,6 +149,7 @@ static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UN static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); +static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static VOID (CDECL *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif @@ -2490,6 +2491,38 @@ static void test_dpe_exceptions(void) pRtlRemoveVectoredExceptionHandler(handler); } +static void test_wow64_context(void) +{ + char cmdline[] = "C:\\windows\\syswow64\\notepad.exe"; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + WOW64_CONTEXT ctx; + NTSTATUS ret; + + memset(&ctx, 0x55, sizeof(ctx)); + ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext( GetCurrentThread(), &ctx ); + ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_PARTIAL_COPY), "got %#x\n", ret); + + CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + + ret = pRtlWow64GetThreadContext( pi.hThread, &ctx ); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + ok(ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx.ContextFlags); + ok(!ctx.Ebp, "got ebp %08x\n", ctx.Ebp); + ok(!ctx.Ecx, "got ecx %08x\n", ctx.Ecx); + ok(!ctx.Edx, "got edx %08x\n", ctx.Edx); + ok(!ctx.Esi, "got esi %08x\n", ctx.Esi); + ok(!ctx.Edi, "got edi %08x\n", ctx.Edi); + ok((ctx.EFlags & ~2) == 0x200, "got eflags %08x\n", ctx.EFlags); + ok((WORD) ctx.FloatSave.ControlWord == 0x27f, "got control word %08x\n", + ctx.FloatSave.ControlWord); + ok(*(WORD *)ctx.ExtendedRegisters == 0x27f, "got SSE control word %04x\n", + *(WORD *)ctx.ExtendedRegisters); + + pNtTerminateProcess(pi.hProcess, 0); +} + #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -3128,6 +3161,8 @@ START_TEST(exception) "RtlRestoreContext" ); pRtlUnwindEx = (void *)GetProcAddress( hntdll, "RtlUnwindEx" ); + pRtlWow64GetThreadContext = (void *)GetProcAddress( hntdll, + "RtlWow64GetThreadContext" ); p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" ); @@ -3143,6 +3178,7 @@ START_TEST(exception) test_restore_context(); test_prot_fault(); test_dpe_exceptions(); + test_wow64_context(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 35e23d2..df04b33 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -924,22 +924,18 @@ static inline unsigned int get_server_context_flags( DWORD flags ) return ret; } -/*********************************************************************** - * get_thread_context - */ -NTSTATUS get_thread_context( HANDLE handle, CONTEXT *context, BOOL *self ) +static NTSTATUS get_server_context( HANDLE handle, unsigned int server_flags, + context_t *context, BOOL *self ) { NTSTATUS ret; DWORD dummy, i; - unsigned int server_flags = get_server_context_flags( context->ContextFlags ); - context_t server_context; SERVER_START_REQ( get_thread_context ) { req->handle = wine_server_obj_handle( handle ); req->flags = server_flags; req->suspend = 1; - wine_server_set_reply( req, &server_context, sizeof(server_context) ); + wine_server_set_reply( req, context, sizeof(*context) ); ret = wine_server_call( req ); *self = reply->self; } @@ -954,7 +950,7 @@ NTSTATUS get_thread_context( HANDLE handle, CONTEXT *context, BOOL *self ) req->handle = wine_server_obj_handle( handle ); req->flags = server_flags; req->suspend = 0; - wine_server_set_reply( req, &server_context, sizeof(server_context) ); + wine_server_set_reply( req, context, sizeof(*context) ); ret = wine_server_call( req ); } SERVER_END_REQ; @@ -969,10 +965,112 @@ NTSTATUS get_thread_context( HANDLE handle, CONTEXT *context, BOOL *self ) NtResumeThread( handle, &dummy ); if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; } + return ret; +} + +NTSTATUS get_thread_context( HANDLE handle, CONTEXT *context, BOOL *self) +{ + context_t server_context; + unsigned int server_flags = get_server_context_flags( context->ContextFlags ); + NTSTATUS ret = get_server_context( handle, server_flags, &server_context, self); if (!ret) ret = context_from_server( context, &server_context ); return ret; } +#ifdef _WIN64 +/* convert CPU-specific flags to generic server flags */ +static inline unsigned int wow64_get_server_context_flags( DWORD flags ) +{ + unsigned int ret = 0; + + flags &= 0x3f; /* mask CPU id flags */ + if (flags & WOW64_CONTEXT_CONTROL) ret |= SERVER_CTX_CONTROL; + if (flags & WOW64_CONTEXT_INTEGER) ret |= SERVER_CTX_INTEGER; + if (flags & WOW64_CONTEXT_SEGMENTS) ret |= SERVER_CTX_SEGMENTS; + if (flags & WOW64_CONTEXT_FLOATING_POINT) ret |= SERVER_CTX_FLOATING_POINT; + if (flags & WOW64_CONTEXT_DEBUG_REGISTERS) ret |= SERVER_CTX_DEBUG_REGISTERS; + if (flags & WOW64_CONTEXT_EXTENDED_REGISTERS) ret |= SERVER_CTX_EXTENDED_REGISTERS; + return ret; +} + +static NTSTATUS wow64_context_from_server( WOW64_CONTEXT *to, const context_t *from ) +{ + if (from->cpu != CPU_x86) return STATUS_INVALID_PARAMETER; + + to->ContextFlags = WOW64_CONTEXT_i386; + if (from->flags & SERVER_CTX_CONTROL) + { + to->ContextFlags |= WOW64_CONTEXT_CONTROL; + to->Ebp = from->ctl.i386_regs.ebp; + to->Esp = from->ctl.i386_regs.esp; + to->Eip = from->ctl.i386_regs.eip; + to->SegCs = from->ctl.i386_regs.cs; + to->SegSs = from->ctl.i386_regs.ss; + to->EFlags = from->ctl.i386_regs.eflags; + } + if (from->flags & SERVER_CTX_INTEGER) + { + to->ContextFlags |= WOW64_CONTEXT_INTEGER; + to->Eax = from->integer.i386_regs.eax; + to->Ebx = from->integer.i386_regs.ebx; + to->Ecx = from->integer.i386_regs.ecx; + to->Edx = from->integer.i386_regs.edx; + to->Esi = from->integer.i386_regs.esi; + to->Edi = from->integer.i386_regs.edi; + } + if (from->flags & SERVER_CTX_SEGMENTS) + { + to->ContextFlags |= WOW64_CONTEXT_SEGMENTS; + to->SegDs = from->seg.i386_regs.ds; + to->SegEs = from->seg.i386_regs.es; + to->SegFs = from->seg.i386_regs.fs; + to->SegGs = from->seg.i386_regs.gs; + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= WOW64_CONTEXT_FLOATING_POINT; + to->FloatSave.ControlWord = from->fp.i386_regs.ctrl; + to->FloatSave.StatusWord = from->fp.i386_regs.status; + to->FloatSave.TagWord = from->fp.i386_regs.tag; + to->FloatSave.ErrorOffset = from->fp.i386_regs.err_off; + to->FloatSave.ErrorSelector = from->fp.i386_regs.err_sel; + to->FloatSave.DataOffset = from->fp.i386_regs.data_off; + to->FloatSave.DataSelector = from->fp.i386_regs.data_sel; + to->FloatSave.Cr0NpxState = from->fp.i386_regs.cr0npx; + memcpy( to->FloatSave.RegisterArea, from->fp.i386_regs.regs, sizeof(to->FloatSave.RegisterArea) ); + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= WOW64_CONTEXT_DEBUG_REGISTERS; + to->Dr0 = from->debug.i386_regs.dr0; + to->Dr1 = from->debug.i386_regs.dr1; + to->Dr2 = from->debug.i386_regs.dr2; + to->Dr3 = from->debug.i386_regs.dr3; + to->Dr6 = from->debug.i386_regs.dr6; + to->Dr7 = from->debug.i386_regs.dr7; + } + if (from->flags & SERVER_CTX_EXTENDED_REGISTERS) + { + to->ContextFlags |= WOW64_CONTEXT_EXTENDED_REGISTERS; + memcpy( to->ExtendedRegisters, from->ext.i386_regs, sizeof(to->ExtendedRegisters) ); + } + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * RtlWow64GetThreadContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context ) +{ + BOOL self; + context_t server_context; + unsigned int server_flags = wow64_get_server_context_flags( context->ContextFlags ); + NTSTATUS ret = get_server_context( handle, server_flags, &server_context, &self ); + if (!ret) ret = wow64_context_from_server( context, &server_context ); + return ret; +} +#endif /****************************************************************************** * NtQueryInformationThread (NTDLL.@) -- 2.7.4

June 6, 2018

[PATCH v3 1/5] winnt.h: Add some WOW64 definitions.

by Zebediah Figura

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

June 6, 2018

Re: [PATCH v2 3/5] ntdll: Implement RtlWow64SetThreadContext().

by Marvin

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=39017 Your paranoid android. === wvistau64 (64 bit exception) === exception.c:2506: Test failed: got 0x8000000d === w2008s64 (64 bit exception) === exception.c:2506: Test failed: got 0x8000000d

June 6, 2018

Re: [PATCH v2 2/5] ntdll: Implement RtlWow64GetThreadContext().

by Marvin

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=39016 Your paranoid android. === wvistau64 (64 bit exception) === exception.c:2505: Test failed: got 0x8000000d === w2008s64 (64 bit exception) === exception.c:2505: Test failed: got 0x8000000d

June 6, 2018