Change all SendAsyncCallback calls into the synchronous

dlls/wininet/http.c

@@ -1107,7 +1107,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
     HeapFree(GetProcessHeap(), 0, lpszUrl);
 
 
-    SendAsyncCallback(&lpwhs->hdr, dwContext,
+    INTERNET_SendCallback(&lpwhs->hdr, dwContext,
                           INTERNET_STATUS_HANDLE_CREATED, &handle,
                           sizeof(handle));
 
@@ -1118,7 +1118,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
     /*
      * According to my tests. The name is not resolved until a request is Opened
      */
-    SendAsyncCallback(&lpwhr->hdr, dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, dwContext,
                           INTERNET_STATUS_RESOLVING_NAME,
                           lpwhs->lpszServerName,
                           strlenW(lpwhs->lpszServerName)+1);
@@ -1132,7 +1132,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
         goto lend;
     }
 
-    SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                           INTERNET_STATUS_NAME_RESOLVED,
                           &(lpwhs->socketAddress),
                           sizeof(struct sockaddr_in));
@@ -1878,7 +1878,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWST
         lpwhs->lpszUserName = WININET_strdupW(userName);
         lpwhs->nServerPort = urlComponents.nPort;
 
-        SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+        INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                               INTERNET_STATUS_RESOLVING_NAME,
                               lpwhs->lpszServerName,
                               strlenW(lpwhs->lpszServerName)+1);
@@ -1892,7 +1892,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWST
 
         StrCatW(path,extra);
 
-        SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+        INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                               INTERNET_STATUS_NAME_RESOLVED,
                               &(lpwhs->socketAddress),
                               sizeof(struct sockaddr_in));
@@ -2068,17 +2068,17 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
         ascii_req[len] = 0;
         TRACE("full request -> %s\n", debugstr_a(ascii_req) );
 
-        SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+        INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                               INTERNET_STATUS_SENDING_REQUEST, NULL, 0);
 
         NETCON_send(&lpwhr->netConnection, ascii_req, len, 0, &cnt);
         HeapFree( GetProcessHeap(), 0, ascii_req );
 
-        SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+        INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                               INTERNET_STATUS_REQUEST_SENT,
-                          &len,sizeof(DWORD));
+                              &len, sizeof(DWORD));
 
-        SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+        INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                               INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
 
         if (cnt < 0)
@@ -2088,7 +2088,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
         if (responseLen)
 	    bSuccess = TRUE;
 
-        SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+        INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                               INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen,
                               sizeof(DWORD));
 
@@ -2114,7 +2114,7 @@ lend:
             dwIndex=0;
             if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex))
             {
-                SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+                INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                                       INTERNET_STATUS_REDIRECT, szNewLocation,
                                       dwBufferSize);
                 return HTTP_HandleRedirect(lpwhr, szNewLocation, lpszHeaders,
@@ -2127,7 +2127,7 @@ lend:
     iar.dwResult = (DWORD)bSuccess;
     iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError();
 
-    SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                           INTERNET_STATUS_REQUEST_COMPLETE, &iar,
                           sizeof(INTERNET_ASYNC_RESULT));
 
@@ -2208,7 +2208,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
     /* Don't send a handle created callback if this handle was created with InternetOpenUrl */
     if (!(lpwhs->hdr.dwInternalFlags & INET_OPENURL))
     {
-        SendAsyncCallback(&hIC->hdr, dwContext,
+        INTERNET_SendCallback(&hIC->hdr, dwContext,
                               INTERNET_STATUS_HANDLE_CREATED, &handle,
                               sizeof(handle));
     }
@@ -2257,7 +2257,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr)
     lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent;
 
     hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
-    SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                           INTERNET_STATUS_CONNECTING_TO_SERVER,
                           &(lpwhs->socketAddress),
                           sizeof(struct sockaddr_in));
@@ -2294,7 +2294,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr)
         }
     }
 
-    SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                           INTERNET_STATUS_CONNECTED_TO_SERVER,
                           &(lpwhs->socketAddress),
                           sizeof(struct sockaddr_in));
@@ -2885,7 +2885,7 @@ static VOID HTTP_CloseConnection(LPWININETHTTPREQW lpwhr)
     lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
     hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
 
-    SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                           INTERNET_STATUS_CLOSING_CONNECTION, 0, 0);
 
     if (NETCON_connected(&lpwhr->netConnection))
@@ -2893,7 +2893,7 @@ static VOID HTTP_CloseConnection(LPWININETHTTPREQW lpwhr)
         NETCON_close(&lpwhr->netConnection);
     }
 
-    SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
+    INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,
                           INTERNET_STATUS_CONNECTION_CLOSED, 0, 0);
 }