March 2009 - Wine-Commits - list.winehq.org

James Hawkins : msi: Use a SQL marker to query the _Property table when fetching a property.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 293bdffa29f5daba1195ad761de7e646bf6c1db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bdffa29f5daba1195ad761… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:56 2009 -0800 msi: Use a SQL marker to query the _Property table when fetching a property. --- dlls/msi/package.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f662fe0..7172ff4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1403,16 +1403,36 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue static MSIRECORD *MSI_GetPropertyRow( MSIPACKAGE *package, LPCWSTR name ) { + MSIQUERY *view; + MSIRECORD *rec, *row = NULL; + UINT r; + static const WCHAR query[]= { 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ', 'F','R','O','M',' ' ,'`','_','P','r','o','p','e','r','t','y','`', ' ','W','H','E','R','E',' ' ,'`','_','P','r','o','p','e','r','t','y','`', - '=','\'','%','s','\'',0}; + '=','?',0}; if (!name || !*name) return NULL; - return MSI_QueryGetRecord( package->db, query, name ); + rec = MSI_CreateRecord(1); + if (!rec) + return NULL; + + MSI_RecordSetStringW(rec, 1, name); + + r = MSI_DatabaseOpenViewW(package->db, query, &view); + if (r == ERROR_SUCCESS) + { + MSI_ViewExecute(view, rec); + MSI_ViewFetch(view, &row); + MSI_ViewClose(view); + msiobj_release(&view->hdr); + } + + msiobj_release(&rec->hdr); + return row; } /* internal function, not compatible with MsiGetPropertyW */

1 0

James Hawkins : msi: Order primary keys to be first in the column list when creating a table.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: c07b554edcd0b71f92c662c6c0042b76354c6862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07b554edcd0b71f92c662c6c… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:30 2009 -0800 msi: Order primary keys to be first in the column list when creating a table. --- dlls/msi/sql.y | 53 +++++- dlls/msi/tests/db.c | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 529 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c07b554edcd0b71f92c66…

1 0

James Hawkins : msi: Column attributes for temporary string and int columns should be g and j respectively .
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: c9b3bc1165022d970eacc3f143b3107f2f6bc3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b3bc1165022d970eacc3f14… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:39 2009 -0800 msi: Column attributes for temporary string and int columns should be g and j respectively. --- dlls/msi/alter.c | 4 ++-- dlls/msi/create.c | 4 ++-- dlls/msi/delete.c | 7 ++++--- dlls/msi/distinct.c | 7 ++++--- dlls/msi/insert.c | 16 ++++++++-------- dlls/msi/join.c | 7 ++++--- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 27 ++++++++++++++++++++------- dlls/msi/select.c | 9 +++++---- dlls/msi/storages.c | 9 ++++++--- dlls/msi/streams.c | 9 ++++++--- dlls/msi/table.c | 18 ++++++++++++------ dlls/msi/tests/db.c | 4 ++-- dlls/msi/update.c | 6 +++--- dlls/msi/where.c | 9 +++++---- 15 files changed, 84 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b3bc1165022d970eacc…

1 0

James Hawkins : msi: The PATH environment variable can be longer than MAX_PATH, so dynamically allocate strings to deal with that.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 046bcc918c70f760870363ee5cfba0a1470328cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=046bcc918c70f760870363ee5… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:41 2009 -0800 msi: The PATH environment variable can be longer than MAX_PATH, so dynamically allocate strings to deal with that. --- dlls/msi/tests/package.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f9029e6..46fde5a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7330,6 +7330,8 @@ static void test_appsearch_reglocator(void) BOOL space, version; HKEY hklm, classes; HKEY hkcu, users; + LPSTR pathdata; + LPSTR pathvar; LPCSTR str; LPSTR ptr; LONG res; @@ -7772,12 +7774,22 @@ static void test_appsearch_reglocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, "#-42"), "Expected \"#-42\", got \"%s\"\n", prop); - ExpandEnvironmentStringsA("%PATH%", path, MAX_PATH); + size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); + pathvar = HeapAlloc(GetProcessHeap(), 0, size); + ExpandEnvironmentStringsA("%PATH%", pathvar, size); - size = MAX_PATH; - r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); + size = 0; + r = MsiGetPropertyA(hpkg, "SIGPROP4", NULL, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + + pathdata = HeapAlloc(GetProcessHeap(), 0, ++size); + r = MsiGetPropertyA(hpkg, "SIGPROP4", pathdata, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(pathdata, pathvar), + "Expected \"%s\", got \"%s\"\n", pathvar, pathdata); + + HeapFree(GetProcessHeap(), 0, pathvar); + HeapFree(GetProcessHeap(), 0, pathdata); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size);

1 0

James Hawkins : msi: Delete the view on error.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: f36e13fd818e3e9208ba05a3b6c730e6b4db4fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36e13fd818e3e9208ba05a3b… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:48 2009 -0800 msi: Delete the view on error. --- dlls/msi/sql.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index f5616ba..425b584 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -961,7 +961,11 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, TRACE("Parse returned %d\n", r); if( r ) { - *sql.view = NULL; + if (*sql.view) + { + (*sql.view)->ops->delete(*sql.view); + *sql.view = NULL; + } return sql.r; }

1 0

James Hawkins : msi: Correctly order transposed column values in the INSERT query.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: b3c9875cf770aee477c2a4bc92cc0c27b9dee5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c9875cf770aee477c2a4bc9… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:22 2009 -0800 msi: Correctly order transposed column values in the INSERT query. --- dlls/msi/database.c | 2 +- dlls/msi/insert.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 2 +- dlls/msi/select.c | 4 +- dlls/msi/storages.c | 13 ++++-- dlls/msi/streams.c | 13 ++++-- dlls/msi/table.c | 49 +++++++++++++++---- dlls/msi/tests/db.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 294 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c9875cf770aee477c2a…

1 0

James Hawkins : msi: The _Streams and _Storages table are special and always exist.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 37c5e0401013939c8e4c6eef1f9cf5a0b2a00e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c5e0401013939c8e4c6eef1… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:46 2009 -0800 msi: The _Streams and _Storages table are special and always exist. --- dlls/msi/table.c | 8 +++++--- dlls/msi/tests/db.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 19a9915..ab86bcd 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1060,9 +1060,11 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) UINT r, table_id = 0, i, count; MSITABLE *table = NULL; - if( !lstrcmpW( name, szTables ) ) - return TRUE; - if( !lstrcmpW( name, szColumns ) ) + static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; + static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; + + if( !lstrcmpW( name, szTables ) || !lstrcmpW( name, szColumns ) || + !lstrcmpW( name, szStreams ) || !lstrcmpW( name, szStorages ) ) return TRUE; r = msi_string2idW( db->strings, name, &table_id ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 641202b..ab10da9 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3965,12 +3965,12 @@ static void test_special_tables(void) query = "CREATE TABLE `_Storages` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, 0, query); - todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); query = "CREATE TABLE `_Streams` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, 0, query); - todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); query = "CREATE TABLE `_Tables` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)";

1 0

Jacek Caban : urlmon: Move HttpProtocol:: Start implementation to generic Protocol object.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: a4ba18a50dd132e39da3214a753ce653466bb3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ba18a50dd132e39da3214a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:21:07 2009 +0100 urlmon: Move HttpProtocol::Start implementation to generic Protocol object. --- dlls/urlmon/http.c | 507 ++++++++++++++------------------------------- dlls/urlmon/protocol.c | 161 ++++++++++++++ dlls/urlmon/urlmon_main.h | 3 + 3 files changed, 316 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ba18a50dd132e39da32…

1 0

Jacek Caban : urlmon: Move HttpProtocol:: Read implementation to generic Protocol object.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 4c129514b5aa9acc4c71e391235a2bb6ec14d462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c129514b5aa9acc4c71e3912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:20:26 2009 +0100 urlmon: Move HttpProtocol::Read implementation to generic Protocol object. --- dlls/urlmon/http.c | 80 +------------------------- dlls/urlmon/protocol.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 145 insertions(+), 79 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 5d102a6..c7d463b 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -144,14 +144,6 @@ static void HTTPPROTOCOL_ReportData(HttpProtocol *This) } } -static void HTTPPROTOCOL_AllDataRead(HttpProtocol *This) -{ - if (!(This->base.flags & FLAG_ALL_DATA_READ)) - This->base.flags |= FLAG_ALL_DATA_READ; - HTTPPROTOCOL_ReportData(This); - HTTPPROTOCOL_ReportResult(This, S_OK); -} - static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( HINTERNET hInternet, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInformation, DWORD dwStatusInformationLength) @@ -735,80 +727,10 @@ static HRESULT WINAPI HttpProtocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { HttpProtocol *This = PROTOCOL_THIS(iface); - ULONG read = 0, len = 0; - HRESULT hres = S_FALSE; TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - if (!(This->base.flags & FLAG_REQUEST_COMPLETE)) - { - hres = E_PENDING; - } - else while (!(This->base.flags & FLAG_ALL_DATA_READ) && - read < cb) - { - if (This->base.available_bytes == 0) - { - /* 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 */ - This->base.flags &= ~FLAG_REQUEST_COMPLETE; - if (!InternetQueryDataAvailable(This->base.request, &This->base.available_bytes, 0, 0)) - { - if (GetLastError() == ERROR_IO_PENDING) - { - hres = E_PENDING; - } - else - { - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - hres = INET_E_DATA_NOT_AVAILABLE; - HTTPPROTOCOL_ReportResult(This, hres); - } - goto done; - } - else if (This->base.available_bytes == 0) - { - HTTPPROTOCOL_AllDataRead(This); - } - } - else - { - if (!InternetReadFile(This->base.request, ((BYTE *)pv)+read, - This->base.available_bytes > cb-read ? - cb-read : This->base.available_bytes, &len)) - { - WARN("InternetReadFile failed: %d\n", GetLastError()); - hres = INET_E_DOWNLOAD_FAILURE; - HTTPPROTOCOL_ReportResult(This, hres); - goto done; - } - else if (len == 0) - { - HTTPPROTOCOL_AllDataRead(This); - } - else - { - read += len; - This->base.current_position += len; - This->base.available_bytes -= len; - } - } - } - - /* Per MSDN this should be if (read == cb), but native returns S_OK - * if any bytes were read, so we will too */ - if (read) - hres = S_OK; - -done: - if (pcbRead) - *pcbRead = read; - - if (hres != E_PENDING) - This->base.flags |= FLAG_REQUEST_COMPLETE; - - return hres; + return protocol_read(&This->base, pv, cb, pcbRead); } static HRESULT WINAPI HttpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index a2e801b..46e6264 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -23,6 +23,149 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +/* Flags are needed for, among other things, return HRESULTs from the Read function + * to conform to native. For example, Read returns: + * + * 1. E_PENDING if called before the request has completed, + * (flags = 0) + * 2. S_FALSE after all data has been read and S_OK has been reported, + * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) + * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time + * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, + * (flags = FLAG_REQUEST_COMPLETE) + * but upon subsequent calls to Read no reporting will take place, yet + * InternetQueryDataAvailable will still be called, and, on failure, + * INET_E_DATA_NOT_AVAILABLE will still be returned. + * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) + * + * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper + * ReportData reporting. For example, if OnResponse returns S_OK, Continue will + * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will + * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, + * if OnResponse does not return S_OK, Continue will not report data, and Read + * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all + * data has been read. + */ +#define FLAG_REQUEST_COMPLETE 0x0001 +#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 +#define FLAG_FIRST_DATA_REPORTED 0x0004 +#define FLAG_ALL_DATA_READ 0x0008 +#define FLAG_LAST_DATA_REPORTED 0x0010 +#define FLAG_RESULT_REPORTED 0x0020 + +static inline HRESULT report_result(Protocol *protocol, HRESULT hres) +{ + if (!(protocol->flags & FLAG_RESULT_REPORTED) && protocol->protocol_sink) { + protocol->flags |= FLAG_RESULT_REPORTED; + IInternetProtocolSink_ReportResult(protocol->protocol_sink, hres, 0, NULL); + } + + return hres; +} + +static void report_data(Protocol *protocol) +{ + DWORD bscf; + + if((protocol->flags & FLAG_LAST_DATA_REPORTED) || !protocol->protocol_sink) + return; + + if(protocol->flags & FLAG_FIRST_DATA_REPORTED) { + bscf = BSCF_INTERMEDIATEDATANOTIFICATION; + }else { + protocol->flags |= FLAG_FIRST_DATA_REPORTED; + bscf = BSCF_FIRSTDATANOTIFICATION; + } + + if(protocol->flags & FLAG_ALL_DATA_READ && !(protocol->flags & FLAG_LAST_DATA_REPORTED)) { + protocol->flags |= FLAG_LAST_DATA_REPORTED; + bscf |= BSCF_LASTDATANOTIFICATION; + } + + IInternetProtocolSink_ReportData(protocol->protocol_sink, bscf, + protocol->current_position+protocol->available_bytes, + protocol->content_length); +} + +static void all_data_read(Protocol *protocol) +{ + protocol->flags |= FLAG_ALL_DATA_READ; + + report_data(protocol); + report_result(protocol, S_OK); +} + +HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret) +{ + ULONG read = 0; + BOOL res; + HRESULT hres = S_FALSE; + + if(!(protocol->flags & FLAG_REQUEST_COMPLETE)) { + *read_ret = 0; + return E_PENDING; + } + + if(protocol->flags & FLAG_ALL_DATA_READ) { + *read_ret = 0; + return S_FALSE; + } + + while(read < size) { + if(protocol->available_bytes) { + ULONG len; + + res = InternetReadFile(protocol->request, ((BYTE *)buf)+read, + protocol->available_bytes > size-read ? size-read : protocol->available_bytes, &len); + if(!res) { + WARN("InternetReadFile failed: %d\n", GetLastError()); + hres = INET_E_DOWNLOAD_FAILURE; + report_result(protocol, hres); + break; + } + + if(!len) { + all_data_read(protocol); + break; + } + + read += len; + protocol->current_position += len; + protocol->available_bytes -= len; + }else { + /* 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 (GetLastError() == ERROR_IO_PENDING) { + hres = E_PENDING; + }else { + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + hres = INET_E_DATA_NOT_AVAILABLE; + report_result(protocol, hres); + } + break; + } + + if(!protocol->available_bytes) { + all_data_read(protocol); + break; + } + } + } + + *read_ret = read; + + if (hres != E_PENDING) + protocol->flags |= FLAG_REQUEST_COMPLETE; + if(FAILED(hres)) + return hres; + + return read ? S_OK : S_FALSE; +} + HRESULT protocol_lock_request(Protocol *protocol) { if (!InternetLockRequestFile(protocol->request, &protocol->lock)) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 6519630..a75c1ed 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -106,6 +106,7 @@ struct ProtocolVtbl { void (*close_connection)(Protocol*); }; +HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*); HRESULT protocol_lock_request(Protocol*); HRESULT protocol_unlock_request(Protocol*); void protocol_close_connection(Protocol*);

1 0

Jacek Caban : urlmon: Move close_connection implementation to common Protocol object.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: a30ffca108d905e4e77d1cc6651722d8ce671085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30ffca108d905e4e77d1cc66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:20:09 2009 +0100 urlmon: Move close_connection implementation to common Protocol object. --- dlls/urlmon/http.c | 61 ++++++++++++++++++++++----------------------- dlls/urlmon/protocol.c | 14 ++++++++++ dlls/urlmon/urlmon_main.h | 9 ++++++ 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index ab5aa38..5d102a6 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -80,9 +80,32 @@ typedef struct { static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g', ':',' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0}; -/* - * Helpers - */ +#define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(HttpProtocol, base, iface) + +static void HttpProtocol_close_connection(Protocol *prot) +{ + HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); + + if(This->connection) + InternetCloseHandle(This->connection); + + if(This->http_negotiate) { + IHttpNegotiate_Release(This->http_negotiate); + This->http_negotiate = 0; + } + + if(This->full_header) { + if(This->full_header != wszHeaders) + heap_free(This->full_header); + This->full_header = 0; + } +} + +#undef ASYNCPROTOCOL_THIS + +static const ProtocolVtbl AsyncProtocolVtbl = { + HttpProtocol_close_connection +}; static void HTTPPROTOCOL_ReportResult(HttpProtocol *This, HRESULT hres) { @@ -129,31 +152,6 @@ static void HTTPPROTOCOL_AllDataRead(HttpProtocol *This) HTTPPROTOCOL_ReportResult(This, S_OK); } -static void HTTPPROTOCOL_Close(HttpProtocol *This) -{ - if (This->http_negotiate) - { - IHttpNegotiate_Release(This->http_negotiate); - This->http_negotiate = 0; - } - if (This->base.request) - InternetCloseHandle(This->base.request); - if (This->connection) - InternetCloseHandle(This->connection); - if (This->base.internet) - { - InternetCloseHandle(This->base.internet); - This->base.internet = 0; - } - if (This->full_header) - { - if (This->full_header != wszHeaders) - heap_free(This->full_header); - This->full_header = 0; - } - This->base.flags = 0; -} - static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( HINTERNET hInternet, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInformation, DWORD dwStatusInformationLength) @@ -269,7 +267,7 @@ static ULONG WINAPI HttpProtocol_Release(IInternetProtocol *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - HTTPPROTOCOL_Close(This); + protocol_close_connection(&This->base); heap_free(This); URLMON_UnlockModule(); @@ -523,7 +521,7 @@ done: if (hres != S_OK) { IInternetProtocolSink_ReportResult(This->base.protocol_sink, hres, 0, NULL); - HTTPPROTOCOL_Close(This); + protocol_close_connection(&This->base); } CoTaskMemFree(post_cookie); @@ -714,8 +712,8 @@ static HRESULT WINAPI HttpProtocol_Terminate(IInternetProtocol *iface, DWORD dwO HttpProtocol *This = PROTOCOL_THIS(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); - HTTPPROTOCOL_Close(This); + protocol_close_connection(&This->base); return S_OK; } @@ -915,6 +913,7 @@ static HRESULT create_http_protocol(BOOL https, void **ppobj) if(!ret) return E_OUTOFMEMORY; + ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index b25c9de..a2e801b 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -42,3 +42,17 @@ HRESULT protocol_unlock_request(Protocol *protocol) return S_OK; } + +void protocol_close_connection(Protocol *protocol) +{ + protocol->vtbl->close_connection(protocol); + + if(protocol->request) + InternetCloseHandle(protocol->request); + if(protocol->internet) { + InternetCloseHandle(protocol->internet); + protocol->internet = 0; + } + + protocol->flags = 0; +} diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 906cd31..6519630 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -79,7 +79,11 @@ HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, v HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); +typedef struct ProtocolVtbl ProtocolVtbl; + typedef struct { + const ProtocolVtbl *vtbl; + IInternetProtocol *protocol; IInternetProtocolSink *protocol_sink; @@ -98,8 +102,13 @@ typedef struct { LONG priority; } Protocol; +struct ProtocolVtbl { + void (*close_connection)(Protocol*); +}; + HRESULT protocol_lock_request(Protocol*); HRESULT protocol_unlock_request(Protocol*); +void protocol_close_connection(Protocol*); static inline void *heap_alloc(size_t len) {

1 0