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