February 2013 - Wine-Commits

Alexandre Julliard : twain_32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 731a3fea91c13082d0d051274f34acc2a9df7c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731a3fea91c13082d0d051274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:35:40 2013 +0100 twain_32: Remove an unnecessary DllMain entry point. --- dlls/twain_32/dsm_ctrl.c | 14 +++++--------- dlls/twain_32/twain32_main.c | 19 ------------------- dlls/twain_32/twain_i.h | 1 - 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index b50dbc5..db57d08 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -207,7 +207,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_IDENTITY/MSG_OPENDS\n"); TRACE("pIdentity is %s\n", pIdentity->ProductName); - if (DSM_currentState != 3) { + if (!DSM_initialized) { FIXME("seq error\n"); DSM_twCC = TWCC_SEQERROR; return TWRC_FAILURE; @@ -281,10 +281,9 @@ TW_UINT16 TWAIN_CloseDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_PARENT/MSG_CLOSEDSM\n"); - if (DSM_currentState == 3) + if (DSM_initialized) { DSM_initialized = FALSE; - DSM_currentState = 2; /* If there are data sources still open, close them now. */ while (currentDS != NULL) @@ -309,12 +308,9 @@ TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) TW_UINT16 twRC = TWRC_SUCCESS; TRACE("DG_CONTROL/DAT_PARENT/MSG_OPENDSM\n"); - if (DSM_currentState == 2) { - if (!DSM_initialized) { - DSM_currentDevice = 0; - DSM_initialized = TRUE; - } - DSM_currentState = 3; + if (!DSM_initialized) { + DSM_currentDevice = 0; + DSM_initialized = TRUE; DSM_twCC = TWCC_SUCCESS; twRC = TWRC_SUCCESS; } else { diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 9eb2754..f7b8f58 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -43,25 +43,6 @@ static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) return pSource; } -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - DSM_currentState = 2; - break; - - case DLL_PROCESS_DETACH: - DSM_currentState = 1; - break; - } - - return TRUE; -} - static TW_UINT16 TWAIN_SourceManagerHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index ffe6bd9..a8fa2fb 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -39,7 +39,6 @@ typedef struct tagActiveDS DSENTRYPROC dsEntry; } activeDS; -TW_UINT16 DSM_currentState DECLSPEC_HIDDEN; /* current state of Source Manager */ TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */

1 0

Alexandre Julliard : odbccu32: Remove an unnecessary source file.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 981f79dbf862b8d46014061f043a1992cc76842f URL: http://source.winehq.org/git/wine.git/?a=commit;h=981f79dbf862b8d46014061f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:35:21 2013 +0100 odbccu32: Remove an unnecessary source file. --- dlls/odbccu32/Makefile.in | 3 -- dlls/odbccu32/odbccu32_main.c | 42 ----------------------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in index cc8bf71..36737ce 100644 --- a/dlls/odbccu32/Makefile.in +++ b/dlls/odbccu32/Makefile.in @@ -1,8 +1,5 @@ MODULE = odbccu32.dll -C_SRCS = \ - odbccu32_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/odbccu32/odbccu32_main.c b/dlls/odbccu32/odbccu32_main.c deleted file mode 100644 index 09abf2b..0000000 --- a/dlls/odbccu32/odbccu32_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * ODBC Cursor Library - * - * Copyright 2012 Alistair Leslie-Hughes - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -}

1 0

Aric Stewart : usp10: Correct error with ScriptLayout log2vis.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 9a59d81f7254cd6e4b99822e2f0cf997ae80e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a59d81f7254cd6e4b99822e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 14 12:10:31 2013 -0600 usp10: Correct error with ScriptLayout log2vis. Issue found and test written by Huw Davies. --- dlls/usp10/bidi.c | 6 ++++-- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index a2edfa6..3b1823f 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -872,11 +872,13 @@ int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B reverse(pIndexs, ich); } - if (newlevel > 1) + if (newlevel >= 0) { ich = 0; for (; ich < cch; ich++) - if (plevel[ich] > level) + if (plevel[ich] < level) + break; + else if (plevel[ich] > level) ich += BIDI_ReorderL2vLevel(level + 1, pIndexs + ich, plevel + ich, cch - ich, fReverse) - 1; } diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7752f2c..354bc23 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2786,6 +2786,11 @@ static void test_ScriptLayout(void) { 0, 0, 1, 1, 2, 2, 1, 1, 0, 1 }, { 1, 0, 1, 2, 2, 1, 2, 1, 0, 1 }, + + { 1, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 4, 4, 4, 1, 1, 0, 0 }, + { 1, 2, 3, 0, 3, 2, 1, 0, 0, 0 } }; static const int expect_l2v[][10] = { @@ -2802,6 +2807,11 @@ static void test_ScriptLayout(void) { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, /**/ { 0, 1, 7, 5, 6, 4, 3 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 2, 3, 4, 5, 6, 7, 1, 0, 8, 9}, + { 2, 0, 1, 3, 5, 6, 4, 7, 8, 9} }; static const int expect_v2l[][10] = { @@ -2818,6 +2828,11 @@ static void test_ScriptLayout(void) { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, { 0, 1, 7, 6, 5, 3, 4 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 7, 6, 0, 1, 2, 3, 4, 5, 8, 9}, + { 1, 2, 0, 3, 6, 4, 5, 7, 8, 9} }; int i, j, vistolog[sizeof(levels[0])], logtovis[sizeof(levels[0])];

1 0

Alexandre Julliard : wtsapi32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 102f5085efc5d9ac9e3190c721c08a2eeb917e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102f5085efc5d9ac9e3190c72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:37 2013 +0100 wtsapi32: Remove an unnecessary DllMain entry point. --- dlls/wtsapi32/wtsapi32.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c25f75b..898b95d 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -26,25 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - /************************************************************ * WTSCloseServer (WTSAPI32.@) */

1 0

Alexandre Julliard : cryptnet: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: a4cdc0e90d3f3ad1b1ade84d352a8239d70771ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cdc0e90d3f3ad1b1ade84d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:36:26 2013 +0100 cryptnet: Remove an unnecessary DllMain entry point. --- dlls/cryptnet/cryptnet_main.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index c7511d7..46eac4e 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -42,22 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - /* Do uninitialisation here */ - break; - default: break; - } - return TRUE; -} - static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', 'd','l','l',0 };

1 0

Alexandre Julliard : iphlpapi: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 4468a0122f70fd4ac23417f766a5e8c96af025c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4468a0122f70fd4ac23417f76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:36:51 2013 +0100 iphlpapi: Remove an unnecessary DllMain entry point. --- dlls/iphlpapi/iphlpapi_main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9cffe06..600bf8c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -71,19 +71,6 @@ static void initialise_resolver(void) res_init(); } -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - /****************************************************************** * AddIPAddress (IPHLPAPI.@) *

1 0

Jacek Caban : wininet: Set available bytes in InternetQueryDataAvailable even if it ends up in async call .
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 851866e22a731141da7e3cbd2550c67c59968959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851866e22a731141da7e3cbd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 14 18:05:14 2013 +0100 wininet: Set available bytes in InternetQueryDataAvailable even if it ends up in async call. --- dlls/wininet/http.c | 24 ++++++++++++++++-------- dlls/wininet/tests/http.c | 9 ++++++++- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d4c822d..81439ca 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2763,7 +2763,7 @@ static void send_request_complete(http_request_t *req, DWORD_PTR result, DWORD e sizeof(INTERNET_ASYNC_RESULT)); } -static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD *ret_size) { DWORD res, read = 0, avail = 0; read_mode_t mode; @@ -2776,6 +2776,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) res = refill_read_buffer(req, mode, &read); if(res == ERROR_SUCCESS && !first_notif) avail = get_avail_data(req); + if(ret_size) + *ret_size = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2993,11 +2995,16 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } -static void AsyncQueryDataAvailableProc(task_header_t *task) +typedef struct { + task_header_t hdr; + DWORD *ret_size; +} http_data_available_task_t; + +static void AsyncQueryDataAvailableProc(task_header_t *hdr) { - http_request_t *req = (http_request_t*)task->hdr; + http_data_available_task_t *task = (http_data_available_task_t*)hdr; - HTTP_ReceiveRequestData(req, FALSE); + HTTP_ReceiveRequestData((http_request_t*)task->hdr.hdr, FALSE, task->ret_size); } static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) @@ -3008,7 +3015,7 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - task_header_t *task; + http_data_available_task_t *task; /* never wait, if we can't enter the section we queue an async request right away */ if (TryEnterCriticalSection( &req->read_section )) @@ -3020,7 +3027,8 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, } task = alloc_async_task(&req->hdr, AsyncQueryDataAvailableProc, sizeof(*task)); - INTERNET_AsyncCall(task); + task->ret_size = available; + INTERNET_AsyncCall(&task->hdr); return ERROR_IO_PENDING; } @@ -4923,7 +4931,7 @@ lend: { if (res == ERROR_SUCCESS) { if(bEndRequest && request->contentLength && request->bytesWritten == request->bytesToWrite) - HTTP_ReceiveRequestData(request, TRUE); + HTTP_ReceiveRequestData(request, TRUE, NULL); else send_request_complete(request, request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0); @@ -5034,7 +5042,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ create_cache_entry(request); if (res == ERROR_SUCCESS && request->contentLength) - HTTP_ReceiveRequestData(request, TRUE); + HTTP_ReceiveRequestData(request, TRUE, NULL); else send_request_complete(request, res == ERROR_SUCCESS, res); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ba4ec4d..6083900 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -448,7 +448,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, post_len = 0; + DWORD length, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,12 +649,17 @@ static void InternetReadFile_test(int flags, const test_data_t *test) { if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + length = 0; res = InternetQueryDataAvailable(hor,&length,0x0,0x0); if (flags & INTERNET_FLAG_ASYNC) { if (res) { CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + if(exlen) { + ok(length >= exlen, "length %u < exlen %u\n", length, exlen); + exlen = 0; + } } else if (GetLastError() == ERROR_IO_PENDING) { @@ -663,6 +668,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if(!(test->flags & TESTF_CHUNKED)) ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); + exlen = length; + ok(exlen, "length = 0\n"); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); ok(req_error, "req_error = 0\n"); continue;

1 0

Alexandre Julliard : ktmw32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 94038dd67a7b4adcc75aa6a5bfde0d243a01f04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94038dd67a7b4adcc75aa6a5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:03 2013 +0100 ktmw32: Remove an unnecessary DllMain entry point. --- dlls/ktmw32/ktmw32_main.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 6aee549..328ddb5 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -28,21 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ktmw32); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -} - /*********************************************************************** * CommitTransaction (ktmw32.@) */

1 0

Alexandre Julliard : sensapi: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: a5c4f231cab8867f988439e3e7b5b47e34a9aee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c4f231cab8867f988439e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:17 2013 +0100 sensapi: Remove an unnecessary DllMain entry point. --- dlls/sensapi/sensapi.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 75d07a8..0d2f212 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,25 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - BOOL WINAPI IsDestinationReachableA(LPCSTR lpszDestination, LPQOCINFO lpQOCInfo) { FIXME("%s,%p\n", lpszDestination, lpQOCInfo);

1 0

Jacek Caban : urlmon: Allow available_bytes to be set before protocol_continue call.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 5f14eb564ee35c7f47814cee107982ab5c43bc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f14eb564ee35c7f47814cee1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 14 18:04:53 2013 +0100 urlmon: Allow available_bytes to be set before protocol_continue call. --- dlls/urlmon/protocol.c | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 5bd16dd..e404e4d 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -338,32 +338,38 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } - if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA) && !protocol->available_bytes) { - BOOL res; - - /* InternetQueryDataAvailable may immediately fork and perform its asynchronous - * read, so clear the flag _before_ calling so it does not incorrectly get cleared - * after the status callback is called */ - protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); - if(res) { - if(!protocol->available_bytes) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); + if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { + if(!protocol->available_bytes) { + BOOL res; + + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + protocol->flags &= ~FLAG_REQUEST_COMPLETE; + res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); + if(res) { + TRACE("available %u bytes\n", protocol->available_bytes); + if(!protocol->available_bytes) { + if(is_start) { + TRACE("empty file\n"); + all_data_read(protocol); + }else { + WARN("unexpected end of file?\n"); + report_result(protocol, INET_E_DOWNLOAD_FAILURE); + } + return S_OK; } + }else if(GetLastError() != ERROR_IO_PENDING) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + report_result(protocol, INET_E_DATA_NOT_AVAILABLE); return S_OK; } + protocol->flags |= FLAG_REQUEST_COMPLETE; - report_data(protocol); - }else if(GetLastError() != ERROR_IO_PENDING) { - protocol->flags |= FLAG_REQUEST_COMPLETE; - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - report_result(protocol, INET_E_DATA_NOT_AVAILABLE); } + + report_data(protocol); } return S_OK;

1 0