November 2008 - Wine-Commits

Austin English : include/shlwapi: Fix some typos.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: 2618bd1a4d32d99831dc997eff2633a4bf85c52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2618bd1a4d32d99831dc997ef… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 12 19:00:41 2008 -0600 include/shlwapi: Fix some typos. --- include/shlwapi.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index d1669e6..b723e54 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -340,7 +340,7 @@ int WINAPI PathCommonPrefixW(LPCWSTR,LPCWSTR,LPWSTR); HRESULT WINAPI PathCreateFromUrlA(LPCSTR pszUrl, LPSTR pszPath, LPDWORD pcchPath, DWORD dwReserved); HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, LPDWORD pcchPath, DWORD dwReserved); -#define PathCreateFromUrl WINELIB_NANE_AW(PathCreateFromUrl) +#define PathCreateFromUrl WINELIB_NAME_AW(PathCreateFromUrl) BOOL WINAPI PathFileExistsA(LPCSTR); BOOL WINAPI PathFileExistsW(LPCWSTR); @@ -667,17 +667,17 @@ BOOL WINAPI UrlIsOpaqueW(LPCWSTR); HRESULT WINAPI UrlUnescapeA(LPSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlUnescapeW(LPWSTR,LPWSTR,LPDWORD,DWORD); -#define UrlUnescape WINELIB_AW_NAME(UrlUnescape) +#define UrlUnescape WINELIB_NAME_AW(UrlUnescape) #define UrlUnescapeInPlaceA(x,y) UrlUnescapeA(x, NULL, NULL, \ y | URL_UNESCAPE_INPLACE) #define UrlUnescapeInPlaceW(x,y) UrlUnescapeW(x, NULL, NULL, \ y | URL_UNESCAPE_INPLACE) -#define UrlUnescapeInPlace WINELIB_AW_NAME(UrlUnescapeInPlace) +#define UrlUnescapeInPlace WINELIB_NAME_AW(UrlUnescapeInPlace) HRESULT WINAPI UrlCreateFromPathA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlCreateFromPathW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -#define UrlCreateFromPath WINELIB_AW_NAME(UrlCreateFromPath) +#define UrlCreateFromPath WINELIB_NAME_AW(UrlCreateFromPath) typedef struct tagPARSEDURLA { DWORD cbSize; @@ -699,7 +699,7 @@ typedef struct tagPARSEDURLW { HRESULT WINAPI ParseURLA(LPCSTR pszUrl, PARSEDURLA *ppu); HRESULT WINAPI ParseURLW(LPCWSTR pszUrl, PARSEDURLW *ppu); -#define ParseURL WINELIB_AW_NAME(ParseUrl) +#define ParseURL WINELIB_NAME_AW(ParseUrl) #endif /* NO_SHLWAPI_PATH */

1 0

Alexandre Julliard : kernel32/tests: Fix the thread test to cope with the Win95 InterlockedIncrement behavior.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: f2f0dead61685555aba3160b33d00303c39ddae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f0dead61685555aba3160b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 13 11:49:36 2008 +0100 kernel32/tests: Fix the thread test to cope with the Win95 InterlockedIncrement behavior. --- dlls/kernel32/tests/thread.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 75b450c..b3580a1 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -105,23 +105,22 @@ CreateThread it. It basically makes multithreaded execution linear, which defeats the purpose of multiple threads, but makes testing easy. */ static HANDLE start_event, stop_event; -static LONG num_syncing_threads, num_synced; +static LONG num_synced; -static void init_thread_sync_helpers(LONG num_threads) +static void init_thread_sync_helpers(void) { start_event = CreateEvent(NULL, TRUE, FALSE, NULL); ok(start_event != NULL, "CreateEvent failed\n"); stop_event = CreateEvent(NULL, TRUE, FALSE, NULL); ok(stop_event != NULL, "CreateEvent failed\n"); - num_syncing_threads = num_threads; - num_synced = 0; + num_synced = -1; } static BOOL sync_threads_and_run_one(DWORD sync_id, DWORD my_id) { LONG num = InterlockedIncrement(&num_synced); - assert(0 < num && num <= num_syncing_threads); - if (num == num_syncing_threads) + assert(-1 <= num && num <= 1); + if (num == 1) { ResetEvent( stop_event ); SetEvent( start_event ); @@ -129,7 +128,7 @@ static BOOL sync_threads_and_run_one(DWORD sync_id, DWORD my_id) else { DWORD ret = WaitForSingleObject(start_event, 10000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed %x\n",ret); } return sync_id == my_id; } @@ -137,8 +136,8 @@ static BOOL sync_threads_and_run_one(DWORD sync_id, DWORD my_id) static void resync_after_run(void) { LONG num = InterlockedDecrement(&num_synced); - assert(0 <= num && num < num_syncing_threads); - if (num == 0) + assert(-1 <= num && num <= 1); + if (num == -1) { ResetEvent( start_event ); SetEvent( stop_event ); @@ -1171,7 +1170,7 @@ static void test_TLS(void) DWORD ret; BOOL suc; - init_thread_sync_helpers(2); + init_thread_sync_helpers(); /* Allocate a TLS slot in the main thread to test for inheritance. */ TLS_main = TlsAlloc();

1 0

Alexandre Julliard : kernel32: Don' t request unneeded access in OpenFileMapping.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: 22949d94f0b743595ece97f343390d474de9b28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22949d94f0b743595ece97f34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 13 11:49:17 2008 +0100 kernel32: Don't request unneeded access in OpenFileMapping. --- dlls/kernel32/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 2b89655..6a12885 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -469,8 +469,8 @@ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, name ); - if (access & FILE_MAP_COPY) access |= SECTION_MAP_READ; - access |= STANDARD_RIGHTS_REQUIRED | SECTION_QUERY; + if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; + access |= SECTION_QUERY; if (GetVersion() & 0x80000000) {

1 0

Andrew Talbot : shlwapi: Sign-compare warnings fix.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: ba1e2660e85baf9aeb77654d1cb20af71ef50bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1e2660e85baf9aeb77654d1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 12 20:22:09 2008 +0000 shlwapi: Sign-compare warnings fix. --- dlls/shlwapi/assoc.c | 2 +- dlls/shlwapi/url.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 0ca8678..b619518 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -803,7 +803,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( goto get_friendly_name_fail; if (VerQueryValueW(verinfoW, translationW, (LPVOID *)&bufW, &flen)) { - int i; + UINT i; DWORD *langCodeDesc = (DWORD *)bufW; for (i = 0; i < flen / sizeof(DWORD); i++) { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index e6289a5..4a39726 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -118,7 +118,7 @@ static const unsigned char HashDataLookup[256] = { static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len) { - int i; + unsigned int i; for(i=0; i < sizeof(shlwapi_schemes)/sizeof(shlwapi_schemes[0]); i++) { if(scheme_len == strlenW(shlwapi_schemes[i].scheme_name) @@ -314,8 +314,8 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, HRESULT hr = S_OK; DWORD EscapeFlags; LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; - INT nByteLen, state; - DWORD nLen, nWkLen; + INT state; + DWORD nByteLen, nLen, nWkLen; WCHAR slash = '/'; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -332,7 +332,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, return S_OK; } - nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ + nByteLen = (strlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, INTERNET_MAX_URL_LENGTH * sizeof(WCHAR));

1 0

Paul Vriens : crypt32/tests: Fix a test failure on Vista and W2K8.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: 77ca0d8935fe1060c7f3d8e5f49f3e6da284816d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ca0d8935fe1060c7f3d8e5f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 12 17:35:12 2008 +0100 crypt32/tests: Fix a test failure on Vista and W2K8. --- dlls/crypt32/tests/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index b1e53b1..9b622bb 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -467,8 +467,10 @@ static void test_format_object(void) SetLastError(0xdeadbeef); ret = pCryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, NULL, NULL, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(!ret, "CryptFormatObject succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ + "expected ERROR_FILE_NOT_FOUND or no change, got %d\n", GetLastError()); /* When called to format an AUTHORITY_KEY_ID2_INFO, it fails when no * data are given. */

1 0

Ken Thomases : ntdll: Don't poll() on a normal file; it should never block.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: 974b8d802c00b9e3a6dc3051246099e37603ec03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974b8d802c00b9e3a6dc30512… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 12 12:15:31 2008 -0600 ntdll: Don't poll() on a normal file; it should never block. --- dlls/ntdll/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d04125f..7afc380 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -612,6 +612,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } } + else if (type == FD_TYPE_FILE) continue; /* no async I/O on regular files */ } else { @@ -940,6 +941,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = STATUS_SUCCESS; goto done; } + if (type == FD_TYPE_FILE) continue; /* no async I/O on regular files */ } else {

1 0

Alexandre Julliard : user32: Don' t process other messages when recursing in peek_message for an internal message .
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: fe9f688774eb7d53df71282115c839eebe66d8a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9f688774eb7d53df7128211… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 12 19:56:36 2008 +0100 user32: Don't process other messages when recursing in peek_message for an internal message. --- dlls/user32/message.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e049d57..5d3adb8 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2163,8 +2163,12 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (info.msg.message & 0x80000000) /* internal message */ { if (flags & PM_REMOVE) + { handle_internal_message( info.msg.hwnd, info.msg.message, info.msg.wParam, info.msg.lParam ); + /* if this is a nested call return right away */ + if (first == info.msg.message && last == info.msg.message) return FALSE; + } else peek_message( msg, info.msg.hwnd, info.msg.message, info.msg.message, flags | PM_REMOVE, changed_mask );

1 0

Paul Vriens : crypt32/tests: Skip some tests if needed.
by Alexandre Julliard Nov. 13, 2008

Nov. 13, 2008

Module: wine Branch: master Commit: 7e0b9301825841c87777832de362d0601e4ba74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0b9301825841c87777832de… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 12 17:30:22 2008 +0100 crypt32/tests: Skip some tests if needed. --- dlls/crypt32/tests/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 7a7d458..b1e53b1 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -416,6 +416,11 @@ static void test_format_object(void) ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); if (ret) { + if (size == 0 && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("CryptFormatObject has no default implementation\n"); + return; + } ok(size == sizeof(WCHAR), "unexpected size %d\n", size); str = HeapAlloc(GetProcessHeap(), 0, size); SetLastError(0xdeadbeef);

1 0

Huw Davies : ole32: Don't issue a warning if a flat copy is all that' s required.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 706b29c47cb046c6d5da40b1add8846a85dfe08b URL: http://source.winehq.org/git/wine.git/?a=commit;h=706b29c47cb046c6d5da40b1a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 12 12:39:58 2008 +0000 ole32: Don't issue a warning if a flat copy is all that's required. --- dlls/ole32/ole2.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 441244c..4be2eb8 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2815,6 +2815,22 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ switch(pvarSrc->vt) { + case VT_EMPTY: + case VT_NULL: + case VT_I1: + case VT_UI1: + case VT_I2: + case VT_UI2: + case VT_BOOL: + case VT_I4: + case VT_UI4: + case VT_R4: + case VT_ERROR: + case VT_I8: + case VT_UI8: + case VT_R8: + case VT_CY: + case VT_DATE: case VT_FILETIME: break; case VT_STREAM:

1 0

Aric Stewart : winhttp: Correct another difference between InternetCrackurl and WinHttpCrackUrl.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 3590a4227fb7eed98199c387439ad608c136afd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3590a4227fb7eed98199c3874… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 11 09:17:29 2008 -0600 winhttp: Correct another difference between InternetCrackurl and WinHttpCrackUrl. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/url.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 12 +++++++ 3 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1f91c99..d2d515f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1104,7 +1104,7 @@ static BOOL handle_redirect( request_t *request ) heap_free( request->path ); request->path = NULL; - if (uc.lpszUrlPath) + if (uc.dwUrlPathLength) { len = uc.dwUrlPathLength + uc.dwExtraInfoLength; if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 20ff7f6..5d88614 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -60,6 +60,13 @@ static const WCHAR url9[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','0','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; +static const WCHAR url_k1[] = + {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', + '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; + +static const WCHAR url_k2[] = + {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + static void fill_url_components( URL_COMPONENTS *uc ) { uc->dwStructSize = sizeof(URL_COMPONENTS); @@ -269,7 +276,77 @@ static void WinHttpCreateUrl_test( void ) HeapFree( GetProcessHeap(), 0, url ); } +static void WinHttpCrackUrl_test( void ) +{ + URL_COMPONENTSW uc; + DWORD Len = 0; + BOOL ret; + + /* NULL components */ + SetLastError( 0xdeadbeef ); + memset(&uc,0,sizeof(uc)); + uc.dwStructSize = sizeof(URL_COMPONENTSW); + uc.dwSchemeLength = -1; + uc.dwHostNameLength = -1; + uc.dwUserNameLength = -1; + uc.dwPasswordLength = -1; + uc.dwUrlPathLength = -1; + uc.dwExtraInfoLength = -1; + + ret = WinHttpCrackUrl( url_k1, 0, 0,&uc); + + Len = 0; + ok (ret!=0,"WinHttpCrackUrl failed\n"); + ok (uc.lpszScheme == url_k1,"Failed to get uc.lpszScheme\n"); + ok (uc.dwSchemeLength == 4, "Unexpected dwSchemeLength\n"); + Len += uc.dwSchemeLength + 3; + ok (uc.lpszUserName== &url_k1[Len],"Failed to get uc.lpszUserName\n"); + ok (uc.dwUserNameLength == 8, "Unexpected dwUserNameLength\n"); + Len +=uc.dwUserNameLength + 1; + ok (uc.lpszPassword==&url_k1[Len],"Failed to get uc.lpszPassword\n"); + ok (uc.dwPasswordLength == 8, "Unexpected dwPasswordLength\n"); + Len +=uc.dwPasswordLength + 1; + ok (uc.lpszHostName == &url_k1[Len],"Failed to get uc.lpszHostName\n"); + ok (uc.dwHostNameLength == 14, "Unexpected dwHostNameLength\n"); + Len += uc.dwHostNameLength; + ok (uc.lpszUrlPath == &url_k1[Len],"Failed to get uc.lpszUrlPath\n"); + ok (uc.dwUrlPathLength == 11, "Unexpected dwUrlPathLength\n"); + Len += uc.dwUrlPathLength; + ok (uc.lpszExtraInfo == &url_k1[Len],"Failed to get uc.lpszExtraInfo\n"); + ok (uc.dwExtraInfoLength == 0, "Unexpected dwExtraInfoLength\n"); + + memset(&uc,0,sizeof(uc)); + uc.dwStructSize = sizeof(URL_COMPONENTSW); + uc.dwSchemeLength = -1; + uc.dwHostNameLength = -1; + uc.dwUserNameLength = -1; + uc.dwPasswordLength = -1; + uc.dwUrlPathLength = -1; + uc.dwExtraInfoLength = -1; + + ret = WinHttpCrackUrl( url_k2, 0, 0,&uc); + + Len = 0; + ok (ret!=0,"WinHttpCrackUrl failed\n"); + ok (uc.lpszScheme == url_k2,"Failed to get uc.lpszScheme\n"); + ok (uc.dwSchemeLength == 4, "Unexpected dwSchemeLength\n"); + Len += uc.dwSchemeLength + 3; + ok (uc.lpszUserName == NULL ,"Got uc.lpszUserName\n"); + ok (uc.dwUserNameLength == 0, "Unexpected dwUserNameLength\n"); + ok (uc.lpszPassword == NULL,"Got uc.lpszPassword\n"); + ok (uc.dwPasswordLength == 0, "Unexpected dwPasswordLength\n"); + ok (uc.lpszHostName == &url_k2[Len],"Failed to get uc.lpszHostName\n"); + ok (uc.dwHostNameLength == 14, "Unexpected dwHostNameLength\n"); + Len += uc.dwHostNameLength; + ok (uc.lpszUrlPath == &url_k2[Len],"Failed to get uc.lpszUrlPath\n"); + ok (uc.dwUrlPathLength == 0, "Unexpected dwUrlPathLength\n"); + Len += uc.dwUrlPathLength; + ok (uc.lpszExtraInfo == &url_k2[Len],"Failed to get uc.lpszExtraInfo\n"); + ok (uc.dwExtraInfoLength == 0, "Unexpected dwExtraInfoLength\n"); +} + START_TEST(url) { WinHttpCreateUrl_test(); + WinHttpCrackUrl_test(); } diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 7d739d5..ac25f2c 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -40,8 +40,12 @@ BOOL WINAPI InternetCrackUrlW( LPCWSTR, DWORD, DWORD, LPURL_COMPONENTSW ); BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW components ) { BOOL ret; + INT upLen; + INT exLen; TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, components); + upLen = components->dwUrlPathLength; + exLen = components->dwExtraInfoLength; if ((ret = InternetCrackUrlW( url, len, flags, components ))) { @@ -53,6 +57,14 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } + if (!len) + len = lstrlenW(url); + /* WinHttpCrackUrl actually returns pointers to the end of the string for components, + other than UserName and Password, that are missing */ + if (upLen && components->lpszUrlPath == NULL) + components->lpszUrlPath = (LPWSTR)&url[len]; + if (exLen && components->lpszExtraInfo == NULL) + components->lpszExtraInfo = (LPWSTR)&url[len]; } return ret; }

1 0