Change some SendAsyncCallback calls to INTERNET_SendCallback as the

tests show that the callbacks happen either synchronously or within an alternative asynchronous call. Remove a check for a NULL lpfnStatusCB that is already performed by INTERNET_SendCallback and add a comment about a difference to native.

Change some SendAsyncCallback calls to INTERNET_SendCallback as the
8c8c81a1 · Robert Shearman · Alexandre Julliard · 29a436fd · 8c8c81a1
Commit 8c8c81a1 authored Nov 28, 2005 by Robert Shearman Committed by Alexandre Julliard Nov 28, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

internet.c dlls/wininet/internet.c +12 -10

No files found.
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -951,7 +951,7 @@ BOOL WINAPI INTERNET_FindNextFileW(LPWININETFINDNEXTW lpwh, LPVOID lpvFindData)

 lend:

-    if (lpwh->hdr.dwFlags & INTERNET_FLAG_ASYNC && lpwh->hdr.lpfnStatusCB)
+    if (lpwh->hdr.dwFlags & INTERNET_FLAG_ASYNC)
    {
        INTERNET_ASYNC_RESULT iar;

@@ -959,9 +959,9 @@ lend:
        iar.dwError = iar.dwError = bSuccess ? ERROR_SUCCESS :
                                               INTERNET_GetLastError();

-        SendAsyncCallback(&lpwh->hdr, lpwh->hdr.dwContext,
-                      INTERNET_STATUS_REQUEST_COMPLETE, &iar,
-                       sizeof(INTERNET_ASYNC_RESULT));
+        INTERNET_SendCallback(&lpwh->hdr, lpwh->hdr.dwContext,
+                              INTERNET_STATUS_REQUEST_COMPLETE, &iar,
+                              sizeof(INTERNET_ASYNC_RESULT));
    }

    return bSuccess;
@@ -1015,9 +1015,11 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet)
        return FALSE;
    }

-    SendAsyncCallback(lpwh, lpwh->dwContext,
-                      INTERNET_STATUS_HANDLE_CLOSING, &hInternet,
-                      sizeof(HINTERNET));
+    /* FIXME: native appears to send this from the equivalent of
+     * WININET_Release */
+    INTERNET_SendCallback(lpwh, lpwh->dwContext,
+                          INTERNET_STATUS_HANDLE_CLOSING, &hInternet,
+                          sizeof(HINTERNET));

    if( lpwh->lpwhparent )
        WININET_Release( lpwh->lpwhparent );
@@ -1753,9 +1755,9 @@ static BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer,
        iar.dwError = iar.dwError = retval ? ERROR_SUCCESS :
                                             INTERNET_GetLastError();

-        SendAsyncCallback(lpwh, lpwh->dwContext,
-                          INTERNET_STATUS_REQUEST_COMPLETE, &iar,
-                          sizeof(INTERNET_ASYNC_RESULT));
+        INTERNET_SendCallback(lpwh, lpwh->dwContext,
+                              INTERNET_STATUS_REQUEST_COMPLETE, &iar,
+                              sizeof(INTERNET_ASYNC_RESULT));
    }
    return retval;
 }