ChangeSet ID: 21270 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/15 06:01:59
Modified files: dlls/wininet : http.c
Log message: Robert Shearman rob@codeweavers.com INTERNET_STATUS_HANDLE_CREATED notifications just send the handle, not an INTERNET_ASYNC_RESULT structure. The source handle in HTTP_Connect should be the parent's handle.
Patch: http://cvs.winehq.org/patch.py?id=21270
Old revision New revision Changes Path 1.108 1.109 +5 -14 wine/dlls/wininet/http.c
Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.108 wine/dlls/wininet/http.c:1.109 --- wine/dlls/wininet/http.c:1.108 15 Nov 2005 12: 1:59 -0000 +++ wine/dlls/wininet/http.c 15 Nov 2005 12: 1:59 -0000 @@ -669,7 +669,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L HINTERNET handle = NULL; static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; DWORD len; - INTERNET_ASYNC_RESULT iar;
TRACE("-->\n");
@@ -797,12 +796,9 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L HeapFree(GetProcessHeap(), 0, lpszUrl);
- iar.dwResult = (DWORD_PTR)handle; - iar.dwError = ERROR_SUCCESS; - SendAsyncCallback(&lpwhs->hdr, dwContext, - INTERNET_STATUS_HANDLE_CREATED, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + INTERNET_STATUS_HANDLE_CREATED, &handle, + sizeof(handle));
/* * A STATUS_REQUEST_COMPLETE is NOT sent here as per my tests on windows @@ -1867,14 +1863,9 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(lpwhs->hdr.dwInternalFlags & INET_OPENURL)) { - INTERNET_ASYNC_RESULT iar; - - iar.dwResult = (DWORD_PTR)handle; - iar.dwError = ERROR_SUCCESS; - - SendAsyncCallback(&lpwhs->hdr, dwContext, - INTERNET_STATUS_HANDLE_CREATED, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + SendAsyncCallback(&hIC->hdr, dwContext, + INTERNET_STATUS_HANDLE_CREATED, &handle, + sizeof(handle)); }
bSuccess = TRUE;