April 2015 - Wine-commits - list.winehq.org

Mark Harmstone : include: Add SM_CXPADDEDBORDER to winuser.h.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: cb8545ab98fae56e89b88be3dfdc7c717297d8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8545ab98fae56e89b88be3d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 23:41:52 2015 +0100 include: Add SM_CXPADDEDBORDER to winuser.h. --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 3d9b937..e9804a9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -982,6 +982,7 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define SM_SERVERR2 89 #define SM_CMETRICS 90 #define SM_MOUSEHORIZONTALWHEELPRESENT 91 +#define SM_CXPADDEDBORDER 92 #define SM_REMOTESESSION 0x1000 #define SM_SHUTTINGDOWN 0x2000

1 0

Jianqiu Zhang : include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION.
by Alexandre Julliard 09 Apr '15

09 Apr '15

Module: wine Branch: master Commit: 047698bf7d0d7e38dc4cf971745ef93c4b786de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047698bf7d0d7e38dc4cf9717… Author: Jianqiu Zhang <zhangjianqiu13(a)gmail.com> Date: Mon Mar 30 11:18:17 2015 +0800 include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION. --- include/winioctl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winioctl.h b/include/winioctl.h index fb78821..269f771 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -439,6 +439,20 @@ typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { WCHAR FileSystemName[1]; } FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; +/*FileFsControlInformation = 6 */ +/* + unknown + */ + +/*FileFsFullSizeInformation = 7 */ +typedef struct _FILE_FS_FULL_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; + typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { LARGE_INTEGER Timeout; ULONG NameLength;

1 0

Sebastian Lackner : wined3d: Fix a typo in vertexshader_init.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 14219b0c3b39d696028718a91bdec9c5ad6239ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=14219b0c3b39d696028718a91… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 8 04:56:33 2015 +0200 wined3d: Fix a typo in vertexshader_init. Should fix the graphical corruptions recently introduced by 002713de6d6afed8f1483316fd32fbfc0956b338. --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6428ec7..0bedf24 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2312,7 +2312,7 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d shader->u.vs.attributes[input->register_idx].usage = shader_usage_from_semantic_name(input->semantic_name); - shader->u.vs.attributes[i].usage_idx = input->semantic_idx; + shader->u.vs.attributes[input->register_idx].usage_idx = input->semantic_idx; } shader->load_local_constsF = (reg_maps->usesrelconstF && !list_empty(&shader->constantsF)) ||

1 0

Bruno Jesus : ws2_32/tests: Add some more select() related tests.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: f01ccea4b538e624f1efc59a91ba9e998d10762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01ccea4b538e624f1efc59a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 02:02:01 2015 -0300 ws2_32/tests: Add some more select() related tests. --- dlls/ws2_32/tests/sock.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 287a24b..2b4daae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3675,6 +3675,12 @@ static void test_select(void) select_timeout.tv_sec = 1; select_timeout.tv_usec = 250000; + /* When no events are pending select returns 0 with no error */ + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 0, "expected 0, got %d\n", ret); + /* When a socket is attempting to connect the listening socket receives the read descriptor */ fdWrite = setup_connector_socket(&address, len, TRUE); FD_ZERO_ALL(); @@ -3695,6 +3701,10 @@ static void test_select(void) ok(ret == 2, "expected 2, got %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); ok(FD_ISSET(fdRead, &writefds), "fdRead socket is not in the set\n"); + len = sizeof(id); + id = 0xdeadbeef; + ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); + ok(id == 0, "expected 0, got %d\n", id); /* When data is received the receiver gets the read descriptor */ ret = send(fdWrite, "1234", 4, 0); @@ -3767,6 +3777,7 @@ static void test_select(void) ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); + len = sizeof(address); fdWrite = setup_connector_socket(&address, len, TRUE); FD_ZERO_ALL(); FD_SET(fdWrite, &writefds); @@ -3774,6 +3785,11 @@ static void test_select(void) select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); +todo_wine + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite);

1 0

Bruno Jesus : ws2_32: Add a more generic function to retrieve socket errors from server.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: b34ca6f4fe836b5ddd43672d1a789aa2ddde7360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34ca6f4fe836b5ddd43672d1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 02:02:41 2015 -0300 ws2_32: Add a more generic function to retrieve socket errors from server. --- dlls/ws2_32/socket.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7494b5f..ad75a75 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1075,19 +1075,23 @@ static void _sync_sock_state(SOCKET s) (void)_is_blocking(s, &dummy); } -static int _get_sock_error(SOCKET s, unsigned int bit) +static void _get_sock_errors(SOCKET s, int *events) { - int events[FD_MAX_EVENTS]; - SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_set_reply( req, events, sizeof(events) ); + wine_server_set_reply( req, events, sizeof(int) * FD_MAX_EVENTS ); wine_server_call( req ); } SERVER_END_REQ; +} + +static int _get_sock_error(SOCKET s, unsigned int bit) +{ + int events[FD_MAX_EVENTS]; + _get_sock_errors(s, events); return events[bit]; }

1 0

Bruno Jesus : ws2_32: Handle SO_ERROR manually in getsockopt().
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 71c60d15d3fb6c88c23d8c8cd4f7e6cfd3e89458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71c60d15d3fb6c88c23d8c8cd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 02:02:55 2015 -0300 ws2_32: Handle SO_ERROR manually in getsockopt(). As soon as SO_ERROR is read from getsockopt it is reset in the kernel, when attempting a non-blocking connection the wine server reads SO_ERROR first so when the application tries to read the value it will end with zero. --- dlls/ws2_32/socket.c | 31 ++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ad75a75..6903909 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3286,7 +3286,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, * alphabetically */ case WS_SO_BROADCAST: case WS_SO_DEBUG: - case WS_SO_ERROR: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: case WS_SO_RCVBUF: @@ -3450,6 +3449,36 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *optlen = sizeof(BOOL); return 0; + case WS_SO_ERROR: + { + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + ret = SOCKET_ERROR; + } + release_sock_fd( s, fd ); + + /* The wineserver may have swallowed the error before us */ + if (!ret && *(int*) optval == 0) + { + int i, events[FD_MAX_EVENTS]; + _get_sock_errors(s, events); + for (i = 0; i < FD_MAX_EVENTS; i++) + { + if(events[i]) + { + events[i] = NtStatusToWSAError(events[i]); + TRACE("returning SO_ERROR %d from wine server\n", events[i]); + *(int*) optval = events[i]; + break; + } + } + } + return ret; + } + case WS_SO_LINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2b4daae..5f25471 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3788,7 +3788,6 @@ static void test_select(void) len = sizeof(id); id = 0xdeadbeef; ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), "getsockopt failed with %d\n",WSAGetLastError()); -todo_wine ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n");

1 0

Andrew Eikum : shell32: Support setting and retrieving KnownFolder parsing names.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: c01efd0666bd1d5bf57ae6659899b1edfaeab764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01efd0666bd1d5bf57ae6659… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 08:52:46 2015 -0500 shell32: Support setting and retrieving KnownFolder parsing names. --- dlls/shell32/shellpath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b35f04f..5337809 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -771,6 +771,7 @@ VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; static const WCHAR szAttributes[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR szName[] = {'N','a','m','e',0}; +static const WCHAR szParsingName[] = {'P','a','r','s','i','n','g','N','a','m','e',0}; static const WCHAR szRelativePath[] = {'R','e','l','a','t','i','v','e','P','a','t','h',0}; static const WCHAR szParentFolder[] = {'P','a','r','e','n','t','F','o','l','d','e','r',0}; @@ -3869,6 +3870,8 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( get_known_folder_wstr(knownfolder->registryPath, szRelativePath, &pKFD->pszRelativePath); + get_known_folder_wstr(knownfolder->registryPath, szParsingName, &pKFD->pszParsingName); + return S_OK; } @@ -4093,6 +4096,9 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) )); + if(SUCCEEDED(hr) && pKFD->pszParsingName) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParsingName, 0, REG_SZ, (LPBYTE)pKFD->pszParsingName, (lstrlenW(pKFD->pszParsingName)+1)*sizeof(WCHAR) )); + if(SUCCEEDED(hr) && !IsEqualGUID(&pKFD->fidParent, &GUID_NULL)) { WCHAR sParentGuid[39];

1 0

Andrew Eikum : shell32: Add more knownfolder definitions.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 915bef8725d2403c2d07a258865f64865852cfa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915bef8725d2403c2d07a2588… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 08:55:46 2015 -0500 shell32: Add more knownfolder definitions. --- dlls/shell32/shellpath.c | 195 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 22 ++--- 2 files changed, 196 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=915bef8725d2403c2d07a…

1 0

Aric Stewart : dinput: Add JoystickID to the Instance Name.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 3d30db22484c119d65e1fa476662bd6a4a3eea21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d30db22484c119d65e1fa476… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 7 10:00:31 2015 -0500 dinput: Add JoystickID to the Instance Name. --- dlls/dinput/joystick.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 547ba56..9425c0b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -26,6 +26,8 @@ * force feedback */ +#include <stdio.h> + #include "joystick_private.h" #include "wine/debug.h" #include "winreg.h" @@ -608,6 +610,8 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIDEVICEINSTANCEA pdidi) { JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); + DIPROPDWORD pd; + DWORD index = 0; TRACE("(%p,%p)\n", iface, pdidi); @@ -622,12 +626,20 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( return DIERR_INVALIDPARAM; } + /* Try to get joystick index */ + pd.diph.dwSize = sizeof(pd); + pd.diph.dwHeaderSize = sizeof(pd.diph); + pd.diph.dwObj = 0; + pd.diph.dwHow = DIPH_DEVICE; + if (SUCCEEDED(IDirectInputDevice2_GetProperty(iface, DIPROP_JOYSTICKID, &pd.diph))) + index = pd.dwData; + /* Return joystick */ pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; - strcpy(pdidi->tszInstanceName, "Joystick"); + snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); strcpy(pdidi->tszProductName, This->name); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; @@ -646,6 +658,9 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIDEVICEINSTANCEW pdidi) { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + CHAR buffer[MAX_PATH]; + DIPROPDWORD pd; + DWORD index = 0; TRACE("(%p,%p)\n", iface, pdidi); @@ -655,12 +670,21 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( return DIERR_INVALIDPARAM; } + /* Try to get joystick index */ + pd.diph.dwSize = sizeof(pd); + pd.diph.dwHeaderSize = sizeof(pd.diph); + pd.diph.dwObj = 0; + pd.diph.dwHow = DIPH_DEVICE; + if (SUCCEEDED(IDirectInputDevice2_GetProperty(iface, DIPROP_JOYSTICKID, &pd.diph))) + index = pd.dwData; + /* Return joystick */ pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; - MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, pdidi->tszInstanceName, MAX_PATH); + snprintf(buffer, sizeof(buffer), "Joystick %d", index); + MultiByteToWideChar(CP_ACP, 0, buffer, -1, pdidi->tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, This->name, -1, pdidi->tszProductName, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3W)) { pdidi->guidFFDriver = GUID_NULL;

1 0

Francois Gouget : shell32: Add support for the OS X 'My Stuff' folders.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: e9d010ef628ac58482cee9c6c7814516d5e79e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d010ef628ac58482cee9c6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 16:50:43 2015 +0200 shell32: Add support for the OS X 'My Stuff' folders. --- dlls/shell32/shellpath.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index cfd3094..b35f04f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -813,6 +813,7 @@ static const WCHAR Microsoft_Windows_GameExplorerW[] = {'M','i','c','r','o','s', static const WCHAR Microsoft_Windows_LibrariesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','L','i','b','r','a','r','i','e','s','\0'}; static const WCHAR Microsoft_Windows_RingtonesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','R','i','n','g','t','o','n','e','s','\0'}; static const WCHAR Microsoft_Windows_Start_MenuW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u',0}; +static const WCHAR MoviesW[] = {'M','o','v','i','e','s','\0'}; static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'}; static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'}; @@ -2785,6 +2786,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { 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 = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); @@ -2870,36 +2872,47 @@ static void _SHCreateSymbolicLinks(void) } /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ - for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { + for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) + { /* 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; - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && - !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* If there's a 'My Whatever' directory where 'My Documents' links to, link to it. */ - rmdir(pszMyStuff); - symlink(szMyStuffTarget, pszMyStuff); - } - else + while (1) { - rmdir(pszMyStuff); + /* Check for the Wine-specific '$HOME/My Documents' subfolder */ + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && + !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + break; + + /* Try the XDG_XXX_DIR folder */ if (xdg_results && xdg_results[i]) { - /* the folder specified by XDG_XXX_DIR exists, link to it. */ - symlink(xdg_results[i], pszMyStuff); + strcpy(szMyStuffTarget, xdg_results[i]); + break; } - else + + /* Or the OS X folder (these are never localized) */ + if (pszHome) { - /* Else link to where 'My Documents' itself links to. */ - symlink(szPersonalTarget, pszMyStuff); + strcpy(szMyStuffTarget, pszHome); + if (_SHAppendToUnixPath(szMyStuffTarget, MyOSXStuffW[i]) && + !stat(szMyStuffTarget, &statFolder) && + S_ISDIR(statFolder.st_mode)) + break; } + + /* As a last resort point to the same location as 'My Documents' */ + strcpy(szMyStuffTarget, szPersonalTarget); + break; } + rmdir(pszMyStuff); + symlink(szMyStuffTarget, pszMyStuff); HeapFree(GetProcessHeap(), 0, pszMyStuff); }

1 0