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

Thomas Mullaly : urlmon: Implemented the canonicalization routine for the userinfo of a URI.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: eff59a51072d172f9d0c9c867a6f4d7c4ca772b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff59a51072d172f9d0c9c867… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jun 17 15:58:17 2010 -0400 urlmon: Implemented the canonicalization routine for the userinfo of a URI. --- dlls/urlmon/uri.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 190 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0942d8a..f8d99a8 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -38,6 +38,10 @@ typedef struct { INT scheme_start; DWORD scheme_len; URL_SCHEME scheme_type; + + INT userinfo_start; + DWORD userinfo_len; + INT userinfo_split; } Uri; typedef struct { @@ -61,6 +65,8 @@ typedef struct { INT userinfo_split; } parse_data; +static const CHAR hexDigits[] = "0123456789ABCDEF"; + /* List of scheme types/scheme names that are recognized by the IUri interface as of IE 7. */ static const struct { URL_SCHEME scheme; @@ -161,12 +167,64 @@ static inline BOOL is_auth_delim(WCHAR val, BOOL acceptSlash) { val == '\0' || (acceptSlash && val == '\\')); } +/* reserved = gen-delims / sub-delims */ +static inline BOOL is_reserved(WCHAR val) { + return (is_subdelim(val) || is_gendelim(val)); +} + static inline BOOL is_hexdigit(WCHAR val) { return ((val >= 'a' && val <= 'f') || (val >= 'A' && val <= 'F') || (val >= '0' && val <= '9')); } +/* Taken from dlls/jscript/lex.c */ +static int hex_to_int(WCHAR val) { + if(val >= '0' && val <= '9') + return val - '0'; + else if(val >= 'a' && val <= 'f') + return val - 'a' + 10; + else if(val >= 'A' && val <= 'F') + return val - 'A' + 10; + + return -1; +} + +/* Helper function for converting a percent encoded string + * representation of a WCHAR value into its actual WCHAR value. If + * the two characters following the '%' aren't valid hex values then + * this function returns the NULL character. + * + * Eg. + * "%2E" will result in '.' being returned by this function. + */ +static WCHAR decode_pct_val(const WCHAR *ptr) { + WCHAR ret = '\0'; + + if(*ptr == '%' && is_hexdigit(*(ptr + 1)) && is_hexdigit(*(ptr + 2))) { + INT a = hex_to_int(*(ptr + 1)); + INT b = hex_to_int(*(ptr + 2)); + + ret = a << 4; + ret += b; + } + + return ret; +} + +/* Helper function for percent encoding a given character + * and storing the encoded value into a given buffer (dest). + * + * It's up to the calling function to ensure that there is + * at least enough space in 'dest' for the percent encoded + * value to be stored (so dest + 3 spaces available). + */ +static inline void pct_encode_val(WCHAR val, WCHAR *dest) { + dest[0] = '%'; + dest[1] = hexDigits[(val >> 4) & 0xf]; + dest[2] = hexDigits[val & 0xf]; +} + /* Checks if the characters pointed to by 'ptr' are * a percent encoded data octet. * @@ -488,6 +546,126 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { return TRUE; } +/* Canonicalizes the userinfo of the URI represented by the parse_data. + * + * Canonicalization of the userinfo is a simple process. If there are any percent + * encoded characters that fall in the "unreserved" character set, they are decoded + * to their actual value. If a character is not in the "unreserved" or "reserved" sets + * then it is percent encoded. Other than that the characters are copied over without + * change. + */ +static BOOL canonicalize_userinfo(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + DWORD i = 0; + + uri->userinfo_start = uri->userinfo_split = -1; + uri->userinfo_len = 0; + + if(!data->userinfo) + /* URI doesn't have userinfo, so nothing to do here. */ + return TRUE; + + uri->userinfo_start = uri->canon_len; + + while(i < data->userinfo_len) { + if(data->userinfo[i] == ':' && uri->userinfo_split == -1) + /* Windows only considers the first ':' as the delimiter. */ + uri->userinfo_split = uri->canon_len - uri->userinfo_start; + else if(data->userinfo[i] == '%') { + /* Only decode % encoded values for known scheme types. */ + if(data->scheme_type != URL_SCHEME_UNKNOWN) { + /* See if the value really needs decoded. */ + WCHAR val = decode_pct_val(data->userinfo + i); + if(is_unreserved(val)) { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = val; + + ++uri->canon_len; + + /* Move pass the hex characters. */ + i += 3; + continue; + } + } + } else if(!is_reserved(data->userinfo[i]) && !is_unreserved(data->userinfo[i]) && + data->userinfo[i] != '\\') { + /* Only percent encode forbidden characters if the NO_ENCODE_FORBIDDEN_CHARACTERS flag + * is NOT set. + */ + if(!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { + if(!computeOnly) + pct_encode_val(data->userinfo[i], uri->canon_uri + uri->canon_len); + + uri->canon_len += 3; + ++i; + continue; + } + } + + if(!computeOnly) + /* Nothing special, so just copy the character over. */ + uri->canon_uri[uri->canon_len] = data->userinfo[i]; + + ++uri->canon_len; + ++i; + } + + uri->userinfo_len = uri->canon_len - uri->userinfo_start; + if(!computeOnly) + TRACE("(%p %p %x %d): Canonicalized userinfo, userinfo_start=%d, userinfo=%s, userinfo_split=%d userinfo_len=%d.\n", + data, uri, flags, computeOnly, uri->userinfo_start, debugstr_wn(uri->canon_uri + uri->userinfo_start, uri->userinfo_len), + uri->userinfo_split, uri->userinfo_len); + + /* Now insert the '@' after the userinfo. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = '@'; + + ++uri->canon_len; + 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. */ + + return TRUE; +} + +/* Determines how the URI represented by the parse_data should be canonicalized. + * + * Essentially, if the parse_data represents an hierarchical URI then it calls + * canonicalize_authority and the canonicalization functions for the path. If the + * URI is opaque it canonicalizes the path of the URI. + */ +static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + if(!data->is_opaque) { + /* "//" is only added for non-wildcard scheme types. */ + if(data->scheme_type != URL_SCHEME_WILDCARD) { + if(!computeOnly) { + INT pos = uri->canon_len; + + uri->canon_uri[pos] = '/'; + uri->canon_uri[pos+1] = '/'; + } + uri->canon_len += 2; + } + + if(!canonicalize_authority(data, uri, flags, computeOnly)) + return FALSE; + + /* TODO: Canonicalize the path of the URI. */ + + } else { + /* Opaque URI's don't have userinfo. */ + uri->userinfo_start = uri->userinfo_split = -1; + uri->userinfo_len = 0; + } + + return TRUE; +} + /* Canonicalizes the scheme information specified in the parse_data using the specified flags. */ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { uri->scheme_start = -1; @@ -519,7 +697,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B debugstr_wn(uri->canon_uri, uri->scheme_len), data->scheme_len); } - /* This happens in both compute only and non-compute only. */ + /* This happens in both computation modes. */ uri->canon_len += data->scheme_len + 1; uri->scheme_len = data->scheme_len; } @@ -545,6 +723,11 @@ static int compute_canonicalized_length(const parse_data *data, DWORD flags) { return -1; } + if(!canonicalize_hierpart(data, &uri, flags, TRUE)) { + ERR("(%p %x): Failed to compute URI hierpart length.\n", data, flags); + return -1; + } + TRACE("(%p %x): Finished computing canonicalized URI length. length=%d\n", data, flags, uri.canon_len); return uri.canon_len; @@ -585,6 +768,12 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { } uri->scheme_type = data->scheme_type; + if(!canonicalize_hierpart(data, uri, flags, FALSE)) { + ERR("(%p %p %x): Unable to canonicalize the heirpart of the URI\n", data, uri, flags); + heap_free(uri->canon_uri); + return E_INVALIDARG; + } + uri->canon_uri[uri->canon_len] = '\0'; TRACE("(%p %p %x): finished canonicalizing the URI.\n", data, uri, flags);

1 0

Thomas Mullaly : urlmon: Added a stub implementation for parsing the hier-part of a URI.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 9d363d52cd38bc49cf18b7e3445d6784022a7814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d363d52cd38bc49cf18b7e34… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Jun 11 20:19:35 2010 -0400 urlmon: Added a stub implementation for parsing the hier-part of a URI. --- dlls/urlmon/tests/uri.c | 30 ++++++++++++++++ dlls/urlmon/uri.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 07b22cc..d674925 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -823,6 +823,36 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_WILDCARD,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* URI is considered opaque since CREATE_NO_CRACK_UNKNOWN_SCHEMES is set and its an unknown scheme. */ + { "zip://google.com", Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH| + Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME_NAME| + Uri_HAS_SCHEME, + TRUE, + { + {"zip:/.//google.com",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"zip:/.//google.com",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {".com",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"/.//google.com",S_OK,TRUE}, + {"/.//google.com",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"zip://google.com",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 06f8872..d8ff2cb 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -49,6 +49,8 @@ typedef struct { BSTR uri; BOOL is_relative; + BOOL is_opaque; + BOOL has_implicit_scheme; const WCHAR *scheme; DWORD scheme_len; @@ -104,6 +106,25 @@ static inline BOOL is_implicit_file_path(const WCHAR *str) { return FALSE; } +/* Checks if the URI is a hierarchical URI. A hierarchical + * URI is one that has "//" after the scheme. + */ +static BOOL check_hierarchical(const WCHAR **ptr) { + const WCHAR *start = *ptr; + + if(**ptr != '/') + return FALSE; + + ++(*ptr); + if(**ptr != '/') { + *ptr = start; + return FALSE; + } + + ++(*ptr); + return TRUE; +} + /* Tries to parse the scheme name of the URI. * * scheme = ALPHA *(ALPHA | NUM | '+' | '-' | '.') as defined by RFC 3896. @@ -195,6 +216,8 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { if(flags & Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME) { data->scheme = fileW; data->scheme_len = lstrlenW(fileW); + data->has_implicit_scheme = TRUE; + TRACE("(%p %p %x): URI is an implicit file path.\n", ptr, data, flags); } else { /* Window's does not consider anything that can implicitly be a file @@ -213,6 +236,7 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { if(flags & Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME) { data->scheme = wildcardW; data->scheme_len = lstrlenW(wildcardW); + data->has_implicit_scheme = TRUE; TRACE("(%p %p %x): URI is an implicit wildcard scheme.\n", ptr, data, flags); } else if (flags & Uri_CREATE_ALLOW_RELATIVE) { @@ -235,6 +259,65 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } +/* Determines how the URI should be parsed after the scheme information. + * + * If the scheme is followed, by "//" then, it is treated as an hierarchical URI + * which then the authority and path information will be parsed out. Otherwise, the + * URI will be treated as an opaque URI which the authority information is not parsed + * out. + * + * RFC 3896 defenition of hier-part: + * + * hier-part = "//" authority path-abempty + * / path-absolute + * / path-rootless + * / path-empty + * + * MSDN opaque URI definition: + * scheme ":" path [ "#" fragment ] + * + * NOTES: + * If the URI is of an unknown scheme type and has a "//" following the scheme then it + * is treated as a hierarchical URI, but, if the CREATE_NO_CRACK_UNKNOWN_SCHEMES flag is + * set then it is considered an opaque URI reguardless of what follows the scheme information + * (per MSDN documentation). + */ +static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { + /* Checks if the authority information needs to be parsed. + * + * Relative URI's aren't hierarchical URI's, but, they could trick + * "check_hierarchical" into thinking it is, so we need to explicitly + * make sure it's not relative. Also, if the URI is an implicit file + * scheme it might not contain a "//", but, it's considered hierarchical + * anyways. Wildcard Schemes are always considered hierarchical + */ + if(data->scheme_type == URL_SCHEME_WILDCARD || + data->scheme_type == URL_SCHEME_FILE || + (!data->is_relative && check_hierarchical(ptr))) { + /* Only treat it as a hierarchical URI if the scheme_type is known or + * the Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES flag is not set. + */ + if(data->scheme_type != URL_SCHEME_UNKNOWN || + !(flags & Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES)) { + TRACE("(%p %p %x): Treating URI as an hierarchical URI.\n", ptr, data, flags); + data->is_opaque = FALSE; + + /* TODO: Handle hierarchical URI's, parse authority then parse the path. */ + return TRUE; + } + } + + /* If it reaches here, then the URI will be treated as an opaque + * URI. + */ + + TRACE("(%p %p %x): Treating URI as an opaque URI.\n", ptr, data, flags); + + data->is_opaque = TRUE; + /* TODO: Handle opaque URI's, parse path. */ + return TRUE; +} + /* Parses and validates the components of the specified by data->uri * and stores the information it parses into 'data'. * @@ -252,6 +335,9 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_scheme(pptr, data, flags)) return FALSE; + if(!parse_hierpart(pptr, data, flags)) + return FALSE; + TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); return TRUE; }

1 0

Aric Stewart : kernel32/tests: Add test for CT_TYPE1 of GetStringTypeW.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 6c970e7e665745c587b5f9afb72435f21d3c0c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c970e7e665745c587b5f9afb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:57 2010 -0500 kernel32/tests: Add test for CT_TYPE1 of GetStringTypeW. --- dlls/kernel32/tests/locale.c | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f37d503..9d6f7e4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2656,6 +2656,131 @@ static void test_GetCPInfo(void) } } +/* + * The CT_TYPE1 has varied over windows version. + * The current target for correct behavior is windows 7. + * There was a big shift between windows 2000 (first introduced) and windows Xp + * Most of the old values below are from windows 2000. + * A smaller subset of changes happened between windows Xp and Window vista/7 + */ +static void test_GetStringTypeW(void) +{ + static const WCHAR blanks[] = {0x9, 0x20, 0xa0, 0x3000, 0xfeff}; + static const WORD blanks_new[] = {C1_SPACE | C1_CNTRL | C1_BLANK | C1_DEFINED, + C1_SPACE | C1_BLANK | C1_DEFINED, + C1_SPACE | C1_BLANK | C1_DEFINED, + C1_SPACE | C1_BLANK | C1_DEFINED, + C1_CNTRL | C1_BLANK | C1_DEFINED}; + static const WORD blanks_old[] ={C1_SPACE | C1_CNTRL | C1_BLANK, + C1_SPACE | C1_BLANK, + C1_SPACE | C1_BLANK, + C1_SPACE | C1_BLANK, + C1_SPACE | C1_BLANK}; + + static const WCHAR undefined[] = {0x378, 0x379, 0x65f, 0xfff8, 0xfffe}; + + /* Lu, Ll, Lt */ + static const WCHAR alpha[] = {0x47, 0x67, 0x1c5}; + static const WORD alpha_old[] = {C1_UPPER | C1_ALPHA, + C1_LOWER | C1_ALPHA, + C1_UPPER | C1_LOWER | C1_ALPHA, + C1_ALPHA}; + + /* Sk, Sk, Mn, So, Me */ + static const WCHAR oldpunc[] = { 0x2c2, 0x2e5, 0x322, 0x482, 0x6de, + /* Sc, Sm, No,*/ + 0xffe0, 0xffe9, 0x2153}; + + /* Lm, Nl, Cf, 0xad(Cf), 0x1f88 (Lt), Lo, Mc */ + static const WCHAR changed[] = {0x2b0, 0x2160, 0x600, 0xad, 0x1f88, 0x294, 0x903}; + static const WORD changed_old[] = { C1_PUNCT, C1_PUNCT, 0, C1_PUNCT, C1_UPPER | C1_ALPHA, C1_ALPHA, C1_PUNCT }; + static const WORD changed_xp[] = {C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_DEFINED, + C1_CNTRL | C1_DEFINED, + C1_PUNCT | C1_DEFINED, + C1_UPPER | C1_LOWER | C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_LOWER | C1_DEFINED, + C1_ALPHA | C1_DEFINED }; + static const WORD changed_new[] = { C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_DEFINED, + C1_CNTRL | C1_DEFINED, + C1_PUNCT | C1_CNTRL | C1_DEFINED, + C1_UPPER | C1_LOWER | C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_DEFINED, + C1_DEFINED + }; + /* Pc, Pd, Ps, Pe, Pi, Pf, Po*/ + static const WCHAR punct[] = { 0x5f, 0x2d, 0x28, 0x29, 0xab, 0xbb, 0x21 }; + + static const WCHAR punct_special[] = {0x24, 0x2b, 0x3c, 0x3e, 0x5e, 0x60, + 0x7c, 0x7e, 0xa2, 0xbe, 0xd7, 0xf7}; + static const WCHAR digit_special[] = {0xb2, 0xb3, 0xb9}; + static const WCHAR lower_special[] = {0x2071, 0x207f}; + static const WCHAR cntrl_special[] = {0x070f, 0x200c, 0x200d, + 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, + 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, + 0xfff9, 0xfffa, 0xfffb}; + static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; + + WORD types[20]; + int i; + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, blanks, 5, types); + for (i = 0; i < 5; i++) + ok(types[i] == blanks_new[i] || broken(types[i] == blanks_old[i] || broken(types[i] == 0)), "incorrect type1 returned for %x -> (%x != %x)\n",blanks[i],types[i],blanks_new[i]); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, alpha, 3, types); + for (i = 0; i < 3; i++) + ok(types[i] == (C1_DEFINED | alpha_old[i]) || broken(types[i] == alpha_old[i]) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",alpha[i], types[i],(C1_DEFINED | alpha_old[i])); + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, undefined, 5, types); + for (i = 0; i < 5; i++) + ok(types[i] == 0, "incorrect types returned for %x -> (%x != 0)\n",undefined[i], types[i]); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, oldpunc, 8, types); + for (i = 0; i < 8; i++) + ok(types[i] == C1_DEFINED || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",oldpunc[i], types[i], C1_DEFINED); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, changed, 7, types); + for (i = 0; i < 7; i++) + ok(types[i] == changed_new[i] || broken(types[i] == changed_old[i]) || broken(types[i] == changed_xp[i]) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",changed[i], types[i], changed_new[i]); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, punct, 7, types); + for (i = 0; i < 7; i++) + ok(types[i] == (C1_PUNCT | C1_DEFINED) || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",punct[i], types[i], (C1_PUNCT | C1_DEFINED)); + + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, punct_special, 12, types); + for (i = 0; i < 12; i++) + ok(types[i] & C1_PUNCT || broken(types[i] == 0), "incorrect types returned for %x -> (%x doest not have %x)\n",punct_special[i], types[i], C1_PUNCT); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, digit_special, 3, types); + for (i = 0; i < 3; i++) + ok(types[i] & C1_DIGIT || broken(types[i] == 0), "incorrect types returned for %x -> (%x doest not have = %x)\n",digit_special[i], types[i], C1_DIGIT); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, lower_special, 2, types); + for (i = 0; i < 2; i++) + ok(types[i] & C1_LOWER || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",lower_special[i], types[i], C1_LOWER); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, cntrl_special, 20, types); + for (i = 0; i < 20; i++) + ok(types[i] & C1_CNTRL || broken(types[i] == (C1_BLANK|C1_SPACE)) || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",cntrl_special[i], types[i], C1_CNTRL); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, space_special, 3, types); + for (i = 0; i < 3; i++) + ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); +} + START_TEST(locale) { InitFunctionPointers(); @@ -2680,6 +2805,7 @@ START_TEST(locale) test_SetLocaleInfoA(); test_EnumUILanguageA(); test_GetCPInfo(); + test_GetStringTypeW(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Aric Stewart : libwine: There are a few supercript characters (No, Lm types ) that Windows marks as being either digit or as a letter.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 46a5b46710a4b8a886674a13b401c01db3d09bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a5b46710a4b8a886674a13b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:43 2010 -0500 libwine: There are a few supercript characters (No, Lm types) that Windows marks as being either digit or as a letter. --- libs/wine/cpmap.pl | 4 +++- libs/wine/wctype.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index 7a02ee6..79f5fd5 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -161,7 +161,9 @@ my %special_categories = 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, 0xfff9, 0xfffa, 0xfffb ], "punct" => [ 0x24, 0x2b, 0x3c..0x3e, 0x5e, 0x60, 0x7c, 0x7e, 0xa2..0xbe, - 0xd7, 0xf7 ] + 0xd7, 0xf7 ], + "digit" => [ 0xb2, 0xb3, 0xb9 ], + "lower" => [ 0x2071, 0x207f ] ); my %directions = diff --git a/libs/wine/wctype.c b/libs/wine/wctype.c index 071a7b4..5b5100e 100644 --- a/libs/wine/wctype.c +++ b/libs/wine/wctype.c @@ -61,8 +61,8 @@ const unsigned short wine_wctype_table[17152] = 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x7248, 0xb210, 0x5210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1312, 0xb210, 0xb210, 0xe230, 0xb210, 0xb210, - 0x5210, 0x5210, 0x3210, 0x3210, 0xb210, 0x1312, 0xb210, 0xb210, - 0xb210, 0x3210, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, + 0x5210, 0x5210, 0x3214, 0x3214, 0xb210, 0x1312, 0xb210, 0xb210, + 0xb210, 0x3214, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb210, @@ -1045,8 +1045,8 @@ const unsigned short wine_wctype_table[17152] = 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xa208, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, - 0x3200, 0x1300, 0x0000, 0x0000, 0x3200, 0x3200, 0x3200, 0x3200, - 0x3200, 0x3200, 0x4200, 0x4200, 0xb200, 0xb210, 0xb210, 0x1300, + 0x3200, 0x1302, 0x0000, 0x0000, 0x3200, 0x3200, 0x3200, 0x3200, + 0x3200, 0x3200, 0x4200, 0x4200, 0xb200, 0xb210, 0xb210, 0x1302, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x4200, 0x4200, 0xb200, 0xb210, 0xb210, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000,

1 0

Aric Stewart : libwine: Remove some previous c1 cntrl exceptions that are no longer valid.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 84561d76e5add36f13fa1393b3b72b2748b07327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84561d76e5add36f13fa1393b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:15 2010 -0500 libwine: Remove some previous c1 cntrl exceptions that are no longer valid. --- libs/wine/cpmap.pl | 2 +- libs/wine/wctype.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index fe35bfd..6d76f0b 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -156,7 +156,7 @@ my %special_categories = 0xff10..0xff19, 0xff21..0xff26, 0xff41..0xff46 ], "space" => [ 0x09..0x0d, 0x85 ], "blank" => [ 0x09, 0x20, 0xa0, 0x3000, 0xfeff ], - "cntrl" => [ 0x070f, 0x180b, 0x180c, 0x180d, 0x180e, 0x200c, 0x200d, + "cntrl" => [ 0x070f, 0x200c, 0x200d, 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, 0xfff9, 0xfffa, 0xfffb ] diff --git a/libs/wine/wctype.c b/libs/wine/wctype.c index 9cc5412..38e71ee 100644 --- a/libs/wine/wctype.c +++ b/libs/wine/wctype.c @@ -776,7 +776,7 @@ const unsigned short wine_wctype_table[17152] = 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0xd220, 0xd220, 0xd220, 0xa228, 0x0000, + 0xb210, 0xb210, 0xb210, 0xd200, 0xd200, 0xd200, 0xa208, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300,

1 0

Aric Stewart : libwine: There are a number of characters of non punctuation type in the latin I block that Windows considers to be punctuation .
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 459fb56afbf6cfd9dcadcc750856c0a9a0bc1756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459fb56afbf6cfd9dcadcc750… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:29 2010 -0500 libwine: There are a number of characters of non punctuation type in the latin I block that Windows considers to be punctuation. --- libs/wine/cpmap.pl | 4 +++- libs/wine/wctype.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index 6d76f0b..7a02ee6 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -159,7 +159,9 @@ my %special_categories = "cntrl" => [ 0x070f, 0x200c, 0x200d, 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, - 0xfff9, 0xfffa, 0xfffb ] + 0xfff9, 0xfffa, 0xfffb ], + "punct" => [ 0x24, 0x2b, 0x3c..0x3e, 0x5e, 0x60, 0x7c, 0x7e, 0xa2..0xbe, + 0xd7, 0xf7 ] ); my %directions = diff --git a/libs/wine/wctype.c b/libs/wine/wctype.c index 38e71ee..071a7b4 100644 --- a/libs/wine/wctype.c +++ b/libs/wine/wctype.c @@ -43,33 +43,33 @@ const unsigned short wine_wctype_table[17152] = 0xe220, 0x9268, 0x8228, 0x9228, 0xa228, 0x8228, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x8220, 0x8220, 0x8220, 0x9220, - 0xa248, 0xb210, 0xb210, 0x5210, 0x5200, 0x5210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0x4200, 0x7210, 0x4210, 0x7210, 0x7210, + 0xa248, 0xb210, 0xb210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, + 0xb210, 0xb210, 0xb210, 0x4210, 0x7210, 0x4210, 0x7210, 0x7210, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, - 0x3284, 0x3284, 0x7210, 0xb210, 0xb200, 0xb200, 0xb200, 0xb210, + 0x3284, 0x3284, 0x7210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1381, 0x1381, 0x1381, 0x1381, 0x1381, 0x1381, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, - 0x1301, 0x1301, 0x1301, 0xb210, 0xb210, 0xb210, 0xb200, 0xb210, - 0xb200, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1302, + 0x1301, 0x1301, 0x1301, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, + 0xb210, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, - 0x1302, 0x1302, 0x1302, 0xb210, 0xb200, 0xb210, 0xb200, 0xe220, + 0x1302, 0x1302, 0x1302, 0xb210, 0xb210, 0xb210, 0xb210, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x8228, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, - 0x7248, 0xb210, 0x5200, 0x5200, 0x5200, 0x5200, 0xb200, 0xb200, - 0xb200, 0xb200, 0x1302, 0xb210, 0xb200, 0xe220, 0xb200, 0xb200, - 0x5200, 0x5200, 0x3200, 0x3200, 0xb200, 0x1302, 0xb200, 0xb210, - 0xb200, 0x3200, 0x1302, 0xb210, 0xb200, 0xb200, 0xb200, 0xb210, + 0x7248, 0xb210, 0x5210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, + 0xb210, 0xb210, 0x1312, 0xb210, 0xb210, 0xe230, 0xb210, 0xb210, + 0x5210, 0x5210, 0x3210, 0x3210, 0xb210, 0x1312, 0xb210, 0xb210, + 0xb210, 0x3210, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, - 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb200, + 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, - 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0xb200, + 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0xb210, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302,

1 0

Aric Stewart : libwine: Add C1_DEFINED to our C1 types and set it properly.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: f2b8873b1da05618e8759e64d54d019479f254e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b8873b1da05618e8759e64d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:51:59 2010 -0500 libwine: Add C1_DEFINED to our C1 types and set it properly. --- include/winnls.h | 1 + libs/wine/cpmap.pl | 63 +- libs/wine/wctype.c | 4224 ++++++++++++++++++++++++++-------------------------- 3 files changed, 2145 insertions(+), 2143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2b8873b1da05618e8759…

1 0

Aric Stewart : libwine: Update wctype table to represent windows 7 values.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 49a4e8dfb897b4450b93401378c97b832d8171fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a4e8dfb897b4450b9340137… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:51:39 2010 -0500 libwine: Update wctype table to represent windows 7 values. --- libs/wine/cpmap.pl | 26 +- libs/wine/wctype.c | 1698 ++++++++++++++++++++++++++-------------------------- 2 files changed, 845 insertions(+), 879 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a4e8dfb897b4450b934…

1 0

Hans Leidekker : winhttp: Handle errors from SSL_read.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 5fc17a280046346627661e17903d2cea473e7139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc17a280046346627661e179… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 20 14:50:19 2010 +0200 winhttp: Handle errors from SSL_read. --- dlls/winhttp/net.c | 24 +++++++++++++++++++----- dlls/winhttp/tests/winhttp.c | 8 ++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index ab7a4a7..e60bd16 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -111,6 +111,7 @@ MAKE_FUNCPTR( SSL_connect ); MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); +MAKE_FUNCPTR( SSL_get_error ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); MAKE_FUNCPTR( SSL_set_ex_data ); @@ -440,6 +441,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_shutdown ); LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_read ); + LOAD_FUNCPTR( SSL_get_error ); LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); LOAD_FUNCPTR( SSL_set_ex_data ); @@ -713,6 +715,8 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) { + int ret; + *recvd = 0; if (!netconn_connected( conn )) return FALSE; if (!len) return TRUE; @@ -751,19 +755,29 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd /* check if we have enough data from the peek buffer */ if (!(flags & MSG_WAITALL) || (*recvd == len)) return TRUE; } - *recvd += pSSL_read( conn->ssl_conn, (char *)buf + *recvd, len - *recvd ); + ret = pSSL_read( conn->ssl_conn, (char *)buf + *recvd, len - *recvd ); + if (ret < 0) + return FALSE; + + /* check if EOF was received */ + if (!ret && (pSSL_get_error( conn->ssl_conn, ret ) == SSL_ERROR_ZERO_RETURN || + pSSL_get_error( conn->ssl_conn, ret ) == SSL_ERROR_SYSCALL )) + { + netconn_close( conn ); + return TRUE; + } if (flags & MSG_PEEK) /* must copy into buffer */ { - conn->peek_len = *recvd; - if (!*recvd) + conn->peek_len = ret; + if (!ret) { heap_free( conn->peek_msg_mem ); conn->peek_msg_mem = NULL; conn->peek_msg = NULL; } - else memcpy( conn->peek_msg, buf, *recvd ); + else memcpy( conn->peek_msg, buf, ret ); } - if (*recvd < 1) return FALSE; + *recvd = ret; return TRUE; #else return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 21cc501..3c725cf 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -771,6 +771,7 @@ static void test_secure_connection(void) BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; + char buffer[32]; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -847,6 +848,13 @@ static void test_secure_connection(void) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); + for (;;) + { + size = 0; + ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + if (!size) break; + } + cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con);

1 0

Dylan Smith : user32: Prevent resize of minimized windows from SetWindowPos .
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 9f32d6d6a94d56d64bac6903f8c218d8e0c20b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f32d6d6a94d56d64bac6903f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:53:23 2010 -0400 user32: Prevent resize of minimized windows from SetWindowPos. --- dlls/user32/tests/win.c | 2 +- dlls/user32/winpos.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 522a0f5..632e382 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4923,7 +4923,7 @@ static void test_ShowWindow(void) SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); ok(ret, "not expected ret: %lu\n", ret); GetWindowRect(hwnd, &rc); - todo_wine ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); + ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index dd529dc..e5e4e0c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1519,8 +1519,16 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS* pWinpos, RECT* pNewWindowRect, RECT if (!(pWinpos->flags & SWP_NOSIZE)) { - pNewWindowRect->right = pNewWindowRect->left + pWinpos->cx; - pNewWindowRect->bottom = pNewWindowRect->top + pWinpos->cy; + if (wndPtr->dwStyle & WS_MINIMIZE) + { + pNewWindowRect->right = pNewWindowRect->left + GetSystemMetrics(SM_CXICON); + pNewWindowRect->bottom = pNewWindowRect->top + GetSystemMetrics(SM_CYICON); + } + else + { + pNewWindowRect->right = pNewWindowRect->left + pWinpos->cx; + pNewWindowRect->bottom = pNewWindowRect->top + pWinpos->cy; + } } if (!(pWinpos->flags & SWP_NOMOVE)) {

1 0