July 2010 - Wine-Commits - list.winehq.org

Thomas Mullaly : urlmon: Implemented canonicalization functions for IPv4 addresses.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: a3dd8f4598b838d647dc2d7e2b94621acbb990ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3dd8f4598b838d647dc2d7e2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jun 23 23:21:14 2010 -0400 urlmon: Implemented canonicalization functions for IPv4 addresses. --- dlls/urlmon/uri.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 192 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index cbd8c15..060b92e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -30,20 +30,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IUriVtbl *lpIUriVtbl; LONG ref; - BSTR raw_uri; + + BSTR raw_uri; /* Information about the canonicalized URI's buffer. */ - WCHAR *canon_uri; - DWORD canon_size; - DWORD canon_len; + WCHAR *canon_uri; + DWORD canon_size; + DWORD canon_len; + + INT scheme_start; + DWORD scheme_len; + URL_SCHEME scheme_type; - INT scheme_start; - DWORD scheme_len; - URL_SCHEME scheme_type; + INT userinfo_start; + DWORD userinfo_len; + INT userinfo_split; - INT userinfo_start; - DWORD userinfo_len; - INT userinfo_split; + INT host_start; + DWORD host_len; + Uri_HOST_TYPE host_type; } Uri; typedef struct { @@ -233,6 +238,34 @@ static inline void pct_encode_val(WCHAR val, WCHAR *dest) { dest[2] = hexDigits[val & 0xf]; } +/* Converts an IPv4 address in numerical form into it's fully qualified + * string form. This function returns the number of characters written + * to 'dest'. If 'dest' is NULL this function will return the number of + * characters that would have been written. + * + * It's up to the caller to ensure there's enough space in 'dest' for the + * address. + */ +static DWORD ui2ipv4(WCHAR *dest, UINT address) { + static const WCHAR formatW[] = + {'%','u','.','%','u','.','%','u','.','%','u',0}; + DWORD ret = 0; + UCHAR digits[4]; + + digits[0] = (address >> 24) & 0xff; + digits[1] = (address >> 16) & 0xff; + digits[2] = (address >> 8) & 0xff; + digits[3] = address & 0xff; + + if(!dest) { + WCHAR tmp[16]; + ret = sprintfW(tmp, formatW, digits[0], digits[1], digits[2], digits[3]); + } else + ret = sprintfW(dest, formatW, digits[0], digits[1], digits[2], digits[3]); + + return ret; +} + /* Checks if the characters pointed to by 'ptr' are * a percent encoded data octet. * @@ -823,12 +856,160 @@ static BOOL canonicalize_userinfo(const parse_data *data, Uri *uri, DWORD flags, return TRUE; } +/* Attempts to canonicalize an implicit IPv4 address. */ +static BOOL canonicalize_implicit_ipv4address(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + uri->host_start = uri->canon_len; + + TRACE("%u\n", data->implicit_ipv4); + /* For unknown scheme types Window's doesn't convert + * the value into an IP address, but, it still considers + * it an IPv4 address. + */ + if(data->scheme_type == URL_SCHEME_UNKNOWN) { + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->host, data->host_len*sizeof(WCHAR)); + uri->canon_len += data->host_len; + } else { + if(!computeOnly) + uri->canon_len += ui2ipv4(uri->canon_uri+uri->canon_len, data->implicit_ipv4); + else + uri->canon_len += ui2ipv4(NULL, data->implicit_ipv4); + } + + uri->host_len = uri->canon_len - uri->host_start; + uri->host_type = Uri_HOST_IPV4; + + if(!computeOnly) + TRACE("%p %p %x %d): Canonicalized implicit IP address=%s len=%d\n", + data, uri, flags, computeOnly, + debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), + uri->host_len); + + return TRUE; +} + +/* Attempts to canonicalize an IPv4 address. + * + * If the parse_data represents a URI that has an implicit IPv4 address + * (ex. http://256/, this function will convert 256 into 0.0.1.0). If + * the implicit IP address exceeds the value of UINT_MAX (maximum value + * for an IPv4 address) it's canonicalized as if were a reg-name. + * + * If the parse_data contains a partial or full IPv4 address it normalizes it. + * A partial IPv4 address is something like "192.0" and would be normalized to + * "192.0.0.0". With a full (or partial) IPv4 address like "192.002.01.003" would + * be normalized to "192.2.1.3". + * + * NOTES: + * Window's ONLY normalizes IPv4 address for known scheme types (one that isn't + * URL_SCHEME_UNKNOWN). For unknown scheme types, it simply copies the data from + * the original URI into the canonicalized URI, but, it still recognizes URI's + * host type as HOST_IPV4. + */ +static BOOL canonicalize_ipv4address(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + if(data->has_implicit_ip) + return canonicalize_implicit_ipv4address(data, uri, flags, computeOnly); + else { + uri->host_start = uri->canon_len; + + /* Windows only normalizes for known scheme types. */ + if(data->scheme_type != URL_SCHEME_UNKNOWN) { + /* parse_data contains a partial or full IPv4 address, so normalize it. */ + DWORD i, octetDigitCount = 0, octetCount = 0; + BOOL octetHasDigit = FALSE; + + for(i = 0; i < data->host_len; ++i) { + if(data->host[i] == '0' && !octetHasDigit) { + /* Can ignore leading zeros if: + * 1) It isn't the last digit of the octet. + * 2) i+1 != data->host_len + * 3) i+1 != '.' + */ + if(octetDigitCount == 2 || + i+1 == data->host_len || + data->host[i+1] == '.') { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = data->host[i]; + ++uri->canon_len; + TRACE("Adding zero\n"); + } + } else if(data->host[i] == '.') { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = data->host[i]; + ++uri->canon_len; + + octetDigitCount = 0; + octetHasDigit = FALSE; + ++octetCount; + } else { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = data->host[i]; + ++uri->canon_len; + + ++octetDigitCount; + octetHasDigit = TRUE; + } + } + + /* Make sure the canonicalized IP address has 4 dec-octets. + * If doesn't add "0" ones until there is 4; + */ + for( ; octetCount < 3; ++octetCount) { + if(!computeOnly) { + uri->canon_uri[uri->canon_len] = '.'; + uri->canon_uri[uri->canon_len+1] = '0'; + } + + uri->canon_len += 2; + } + } else { + /* Windows doesn't normalize addresses in unknown schemes. */ + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->host, data->host_len*sizeof(WCHAR)); + uri->canon_len += data->host_len; + } + + uri->host_len = uri->canon_len - uri->host_start; + if(!computeOnly) + TRACE("(%p %p %x %d): Canonicalized IPv4 address, ip=%s len=%d\n", + data, uri, flags, computeOnly, + debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), + uri->host_len); + } + + return TRUE; +} + +static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + uri->host_start = -1; + uri->host_len = 0; + + if(data->host) { + switch(data->host_type) { + case Uri_HOST_IPV4: + uri->host_type = Uri_HOST_IPV4; + if(!canonicalize_ipv4address(data, uri, flags, computeOnly)) + return FALSE; + + break; + default: + WARN("(%p %p %x %d): Canonicalization not supported yet\n", data, + uri, flags, computeOnly); + } + } + + return TRUE; +} + /* Canonicalizes the authority of the URI represented by the parse_data. */ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { if(!canonicalize_userinfo(data, uri, flags, computeOnly)) return FALSE; - /* TODO: canonicalize the host and port information. */ + if(!canonicalize_host(data, uri, flags, computeOnly)) + return FALSE; + + /* TODO Canonicalize port information. */ return TRUE; }

1 0

Vincent Povirk : wineboot: Don' t abort shutdown if we have to terminate a process.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: da8904d150694ba82b201ec72e2e94cba9dd4475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8904d150694ba82b201ec72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 22 16:49:35 2010 -0500 wineboot: Don't abort shutdown if we have to terminate a process. We can sometimes get a FALSE result from WM_QUERYENDSESSION as a side-effect of terminating a process. We should continue the shutdown process in this case. --- programs/wineboot/shutdown.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index cebe16b..ac3019c 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -113,6 +113,7 @@ struct endtask_dlg_data { struct window_info *win; BOOL cancelled; + BOOL terminated; }; static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) @@ -138,6 +139,7 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP WINE_TRACE( "terminating process %04x\n", data->win[0].pid ); TerminateProcess( handle, 0 ); CloseHandle( handle ); + data->terminated = TRUE; } return TRUE; case MAKEWPARAM(IDCANCEL, BN_CLICKED): @@ -175,6 +177,7 @@ static LRESULT send_messages_with_timeout_dialog( cb_data->window_count = count; dlg_data.win = win; + dlg_data.terminated = FALSE; dlg_data.cancelled = FALSE; for (i = 0; i < count; i++) @@ -211,7 +214,7 @@ static LRESULT send_messages_with_timeout_dialog( } if (!cb_data->window_count) { - result = cb_data->result; + result = dlg_data.terminated || cb_data->result; HeapFree( GetProcessHeap(), 0, cb_data ); if (!result) goto cleanup;

1 0

Alexandre Julliard : gdi32/tests: Fix a typo in a macro name.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 480117fdafd6514568f8f75ec84997580d5d4f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480117fdafd6514568f8f75ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 21:04:56 2010 +0200 gdi32/tests: Fix a typo in a macro name. --- dlls/gdi32/tests/mapping.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 655ab2c..f6d2edb 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -39,7 +39,7 @@ ok(rough_match(_pt.y, _y), "expected y %d, got %d\n", (_y), _pt.y); \ } -#define expect_world_trasform(_hdc, _em11, _em22) \ +#define expect_world_transform(_hdc, _em11, _em22) \ { \ BOOL _ret; \ XFORM _xform; \ @@ -105,7 +105,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); SetLastError(0xdeadbeef); @@ -128,7 +128,7 @@ static void test_world_transform(void) rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); } - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); SetLastError(0xdeadbeef); @@ -137,7 +137,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); ret = SetGraphicsMode(hdc, GM_ADVANCED); @@ -150,7 +150,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ @@ -177,7 +177,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); SetLastError(0xdeadbeef); @@ -192,7 +192,7 @@ static void test_world_transform(void) ok( rough_match( size.cy, size_cy * 10 ) || rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, MulDiv(20000, res_x, size.cx), -MulDiv(20000, res_y, size.cy)); SetLastError(0xdeadbeef); @@ -201,7 +201,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); ret = SetGraphicsMode(hdc, GM_COMPATIBLE); @@ -211,7 +211,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); DeleteDC(hdc);

1 0

Thomas Mullaly : urlmon: Implemented a parser for IPv4 addresses.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 89026cf980a55e1baef39b5630da28cbe51f2d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89026cf980a55e1baef39b563… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 21 17:03:02 2010 -0400 urlmon: Implemented a parser for IPv4 addresses. --- dlls/urlmon/uri.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 201 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 526624f..cbd8c15 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -23,6 +23,8 @@ #define NO_SHLWAPI_REG #include "shlwapi.h" +#define UINT_MAX 0xffffffff + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { @@ -55,6 +57,8 @@ typedef struct { BOOL is_relative; BOOL is_opaque; BOOL has_implicit_scheme; + BOOL has_implicit_ip; + UINT implicit_ipv4; const WCHAR *scheme; DWORD scheme_len; @@ -63,6 +67,10 @@ typedef struct { const WCHAR *userinfo; DWORD userinfo_len; INT userinfo_split; + + const WCHAR *host; + DWORD host_len; + Uri_HOST_TYPE host_type; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -252,6 +260,135 @@ static BOOL check_pct_encoded(const WCHAR **ptr) { return TRUE; } +/* dec-octet = DIGIT ; 0-9 + * / %x31-39 DIGIT ; 10-99 + * / "1" 2DIGIT ; 100-199 + * / "2" %x30-34 DIGIT ; 200-249 + * / "25" %x30-35 ; 250-255 + */ +static BOOL check_dec_octet(const WCHAR **ptr) { + const WCHAR *c1, *c2, *c3; + + c1 = *ptr; + /* A dec-octet must be at least 1 digit long. */ + if(*c1 < '0' || *c1 > '9') + return FALSE; + + ++(*ptr); + + c2 = *ptr; + /* Since the 1 digit requirment was meet, it doesn't + * matter if this is a DIGIT value, it's considered a + * dec-octet. + */ + if(*c2 < '0' || *c2 > '9') + return TRUE; + + ++(*ptr); + + c3 = *ptr; + /* Same explanation as above. */ + if(*c3 < '0' || *c3 > '9') + return TRUE; + + /* Anything > 255 isn't a valid IP dec-octet. */ + if(*c1 >= '2' && *c2 >= '5' && *c3 >= '5') { + *ptr = c1; + return FALSE; + } + + ++(*ptr); + return TRUE; +} + +/* Checks if there is an implicit IPv4 address in the host component of the URI. + * The max value of an implicit IPv4 address is UINT_MAX. + * + * Ex: + * "234567" would be considered an implicit IPv4 address. + */ +static BOOL check_implicit_ipv4(const WCHAR **ptr, UINT *val) { + const WCHAR *start = *ptr; + ULONGLONG ret = 0; + *val = 0; + + while(is_num(**ptr)) { + ret = ret*10 + (**ptr - '0'); + + if(ret > UINT_MAX) { + *ptr = start; + return FALSE; + } + ++(*ptr); + } + + if(*ptr == start) + return FALSE; + + *val = ret; + return TRUE; +} + +/* Checks if the string contains an IPv4 address. + * + * This function has a strict mode or a non-strict mode of operation + * When 'strict' is set to FALSE this function will return TRUE if + * the string contains at least 'dec-octet "." dec-octet' since partial + * IPv4 addresses will be normalized out into full IPv4 addresses. When + * 'strict' is set this function expects there to be a full IPv4 address. + * + * IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet + */ +static BOOL check_ipv4address(const WCHAR **ptr, BOOL strict) { + const WCHAR *start = *ptr; + + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + if(**ptr != '.') { + *ptr = start; + return FALSE; + } + + ++(*ptr); + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + if(**ptr != '.') { + if(strict) { + *ptr = start; + return FALSE; + } else + return TRUE; + } + + ++(*ptr); + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + if(**ptr != '.') { + if(strict) { + *ptr = start; + return FALSE; + } else + return TRUE; + } + + ++(*ptr); + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + /* Found a four digit ip address. */ + return TRUE; +} /* Tries to parse the scheme name of the URI. * * scheme = ALPHA *(ALPHA | NUM | '+' | '-' | '.') as defined by RFC 3896. @@ -448,6 +585,68 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); } +/* Attempts to parse a IPv4 address from the URI. + * + * NOTES: + * Window's normalizes IPv4 addresses, This means there's three + * possibilities for the URI to contain an IPv4 address. + * 1) A well formed address (ex. 192.2.2.2). + * 2) A partially formed address. For example "192.0" would + * normalize to "192.0.0.0" during canonicalization. + * 3) An implicit IPv4 address. For example "256" would + * normalize to "0.0.1.0" during canonicalization. Also + * note that the maximum value for an implicit IP address + * is UINT_MAX, if the value in the URI exceeds this then + * it is not considered an IPv4 address. + */ +static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL is_unknown = data->scheme_type == URL_SCHEME_UNKNOWN; + data->host = *ptr; + + if(!check_ipv4address(ptr, FALSE)) { + if(!check_implicit_ipv4(ptr, &data->implicit_ipv4)) { + TRACE("(%p %p %x): URI didn't contain anything looking like an IPv4 address.\n", + ptr, data, flags); + *ptr = data->host; + data->host = NULL; + return FALSE; + } else + data->has_implicit_ip = TRUE; + } + + /* Check if what we found is the only part of the host name (if it isn't + * we don't have an IPv4 address). + */ + if(!is_auth_delim(**ptr, !is_unknown) && **ptr != ':') { + *ptr = data->host; + data->host = NULL; + data->has_implicit_ip = FALSE; + return FALSE; + } + + data->host_len = *ptr - data->host; + data->host_type = Uri_HOST_IPV4; + TRACE("(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d\n", + ptr, data, flags, debugstr_wn(data->host, data->host_len), + data->host_len, data->host_type); + return TRUE; +} + +/* Parses the host information from the URI. + * + * host = IP-literal / IPv4address / reg-name + */ +static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { + if(!parse_ipv4address(ptr, data, flags)) { + WARN("(%p %p %x): Only IPv4 parsing is implemented so far.\n", ptr, data, flags); + data->host_type = Uri_HOST_UNKNOWN; + } + + /* TODO parse IP-Literal / reg-name. */ + + return TRUE; +} + /* Parses the authority information from the URI. * * authority = [ userinfo "@" ] host [ ":" port ] @@ -455,7 +654,8 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { parse_userinfo(ptr, data, flags); - /* TODO: Parse host and port information. */ + if(!parse_host(ptr, data, flags)) + return FALSE; return TRUE; }

1 0

Aric Stewart : usp10: Start implementing Chaining Context Substitution Format 3: Coverage-based Chaining Context Glyph Substitution.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 1b37809dba65745828d7895ad5fda9bc3fd1e403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b37809dba65745828d7895ad… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 22 16:18:02 2010 -0500 usp10: Start implementing Chaining Context Substitution Format 3: Coverage-based Chaining Context Glyph Substitution. --- dlls/usp10/shape.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0a4f5b9..0018ae5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -185,6 +185,42 @@ typedef struct{ WORD Component[1]; }GSUB_Ligature; +typedef struct{ + WORD SequenceIndex; + WORD LookupListIndex; + +}GSUB_SubstLookupRecord; + +typedef struct{ + WORD SubstFormat; /* = 1 */ + WORD Coverage; + WORD ChainSubRuleSetCount; + WORD ChainSubRuleSet[1]; +}GSUB_ChainContextSubstFormat1; + +typedef struct { + WORD SubstFormat; /* = 3 */ + WORD BacktrackGlyphCount; + WORD Coverage[1]; +}GSUB_ChainContextSubstFormat3_1; + +typedef struct{ + WORD InputGlyphCount; + WORD Coverage[1]; +}GSUB_ChainContextSubstFormat3_2; + +typedef struct{ + WORD LookaheadGlyphCount; + WORD Coverage[1]; +}GSUB_ChainContextSubstFormat3_3; + +typedef struct{ + WORD SubstCount; + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_ChainContextSubstFormat3_4; + +static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); + /* the orders of joined_forms and contextual_features need to line up */ static const char* contextual_features[] = { @@ -429,6 +465,101 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, return GSUB_E_NOGLYPH; } +static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + BOOL done = FALSE; + + TRACE("Chaining Contextual Substitution Subtable\n"); + for (j = 0; j < GET_BE_WORD(look->SubTableCount) && !done; j++) + { + const GSUB_ChainContextSubstFormat1 *ccsf1; + int offset; + int dirLookahead = write_dir; + int dirBacktrack = -1 * write_dir; + + offset = GET_BE_WORD(look->SubTable[j]); + ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(ccsf1->SubstFormat) == 1) + { + FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); + return -1; + } + else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) + { + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + return -1; + } + else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) + { + int k; + int indexGlyphs; + const GSUB_ChainContextSubstFormat3_1 *ccsf3_1; + const GSUB_ChainContextSubstFormat3_2 *ccsf3_2; + const GSUB_ChainContextSubstFormat3_3 *ccsf3_3; + const GSUB_ChainContextSubstFormat3_4 *ccsf3_4; + int newIndex = glyph_index; + + ccsf3_1 = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; + + TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Substitution)\n"); + + for (k = 0; k < GET_BE_WORD(ccsf3_1->BacktrackGlyphCount); k++) + { + offset = GET_BE_WORD(ccsf3_1->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (dirBacktrack * (k+1))]) == -1) + break; + } + if (k != GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)) + return -1; + TRACE("Matched Backtrack\n"); + + ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)(((LPBYTE)ccsf1)+sizeof(GSUB_ChainContextSubstFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)-1))); + + indexGlyphs = GET_BE_WORD(ccsf3_2->InputGlyphCount); + for (k = 0; k < indexGlyphs; k++) + { + offset = GET_BE_WORD(ccsf3_2->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (write_dir * k)]) == -1) + break; + } + if (k != indexGlyphs) + return -1; + TRACE("Matched IndexGlyphs\n"); + + ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)(((LPBYTE)ccsf3_2)+sizeof(GSUB_ChainContextSubstFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_2->InputGlyphCount)-1))); + + for (k = 0; k < GET_BE_WORD(ccsf3_3->LookaheadGlyphCount); k++) + { + offset = GET_BE_WORD(ccsf3_3->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (dirLookahead * (indexGlyphs + k+1))]) == -1) + break; + } + if (k != GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)) + return -1; + TRACE("Matched LookAhead\n"); + + ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); + + for (k = 0; k < GET_BE_WORD(ccsf3_4->SubstCount); k++) + { + int lookupIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(ccsf3_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 == -1) + { + ERR("Chain failed to generate a glyph\n"); + return -1; + } + } + return newIndex + 1; + } + } + return -1; +} + static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; @@ -443,6 +574,8 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 6: + return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); }

1 0

Igor Paliychuk : cmdlgtst: Add Ukrainian translation.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 70ef03208fa6f9ebad9be66731655ef3e7e135b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ef03208fa6f9ebad9be6673… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 22 17:22:14 2010 +0300 cmdlgtst: Add Ukrainian translation. --- programs/cmdlgtst/Makefile.in | 1 + programs/cmdlgtst/Uk.rc | 301 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70ef03208fa6f9ebad9be…

1 0

Alexandre Julliard : include: Don't install tlb files, they are platform-dependent.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: c1de11eee5a829ec83438719fae7f93690423f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1de11eee5a829ec83438719f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:34:23 2010 +0200 include: Don't install tlb files, they are platform-dependent. --- include/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d1f653a..b228795 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -552,7 +552,7 @@ IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) @MAKE_RULES@ -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) +OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb)

1 0

Alexandre Julliard : gdi32: Update the DC mappings when the layout is changed.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: f695c1d19d1d43d7778384841e549342626ca7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f695c1d19d1d43d7778384841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:34:07 2010 +0200 gdi32: Update the DC mappings when the layout is changed. --- dlls/gdi32/dc.c | 6 +++ dlls/gdi32/mapping.c | 3 +- dlls/gdi32/tests/mapping.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c55442f..7c86d34 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -289,6 +289,7 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) scaleX = (double)dc->vportExtX / (double)dc->wndExtX; scaleY = (double)dc->vportExtY / (double)dc->wndExtY; + if (dc->layout & LAYOUT_RTL) scaleX = -scaleX; xform->eM11 = scaleX; xform->eM12 = 0.0; xform->eM21 = 0.0; @@ -1948,6 +1949,11 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) { oldlayout = dc->layout; dc->layout = layout; + if (layout != oldlayout) + { + if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + DC_UpdateXforms( dc ); + } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 35bb1ea..8010b3d 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -185,7 +185,8 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) default: goto done; } - dc->MapMode = mode; + /* RTL layout is always MM_ANISOTROPIC */ + if (!(dc->layout & LAYOUT_RTL)) dc->MapMode = mode; DC_UpdateXforms( dc ); done: release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index f6d2edb..7193a0f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -217,6 +217,81 @@ static void test_world_transform(void) DeleteDC(hdc); } +static void test_dc_layout(void) +{ + INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; + SIZE size; + DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); + DWORD (WINAPI *pGetLayout)(HDC hdc); + HDC hdc; + + pGetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetLayout"); + pSetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetLayout"); + if (!pGetLayout || !pSetLayout) + { + win_skip( "Don't have SetLayout\n" ); + return; + } + + hdc = CreateCompatibleDC(0); + + size_cx = GetDeviceCaps(hdc, HORZSIZE); + size_cy = GetDeviceCaps(hdc, VERTSIZE); + res_x = GetDeviceCaps(hdc, HORZRES); + res_y = GetDeviceCaps(hdc, VERTRES); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + + ret = GetMapMode( hdc ); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, 1000, 1000); + + pSetLayout( hdc, LAYOUT_RTL ); + if (!pGetLayout( hdc )) + { + win_skip( "SetLayout not supported\n" ); + DeleteDC(hdc); + return; + } + + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, -1000, 1000); + + SetMapMode(hdc, MM_LOMETRIC); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + + expect_viewport_ext(hdc, res_x, -res_y); + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + + SetMapMode(hdc, MM_TEXT); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + pSetLayout( hdc, LAYOUT_LTR ); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + SetMapMode(hdc, MM_TEXT); + ret = GetMapMode( hdc ); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + DeleteDC(hdc); +} + static void test_modify_world_transform(void) { HDC hdc = GetDC(0); @@ -562,6 +637,7 @@ START_TEST(mapping) { test_modify_world_transform(); test_world_transform(); + test_dc_layout(); test_isotropic_mapping(); test_setvirtualresolution(); test_gettransform();

1 0

Alexandre Julliard : user32: DCX_NORESETATTRS should be applied at DC release time.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: f1ea06375d76c9f8e181e3ee4874ddef661e80c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ea06375d76c9f8e181e3ee4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 20:00:35 2010 +0200 user32: DCX_NORESETATTRS should be applied at DC release time. --- dlls/user32/painting.c | 21 ++++++++++++++------- dlls/user32/tests/dce.c | 9 +++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index efb0884..5e57e7f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -168,6 +168,16 @@ static void update_visible_region( struct dce *dce ) /*********************************************************************** + * reset_dce_attrs + */ +static void reset_dce_attrs( struct dce *dce ) +{ + RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ + SaveDC( dce->hdc ); /* save the state again for next time */ +} + + +/*********************************************************************** * release_dce */ static void release_dce( struct dce *dce ) @@ -329,6 +339,7 @@ void free_dce( struct dce *dce, HWND hwnd ) if (!--dce->count) { /* turn it into a cache entry */ + reset_dce_attrs( dce ); release_dce( dce ); dce->flags |= DCX_CACHE; } @@ -455,6 +466,7 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) dce = (struct dce *)GetDCHook( hdc, NULL ); if (dce && dce->count) { + if (!(dce->flags & DCX_NORESETATTRS)) reset_dce_attrs( dce ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); if (dce->flags & DCX_CACHE) dce->count = 0; ret = TRUE; @@ -898,6 +910,7 @@ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) { static const DWORD clip_flags = DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW; + static const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ struct dce *dce; BOOL bUpdateVisRgn = TRUE; HWND parent; @@ -1021,18 +1034,12 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) } dce->hwnd = hwnd; - dce->flags = (dce->flags & ~clip_flags) | (flags & clip_flags); + dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce ); - if (!(flags & DCX_NORESETATTRS)) - { - RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ - SaveDC( dce->hdc ); /* save the state again for next time */ - } - TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc); return dce->hdc; } diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index cfa07e5..c366ebc 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -66,10 +66,7 @@ static void test_dc_attributes(void) hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); if (!hdc) break; rop = GetROP2( hdc ); - if (hdc == old_hdc) - todo_wine ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); - else - ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); if (hdc == old_hdc) { found_dc = 1; @@ -104,8 +101,8 @@ static void test_dc_attributes(void) rop = GetROP2( hdc ); if (hdc == old_hdc) { - todo_wine ok( rop == R2_WHITE || broken( rop == def_rop), - "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + ok( rop == R2_WHITE || broken( rop == def_rop), + "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); SetROP2( old_hdc, def_rop ); } else

1 0

David Hedberg : shell32: Implement Set/ GetCurrentViewMode in the default shellview.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 0e7a5bf76c0d24f320c70b03251c9abf2ae20eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7a5bf76c0d24f320c70b032… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Jul 22 22:08:07 2010 +0200 shell32: Implement Set/GetCurrentViewMode in the default shellview. --- dlls/shell32/shlview.c | 71 +++++++--- dlls/shell32/tests/shlview.c | 341 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 393 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7a5bf76c0d24f320c70…

1 0