Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[akhaldi] 74197: [WINHTTP] Sync with Wine Staging 2.2. CORE-12823 6053db9 winhttp: Fix handling of Accept headers. c43dd19 winhttp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. 5b9beca...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 17:04:32 2017 New Revision: 74197 URL: http://svn.reactos.org/svn/reactos?rev=74197&view=rev Log: [WINHTTP] Sync with Wine Staging 2.2. CORE-12823 6053db9 winhttp: Fix handling of Accept headers. c43dd19 winhttp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. 5b9beca winhttp: Fix some spec file entries. 542998e winhttp: Accept NULL buffer for size queries in WinHttpCreateUrl. ec35394 winhttp: Handle EINTR from connect and poll. 613e239 winhttp: Use return value of sprintf() instead of calling strlen() and simplify code. Modified: trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/winhttp/session.c trunk/reactos/dll/win32/winhttp/url.c trunk/reactos/dll/win32/winhttp/winhttp.spec trunk/reactos/dll/win32/winhttp/winhttp_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -366,7 +366,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { BOOL ret = FALSE; - int res = 0; + int res; ULONG state; if (timeout > 0) @@ -374,37 +374,59 @@ state = 1; ioctlsocket( conn->socket, FIONBIO, &state ); } - if (connect( conn->socket, sockaddr, addr_len ) < 0) - { - res = sock_get_error( errno ); - if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) + + for (;;) + { + res = 0; + if (connect( conn->socket, sockaddr, addr_len ) < 0) { + res = sock_get_error( errno ); + if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) + { #ifdef __REACTOS__ - /* ReactOS: use select instead of poll */ - fd_set outfd; - struct timeval tv; - - FD_ZERO(&outfd); - FD_SET(conn->socket, &outfd); - - tv.tv_sec = 0; - tv.tv_usec = timeout * 1000; - - if (select( 0, NULL, &outfd, NULL, &tv ) > 0) + /* ReactOS: use select instead of poll */ + fd_set outfd; + struct timeval tv; + + FD_ZERO(&outfd); + FD_SET(conn->socket, &outfd); + + tv.tv_sec = 0; + tv.tv_usec = timeout * 1000; + for (;;) + { + res = 0; + + if (select( 0, NULL, &outfd, NULL, &tv ) > 0) #else - struct pollfd pfd; - - pfd.fd = conn->socket; - pfd.events = POLLOUT; - if (poll( &pfd, 1, timeout ) > 0) -#endif - ret = TRUE; - else - res = sock_get_error( errno ); - } - } - else - ret = TRUE; + struct pollfd pfd; + + pfd.fd = conn->socket; + pfd.events = POLLOUT; + for (;;) + { + res = 0; + if (poll( &pfd, 1, timeout ) > 0) +#endif + { + ret = TRUE; + break; + } + else + { + res = sock_get_error( errno ); + if (res != WSAEINTR) break; + } + } + } + if (res != WSAEINTR) break; + } + else + { + ret = TRUE; + break; + } + } if (timeout > 0) { state = 0; Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -392,7 +392,7 @@ return TRUE; } -static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) +BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) { int index; header_t hdr; @@ -1119,15 +1119,10 @@ WCHAR *req = NULL; char *req_ascii; int bytes_sent; - DWORD len, i, flags; + DWORD len; clear_response_headers( request ); - flags = WINHTTP_ADDREQ_FLAG_ADD|WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; - for (i = 0; i < request->num_accept_types; i++) - { - process_header( request, attr_accept, request->accept_types[i], flags, TRUE ); - } if (session->agent) process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); Modified: trunk/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/session.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -577,8 +577,6 @@ heap_free( request->headers[i].value ); } heap_free( request->headers ); - for (i = 0; i < request->num_accept_types; i++) heap_free( request->accept_types[i] ); - heap_free( request->accept_types ); for (i = 0; i < TARGET_MAX; i++) { for (j = 0; j < SCHEME_MAX; j++) @@ -1001,32 +999,14 @@ static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) { + static const WCHAR attr_accept[] = {'A','c','c','e','p','t',0}; + static const DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; const WCHAR **types = accept_types; - DWORD i; if (!types) return TRUE; while (*types) { - request->num_accept_types++; - types++; - } - if (!request->num_accept_types) return TRUE; - if (!(request->accept_types = heap_alloc( request->num_accept_types * sizeof(WCHAR *)))) - { - request->num_accept_types = 0; - return FALSE; - } - types = accept_types; - for (i = 0; i < request->num_accept_types; i++) - { - if (!(request->accept_types[i] = strdupW( *types ))) - { - for ( ; i > 0; --i) heap_free( request->accept_types[i - 1] ); - heap_free( request->accept_types ); - request->accept_types = NULL; - request->num_accept_types = 0; - return FALSE; - } + process_header( request, attr_accept, *types, flags, TRUE ); types++; } return TRUE; Modified: trunk/reactos/dll/win32/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -387,8 +387,7 @@ { WCHAR port[sizeof("65535")]; - sprintfW( port, formatW, uc->nPort ); - *len += strlenW( port ); + *len += sprintfW( port, formatW, uc->nPort ); *len += 1; /* ":" */ } if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */ @@ -405,13 +404,12 @@ { static const WCHAR formatW[] = {'%','u',0}; static const WCHAR twoslashW[] = {'/','/'}; - DWORD len; INTERNET_SCHEME scheme; TRACE("%p, 0x%08x, %p, %p\n", uc, flags, url, required); - if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required || !url) + if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -423,6 +421,11 @@ { *required = len + 1; set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (!url) + { + set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -484,15 +487,10 @@ if (!uses_default_port( scheme, uc->nPort )) { - WCHAR port[sizeof("65535")]; - - sprintfW( port, formatW, uc->nPort ); *url = ':'; url++; - len = strlenW( port ); - memcpy( url, port, len * sizeof(WCHAR) ); - url += len; + url += sprintfW( url, formatW, uc->nPort ); } /* add slash between hostname and path if necessary */ Modified: trunk/reactos/dll/win32/winhttp/winhttp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp.spec [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -20,11 +20,11 @@ @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) -@ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) +@ stdcall WinHttpSendRequest(ptr wstr long ptr long long long) @ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @ stdcall WinHttpSetOption(ptr long ptr long) -@ stdcall WinHttpSetStatusCallback(ptr ptr long ptr) +@ stdcall WinHttpSetStatusCallback(ptr ptr long long) @ stdcall WinHttpSetTimeouts(ptr long long long long) @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr) Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -222,8 +222,6 @@ char read_buf[8192]; /* buffer for already read but not returned data */ header_t *headers; DWORD num_headers; - WCHAR **accept_types; - DWORD num_accept_types; struct authinfo *authinfo; struct authinfo *proxy_authinfo; HANDLE task_wait; @@ -318,25 +316,27 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; +BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) DECLSPEC_HIDDEN; + extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); } -static inline void *heap_alloc_zero( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); } -static inline void *heap_realloc( LPVOID mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), 0, mem, size ); } -static inline void *heap_realloc_zero( LPVOID mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 17:04:32 2017 @@ -200,7 +200,7 @@ reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.2 reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/winhttp # Synced to WineStaging-1.9.23 +reactos/dll/win32/winhttp # Synced to WineStaging-2.2 reactos/dll/win32/wininet # Synced to WineStaging-2.2 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628

7 years, 6 months

[akhaldi] 74196: [URLMON_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 16:58:47 2017 New Revision: 74196 URL: http://svn.reactos.org/svn/reactos?rev=74196&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/sec_mgr.c trunk/rostests/winetests/urlmon/uri.c trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sun Mar 19 16:58:47 2017 @@ -1121,6 +1121,12 @@ static HRESULT WINAPI MimeProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + *ppv = iface; + return S_OK; + } + ok(0, "unexpected call\n"); return E_NOTIMPL; } Modified: trunk/rostests/winetests/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.… ============================================================================== --- trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] Sun Mar 19 16:58:47 2017 @@ -766,7 +766,7 @@ {"wine.testing",NULL,"*",URLZONE_CUSTOM2} }; -static void register_zone_domains(void) +static BOOL register_zone_domains(void) { HKEY domains; DWORD res, i; @@ -779,6 +779,12 @@ DWORD zone = URLZONE_CUSTOM; res = RegCreateKeyA(domains, "local.machine", &domain); + if (res == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + RegCloseKey(domains); + return FALSE; + } ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); res = RegSetValueExA(domain, "http", 0, REG_DWORD, (BYTE*)&zone, sizeof(DWORD)); @@ -818,6 +824,7 @@ } RegCloseKey(domains); + return TRUE; } static void unregister_zone_domains(void) @@ -972,7 +979,7 @@ test_zone_domain_cache(); - register_zone_domains(); + if (!register_zone_domains()) return; run_child_process(); unregister_zone_domains(); } Modified: trunk/rostests/winetests/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] Sun Mar 19 16:58:47 2017 @@ -122,6 +122,8 @@ HRESULT expected; BOOL todo; const char* broken_value; + const char* value2; + HRESULT expected2; } uri_str_property; typedef struct _uri_dword_property { @@ -1964,15 +1966,40 @@ {"http://google.com.uk/",S_OK,FALSE}, {"google.com.uk",S_OK,FALSE}, {"http://google.com.uk/",S_OK,FALSE}, + {"google.com.uk",S_OK,FALSE,NULL,"com.uk",S_OK}, /* cf. google.co.uk below */ + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, {"google.com.uk",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"",S_FALSE,FALSE}, - {"google.com.uk",S_OK,FALSE}, - {"",S_FALSE,FALSE}, {"/",S_OK,FALSE}, {"/",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"http://google.com.uk",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {80,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "http://google.co.uk", 0, S_OK, FALSE, + { + {"http://google.co.uk/",S_OK,FALSE}, + {"google.co.uk",S_OK,FALSE}, + {"http://google.co.uk/",S_OK,FALSE}, + {"google.co.uk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"google.co.uk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,FALSE}, + {"/",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"http://google.co.uk",S_OK,FALSE}, {"http",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE} @@ -2014,7 +2041,7 @@ {"http://google.uk.1/",S_OK,FALSE}, {"google.uk.1",S_OK,FALSE}, {"http://google.uk.1/",S_OK,FALSE}, - {"google.uk.1",S_OK,FALSE}, + {"google.uk.1",S_OK,FALSE,NULL,"uk.1",S_OK}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, {"google.uk.1",S_OK,FALSE}, @@ -2090,7 +2117,7 @@ {"http://.uk/",S_OK,FALSE}, {".uk",S_OK,FALSE}, {"http://.uk/",S_OK,FALSE}, - {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE,NULL,".uk",S_OK}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, {".uk",S_OK,FALSE}, @@ -2115,7 +2142,7 @@ {"http://www.co.google.com.[]/",S_OK,FALSE}, {"www.co.google.com.[]",S_OK,FALSE}, {"http://www.co.google.com.[]/",S_OK,FALSE}, - {"google.com.[]",S_OK,FALSE}, + {"google.com.[]",S_OK,FALSE,NULL,"com.[]",S_OK}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, {"www.co.google.com.[]",S_OK,FALSE}, @@ -7325,6 +7352,7 @@ const char *property; HRESULT expected; BOOL todo; + const char *property2; } uri_parse_test; static const uri_parse_test uri_parse_tests[] = { @@ -7388,7 +7416,7 @@ {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE}, /* PARSE_DOMAIN tests. */ - {"http://google.com.uk/",0,PARSE_DOMAIN,0,"google.com.uk",S_OK,FALSE}, + {"http://google.com.uk/",0,PARSE_DOMAIN,0,"google.com.uk",S_OK,FALSE,"com.uk"}, {"http://google.com.com/",0,PARSE_DOMAIN,0,"com.com",S_OK,FALSE}, {"test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOMAIN,0,"",S_OK,FALSE}, {"file://server/test",0,PARSE_DOMAIN,0,"",S_OK,FALSE}, @@ -7410,6 +7438,11 @@ } return ret; +} + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); } static inline BOOL heap_free(void* mem) { @@ -7617,9 +7650,12 @@ hr = IUri_GetPropertyBSTR(uri, j, &received, 0); todo_wine_if(prop.todo) { - ok(hr == prop.expected, "GetPropertyBSTR returned 0x%08x, expected 0x%08x. On uri_tests[%d].str_props[%d].\n", + ok(hr == prop.expected || + (prop.value2 && hr == prop.expected2), + "GetPropertyBSTR returned 0x%08x, expected 0x%08x. On uri_tests[%d].str_props[%d].\n", hr, prop.expected, i, j); - ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), + ok(!strcmp_aw(prop.value, received) || (prop.value2 && !strcmp_aw(prop.value2, received)) || + broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), "Expected %s but got %s on uri_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } @@ -7802,9 +7838,11 @@ prop = test.str_props[Uri_PROPERTY_DOMAIN]; hr = IUri_GetDomain(uri, &received); todo_wine_if(prop.todo) { - ok(hr == prop.expected, "Error: GetDomain returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + ok(hr == prop.expected || (prop.value2 && hr == prop.expected2), + "Error: GetDomain returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", hr, prop.expected, i); - ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n", + ok(!strcmp_aw(prop.value, received) || (prop.value2 && !strcmp_aw(prop.value2, received)), + "Error: Expected %s but got %s on uri_tests[%d].\n", prop.value, wine_dbgstr_w(received), i); } SysFreeString(received); @@ -8082,9 +8120,11 @@ hr = IUri_GetPropertyLength(uri, j, &receivedLen, 0); todo_wine_if(prop.todo) { - ok(hr == prop.expected, "Error: GetPropertyLength returned 0x%08x, expected 0x%08x on uri_tests[%d].str_props[%d].\n", + ok(hr == prop.expected || (prop.value2 && hr == prop.expected2), + "Error: GetPropertyLength returned 0x%08x, expected 0x%08x on uri_tests[%d].str_props[%d].\n", hr, prop.expected, i, j); - ok(receivedLen == expectedLen || broken(prop.broken_value && receivedLen == lstrlenA(prop.broken_value)), + ok(receivedLen == expectedLen || (prop.value2 && receivedLen == lstrlenA(prop.value2)) || + broken(prop.broken_value && receivedLen == lstrlenA(prop.broken_value)), "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n", expectedLen, receivedLen, i, j); } @@ -8097,18 +8137,25 @@ } } -static DWORD compute_expected_props(uri_properties *test) +static DWORD compute_expected_props(uri_properties *test, DWORD *mask) { DWORD ret = 0, i; + + *mask = 0; for(i=Uri_PROPERTY_STRING_START; i <= Uri_PROPERTY_STRING_LAST; i++) { if(test->str_props[i-Uri_PROPERTY_STRING_START].expected == S_OK) ret |= 1<<i; + if(test->str_props[i-Uri_PROPERTY_STRING_START].value2 == NULL || + test->str_props[i-Uri_PROPERTY_STRING_START].expected == + test->str_props[i-Uri_PROPERTY_STRING_START].expected2) + *mask |= 1<<i; } for(i=Uri_PROPERTY_DWORD_START; i <= Uri_PROPERTY_DWORD_LAST; i++) { if(test->dword_props[i-Uri_PROPERTY_DWORD_START].expected == S_OK) ret |= 1<<i; + *mask |= 1<<i; } return ret; @@ -8138,20 +8185,22 @@ ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, test.create_expected); if(SUCCEEDED(hr)) { - DWORD received = 0, expected_props; + DWORD received = 0, expected_props, mask; DWORD j; hr = IUri_GetProperties(uri, &received); ok(hr == S_OK, "Error: GetProperties returned 0x%08x, expected 0x%08x.\n", hr, S_OK); - expected_props = compute_expected_props(&test); + expected_props = compute_expected_props(&test, &mask); for(j = 0; j <= Uri_PROPERTY_DWORD_LAST; ++j) { /* (1 << j) converts a Uri_PROPERTY to its corresponding Uri_HAS_* flag mask. */ - if(expected_props & (1 << j)) - ok(received & (1 << j), "Error: Expected flag for property %d on uri_tests[%d].\n", j, i); - else - ok(!(received & (1 << j)), "Error: Received flag for property %d when not expected on uri_tests[%d].\n", j, i); + if(mask & (1 << j)) { + if(expected_props & (1 << j)) + ok(received & (1 << j), "Error: Expected flag for property %d on uri_tests[%d].\n", j, i); + else + ok(!(received & (1 << j)), "Error: Received flag for property %d when not expected on uri_tests[%d].\n", j, i); + } } } @@ -8186,9 +8235,9 @@ ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, test.create_expected); if(SUCCEEDED(hr)) { - DWORD expected_props, j; - - expected_props = compute_expected_props(&test); + DWORD expected_props, j, mask; + + expected_props = compute_expected_props(&test, &mask); for(j = 0; j <= Uri_PROPERTY_DWORD_LAST; ++j) { /* Assign -1, then explicitly test for TRUE or FALSE later. */ @@ -8198,10 +8247,12 @@ ok(hr == S_OK, "Error: HasProperty returned 0x%08x, expected 0x%08x for property %d on uri_tests[%d].\n", hr, S_OK, j, i); - if(expected_props & (1 << j)) { - ok(received == TRUE, "Error: Expected to have property %d on uri_tests[%d].\n", j, i); - } else { - ok(received == FALSE, "Error: Wasn't expecting to have property %d on uri_tests[%d].\n", j, i); + if(mask & (1 << j)) { + if(expected_props & (1 << j)) { + ok(received == TRUE, "Error: Expected to have property %d on uri_tests[%d].\n", j, i); + } else { + ok(received == FALSE, "Error: Wasn't expecting to have property %d on uri_tests[%d].\n", j, i); + } } } } @@ -10410,7 +10461,9 @@ HRESULT hr; IUri *uri = NULL; WCHAR tmp[3]; + WCHAR *longurl, *copy; DWORD result = -1; + DWORD i, len; hr = pCoInternetParseIUri(NULL, PARSE_CANONICALIZE, 0, tmp, 3, &result, 0); ok(hr == E_INVALIDARG, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", @@ -10466,6 +10519,33 @@ expected_len, result); } if(uri) IUri_Release(uri); + + /* a long url that causes a crash on Wine */ + len = INTERNET_MAX_URL_LENGTH*2; + longurl = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(longurl, http_urlW, sizeof(http_urlW)); + for(i = sizeof(http_urlW)/sizeof(WCHAR)-1; i < len; i++) + longurl[i] = 'x'; + longurl[len] = 0; + + copy = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(copy, longurl, (len+1)*sizeof(WCHAR)); + + hr = pCreateUri(longurl, 0, 0, &uri); + ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = -1; + memset(longurl, 0xcc, len*sizeof(WCHAR)); + hr = pCoInternetParseIUri(uri, PARSE_CANONICALIZE, 0, longurl, len+1, &result, 0); + ok(SUCCEEDED(hr), "Error: CoInternetParseIUri returned 0x%08x.\n", hr); + ok(!lstrcmpW(longurl, copy), "Error: expected long url '%s' but was '%s'.\n", + wine_dbgstr_w(copy), wine_dbgstr_w(longurl)); + ok(result == len, "Error: Expected 'result' to be %d, but was %d instead.\n", + len, result); + } + heap_free(longurl); + heap_free(copy); + if(uri) IUri_Release(uri); } static void test_CoInternetParseIUri(void) { @@ -10491,10 +10571,10 @@ hr, test.expected, i); if(SUCCEEDED(hr)) { DWORD len = lstrlenA(test.property); - ok(!strcmp_aw(test.property, result), + ok(!strcmp_aw(test.property, result) || (test.property2 && !strcmp_aw(test.property2, result)), "Error: Expected %s but got %s instead on uri_parse_tests[%d].\n", test.property, wine_dbgstr_w(result), i); - ok(len == result_len, + ok(len == result_len || (test.property2 && lstrlenA(test.property2) == result_len), "Error: Expected %d, but got %d instead on uri_parse_tests[%d].\n", len, result_len, i); } else { Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Sun Mar 19 16:58:47 2017 @@ -1957,6 +1957,31 @@ return S_OK; } +static void test_stream_seek(IStream *stream) +{ + ULARGE_INTEGER new_pos; + LARGE_INTEGER pos; + HRESULT hres; + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, STREAM_SEEK_SET, &new_pos); + ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(!new_pos.QuadPart, "new_pos.QuadPart != 0\n"); + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, STREAM_SEEK_END, &new_pos); + ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(new_pos.QuadPart, "new_pos.QuadPart = 0\n"); + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, 100, &new_pos); + ok(hres == E_FAIL, "Seek failed: %08x\n", hres); + ok(new_pos.QuadPart == 0xdeadbeef, "unexpected new_pos.QuadPart\n"); +} + static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { @@ -2003,24 +2028,28 @@ ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); switch(pstgmed->tymed) { - case TYMED_ISTREAM: + case TYMED_ISTREAM: { + IStream *stream = U(*pstgmed).pstm; + + ok(stream != NULL, "U(*pstgmed).pstm == NULL\n"); + if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) { STATSTG stat; - hres = IStream_Write(U(*pstgmed).pstm, buf, 10, NULL); + hres = IStream_Write(stream, buf, 10, NULL); ok(hres == STG_E_ACCESSDENIED, "Write failed: %08x, expected STG_E_ACCESSDENIED\n", hres); - hres = IStream_Commit(U(*pstgmed).pstm, 0); + hres = IStream_Commit(stream, 0); ok(hres == E_NOTIMPL, "Commit failed: %08x, expected E_NOTIMPL\n", hres); - hres = IStream_Revert(U(*pstgmed).pstm); + hres = IStream_Revert(stream); ok(hres == E_NOTIMPL, "Revert failed: %08x, expected E_NOTIMPL\n", hres); - hres = IStream_Stat(U(*pstgmed).pstm, NULL, STATFLAG_NONAME); + hres = IStream_Stat(stream, NULL, STATFLAG_NONAME); ok(hres == E_FAIL, "hres = %x\n", hres); if(use_cache_file && emulate_protocol) { - hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_DEFAULT); + hres = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); ok(hres == S_OK, "hres = %x\n", hres); ok(!lstrcmpW(stat.pwcsName, cache_file_name), "stat.pwcsName = %s, cache_file_name = %s\n", @@ -2029,7 +2058,7 @@ ok(U(stat.cbSize).LowPart == (bindf&BINDF_ASYNCHRONOUS?0:6500), "stat.cbSize.LowPart = %u\n", U(stat.cbSize).LowPart); } else { - hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_NONAME); + hres = IStream_Stat(stream, &stat, STATFLAG_NONAME); ok(hres == S_OK, "hres = %x\n", hres); ok(!stat.pwcsName || broken(stat.pwcsName!=NULL), "stat.pwcsName = %s\n", wine_dbgstr_w(stat.pwcsName)); @@ -2042,17 +2071,19 @@ ok(stat.reserved == 0, "stat.reserved = %x\n", stat.reserved); } - ok(U(*pstgmed).pstm != NULL, "U(*pstgmed).pstm == NULL\n"); if(callback_read) { do { - hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + hres = IStream_Read(stream, buf, 512, &readed); if(test_protocol == HTTP_TEST && emulate_protocol && readed) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } + + if(use_cache_file && (grfBSCF & BSCF_FIRSTDATANOTIFICATION) && !(bindf & BINDF_PULLDATA)) + test_stream_seek(stream); break; - + } case TYMED_FILE: if(test_protocol == FILE_TEST) ok(!lstrcmpW(pstgmed->u.lpszFileName, file_url+7),

7 years, 6 months

[akhaldi] 74195: [URLMON] Sync with Wine Staging 2.2. CORE-12823 1b04cf1 urlmon: Remove 'stub' from implemented functions trace message. 8f23a89 urlmon: Fix FindMimeFromData spec file entry. 32671b...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 16:57:50 2017 New Revision: 74195 URL: http://svn.reactos.org/svn/reactos?rev=74195&view=rev Log: [URLMON] Sync with Wine Staging 2.2. CORE-12823 1b04cf1 urlmon: Remove 'stub' from implemented functions trace message. 8f23a89 urlmon: Fix FindMimeFromData spec file entry. 32671b1 urlmon: Added Seek implementations for streams using cache file. aa2ed73 urlmon: Correctly handle INTERNET_STATUS_REQUEST_COMPLETE notification with no data available. 22b4599 urlmon: Fix buffer overflow in parse_canonicalize. Modified: trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/internet.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Sun Mar 19 16:57:50 2017 @@ -512,8 +512,40 @@ DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); - return E_NOTIMPL; + LARGE_INTEGER new_pos; + DWORD method; + + TRACE("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + + if(This->buf->file == INVALID_HANDLE_VALUE) { + /* We should probably call protocol handler's Seek. */ + FIXME("no cache file, not supported\n"); + return E_FAIL; + } + + switch(dwOrigin) { + case STREAM_SEEK_SET: + method = FILE_BEGIN; + break; + case STREAM_SEEK_CUR: + method = FILE_CURRENT; + break; + case STREAM_SEEK_END: + method = FILE_END; + break; + default: + WARN("Invalid origin %x\n", dwOrigin); + return E_FAIL; + } + + if(!SetFilePointerEx(This->buf->file, dlibMove, &new_pos, method)) { + FIXME("SetFilePointerEx failed: %u\n", GetLastError()); + return E_FAIL; + } + + if(plibNewPosition) + plibNewPosition->QuadPart = new_pos.QuadPart; + return S_OK; } static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) Modified: trunk/reactos/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/internet.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] Sun Mar 19 16:57:50 2017 @@ -482,7 +482,7 @@ IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s, %x, %x, %p, %x, %p, %x): stub\n", debugstr_w(pwzUrl), + TRACE("(%s, %x, %x, %p, %x, %p, %x)\n", debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved); protocol_info = get_protocol_info(pwzUrl); Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] Sun Mar 19 16:57:50 2017 @@ -391,13 +391,7 @@ if(res) { TRACE("available %u bytes\n", protocol->query_available); if(!protocol->query_available) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); - } + all_data_read(protocol); return S_OK; } protocol->available_bytes = protocol->query_available; Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… ============================================================================== --- trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] Sun Mar 19 16:57:50 2017 @@ -6760,7 +6760,7 @@ HRESULT hr; IInternetProtocolInfo *info; - TRACE("(%p %s %x %p %x) stub\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + TRACE("(%p %s %x %p %x)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); if(!ppCombinedUri) @@ -6817,7 +6817,6 @@ const WCHAR *ptr = NULL; WCHAR *path = NULL; const WCHAR **pptr; - WCHAR buffer[INTERNET_MAX_URL_LENGTH+1]; DWORD len = 0; BOOL reduce_path; @@ -6844,11 +6843,11 @@ * it later. */ if(reduce_path && !path && ptr == uri->canon_uri+uri->path_start) - path = buffer+len; + path = output+len; /* Check if it's time to reduce the path. */ if(reduce_path && ptr == uri->canon_uri+uri->path_start+uri->path_len) { - DWORD current_path_len = (buffer+len) - path; + DWORD current_path_len = (output+len) - path; DWORD new_path_len = remove_dot_segments(path, current_path_len); /* Update the current length. */ @@ -6860,7 +6859,9 @@ const WCHAR decoded = decode_pct_val(ptr); if(decoded) { if(allow_unescape && (flags & URL_UNESCAPE)) { - buffer[len++] = decoded; + if(len < output_len) + output[len] = decoded; + len++; ptr += 2; do_default_action = FALSE; } @@ -6868,48 +6869,55 @@ /* See if %'s needed to encoded. */ if(do_default_action && (flags & URL_ESCAPE_PERCENT)) { - pct_encode_val(*ptr, buffer+len); + if(len + 3 < output_len) + pct_encode_val(*ptr, output+len); len += 3; do_default_action = FALSE; } } else if(*ptr == ' ') { if((flags & URL_ESCAPE_SPACES_ONLY) && !(flags & URL_ESCAPE_UNSAFE)) { - pct_encode_val(*ptr, buffer+len); + if(len + 3 < output_len) + pct_encode_val(*ptr, output+len); len += 3; do_default_action = FALSE; } } else if(!is_reserved(*ptr) && !is_unreserved(*ptr)) { if(flags & URL_ESCAPE_UNSAFE) { - pct_encode_val(*ptr, buffer+len); + if(len + 3 < output_len) + pct_encode_val(*ptr, output+len); len += 3; do_default_action = FALSE; } } - if(do_default_action) - buffer[len++] = *ptr; + if(do_default_action) { + if(len < output_len) + output[len] = *ptr; + len++; + } } /* Sometimes the path is the very last component of the IUri, so * see if the dot segments need to be reduced now. */ if(reduce_path && path) { - DWORD current_path_len = (buffer+len) - path; + DWORD current_path_len = (output+len) - path; DWORD new_path_len = remove_dot_segments(path, current_path_len); /* Update the current length. */ len -= (current_path_len-new_path_len); } - buffer[len++] = 0; + if(len < output_len) + output[len] = 0; + else + output[output_len-1] = 0; /* The null terminator isn't included in the length. */ - *result_len = len-1; - if(len > output_len) + *result_len = len; + if(len >= output_len) return STRSAFE_E_INSUFFICIENT_BUFFER; - else - memcpy(output, buffer, len*sizeof(WCHAR)); return S_OK; } Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Sun Mar 19 16:57:50 2017 @@ -65,7 +65,7 @@ 164 stdcall FaultInIEFeature(long ptr ptr long) #165 stub FindMediaType #166 stub FindMediaTypeClass -167 stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) +167 stdcall FindMimeFromData(ptr ptr ptr long ptr long ptr long) #168 GetAddSitesFileUrl 169 stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) #170 stub GetClassURL Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 16:57:50 2017 @@ -188,7 +188,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 -reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 +reactos/dll/win32/urlmon # Synced to WineStaging-2.2 reactos/dll/win32/usp10 # Synced to WineStaging-2.2 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23

7 years, 6 months

[akhaldi] 74194: [USP10_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 16:54:04 2017 New Revision: 74194 URL: http://svn.reactos.org/svn/reactos?rev=74194&view=rev Log: [USP10_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sun Mar 19 16:54:04 2017 @@ -85,7 +85,7 @@ winetest_ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); if (nItemsBroken && (broken(nItemsBroken[0] == outnItems) || broken(nItemsBroken[1] == outnItems))) { - winetest_win_skip("This test broken on this platform\n"); + winetest_win_skip("This test broken on this platform: nitems %d\n", outnItems); return; } todo_wine_if (nItemsToDo) @@ -94,38 +94,40 @@ for (x = 0; x <= outnItems; x++) { if (items[x].isBroken && broken(outpItems[x].iCharPos == items[x].broken_value[0])) - winetest_win_skip("This test broken on this platform\n"); + winetest_win_skip("This test broken on this platform: item %d CharPos %d\n", x, outpItems[x].iCharPos); else todo_wine_if (items[x].todo_flag[0]) winetest_ok(outpItems[x].iCharPos == items[x].iCharPos, "%i:Wrong CharPos (%i)\n",x,outpItems[x].iCharPos); if (items[x].isBroken && broken(outpItems[x].a.fRTL== items[x].broken_value[1])) - winetest_win_skip("This test broken on this platform\n"); + winetest_win_skip("This test broken on this platform: item %d fRTL %d\n", x, outpItems[x].a.fRTL); else todo_wine_if (items[x].todo_flag[1]) winetest_ok(outpItems[x].a.fRTL == items[x].fRTL, "%i:Wrong fRTL(%i)\n",x,outpItems[x].a.fRTL); if (items[x].isBroken && broken(outpItems[x].a.fLayoutRTL == items[x].broken_value[2])) - winetest_win_skip("This test broken on this platform\n"); + winetest_win_skip("This test broken on this platform: item %d fLayoutRTL %d\n", x, outpItems[x].a.fLayoutRTL); else todo_wine_if (items[x].todo_flag[2]) winetest_ok(outpItems[x].a.fLayoutRTL == items[x].fLayoutRTL, "%i:Wrong fLayoutRTL(%i)\n",x,outpItems[x].a.fLayoutRTL); if (items[x].isBroken && broken(outpItems[x].a.s.uBidiLevel == items[x].broken_value[3])) - winetest_win_skip("This test broken on this platform\n"); + winetest_win_skip("This test broken on this platform: item %d BidiLevel %d\n", x, outpItems[x].a.s.uBidiLevel); else todo_wine_if (items[x].todo_flag[3]) winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel(%i)\n",x,outpItems[x].a.s.uBidiLevel); + + if (items[x].isBroken && broken(outpItems[x].a.s.fOverrideDirection == items[x].broken_value[4])) + winetest_win_skip("This test broken on this platform: item %d fOverrideDirection %d\n", x, outpItems[x].a.s.fOverrideDirection); + else todo_wine_if (items[x].todo_flag[4]) + winetest_ok(outpItems[x].a.s.fOverrideDirection == items[x].fOverrideDirection, "%i:Wrong fOverrideDirection(%i)\n",x,outpItems[x].a.s.fOverrideDirection); + if (x != outnItems) winetest_ok(outpItems[x].a.eScript != SCRIPT_UNDEFINED, "%i: Undefined script\n",x); if (pScriptItemizeOpenType) { - if (items[x].isBroken && broken(tags[x] == items[x].broken_value[4])) - winetest_win_skip("This test broken on this platform\n"); - else todo_wine_if (items[x].todo_flag[4]) + if (items[x].isBroken && broken(tags[x] == items[x].broken_value[5])) + winetest_win_skip("This test broken on this platform: item %d Script Tag %x\n", x, tags[x]); + else todo_wine_if (items[x].todo_flag[5]) winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag); } - if (items[x].isBroken && broken(outpItems[x].a.s.fOverrideDirection == items[x].broken_value[5])) - winetest_win_skip("This test broken on this platform\n"); - else todo_wine_if (items[x].todo_flag[5]) - winetest_ok(outpItems[x].a.s.fOverrideDirection == items[x].fOverrideDirection, "%i:Wrong fOverrideDirection(%i)\n",x,outpItems[x].a.s.fOverrideDirection); } } @@ -264,7 +266,7 @@ /* Hebrew */ static const WCHAR test6[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd, '.',0}; - static const itemTest t61[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0,0},4,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; + static const itemTest t61[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1,-1}},{{0,0,0,0,0,0},4,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},4,1,1,1,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, @@ -273,7 +275,7 @@ static const int b63[2] = {2,2}; static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; - static const itemTest t71[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0,0},19,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; + static const itemTest t71[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1,-1}},{{0,0,0,0,0,0},19,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},18,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},8,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},19,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, @@ -349,7 +351,7 @@ /* Diacritical */ static const WCHAR test20[] = {0x0309,'a','b','c','d',0}; static const itemTest t201[3] = {{{0,0,0,0,0,0},0,0,0,0,0x0,0,FALSE},{{0,0,0,0,0,0},1,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; - static const itemTest t202[3] = {{{0,0,0,0,0,0},0,0,0,2,0,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},1,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; + static const itemTest t202[3] = {{{0,0,0,0,0,0},0,0,0,2,0,0,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},1,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const WCHAR test21[] = {0x0710, 0x0712, 0x0308, 0x0712, 0x0714,0}; static const itemTest t211[2] = {{{0,0,0,0,0,0},0,1,1,1,0,syrc_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; @@ -372,22 +374,22 @@ /* Myanmar */ static const WCHAR test24[] = {0x1019,0x103c,0x1014,0x103a,0x1019,0x102c,0x1021,0x1000,0x1039,0x1001,0x101b,0x102c}; static const itemTest t241[2] = {{{0,0,0,0,0,0},0,0,0,0,0,mymr_tag,FALSE},{{0,0,0,0,0,0},12,0,0,0,0,-1,FALSE}}; - static const itemTest t242[2] = {{{0,0,0,0,0,0},0,0,0,2,0,mymr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},12,0,0,0,0,-1,FALSE}}; + static const itemTest t242[2] = {{{0,0,0,0,0,0},0,0,0,2,0,mymr_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},12,0,0,0,0,-1,FALSE}}; /* Tai Le */ static const WCHAR test25[] = {0x1956,0x196d,0x1970,0x1956,0x196c,0x1973,0x1951,0x1968,0x1952,0x1970}; - static const itemTest t251[2] = {{{0,0,0,0,0,0},0,0,0,0,0,tale_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; - static const itemTest t252[2] = {{{0,0,0,0,0,0},0,0,0,2,0,tale_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; + static const itemTest t251[2] = {{{0,0,0,0,0,0},0,0,0,0,0,tale_tag,TRUE,{-1,-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; + static const itemTest t252[2] = {{{0,0,0,0,0,0},0,0,0,2,0,tale_tag,TRUE,{-1,1,1,1,-1,latn_tag}},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; /* New Tai Lue */ static const WCHAR test26[] = {0x1992,0x19c4}; - static const itemTest t261[2] = {{{0,0,0,0,0,0},0,0,0,0,0,talu_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; - static const itemTest t262[2] = {{{0,0,0,0,0,0},0,0,0,2,0,talu_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; + static const itemTest t261[2] = {{{0,0,0,0,0,0},0,0,0,0,0,talu_tag,TRUE,{-1,-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; + static const itemTest t262[2] = {{{0,0,0,0,0,0},0,0,0,2,0,talu_tag,TRUE,{-1,1,1,1,-1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; /* Khmer */ static const WCHAR test27[] = {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6}; static const itemTest t271[2] = {{{0,0,0,0,0,0},0,0,0,0,0,khmr_tag,FALSE},{{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; - static const itemTest t272[2] = {{{0,0,0,0,0,0},0,0,0,2,0,khmr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; + static const itemTest t272[2] = {{{0,0,0,0,0,0},0,0,0,2,0,khmr_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; /* CJK Han */ static const WCHAR test28[] = {0x8bed,0x7d20,0x6587,0x5b57}; @@ -431,35 +433,35 @@ static const WCHAR test35[] = {0x182e,0x1823,0x1829,0x182d,0x1823,0x182f,0x0020,0x182a,0x1822,0x1834,0x1822,0x182d,0x180c}; static const itemTest t351[2] = {{{0,0,0,0,0,0},0,0,0,0,0,mong_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const int b351[2] = {2,2}; - static const itemTest t352[2] = {{{0,0,0,0,0,0},0,0,0,2,0,mong_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t352[2] = {{{0,0,0,0,0,0},0,0,0,2,0,mong_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const int b352[2] = {2,3}; - static const itemTest t353[2] = {{{0,0,0,0,0,1},0,0,0,0,1,mong_tag,TRUE,{0,0,0,0,0}},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t353[2] = {{{0,0,0,0,1,0},0,0,0,0,1,mong_tag,TRUE,{-1,-1,-1,-1,0,0}},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; /* Tifinagh */ static const WCHAR test36[] = {0x2d5c,0x2d49,0x2d3c,0x2d49,0x2d4f,0x2d30,0x2d56}; - static const itemTest t361[2] = {{{0,0,0,0,0,0},0,0,0,0,0,tfng_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; - static const itemTest t362[2] = {{{0,0,0,0,0,0},0,0,0,2,0,tfng_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; + static const itemTest t361[2] = {{{0,0,0,0,0,0},0,0,0,0,0,tfng_tag,TRUE,{-1,-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; + static const itemTest t362[2] = {{{0,0,0,0,0,0},0,0,0,2,0,tfng_tag,TRUE,{-1,1,1,1,-1,latn_tag}},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; /* N'Ko */ static const WCHAR test37[] = {0x07d2,0x07de,0x07cf}; - static const itemTest t371[2] = {{{0,0,0,0,0,0},0,1,1,1,0,nko_tag,TRUE,{-1,0,0,0,arab_tag,0}},{{0,0,0,0,0,0},3,0,0,0,0,-1,FALSE}}; - static const itemTest t372[2] = {{{0,0,0,0,0,0},0,1,1,1,0,nko_tag,TRUE,{-1,0,0,2,arab_tag,0}},{{0,0,0,0,0,0},3,0,0,0,0,-1,FALSE}}; - static const itemTest t373[2] = {{{0,0,0,0,0,0},0,0,0,0,1,nko_tag,TRUE,{-1,0,0,2,arab_tag,0}}, {{0,0,0,0,0,0},3,0,0,0,0,-1,FALSE}}; + static const itemTest t371[2] = {{{0,0,0,0,0,0},0,1,1,1,0,nko_tag,TRUE,{-1,0,0,0,-1,arab_tag}},{{0,0,0,0,0,0},3,0,0,0,0,-1,FALSE}}; + static const itemTest t372[2] = {{{0,0,0,0,0,0},0,1,1,1,0,nko_tag,TRUE,{-1,0,0,2,-1,arab_tag}},{{0,0,0,0,0,0},3,0,0,0,0,-1,FALSE}}; + static const itemTest t373[2] = {{{0,0,0,0,0,0},0,0,0,0,1,nko_tag,TRUE,{-1,-1,-1,2,0,arab_tag}}, {{0,0,0,0,0,0},3,0,0,0,0,-1,FALSE}}; /* Vai */ static const WCHAR test38[] = {0xa559,0xa524}; - static const itemTest t381[2] = {{{0,0,0,0,0,0},0,0,0,0,0,vai_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; - static const itemTest t382[2] = {{{0,0,0,0,0,0},0,0,0,2,0,vai_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; + static const itemTest t381[2] = {{{0,0,0,0,0,0},0,0,0,0,0,vai_tag,TRUE,{-1,-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; + static const itemTest t382[2] = {{{0,0,0,0,0,0},0,0,0,2,0,vai_tag,TRUE,{-1,1,1,1,-1,latn_tag}},{{0,0,0,0,0,0},2,0,0,0,0,-1,FALSE}}; /* Cherokee */ static const WCHAR test39[] = {0x13e3,0x13b3,0x13a9,0x0020,0x13a6,0x13ec,0x13c2,0x13af,0x13cd,0x13d7}; static const itemTest t391[2] = {{{0,0,0,0,0,0},0,0,0,0,0,cher_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; - static const itemTest t392[2] = {{{0,0,0,0,0,0},0,0,0,2,0,cher_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; + static const itemTest t392[2] = {{{0,0,0,0,0,0},0,0,0,2,0,cher_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},10,0,0,0,0,-1,FALSE}}; /* Canadian Aboriginal Syllabics */ static const WCHAR test40[] = {0x1403,0x14c4,0x1483,0x144e,0x1450,0x1466}; static const itemTest t401[2] = {{{0,0,0,0,0,0},0,0,0,0,0,cans_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; - static const itemTest t402[2] = {{{0,0,0,0,0,0},0,0,0,2,0,cans_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + static const itemTest t402[2] = {{{0,0,0,0,0,0},0,0,0,2,0,cans_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; /* Ogham */ static const WCHAR test41[] = {0x169b,0x1691,0x168c,0x1690,0x168b,0x169c}; @@ -470,32 +472,32 @@ /* Runic */ static const WCHAR test42[] = {0x16a0,0x16a1,0x16a2,0x16a3,0x16a4,0x16a5}; static const itemTest t421[2] = {{{0,0,0,0,0,0},0,0,0,0,0,runr_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; - static const itemTest t422[4] = {{{0,0,0,0,0,0},0,0,0,2,0,runr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + static const itemTest t422[4] = {{{0,0,0,0,0,0},0,0,0,2,0,runr_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; /* Braille */ static const WCHAR test43[] = {0x280f,0x2817,0x2811,0x280d,0x280a,0x2811,0x2817}; static const itemTest t431[2] = {{{0,0,0,0,0,0},0,0,0,0,0,brai_tag,FALSE},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; - static const itemTest t432[4] = {{{0,0,0,0,0,0},0,0,0,2,0,brai_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; + static const itemTest t432[4] = {{{0,0,0,0,0,0},0,0,0,2,0,brai_tag,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},7,0,0,0,0,-1,FALSE}}; /* Private and Surrogates Area */ static const WCHAR test44[] = {0xe000, 0xe001, 0xd800, 0xd801}; static const itemTest t441[3] = {{{0,0,0,0,0,0},0,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},2,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},4,0,0,0,0,-1,FALSE}}; - static const itemTest t442[4] = {{{0,0,0,0,0,0},0,0,0,2,0,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},2,0,0,2,0,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0,0},4,0,0,0,0,-1,FALSE}}; + static const itemTest t442[4] = {{{0,0,0,0,0,0},0,0,0,2,0,0,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},2,0,0,2,0,0,TRUE,{-1,1,1,1,-1,-1}},{{0,0,0,0,0,0},4,0,0,0,0,-1,FALSE}}; /* Deseret */ static const WCHAR test45[] = {0xd801,0xdc19,0xd801,0xdc32,0xd801,0xdc4c,0xd801,0xdc3c,0xd801,0xdc32,0xd801,0xdc4b,0xd801,0xdc2f,0xd801,0xdc4c,0xd801,0xdc3b,0xd801,0xdc32,0xd801,0xdc4a,0xd801,0xdc28}; - static const itemTest t451[2] = {{{0,0,0,0,0,0},0,0,0,0,0,dsrt_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0,0},24,0,0,0,0,-1,FALSE}}; - static const itemTest t452[2] = {{{0,0,0,0,0,0},0,0,0,2,0,dsrt_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0,0},24,0,0,0,0,-1,FALSE}}; + static const itemTest t451[2] = {{{0,0,0,0,0,0},0,0,0,0,0,dsrt_tag,TRUE,{-1,-1,-1,-1,-1,0x0}},{{0,0,0,0,0,0},24,0,0,0,0,-1,FALSE}}; + static const itemTest t452[2] = {{{0,0,0,0,0,0},0,0,0,2,0,dsrt_tag,TRUE,{-1,1,1,1,-1,0x0}},{{0,0,0,0,0,0},24,0,0,0,0,-1,FALSE}}; /* Osmanya */ static const WCHAR test46[] = {0xd801,0xdc8b,0xd801,0xdc98,0xd801,0xdc88,0xd801,0xdc91,0xd801,0xdc9b,0xd801,0xdc92,0xd801,0xdc95,0xd801,0xdc80}; - static const itemTest t461[2] = {{{0,0,0,0,0,0},0,0,0,0,0,osma_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0,0},16,0,0,0,0,-1,FALSE}}; - static const itemTest t462[2] = {{{0,0,0,0,0,0},0,0,0,2,0,osma_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0,0},16,0,0,0,0,-1,FALSE}}; + static const itemTest t461[2] = {{{0,0,0,0,0,0},0,0,0,0,0,osma_tag,TRUE,{-1,-1,-1,-1,-1,0x0}},{{0,0,0,0,0,0},16,0,0,0,0,-1,FALSE}}; + static const itemTest t462[2] = {{{0,0,0,0,0,0},0,0,0,2,0,osma_tag,TRUE,{-1,1,1,1,-1,0x0}},{{0,0,0,0,0,0},16,0,0,0,0,-1,FALSE}}; /* Mathematical Alphanumeric Symbols */ static const WCHAR test47[] = {0xd835,0xdc00,0xd835,0xdc35,0xd835,0xdc6a,0xd835,0xdc9f,0xd835,0xdcd4,0xd835,0xdd09,0xd835,0xdd3e,0xd835,0xdd73,0xd835,0xdda8,0xd835,0xdddd,0xd835,0xde12,0xd835,0xde47,0xd835,0xde7c}; - static const itemTest t471[2] = {{{0,0,0,0,0,0},0,0,0,0,0,math_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0,0},26,0,0,0,0,-1,FALSE}}; - static const itemTest t472[2] = {{{0,0,0,0,0,0},0,0,0,2,0,math_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0,0},26,0,0,0,0,-1,FALSE}}; + static const itemTest t471[2] = {{{0,0,0,0,0,0},0,0,0,0,0,math_tag,TRUE,{-1,-1,-1,-1,-1,0x0}},{{0,0,0,0,0,0},26,0,0,0,0,-1,FALSE}}; + static const itemTest t472[2] = {{{0,0,0,0,0,0},0,0,0,2,0,math_tag,TRUE,{-1,1,1,1,-1,0x0}},{{0,0,0,0,0,0},26,0,0,0,0,-1,FALSE}}; /* Mathematical and Numeric combinations */ /* These have a leading hebrew character to force complicated itemization */ @@ -592,7 +594,7 @@ 0x0666, 0x0667, 0x0668, 0x066b, 0x0669, 0x0660}; /* Ù¦Ù§Ù¨Ù«Ù©Ù */ static const itemTest t581[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t582[] = {{{0,0,1,1,0,1}, 0,0,0,0,1,arab_tag,FALSE}, + static const itemTest t582[] = {{{0,0,1,1,1,0}, 0,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; SCRIPT_ITEM items[15]; @@ -930,8 +932,9 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD item, DWORD nGlyphs, - const shapeTest_char* charItems, - const shapeTest_glyph* glyphItems) + const shapeTest_char *charItems, + const shapeTest_glyph *glyphItems, + const SCRIPT_GLYPHPROP *props2) { HRESULT hr; int x, outnItems=0, outnGlyphs=0; @@ -1017,19 +1020,27 @@ winetest_trace("%i: Glyph present when it should not be\n",x); } if (valid > 0) - winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification, "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || + (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), + "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); else if (glyphProp[x].sva.uJustification != glyphItems[x].GlyphProp.sva.uJustification) winetest_trace("%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); if (valid > 0) - winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart, "%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); + winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart || + (props2 && glyphProp[x].sva.fClusterStart == props2[x].sva.fClusterStart), + "%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); else if (glyphProp[x].sva.fClusterStart != glyphItems[x].GlyphProp.sva.fClusterStart) winetest_trace("%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); if (valid > 0) - winetest_ok(glyphProp[x].sva.fDiacritic == glyphItems[x].GlyphProp.sva.fDiacritic, "%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); + winetest_ok(glyphProp[x].sva.fDiacritic == glyphItems[x].GlyphProp.sva.fDiacritic || + (props2 && glyphProp[x].sva.fDiacritic == props2[x].sva.fDiacritic), + "%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); else if (glyphProp[x].sva.fDiacritic != glyphItems[x].GlyphProp.sva.fDiacritic) winetest_trace("%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); if (valid > 0) - winetest_ok(glyphProp[x].sva.fZeroWidth == glyphItems[x].GlyphProp.sva.fZeroWidth, "%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); + winetest_ok(glyphProp[x].sva.fZeroWidth == glyphItems[x].GlyphProp.sva.fZeroWidth || + (props2 && glyphProp[x].sva.fZeroWidth == props2[x].sva.fZeroWidth), + "%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); else if (glyphProp[x].sva.fZeroWidth != glyphItems[x].GlyphProp.sva.fZeroWidth) winetest_trace("%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); } @@ -1042,9 +1053,14 @@ ScriptFreeCache(&sc); } -#define test_shape_ok(a,b,c,d,e,f,g,h,i) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(1,a,b,c,d,e,f,g,h,i) - -#define test_shape_ok_valid(v,a,b,c,d,e,f,g,h,i) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i) +#define test_shape_ok(a,b,c,d,e,f,g,h,i) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(1,a,b,c,d,e,f,g,h,i,NULL) + +#define test_shape_ok_valid(v,a,b,c,d,e,f,g,h,i) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i,NULL) + +#define test_shape_ok_valid_props2(v,a,b,c,d,e,f,g,h,i,j) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i,j) typedef struct tagRangeP { BYTE range; @@ -1248,6 +1264,18 @@ {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + static const SCRIPT_GLYPHPROP phagspa_win10_props[] = { + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0} }; /* Lao */ static const WCHAR test_lao[] = {0x0ead, 0x0eb1, 0x0e81, 0x0eaa, 0x0ead, 0x0e99, 0x0ea5, 0x0eb2, 0x0ea7, 0}; @@ -1284,6 +1312,24 @@ {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + static const SCRIPT_GLYPHPROP tibetan_win10_props[] = { + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0} }; /* Devanagari */ static const WCHAR test_devanagari[] = {0x0926, 0x0947, 0x0935, 0x0928, 0x093e, 0x0917, 0x0930, 0x0940}; @@ -1467,7 +1513,8 @@ test_valid = find_font_for_range(hdc, "Microsoft PhagsPa", 53, test_phagspa[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_phagspa, 11, &Control, &State, 0, 11, phagspa_c, phagspa_g); + test_shape_ok_valid_props2(test_valid, hdc, test_phagspa, 11, &Control, &State, 0, 11, + phagspa_c, phagspa_g, phagspa_win10_props); SelectObject(hdc, hfont_orig); DeleteObject(hfont); } @@ -1483,7 +1530,8 @@ test_valid = find_font_for_range(hdc, "Microsoft Himalaya", 70, test_tibetan[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, tibetan_c, tibetan_g); + test_shape_ok_valid_props2(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, + tibetan_c, tibetan_g, tibetan_win10_props); SelectObject(hdc, hfont_orig); DeleteObject(hfont); } @@ -1569,7 +1617,7 @@ SCRIPT_CACHE sc = NULL; WORD glyphs[4], glyphs2[4], logclust[4], glyphs3[4]; SCRIPT_VISATTR attrs[4]; - SCRIPT_ITEM items[2]; + SCRIPT_ITEM items[4]; int nb, i, j; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); @@ -1699,9 +1747,33 @@ for (i = 0; i < 2; i++) { static const WCHAR space[] = {' ', 0}; - static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, - 0x200b, 0x200c, 0x200d, 0x200e, 0x200f, /* ZWSP, ZWNJ, ZWJ, LRM, RLM */ - 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0}; /* LRE, RLE, PDF, LRO, RLO */ + static const struct + { + WCHAR c; + unsigned int item_count; + unsigned int item; + } + test_data[] = + { + {0x0009, 3, 1}, /* \t */ + {0x000a, 3, 1}, /* \n */ + {0x000d, 3, 1}, /* \r */ + {0x001c, 3, 1}, /* FS */ + {0x001d, 3, 1}, /* GS */ + {0x001e, 3, 1}, /* RS */ + {0x001f, 3, 1}, /* US */ + {0x200b, 1, 0}, /* ZWSP */ + {0x200c, 1, 0}, /* ZWNJ */ + {0x200d, 1, 0}, /* ZWJ */ + {0x200e, 3, 1}, /* LRM */ + {0x200f, 3, 1}, /* RLM */ + {0x202a, 3, 1}, /* LRE */ + {0x202b, 3, 1}, /* RLE */ + {0x202c, 3, 1}, /* PDF */ + {0x202d, 3, 1}, /* LRO */ + {0x202e, 3, 1}, /* RLO */ + }; + WCHAR chars[3]; HFONT font, oldfont = NULL; LOGFONTA lf; @@ -1720,43 +1792,52 @@ ok(hr == S_OK, "%s: expected S_OK, got %08x\n", lf.lfFaceName, hr); ok(nb == 1, "%s: expected 1, got %d\n", lf.lfFaceName, nb); - for (j = 0; blanks[j]; j++) + chars[0] = 'A'; + chars[2] = 'A'; + for (j = 0; j < sizeof(test_data) / sizeof(*test_data); ++j) { - hr = ScriptItemize(&blanks[j], 1, 2, NULL, NULL, items, NULL); - ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); - - ok(!items[0].a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", - lf.lfFaceName, blanks[j], items[0].a.fNoGlyphIndex); - hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); - ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); - ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - ok(!items[0].a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", - lf.lfFaceName, blanks[j], items[0].a.fNoGlyphIndex); - - ok(glyphs[0] == glyphs2[0] || - broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), - "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); - ok(attrs[0].fZeroWidth || broken(!attrs[0].fZeroWidth && (blanks[j] < 0x10) /* Vista */), - "%s: [%02x] got unexpected fZeroWidth %#x.\n", lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); - - items[0].a.fNoGlyphIndex = 1; - hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); - ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); - ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - - if (blanks[j] == 0x200b || blanks[j] == 0x200c || blanks[j] == 0x200d) + WCHAR c = test_data[j].c; + SCRIPT_ITEM *item; + + chars[1] = c; + hr = ScriptItemize(chars, 3, 4, NULL, NULL, items, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); + ok(nb == test_data[j].item_count, "%s: [%02x] Got unexpected item count %d.\n", + lf.lfFaceName, c, nb); + item = &items[test_data[j].item]; + + ok(!item->a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", + lf.lfFaceName, c, item->a.fNoGlyphIndex); + hr = ScriptShape(hdc, &sc, chars, 3, 3, &item->a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); + ok(nb == 3, "%s: [%02x] expected 3, got %d\n", lf.lfFaceName, c, nb); + ok(!item->a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", + lf.lfFaceName, c, item->a.fNoGlyphIndex); + + ok(glyphs[0] == glyphs2[1] || + broken(glyphs2[1] == c && (c < 0x10)), + "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, c, glyphs[0], glyphs2[1]); + ok(attrs[1].fZeroWidth || broken(!attrs[1].fZeroWidth && (c < 0x10) /* Vista */), + "%s: [%02x] got unexpected fZeroWidth %#x.\n", lf.lfFaceName, c, attrs[1].fZeroWidth); + + item->a.fNoGlyphIndex = 1; + hr = ScriptShape(hdc, &sc, chars, 3, 3, &item->a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); + ok(nb == 3, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, c, nb); + + if (c == 0x200b || c == 0x200c || c == 0x200d) { - ok(glyphs2[0] == 0x0020, - "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); - ok(attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", - lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + ok(glyphs2[1] == 0x0020, + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, c, glyphs2[1]); + ok(attrs[1].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, c, attrs[1].fZeroWidth); } else { - ok(glyphs2[0] == blanks[j], - "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); - ok(!attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", - lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + ok(glyphs2[1] == c, + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, c, glyphs2[1]); + ok(!attrs[1].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, c, attrs[1].fZeroWidth); } } if (oldfont)

7 years, 6 months

[akhaldi] 74193: [USP10] Sync with Wine Staging 2.2. CORE-12823 d00f731 usp10: Itemise ZWSP like ZWNJ and ZWJ. 721fbf6 usp10: Explicitly check for zero-width control characters in ScriptShapeOpenTy...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 19 16:53:04 2017 New Revision: 74193 URL: http://svn.reactos.org/svn/reactos?rev=74193&view=rev Log: [USP10] Sync with Wine Staging 2.2. CORE-12823 d00f731 usp10: Itemise ZWSP like ZWNJ and ZWJ. 721fbf6 usp10: Explicitly check for zero-width control characters in ScriptShapeOpenType(). 7e6a4b2 usp10: Fix LB27 rule that should check for prefix, not suffix. c4626bb usp10: Fixed LB30 condition, breaking after CP class. 0c14195 usp10: Apply 'ccmp' before Arabic contextual shaping. e2d4cf9 usp10: Fix next index for RTL MultipleSubst. 0401bdf usp10: Change GSUB_E_NOGLYPH value. 10e9adf usp10: Fix Contextual Shaping for Languages with RTL write order. 961e1e6 usp10: Fix ScriptRecordDigitSubstitution spec file entry. aae5a83 usp10: Implement Chaining Context Substitution Format 2: Class-based Chaining Context Glyph Substitution. b98a70a usp10: Implement Contextual Positioning Subtable: Format 2. 5e6b2c0 usp10: Implement GSUB Context Substitution types 1 and 2. c705eca usp10: A spelling fix in a comment. Modified: trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -371,7 +371,7 @@ if (break_class[i+1] == b_IN || break_class[i+1] == b_PO) else_break(&break_before[i+1],b_x); } - if (break_class[i] == b_PO) + if (break_class[i] == b_PR) { switch (break_class[i+1]) { @@ -401,7 +401,7 @@ break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i+1] == b_HL || break_class[i+1] == b_NU)) else_break(&break_before[i+1],b_x); /* LB30a */ Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -228,11 +228,91 @@ }GSUB_SubstLookupRecord; typedef struct{ + WORD SubstFormat; + WORD Coverage; + WORD SubRuleSetCount; + WORD SubRuleSet[1]; +}GSUB_ContextSubstFormat1; + +typedef struct{ + WORD SubRuleCount; + WORD SubRule[1]; +}GSUB_SubRuleSet; + +typedef struct { + WORD GlyphCount; + WORD SubstCount; + WORD Input[1]; +}GSUB_SubRule_1; + +typedef struct { + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_SubRule_2; + +typedef struct { + WORD SubstFormat; + WORD Coverage; + WORD ClassDef; + WORD SubClassSetCnt; + WORD SubClassSet[1]; +}GSUB_ContextSubstFormat2; + +typedef struct { + WORD SubClassRuleCnt; + WORD SubClassRule[1]; +}GSUB_SubClassSet; + +typedef struct { + WORD GlyphCount; + WORD SubstCount; + WORD Class[1]; +}GSUB_SubClassRule_1; + +typedef struct { + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_SubClassRule_2; + +typedef struct{ WORD SubstFormat; /* = 1 */ WORD Coverage; WORD ChainSubRuleSetCount; WORD ChainSubRuleSet[1]; }GSUB_ChainContextSubstFormat1; + +typedef struct { + WORD SubstFormat; /* = 2 */ + WORD Coverage; + WORD BacktrackClassDef; + WORD InputClassDef; + WORD LookaheadClassDef; + WORD ChainSubClassSetCnt; + WORD ChainSubClassSet[1]; +}GSUB_ChainContextSubstFormat2; + +typedef struct { + WORD ChainSubClassRuleCnt; + WORD ChainSubClassRule[1]; +}GSUB_ChainSubClassSet; + +typedef struct { + WORD BacktrackGlyphCount; + WORD Backtrack[1]; +}GSUB_ChainSubClassRule_1; + +typedef struct { + WORD InputGlyphCount; + WORD Input[1]; +}GSUB_ChainSubClassRule_2; + +typedef struct { + WORD LookaheadGlyphCount; + WORD LookAhead[1]; +}GSUB_ChainSubClassRule_3; + +typedef struct { + WORD SubstCount; + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_ChainSubClassRule_4; typedef struct { WORD SubstFormat; /* = 3 */ @@ -453,6 +533,29 @@ WORD SequenceIndex; WORD LookupListIndex; } GPOS_PosLookupRecord; + +typedef struct { + WORD PosFormat; + WORD Coverage; + WORD ClassDef; + WORD PosClassSetCnt; + WORD PosClassSet[1]; +} GPOS_ContextPosFormat2; + +typedef struct { + WORD PosClassRuleCnt; + WORD PosClassRule[1]; +} GPOS_PosClassSet; + +typedef struct { + WORD GlyphCount; + WORD PosCount; + WORD Class[1]; +} GPOS_PosClassRule_1; + +typedef struct { + GPOS_PosLookupRecord PosLookupRecord[1]; +} GPOS_PosClassRule_2; typedef struct { WORD PosFormat; @@ -827,7 +930,10 @@ TRACE("\n"); } - return glyph_index + (sub_count * write_dir); + if (write_dir > 0) + return glyph_index + sub_count; + else + return glyph_index - 1; } } return GSUB_E_NOGLYPH; @@ -930,6 +1036,151 @@ return GSUB_E_NOGLYPH; } +static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Context Substitution Subtable\n"); + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GSUB_ContextSubstFormat1 *csf1; + + csf1 = (const GSUB_ContextSubstFormat1*)GSUB_get_subtable(look, j); + if (GET_BE_WORD(csf1->SubstFormat) == 1) + { + int offset, index; + TRACE("Context Substitution Subtable: Class 1\n"); + offset = GET_BE_WORD(csf1->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)csf1+offset, glyphs[glyph_index]); + TRACE(" Coverage index %i\n",index); + if (index != -1) + { + int k, count; + const GSUB_SubRuleSet *srs; + offset = GET_BE_WORD(csf1->SubRuleSet[index]); + srs = (const GSUB_SubRuleSet*)((const BYTE*)csf1+offset); + count = GET_BE_WORD(srs->SubRuleCount); + TRACE(" SubRuleSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GSUB_SubRule_1 *sr; + const GSUB_SubRule_2 *sr_2; + int g_count, l; + int newIndex = glyph_index; + + offset = GET_BE_WORD(srs->SubRule[k]); + sr = (const GSUB_SubRule_1*)((const BYTE*)srs+offset); + g_count = GET_BE_WORD(sr->GlyphCount); + TRACE(" SubRule has %i glyphs\n",g_count); + for (l = 0; l < g_count-1; l++) + if (glyphs[glyph_index + (write_dir * (l+1))] != GET_BE_WORD(sr->Input[l])) break; + + if (l < g_count-1) + { + TRACE(" Rule does not match\n"); + continue; + } + + TRACE(" Rule matches\n"); + sr_2 = (const GSUB_SubRule_2*)((const BYTE*)sr+ + FIELD_OFFSET(GSUB_SubRule_1, Input[g_count-1])); + + for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) + { + int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + + TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == GSUB_E_NOGLYPH) + { + ERR(" Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + } + } + else if (GET_BE_WORD(csf1->SubstFormat) == 2) + { + const GSUB_ContextSubstFormat2 *csf2; + const void *glyph_class_table; + int offset, index; + + csf2 = (const GSUB_ContextSubstFormat2*)csf1; + TRACE("Context Substitution Subtable: Class 2\n"); + offset = GET_BE_WORD(csf2->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)csf2+offset, glyphs[glyph_index]); + TRACE(" Coverage index %i\n",index); + if (index != -1) + { + int k, count, class; + const GSUB_SubClassSet *scs; + + offset = GET_BE_WORD(csf2->ClassDef); + glyph_class_table = (const BYTE *)csf2 + offset; + + class = OT_get_glyph_class(glyph_class_table,glyphs[glyph_index]); + + offset = GET_BE_WORD(csf2->SubClassSet[class]); + if (offset == 0) + { + TRACE(" No class rule table for class %i\n",class); + continue; + } + scs = (const GSUB_SubClassSet*)((const BYTE*)csf2+offset); + count = GET_BE_WORD(scs->SubClassRuleCnt); + TRACE(" SubClassSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GSUB_SubClassRule_1 *sr; + const GSUB_SubClassRule_2 *sr_2; + int g_count, l; + int newIndex = glyph_index; + + offset = GET_BE_WORD(scs->SubClassRule[k]); + sr = (const GSUB_SubClassRule_1*)((const BYTE*)scs+offset); + g_count = GET_BE_WORD(sr->GlyphCount); + TRACE(" SubClassRule has %i glyphs classes\n",g_count); + for (l = 0; l < g_count-1; l++) + { + int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]); + if (g_class != GET_BE_WORD(sr->Class[l])) break; + } + + if (l < g_count-1) + { + TRACE(" Rule does not match\n"); + continue; + } + + TRACE(" Rule matches\n"); + sr_2 = (const GSUB_SubClassRule_2*)((const BYTE*)sr+ + FIELD_OFFSET(GSUB_SubClassRule_1, Class[g_count-1])); + + for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) + { + int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + + TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == GSUB_E_NOGLYPH) + { + ERR(" Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + } + } + else + FIXME("Unhandled Context Substitution Format %i\n", GET_BE_WORD(csf1->SubstFormat)); + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -952,10 +1203,122 @@ } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - static int once; - if (!once++) - FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); - continue; + int newIndex = glyph_index; + WORD offset, count; + const void *backtrack_class_table; + const void *input_class_table; + const void *lookahead_class_table; + int i; + WORD class; + + const GSUB_ChainContextSubstFormat2 *ccsf2 = (const GSUB_ChainContextSubstFormat2*)ccsf1; + const GSUB_ChainSubClassSet *csc; + + TRACE(" subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + + offset = GET_BE_WORD(ccsf2->Coverage); + + if (GSUB_is_glyph_covered((const BYTE*)ccsf2+offset, glyphs[glyph_index]) == -1) + { + TRACE("Glyph not covered\n"); + continue; + } + offset = GET_BE_WORD(ccsf2->BacktrackClassDef); + backtrack_class_table = (const BYTE*)ccsf2+offset; + offset = GET_BE_WORD(ccsf2->InputClassDef); + input_class_table = (const BYTE*)ccsf2+offset; + offset = GET_BE_WORD(ccsf2->LookaheadClassDef); + lookahead_class_table = (const BYTE*)ccsf2+offset; + count = GET_BE_WORD(ccsf2->ChainSubClassSetCnt); + + class = OT_get_glyph_class(input_class_table, glyphs[glyph_index]); + offset = GET_BE_WORD(ccsf2->ChainSubClassSet[class]); + + if (offset == 0) + { + TRACE("No rules for class\n"); + continue; + } + + csc = (const GSUB_ChainSubClassSet*)((BYTE*)ccsf2+offset); + count = GET_BE_WORD(csc->ChainSubClassRuleCnt); + + TRACE("%i rules to check\n",count); + + for (i = 0; i < count; i++) + { + int k; + int indexGlyphs; + const GSUB_ChainSubClassRule_1 *cscr_1; + const GSUB_ChainSubClassRule_2 *cscr_2; + const GSUB_ChainSubClassRule_3 *cscr_3; + const GSUB_ChainSubClassRule_4 *cscr_4; + + offset = GET_BE_WORD(csc->ChainSubClassRule[i]); + cscr_1 = (const GSUB_ChainSubClassRule_1*)((BYTE*)csc+offset); + + for (k = 0; k < GET_BE_WORD(cscr_1->BacktrackGlyphCount); k++) + { + WORD target_class = GET_BE_WORD(cscr_1->Backtrack[k]); + WORD glyph_class = OT_get_glyph_class(backtrack_class_table, glyphs[glyph_index + (dirBacktrack * (k+1))]); + if (target_class != glyph_class) + break; + } + if (k != GET_BE_WORD(cscr_1->BacktrackGlyphCount)) + continue; + TRACE("Matched Backtrack\n"); + + cscr_2 = (const GSUB_ChainSubClassRule_2*)((BYTE *)cscr_1 + + FIELD_OFFSET(GSUB_ChainSubClassRule_1, Backtrack[GET_BE_WORD(cscr_1->BacktrackGlyphCount)])); + + indexGlyphs = GET_BE_WORD(cscr_2->InputGlyphCount); + for (k = 0; k < indexGlyphs - 1; k++) + { + WORD target_class = GET_BE_WORD(cscr_2->Input[k]); + WORD glyph_class = OT_get_glyph_class(input_class_table, glyphs[glyph_index + (write_dir * (k+1))]); + if (target_class != glyph_class) + break; + } + if (k != indexGlyphs-1) + continue; + TRACE("Matched IndexGlyphs\n"); + + cscr_3 = (const GSUB_ChainSubClassRule_3*)((BYTE *)cscr_2 + + FIELD_OFFSET(GSUB_ChainSubClassRule_2, Input[GET_BE_WORD(cscr_2->InputGlyphCount)-1])); + + for (k = 0; k < GET_BE_WORD(cscr_3->LookaheadGlyphCount); k++) + { + WORD target_class = GET_BE_WORD(cscr_3->LookAhead[k]); + WORD glyph_class = OT_get_glyph_class(lookahead_class_table, glyphs[glyph_index + (dirLookahead * (indexGlyphs+k))]); + if (target_class != glyph_class) + break; + } + if (k != GET_BE_WORD(cscr_3->LookaheadGlyphCount)) + continue; + TRACE("Matched LookAhead\n"); + + cscr_4 = (const GSUB_ChainSubClassRule_4*)((BYTE *)cscr_3 + + FIELD_OFFSET(GSUB_ChainSubClassRule_3, LookAhead[GET_BE_WORD(cscr_3->LookaheadGlyphCount)])); + + if (GET_BE_WORD(cscr_4->SubstCount)) + { + for (k = 0; k < GET_BE_WORD(cscr_4->SubstCount); k++) + { + int lookupIndex = GET_BE_WORD(cscr_4->SubstLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(cscr_4->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == GSUB_E_NOGLYPH) + { + ERR("Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + else return GSUB_E_NOGLYPH; + } } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { @@ -1020,7 +1383,7 @@ TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + if (newIndex == GSUB_E_NOGLYPH) { ERR("Chain failed to generate a glyph\n"); continue; @@ -1031,7 +1394,7 @@ else return GSUB_E_NOGLYPH; } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) @@ -1074,6 +1437,8 @@ return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 5: + return GSUB_apply_ContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); case 6: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); case 7: @@ -1667,6 +2032,109 @@ return rc; } +static INT GPOS_apply_ContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, + const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, GOFFSET *pGoffset) +{ + int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + TRACE("Contextual Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GPOS_ContextPosFormat2 *cpf2 = (GPOS_ContextPosFormat2*)GPOS_get_subtable(look, j); + + if (GET_BE_WORD(cpf2->PosFormat) == 1) + { + static int once; + if (!once++) + FIXME(" TODO: subtype 1\n"); + continue; + } + else if (GET_BE_WORD(cpf2->PosFormat) == 2) + { + WORD offset = GET_BE_WORD(cpf2->Coverage); + int index; + + TRACE("Contextual Positioning Subtable: Format 2\n"); + + index = GSUB_is_glyph_covered((const BYTE*)cpf2+offset, glyphs[glyph_index]); + TRACE("Coverage index %i\n",index); + if (index != -1) + { + int k, count, class; + const GPOS_PosClassSet *pcs; + const void *glyph_class_table = NULL; + + offset = GET_BE_WORD(cpf2->ClassDef); + glyph_class_table = (const BYTE *)cpf2 + offset; + + class = OT_get_glyph_class(glyph_class_table,glyphs[glyph_index]); + + offset = GET_BE_WORD(cpf2->PosClassSet[class]); + if (offset == 0) + { + TRACE("No class rule table for class %i\n",class); + continue; + } + pcs = (const GPOS_PosClassSet*)((const BYTE*)cpf2+offset); + count = GET_BE_WORD(pcs->PosClassRuleCnt); + TRACE("PosClassSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GPOS_PosClassRule_1 *pr; + const GPOS_PosClassRule_2 *pr_2; + int g_count, l; + + offset = GET_BE_WORD(pcs->PosClassRule[k]); + pr = (const GPOS_PosClassRule_1*)((const BYTE*)pcs+offset); + g_count = GET_BE_WORD(pr->GlyphCount); + TRACE("PosClassRule has %i glyphs classes\n",g_count); + for (l = 0; l < g_count-1; l++) + { + int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]); + if (g_class != GET_BE_WORD(pr->Class[l])) break; + } + + if (l < g_count-1) + { + TRACE("Rule does not match\n"); + continue; + } + + TRACE("Rule matches\n"); + pr_2 = (const GPOS_PosClassRule_2*)((const BYTE*)pr+ + FIELD_OFFSET(GPOS_PosClassRule_1, Class[g_count-1])); + + for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) + { + int lookupIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex) * write_dir; + + TRACE("Position: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + GPOS_apply_lookup(psc, lpotm, lplogfont, analysis, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, glyph_count, pGoffset); + } + return glyph_index + 1; + } + } + + TRACE("Not covered\n"); + continue; + } + else if (GET_BE_WORD(cpf2->PosFormat) == 3) + { + static int once; + if (!once++) + FIXME(" TODO: subtype 3\n"); + continue; + } + else + FIXME("Unhandled Contextual Positioning Format %i\n",GET_BE_WORD(cpf2->PosFormat)); + } + return glyph_index + 1; +} + static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, GOFFSET *pGoffset) @@ -1915,6 +2383,8 @@ } break; } + case 7: + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); case 8: { return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -1060,6 +1060,8 @@ INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1103,38 +1105,63 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { BOOL shaped = FALSE; if (psc->GSUB_Table) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { - i = nextIndex; - UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) { - if (context_shape[i] == Xn) + if (context_shape[char_index] == Xn) { - WORD newGlyph = pwOutGlyphs[i]; - if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + WORD newGlyph = pwOutGlyphs[glyph_index]; + if (pwcChars[char_index] >= FIRST_ARABIC_CHAR && pwcChars[char_index] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */ - WCHAR context_char = wine_shaping_forms[pwcChars[i] - FIRST_ARABIC_CHAR][context_shape[i]]; - if (context_char != pwcChars[i] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) - pwOutGlyphs[i] = newGlyph; + WCHAR context_char = wine_shaping_forms[pwcChars[char_index] - FIRST_ARABIC_CHAR][context_shape[char_index]]; + if (context_char != pwcChars[char_index] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) + pwOutGlyphs[glyph_index] = newGlyph; } } - i++; + char_index += dirL; + glyph_index += dirL; } } @@ -1281,6 +1308,8 @@ INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1343,19 +1372,45 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) - { - INT nextIndex; + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) + { + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -1415,6 +1470,8 @@ INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1463,24 +1520,36 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) - { - if (context_shape[i] >= 0) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) + { + if (context_shape[char_index] >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -2143,7 +2212,7 @@ switch( type ) { case 0x0d07: /* Unknown */ - case 0x0e07: /* Unknwon */ + case 0x0e07: /* Unknown */ default: return lex_Generic; case 0x0001: case 0x0002: @@ -2757,6 +2826,8 @@ INT *context_shape; INT dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -2793,19 +2864,28 @@ } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -1352,7 +1352,7 @@ for (i = 0; i < cInChars; i++) { /* Joiners get merged preferencially right */ - if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ || pwcInChars[i] == ZWSP)) { int j; if (i+1 == cInChars) @@ -1361,7 +1361,8 @@ { for (j = i+1; j < cInChars; j++) { - if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ + && pwcInChars[j] != ZWSP && pwcInChars[j] != Numeric_space) { scripts[i] = scripts[j]; break; @@ -1486,14 +1487,15 @@ } /* Joiners get merged preferencially right */ - if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ || pwcInChars[i] == ZWSP)) { int j; if (i+1 == cInChars && levels[i-1] == levels[i]) strength[i] = strength[i-1]; else for (j = i+1; j < cInChars && levels[i] == levels[j]; j++) - if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ + && pwcInChars[j] != ZWSP && pwcInChars[j] != Numeric_space) { strength[i] = strength[j]; break; @@ -3112,9 +3114,6 @@ chInput = mirror_char(pwcChars[idx]); else chInput = pwcChars[idx]; - /* special case for tabs */ - if (chInput == 0x0009) - chInput = 0x0020; rChars[i] = chInput; } else @@ -3154,6 +3153,20 @@ SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); SHAPE_CharGlyphProp(hdc, (ScriptCache *)*psc, psa, pwcChars, cChars, pwOutGlyphs, *pcGlyphs, pwLogClust, pCharProps, pOutGlyphProps); + + for (i = 0; i < cChars; ++i) + { + /* Special case for tabs and joiners. As control characters, ZWNJ + * and ZWJ would in principle get handled by the corresponding + * shaping functions. However, since ZWNJ and ZWJ can get merged + * into adjoining runs during itemisation, these don't generally + * get classified as Script_Control. */ + if (pwcChars[i] == 0x0009 || pwcChars[i] == ZWSP || pwcChars[i] == ZWNJ || pwcChars[i] == ZWJ) + { + pwOutGlyphs[pwLogClust[i]] = ((ScriptCache *)*psc)->sfp.wgBlank; + pOutGlyphProps[pwLogClust[i]].sva.fZeroWidth = 1; + } + } heap_free(rChars); } else @@ -3178,7 +3191,8 @@ pOutGlyphProps[i].sva.fZeroWidth = 1; } } - else if (psa->eScript == Script_Control) + else if (psa->eScript == Script_Control || pwcChars[idx] == ZWSP + || pwcChars[idx] == ZWNJ || pwcChars[idx] == ZWJ) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C) Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -22,7 +22,7 @@ @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) @ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) @ stub ScriptPositionSingleGlyph -@ stdcall ScriptRecordDigitSubstitution(ptr ptr) +@ stdcall ScriptRecordDigitSubstitution(long ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -147,8 +147,8 @@ #define NUM_PAGES 17 -#define GSUB_E_NOFEATURE -2 -#define GSUB_E_NOGLYPH -1 +#define GSUB_E_NOFEATURE -20 +#define GSUB_E_NOGLYPH -10 #define FEATURE_ALL_TABLES 0 #define FEATURE_GSUB_TABLE 1 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 19 16:53:04 2017 @@ -189,7 +189,7 @@ reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 -reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23 +reactos/dll/win32/usp10 # Synced to WineStaging-2.2 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/version # Synced to WineStaging-1.9.11

7 years, 6 months

[ekohl] 74192: [AT] Fix duplicate resource string.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 19 00:43:26 2017 New Revision: 74192 URL: http://svn.reactos.org/svn/reactos?rev=74192&view=rev Log: [AT] Fix duplicate resource string. Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Sun Mar 19 00:43:26 2017 @@ -29,7 +29,6 @@ IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N]: " IDS_NEW_JOB "Added a new job with job ID = %lu\n" - IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" IDS_JOBS_LIST "Status ID Day Time Command Line\n" IDS_NO_ENTRIES "There are no entries in the list.\n"

7 years, 6 months

[sgasiorek] 74191: import EGA palette fix from Wine

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Sun Mar 19 00:35:48 2017 New Revision: 74191 URL: http://svn.reactos.org/svn/reactos?rev=74191&view=rev Log: import EGA palette fix from Wine Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Mar 19 00:35:48 2017 @@ -10,27 +10,6 @@ #define NDEBUG #include <debug.h> - -static const RGBQUAD EGAColorsQuads[16] = -{ - /* rgbBlue, rgbGreen, rgbRed, rgbReserved */ - { 0x00, 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x80, 0x00 }, - { 0x00, 0x80, 0x00, 0x00 }, - { 0x00, 0x80, 0x80, 0x00 }, - { 0x80, 0x00, 0x00, 0x00 }, - { 0x80, 0x00, 0x80, 0x00 }, - { 0x80, 0x80, 0x00, 0x00 }, - { 0x80, 0x80, 0x80, 0x00 }, - { 0xc0, 0xc0, 0xc0, 0x00 }, - { 0x00, 0x00, 0xff, 0x00 }, - { 0x00, 0xff, 0x00, 0x00 }, - { 0x00, 0xff, 0xff, 0x00 }, - { 0xff, 0x00, 0x00, 0x00 }, - { 0xff, 0x00, 0xff, 0x00 }, - { 0xff, 0xff, 0x00, 0x00 }, - { 0xff, 0xff, 0xff, 0x00 } -}; static const RGBQUAD DefLogPaletteQuads[20] = /* Copy of Default Logical Palette */ { @@ -883,7 +862,12 @@ break; case 4: - RtlCopyMemory(rgbQuads, EGAColorsQuads, sizeof(EGAColorsQuads)); + /* The EGA palette is the first and last 8 colours of the default palette + with the innermost pair swapped */ + RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 7 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 7, DefLogPaletteQuads + 12, 1 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 8, DefLogPaletteQuads + 7, 1 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 9, DefLogPaletteQuads + 13, 7 * sizeof(RGBQUAD)); break; case 8:

7 years, 6 months

[ekohl] 74190: [AT] Implement the AT command: - The /every and /next options are not supported yet. - The 12 hour time format cannot be parsed yet.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 19 00:11:31 2017 New Revision: 74190 URL: http://svn.reactos.org/svn/reactos?rev=74190&view=rev Log: [AT] Implement the AT command: - The /every and /next options are not supported yet. - The 12 hour time format cannot be parsed yet. Added: trunk/reactos/base/applications/cmdutils/at/ (with props) trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/at/at.c (with props) trunk/reactos/base/applications/cmdutils/at/at.rc (with props) trunk/reactos/base/applications/cmdutils/at/lang/ (with props) trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc (with props) trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/at/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -1,3 +1,4 @@ +add_subdirectory(at) add_subdirectory(clip) add_subdirectory(comp) add_subdirectory(cscript) Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 19 00:11:31 2017 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/at/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(at at.c at.rc) +set_module_type(at win32cui UNICODE) +target_link_libraries(at conutils ${PSEH_LIB}) +add_importlibs(at msvcrt kernel32 user32 netapi32) +add_cd_file(TARGET at DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/at/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c (added) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,515 @@ +/* + * PROJECT: ReactOS AT utility + * COPYRIGHT: See COPYING in the top level directory + * FILE: base/applications/cmdutils/at/at.c + * PURPOSE: ReactOS AT utility + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include <stdlib.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wincon.h> +#include <winnls.h> +#include <lm.h> + +#include <conutils.h> + +#include "resource.h" + + +static +BOOL +ParseTime( + PWSTR pszTime, + PULONG pulJobHour, + PULONG pulJobMinute) +{ + PWSTR startPtr, endPtr; + ULONG ulHour = 0, ulMinute = 0; + BOOL bResult = FALSE; + + startPtr = pszTime; + endPtr = NULL; + ulHour = wcstoul(startPtr, &endPtr, 10); + if (ulHour < 24 && endPtr != NULL && *endPtr == L':') + { + startPtr = endPtr + 1; + endPtr = NULL; + ulMinute = wcstoul(startPtr, &endPtr, 10); + if (ulMinute < 60 && endPtr != NULL && *endPtr == UNICODE_NULL) + { + bResult = TRUE; + + if (pulJobHour != NULL) + *pulJobHour = ulHour; + + if (pulJobMinute != NULL) + *pulJobMinute = ulMinute; + } + } + + return bResult; +} + + +static +BOOL +ParseId( + PWSTR pszId, + PULONG pulId) +{ + PWSTR startPtr, endPtr; + ULONG ulId = 0; + BOOL bResult = FALSE; + + startPtr = pszId; + endPtr = NULL; + ulId = wcstoul(startPtr, &endPtr, 10); + if (endPtr != NULL && *endPtr == UNICODE_NULL) + { + bResult = TRUE; + + if (pulId != NULL) + *pulId = ulId; + } + + return bResult; +} + + +static +VOID +PrintErrorMessage( + DWORD dwError) +{ + PWSTR pszBuffer = NULL; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + 0, + (PWSTR)&pszBuffer, + 0, + NULL); + + ConPuts(StdErr, pszBuffer); + LocalFree(pszBuffer); +} + + +static +VOID +PrintHorizontalLine(VOID) +{ + WCHAR szBuffer[80]; + INT i; + + for (i = 0; i < 79; i++) + szBuffer[i] = L'-'; + szBuffer[79] = UNICODE_NULL; + + ConPuts(StdOut, szBuffer); +} + + +static +DWORD_PTR +GetTimeAsJobTime(VOID) +{ + SYSTEMTIME Time; + DWORD_PTR JobTime; + + GetLocalTime(&Time); + + JobTime = (DWORD_PTR)Time.wHour * 3600000 + + (DWORD_PTR)Time.wMinute * 60000; + + return JobTime; +} + + +static +VOID +JobTimeToTimeString( + PWSTR pszBuffer, + INT cchBuffer, + WORD wHour, + WORD wMinute) +{ + SYSTEMTIME Time = {0, 0, 0, 0, 0, 0, 0, 0}; + + Time.wHour = wHour; + Time.wMinute = wMinute; + + GetTimeFormat(LOCALE_USER_DEFAULT, + TIME_NOSECONDS, + &Time, + NULL, + pszBuffer, + cchBuffer); +} + +static +INT +PrintJobDetails( + PWSTR pszComputerName, + ULONG ulJobId) +{ + AT_INFO *pBuffer = NULL; + DWORD_PTR CurrentTime; + WCHAR szStatusBuffer[16]; + WCHAR szDayBuffer[32]; + WCHAR szTimeBuffer[16]; + WCHAR szInteractiveBuffer[16]; + HINSTANCE hInstance; + NET_API_STATUS Status; + + hInstance = GetModuleHandle(NULL); + + Status = NetScheduleJobGetInfo(pszComputerName, + ulJobId, + (PBYTE *)&pBuffer); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + if (pBuffer->Flags & JOB_EXEC_ERROR) + LoadStringW(hInstance, IDS_ERROR, szStatusBuffer, ARRAYSIZE(szStatusBuffer)); + else + LoadStringW(hInstance, IDS_OK, szStatusBuffer, ARRAYSIZE(szStatusBuffer)); + + if (pBuffer->DaysOfMonth != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfMonth!"); + } + else if (pBuffer->DaysOfWeek != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfWeek!"); + } + else + { + CurrentTime = GetTimeAsJobTime(); + if (CurrentTime > pBuffer->JobTime) + LoadStringW(hInstance, IDS_TOMORROW, szDayBuffer, ARRAYSIZE(szDayBuffer)); + else + LoadStringW(hInstance, IDS_TODAY, szDayBuffer, ARRAYSIZE(szDayBuffer)); + } + + JobTimeToTimeString(szTimeBuffer, + ARRAYSIZE(szTimeBuffer), + (WORD)(pBuffer->JobTime / 3600000), + (WORD)((pBuffer->JobTime % 3600000) / 60000)); + + if (pBuffer->Flags & JOB_NONINTERACTIVE) + LoadStringW(hInstance, IDS_NO, szInteractiveBuffer, ARRAYSIZE(szInteractiveBuffer)); + else + LoadStringW(hInstance, IDS_YES, szInteractiveBuffer, ARRAYSIZE(szInteractiveBuffer)); + + ConResPrintf(StdOut, IDS_TASKID, ulJobId); + ConResPrintf(StdOut, IDS_STATUS, szStatusBuffer); + ConResPrintf(StdOut, IDS_SCHEDULE, szDayBuffer); + ConResPrintf(StdOut, IDS_TIME, szTimeBuffer); + ConResPrintf(StdOut, IDS_INTERACTIVE, szInteractiveBuffer); + ConResPrintf(StdOut, IDS_COMMAND, pBuffer->Command); + + NetApiBufferFree(pBuffer); + + return 0; +} + + +static +INT +PrintAllJobs( + PWSTR pszComputerName) +{ + PAT_ENUM pBuffer = NULL; + DWORD dwRead = 0, dwTotal = 0; + DWORD dwResume = 0, i; + DWORD_PTR CurrentTime; + NET_API_STATUS Status; + + WCHAR szDayBuffer[32]; + WCHAR szTimeBuffer[16]; + HINSTANCE hInstance; + + Status = NetScheduleJobEnum(pszComputerName, + (PBYTE *)&pBuffer, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &dwResume); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + if (dwTotal == 0) + { + ConResPrintf(StdOut, IDS_NO_ENTRIES); + return 0; + } + + ConResPrintf(StdOut, IDS_JOBS_LIST); + PrintHorizontalLine(); + + hInstance = GetModuleHandle(NULL); + + for (i = 0; i < dwRead; i++) + { + if (pBuffer[i].DaysOfMonth != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfMonth"); + } + else if (pBuffer[i].DaysOfWeek != 0) + { + wcscpy(szDayBuffer, L"TODO: DaysOfWeek"); + } + else + { + CurrentTime = GetTimeAsJobTime(); + if (CurrentTime > pBuffer[i].JobTime) + LoadStringW(hInstance, IDS_TOMORROW, szDayBuffer, ARRAYSIZE(szDayBuffer)); + else + LoadStringW(hInstance, IDS_TODAY, szDayBuffer, ARRAYSIZE(szDayBuffer)); + } + + JobTimeToTimeString(szTimeBuffer, + ARRAYSIZE(szTimeBuffer), + (WORD)(pBuffer[i].JobTime / 3600000), + (WORD)((pBuffer[i].JobTime % 3600000) / 60000)); + + ConPrintf(StdOut, + L" %7lu %-22s %-12s %s\n", + pBuffer[i].JobId, + szDayBuffer, + szTimeBuffer, + pBuffer[i].Command); + } + + NetApiBufferFree(pBuffer); + + return 0; +} + + +static +INT +AddJob( + PWSTR pszComputerName, + ULONG ulJobHour, + ULONG ulJobMinute, + BOOL bInteractiveJob, + PWSTR pszCommand) +{ + AT_INFO InfoBuffer; + ULONG ulJobId = 0; + NET_API_STATUS Status; + + InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + + (DWORD_PTR)ulJobMinute * 60000; + InfoBuffer.DaysOfMonth = 0; + InfoBuffer.DaysOfWeek = 0; + InfoBuffer.Flags = bInteractiveJob ? 0 : JOB_NONINTERACTIVE; + InfoBuffer.Command = pszCommand; + + Status = NetScheduleJobAdd(pszComputerName, + (PBYTE)&InfoBuffer, + &ulJobId); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + ConResPrintf(StdOut, IDS_NEW_JOB, ulJobId); + + return 0; +} + + +static +INT +DeleteJob( + PWSTR pszComputerName, + ULONG ulJobId, + BOOL bForceDelete) +{ + NET_API_STATUS Status; + + if (ulJobId == (ULONG)-1 && bForceDelete == FALSE) + { + ConResPrintf(StdOut, IDS_CONFIRM_DELETE); + return 0; + } + + Status = NetScheduleJobDel(pszComputerName, + (ulJobId == (ULONG)-1) ? 0 : ulJobId, + (ulJobId == (ULONG)-1) ? -1 : ulJobId); + if (Status != NERR_Success) + { + PrintErrorMessage(Status); + return 1; + } + + return 0; +} + + +int wmain(int argc, WCHAR **argv) +{ + PWSTR pszComputerName = NULL; + PWSTR pszCommand = NULL; + ULONG ulJobId = (ULONG)-1; + ULONG ulJobHour = (ULONG)-1; + ULONG ulJobMinute = (ULONG)-1; + BOOL bDeleteJob = FALSE, bForceDelete = FALSE; + BOOL bInteractiveJob = FALSE; + BOOL bPrintUsage = FALSE; + INT nResult = 0; + INT i, minIdx; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + /* Parse the computer name */ + i = 1; + minIdx = 1; + if (i < argc && + argv[i][0] == L'\\' && + argv[i][1] == L'\\') + { + pszComputerName = argv[i]; + i++; + minIdx++; + } + + /* Parse the time or job id */ + if (i < argc && argv[i][0] != L'/') + { + if (ParseTime(argv[i], &ulJobHour, &ulJobMinute)) + { + i++; + minIdx++; + } + else if (ParseId(argv[i], &ulJobId)) + { + i++; + minIdx++; + } + } + + /* Parse the options */ + for (; i < argc; i++) + { + if (argv[i][0] == L'/') + { + if (_wcsicmp(argv[i], L"/?") == 0) + { + bPrintUsage = TRUE; + goto done; + } + else if (_wcsicmp(argv[i], L"/delete") == 0) + { + bDeleteJob = TRUE; + } + else if (_wcsicmp(argv[i], L"/yes") == 0) + { + bForceDelete = TRUE; + } + else if (_wcsicmp(argv[i], L"/interactive") == 0) + { + bInteractiveJob = TRUE; + } +/* + else if (_wcsnicmp(argv[i], L"/every:", 7) == 0) + { + } + else if (_wcsnicmp(argv[i], L"/next:", 6) == 0) + { + } +*/ + else + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + } + } + + /* Parse the command */ + if (argc > minIdx && argv[argc - 1][0] != L'/') + { + pszCommand = argv[argc - 1]; + } + + if (bDeleteJob == TRUE) + { + /* Check for invalid options or arguments */ + if (bInteractiveJob == TRUE || + ulJobHour != (ULONG)-1 || + ulJobMinute != (ULONG)-1 || + pszCommand != NULL) + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + + nResult = DeleteJob(pszComputerName, ulJobId, bForceDelete); + } + else + { + if (ulJobHour != (ULONG)-1 && ulJobMinute != (ULONG)-1) + { + /* Check for invalid options or arguments */ + if (bForceDelete == TRUE || pszCommand == NULL) + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + + nResult = AddJob(pszComputerName, + ulJobHour, + ulJobMinute, + bInteractiveJob, + pszCommand); + } + else + { + /* Check for invalid options or arguments */ + if (bForceDelete == TRUE || bInteractiveJob == TRUE) + { + bPrintUsage = TRUE; + nResult = 1; + goto done; + } + + if (ulJobId == (ULONG)-1) + { + nResult = PrintAllJobs(pszComputerName); + } + else + { + nResult = PrintJobDetails(pszComputerName, ulJobId); + } + } + } + +done: + if (bPrintUsage == TRUE) + ConResPuts(StdOut, IDS_USAGE); + + return nResult; +} + +/* EOF */ Propchange: trunk/reactos/base/applications/cmdutils/at/at.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/at.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/at.rc [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,17 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS AT Command" +#define REACTOS_STR_INTERNAL_NAME "at" +#define REACTOS_STR_ORIGINAL_FILENAME "at.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/at/at.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 19 00:11:31 2017 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,40 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Mit dem AT Befeht kÃ¶nnen Befehle und Programme zu einem vorbestimmten\n\ +Termin gestartet werden. Der Zeitplandienst muss gestartet sein, um den\n\ +Befeht AT zu verwenden.\n\n\ +AT [\\\\Computername] [ [Kennung] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\Computername] Zeit [/INTERACTIVE]\n\ + [ /EVERY:Datum[,...] | /NEXT:Datum[,...]] ""Befehl""\n\n\ +\\\\Computername ...\n\ +Kennung ...\n\ +/DELETE ...\n\ +/YES ...\n\ +Zeit Gibt die Zeit an, zu der ein Befehl ausgefÃ¼hrt werden soll.\n\ +/INTERACTIVE ...\n\ +/EVERY:Datum[,...] ...\n\ +/NEXT:Datum[,...] ...\n\ +""Befehl"" Ist der auszufÃ¼hrende Befehl oder das Stapelprogramm.\n" + + IDS_CONFIRM_DELETE "Dieser Vorgang wird alle geplanten AufrÃ¤ge lÃ¶schen.\nMÃ¶chten Sie diesen Vorgang fortsetzen? (J/N) [N]" + IDS_NEW_JOB "Neuer Auftrag hinzugefÃ¼gt. Kennung = %lu\n" + IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" + IDS_NO_ENTRIES "Es sind keine EintrÃ¤ge in der Liste.\n" + + IDS_TODAY "Heute" + IDS_TOMORROW "Morgen" + + IDS_YES "Ja" + IDS_NO "Nein" + IDS_ERROR "ERROR" + IDS_OK "OK" + + IDS_TASKID "Taskkennung: %lu\n" + IDS_STATUS "Status: %s\n" + IDS_SCHEDULE "Zeitplan: %s\n" + IDS_TIME "Zeit: %s\n" + IDS_INTERACTIVE "Interaktiv: %s\n" + IDS_COMMAND "Befehl: %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,50 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "The AT command schedules commands and programs to run on a computer at\n\ +a specified time and date. The Schedule service must be running to use\n\ +the AT command.\n\n\ +AT [\\\\computername] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\computername] time [/INTERACTIVE]\n\ + [ /EVERY:date[,...] | /NEXT:date[,...]] ""command""\n\n\ +\\\\computername Specifies a remote computer. Commands are scheduled on the \n\ + local computer if this parameter is omitted.\n\ +id Is an identification number assigned to a scheduled\n\ + command.\n\ +/DELETE Cancels a scheduled command. If id is omitted, all the\n\ + scheduled commands on the computer are canceled.\n\ +/YES Used with cancel all jobs command when no further\n\ + confirmation is desired.\n\ +Zeit Specifies the time when command is to run.\n\ +/INTERACTIVE Allows the ob to interact with the desktop of the user\n\ + who is logged on at the time the job runs.\n\ +/EVERY:date[,...] Runs the command on each specified day(s) of the week or\n\ + month. If date is omitted, the current day of the month\n\ + is assumed.\n\ +/NEXT:date[,...] Runs the specified command on the next occurrence of the\n\ + day (for example, next Thursday). If date is omitted, the \n\ + current day of the month is assumed.\n\ +""command"" Is the command or batch program to be run.\n" + + IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N]: " + IDS_NEW_JOB "Added a new job with job ID = %lu\n" + IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" + IDS_JOBS_LIST "Status ID Day Time Command Line\n" + IDS_NO_ENTRIES "There are no entries in the list.\n" + + IDS_TODAY "Today" + IDS_TOMORROW "Tomorrow" + + IDS_YES "Yes" + IDS_NO "No" + IDS_ERROR "ERROR" + IDS_OK "OK" + + IDS_TASKID "Task ID: %lu\n" + IDS_STATUS "Status: %s\n" + IDS_SCHEDULE "Schedule: %s\n" + IDS_TIME "Time of day: %s\n" + IDS_INTERACTIVE "Interactive: %s\n" + IDS_COMMAND "Command: %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/at/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] Sun Mar 19 00:11:31 2017 @@ -0,0 +1,24 @@ +#pragma once + +#define IDS_USAGE 100 + +#define IDS_CONFIRM_DELETE 105 +#define IDS_NEW_JOB 106 +#define IDS_JOBS_LIST 107 +#define IDS_NO_ENTRIES 108 + +#define IDS_TODAY 109 +#define IDS_TOMORROW 110 + + +#define IDS_YES 101 +#define IDS_NO 102 +#define IDS_ERROR 103 +#define IDS_OK 104 + +#define IDS_TASKID 122 +#define IDS_STATUS 123 +#define IDS_SCHEDULE 124 +#define IDS_TIME 125 +#define IDS_INTERACTIVE 126 +#define IDS_COMMAND 127 Propchange: trunk/reactos/base/applications/cmdutils/at/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 6 months

[pschweitzer] 74189: [MUP] Properly define magic values for CCB and DFS

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 18 14:03:45 2017 New Revision: 74189 URL: http://svn.reactos.org/svn/reactos?rev=74189&view=rev Log: [MUP] Properly define magic values for CCB and DFS Modified: trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/mup/mup.h Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sat Mar 18 14:03:45 2017 @@ -1804,7 +1804,7 @@ MasterQueryContext->LatestProvider = QueryContext->UncProvider; MasterQueryContext->LatestStatus = Status; - if (MasterQueryContext->FileObject->FsContext2 != DFS_MAGIC_CCB) + if (MasterQueryContext->FileObject->FsContext2 != (PVOID)DFS_DOWNLEVEL_OPEN_CONTEXT) { /* Allocate a buffer for the prefix */ AcceptedPrefix = ExAllocatePoolWithTag(PagedPool, QueryResponse->LengthAccepted, TAG_MUP); @@ -2045,7 +2045,7 @@ } /* Ok, at that point, that's a regular MUP opening (if no DFS) */ - if (!MupEnableDfs || FileObject->FsContext2 == DFS_MAGIC_CCB) + if (!MupEnableDfs || FileObject->FsContext2 == (PVOID)DFS_DOWNLEVEL_OPEN_CONTEXT) { /* We won't complete immediately */ IoMarkIrpPending(Irp); Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] Sat Mar 18 14:03:45 2017 @@ -17,8 +17,12 @@ #define TAG_MUP ' puM' -#define DFS_MAGIC_CCB (PVOID)0x11444653 #define FILE_SIMPLE_RIGHTS_MASK (FILE_ALL_ACCESS & ~STANDARD_RIGHTS_REQUIRED &~ SYNCHRONIZE) + +#define DFS_OPEN_CONTEXT 0xFF444653 +#define DFS_DOWNLEVEL_OPEN_CONTEXT 0x11444653 +#define DFS_CSCAGENT_NAME_CONTEXT 0xAAAAAAAA +#define DFS_USER_NAME_CONTEXT 0xBBBBBBBB #define NODE_TYPE_VCB 0x1 #define NODE_TYPE_UNC 0x2

7 years, 6 months

[mjansen] 74188: [USETUP] Split font substitution settings for CJK languages. Patch by Katayama Hirofumi MZ. CORE-9615

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Mar 18 13:28:57 2017 New Revision: 74188 URL: http://svn.reactos.org/svn/reactos?rev=74188&view=rev Log: [USETUP] Split font substitution settings for CJK languages. Patch by Katayama Hirofumi MZ. CORE-9615 Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Sat Mar 18 13:28:57 2017 @@ -2,8 +2,7 @@ MUI_SUBFONT LatinFonts[] = { - /*Font Substitute */ - + /*Font Substitute */ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, @@ -82,7 +81,11 @@ { NULL, NULL } }; -MUI_SUBFONT CJKFonts[] = +WCHAR CSF_LocalName0[] = {0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName1[] = {0x65B0, 0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName2[] = {0x4E2D, 0x6613, 0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName3[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; +MUI_SUBFONT ChineseSimplifiedFonts[] = { { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, @@ -101,6 +104,109 @@ { L"Terminal", L"DejaVu Sans Mono" }, { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, + { L"SimSun", L"Droid Sans Fallback" }, + { L"NSimSun", L"Droid Sans Fallback" }, + { L"MS Song", L"Droid Sans Fallback" }, + /* localized names */ + { CSF_LocalName0, L"Droid Sans Fallback" }, + { CSF_LocalName1, L"Droid Sans Fallback" }, + { CSF_LocalName2, L"Droid Sans Fallback" }, + { CSF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR CTF_LocalName0[] = {0x7D30, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName1[] = {0x65B0, 0x7D30, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName2[] = {0x83EF, 0x5EB7, 0x4E2D, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; +MUI_SUBFONT ChineseTraditionalFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + /* localized names */ + { CTF_LocalName0, L"Droid Sans Fallback" }, + { CTF_LocalName1, L"Droid Sans Fallback" }, + { CTF_LocalName2, L"Droid Sans Fallback" }, + { CTF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR JF_LocalName0[] = {0xFF2D, 0xFF33, ' ', 0x660E, 0x671D, 0}; +WCHAR JF_LocalName1[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x660E, 0x671D, 0}; +WCHAR JF_LocalName2[] = {0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +MUI_SUBFONT JapaneseFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + /* localized names */ + { JF_LocalName0, L"Droid Sans Fallback" }, + { JF_LocalName1, L"Droid Sans Fallback" }, + { JF_LocalName2, L"Droid Sans Fallback" }, + { JF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR KF_LocalName0[] = {0xBC14, 0xD0D5, 0}; +WCHAR KF_LocalName1[] = {0xBC14, 0xD0D5, 0xCCB4, 0}; +WCHAR KF_LocalName2[] = {0xAD81, 0xC11C, 0}; +WCHAR KF_LocalName3[] = {0xAD81, 0xC11C, 0xCCB4, 0}; +MUI_SUBFONT KoreanFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, + /* localized names */ + { KF_LocalName0, L"Droid Sans Fallback" }, + { KF_LocalName1, L"Droid Sans Fallback" }, + { KF_LocalName2, L"Droid Sans Fallback" }, + { KF_LocalName3, L"Droid Sans Fallback" }, { NULL, NULL } }; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sat Mar 18 13:28:57 2017 @@ -499,19 +499,19 @@ {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhTWLayouts }, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhCNLayouts }, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhHKLayouts }, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhSGLayouts }, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhMOLayouts }, #endif #ifdef LANGUAGE_HR_HR {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, @@ -652,7 +652,7 @@ {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, #endif #ifdef LANGUAGE_KN_IN {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, @@ -664,7 +664,7 @@ {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, KoreanFonts, koKRLayouts }, #endif #ifdef LANGUAGE_KY_KG {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts },

7 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2017