May 2012 - Wine-commits - list.winehq.org

Jacek Caban : port.h: Added NAN macro.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 91b89133a9cdb8938416cd6c558e71df44f71ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b89133a9cdb8938416cd6c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 12:53:38 2012 +0200 port.h: Added NAN macro. --- include/wine/port.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 8281653..705716e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -199,6 +199,15 @@ struct statvfs #define M_PI_2 1.570796326794896619 #endif +#ifndef NAN +static float inline __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + /**************************************************************** * Function definitions (only when using libwine_port)

1 0

Jacek Caban : jscript: Get rid of ret_nan hack.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d0a719a79dae001df341db907fcae54118691d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a719a79dae001df341db907… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 12:53:55 2012 +0200 jscript: Get rid of ret_nan hack. --- dlls/jscript/date.c | 28 ++++++++++++++-------------- dlls/jscript/error.c | 3 ++- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 7 ------- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 2 +- 6 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d9c0d39..6bcf9c1 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -130,7 +130,7 @@ static inline DOUBLE days_in_year(DOUBLE year) int y; if(year != (int)year) - return ret_nan(); + return NAN; y = year; if(y%4 != 0) return 365; @@ -143,7 +143,7 @@ static inline DOUBLE days_in_year(DOUBLE year) static inline DOUBLE day_from_year(DOUBLE year) { if(year != (int)year) - return ret_nan(); + return NAN; return floor(365.0*(year-1970) + floor((year-1969)/4) - floor((year-1901)/100) + floor((year-1601)/400)); @@ -192,7 +192,7 @@ static inline DOUBLE year_from_time(DOUBLE time) int y; if(isnan(time)) - return ret_nan(); + return NAN; y = 1970 + time/365.25/MS_PER_DAY; @@ -225,7 +225,7 @@ static inline DOUBLE month_from_time(DOUBLE time) int dwy = day_within_year(time); if(isnan(time)) - return ret_nan(); + return NAN; if(0<=dwy && dwy<31) return 0; if(dwy < 59+ily) return 1; @@ -249,7 +249,7 @@ static inline DOUBLE date_from_time(DOUBLE time) int mft = month_from_time(time); if(isnan(time)) - return ret_nan(); + return NAN; if(mft==0) return dwy+1; if(mft==1) return dwy-30; @@ -271,7 +271,7 @@ static inline DOUBLE week_day(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(day(time)+4, 7); if(ret<0) ret += 7; @@ -285,7 +285,7 @@ static inline DOUBLE convert_time(int year, SYSTEMTIME st) int set_week_day; if(st.wMonth == 0) - return ret_nan(); + return NAN; if(st.wYear != 0) year = st.wYear; @@ -359,7 +359,7 @@ static inline DOUBLE hour_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(floor(time/MS_PER_HOUR), 24); if(ret<0) ret += 24; @@ -373,7 +373,7 @@ static inline DOUBLE min_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(floor(time/MS_PER_MINUTE), 60); if(ret<0) ret += 60; @@ -387,7 +387,7 @@ static inline DOUBLE sec_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(floor(time/1000), 60); if(ret<0) ret += 60; @@ -401,7 +401,7 @@ static inline DOUBLE ms_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(time, 1000); if(ret<0) ret += 1000; @@ -443,7 +443,7 @@ static inline DOUBLE make_date(DOUBLE day, DOUBLE time) static inline DOUBLE time_clip(DOUBLE time) { if(8.64e15 < time || time < -8.64e15) { - return ret_nan(); + return NAN; } return floor(time); @@ -2169,7 +2169,7 @@ static inline HRESULT date_parse(BSTR input, double *ret) { else if(input[i] == ')') { nest_level--; if(nest_level<0) { - *ret = ret_nan(); + *ret = NAN; return S_OK; } } @@ -2393,7 +2393,7 @@ static inline HRESULT date_parse(BSTR input, double *ret) { if(set_hour_adjust) *ret = utc(*ret, &di); }else { - *ret = ret_nan(); + *ret = NAN; } for(i=0; i<sizeof(string_ids)/sizeof(DWORD); i++) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index d242ce3..00560db 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include "wine/port.h" @@ -238,7 +239,7 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, hres = to_number(ctx, get_arg(dp, 0), ei, &n); if(FAILED(hres)) /* FIXME: really? */ - n = ret_nan(); + n = NAN; if(isnan(n)) hres = to_string(ctx, get_arg(dp, 0), ei, &msg); if(FAILED(hres)) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 63239c8..3fb169b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -511,7 +511,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, i = char_to_int(*ptr++); }while(i < radix); }else if(empty) { - ret = ret_nan(); + ret = NAN; } SysFreeString(str); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index dcdd143..c53e1a4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -445,13 +445,6 @@ static inline void num_set_nan(VARIANT *v) #endif } -static inline DOUBLE ret_nan(void) -{ - VARIANT v; - num_set_nan(&v); - return V_R8(&v); -} - static inline void num_set_inf(VARIANT *v, BOOL positive) { V_VT(v) = VT_R8; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d19d71b..6a36613 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -349,7 +349,7 @@ static HRESULT str_to_number(BSTR str, double *ret) ptr++; if(*ptr) - *ret = ret_nan(); + *ret = NAN; else *ret = neg ? -ret_inf() : ret_inf(); return S_OK; @@ -403,7 +403,7 @@ static HRESULT str_to_number(BSTR str, double *ret) ptr++; if(*ptr) { - *ret = ret_nan(); + *ret = NAN; return S_OK; } @@ -419,7 +419,7 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) { switch(V_VT(v)) { case VT_EMPTY: - *ret = ret_nan(); + *ret = NAN; break; case VT_NULL: *ret = 0; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 6842b58..022c06e 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -933,7 +933,7 @@ static int cc_token(parser_ctx_t *ctx, void *lval) var = find_cc_var(ctx->script->cc, ctx->ptr, id_len); ctx->ptr += id_len; if(!var || var->is_num) { - *(literal_t**)lval = new_double_literal(ctx, var ? var->u.n : ret_nan()); + *(literal_t**)lval = new_double_literal(ctx, var ? var->u.n : NAN); return tNumericLiteral; }

1 0

Jacek Caban : jscript: Get rid of num_set_nan hack.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: db737291fc1862ca825e95a1d9e059b91bdee250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db737291fc1862ca825e95a1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 12:54:11 2012 +0200 jscript: Get rid of num_set_nan hack. --- dlls/jscript/date.c | 6 ++-- dlls/jscript/global.c | 10 ++++---- dlls/jscript/jscript.h | 10 -------- dlls/jscript/math.c | 55 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 5 +++- 5 files changed, 34 insertions(+), 52 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 6bcf9c1..d5824b7 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1987,7 +1987,7 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP t = local_time(date->time, date); if(isnan(t)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -2023,7 +2023,7 @@ static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(isnan(year)) { date->time = year; if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -2414,7 +2414,7 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 3fb169b..3732b65 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -456,7 +456,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, HRESULT hres; if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -468,7 +468,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(radix && (radix < 2 || radix > 36)) { WARN("radix %d out of range\n", radix); if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } } @@ -537,7 +537,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -616,7 +616,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag if(ret_nan) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -1284,7 +1284,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - num_set_nan(&var); + num_set_val(&var, NAN); hres = jsdisp_propput_name(ctx->global, NaNW, &var, NULL/*FIXME*/); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c53e1a4..6207bbd 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -435,16 +435,6 @@ static inline void num_set_val(VARIANT *v, DOUBLE d) } } -static inline void num_set_nan(VARIANT *v) -{ - V_VT(v) = VT_R8; -#ifdef NAN - V_R8(v) = NAN; -#else - V_UI8(v) = (ULONGLONG)0x7ff80000<<32; -#endif -} - static inline void num_set_inf(VARIANT *v, BOOL positive) { V_VT(v) = VT_R8; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9c17967..d30e464 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -68,7 +68,7 @@ static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -90,7 +90,7 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -98,12 +98,8 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) { - if(x < -1.0 || x > 1.0) - num_set_nan(retv); - else - num_set_val(retv, acos(x)); - } + if(retv) + num_set_val(retv, x < -1.0 || x > 1.0 ? NAN : acos(x)); return S_OK; } @@ -116,7 +112,7 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -124,12 +120,8 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) { - if(x < -1.0 || x > 1.0) - num_set_nan(retv); - else - num_set_val(retv, asin(x)); - } + if(retv) + num_set_val(retv, x < -1.0 || x > 1.0 ? NAN : asin(x)); return S_OK; } @@ -142,7 +134,7 @@ static HRESULT Math_atan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -163,7 +155,7 @@ static HRESULT Math_atan2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA TRACE("\n"); if(arg_cnt(dp)<2) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -190,7 +182,7 @@ static HRESULT Math_ceil(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -212,7 +204,7 @@ static HRESULT Math_cos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -233,7 +225,7 @@ static HRESULT Math_exp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -255,7 +247,7 @@ static HRESULT Math_floor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -278,7 +270,7 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -286,12 +278,8 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(FAILED(hres)) return hres; - if(retv) { - if(x < -0.0) - num_set_nan(retv); - else - num_set_val(retv, log(x)); - } + if(retv) + num_set_val(retv, x < -0.0 ? NAN : log(x)); return S_OK; } @@ -373,7 +361,7 @@ static HRESULT Math_pow(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(arg_cnt(dp) < 2) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -417,7 +405,8 @@ static HRESULT Math_round(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA TRACE("\n"); if(!arg_cnt(dp)) { - num_set_nan(retv); + if(retv) + num_set_val(retv, NAN); return S_OK; } @@ -439,7 +428,7 @@ static HRESULT Math_sin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -460,7 +449,7 @@ static HRESULT Math_sqrt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -481,7 +470,7 @@ static HRESULT Math_tan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ea826c6..d1142ff 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include "jscript.h" #include "wine/debug.h" @@ -358,7 +361,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(!is_int32(d) || d < 0 || d >= length) { SysFreeString(val_str); if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; }

1 0

Jacek Caban : mshtml: Fixed Exec_ShellDocView_84 tests.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 0675f5c3d1f839544f27bf35d8cd6afca94f6573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0675f5c3d1f839544f27bf35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 14:38:04 2012 +0200 mshtml: Fixed Exec_ShellDocView_84 tests. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 41 ++++++++++------------------------------- dlls/mshtml/oleobj.c | 23 +++++++++++++++++++++++ dlls/mshtml/persist.c | 1 + dlls/mshtml/tests/htmldoc.c | 31 ++++++++++++++++++++----------- 5 files changed, 55 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0675f5c3d1f839544f27b…

1 0

Alexandre Julliard : winedbg: Fix some pointer conversion warnings.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d17bc39b1fa51d46988872da11c69c04fd22e0fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17bc39b1fa51d46988872da1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 19:14:31 2012 +0200 winedbg: Fix some pointer conversion warnings. --- programs/winedbg/be_x86_64.c | 3 +-- programs/winedbg/dbg.y | 2 +- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index dde30f3..7fae50c 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -561,8 +561,7 @@ static unsigned be_x86_64_remove_Xpoint(HANDLE hProcess, const struct be_process if (size != 0) return 0; if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; if (ch != (unsigned char)0xCC) - WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", - ch, (unsigned long)addr); + WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr); ch = (unsigned char)val; if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; break; diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 5929b87..61acb90 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -181,7 +181,7 @@ list_arg: | pathname ':' identifier { symbol_get_line($1, $3, &$$); } | '*' expr_lvalue { DWORD disp; ADDRESS64 addr; $$.SizeOfStruct = sizeof($$); types_extract_as_address(&$2, &addr); - SymGetLineFromAddr64(dbg_curr_process->handle, (unsigned long)memory_to_linear_addr(& addr), &disp, & $$); } + SymGetLineFromAddr64(dbg_curr_process->handle, (ULONG_PTR)memory_to_linear_addr(& addr), &disp, & $$); } ; run_command: diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 735ef53..cfbf161 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -73,7 +73,7 @@ static void memory_report_invalid_addr(const void* addr) address.Mode = AddrModeFlat; address.Segment = 0; - address.Offset = (unsigned long)addr; + address.Offset = (ULONG_PTR)addr; dbg_printf("*** Invalid address "); print_address(&address, FALSE); dbg_printf(" ***\n"); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 9ac49f2..ef92e89 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -67,7 +67,7 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, if (type.id == dbg_itype_segptr) { - return (long int)memory_to_linear_addr(&lvalue->addr); + return (LONG_PTR)memory_to_linear_addr(&lvalue->addr); } if (psize) *psize = 0;

1 0

Vincent Povirk : propsys: Add test for saving/ loading an empty property store.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 6fe6a43a6c9c540f3d07f613b7d573c76ca3de91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe6a43a6c9c540f3d07f613b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 23 14:01:34 2012 -0500 propsys: Add test for saving/loading an empty property store. --- dlls/propsys/tests/propstore.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 5c1b021..01500dd 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -196,11 +196,64 @@ static void test_inmemorystore(void) IPropertyStoreCache_Release(propcache); } +static void test_persistserialized(void) +{ + IPropertyStore *propstore; + IPersistSerializedPropStorage *serialized; + HRESULT hr; + SERIALIZEDPROPSTORAGE *result; + DWORD result_size; + + hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, + &IID_IPropertyStore, (void**)&propstore); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IPropertyStore_QueryInterface(propstore, &IID_IPersistSerializedPropStorage, + (void**)&serialized); + todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + if (FAILED(hr)) + { + skip("IPersistSerializedPropStorage not supported\n"); + return; + } + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, NULL, &result_size); + ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, NULL); + ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, &result_size); + ok(hr == S_OK, "GetPropertyStorage failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + ok(result_size == 0, "expected 0 bytes, got %i\n", result_size); + + CoTaskMemFree(result); + } + + hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 4); + ok(hr == E_POINTER, "SetPropertyStorage failed, hr=%x\n", hr); + + hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 0); + ok(hr == S_OK, "SetPropertyStorage failed, hr=%x\n", hr); + + hr = IPropertyStore_GetCount(propstore, &result_size); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(result_size == 0, "expecting 0, got %d\n", result_size); + + IPropertyStore_Release(propstore); + IPersistSerializedPropStorage_Release(serialized); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); + test_persistserialized(); CoUninitialize(); }

1 0

Jacek Caban : urlhist.idl: Added missing flags.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: ef309733709bf882887a5aaeac61a92fcf855b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef309733709bf882887a5aaea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 11:50:53 2012 +0200 urlhist.idl: Added missing flags. --- include/urlhist.idl | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/urlhist.idl b/include/urlhist.idl index 7d05901..955d7ff 100644 --- a/include/urlhist.idl +++ b/include/urlhist.idl @@ -21,6 +21,14 @@ import "oleidl.idl"; import "oaidl.idl"; import "docobj.idl"; +cpp_quote("#define STATURL_QUERYFLAG_ISCACHED 0x010000") +cpp_quote("#define STATURL_QUERYFLAG_NOURL 0x020000") +cpp_quote("#define STATURL_QUERYFLAG_NOTITLE 0x040000") +cpp_quote("#define STATURL_QUERYFLAG_TOPLEVEL 0x080000") + +cpp_quote("#define STATURLFLAG_ISCACHED 0x0001") +cpp_quote("#define STATURLFLAG_ISTOPLEVEL 0x0002") + typedef enum _ADDURL_FLAG { ADDURL_FIRST = 0, @@ -40,7 +48,7 @@ typedef enum _ADDURL_FLAG interface IEnumSTATURL : IUnknown { typedef [unique] IEnumSTATURL *LPENUMSTATURL; - + typedef struct _STATURL { DWORD cbSize; @@ -77,7 +85,7 @@ interface IEnumSTATURL : IUnknown interface IUrlHistoryStg : IUnknown { typedef [unique] IUrlHistoryStg *LPURLHISTORYSTG; - + HRESULT AddUrl( [in] LPCOLESTR pocsUrl, [in, unique] LPCOLESTR pocsTitle, @@ -91,14 +99,14 @@ interface IUrlHistoryStg : IUnknown [in] LPCOLESTR pocsUrl, [in] DWORD dwFlags, [in, out, unique] LPSTATURL lpSTATURL); - + HRESULT BindToObject( [in] LPCOLESTR pocsUrl, [in] REFIID riid, [out, iid_is(riid)] void **ppvOut); HRESULT EnumUrls( - [out] IEnumSTATURL **ppEnum); + [out] IEnumSTATURL **ppEnum); } /*****************************************************************************

1 0

Jacek Caban : wininet: Handle error flags only for masked-error mode.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 79259064c9c9cd754dfc246988b9626bbcd1f3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79259064c9c9cd754dfc24698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:54:32 2012 +0200 wininet: Handle error flags only for masked-error mode. --- dlls/wininet/netconnection.c | 32 ++++++++++++++------- dlls/wininet/tests/http.c | 61 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 238d365..8117884 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -247,41 +247,47 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors = chain->TrustStatus.dwErrorStatus; if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); err = ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; } if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } if(errors & (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN)) { - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; errors &= ~(CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN); } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + if(conn->mask_errors) + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) err = ERROR_INTERNET_SEC_CERT_NO_REV; errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); } if(errors & CERT_TRUST_IS_REVOKED) { - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + if(conn->mask_errors) + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) err = ERROR_INTERNET_SEC_CERT_REVOKED; errors &= ~CERT_TRUST_IS_REVOKED; } if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) err = ERROR_INTERNET_SEC_INVALID_CERT; errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; @@ -313,10 +319,12 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR */ if(ret) { if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; err = ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { - WARN("unknown error flags for policy status %x\n", policyStatus.dwError); + if(conn->mask_errors) + WARN("unknown error flags for policy status %x\n", policyStatus.dwError); err = ERROR_INTERNET_SEC_INVALID_CERT; } }else { @@ -328,9 +336,10 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(err) { WARN("failed %u\n", err); - conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; - if(conn->mask_errors) + if(conn->mask_errors) { + conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; return err == ERROR_INTERNET_INVALID_CA ? ERROR_INTERNET_SEC_CERT_REV_FAILED : ERROR_INTERNET_SEC_CERT_ERRORS; + } return err; } @@ -772,7 +781,8 @@ DWORD NETCON_secure_connect(netconn_t *connection) connection->security_flags |= SECURITY_FLAG_STRENGTH_WEAK; connection->security_flags |= SECURITY_FLAG_SECURE; - connection->server->security_flags = connection->security_flags; + if(connection->mask_errors) + connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; fail: diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2cfc2af..2e7b693 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2929,12 +2929,63 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + test_secflags_option(req, 0); + set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + + SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); + SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + + res = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); + + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); + + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + + test_request_flags(req, 0); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA| + SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_STRENGTH_STRONG); + + res = InternetReadFile(req, buf, sizeof(buf), &size); + ok(res, "InternetReadFile failed: %u\n", GetLastError()); + ok(size, "size = 0\n"); + + /* Collect all existing persistent connections */ + res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(res, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequest(conn, "GET", "/tests/hello.html", NULL, NULL, NULL, + INTERNET_FLAG_SECURE|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_RELOAD|INTERNET_FLAG_NO_CACHE_WRITE, + 0xdeadbeef); + ok(req != NULL, "HttpOpenRequest failed\n"); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT|INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY; res = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&flags, sizeof(flags)); ok(res, "InternetQueryOption(INTERNET_OPTION_ERROR_MASK failed: %u\n", GetLastError()); - SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); - SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); @@ -2950,8 +3001,6 @@ static void test_security_flags(void) ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); @@ -2963,7 +3012,7 @@ static void test_security_flags(void) if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { win_skip("Unexpected cert errors, skipping security flags tests\n"); - close_async_handle(ses, hCompleteEvent, 2); + close_async_handle(ses, hCompleteEvent, 3); CloseHandle(hCompleteEvent); return; } @@ -3013,7 +3062,7 @@ static void test_security_flags(void) ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n"); - close_async_handle(ses, hCompleteEvent, 2); + close_async_handle(ses, hCompleteEvent, 3); /* Collect all existing persistent connections */ res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0);

1 0

Jacek Caban : wininet: Fixed grouping security error flags.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: a24b5588d23b61a6e769f53996610c75f0de6af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24b5588d23b61a6e769f5399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:55:00 2012 +0200 wininet: Fixed grouping security error flags. --- dlls/wininet/internet.h | 4 ++-- dlls/wininet/netconnection.c | 34 ++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 230e8d8..fd6b5f7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -561,11 +561,11 @@ typedef struct } wininet_flag_info; /* Undocumented security flags */ -#define _SECURITY_FLAG_CERT_INVALID_CA 0x00800000 +#define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 #define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 #define _SECURITY_ERROR_FLAGS_MASK \ - (_SECURITY_FLAG_CERT_INVALID_CA \ + (_SECURITY_FLAG_CERT_REV_FAILED \ |_SECURITY_FLAG_CERT_INVALID_CN) #endif /* _WINE_INTERNET_H_ */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8117884..ceed17a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -249,7 +249,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; } @@ -257,23 +257,31 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) - err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } - if(errors & (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN)) { + if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + WARN("CERT_TRUST_IS_UNTRUSTED_ROOT, unknown flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = ERROR_INTERNET_INVALID_CA; - errors &= ~(CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN); + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; + } + + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = ERROR_INTERNET_SEC_CERT_NO_REV; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); } @@ -281,7 +289,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = ERROR_INTERNET_SEC_CERT_REVOKED; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; errors &= ~CERT_TRUST_IS_REVOKED; } @@ -289,7 +297,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; } @@ -321,11 +329,11 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { if(conn->mask_errors) conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { if(conn->mask_errors) WARN("unknown error flags for policy status %x\n", policyStatus.dwError); - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; } }else { err = GetLastError(); @@ -336,10 +344,8 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(err) { WARN("failed %u\n", err); - if(conn->mask_errors) { + if(conn->mask_errors) conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; - return err == ERROR_INTERNET_INVALID_CA ? ERROR_INTERNET_SEC_CERT_REV_FAILED : ERROR_INTERNET_SEC_CERT_ERRORS; - } return err; }

1 0

Jacek Caban : wininet: Get rid of no longer used serverName and serverPort from http_session_t.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 2ed97ebe43ef637605ebca25197a39acd1cdd60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed97ebe43ef637605ebca251… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:55:13 2012 +0200 wininet: Get rid of no longer used serverName and serverPort from http_session_t. --- dlls/wininet/http.c | 7 ++----- dlls/wininet/internet.h | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f08ab6d..74c9006 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3086,11 +3086,11 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - port = session->serverPort; + port = session->hostPort; if(port == INTERNET_INVALID_PORT_NUMBER) port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - request->server = get_server(session->serverName, port); + request->server = get_server(session->hostName, port); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -5450,7 +5450,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr) WININET_Release(&session->appInfo->hdr); heap_free(session->hostName); - heap_free(session->serverName); heap_free(session->password); heap_free(session->userName); } @@ -5602,13 +5601,11 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->proxyBypass) FIXME("Proxy bypass is ignored.\n"); } - session->serverName = heap_strdupW(lpszServerName); session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); if (lpszPassword && lpszPassword[0]) session->password = heap_strdupW(lpszPassword); - session->serverPort = serverPort; session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; session->send_timeout = INFINITE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index fd6b5f7..2e59720 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -269,11 +269,9 @@ typedef struct object_header_t hdr; appinfo_t *appInfo; LPWSTR hostName; /* the final destination of the request */ - LPWSTR serverName; /* the name of the server we directly connect to */ LPWSTR userName; LPWSTR password; INTERNET_PORT hostPort; /* the final destination port of the request */ - INTERNET_PORT serverPort; /* the port of the server we directly connect to */ DWORD connect_timeout; DWORD send_timeout; DWORD receive_timeout;

1 0