August 2008 - Wine-Commits - list.winehq.org

Kirill K. Smirnov : winhlp32: Load internal file containing pagenum-> topicoffset mapping.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: deb98a4e83837fa8d575c32302edb1516d21dc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb98a4e83837fa8d575c3230… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Aug 6 19:47:11 2008 +0400 winhlp32: Load internal file containing pagenum->topicoffset mapping. --- programs/winhlp32/hlpfile.c | 23 +++++++++++++++++++++++ programs/winhlp32/hlpfile.h | 2 ++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 05d5347..c941bbd 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -63,6 +63,7 @@ static BOOL HLPFILE_Uncompress_Topic(HLPFILE*); static BOOL HLPFILE_GetContext(HLPFILE*); static BOOL HLPFILE_GetKeywords(HLPFILE*); static BOOL HLPFILE_GetMap(HLPFILE*); +static BOOL HLPFILE_GetTOMap(HLPFILE*); static BOOL HLPFILE_AddPage(HLPFILE*, const BYTE*, const BYTE*, unsigned, unsigned); static BOOL HLPFILE_SkipParagraph(HLPFILE*, const BYTE*, const BYTE*, unsigned*); static void HLPFILE_Uncompress2(HLPFILE*, const BYTE*, const BYTE*, BYTE*, const BYTE*); @@ -293,6 +294,8 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_SystemCommands(hlpfile)) return FALSE; + if (hlpfile->version <= 16 && !HLPFILE_GetTOMap(hlpfile)) return FALSE; + /* load phrases support */ if (!HLPFILE_UncompressLZ77_Phrases(hlpfile)) HLPFILE_Uncompress_Phrases40(hlpfile); @@ -2577,6 +2580,26 @@ static BOOL HLPFILE_GetMap(HLPFILE *hlpfile) /*********************************************************************** * + * HLPFILE_GetTOMap + */ +static BOOL HLPFILE_GetTOMap(HLPFILE *hlpfile) +{ + BYTE *cbuf, *cend; + unsigned clen; + + if (!HLPFILE_FindSubFile(hlpfile, "|TOMAP", &cbuf, &cend)) + {WINE_WARN("no tomap section\n"); return FALSE;} + + clen = cend - cbuf - 9; + hlpfile->TOMap = HeapAlloc(GetProcessHeap(), 0, clen); + if (!hlpfile->TOMap) return FALSE; + memcpy(hlpfile->TOMap, cbuf+9, clen); + hlpfile->wTOMapLen = clen/4; + return TRUE; +} + +/*********************************************************************** + * * DeleteMacro */ static void HLPFILE_DeleteMacro(HLPFILE_MACRO* macro) diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index 5097259..b0d1f23 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -100,6 +100,8 @@ typedef struct tagHlpFileFile BYTE* kwdata; unsigned wMapLen; HLPFILE_MAP* Map; + unsigned wTOMapLen; + unsigned* TOMap; unsigned long contents_start; struct tagHlpFileFile* prev;

1 0

Hans Leidekker : winhttp: Implement WinHttpTimeFromSystemTime and WinHttpTimeToSystemTime.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 250cac32ca5ff4e7c282bd25abb4f1ae171476b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250cac32ca5ff4e7c282bd25a… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:44:16 2008 +0200 winhttp: Implement WinHttpTimeFromSystemTime and WinHttpTimeToSystemTime. --- dlls/winhttp/main.c | 22 -------- dlls/winhttp/session.c | 113 ++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 12 ++-- 3 files changed, 119 insertions(+), 28 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 6aa59df..c503e23 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -165,28 +165,6 @@ BOOL WINAPI WinHttpWriteData (HINTERNET hRequest, LPCVOID lpBuffer, } /*********************************************************************** - * WinHttpTimeFromSystemTime (winhttp.@) - */ -BOOL WINAPI WinHttpTimeFromSystemTime (CONST SYSTEMTIME* pst, LPWSTR pwszTime) -{ - FIXME("(%p, %p): stub\n", pst, pwszTime); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - -/*********************************************************************** - * WinHttpTimeToSystemTime (winhttp.@) - */ -BOOL WINAPI WinHttpTimeToSystemTime (LPCWSTR pwszTime, SYSTEMTIME* pst) -{ - FIXME("(%s, %p): stub\n", debugstr_w(pwszTime), pst); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - -/*********************************************************************** * WinHttpQueryHeaders (winhttp.@) */ BOOL WINAPI WinHttpQueryHeaders (HINTERNET hRequest, DWORD dwInfoLevel, LPCWSTR pwszName, diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index dd612ec..eb2c71f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -391,3 +391,116 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT release_object( hdr ); return ret; } + +static const WCHAR wkday[7][4] = + {{'S','u','n', 0}, {'M','o','n', 0}, {'T','u','e', 0}, {'W','e','d', 0}, + {'T','h','u', 0}, {'F','r','i', 0}, {'S','a','t', 0}}; +static const WCHAR month[12][4] = + {{'J','a','n', 0}, {'F','e','b', 0}, {'M','a','r', 0}, {'A','p','r', 0}, + {'M','a','y', 0}, {'J','u','n', 0}, {'J','u','l', 0}, {'A','u','g', 0}, + {'S','e','p', 0}, {'O','c','t', 0}, {'N','o','v', 0}, {'D','e','c', 0}}; + +/*********************************************************************** + * WinHttpTimeFromSystemTime (WININET.@) + */ +BOOL WINAPI WinHttpTimeFromSystemTime( const SYSTEMTIME *time, LPWSTR string ) +{ + static const WCHAR format[] = + {'%','s',',',' ','%','0','2','d',' ','%','s',' ','%','4','d',' ','%','0', + '2','d',':','%','0','2','d',':','%','0','2','d',' ','G','M','T', 0}; + + TRACE("%p, %p\n", time, string); + + if (!time || !string) return FALSE; + + sprintfW( string, format, + wkday[time->wDayOfWeek], + time->wDay, + month[time->wMonth - 1], + time->wYear, + time->wHour, + time->wMinute, + time->wSecond ); + + return TRUE; +} + +/*********************************************************************** + * WinHttpTimeToSystemTime (WININET.@) + */ +BOOL WINAPI WinHttpTimeToSystemTime( LPCWSTR string, SYSTEMTIME *time ) +{ + unsigned int i; + const WCHAR *s = string; + WCHAR *end; + + TRACE("%s, %p\n", debugstr_w(string), time); + + if (!string || !time) return FALSE; + + /* Windows does this too */ + GetSystemTime( time ); + + /* Convert an RFC1123 time such as 'Fri, 07 Jan 2005 12:06:35 GMT' into + * a SYSTEMTIME structure. + */ + + while (*s && !isalphaW( *s )) s++; + if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + time->wDayOfWeek = 7; + + for (i = 0; i < 7; i++) + { + if (toupperW( wkday[i][0] ) == toupperW( s[0] ) && + toupperW( wkday[i][1] ) == toupperW( s[1] ) && + toupperW( wkday[i][2] ) == toupperW( s[2] ) ) + { + time->wDayOfWeek = i; + break; + } + } + + if (time->wDayOfWeek > 6) return TRUE; + while (*s && !isdigitW( *s )) s++; + time->wDay = strtolW( s, &end, 10 ); + s = end; + + while (*s && !isalphaW( *s )) s++; + if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + time->wMonth = 0; + + for (i = 0; i < 12; i++) + { + if (toupperW( month[i][0]) == toupperW( s[0] ) && + toupperW( month[i][1]) == toupperW( s[1] ) && + toupperW( month[i][2]) == toupperW( s[2] ) ) + { + time->wMonth = i + 1; + break; + } + } + if (time->wMonth == 0) return TRUE; + + while (*s && !isdigitW( *s )) s++; + if (*s == '\0') return TRUE; + time->wYear = strtolW( s, &end, 10 ); + s = end; + + while (*s && !isdigitW( *s )) s++; + if (*s == '\0') return TRUE; + time->wHour = strtolW( s, &end, 10 ); + s = end; + + while (*s && !isdigitW( *s )) s++; + if (*s == '\0') return TRUE; + time->wMinute = strtolW( s, &end, 10 ); + s = end; + + while (*s && !isdigitW( *s )) s++; + if (*s == '\0') return TRUE; + time->wSecond = strtolW( s, &end, 10 ); + s = end; + + time->wMilliseconds = 0; + return TRUE; +} diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index abfa713..395d66f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -151,8 +151,8 @@ static void test_WinHttpTimeFromSystemTime(void) WCHAR time_string[WINHTTP_TIME_FORMAT_BUFSIZE+1]; ret = WinHttpTimeFromSystemTime(&time, time_string); - todo_wine ok(ret == TRUE, "WinHttpTimeFromSystemTime failed: %u\n", GetLastError()); - todo_wine ok(memcmp(time_string, expected_string, sizeof(expected_string)) == 0, + ok(ret == TRUE, "WinHttpTimeFromSystemTime failed: %u\n", GetLastError()); + ok(memcmp(time_string, expected_string, sizeof(expected_string)) == 0, "Time string returned did not match expected time string.\n"); } @@ -169,13 +169,13 @@ static void test_WinHttpTimeToSystemTime(void) '1','0',' ','0','5',' ','5','2','\n',0}; ret = WinHttpTimeToSystemTime(time_string1, &time); - todo_wine ok(ret == TRUE, "WinHttpTimeToSystemTime failed: %u\n", GetLastError()); - todo_wine ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, + ok(ret == TRUE, "WinHttpTimeToSystemTime failed: %u\n", GetLastError()); + ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); ret = WinHttpTimeToSystemTime(time_string2, &time); - todo_wine ok(ret == TRUE, "WinHttpTimeToSystemTime failed: %u\n", GetLastError()); - todo_wine ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, + ok(ret == TRUE, "WinHttpTimeToSystemTime failed: %u\n", GetLastError()); + ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); }

1 0

Hans Leidekker : winhttp: Forward WinHttpCrackUrl and WinHttpCreateUrl to wininet for the time being .
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 877d6c95c6e341cf3fc5f968fb4f88509c0b6937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877d6c95c6e341cf3fc5f968f… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:43:47 2008 +0200 winhttp: Forward WinHttpCrackUrl and WinHttpCreateUrl to wininet for the time being. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/main.c | 21 +++++++++++++++++++++ dlls/winhttp/winhttp.spec | 4 ++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index c83e630..c65adbd 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = kernel32 +IMPORTS = wininet kernel32 C_SRCS = \ handle.c \ diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index bec3cc0..6aa59df 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -209,3 +209,24 @@ BOOL WINAPI WinHttpAddRequestHeaders (HINTERNET hRequest, LPCWSTR pwszHeaders, SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +BOOL WINAPI InternetCrackUrlW( LPCWSTR, DWORD, DWORD, LPURL_COMPONENTSW ); +BOOL WINAPI InternetCreateUrlW( LPURL_COMPONENTS, DWORD, LPWSTR, LPDWORD ); + +/*********************************************************************** + * WinHttpCrackUrl (winhttp.@) + */ +BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW components ) +{ + TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, components); + return InternetCrackUrlW( url, len, flags, components ); +} + +/*********************************************************************** + * WinHttpCreateUrl (winhttp.@) + */ +BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS comps, DWORD flags, LPWSTR url, LPDWORD len ) +{ + TRACE("%p, 0x%08x, %p, %p\n", comps, flags, url, len); + return InternetCreateUrlW( comps, flags, url, len ); +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index e86fe60..08e4d93 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -6,8 +6,8 @@ @ stdcall WinHttpCheckPlatform() @ stdcall WinHttpCloseHandle(ptr) @ stdcall WinHttpConnect(ptr wstr long long) -@ stub WinHttpCrackUrl -@ stub WinHttpCreateUrl +@ stdcall WinHttpCrackUrl(wstr long long ptr) +@ stdcall WinHttpCreateUrl(ptr long ptr ptr) @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) @ stdcall WinHttpGetDefaultProxyConfiguration(ptr) @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr)

1 0

Hans Leidekker : include: Add prototype for WinHttpQueryOption.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: a591c64ffd624a9577c3af5c798f29c6c3359e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a591c64ffd624a9577c3af5c7… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:44:32 2008 +0200 include: Add prototype for WinHttpQueryOption. --- include/winhttp.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index 4c64768..e67d6c2 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -525,7 +525,7 @@ HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); +BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); @@ -533,6 +533,7 @@ BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); +BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR);

1 0

Kirill K. Smirnov : winhlp32: Fix offsets handling for old 3.0 files.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 4c387a9567870173ea3b5c6540fe2d0b8f63fafa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c387a9567870173ea3b5c654… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Aug 6 19:48:03 2008 +0400 winhlp32: Fix offsets handling for old 3.0 files. --- programs/winhlp32/hlpfile.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index c941bbd..e54d3bf 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -283,7 +283,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) OFSTRUCT ofs; BYTE* buf; DWORD ref = 0x0C; - unsigned index, old_index, offset, len, offs; + unsigned index, old_index, offset, len, offs, topicoffset; hFile = OpenFile(lpszPath, &ofs, OF_READ); if (hFile == HFILE_ERROR) return FALSE; @@ -339,7 +339,11 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) switch (buf[0x14]) { case 0x02: - if (!HLPFILE_AddPage(hlpfile, buf, end, ref, index * 0x8000L + offs)) return FALSE; + if (hlpfile->version <= 16) + topicoffset = ref + index * 12; + else + topicoffset = index * 0x8000 + offs; + if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE; break; case 0x01:

1 0

Hans Leidekker : winhttp: Implement WinHttpSetStatusCallback. Start sending notifications.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: a3d9df7d4d6ab85a44468494c79251a26c692503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d9df7d4d6ab85a44468494c… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:43:07 2008 +0200 winhttp: Implement WinHttpSetStatusCallback. Start sending notifications. --- dlls/winhttp/handle.c | 2 ++ dlls/winhttp/session.c | 33 +++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 2 +- dlls/winhttp/winhttp_private.h | 2 ++ 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 8886788..607bfcd 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -77,6 +77,8 @@ void release_object( object_header_t *hdr ) TRACE("object %p refcount = %d\n", hdr, refs); if (!refs) { + send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); + TRACE("destroying object %p\n", hdr); if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) list_remove( &hdr->entry ); hdr->vtbl->destroy( hdr ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 9a668b3..26f229e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -37,6 +37,11 @@ static void set_last_error( DWORD error ) SetLastError( error ); } +void send_callback( object_header_t *hdr, DWORD status, LPVOID info, DWORD buflen ) +{ + FIXME("%p, %u, %p, %u\n", hdr, status, info, buflen); +} + /*********************************************************************** * WinHttpCheckPlatform (winhttp.@) */ @@ -175,6 +180,8 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect; + send_callback( &session->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hconnect, sizeof(hconnect) ); + end: release_object( &connect->hdr ); @@ -262,6 +269,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, &hrequest, sizeof(hrequest) ); + end: release_object( &request->hdr ); @@ -287,3 +296,27 @@ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) free_handle( handle ); return TRUE; } + +/*********************************************************************** + * WinHttpSetStatusCallback (winhttp.@) + */ +WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHTTP_STATUS_CALLBACK callback, + DWORD flags, DWORD_PTR reserved ) +{ + object_header_t *hdr; + WINHTTP_STATUS_CALLBACK ret; + + TRACE("%p, %p, 0x%08x, 0x%lx\n", handle, callback, flags, reserved); + + if (!(hdr = grab_object( handle ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return WINHTTP_INVALID_STATUS_CALLBACK; + } + ret = hdr->callback; + hdr->callback = callback; + hdr->notify_mask = flags; + + release_object( hdr ); + return ret; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index ce9407e..dc13d5d 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -24,7 +24,7 @@ @ stub WinHttpSetCredentials @ stub WinHttpSetDefaultProxyConfiguration @ stdcall WinHttpSetOption(ptr long ptr long) -@ stub WinHttpSetStatusCallback +@ stdcall WinHttpSetStatusCallback(ptr ptr long ptr) @ stub WinHttpSetTimeouts @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0f87466..c13a63a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -116,6 +116,8 @@ void release_object( object_header_t * ); HINTERNET alloc_handle( object_header_t * ); BOOL free_handle( HINTERNET ); +void send_callback( object_header_t *, DWORD, LPVOID, DWORD ); + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size );

1 0

Hans Leidekker : winhttp: Implement WinHttpOpenRequest.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: ce00aa019f344403a41eb56f9ed8799a97304b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce00aa019f344403a41eb56f9… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:42:41 2008 +0200 winhttp: Implement WinHttpOpenRequest. --- dlls/winhttp/main.c | 14 ------ dlls/winhttp/session.c | 87 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 13 +++--- dlls/winhttp/winhttp_private.h | 32 +++++++++++++++ 4 files changed, 125 insertions(+), 21 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 6133590..44a1e42 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -117,20 +117,6 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_ } /*********************************************************************** - * WinHttpOpenRequest (winhttp.@) - */ -HINTERNET WINAPI WinHttpOpenRequest (HINTERNET hConnect, LPCWSTR pwszVerb, LPCWSTR pwszObjectName, - LPCWSTR pwszVersion, LPCWSTR pwszReferrer, LPCWSTR* ppwszAcceptTypes, - DWORD dwFlags) -{ - FIXME("(%s, %s, %s, %s, 0x%x): stub\n", debugstr_w(pwszVerb), debugstr_w(pwszObjectName), - debugstr_w(pwszVersion), debugstr_w(pwszReferrer), dwFlags); - - SetLastError(ERROR_NOT_SUPPORTED); - return NULL; -} - -/*********************************************************************** * WinHttpSendRequest (winhttp.@) */ BOOL WINAPI WinHttpSendRequest (HINTERNET hRequest, LPCWSTR pwszHeaders, DWORD dwHeadersLength, diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8f8ac2f..9a668b3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -183,6 +183,93 @@ end: } /*********************************************************************** + * request_destroy (internal) + */ +static void request_destroy( object_header_t *hdr ) +{ + request_t *request = (request_t *)hdr; + int i; + + TRACE("%p\n", request); + + release_object( &request->connect->hdr ); + + heap_free( request->verb ); + heap_free( request->path ); + heap_free( request->version ); + heap_free( request->raw_headers ); + heap_free( request->status_text ); + for (i = 0; i < request->num_headers; i++) + { + heap_free( request->headers[i].field ); + heap_free( request->headers[i].value ); + } + heap_free( request->headers ); + heap_free( request ); +} + +static const object_vtbl_t request_vtbl = +{ + request_destroy, + NULL, + NULL +}; + +/*********************************************************************** + * WinHttpOpenRequest (winhttp.@) + */ +HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR object, LPCWSTR version, + LPCWSTR referrer, LPCWSTR *types, DWORD flags ) +{ + request_t *request; + connect_t *connect; + HINTERNET hrequest = NULL; + + TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), + debugstr_w(version), debugstr_w(referrer), types, flags); + + if (!(connect = (connect_t *)grab_object( hconnect ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return NULL; + } + if (connect->hdr.type != WINHTTP_HANDLE_TYPE_CONNECT) + { + release_object( &connect->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return NULL; + } + if (!(request = heap_alloc_zero( sizeof(request_t) ))) + { + release_object( &connect->hdr ); + return NULL; + } + request->hdr.type = WINHTTP_HANDLE_TYPE_REQUEST; + request->hdr.vtbl = &request_vtbl; + request->hdr.refs = 1; + request->hdr.flags = flags; + request->hdr.callback = connect->hdr.callback; + request->hdr.notify_mask = connect->hdr.notify_mask; + + addref_object( &connect->hdr ); + request->connect = connect; + list_add_head( &connect->hdr.children, &request->hdr.entry ); + + if (verb && !(request->verb = strdupW( verb ))) goto end; + if (object && !(request->path = strdupW( object ))) goto end; + if (version && !(request->version = strdupW( version ))) goto end; + + if (!(hrequest = alloc_handle( &request->hdr ))) goto end; + request->hdr.handle = hrequest; + +end: + release_object( &request->hdr ); + + TRACE("returning %p\n", hrequest); + return hrequest; +} + +/*********************************************************************** * WinHttpCloseHandle (winhttp.@) */ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5f6ce7c..abfa713 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -55,13 +55,12 @@ static void test_OpenRequest (void) skip("Network unreachable, skipping.\n"); goto done; } - todo_wine ok(request != NULL, - "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); todo_wine ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); ret = WinHttpCloseHandle(request); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); @@ -108,7 +107,7 @@ static void test_SendRequest (void) skip("Network unreachable, skipping.\n"); goto done; } - todo_wine ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, 0); todo_wine ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); @@ -134,7 +133,7 @@ static void test_SendRequest (void) "Data read did not match, got '%s'.\n", buffer); ret = WinHttpCloseHandle(request); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); @@ -236,7 +235,7 @@ static void test_WinHttpAddHeaders(void) skip("Network unreachable, skipping.\n"); goto done; } - todo_wine ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); index = 0; len = sizeof(buffer); @@ -540,7 +539,7 @@ static void test_WinHttpAddHeaders(void) ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n"); ret = WinHttpCloseHandle(request); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 74398a6..0f87466 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -78,6 +78,38 @@ typedef struct struct sockaddr_in sockaddr; } connect_t; +typedef struct +{ + int socket; + char *peek_msg; + char *peek_msg_mem; + size_t peek_len; +} netconn_t; + +typedef struct +{ + LPWSTR field; + LPWSTR value; + WORD flags; + WORD count; +} header_t; + +typedef struct +{ + object_header_t hdr; + connect_t *connect; + LPWSTR verb; + LPWSTR path; + LPWSTR version; + LPWSTR raw_headers; + netconn_t netconn; + LPWSTR status_text; + DWORD content_length; /* total number of bytes to be read (per chunk) */ + DWORD content_read; /* bytes read so far */ + header_t *headers; + DWORD num_headers; +} request_t; + object_header_t *addref_object( object_header_t * ); object_header_t *grab_object( HINTERNET ); void release_object( object_header_t * );

1 0

Hans Leidekker : winhttp: Add stub implementations for WinHttpGetDefaultProxyConfiguration, WinHttpGetProxyForUrl and WinHttpSetDefaultProxyConfiguration.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 587162c3b6ffe0dc977fbd037521234f52e42f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587162c3b6ffe0dc977fbd037… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:43:23 2008 +0200 winhttp: Add stub implementations for WinHttpGetDefaultProxyConfiguration, WinHttpGetProxyForUrl and WinHttpSetDefaultProxyConfiguration. --- dlls/winhttp/main.c | 33 --------------------- dlls/winhttp/session.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 6 ++-- 3 files changed, 74 insertions(+), 36 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 44a1e42..bec3cc0 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -84,39 +84,6 @@ HRESULT WINAPI DllUnregisterServer(void) } /*********************************************************************** - * WinHttpDetectAutoProxyConfigUrl (winhttp.@) - */ -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD flags, LPWSTR *url) -{ - FIXME("(%x %p)\n", flags, url); - - SetLastError(ERROR_WINHTTP_AUTODETECTION_FAILED); - return FALSE; -} - -/*********************************************************************** - * WinHttpGetIEProxyConfigForCurrentUser (winhttp.@) - */ -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config) -{ - if(!config) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* TODO: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */ - FIXME("returning no proxy used\n"); - config->fAutoDetect = FALSE; - config->lpszAutoConfigUrl = NULL; - config->lpszProxy = NULL; - config->lpszProxyBypass = NULL; - - SetLastError(ERROR_SUCCESS); - return TRUE; -} - -/*********************************************************************** * WinHttpSendRequest (winhttp.@) */ BOOL WINAPI WinHttpSendRequest (HINTERNET hRequest, LPCWSTR pwszHeaders, DWORD dwHeadersLength, diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 26f229e..dd612ec 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -298,6 +298,77 @@ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) } /*********************************************************************** + * WinHttpDetectAutoProxyConfigUrl (winhttp.@) + */ +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) +{ + FIXME("0x%08x, %p\n", flags, url); + + set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + return FALSE; +} + +/*********************************************************************** + * WinHttpGetDefaultProxyConfiguration (winhttp.@) + */ +BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) +{ + FIXME("%p\n", info); + + info->dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; + info->lpszProxy = NULL; + info->lpszProxyBypass = NULL; + + return TRUE; +} + +/*********************************************************************** + * WinHttpGetIEProxyConfigForCurrentUser (winhttp.@) + */ +BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *config ) +{ + TRACE("%p\n", config); + + if (!config) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + /* FIXME: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */ + + FIXME("returning no proxy used\n"); + config->fAutoDetect = FALSE; + config->lpszAutoConfigUrl = NULL; + config->lpszProxy = NULL; + config->lpszProxyBypass = NULL; + + return TRUE; +} + +/*********************************************************************** + * WinHttpGetProxyForUrl (winhttp.@) + */ +BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTOPROXY_OPTIONS *options, + WINHTTP_PROXY_INFO *info ) +{ + FIXME("%p, %s, %p, %p\n", hsession, debugstr_w(url), options, info); + + set_last_error( ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR ); + return FALSE; +} + +/*********************************************************************** + * WinHttpSetDefaultProxyConfiguration (winhttp.@) + */ +BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) +{ + FIXME("%p [%u, %s, %s]\n", info, info->dwAccessType, debugstr_w(info->lpszProxy), + debugstr_w(info->lpszProxyBypass)); + return TRUE; +} + +/*********************************************************************** * WinHttpSetStatusCallback (winhttp.@) */ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHTTP_STATUS_CALLBACK callback, diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index dc13d5d..e86fe60 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -9,9 +9,9 @@ @ stub WinHttpCrackUrl @ stub WinHttpCreateUrl @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) -@ stub WinHttpGetDefaultProxyConfiguration +@ stdcall WinHttpGetDefaultProxyConfiguration(ptr) @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) -@ stub WinHttpGetProxyForUrl +@ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr) @ stdcall WinHttpOpen(wstr long wstr wstr long) @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stub WinHttpQueryAuthSchemes @@ -22,7 +22,7 @@ @ stdcall WinHttpReceiveResponse(ptr ptr) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) @ stub WinHttpSetCredentials -@ stub WinHttpSetDefaultProxyConfiguration +@ stdcall WinHttpSetDefaultProxyConfiguration(ptr long long wstr ptr ptr) @ stdcall WinHttpSetOption(ptr long ptr long) @ stdcall WinHttpSetStatusCallback(ptr ptr long ptr) @ stub WinHttpSetTimeouts

1 0

Hans Leidekker : winhttp: Implement WinHttpConnect.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 770ee20461ba7a262f291a7c295ec2dfbd32333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=770ee20461ba7a262f291a7c2… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:42:28 2008 +0200 winhttp: Implement WinHttpConnect. --- dlls/winhttp/main.c | 13 ------ dlls/winhttp/session.c | 81 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 18 +++----- dlls/winhttp/winhttp_private.h | 21 ++++++++++ 4 files changed, 109 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index e5c904b..6133590 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -117,19 +117,6 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_ } /*********************************************************************** - * WinHttpConnect (winhttp.@) - */ - -HINTERNET WINAPI WinHttpConnect (HINTERNET hSession, LPCWSTR pwszServerName, - INTERNET_PORT nServerPort, DWORD dwReserved) -{ - FIXME("(%s, %d, 0x%x): stub\n", debugstr_w(pwszServerName), nServerPort, dwReserved); - - SetLastError(ERROR_NOT_SUPPORTED); - return NULL; -} - -/*********************************************************************** * WinHttpOpenRequest (winhttp.@) */ HINTERNET WINAPI WinHttpOpenRequest (HINTERNET hConnect, LPCWSTR pwszVerb, LPCWSTR pwszObjectName, diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 76a878e..8f8ac2f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -102,6 +102,87 @@ end: } /*********************************************************************** + * connect_destroy (internal) + */ +static void connect_destroy( object_header_t *hdr ) +{ + connect_t *connect = (connect_t *)hdr; + + TRACE("%p\n", connect); + + release_object( &connect->session->hdr ); + + heap_free( connect->hostname ); + heap_free( connect->servername ); + heap_free( connect->username ); + heap_free( connect->password ); + heap_free( connect ); +} + +static const object_vtbl_t connect_vtbl = +{ + connect_destroy, + NULL, + NULL +}; + +/*********************************************************************** + * WinHttpConnect (winhttp.@) + */ +HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) +{ + connect_t *connect; + session_t *session; + HINTERNET hconnect = NULL; + + TRACE("%p, %s, %u, %x\n", hsession, debugstr_w(server), port, reserved); + + if (!server) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return NULL; + } + if (!(session = (session_t *)grab_object( hsession ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return NULL; + } + if (session->hdr.type != WINHTTP_HANDLE_TYPE_SESSION) + { + release_object( &session->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return NULL; + } + if (!(connect = heap_alloc_zero( sizeof(connect_t) ))) + { + release_object( &session->hdr ); + return NULL; + } + connect->hdr.type = WINHTTP_HANDLE_TYPE_CONNECT; + connect->hdr.vtbl = &connect_vtbl; + connect->hdr.refs = 1; + connect->hdr.flags = session->hdr.flags; + connect->hdr.callback = session->hdr.callback; + connect->hdr.notify_mask = session->hdr.notify_mask; + + addref_object( &session->hdr ); + connect->session = session; + list_add_head( &session->hdr.children, &connect->hdr.entry ); + + if (server && !(connect->hostname = strdupW( server ))) goto end; + connect->hostport = port; + + if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; + connect->hdr.handle = hconnect; + +end: + release_object( &connect->hdr ); + + TRACE("returning %p\n", hconnect); + return hconnect; +} + +/*********************************************************************** * WinHttpCloseHandle (winhttp.@) */ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2c7143e..5f6ce7c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -42,13 +42,11 @@ static void test_OpenRequest (void) SetLastError(0xdeadbeef); connection = WinHttpConnect(session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* Test with a valid server name */ connection = WinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); - todo_wine ok(connection != NULL, - "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); @@ -67,7 +65,7 @@ static void test_OpenRequest (void) done: ret = WinHttpCloseHandle(connection); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); @@ -101,8 +99,7 @@ static void test_SendRequest (void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); - todo_wine ok(connection != NULL, - "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); @@ -140,7 +137,7 @@ static void test_SendRequest (void) todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); } @@ -230,8 +227,7 @@ static void test_WinHttpAddHeaders(void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); - todo_wine ok(connection != NULL, - "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); @@ -547,7 +543,7 @@ static void test_WinHttpAddHeaders(void) todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 1d40fcb..74398a6 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -19,9 +19,17 @@ #ifndef _WINE_WINHTTP_PRIVATE_H_ #define _WINE_WINHTTP_PRIVATE_H_ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include "wine/list.h" #include "wine/unicode.h" +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif + typedef struct _object_header_t object_header_t; typedef struct @@ -57,6 +65,19 @@ typedef struct LPWSTR proxy_password; } session_t; +typedef struct +{ + object_header_t hdr; + session_t *session; + LPWSTR hostname; /* final destination of the request */ + LPWSTR servername; /* name of the server we directly connect to */ + LPWSTR username; + LPWSTR password; + INTERNET_PORT hostport; + INTERNET_PORT serverport; + struct sockaddr_in sockaddr; +} connect_t; + object_header_t *addref_object( object_header_t * ); object_header_t *grab_object( HINTERNET ); void release_object( object_header_t * );

1 0

Hans Leidekker : winhttp: Add a handle management implementation.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: d5c0ccf93aed9f2d61734d2f8d3e2f5bee6744e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c0ccf93aed9f2d61734d2f8… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:41:36 2008 +0200 winhttp: Add a handle management implementation. --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/handle.c | 156 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 68 +++++++++++++++++ 3 files changed, 227 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index e69b137..bf26202 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -6,7 +6,9 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = kernel32 -C_SRCS = main.c +C_SRCS = \ + handle.c \ + main.c @MAKE_DLL_RULES@ diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c new file mode 100644 index 0000000..8886788 --- /dev/null +++ b/dlls/winhttp/handle.c @@ -0,0 +1,156 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * Based on the handle implementation from wininet. + * + * 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 "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winhttp.h" + +#include "winhttp_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhttp); + +#define HANDLE_CHUNK_SIZE 0x10 + +static CRITICAL_SECTION handle_cs; +static CRITICAL_SECTION_DEBUG handle_cs_debug = +{ + 0, 0, &handle_cs, + { &handle_cs_debug.ProcessLocksList, &handle_cs_debug.ProcessLocksList }, + 0, 0, { (ULONG_PTR)(__FILE__ ": handle_cs") } +}; +static CRITICAL_SECTION handle_cs = { &handle_cs_debug, -1, 0, 0, 0, 0 }; + +static object_header_t **handles; +static ULONG_PTR next_handle; +static ULONG_PTR max_handles; + +object_header_t *addref_object( object_header_t *hdr ) +{ + ULONG refs = InterlockedIncrement( &hdr->refs ); + TRACE("%p -> refcount = %d\n", hdr, refs); + return hdr; +} + +object_header_t *grab_object( HINTERNET hinternet ) +{ + object_header_t *hdr = NULL; + ULONG_PTR handle = (ULONG_PTR)hinternet; + + EnterCriticalSection( &handle_cs ); + + if ((handle > 0) && (handle <= max_handles) && handles[handle - 1]) + hdr = addref_object( handles[handle - 1] ); + + LeaveCriticalSection( &handle_cs ); + + TRACE("handle 0x%lx -> %p\n", handle, hdr); + return hdr; +} + +void release_object( object_header_t *hdr ) +{ + ULONG refs = InterlockedDecrement( &hdr->refs ); + TRACE("object %p refcount = %d\n", hdr, refs); + if (!refs) + { + TRACE("destroying object %p\n", hdr); + if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) list_remove( &hdr->entry ); + hdr->vtbl->destroy( hdr ); + } +} + +HINTERNET alloc_handle( object_header_t *hdr ) +{ + object_header_t **p; + ULONG_PTR handle = 0, num; + + list_init( &hdr->children ); + + EnterCriticalSection( &handle_cs ); + if (!max_handles) + { + num = HANDLE_CHUNK_SIZE; + if (!(p = heap_alloc_zero( sizeof(ULONG_PTR) * num ))) goto end; + handles = p; + max_handles = num; + } + if (max_handles == next_handle) + { + num = max_handles + HANDLE_CHUNK_SIZE; + if (!(p = heap_realloc_zero( handles, sizeof(ULONG_PTR) * num ))) goto end; + handles = p; + max_handles = num; + } + handle = next_handle; + if (handles[handle]) ERR("handle isn't free but should be\n"); + + handles[handle] = addref_object( hdr ); + while (handles[next_handle] && (next_handle < max_handles)) next_handle++; + +end: + LeaveCriticalSection( &handle_cs ); + return hdr->handle = (HINTERNET)(handle + 1); +} + +BOOL free_handle( HINTERNET hinternet ) +{ + BOOL ret = FALSE; + ULONG_PTR handle = (ULONG_PTR)hinternet; + object_header_t *hdr = NULL, *child, *next; + + EnterCriticalSection( &handle_cs ); + + if ((handle > 0) && (handle <= max_handles)) + { + handle--; + if (handles[handle]) + { + hdr = handles[handle]; + TRACE("destroying handle 0x%lx for object %p\n", handle + 1, hdr); + handles[handle] = NULL; + ret = TRUE; + } + } + + LeaveCriticalSection( &handle_cs ); + + if (hdr) + { + LIST_FOR_EACH_ENTRY_SAFE( child, next, &hdr->children, object_header_t, entry ) + { + TRACE("freeing child handle %p for parent handle 0x%lx\n", child->handle, handle + 1); + free_handle( child->handle ); + } + release_object( hdr ); + } + + EnterCriticalSection( &handle_cs ); + if (next_handle > handle && !handles[handle]) next_handle = handle; + LeaveCriticalSection( &handle_cs ); + + return ret; +} diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h new file mode 100644 index 0000000..7d06c87 --- /dev/null +++ b/dlls/winhttp/winhttp_private.h @@ -0,0 +1,68 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#ifndef _WINE_WINHTTP_PRIVATE_H_ +#define _WINE_WINHTTP_PRIVATE_H_ + +#include "wine/list.h" + +typedef struct _object_header_t object_header_t; + +typedef struct +{ + void (*destroy)( object_header_t * ); + BOOL (*query_option)( object_header_t *, DWORD, void *, DWORD *, BOOL ); + BOOL (*set_option)( object_header_t *, DWORD, void *, DWORD ); +} object_vtbl_t; + +struct _object_header_t +{ + DWORD type; + HINTERNET handle; + const object_vtbl_t *vtbl; + DWORD flags; + DWORD error; + DWORD_PTR context; + LONG refs; + WINHTTP_STATUS_CALLBACK callback; + DWORD notify_mask; + struct list entry; + struct list children; +}; + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void *heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void *heap_realloc_zero( LPVOID mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +#endif /* _WINE_WINHTTP_PRIVATE_H_ */

1 0