September 2013 - Wine-commits

Bruno Jesus : ws2_32: Advertise protocol entries as default.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: e0581b38a7edee6ba61f5b3559a68af82d7d1f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0581b38a7edee6ba61f5b355… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:43:31 2013 -0300 ws2_32: Advertise protocol entries as default. --- dlls/ws2_32/socket.c | 5 +++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eacc793..8762950 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1613,6 +1613,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3e9; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_INET; @@ -1628,6 +1629,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_CONNECTIONLESS; info->ProviderId = ProviderIdIP; info->dwCatalogEntryId = 0x3ea; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_INET; @@ -1644,6 +1646,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_CONNECTIONLESS; info->ProviderId = ProviderIdIPX; info->dwCatalogEntryId = 0x406; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_IPX; @@ -1661,6 +1664,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x407; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_IPX; @@ -1677,6 +1681,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; info->ProviderId = ProviderIdSPX; info->dwCatalogEntryId = 0x409; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; info->iAddressFamily = WS_AF_IPX; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c3658f..bc2bd10 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2000,22 +2000,22 @@ todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); -todo_wine { size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); +todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for(i = 0; i < items; i++) { if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) { +todo_wine ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", pi[i].iSocketType, socktype); break; } } ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); -} closesocket(sock); /* when no socket type is specified the first entry from WSAEnumProtocols

1 0

Bruno Jesus : ws2_32: Avoid magic numbers.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 44ea5334caf05bd9b450d1d0b9f4da1d8a202acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ea5334caf05bd9b450d1d0b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:43:45 2013 -0300 ws2_32: Avoid magic numbers. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8762950..c6b3593 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1670,7 +1670,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; - info->iSocketType = 5; + info->iSocketType = WS_SOCK_SEQPACKET; info->dwMessageSize = 0xffffffff; strcpyW( info->szProtocol, NameSpxW ); break; @@ -1687,7 +1687,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; - info->iSocketType = 5; + info->iSocketType = WS_SOCK_SEQPACKET; info->dwMessageSize = 0xffffffff; strcpyW( info->szProtocol, NameSpxIIW ); break;

1 0

Bruno Jesus : ws2_32: Make WS_EnterSingleProtocol return a boolean.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 78ca87a00baf08c577ea526a4cc91f5e9858006c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ca87a00baf08c577ea526a4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:44:03 2013 -0300 ws2_32: Make WS_EnterSingleProtocol return a boolean. --- dlls/ws2_32/socket.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c6b3593..b591c5e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1592,15 +1592,14 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR * buffer. * * RETURNS - * 1 if a protocol was entered into the buffer. - * SOCKET_ERROR otherwise. + * TRUE if a protocol was entered into the buffer. * * BUGS * - only implemented for IPX, SPX, SPXII, TCP, UDP * - there is no check that the operating system supports the returned * protocols */ -static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) { memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); info->iProtocol = protocol; @@ -1694,9 +1693,9 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) default: FIXME("unknown Protocol <0x%08x>\n", protocol); - return SOCKET_ERROR; + return FALSE; } - return 1; + return TRUE; } /***************************************************************************** @@ -1705,14 +1704,14 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) * see function WS_EnterSingleProtocolW * */ -static INT WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) +static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) { WSAPROTOCOL_INFOW infow; INT ret; memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); ret = WS_EnterSingleProtocolW( protocol, &infow ); - if (ret != SOCKET_ERROR) + if (ret) { /* convert the structure from W to A */ memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); @@ -1758,12 +1757,12 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I { if (unicode) { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ) != SOCKET_ERROR) + if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] )) items++; } else { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ) != SOCKET_ERROR) + if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] )) items++; } }

1 0

Bruno Jesus : ws2_32: Fix WSASocket return code for invalid combination of socket type and protocol .
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 5762067b20dc3b0cc8d9fecb1a99d3784dc0131d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5762067b20dc3b0cc8d9fecb1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:44:22 2013 -0300 ws2_32: Fix WSASocket return code for invalid combination of socket type and protocol. --- dlls/ws2_32/socket.c | 17 ++++++++++++++--- dlls/ws2_32/tests/sock.c | 3 --- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b591c5e..dafbeb4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5867,6 +5867,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, GROUP g, DWORD dwFlags) { SOCKET ret; + DWORD err; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -5929,16 +5930,26 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - if (GetLastError() == WSAEACCES) /* raw socket denied */ + err = GetLastError(); + if (err == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); else ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); - SetLastError(WSAESOCKTNOSUPPORT); + err = WSAESOCKTNOSUPPORT; + } + else + { + /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ + if (err == WSAEINVAL) + err = WSAESOCKTNOSUPPORT; + else if (err == WSAEOPNOTSUPP) + err = WSAEPROTONOSUPPORT; } - WARN("\t\tfailed!\n"); + WARN("\t\tfailed, error %d!\n", err); + SetLastError(err); return INVALID_SOCKET; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bc2bd10..40496ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1854,7 +1854,6 @@ todo_wine ok(WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); SetLastError(0xdeadbeef); @@ -1874,7 +1873,6 @@ todo_wine ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* SOCK_DGRAM does not support IPPROTO_TCP */ @@ -1882,7 +1880,6 @@ todo_wine ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA)

1 0

Bruno Jesus : ws2_32: Fix the error returned for denied SOCK_RAW attempts.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 29aab5df59a485b3c8fddef284ccdc02485bd86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29aab5df59a485b3c8fddef28… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:44:40 2013 -0300 ws2_32: Fix the error returned for denied SOCK_RAW attempts. --- dlls/ws2_32/socket.c | 1 - dlls/ws2_32/tests/sock.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index dafbeb4..4750656 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5937,7 +5937,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); else ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); - err = WSAESOCKTNOSUPPORT; } else { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 40496ca..70269b4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2050,6 +2050,53 @@ todo_wine } HeapFree(GetProcessHeap(), 0, pi); + + SetLastError(0xdeadbeef); + /* starting on vista the socket function returns error during the socket + creation and no longer in the socket operations (sendto, readfrom) */ + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0); + if (sock == INVALID_SOCKET) + { + err = WSAGetLastError(); + ok(err == WSAEACCES, "Expected 10013, received %d\n", err); + skip("SOCK_RAW is not supported\n"); + } + else + { + trace("SOCK_RAW is supported\n"); + + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + + todo_wine { + sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } } static void test_WSADuplicateSocket(void)

1 0

Thomas Faber : comctl32: Fix build with MSVC.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: e12c8c0ce93a22bec67d0926faf211456b8f5442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12c8c0ce93a22bec67d0926f… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Sep 14 21:20:53 2013 +0200 comctl32: Fix build with MSVC. --- dlls/comctl32/trackbar.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 50c44d5..9673771 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -616,8 +616,7 @@ static int TRACKBAR_FillThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, HBRUSH hbrush) { const RECT *thumb = &infoPtr->rcThumb; - const int PointCount = 6; - POINT points[PointCount]; + POINT points[6]; int PointDepth; HBRUSH oldbr; @@ -698,7 +697,7 @@ TRACKBAR_FillThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, HBRUSH hbrush) oldbr = SelectObject(hdc, hbrush); SetPolyFillMode(hdc, WINDING); - Polygon(hdc, points, PointCount); + Polygon(hdc, points, sizeof(points) / sizeof(points[0])); SelectObject(hdc, oldbr); return PointDepth;

1 0

Alexandre Julliard : msxml3: Don't use libxslt without libxml.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: b618910b845f33688016c3508df79b7306499532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b618910b845f33688016c3508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 10:20:50 2013 +0200 msxml3: Don't use libxslt without libxml. --- dlls/msxml3/main.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 46742ef..ae93ec9 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -161,15 +161,6 @@ static int wineXmlFileCloseCallback (void * context) return CloseHandle(context) ? 0 : -1; } -#endif - - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - - void* libxslt_handle = NULL; #ifdef SONAME_LIBXSLT # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL @@ -209,6 +200,15 @@ static void init_libxslt(void) #endif } +#endif /* HAVE_LIBXML2 */ + + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -230,12 +230,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) WARN("Failed to register callbacks\n"); schemasInit(); -#endif init_libxslt(); +#endif DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: if (reserved) break; +#ifdef HAVE_LIBXML2 #ifdef SONAME_LIBXSLT if (libxslt_handle) { @@ -243,7 +244,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) wine_dlclose(libxslt_handle, NULL, 0); } #endif -#ifdef HAVE_LIBXML2 /* Restore default Callbacks */ xmlCleanupInputCallbacks(); xmlRegisterDefaultInputCallbacks();

1 0

Alexandre Julliard : libwine: Use the argv[0] directory as bin directory only if all other methods fail.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 16c8ca8082c87621ea80203a482952f82188d267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c8ca8082c87621ea80203a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 12:34:44 2013 +0200 libwine: Use the argv[0] directory as bin directory only if all other methods fail. --- libs/wine/config.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index df5c33b..4e26212 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -152,16 +152,16 @@ static char *get_runtime_libdir(void) } /* return the directory that contains the main exe at run-time */ -static char *get_runtime_bindir( const char *argv0 ) +static char *get_runtime_exedir(void) { - char *p, *bindir, *cwd; - int len, size; - #ifdef EXE_LINK + char *p, *bindir; + int size; + for (size = 256; ; size *= 2) { int ret; - if (!(bindir = malloc( size ))) break; + if (!(bindir = malloc( size ))) return NULL; if ((ret = readlink( EXE_LINK, bindir, size )) == -1) break; if (ret != size) { @@ -175,6 +175,14 @@ static char *get_runtime_bindir( const char *argv0 ) } free( bindir ); #endif + return NULL; +} + +/* return the base directory from argv0 */ +static char *get_runtime_argvdir( const char *argv0 ) +{ + char *p, *bindir, *cwd; + int len, size; if (!(p = strrchr( argv0, '/' ))) return NULL; @@ -370,21 +378,32 @@ void wine_init_argv0_path( const char *argv0 ) if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; - bindir = get_runtime_bindir( argv0 ); - libdir = get_runtime_libdir(); - + bindir = get_runtime_exedir(); if (bindir && !is_valid_bindir( bindir )) { build_dir = running_from_build_dir( bindir ); free( bindir ); bindir = NULL; } + + libdir = get_runtime_libdir(); if (libdir && !bindir && !build_dir) { build_dir = running_from_build_dir( libdir ); if (!build_dir) bindir = build_path( libdir, LIB_TO_BINDIR ); } + if (!libdir && !bindir && !build_dir) + { + bindir = get_runtime_argvdir( argv0 ); + if (bindir && !is_valid_bindir( bindir )) + { + build_dir = running_from_build_dir( bindir ); + free( bindir ); + bindir = NULL; + } + } + if (build_dir) { argv0_name = build_path( "loader/", basename );

1 0

Alexandre Julliard : libwine: Don' t add a user id to the server directory if not supported.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 876189a405e18ae7229093c391583eeb1447c53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=876189a405e18ae7229093c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 12:43:07 2013 +0200 libwine: Don't add a user id to the server directory if not supported. --- libs/wine/config.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 4e26212..d8c46be 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -36,7 +36,7 @@ #include "wine/library.h" static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */ -static const char server_root_prefix[] = "/tmp/.wine-"; /* prefix for server root dir */ +static const char server_root_prefix[] = "/tmp/.wine"; /* prefix for server root dir */ static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */ static char *bindir; @@ -220,16 +220,18 @@ static char *get_runtime_argvdir( const char *argv0 ) /* initialize the server directory value */ static void init_server_dir( dev_t dev, ino_t ino ) { - char *p; + char *p, *root; + #ifdef HAVE_GETUID - const unsigned int uid = getuid(); + root = xmalloc( sizeof(server_root_prefix) + 12 ); + sprintf( root, "%s-%u", server_root_prefix, getuid() ); #else - const unsigned int uid = 0; + root = xstrdup( server_root_prefix ); #endif - server_dir = xmalloc( sizeof(server_root_prefix) + 32 + sizeof(server_dir_prefix) + - 2*sizeof(dev) + 2*sizeof(ino) ); - sprintf( server_dir, "%s%u%s", server_root_prefix, uid, server_dir_prefix ); + server_dir = xmalloc( strlen(root) + sizeof(server_dir_prefix) + 2*sizeof(dev) + 2*sizeof(ino) + 2 ); + strcpy( server_dir, root ); + strcat( server_dir, server_dir_prefix ); p = server_dir + strlen(server_dir); if (dev != (unsigned long)dev) @@ -241,6 +243,7 @@ static void init_server_dir( dev_t dev, ino_t ino ) sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); else sprintf( p, "%lx", (unsigned long)ino ); + free( root ); } /* retrieve the default dll dir */

1 0

Alexandre Julliard : libwine: Put the server directory inside the wineprefix on Android.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 2b2bf64d3bbcccb5f04a1c1c7c6cba7af1237b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2bf64d3bbcccb5f04a1c1c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 12:44:15 2013 +0200 libwine: Put the server directory inside the wineprefix on Android. --- libs/wine/config.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index d8c46be..3b5dd68 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -222,7 +222,9 @@ static void init_server_dir( dev_t dev, ino_t ino ) { char *p, *root; -#ifdef HAVE_GETUID +#ifdef __ANDROID__ /* there's no /tmp dir on Android */ + root = build_path( config_dir, ".wineserver" ); +#elif defined(HAVE_GETUID) root = xmalloc( sizeof(server_root_prefix) + 12 ); sprintf( root, "%s-%u", server_root_prefix, getuid() ); #else

1 0