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

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

July 24, 2014

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 July 24, 2014

July 24, 2014

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

Alexandre Julliard : vnbt.vxd: Include winsock2.h before other headers.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: b6033972bf55b080392f391b72110d28280c1b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6033972bf55b080392f391b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 19:49:57 2014 +0200 vnbt.vxd: Include winsock2.h before other headers. --- dlls/vnbt.vxd/vnbt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vnbt.vxd/vnbt.c b/dlls/vnbt.vxd/vnbt.c index 9386a83..17f7d96 100644 --- a/dlls/vnbt.vxd/vnbt.c +++ b/dlls/vnbt.vxd/vnbt.c @@ -23,8 +23,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "iphlpapi.h" #include "winsock2.h" +#include "iphlpapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vxd);

1 0

Jacek Caban : wine/debug.h: Added debugstr_variant and debugstr_vt aliases and removed all duplicated implementations.
by Alexandre Julliard July 24, 2014

July 24, 2014

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

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

July 24, 2014

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 July 24, 2014

July 24, 2014

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

Nikolay Sivov : t2embed: Added TTDeleteEmbeddedFont() stub.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: c27e5ca511d65dfd1a516430676ef9b77fdccd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27e5ca511d65dfd1a5164306… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 24 08:27:33 2014 +0400 t2embed: Added TTDeleteEmbeddedFont() stub. --- dlls/t2embed/main.c | 6 ++++++ dlls/t2embed/t2embed.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e92c49c..e1a880d 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -84,3 +84,9 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) if (enabled) *enabled = FALSE; return E_API_NOTIMPL; } + +LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) +{ + FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status); + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 120eaaa..e3be15c 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -1,22 +1,22 @@ @ stub TTCharToUnicode -@ stub TTDeleteEmbeddedFont -@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTDeleteEmbeddedFont(long long ptr) +@ stdcall TTEmbedFont(long long long ptr ptr ptr ptr ptr long long ptr) @ stub TTEmbedFontFromFileA @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo -@ stdcall TTGetEmbeddingType(ptr ptr) -@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTGetEmbeddingType(long ptr) +@ stdcall TTIsEmbeddingEnabled(long ptr) @ stub TTIsEmbeddingEnabledForFacename @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @ stub _TTDeleteEmbeddedFont(a)12 -@ stdcall _TTEmbedFont(a)44(ptr long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont +@ stdcall _TTEmbedFont(a)44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont @ stub _TTEmbedFontFromFileA(a)52 @ stub _TTEnableEmbeddingForFacename(a)8 @ stub _TTGetEmbeddedFontInfo(a)28 -@ stdcall _TTGetEmbeddingType(a)8(ptr ptr) TTGetEmbeddingType -@ stdcall _TTIsEmbeddingEnabled(a)8(ptr ptr) TTIsEmbeddingEnabled +@ stdcall _TTGetEmbeddingType(a)8(long ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled(a)8(long ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename(a)8 @ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8

1 0

Jacek Caban : wininet: Moved DllInstall to internet.c.
by Alexandre Julliard July 24, 2014

July 24, 2014

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 July 24, 2014

July 24, 2014

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 July 24, 2014

July 24, 2014

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