wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Juan Lang : iphlpapi: Honor GAA_FLAG_SKIP_FRIENDLY_NAME.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 434cd6c609d72cb92578077343ffbce9b9f92d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434cd6c609d72cb9257807734… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 08:50:00 2010 -0700 iphlpapi: Honor GAA_FLAG_SKIP_FRIENDLY_NAME. --- dlls/iphlpapi/iphlpapi_main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 190c0ca..52d1c58 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -770,7 +770,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; - total_size += 2 * IF_NAMESIZE * sizeof(WCHAR); + total_size += IF_NAMESIZE * sizeof(WCHAR); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) + total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; @@ -793,11 +795,14 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, memcpy(ptr, name, IF_NAMESIZE); aa->AdapterName = ptr; ptr += IF_NAMESIZE; - aa->FriendlyName = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) - *dst = *src; - *dst++ = 0; - ptr = (char *)dst; + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) + { + aa->FriendlyName = (WCHAR *)ptr; + for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + *dst = *src; + *dst++ = 0; + ptr = (char *)dst; + } aa->Description = (WCHAR *)ptr; for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) *dst = *src;

1 0

Juan Lang : iphlpapi: Honor GAA_FLAG_SKIP_UNICAST.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: c44c16cf740e3b970cd7d23838a4742c0364adf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44c16cf740e3b970cd7d2383… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 13:19:34 2010 -0700 iphlpapi: Honor GAA_FLAG_SKIP_UNICAST. --- dlls/iphlpapi/iphlpapi_main.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fef5637..190c0ca 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -719,14 +719,15 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; + ULONG ret = ERROR_SUCCESS, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; SOCKET_ADDRESS *v6addrs = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; if (family == WS_AF_INET) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, @@ -736,10 +737,14 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, } } else if (family == WS_AF_INET6) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + { + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } else if (family == WS_AF_UNSPEC) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, @@ -747,7 +752,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, if (!ret) { num_v4_gateways = count_v4_gateways(index, routeTable); - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } } }

1 0

Juan Lang : iphlpapi: Only return gateway addresses if GAA_FLAG_INCLUDE_ALL_GATEWAYS is specified .
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 60354102c054094565b094fc8f9e9c4ff75ceddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=60354102c054094565b094fc8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 13:17:45 2010 -0700 iphlpapi: Only return gateway addresses if GAA_FLAG_INCLUDE_ALL_GATEWAYS is specified. --- dlls/iphlpapi/iphlpapi_main.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f14f337..fef5637 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -716,7 +716,8 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } -static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) +static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, + IP_ADAPTER_ADDRESSES *aa, ULONG *size) { ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; @@ -725,26 +726,29 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD if (family == WS_AF_INET) { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, - GetProcessHeap(), 0); - if (!ret) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); - num_v4_gateways = count_v4_gateways(index, routeTable); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); + if (!ret) + num_v4_gateways = count_v4_gateways(index, routeTable); } } else if (family == WS_AF_INET6) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == WS_AF_UNSPEC) { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, - GetProcessHeap(), 0); - if (!ret) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); - num_v4_gateways = count_v4_gateways(index, routeTable); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); if (!ret) + { + num_v4_gateways = count_v4_gateways(index, routeTable); ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } } } else @@ -929,7 +933,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, for (i = 0; i < table->numIndexes; i++) { size = 0; - if ((ret = adapterAddressesFromIndex(family, table->indexes[i], NULL, &size))) + if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], NULL, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret; @@ -941,7 +945,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, ULONG bytes_left = size = total_size; for (i = 0; i < table->numIndexes; i++) { - if ((ret = adapterAddressesFromIndex(family, table->indexes[i], aa, &size))) + if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], aa, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret;

1 0

Juan Lang : ipconfig: Specify GAA_FLAG_INCLUDE_ALL_GATEWAYS when calling GetAdaptersAddresses.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 8d3318a8ff38e43e9ecfb3aff02dcd6ef29dc29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3318a8ff38e43e9ecfb3aff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 08:54:47 2010 -0700 ipconfig: Specify GAA_FLAG_INCLUDE_ALL_GATEWAYS when calling GetAdaptersAddresses. --- programs/ipconfig/ipconfig.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index e76b549..b6eb5f0 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -153,13 +153,15 @@ static void print_basic_information(void) IP_ADAPTER_ADDRESSES *adapters; ULONG out = 0; - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p; @@ -303,13 +305,15 @@ static void print_full_information(void) HeapFree(GetProcessHeap(), 0, info); } - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS) + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p;

1 0

Louis Lenders : gameux: Improve stub for GameExplorerImpl_VerifyAccess.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 75f0573964c8d894d99be2909a1728bfc7f671a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f0573964c8d894d99be2909… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 11 22:11:26 2010 +0200 gameux: Improve stub for GameExplorerImpl_VerifyAccess. --- dlls/gameux/gameexplorer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 744ae8a..1715ad9 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -875,9 +875,9 @@ static HRESULT WINAPI GameExplorerImpl_VerifyAccess( { GameExplorerImpl *This = impl_from_IGameExplorer(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_w(sGDFBinaryPath), pHasAccess); - FIXME("stub\n"); - return E_NOTIMPL; + FIXME("(%p, %s, %p)\n", This, debugstr_w(sGDFBinaryPath), pHasAccess); + *pHasAccess = TRUE; + return S_OK; } static const struct IGameExplorerVtbl GameExplorerImplVtbl =

1 0

Aurimas Fišeras : taskkill: Update Lithuanian translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: d099af8c013714290e43d607151fb2a1e7a96605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d099af8c013714290e43d6071… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 11 22:22:48 2010 +0300 taskkill: Update Lithuanian translation. --- programs/taskkill/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Lt.rc b/programs/taskkill/Lt.rc index 16b8bf5..e2d6884 100644 --- a/programs/taskkill/Lt.rc +++ b/programs/taskkill/Lt.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Klaida: nepavyko rasti proceso „%s“.\n" STRING_ENUM_FAILED, "Klaida: nepavyko gauti procesų sąrašo.\n" STRING_TERMINATE_FAILED, "Klaida: nepavyko nutraukti proceso „%s“.\n" + STRING_SELF_TERMINATION, "Klaida: savo proceso priverstinis nutraukimas negalimas.\n" }

1 0

André Hentschel : taskkill: Update German translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 009f45240714bd6aa6ea71d544debc51be13a37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=009f45240714bd6aa6ea71d54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 11 20:48:59 2010 +0200 taskkill: Update German translation. --- programs/taskkill/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/De.rc b/programs/taskkill/De.rc index 597cc36..ede9538 100644 --- a/programs/taskkill/De.rc +++ b/programs/taskkill/De.rc @@ -40,4 +40,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Fehler: Konnte Prozess \"%s\" nicht finden.\n" STRING_ENUM_FAILED, "Fehler: Konnte die Prozessliste nicht Enumerieren.\n" STRING_TERMINATE_FAILED, "Fehler: Konnte Prozess \"%s\" nicht beenden.\n" + STRING_SELF_TERMINATION, "Fehler: Eigenen Prozess beenden ist nicht gestattet.\n" }

1 0

Andrew Eikum : shlwapi: Handle URL_WININET_COMPATIBILITY flag in UrlCanonicalize.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 6525d89c95e6ae28eb8f6635a7fb9cb756cc1c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6525d89c95e6ae28eb8f6635a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 11 11:17:35 2010 -0500 shlwapi: Handle URL_WININET_COMPATIBILITY flag in UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 21 +++++++++++++++++ dlls/shlwapi/url.c | 50 ++++++++++++++++++++++++++++++++++------ dlls/wininet/tests/internet.c | 2 +- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index cf74177..febe23d 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -123,6 +123,9 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"http://www.winehq.org/tests/../#example", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../#example", FALSE}, {"http://www.winehq.org/tests/foo bar", URL_ESCAPE_SPACES_ONLY| URL_DONT_ESCAPE_EXTRA_INFO , S_OK, "http://www.winehq.org/tests/foo%20bar", FALSE}, {"http://www.winehq.org/tests/foo%20bar", URL_UNESCAPE , S_OK, "http://www.winehq.org/tests/foo bar", FALSE}, + {"http://www.winehq.org", 0, S_OK, "http://www.winehq.org/", FALSE}, + {"http:///www.winehq.org", 0, S_OK, "http:///www.winehq.org", FALSE}, + {"http:////www.winehq.org", 0, S_OK, "http:////www.winehq.org", FALSE}, {"file:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:/tests/foo%20bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, @@ -137,6 +140,24 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar", FALSE}, {"file:///c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "file:///c:/tests/foo bar", FALSE}, + {"file:///c:\\tests\\foobar", 0, S_OK, "file:///c:/tests/foobar", FALSE}, + {"file:///c:\\tests\\foobar", URL_WININET_COMPATIBILITY, S_OK, "file://c:\\tests\\foobar", FALSE}, + {"file://home/user/file", 0, S_OK, "file://home/user/file", FALSE}, + {"file:///home/user/file", 0, S_OK, "file:///home/user/file", FALSE}, + {"file:////home/user/file", 0, S_OK, "file://home/user/file", FALSE}, + {"file://home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\\\home\\user\\file", FALSE}, + {"file:///home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\home\\user\\file", FALSE}, + {"file:////home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\\\home\\user\\file", FALSE}, + {"file://///home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\\\home\\user\\file", FALSE}, + {"file://C:/user/file", 0, S_OK, "file:///C:/user/file", FALSE}, + {"file://C:/user/file/../asdf", 0, S_OK, "file:///C:/user/asdf", FALSE}, + {"file:///C:/user/file", 0, S_OK, "file:///C:/user/file", FALSE}, + {"file:////C:/user/file", 0, S_OK, "file:///C:/user/file", FALSE}, + {"file://C:/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://C:\\user\\file", FALSE}, + {"file:///C:/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://C:\\user\\file", FALSE}, + {"file:////C:/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://C:\\user\\file", FALSE}, + {"http:///www.winehq.org", 0, S_OK, "http:///www.winehq.org", FALSE}, + {"http:///www.winehq.org", URL_WININET_COMPATIBILITY, S_OK, "http:///www.winehq.org", FALSE}, {"http://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/site/about", FALSE}, {"file_://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "file_://www.winehq.org/site/about", FALSE}, {"c:\\dir\\file", 0, S_OK, "file:///c:/dir/file", FALSE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index c808a2f..04e80f9 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -276,6 +276,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, LPWSTR lpszUrlCpy, url, wk2, mp, mp2; INT state; DWORD nByteLen, nLen, nWkLen; + BOOL is_file_url; WCHAR slash = '\0'; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -318,14 +319,13 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, return E_OUTOFMEMORY; } + is_file_url = !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)); + if ((nByteLen >= sizeof(wszHttp) && - !memcmp(wszHttp, url, sizeof(wszHttp))) || - (nByteLen >= sizeof(wszFile) && - !memcmp(wszFile, url, sizeof(wszFile)))) + !memcmp(wszHttp, url, sizeof(wszHttp))) || is_file_url) slash = '/'; - if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) - && !memcmp(wszFile, url, sizeof(wszFile))) + if((dwFlags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) && is_file_url) slash = '\\'; if(nByteLen >= sizeof(wszRes) && !memcmp(wszRes, url, sizeof(wszRes))) { @@ -351,7 +351,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if(url[1] == ':') { /* Assume path */ memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); - if (dwFlags & URL_FILE_USE_PATHURL) + if (dwFlags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) { slash = '\\'; --wk2; @@ -359,6 +359,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, else dwFlags |= URL_ESCAPE_UNSAFE; state = 5; + is_file_url = TRUE; } while (*wk1) { @@ -379,14 +380,47 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) - && !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)) + && is_file_url && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL)) wk1++; } - if(*wk1 == '/' && (dwFlags & URL_FILE_USE_PATHURL)) + + if(*wk1 == '/' && (dwFlags & URL_FILE_USE_PATHURL)){ wk1++; + }else if(is_file_url){ + const WCHAR *body = wk1; + + while(*body == '/') + ++body; + + if(isalnumW(*body) && *(body+1) == ':'){ + if(!(dwFlags & (URL_WININET_COMPATIBILITY | URL_FILE_USE_PATHURL))){ + if(slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + }else{ + if(dwFlags & URL_WININET_COMPATIBILITY){ + if(*wk1 == '/' && *(wk1+1) != '/'){ + *wk2++ = '\\'; + }else{ + *wk2++ = '\\'; + *wk2++ = '\\'; + } + }else{ + if(*wk1 == '/' && *(wk1+1) != '/'){ + if(slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + } + } + wk1 = body; + } state = 4; break; case 3: diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4da9c21..54fd229 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -103,7 +103,7 @@ static void test_InternetCanonicalizeUrlA(void) res = InternetCanonicalizeUrlA("file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", buffer, &dwSize, ICU_DECODE | ICU_NO_ENCODE); ok(res, "InternetCanonicalizeUrlA failed %u\n", GetLastError()); ok(dwSize == lstrlenA(buffer), "got %d expected %d\n", dwSize, lstrlenA(buffer)); - todo_wine ok(!lstrcmpA("file://C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", buffer), + ok(!lstrcmpA("file://C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", buffer), "got %s expected 'file://C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml'\n", buffer); /* buffer is larger as the required size */

1 0

Andrew Eikum : cryptnet/tests: Use UrlCanonicalize to create a URL.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 35f8d7397b538948dab447953207420bc5029d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f8d7397b538948dab447953… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 11 11:17:26 2010 -0500 cryptnet/tests: Use UrlCanonicalize to create a URL. --- dlls/cryptnet/tests/Makefile.in | 2 +- dlls/cryptnet/tests/cryptnet.c | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in index 7fe1e32..2cef5b6 100644 --- a/dlls/cryptnet/tests/Makefile.in +++ b/dlls/cryptnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = cryptnet.dll -IMPORTS = cryptnet crypt32 +IMPORTS = cryptnet crypt32 shlwapi C_SRCS = \ cryptnet.c diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index b8da671..aab3724 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -24,6 +24,7 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> +#include <shlwapi.h> #include "wine/test.h" static const BYTE bigCert[] = { @@ -316,13 +317,14 @@ static void make_tmp_file(LPSTR path) static void test_retrieveObjectByUrl(void) { BOOL ret; - char tmpfile[MAX_PATH * 2], *ptr, url[MAX_PATH + 8]; + char tmpfile[MAX_PATH * 2], url[MAX_PATH + 8]; CRYPT_BLOB_ARRAY *pBlobArray; PCCERT_CONTEXT cert; PCCRL_CONTEXT crl; HCERTSTORE store; CRYPT_RETRIEVE_AUX_INFO aux = { 0 }; FILETIME ft = { 0 }; + DWORD urllen; SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); @@ -332,17 +334,8 @@ static void test_retrieveObjectByUrl(void) GetLastError(), GetLastError()); make_tmp_file(tmpfile); - ptr = strchr(tmpfile, ':'); - if (ptr) - ptr += 2; /* skip colon and first slash */ - else - ptr = tmpfile; - snprintf(url, sizeof(url), "file:///%s", ptr); - do { - ptr = strchr(url, '\\'); - if (ptr) - *ptr = '/'; - } while (ptr); + urllen = sizeof(url); + UrlCanonicalizeA(tmpfile, url, &urllen, URL_WININET_COMPATIBILITY); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,

1 0

Aric Stewart : strmbase: Move mediaSeeking to strmbase SourceSeeking.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 602d44a12c14e6ec24ce4821dfb77ebb4ad152b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602d44a12c14e6ec24ce4821d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 11 10:15:35 2010 -0500 strmbase: Move mediaSeeking to strmbase SourceSeeking. --- dlls/quartz/avisplit.c | 23 ++-- dlls/quartz/control.c | 282 ------------------------------------ dlls/quartz/control_private.h | 38 ----- dlls/quartz/mpegsplit.c | 19 ++- dlls/quartz/parser.c | 60 ++++---- dlls/quartz/parser.h | 4 +- dlls/quartz/videorenderer.c | 1 - dlls/quartz/waveparser.c | 19 ++- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/seeking.c | 315 +++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 40 +++++ 11 files changed, 425 insertions(+), 377 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=602d44a12c14e6ec24ce4…

1 0

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 October 2010