October 2008 - Wine-Commits

Jacek Caban : jscript: Fixed list literal length calculation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 4783dd1e543967997f54bec0250c88a69661a2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4783dd1e543967997f54bec02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 12:01:06 2008 -0500 jscript: Fixed list literal length calculation. --- dlls/jscript/parser.y | 3 ++- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 2123e9c..8f01028 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -738,7 +738,8 @@ PrimaryExpression /* ECMA-262 3rd Edition 11.1.4 */ ArrayLiteral - : '[' Elision_opt ']' { $$ = new_array_literal_expression(ctx, NULL, $2); } + : '[' ']' { $$ = new_array_literal_expression(ctx, NULL, 0); } + | '[' Elision_opt ']' { $$ = new_array_literal_expression(ctx, NULL, $2+1); } | '[' ElementList ']' { $$ = new_array_literal_expression(ctx, $2, 0); } | '[' ElementList ',' Elision_opt ']' { $$ = new_array_literal_expression(ctx, $2, $4+1); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c9d9455..82e865f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -615,6 +615,9 @@ ok(tmp["6"] === true, "tmp[6] !== true"); ok(tmp[2] === 1, "tmp[2] !== 1"); ok([1,].length === 2, "[1,].length !== 2"); +ok([,,].length === 3, "[,,].length !== 3"); +ok([,].length === 2, "[].length != 2"); +ok([].length === 0, "[].length != 0"); tmp = 0; while(tmp < 4) {

1 0

Jacek Caban : jscript: Added encodeURI implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 67af45be7dec29fec89b959f39aba3108637f851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67af45be7dec29fec89b959f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 12:02:39 2008 -0500 jscript: Added encodeURI implementation. --- dlls/jscript/global.c | 107 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 21 +++++++++ 2 files changed, 127 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 01d92dd..432bf00 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -53,6 +53,40 @@ static const WCHAR ScriptEngineBuildVersionW[] = {'S','c','r','i','p','t','E','n','g','i','n','e','B','u','i','l','d','V','e','r','s','i','o','n',0}; static const WCHAR CollectGarbageW[] = {'C','o','l','l','e','c','t','G','a','r','b','a','g','e',0}; static const WCHAR MathW[] = {'M','a','t','h',0}; +static const WCHAR encodeURIW[] = {'e','n','c','o','d','e','U','R','I',0}; + +static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + +static int uri_char_table[] = { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 00-0f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 10-1f */ + 0,2,0,0,1,0,1,2,2,2,2,1,1,2,2,1, /* 20-2f */ + 2,2,2,2,2,2,2,2,2,2,1,1,0,1,0,1, /* 30-3f */ + 1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 40-4f */ + 2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2, /* 50-5f */ + 0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 60-6f */ + 2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,0, /* 70-7f */ +}; + +/* 1 - reserved */ +/* 2 - unescaped */ + +static inline BOOL is_uri_reserved(WCHAR c) +{ + return c < 128 && uri_char_table[c] == 1; +} + +static inline BOOL is_uri_unescaped(WCHAR c) +{ + return c < 128 && uri_char_table[c] == 2; +} + +static WCHAR int_to_char(int i) +{ + if(i < 10) + return '0'+i; + return 'A'+i-10; +} static HRESULT constructor_call(DispatchEx *constr, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -205,7 +239,7 @@ static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA TRACE("parsing %s\n", debugstr_w(V_BSTR(arg))); hres = script_parse(dispex->ctx, V_BSTR(arg), &parser_ctx); if(FAILED(hres)) { - FIXME("parse failed: %08x\n", hres); + WARN("parse (%s) failed: %08x\n", debugstr_w(V_BSTR(arg)), hres); return hres; } @@ -364,6 +398,76 @@ static HRESULT JSGlobal_CollectGarbage(DispatchEx *dispex, LCID lcid, WORD flags return E_NOTIMPL; } +static HRESULT JSGlobal_encodeURI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + const WCHAR *ptr; + DWORD len = 0, i; + char buf[4]; + BSTR str, ret; + WCHAR *rptr; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(dispex->ctx, get_arg(dp,0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr = str; *ptr; ptr++) { + if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { + len++; + }else { + i = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; + if(!i) { + FIXME("throw URIError\n"); + return E_FAIL; + } + + len += i; + } + } + + rptr = ret = SysAllocStringLen(NULL, len); + if(!ret) + return E_OUTOFMEMORY; + + for(ptr = str; *ptr; ptr++) { + if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { + *rptr++ = *ptr; + }else { + len = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + for(i=0; i<len; i++) { + *rptr++ = '%'; + *rptr++ = int_to_char((BYTE)buf[i] >> 4); + *rptr++ = int_to_char(buf[i] & 0x0f); + } + } + } + + TRACE("%s -> %s\n", debugstr_w(str), debugstr_w(ret)); + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + }else { + SysFreeString(ret); + } + return S_OK; +} + static const builtin_prop_t JSGlobal_props[] = { {ActiveXObjectW, JSGlobal_ActiveXObject, PROPF_METHOD}, {ArrayW, JSGlobal_Array, PROPF_CONSTR}, @@ -385,6 +489,7 @@ static const builtin_prop_t JSGlobal_props[] = { {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, {StringW, JSGlobal_String, PROPF_CONSTR}, {VBArrayW, JSGlobal_VBArray, PROPF_METHOD}, + {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD}, {escapeW, JSGlobal_escape, PROPF_METHOD}, {evalW, JSGlobal_eval, PROPF_METHOD|1}, {isFiniteW, JSGlobal_isFinite, PROPF_METHOD}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b421ceb..3543357 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -37,6 +37,27 @@ ok(i === 123, "parseInt('123', 10, 'test') = " + i); i = parseInt("11", "8"); ok(i === 9, "parseInt('11', '8') = " + i); +tmp = encodeURI("abc"); +ok(tmp === "abc", "encodeURI('abc') = " + tmp); +tmp = encodeURI("{abc}"); +ok(tmp === "%7Babc%7D", "encodeURI('{abc}') = " + tmp); +tmp = encodeURI(""); +ok(tmp === "", "encodeURI('') = " + tmp); +tmp = encodeURI("\01\02\03\04"); +ok(tmp === "%01%02%03%04", "encodeURI('\\01\\02\\03\\04') = " + tmp); +tmp = encodeURI("{#@}"); +ok(tmp === "%7B#@%7D", "encodeURI('{#@}') = " + tmp); +tmp = encodeURI("\xa1 "); +ok(tmp === "%C2%A1%20", "encodeURI(\\xa1 ) = " + tmp); +tmp = encodeURI("\xffff"); +ok(tmp.length === 8, "encodeURI('\\xffff').length = " + tmp.length); +tmp = encodeURI("abcABC123;/?:@&=+$,-_.!~*'()"); +ok(tmp === "abcABC123;/?:@&=+$,-_.!~*'()", "encodeURI('abcABC123;/?:@&=+$,-_.!~*'()') = " + tmp); +tmp = encodeURI(); +ok(tmp === "undefined", "encodeURI() = " + tmp); +tmp = encodeURI("abc", "test"); +ok(tmp === "abc", "encodeURI('abc') = " + tmp); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp);

1 0

Jacek Caban : jscript: Fixed numeric escapes unescaping.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: bb08e971edfa0a1b92cf52177ba04ce358bf6e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb08e971edfa0a1b92cf52177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 12:02:08 2008 -0500 jscript: Fixed numeric escapes unescaping. --- dlls/jscript/lex.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 93397a3..a937804 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -243,13 +243,11 @@ static BOOL unescape(WCHAR *str) case 'r': c = '\r'; break; - case '0': - break; case 'x': i = hex_to_int(*++p); if(i == -1) return FALSE; - c = i << 16; + c = i << 4; i = hex_to_int(*++p); if(i == -1) @@ -260,17 +258,17 @@ static BOOL unescape(WCHAR *str) i = hex_to_int(*++p); if(i == -1) return FALSE; - c = i << 24; + c = i << 12; i = hex_to_int(*++p); if(i == -1) return FALSE; - c += i << 16; + c += i << 8; i = hex_to_int(*++p); if(i == -1) return FALSE; - c += 1 << 8; + c += 1 << 4; i = hex_to_int(*++p); if(i == -1) @@ -278,6 +276,14 @@ static BOOL unescape(WCHAR *str) c += i; break; default: + if(isdigitW(*p)) { + c = *p++ - '0'; + while(isdigitW(*p)) + c = c*10 + (*p++ - '0'); + *pd++ = c; + continue; + } + c = *p; }

1 0

Jacek Caban : jscript: Added Array.pop implementation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 80bd994bc73b50ed7efedff722297a158f691831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bd994bc73b50ed7efedff72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 12:01:39 2008 -0500 jscript: Added Array.pop implementation. --- dlls/jscript/array.c | 60 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/dispex.c | 23 +++++++++++------ dlls/jscript/jscript.h | 1 + dlls/jscript/tests/api.js | 22 +++++++++++++++- 4 files changed, 94 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index c4d7399..5e94f95 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -286,10 +286,64 @@ static HRESULT Array_join(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } static HRESULT Array_pop(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT val; + DWORD length; + WCHAR buf[14]; + DISPID id; + HRESULT hres; + + static const WCHAR formatW[] = {'%','d',0}; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + ArrayInstance *array = (ArrayInstance*)dispex; + length = array->length; + }else { + FIXME("not Array this\n"); + return E_NOTIMPL; + } + + if(!length) { + if(retv) + V_VT(retv) = VT_EMPTY; + return S_OK; + } + + sprintfW(buf, formatW, --length); + hres = jsdisp_get_id(dispex, buf, 0, &id); + if(SUCCEEDED(hres)) { + hres = jsdisp_propget(dispex, id, lcid, &val, ei, caller); + if(FAILED(hres)) + return hres; + + hres = IDispatchEx_DeleteMemberByDispID(_IDispatchEx_(dispex), id); + }else if(hres == DISP_E_UNKNOWNNAME) { + V_VT(&val) = VT_EMPTY; + hres = S_OK; + }else { + return hres; + } + + if(SUCCEEDED(hres)) { + if(is_class(dispex, JSCLASS_ARRAY)) { + ArrayInstance *array = (ArrayInstance*)dispex; + array->length = length; + } + } + + if(FAILED(hres)) { + VariantClear(&val); + return hres; + } + + if(retv) + *retv = val; + else + VariantClear(&val); + return S_OK; } /* ECMA-262 3rd Edition 15.4.4.7 */ diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index cefe71e..9717bfe 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -969,6 +969,20 @@ HRESULT jsdisp_propget_idx(DispatchEx *obj, DWORD idx, LCID lcid, VARIANT *var, return jsdisp_propget_name(obj, buf, lcid, var, ei, caller); } +HRESULT jsdisp_propget(DispatchEx *jsdisp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, + IServiceProvider *caller) +{ + DISPPARAMS dp = {NULL,NULL,0,0}; + dispex_prop_t *prop; + + prop = get_prop(jsdisp, id); + if(!prop) + return DISP_E_MEMBERNOTFOUND; + + V_VT(val) = VT_EMPTY; + return prop_get(jsdisp, prop, lcid, &dp, val, ei, caller); +} + HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { DISPPARAMS dp = {NULL,NULL,0,0}; @@ -978,14 +992,7 @@ HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { - dispex_prop_t *prop; - - prop = get_prop(jsdisp, id); - if(prop) - hres = prop_get(jsdisp, prop, lcid, &dp, val, ei, caller); - else - hres = DISP_E_MEMBERNOTFOUND; - + hres = jsdisp_propget(jsdisp, id, lcid, val, ei, caller); IDispatchEx_Release(_IDispatchEx_(jsdisp)); return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2e77d43..691ac9e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -125,6 +125,7 @@ HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,I HRESULT jsdisp_call_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_propget(DispatchEx*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 153c1f5..b421ceb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -229,6 +229,26 @@ ok(arr.push(true, 'b', false) === 10, "arr.push(true, 'b', false) !== 10"); ok(arr[8] === "b", "arr[8] != 'b'"); ok(arr.length === 10, "arr.length != 10"); +arr = [3,4,5]; +tmp = arr.pop(); +ok(arr.length === 2, "arr.length = " + arr.length); +ok(tmp === 5, "pop() = " + tmp); +tmp = arr.pop(2); +ok(arr.length === 1, "arr.length = " + arr.length); +ok(tmp === 4, "pop() = " + tmp); +tmp = arr.pop(); +ok(arr.length === 0, "arr.length = " + arr.length); +ok(tmp === 3, "pop() = " + tmp); +for(tmp in arr) + ok(false, "not deleted " + tmp); +tmp = arr.pop(); +ok(arr.length === 0, "arr.length = " + arr.length); +ok(tmp === undefined, "tmp = " + tmp); +arr = [,,,,,]; +tmp = arr.pop(); +ok(arr.length === 5, "arr.length = " + arr.length); +ok(tmp === undefined, "tmp = " + tmp); + arr = [1,2,null,false,undefined,,"a"]; tmp = arr.join(); @@ -275,7 +295,7 @@ ok(tmp[6] === num, "tmp[6] !== num"); ok(tmp.length === 7, "tmp.length = " + tmp.length); arr = [].concat(); -ok(arr.length === 0, "arr.length = " + arr.lrngth); +ok(arr.length === 0, "arr.length = " + arr.length); arr = [1,]; tmp = arr.concat([2]);

1 0

Jacek Caban : jscript: Fixed copy&paste bug in disp_propget.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 7a8cfdee6dc3aca8579ae5660d6c9694d78cbb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8cfdee6dc3aca8579ae5660… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 12:00:49 2008 -0500 jscript: Fixed copy&paste bug in disp_propget. --- dlls/jscript/dispex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 76caf1c..cefe71e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -994,8 +994,8 @@ HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce if(FAILED(hres)) { ULONG err = 0; - TRACE("uding IDispatch\n"); - return IDispatchEx_Invoke(dispex, id, &IID_NULL, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); + TRACE("using IDispatch\n"); + return IDispatch_Invoke(disp, id, &IID_NULL, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); } hres = IDispatchEx_InvokeEx(dispex, id, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, caller);

1 0

Juan Lang : cryptnet: Set cache expiration time of objects that have an expiration time to the object 's expiration time, rather than relying on the HTTP Expires header.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 6b8fb4ed9b1c2a885a6eac5ef7e4c5f9fd8d7ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8fb4ed9b1c2a885a6eac5ef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 3 10:51:09 2008 -0700 cryptnet: Set cache expiration time of objects that have an expiration time to the object's expiration time, rather than relying on the HTTP Expires header. --- dlls/cryptnet/cryptnet_main.c | 133 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 121 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3f44aeb..7a79371 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -400,7 +400,6 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) return ret; } -/* FIXME: should make wininet cache all downloads instead */ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { @@ -605,30 +604,73 @@ static BOOL CRYPT_DownloadObject(DWORD dwRetrievalFlags, HINTERNET hHttp, return ret; } +/* Finds the object specified by pszURL in the cache. If it's not found, + * creates a new cache entry for the object and writes the object to it. + * Sets the expiration time of the cache entry to expires. + */ static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; + DWORD size = 0; + BOOL ret, create = FALSE; - /* FIXME: let wininet directly cache instead */ - if (CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, - cacheFileName, 0)) + GetUrlCacheEntryInfoW(pszURL, NULL, &size); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - HANDLE hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + INTERNET_CACHE_ENTRY_INFOW *info = CryptMemAlloc(size); - if (hCacheFile != INVALID_HANDLE_VALUE) + if (info) { - DWORD bytesWritten, entryType; - FILETIME ft = { 0 }; + FILETIME ft; + + ret = GetUrlCacheEntryInfoW(pszURL, info, &size); + if (ret) + lstrcpyW(cacheFileName, info->lpszLocalFileName); + /* Check if the existing cache entry is up to date. If it isn't, + * overwite it with the new value. + */ + GetSystemTimeAsFileTime(&ft); + if (CompareFileTime(&info->ExpireTime, &ft) < 0) + create = TRUE; + CryptMemFree(info); + } + else + ret = FALSE; + } + else + { + ret = CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, + cacheFileName, 0); + create = TRUE; + } + if (ret) + { + DWORD entryType; + FILETIME ft = { 0 }; + + if (create) + { + HANDLE hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (hCacheFile != INVALID_HANDLE_VALUE) + { + DWORD bytesWritten; + WriteFile(hCacheFile, pObject->rgBlob[0].pbData, + pObject->rgBlob[0].cbData, &bytesWritten, NULL); + CloseHandle(hCacheFile); + } + else + ret = FALSE; + } + if (ret) + { if (!(dwRetrievalFlags & CRYPT_STICKY_CACHE_RETRIEVAL)) entryType = NORMAL_CACHE_ENTRY; else entryType = STICKY_CACHE_ENTRY; - WriteFile(hCacheFile, pObject->rgBlob[0].pbData, - pObject->rgBlob[0].cbData, &bytesWritten, NULL); - CloseHandle(hCacheFile); CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, NULL, 0, NULL, NULL); } @@ -1280,6 +1322,63 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, return ret; } +typedef BOOL (*get_object_expiration_func)(void *pvContext, + FILETIME *expiration); + +static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) +{ + PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvObject; + + *expiration = cert->pCertInfo->NotAfter; + return TRUE; +} + +static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) +{ + PCCRL_CONTEXT cert = (PCCRL_CONTEXT)pvObject; + + *expiration = cert->pCrlInfo->NextUpdate; + return TRUE; +} + +static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) +{ + PCCTL_CONTEXT cert = (PCCTL_CONTEXT)pvObject; + + *expiration = cert->pCtlInfo->NextUpdate; + return TRUE; +} + +static BOOL CRYPT_GetExpirationFunction(LPCSTR pszObjectOid, + get_object_expiration_func *getExpiration) +{ + BOOL ret; + + if (!HIWORD(pszObjectOid)) + { + switch (LOWORD(pszObjectOid)) + { + case LOWORD(CONTEXT_OID_CERTIFICATE): + *getExpiration = CRYPT_GetExpirationFromCert; + ret = TRUE; + break; + case LOWORD(CONTEXT_OID_CRL): + *getExpiration = CRYPT_GetExpirationFromCRL; + ret = TRUE; + break; + case LOWORD(CONTEXT_OID_CTL): + *getExpiration = CRYPT_GetExpirationFromCTL; + ret = TRUE; + break; + default: + ret = FALSE; + } + } + else + ret = FALSE; + return ret; +} + /*********************************************************************** * CryptRetrieveObjectByUrlW (CRYPTNET.@) */ @@ -1316,7 +1415,17 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, pAuxInfo); if (ret) { + get_object_expiration_func getExpiration; + ret = create(pszObjectOid, dwRetrievalFlags, &object, ppvObject); + if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT) && + CRYPT_GetExpirationFunction(pszObjectOid, &getExpiration)) + { + FILETIME expires; + + if (getExpiration(*ppvObject, &expires)) + CRYPT_CacheURL(pszURL, &object, dwRetrievalFlags, expires); + } freeObject(pszObjectOid, &object, freeContext); } }

1 0

Juan Lang : cryptnet: Don't access URL cache entry before it's been read.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: da605a935b2be910a6ad1f758106192c861d176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=da605a935b2be910a6ad1f758… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 3 10:50:34 2008 -0700 cryptnet: Don't access URL cache entry before it's been read. --- dlls/cryptnet/cryptnet_main.c | 61 ++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 0395e0a..3f44aeb 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -405,52 +405,57 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { BOOL ret = FALSE; - INTERNET_CACHE_ENTRY_INFOW cacheInfo = { sizeof(cacheInfo), 0 }; - DWORD size = sizeof(cacheInfo); + INTERNET_CACHE_ENTRY_INFOW *pCacheInfo = NULL; + DWORD size = 0; TRACE("(%s, %p, %p)\n", debugstr_w(pszURL), pObject, pAuxInfo); - if (GetUrlCacheEntryInfoW(pszURL, &cacheInfo, &size) || - GetLastError() == ERROR_INSUFFICIENT_BUFFER) + ret = GetUrlCacheEntryInfoW(pszURL, NULL, &size); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pCacheInfo = CryptMemAlloc(size); + if (pCacheInfo) + ret = TRUE; + else + SetLastError(ERROR_OUTOFMEMORY); + } + if (ret && (ret = GetUrlCacheEntryInfoW(pszURL, pCacheInfo, &size))) { FILETIME ft; GetSystemTimeAsFileTime(&ft); - if (CompareFileTime(&cacheInfo.ExpireTime, &ft) >= 0) + if (CompareFileTime(&pCacheInfo->ExpireTime, &ft) >= 0) { - LPINTERNET_CACHE_ENTRY_INFOW pCacheInfo = CryptMemAlloc(size); + HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, + GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (pCacheInfo) + if (hFile != INVALID_HANDLE_VALUE) { - if (GetUrlCacheEntryInfoW(pszURL, pCacheInfo, &size)) + if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) { - HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, - GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); - - if (hFile != INVALID_HANDLE_VALUE) - { - if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) - { - if (pAuxInfo && pAuxInfo->cbSize >= - offsetof(CRYPT_RETRIEVE_AUX_INFO, - pLastSyncTime) + sizeof(PFILETIME) && - pAuxInfo->pLastSyncTime) - memcpy(pAuxInfo->pLastSyncTime, - &pCacheInfo->LastSyncTime, - sizeof(FILETIME)); - } - CloseHandle(hFile); - } + if (pAuxInfo && pAuxInfo->cbSize >= + offsetof(CRYPT_RETRIEVE_AUX_INFO, + pLastSyncTime) + sizeof(PFILETIME) && + pAuxInfo->pLastSyncTime) + memcpy(pAuxInfo->pLastSyncTime, + &pCacheInfo->LastSyncTime, + sizeof(FILETIME)); } - CryptMemFree(pCacheInfo); + CloseHandle(hFile); } else - SetLastError(ERROR_OUTOFMEMORY); + { + DeleteUrlCacheEntryW(pszURL); + ret = FALSE; + } } else + { DeleteUrlCacheEntryW(pszURL); + ret = FALSE; + } } + CryptMemFree(pCacheInfo); TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : wininet: Fix trace typo.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: f50b2c237d8b399a5700e9e85b807e8e7b5a3f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50b2c237d8b399a5700e9e85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 3 10:45:35 2008 -0700 wininet: Fix trace typo. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3649a05..1d1beaf 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -590,7 +590,7 @@ static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, URLCACHECONTAIN int prefix_len = strlenW(pContainer->cache_prefix); if (!strncmpW(pContainer->cache_prefix, lpwszUrl, prefix_len)) { - TRACE("found container with prefx %s for URL %s\n", debugstr_w(pContainer->cache_prefix), debugstr_w(lpwszUrl)); + TRACE("found container with prefix %s for URL %s\n", debugstr_w(pContainer->cache_prefix), debugstr_w(lpwszUrl)); *ppContainer = pContainer; return ERROR_SUCCESS; }

1 0

Juan Lang : wininet: Don' t call URL_LocalFileNameToPathA when asked for a unicode string and URL_LocalFileNameToPathW fails .
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 9189bf3d72854f68c485256b307c3135a277aaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9189bf3d72854f68c485256b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 3 10:45:06 2008 -0700 wininet: Don't call URL_LocalFileNameToPathA when asked for a unicode string and URL_LocalFileNameToPathW fails. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ce9e7d4..3649a05 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1005,7 +1005,7 @@ static DWORD URLCache_CopyEntry( lpszLocalFileName = (LPSTR)lpCacheEntryInfo + dwRequiredSize; nLocalFilePathSize = *lpdwBufferSize - dwRequiredSize; if ((bUnicode && URLCache_LocalFileNameToPathW(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, (LPWSTR)lpszLocalFileName, &nLocalFilePathSize)) || - URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize)) + (!bUnicode && URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize))) { lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; }

1 0

Juan Lang : wininet: Trace the cache file entry' s local file name rather than the passed-in cache entry info' s local file name, as the caller may have passed a NULL pointer.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 024c13c1746fce2696f1e4aba561d547e64eaa56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024c13c1746fce2696f1e4aba… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 3 10:44:22 2008 -0700 wininet: Trace the cache file entry's local file name rather than the passed-in cache entry info's local file name, as the caller may have passed a NULL pointer. --- dlls/wininet/urlcache.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9705769..ce9e7d4 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1552,7 +1552,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a(lpCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1633,7 +1633,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1875,7 +1875,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", lpCacheEntryInfo->lpszLocalFileName); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1968,7 +1968,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3234,7 +3234,7 @@ BOOL WINAPI FindNextUrlCacheEntryA( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a(lpNextCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */

1 0