wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Jacek Caban : wine/debug.h: Added debugstr_variant and debugstr_vt aliases and removed all duplicated implementations.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: d2886a05f9fe26c89c50c7bce86bc0656c63643c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2886a05f9fe26c89c50c7bce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 16:26:23 2014 +0200 wine/debug.h: Added debugstr_variant and debugstr_vt aliases and removed all duplicated implementations. --- dlls/ieframe/ieframe.h | 2 -- dlls/ieframe/ieframe_main.c | 27 ------------------------ dlls/jscript/jscript.h | 1 - dlls/jscript/jsutils.c | 29 -------------------------- dlls/mshtml/main.c | 31 ---------------------------- dlls/mshtml/mshtml_private.h | 1 - dlls/msxml3/main.c | 44 ---------------------------------------- dlls/msxml3/msxml_private.h | 2 -- dlls/oleacc/main.c | 32 ----------------------------- dlls/oleacc/oleacc_private.h | 1 - dlls/oleaut32/variant.c | 10 --------- dlls/oleaut32/variant.h | 3 --- dlls/taskschd/taskschd.c | 31 ---------------------------- dlls/taskschd/taskschd_private.h | 1 - dlls/vbscript/vbscript.h | 2 -- dlls/vbscript/vbscript_main.c | 32 ----------------------------- dlls/wbemprox/wbemprox_private.h | 31 ---------------------------- dlls/winhttp/request.c | 3 ++- dlls/winhttp/winhttp_private.h | 31 ---------------------------- dlls/wshom.ocx/shell.c | 32 ----------------------------- include/wine/debug.h | 5 +++++ 21 files changed, 7 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2886a05f9fe26c89c50c…

1 0

Jacek Caban : wine/debug.h: Added wine_dbgstr_variant and wine_dbgstr_vt implementations.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: e18ef3cf4c8b2b831203a4fa7bed74a25415ba24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18ef3cf4c8b2b831203a4fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 16:26:02 2014 +0200 wine/debug.h: Added wine_dbgstr_variant and wine_dbgstr_vt implementations. --- dlls/oleaut32/variant.c | 75 +----------------------------- include/wine/debug.h | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 73 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index addc5a0..21d1941 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -44,7 +44,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); - static const char * const variant_types[] = { "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", @@ -81,82 +80,12 @@ static const char * const variant_flags[16] = const char *debugstr_vt(VARTYPE vt) { - if(vt & ~VT_TYPEMASK) - return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); - - if(vt < sizeof(variant_types)/sizeof(*variant_types)) - return variant_types[vt]; - - if(vt == VT_BSTR_BLOB) - return "VT_BSTR_BLOB"; - - return wine_dbg_sprintf("vt(invalid %x)", vt); + return wine_dbgstr_vt(vt); } const char *debugstr_variant(const VARIANT *v) { - if(!v) - return "(null)"; - - if(V_VT(v) & VT_BYREF) { - if(V_VT(v) == (VT_VARIANT|VT_BYREF)) - return wine_dbg_sprintf("%p {VT_VARIANT|VT_BYREF: %s}", v, debugstr_variant(V_VARIANTREF(v))); - return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_BYREF(v)); - } - - if(V_ISARRAY(v) || V_ISVECTOR(v)) - return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_ARRAY(v)); - - switch(V_VT(v)) { - case VT_EMPTY: - return wine_dbg_sprintf("%p {VT_EMPTY}", v); - case VT_NULL: - return wine_dbg_sprintf("%p {VT_NULL}", v); - case VT_I2: - return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); - case VT_I4: - return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); - case VT_R4: - return wine_dbg_sprintf("%p {VT_R4: %f}", v, V_R4(v)); - case VT_R8: - return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); - case VT_CY: - return wine_dbg_sprintf("%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64)); - case VT_DATE: - return wine_dbg_sprintf("%p {VT_DATE: %lf}", v, V_DATE(v)); - case VT_BSTR: - return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); - case VT_DISPATCH: - return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); - case VT_ERROR: - return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); - case VT_BOOL: - return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); - case VT_UNKNOWN: - return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v)); - case VT_I1: - return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); - case VT_UI1: - return wine_dbg_sprintf("%p {VT_UI1: %u}", v, V_UI1(v)); - case VT_UI2: - return wine_dbg_sprintf("%p {VT_UI2: %d}", v, V_UI2(v)); - case VT_UI4: - return wine_dbg_sprintf("%p {VT_UI4: %d}", v, V_UI4(v)); - case VT_I8: - return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v))); - case VT_UI8: - return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v))); - case VT_INT: - return wine_dbg_sprintf("%p {VT_INT: %d}", v, V_INT(v)); - case VT_UINT: - return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); - case VT_VOID: - return wine_dbg_sprintf("%p {VT_VOID}", v); - case VT_RECORD: - return wine_dbg_sprintf("%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo); - default: - return wine_dbg_sprintf("%p {vt %s}", v, debugstr_vt(V_VT(v))); - } + return wine_dbgstr_variant(v); } /* Convert a variant from one type to another */ diff --git a/include/wine/debug.h b/include/wine/debug.h index ba6fabe..ca25e0a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -219,6 +219,124 @@ static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); } +#if defined(__oaidl_h__) && defined(V_VT) + +static inline const char *wine_dbgstr_vt( VARTYPE vt ) +{ + static const char *const variant_types[] = + { + "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", + "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", + "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", + "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", + "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", + "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", + "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", + "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", + "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", + "VT_VERSIONED_STREAM" + }; + + static const char *const variant_flags[16] = + { + "", + "|VT_VECTOR", + "|VT_ARRAY", + "|VT_VECTOR|VT_ARRAY", + "|VT_BYREF", + "|VT_VECTOR|VT_ARRAY", + "|VT_ARRAY|VT_BYREF", + "|VT_VECTOR|VT_ARRAY|VT_BYREF", + "|VT_RESERVED", + "|VT_VECTOR|VT_RESERVED", + "|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_ARRAY|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", + }; + + if (vt & ~VT_TYPEMASK) + return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); + + if (vt < sizeof(variant_types)/sizeof(*variant_types)) + return variant_types[vt]; + + if (vt == VT_BSTR_BLOB) + return "VT_BSTR_BLOB"; + + return wine_dbg_sprintf( "vt(invalid %x)", vt ); +} + +static inline const char *wine_dbgstr_variant( const VARIANT *v ) +{ + if (!v) + return "(null)"; + + if (V_VT(v) & VT_BYREF) { + if (V_VT(v) == (VT_VARIANT|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); + } + + if (V_ISARRAY(v) || V_ISVECTOR(v)) + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_ARRAY(v) ); + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf( "%p {VT_EMPTY}", v ); + case VT_NULL: + return wine_dbg_sprintf( "%p {VT_NULL}", v ); + case VT_I2: + return wine_dbg_sprintf( "%p {VT_I2: %d}", v, V_I2(v) ); + case VT_I4: + return wine_dbg_sprintf( "%p {VT_I4: %d}", v, V_I4(v) ); + case VT_R4: + return wine_dbg_sprintf( "%p {VT_R4: %f}", v, V_R4(v) ); + case VT_R8: + return wine_dbg_sprintf( "%p {VT_R8: %lf}", v, V_R8(v) ); + case VT_CY: + return wine_dbg_sprintf( "%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64) ); + case VT_DATE: + return wine_dbg_sprintf( "%p {VT_DATE: %lf}", v, V_DATE(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "%p {VT_BSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "%p {VT_DISPATCH: %p}", v, V_DISPATCH(v) ); + case VT_ERROR: + return wine_dbg_sprintf( "%p {VT_ERROR: %08x}", v, V_ERROR(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "%p {VT_BOOL: %x}", v, V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v) ); + case VT_I1: + return wine_dbg_sprintf( "%p {VT_I1: %d}", v, V_I1(v) ); + case VT_UI1: + return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); + case VT_UI2: + return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + case VT_UI4: + return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + case VT_I8: + return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); + case VT_UI8: + return wine_dbg_sprintf( "%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v)) ); + case VT_INT: + return wine_dbg_sprintf( "%p {VT_INT: %d}", v, V_INT(v) ); + case VT_UINT: + return wine_dbg_sprintf( "%p {VT_UINT: %u}", v, V_UINT(v) ); + case VT_VOID: + return wine_dbg_sprintf( "%p {VT_VOID}", v ); + case VT_RECORD: + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + default: + return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); + } +} + +#endif /* defined(__oaidl_h__) && defined(V_VT) */ + #ifndef WINE_TRACE #define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) #define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch)

1 0

Jacek Caban : urlmon: Don't threat '#' as path delimiter in file URIs.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 1de7771a7ce2a20abd1eff32073420c6d8786fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de7771a7ce2a20abd1eff320… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 15:06:17 2014 +0200 urlmon: Don't threat '#' as path delimiter in file URIs. --- dlls/urlmon/tests/uri.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 10 ++--- 2 files changed, 113 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d448566..44ab0a8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -385,6 +385,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file:///z:/test dir/README.txt#hash part", 0, S_OK, FALSE, + { + {"file:///z:/test%20dir/README.txt#hash%20part",S_OK}, + {"",S_FALSE}, + {"file:///z:/test%20dir/README.txt#hash%20part",S_OK}, + {"",S_FALSE}, + {".txt#hash%20part",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/z:/test%20dir/README.txt#hash%20part",S_OK}, + {"/z:/test%20dir/README.txt#hash%20part",S_OK}, + {"",S_FALSE}, + {"file:///z:/test dir/README.txt#hash part",S_OK}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, { {"urn:nothing:should:happen here",S_OK,FALSE}, @@ -587,6 +612,81 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "C:/test/test.mp3#fragment|part", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + { + {"file://C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"C:\\test\\test.mp3#fragment|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"C:/test/test.mp3#fragment|part",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "C:/test/test.mp3?query|part", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + { + {"file://C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\test\\test.mp3",S_OK,FALSE}, + {"C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"?query|part",S_OK,FALSE}, + {"C:/test/test.mp3?query|part",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "C:/test/test.mp3?query|part#hash|part", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + { + {"file://C:\\test\\test.mp3?query|part#hash|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://C:\\test\\test.mp3?query|part#hash|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3",S_OK,FALSE}, + {"#hash|part",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\test\\test.mp3",S_OK,FALSE}, + {"C:\\test\\test.mp3?query|part",S_OK,FALSE}, + {"?query|part",S_OK,FALSE}, + {"C:/test/test.mp3?query|part#hash|part",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "www.winehq.org/test", Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, S_OK, FALSE, { {"*:www.winehq.org/test",S_OK,FALSE}, @@ -11137,6 +11237,14 @@ static const create_urlmon_test_t create_urlmon_tests[] = { "file:///c:/dir/file.txt", "file:///c:/dir/file.txt", "file:///c:/dir/file.txt", + }, + { + "c:\\dir\\file.txt#frag|part",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + NULL,0, + "file://c:\\dir\\file.txt#frag|part", + "file:///c:/dir/file.txt#frag%7Cpart", + "file:///c:/dir/file.txt#frag%7Cpart", + "file:///c:/dir/file.txt#frag%7Cpart", } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1f18bc6..e43d372 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -348,8 +348,8 @@ static inline BOOL is_hexdigit(WCHAR val) { (val >= '0' && val <= '9')); } -static inline BOOL is_path_delim(WCHAR val) { - return (!val || val == '#' || val == '?'); +static inline BOOL is_path_delim(URL_SCHEME scheme, WCHAR val) { + return (!val || (val == '#' && scheme != URL_SCHEME_FILE) || val == '?'); } static inline BOOL is_slash(WCHAR c) @@ -1842,7 +1842,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f static const WCHAR slash[] = {'/',0}; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; - if(is_path_delim(**ptr)) { + if(is_path_delim(data->scheme_type, **ptr)) { if(data->scheme_type == URL_SCHEME_WILDCARD && !data->must_have_path) { data->path = NULL; data->path_len = 0; @@ -1852,7 +1852,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f data->path_len = 1; } } else { - while(!is_path_delim(**ptr)) { + while(!is_path_delim(data->scheme_type, **ptr)) { if(**ptr == '%' && data->scheme_type != URL_SCHEME_UNKNOWN && !is_file) { if(!check_pct_encoded(ptr)) { *ptr = start; @@ -1927,7 +1927,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) else data->path = *ptr; - while(!is_path_delim(**ptr)) { + while(!is_path_delim(data->scheme_type, **ptr)) { if(**ptr == '%' && known_scheme) { if(!check_pct_encoded(ptr)) { *ptr = data->path;

1 0

Piotr Caban : msi: Add more feature state tests.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: de9f19df32f9beed1bcd81dd929543d87db0fc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9f19df32f9beed1bcd81dd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:46 2014 +0200 msi: Add more feature state tests. --- dlls/msi/tests/package.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de9f19df32f9beed1bcd8…

1 0

Piotr Caban : msi: Don' t check feature install level on features specified in arguments.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: b1a4055245db5cf7b8ba2e3d0d0839bfdb1ca2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a4055245db5cf7b8ba2e3d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:37 2014 +0200 msi: Don't check feature install level on features specified in arguments. --- dlls/msi/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9dc804c..41f367b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1675,7 +1675,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) + if (feature->Level <= 0) continue; if (reinstall) @@ -1838,6 +1838,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; + if (!is_feature_selected( feature, level )) continue; + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) { if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && @@ -1862,8 +1864,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); - if (!is_feature_selected( feature, level )) continue; - /* features with components that have compressed files are made local */ LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) {

1 0

Piotr Caban : msi: Fix feature actions overriding in process_state_property.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 0dff7bff9afd6a69340ad99a6f348740b1ea3a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dff7bff9afd6a69340ad99a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:31 2014 +0200 msi: Fix feature actions overriding in process_state_property. --- dlls/msi/action.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index feb8296..9dc804c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1666,6 +1666,8 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, { LPWSTR override; MSIFEATURE *feature; + BOOL remove = !strcmpW(property, szRemove); + BOOL reinstall = !strcmpW(property, szReinstall); override = msi_dup_property( package->db, property ); if (!override) @@ -1676,15 +1678,15 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) continue; - if (!strcmpW(property, szReinstall)) state = feature->Installed; + if (reinstall) + state = (feature->Installed == INSTALLSTATE_ABSENT ? INSTALLSTATE_UNKNOWN : feature->Installed); + else if (remove) + state = (feature->Installed == INSTALLSTATE_ABSENT ? INSTALLSTATE_UNKNOWN : INSTALLSTATE_ABSENT); if (!strcmpiW( override, szAll )) { - if (feature->Installed != state) - { - feature->Action = state; - feature->ActionRequest = state; - } + feature->Action = state; + feature->ActionRequest = state; } else { @@ -1698,11 +1700,8 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if ((ptr2 && strlenW(feature->Feature) == len && !strncmpW(ptr, feature->Feature, len)) || (!ptr2 && !strcmpW(ptr, feature->Feature))) { - if (feature->Installed != state) - { - feature->Action = state; - feature->ActionRequest = state; - } + feature->Action = state; + feature->ActionRequest = state; break; } if (ptr2)

1 0

Piotr Caban : msi: Don't publish features with non positive install level.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 331c86f12450cfb4050fd194c5d70cf98821f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331c86f12450cfb4050fd194c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:16 2014 +0200 msi: Don't publish features with non positive install level. --- dlls/msi/action.c | 2 ++ dlls/msi/tests/package.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c6d6af..feb8296 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4892,6 +4892,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) BOOL absent = FALSE; MSIRECORD *uirow; + if (feature->Level <= 0) continue; + if (feature->Action != INSTALLSTATE_LOCAL && feature->Action != INSTALLSTATE_SOURCE && feature->Action != INSTALLSTATE_ADVERTISED) absent = TRUE; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 043baf9..4211e8b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2689,6 +2689,7 @@ static void test_states(void) {'w','i','n','e','t','e','s','t','3','-','p','a','c','k','a','g','e','.','m','s','i',0}; static const WCHAR msifile4W[] = {'w','i','n','e','t','e','s','t','4','-','p','a','c','k','a','g','e','.','m','s','i',0}; + INSTALLSTATE state; MSIHANDLE hpkg; UINT r; MSIHANDLE hdb; @@ -3217,10 +3218,16 @@ static void test_states(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + /* all features installed locally */ r = MsiInstallProductA(msifile2, "ADDLOCAL=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + r = MsiOpenDatabaseW(msifile2W, MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r);

1 0

Jacek Caban : wininet: Moved DllInstall to internet.c.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 1cfee7da6ee2ed8e854d030e51b99112420bf789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfee7da6ee2ed8e854d030e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 12:20:00 2014 +0200 wininet: Moved DllInstall to internet.c. --- dlls/wininet/Makefile.in | 3 +-- dlls/wininet/internet.c | 9 +++++++++ dlls/wininet/wininet_main.c | 42 ------------------------------------------ 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 357b924..5379e03 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ internet.c \ netconnection.c \ urlcache.c \ - utility.c \ - wininet_main.c + utility.c RC_SRCS = wininet.rc diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3ed9bb1..2a2876c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -341,6 +341,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /*********************************************************************** + * DllInstall (WININET.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%x %s): stub\n", bInstall, debugstr_w(cmdline)); + return S_OK; +} + +/*********************************************************************** * INTERNET_SaveProxySettings * * Stores the proxy settings given by lpwai into the registry diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c deleted file mode 100644 index cf4a6f2..0000000 --- a/dlls/wininet/wininet_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * WinInet - * - * Copyright (c) 2000 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "shlwapi.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); - -/*********************************************************************** - * DllInstall (WININET.@) - */ -HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) -{ - FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", - debugstr_w(cmdline)); - - return S_OK; -}

1 0

Jacek Caban : wininet: Fixed leak in InternetGetConnectedStateExA.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: e1dbfb762c5991bba130bceb5f9ddfe35ff92def URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dbfb762c5991bba130bceb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 12:19:49 2014 +0200 wininet: Fixed leak in InternetGetConnectedStateExA. --- dlls/wininet/internet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aa58e34..3ed9bb1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1294,11 +1294,10 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio rc = InternetGetConnectedStateExW(lpdwStatus,lpwszConnectionName, dwNameLen, dwReserved); if (rc && lpwszConnectionName) - { WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, dwNameLen, NULL, NULL); - heap_free(lpwszConnectionName); - } + + heap_free(lpwszConnectionName); return rc; }

1 0

Alexandre Julliard : libwine: No longer look for libraries in the dll path on Android.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: a6a9b05deeab21f24263de32a17b83a17c1403dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a9b05deeab21f24263de32a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:25:15 2014 +0200 libwine: No longer look for libraries in the dll path on Android. --- libs/wine/loader.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c2290df..3591ede 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ret = dlopen( path, flag | RTLD_FIRST ); } else -#elif defined(__ANDROID__) - if (!strchr( filename, '/' ) && nb_dll_paths) - { - unsigned int i; - char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 ); - - buffer[dll_path_maxlen] = '/'; - strcpy( buffer + dll_path_maxlen + 1, filename ); - for (i = 0; i < nb_dll_paths; i++) - { - char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) ); - ret = dlopen( path, flag | RTLD_FIRST ); - if (ret) break; - } - free( buffer ); - if (ret) return ret; - } #endif ret = dlopen( filename, flag | RTLD_FIRST ); s = dlerror();

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2014