wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Huw Davies : shell32/tests: Updated Windows 7 has a new IShellDispatch6 in its typelib.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: b670fc2c6df15696d74af6eff48ac112a996583a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b670fc2c6df15696d74af6eff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 30 11:28:04 2016 +0000 shell32/tests: Updated Windows 7 has a new IShellDispatch6 in its typelib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 70146cb..3f2d902 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -28,6 +28,8 @@ #include "winsvc.h" #include "wine/test.h" +#include "initguid.h" + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -38,6 +40,9 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static DWORD (WINAPI *pGetLongPathNameW)(LPCWSTR, LPWSTR, DWORD); +/* Updated Windows 7 has a new IShellDispatch6 in its typelib */ +DEFINE_GUID(IID_IWin7ShellDispatch6, 0x34936ba1, 0x67ad, 0x4c41, 0x99,0xb8, 0x8c,0x12,0xdf,0xf1,0xe9,0x74); + static void init_function_pointers(void) { HMODULE hshell32, hkernel32; @@ -530,6 +535,7 @@ static void test_ShellFolderViewDual(void) &IID_IShellDispatch5, &IID_IShellDispatch4, &IID_IShellDispatch2, + &IID_IWin7ShellDispatch6, &IID_NULL }; IShellFolderViewDual *viewdual;

1 0

Jacek Caban : rpcrt4: Acquire new credential handle for each connection.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: c32cd1119cbebe7a8afaf45815cee5cfa949274c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32cd1119cbebe7a8afaf4581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 12:09:12 2016 +0100 rpcrt4: Acquire new credential handle for each connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_message.c | 3 +++ dlls/rpcrt4/rpc_server.c | 28 ++++++++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 57781ce..9642213 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1063,7 +1063,10 @@ RPC_STATUS RPCRT4_ServerConnectionAuth(RpcConnection* conn, auth_data_in->auth_type, cred, exp, max_token, NULL, &conn->AuthInfo); if (status != RPC_S_OK) + { + FreeCredentialsHandle(&cred); return status; + } /* FIXME: should auth_data_in->auth_context_id be checked in the !start case? */ conn->auth_context_id = auth_data_in->auth_context_id; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index c3bc227..9e0426a 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1309,9 +1309,6 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) struct rpc_server_registered_auth_info { struct list entry; - TimeStamp exp; - BOOL cred_acquired; - CredHandle cred; USHORT auth_type; WCHAR *package_name; WCHAR *principal; @@ -1354,30 +1351,22 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( { RPC_STATUS status = RPC_S_UNKNOWN_AUTHN_SERVICE; struct rpc_server_registered_auth_info *auth_info; + SECURITY_STATUS sec_status; EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY(auth_info, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { if (auth_info->auth_type == auth_type) { - if (!auth_info->cred_acquired) + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, + SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, + cred, exp); + if (sec_status != SEC_E_OK) { - SECURITY_STATUS sec_status; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, - SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, - &auth_info->cred, &auth_info->exp); - if (sec_status != SEC_E_OK) - { - status = RPC_S_SEC_PKG_ERROR; - break; - } - - auth_info->cred_acquired = TRUE; + status = RPC_S_SEC_PKG_ERROR; + break; } - *cred = auth_info->cred; - *exp = auth_info->exp; *max_token = auth_info->max_token; status = RPC_S_OK; break; @@ -1395,8 +1384,7 @@ void RPCRT4_ServerFreeAllRegisteredAuthInfo(void) EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY_SAFE(auth_info, cursor2, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { - if (auth_info->cred_acquired) - FreeCredentialsHandle(&auth_info->cred); + HeapFree(GetProcessHeap(), 0, auth_info->package_name); HeapFree(GetProcessHeap(), 0, auth_info->principal); HeapFree(GetProcessHeap(), 0, auth_info); }

1 0

Jacek Caban : rpcrt4: Store security package name in rpc_server_registered_auth_info.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: da05dfd151153fda5731ddcdbcdb951354b5da56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da05dfd151153fda5731ddcdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 12:08:51 2016 +0100 rpcrt4: Store security package name in rpc_server_registered_auth_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 73e9742..c3bc227 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1312,9 +1312,10 @@ struct rpc_server_registered_auth_info TimeStamp exp; BOOL cred_acquired; CredHandle cred; - ULONG max_token; USHORT auth_type; + WCHAR *package_name; WCHAR *principal; + ULONG max_token; }; static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) @@ -1361,17 +1362,11 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( { if (!auth_info->cred_acquired) { - SecPkgInfoW *packages, *package; SECURITY_STATUS sec_status; - status = find_security_package(auth_info->auth_type, &packages, &package); - if (status != RPC_S_OK) - break; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, package->Name, + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, &auth_info->cred, &auth_info->exp); - FreeContextBuffer(packages); if (sec_status != SEC_E_OK) { status = RPC_S_SEC_PKG_ERROR; @@ -1437,6 +1432,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au { struct rpc_server_registered_auth_info *auth_info; SecPkgInfoW *packages, *package; + WCHAR *package_name; ULONG max_token; RPC_STATUS status; @@ -1446,20 +1442,27 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au if (status != RPC_S_OK) return status; + package_name = RPCRT4_strdupW(package->Name); max_token = package->cbMaxToken; FreeContextBuffer(packages); + if (!package_name) + return RPC_S_OUT_OF_RESOURCES; auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); - if (!auth_info) + if (!auth_info) { + HeapFree(GetProcessHeap(), 0, package_name); return RPC_S_OUT_OF_RESOURCES; + } if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + HeapFree(GetProcessHeap(), 0, package_name); HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; } - auth_info->max_token = max_token; auth_info->auth_type = AuthnSvc; + auth_info->package_name = package_name; + auth_info->max_token = max_token; EnterCriticalSection(&server_auth_info_cs); list_add_tail(&server_registered_auth_info, &auth_info->entry);

1 0

Daniel Lehman : wininet: Canonicalize URL in HttpOpenRequest.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: b3d12a16ce73c460166005f385530507b24e00dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d12a16ce73c460166005f38… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 26 12:17:17 2016 -0700 wininet: Canonicalize URL in HttpOpenRequest. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 ++++--- dlls/wininet/tests/http.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b51c6c9..b3c8e66 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3401,13 +3401,14 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if (lpszObjectName && *lpszObjectName) { HRESULT rc; + WCHAR dummy; - len = 0; - rc = UrlEscapeW(lpszObjectName, NULL, &len, URL_ESCAPE_SPACES_ONLY); + len = 1; + rc = UrlCanonicalizeW(lpszObjectName, &dummy, &len, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) len = strlenW(lpszObjectName)+1; request->path = heap_alloc(len*sizeof(WCHAR)); - rc = UrlEscapeW(lpszObjectName, request->path, &len, + rc = UrlCanonicalizeW(lpszObjectName, request->path, &len, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f2fe25c..9cda9c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2402,6 +2402,10 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof(okmsg)-1, 0); send(c, buffer, strlen(buffer), 0); } + if (strstr(buffer, "GET /test_remove_dot_segments")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4851,6 +4855,20 @@ static void test_long_url(int port) close_request(&req); } +static void test_remove_dot_segments(int port) +{ + test_request_t req; + BOOL ret; + + open_simple_request(&req, "localhost", port, NULL, "/A/../B/./C/../../test_remove_dot_segments"); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req.request, 200); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -4902,6 +4920,7 @@ static void test_http_connection(void) test_async_read(si.port); test_http_read(si.port); test_long_url(si.port); + test_remove_dot_segments(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Daniel Lehman : shlwapi: Remove dot segments for URLs starting with /.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 4eac6e84ba4b999c234215a28314074b9581266a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eac6e84ba4b999c234215a28… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 23 14:20:24 2016 -0800 shlwapi: Remove dot segments for URLs starting with /. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 9 +++++++++ dlls/shlwapi/url.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 2cb6fea..f9fc79a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -193,6 +193,15 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"res://c:\\tests/res\\foo%20bar/strange\\sth", 0, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_FILE_USE_PATHURL, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_UNESCAPE, S_OK, "res://c:\\tests/res\\foo bar/strange\\sth", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", 0, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_FILE_USE_PATHURL, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_WININET_COMPATIBILITY, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/B\\C/D\\E", 0, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_FILE_USE_PATHURL, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_WININET_COMPATIBILITY, S_OK, "/A/B\\C/D\\E", FALSE}, + {"///A/../B", 0, S_OK, "///B", FALSE}, + {"///A/../B", URL_FILE_USE_PATHURL, S_OK, "///B", FALSE}, + {"///A/../B", URL_WININET_COMPATIBILITY, S_OK, "///B", FALSE}, {"A", 0, S_OK, "A", FALSE}, {"../A", 0, S_OK, "../A", FALSE}, {"A/../B", 0, S_OK, "B", TRUE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 879a734..2caf998 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -372,6 +372,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, dwFlags |= URL_ESCAPE_UNSAFE; state = 5; is_file_url = TRUE; + } else if(url[0] == '/') { + state = 5; + is_file_url = TRUE; } while (*wk1) {

1 0

Hans Leidekker : winhttp/tests: Properly restore proxy settings on 64-bit.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 2b09cfe9288cbd23fe78952e605fdca924a4d19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b09cfe9288cbd23fe78952e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 30 10:58:57 2016 +0100 winhttp/tests: Properly restore proxy settings on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 61c4acf..1b9ccc4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1217,21 +1217,28 @@ static DWORD get_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD *type ) return ret; } -static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +static void set_proxy( REGSAM access, BYTE *buf, DWORD len, DWORD type ) { - LONG l; - HKEY key; + HKEY hkey; + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, access, NULL, &hkey, NULL )) + { + if (len) RegSetValueExW( hkey, WinHttpSettings, 0, type, buf, len ); + else RegDeleteValueW( hkey, WinHttpSettings ); + RegCloseKey( hkey ); + } +} - l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL ); - if (!l) +static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +{ + BOOL wow64; + IsWow64Process( GetCurrentProcess(), &wow64 ); + if (sizeof(void *) > sizeof(int) || wow64) { - if (len) - RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); - else - RegDeleteValueW( key, WinHttpSettings ); - RegCloseKey( key ); + set_proxy( KEY_WRITE|KEY_WOW64_64KEY, buf, len, type ); + set_proxy( KEY_WRITE|KEY_WOW64_32KEY, buf, len, type ); } + else + set_proxy( KEY_WRITE, buf, len, type ); } static void test_set_default_proxy_config(void)

1 0

Francois Gouget : testbot/TestAgent: Fix SIGALRM handling in _SetError().
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: tools Branch: master Commit: 908ce0ec07f18791d7568d062a6394baeea0368b URL: http://source.winehq.org/git/tools.git/?a=commit;h=908ce0ec07f18791d7568d06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 30 09:01:03 2016 +0100 testbot/TestAgent: Fix SIGALRM handling in _SetError(). SIGALRM must always be caught otherwise the script dies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index da10672..b0e59d1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -214,6 +214,7 @@ sub _SetError($$$) my $ncerr; eval { + local $SIG{ALRM} = sub { die "timeout" }; alarm(2); $self->{fd}->read($ncerr, 1024, 1); alarm(0);

1 0

Lauri Kenttä : shell32: Cosmetic changes to file type names.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 1c3d6ab9ccc6a572f48c63ac220c0a89dd5b450d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3d6ab9ccc6a572f48c63ac2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Nov 29 20:23:59 2016 +0200 shell32: Cosmetic changes to file type names. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 13 ++++++++----- dlls/shell32/shell32_main.c | 23 ++++++++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 1856c12..c3a753a 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2408,15 +2408,18 @@ void _ILGetFileType(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize) { char sTemp[64]; - if(uOutSize > 0) - pOut[0] = 0; - if (_ILGetExtension (pidl, sTemp, 64)) + /* "name" or "name." or any unhandled => "File" */ + lstrcpynA (pOut, "File", uOutSize); + + /* If there's space for more, try to get a better description. */ + if (uOutSize > 6 && _ILGetExtension (pidl, sTemp, 64)) { if (!( HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE) - && HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE ))) + && HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE )) + && sTemp[0]) { lstrcpynA (pOut, sTemp, uOutSize - 6); - strcat (pOut, "-file"); + strcat (pOut, " file"); } } } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index dce1896..7e1c7d5 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -537,8 +537,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get the type name */ if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME)) { + static const WCHAR szFolder[] = { 'F','o','l','d','e','r',0 }; static const WCHAR szFile[] = { 'F','i','l','e',0 }; - static const WCHAR szDashFile[] = { '-','f','i','l','e',0 }; + static const WCHAR szSpaceFile[] = { ' ','f','i','l','e',0 }; if (!(flags & SHGFI_USEFILEATTRIBUTES) || (flags & SHGFI_PIDL)) { @@ -550,17 +551,29 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, else { if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - strcatW (psfi->szTypeName, szFile); + strcatW (psfi->szTypeName, szFolder); else { WCHAR sTemp[64]; lstrcpyW(sTemp,PathFindExtensionW(szFullPath)); - if (!( HCR_MapTypeToValueW(sTemp, sTemp, 64, TRUE) && + if (sTemp[0] == 0 || (sTemp[0] == '.' && sTemp[1] == 0)) + { + /* "name" or "name." => "File" */ + lstrcpynW (psfi->szTypeName, szFile, 64); + } + else if (!( HCR_MapTypeToValueW(sTemp, sTemp, 64, TRUE) && HCR_MapTypeToValueW(sTemp, psfi->szTypeName, 80, FALSE ))) { - lstrcpynW (psfi->szTypeName, sTemp, 64); - strcatW (psfi->szTypeName, szDashFile); + if (sTemp[0]) + { + lstrcpynW (psfi->szTypeName, sTemp, 64); + strcatW (psfi->szTypeName, szSpaceFile); + } + else + { + lstrcpynW (psfi->szTypeName, szFile, 64); + } } } }

1 0

Bruno Jesus : ws2_32/tests: Add IDN resolution tests for GetAddrInfoW.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 590c908088a408febac3ca8ff420762fbcd0fe29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=590c908088a408febac3ca8ff… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 29 15:23:14 2016 -0200 ws2_32/tests: Add IDN resolution tests for GetAddrInfoW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ include/ws2tcpip.h | 2 ++ 2 files changed, 79 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 80425c9..049213a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6811,6 +6811,11 @@ static void test_GetAddrInfoW(void) ADDRINFOW *result, *result2, *p, hint; WCHAR name[256]; DWORD size = sizeof(name)/sizeof(WCHAR); + /* te su to.winehq.org written in katakana */ + static const WCHAR idn_domain[] = + {0x30C6,0x30B9,0x30C8,'.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR idn_punycode[] = + {'x','n','-','-','z','c','k','z','a','h','.','w','i','n','e','h','q','.','o','r','g',0}; if (!pGetAddrInfoW || !pFreeAddrInfoW) { @@ -6993,6 +6998,78 @@ static void test_GetAddrInfoW(void) ok(0, "test %d: GetAddrInfoW failed with %d (err %d)\n", i, ret, err); } } + + /* Test IDN resolution (Internationalized Domain Names) present since Windows 8 */ + trace("Testing punycode IDN %s\n", wine_dbgstr_w(idn_punycode)); + result = NULL; + ret = pGetAddrInfoW(idn_punycode, NULL, NULL, &result); + ok(!ret, "got %d expected success\n", ret); + ok(result != NULL, "got %p\n", result); + pFreeAddrInfoW(result); + + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = 0; + + result = NULL; + ret = pGetAddrInfoW(idn_punycode, NULL, &hint, &result); + ok(!ret, "got %d expected success\n", ret); + ok(result != NULL, "got %p\n", result); + + trace("Testing unicode IDN %s\n", wine_dbgstr_w(idn_domain)); + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, NULL, &result2); + if (ret == WSAHOST_NOT_FOUND && broken(1)) + { + pFreeAddrInfoW(result); + win_skip("IDN resolution not supported in Win <= 7\n"); + return; + } +todo_wine { + ok(!ret, "got %d expected success\n", ret); + ok(result2 != NULL, "got %p\n", result2); + pFreeAddrInfoW(result2); + + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = 0; + + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, &hint, &result2); + ok(!ret, "got %d expected success\n", ret); + ok(result2 != NULL, "got %p\n", result2); + + /* ensure manually resolved punycode and unicode hosts result in same data */ + compare_addrinfow(result, result2); + + pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); + + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = 0; + + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, &hint, &result2); + ok(!ret, "got %d expected success\n", ret); + ok(result2 != NULL, "got %p\n", result2); + pFreeAddrInfoW(result2); +} + /* Disable IDN resolution and test again*/ + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = AI_DISABLE_IDN_ENCODING; + + SetLastError(0xdeadbeef); + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, &hint, &result2); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result2 == NULL, "got %p\n", result2); } static void test_getaddrinfo(void) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index ef460a8..e14a660 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -69,6 +69,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define AI_NON_AUTHORITATIVE 0x00004000 # define AI_SECURE 0x00008000 # define AI_RETURN_PREFERRED_NAMES 0x00010000 +# define AI_DISABLE_IDN_ENCODING 0x00080000 /* getaddrinfo error codes */ # define EAI_AGAIN WSATRY_AGAIN # define EAI_BADFLAGS WSAEINVAL @@ -89,6 +90,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_AI_NON_AUTHORITATIVE 0x00004000 # define WS_AI_SECURE 0x00008000 # define WS_AI_RETURN_PREFERRED_NAMES 0x00010000 +# define WS_AI_DISABLE_IDN_ENCODING 0x00080000 /* getaddrinfo error codes */ # define WS_EAI_AGAIN WSATRY_AGAIN # define WS_EAI_BADFLAGS WSAEINVAL

1 0

Ken Thomases : gdi32: Get the font URL directly from the descriptor on macOS 10.6 and later.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: d684831f4a6c420e76f4ba9dc5a2e6d033e555c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d684831f4a6c420e76f4ba9dc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 11:22:32 2016 -0600 gdi32: Get the font URL directly from the descriptor on macOS 10.6 and later. It's significantly faster than the roundabout way that's necessary for 10.5, which is especially important for users with many fonts installed. Issue identified by Andrew Eikum. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0e82e5e..a5147b5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2933,33 +2933,40 @@ static void load_mac_fonts(void) for (i = 0; i < CFArrayGetCount(descs); i++) { CTFontDescriptorRef desc; - CTFontRef font; - ATSFontRef atsFont; - OSStatus status; - FSRef fsref; CFURLRef url; CFStringRef ext; CFStringRef path; desc = CFArrayGetValueAtIndex(descs, i); - /* CTFontDescriptor doesn't support kCTFontURLAttribute until 10.6, so +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute); +#else + /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ - font = CTFontCreateWithFontDescriptor(desc, 0, NULL); - if (!font) continue; - - atsFont = CTFontGetPlatformFont(font, NULL); - if (!atsFont) { - CFRelease(font); - continue; - } + CTFontRef font; + ATSFontRef atsFont; + OSStatus status; + FSRef fsref; - status = ATSFontGetFileReference(atsFont, &fsref); - CFRelease(font); - if (status != noErr) continue; + font = CTFontCreateWithFontDescriptor(desc, 0, NULL); + if (!font) continue; - url = CFURLCreateFromFSRef(NULL, &fsref); + atsFont = CTFontGetPlatformFont(font, NULL); + if (!atsFont) + { + CFRelease(font); + continue; + } + + status = ATSFontGetFileReference(atsFont, &fsref); + CFRelease(font); + if (status != noErr) continue; + + url = CFURLCreateFromFSRef(NULL, &fsref); + } +#endif if (!url) continue; ext = CFURLCopyPathExtension(url);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016