December 2009 - Wine-Commits

James Hawkins : msi: Keep track of the current view in the sql parser.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 1692e1fe673fd40c649d14e7aa18de250d639b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1692e1fe673fd40c649d14e7a… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 15 18:18:31 2009 -0800 msi: Keep track of the current view in the sql parser. This allows us to free said view in the case of a syntax error. This also allows us to get rid of a few places where we tried to clean up the view ourselves in the parsing code. --- dlls/msi/sql.y | 83 +++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 31 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index e2484df..548a878 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -47,7 +47,10 @@ typedef struct tag_SQL_input LPCWSTR command; DWORD n, len; UINT r; - MSIVIEW **view; /* view structure for the resulting query */ + MSIVIEW **view; /* View structure for the resulting query. This value + * tracks the view currently being created so we can free + * this view on syntax error. + */ struct list *mem; } SQL_input; @@ -68,6 +71,10 @@ static struct expr * EXPR_ival( void *info, int val ); static struct expr * EXPR_sval( void *info, const struct sql_str *str ); static struct expr * EXPR_wildcard( void *info ); +#define PARSER_BUBBLE_UP_VIEW( sql, result, current_view ) \ + *sql->view = current_view; \ + result = current_view + %} %pure-parser @@ -149,7 +156,8 @@ oneinsert: INSERT_CreateView( sql->db, &insert, $3, $5, $9, FALSE ); if( !insert ) YYABORT; - $$ = insert; + + PARSER_BUBBLE_UP_VIEW( sql, $$, insert ); } | TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMPORARY { @@ -159,7 +167,8 @@ oneinsert: INSERT_CreateView( sql->db, &insert, $3, $5, $9, TRUE ); if( !insert ) YYABORT; - $$ = insert; + + PARSER_BUBBLE_UP_VIEW( sql, $$, insert ); } ; @@ -178,7 +187,8 @@ onecreate: sql->r = r; YYABORT; } - $$ = create; + + PARSER_BUBBLE_UP_VIEW( sql, $$, create ); } | TK_CREATE TK_TABLE table TK_LP table_def TK_RP TK_HOLD { @@ -190,7 +200,8 @@ onecreate: CREATE_CreateView( sql->db, &create, $3, $5, TRUE ); if( !create ) YYABORT; - $$ = create; + + PARSER_BUBBLE_UP_VIEW( sql, $$, create ); } ; @@ -203,7 +214,8 @@ oneupdate: UPDATE_CreateView( sql->db, &update, $2, $4, $6 ); if( !update ) YYABORT; - $$ = update; + + PARSER_BUBBLE_UP_VIEW( sql, $$, update ); } | TK_UPDATE table TK_SET update_assign_list { @@ -213,7 +225,8 @@ oneupdate: UPDATE_CreateView( sql->db, &update, $2, $4, NULL ); if( !update ) YYABORT; - $$ = update; + + PARSER_BUBBLE_UP_VIEW( sql, $$, update ); } ; @@ -226,7 +239,8 @@ onedelete: DELETE_CreateView( sql->db, &delete, $2 ); if( !delete ) YYABORT; - $$ = delete; + + PARSER_BUBBLE_UP_VIEW( sql, $$, delete ); } ; @@ -239,7 +253,8 @@ onealter: ALTER_CreateView( sql->db, &alter, $3, NULL, $4 ); if( !alter ) YYABORT; - $$ = alter; + + PARSER_BUBBLE_UP_VIEW( sql, $$, alter ); } | TK_ALTER TK_TABLE table TK_ADD column_and_type { @@ -249,7 +264,8 @@ onealter: ALTER_CreateView( sql->db, &alter, $3, $5, 0 ); if (!alter) YYABORT; - $$ = alter; + + PARSER_BUBBLE_UP_VIEW( sql, $$, alter ); } | TK_ALTER TK_TABLE table TK_ADD column_and_type TK_HOLD { @@ -259,7 +275,8 @@ onealter: ALTER_CreateView( sql->db, &alter, $3, $5, 1 ); if (!alter) YYABORT; - $$ = alter; + + PARSER_BUBBLE_UP_VIEW( sql, $$, alter ); } ; @@ -278,12 +295,14 @@ onedrop: TK_DROP TK_TABLE table { SQL_input* sql = (SQL_input*) info; + MSIVIEW* drop = NULL; UINT r; - $$ = NULL; - r = DROP_CreateView( sql->db, &$$, $3 ); + r = DROP_CreateView( sql->db, &drop, $3 ); if( r != ERROR_SUCCESS || !$$ ) YYABORT; + + PARSER_BUBBLE_UP_VIEW( sql, $$, drop ); } ; @@ -414,15 +433,14 @@ unorderedsel: | TK_SELECT TK_DISTINCT selectfrom { SQL_input* sql = (SQL_input*) info; + MSIVIEW* distinct = NULL; UINT r; - $$ = NULL; - r = DISTINCT_CreateView( sql->db, &$$, $3 ); + r = DISTINCT_CreateView( sql->db, &distinct, $3 ); if (r != ERROR_SUCCESS) - { - $3->ops->delete($3); YYABORT; - } + + PARSER_BUBBLE_UP_VIEW( sql, $$, distinct ); } ; @@ -430,17 +448,16 @@ selectfrom: selcollist from { SQL_input* sql = (SQL_input*) info; + MSIVIEW* select = NULL; UINT r; - $$ = NULL; if( $1 ) { - r = SELECT_CreateView( sql->db, &$$, $2, $1 ); + r = SELECT_CreateView( sql->db, &select, $2, $1 ); if (r != ERROR_SUCCESS) - { - $2->ops->delete($2); YYABORT; - } + + PARSER_BUBBLE_UP_VIEW( sql, $$, select ); } else $$ = $2; @@ -464,15 +481,14 @@ from: | fromtable TK_WHERE expr { SQL_input* sql = (SQL_input*) info; + MSIVIEW* where = NULL; UINT r; - $$ = NULL; - r = WHERE_CreateView( sql->db, &$$, $1, $3 ); + r = WHERE_CreateView( sql->db, &where, $1, $3 ); if( r != ERROR_SUCCESS ) - { - $1->ops->delete( $1 ); YYABORT; - } + + PARSER_BUBBLE_UP_VIEW( sql, $$, where ); } ; @@ -480,21 +496,26 @@ fromtable: TK_FROM table { SQL_input* sql = (SQL_input*) info; + MSIVIEW* table = NULL; UINT r; - $$ = NULL; - r = TABLE_CreateView( sql->db, $2, &$$ ); + r = TABLE_CreateView( sql->db, $2, &table ); if( r != ERROR_SUCCESS || !$$ ) YYABORT; + + PARSER_BUBBLE_UP_VIEW( sql, $$, table ); } | TK_FROM tablelist { SQL_input* sql = (SQL_input*) info; + MSIVIEW* join = NULL; UINT r; - r = JOIN_CreateView( sql->db, &$$, $2 ); + r = JOIN_CreateView( sql->db, &join, $2 ); if( r != ERROR_SUCCESS ) YYABORT; + + PARSER_BUBBLE_UP_VIEW( sql, $$, join ); } ;

1 0

Jacek Caban : mshtml: Added support for redirected binding.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: f7be3645f56d43a4e6a2d9dbb9a72a7b3e6fdcc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7be3645f56d43a4e6a2d9dbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:16:59 2009 +0100 mshtml: Added support for redirected binding. --- dlls/mshtml/navigate.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a68987d..e17d48d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1067,6 +1067,12 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW heap_free(This->nschannel->content_type); This->nschannel->content_type = heap_strdupWtoA(status_text); + break; + case BINDSTATUS_REDIRECTING: + TRACE("redirect to %s\n", debugstr_w(status_text)); + + /* FIXME: We should find a better way to handle this */ + nsIWineURI_SetWineURL(This->nschannel->uri, status_text); } return S_OK;

1 0

Jacek Caban : urlmon: Report redirected URL to object created by BindToObject.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: c069489a67257212bd0503d35b8866c7dfd4ddf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c069489a67257212bd0503d35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:16:35 2009 +0100 urlmon: Report redirected URL to object created by BindToObject. --- dlls/urlmon/binding.c | 6 +++++ dlls/urlmon/tests/url.c | 58 ++++++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index fc21d11..dcf0207 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -98,6 +98,7 @@ struct Binding { LPWSTR mime; UINT clipboard_format; LPWSTR url; + LPWSTR redirect_url; IID iid; BOOL report_mime; DWORD state; @@ -829,6 +830,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface) This->section.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->section); heap_free(This->mime); + heap_free(This->redirect_url); heap_free(This->url); heap_free(This); @@ -968,6 +970,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink on_progress(This, 0, 0, BINDSTATUS_CONNECTING, szStatusText); break; case BINDSTATUS_REDIRECTING: + heap_free(This->redirect_url); + This->redirect_url = heap_strdupW(szStatusText); on_progress(This, 0, 0, BINDSTATUS_REDIRECTING, szStatusText); break; case BINDSTATUS_BEGINDOWNLOADDATA: @@ -1477,6 +1481,8 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I if(binding_ctx) { set_binding_sink(binding->protocol, PROTSINK(binding)); + if(binding_ctx->redirect_url) + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_REDIRECTING, binding_ctx->redirect_url); report_data(binding, 0, 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ba0c134..11bd2ac 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -122,6 +122,7 @@ DEFINE_EXPECT(Obj_OnProgress_BEGINSYNCOPERATION); DEFINE_EXPECT(Obj_OnProgress_ENDSYNCOPERATION); DEFINE_EXPECT(Obj_OnProgress_FINDINGRESOURCE); DEFINE_EXPECT(Obj_OnProgress_CONNECTING); +DEFINE_EXPECT(Obj_OnProgress_REDIRECTING); DEFINE_EXPECT(Obj_OnProgress_CACHEFILENAMEAVAILABLE); DEFINE_EXPECT(Start); DEFINE_EXPECT(Read); @@ -390,11 +391,17 @@ static DWORD WINAPI thread_proc(PVOID arg) CHECK_CALLED(OnProgress_SENDINGREQUEST); if(test_redirect) { - SET_EXPECT(OnProgress_REDIRECTING); + if(bind_to_object) + SET_EXPECT(Obj_OnProgress_REDIRECTING); + else + SET_EXPECT(OnProgress_REDIRECTING); hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, WINE_ABOUT_URL); ok(hres == S_OK, "ReportProgress(BINDSTATUS_REFIRECTING) failed: %08x\n", hres); WaitForSingleObject(complete_event, INFINITE); - CHECK_CALLED(OnProgress_REDIRECTING); + if(bind_to_object) + CHECK_CALLED(Obj_OnProgress_REDIRECTING); + else + CHECK_CALLED(OnProgress_REDIRECTING); } test_switch_fail(); @@ -1286,10 +1293,14 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u SetEvent(complete_event); break; case BINDSTATUS_REDIRECTING: - CHECK_EXPECT(OnProgress_REDIRECTING); + if(iface == &objbsc) + CHECK_EXPECT(Obj_OnProgress_REDIRECTING); + else + CHECK_EXPECT(OnProgress_REDIRECTING); ok(!lstrcmpW(szStatusText, WINE_ABOUT_URL), "unexpected status text %s\n", wine_dbgstr_w(szStatusText)); - SetEvent(complete_event); + if(!bind_to_object || iface == &objbsc) + SetEvent(complete_event); break; case BINDSTATUS_SENDINGREQUEST: if(iface == &objbsc) @@ -1716,6 +1727,8 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva SET_EXPECT(QueryInterface_IBindStatusCallbackEx); SET_EXPECT(GetBindInfo); SET_EXPECT(OnStartBinding); + if(test_redirect) + SET_EXPECT(OnProgress_REDIRECTING); SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == FILE_TEST) SET_EXPECT(OnProgress_CACHEFILENAMEAVAILABLE); @@ -1732,6 +1745,8 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); /* IE 8 */ CHECK_CALLED(GetBindInfo); CHECK_CALLED(OnStartBinding); + if(test_redirect) + CHECK_CALLED(OnProgress_REDIRECTING); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == FILE_TEST) CHECK_CALLED(OnProgress_CACHEFILENAMEAVAILABLE); @@ -2419,7 +2434,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) http_is_first = FALSE; } -static void test_BindToObject(int protocol, BOOL emul) +static void test_BindToObject(int protocol, DWORD flags) { IMoniker *mon; HRESULT hres; @@ -2430,9 +2445,9 @@ static void test_BindToObject(int protocol, BOOL emul) IUnknown *unk = (IUnknown*)0x00ff00ff; IBinding *bind; - init_bind_test(protocol, BINDTEST_TOOBJECT | (emul ? BINDTEST_EMULATE : 0), TYMED_ISTREAM); + init_bind_test(protocol, BINDTEST_TOOBJECT|flags, TYMED_ISTREAM); - if(emul) + if(emulate_protocol) CoRegisterClassObject(&CLSID_HTMLDocument, (IUnknown *)&mime_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); @@ -2523,14 +2538,14 @@ static void test_BindToObject(int protocol, BOOL emul) }else { ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); - if(emul) + if(emulate_protocol) ok(unk == (IUnknown*)&PersistMoniker, "unk != PersistMoniker\n"); } if(unk) IUnknown_Release(unk); while((bindf & BINDF_ASYNCHRONOUS) && - !((!emul || stopped_binding) && stopped_obj_binding) && GetMessage(&msg,NULL,0,0)) { + !((!emulate_protocol || stopped_binding) && stopped_obj_binding) && GetMessage(&msg,NULL,0,0)) { TranslateMessage(&msg); DispatchMessage(&msg); } @@ -2594,7 +2609,7 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_CALLED(Obj_OnStopBinding); } - if(test_protocol != HTTP_TEST || emul || !(bindf & BINDF_ASYNCHRONOUS)) { + if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) { ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); }else { @@ -2602,7 +2617,7 @@ static void test_BindToObject(int protocol, BOOL emul) IBindCtx_Release(bctx); } - if(emul) + if(emulate_protocol) CoRevokeClassObject(regid); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) @@ -2876,13 +2891,13 @@ START_TEST(url) test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); trace("synchronous http test (to object)...\n"); - test_BindToObject(HTTP_TEST, FALSE); + test_BindToObject(HTTP_TEST, 0); trace("synchronous file test...\n"); test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); trace("synchronous file test (to object)...\n"); - test_BindToObject(FILE_TEST, FALSE); + test_BindToObject(FILE_TEST, 0); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; @@ -2893,20 +2908,23 @@ START_TEST(url) test_BindToStorage(HTTP_TEST, 0, TYMED_FILE); trace("http test (to object)...\n"); - test_BindToObject(HTTP_TEST, FALSE); + test_BindToObject(HTTP_TEST, 0); trace("http test (short response)...\n"); http_is_first = TRUE; test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); - test_BindToObject(HTTP_TEST, FALSE); + test_BindToObject(HTTP_TEST, 0); trace("emulated http test...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("emulated http test (to object)...\n"); - test_BindToObject(HTTP_TEST, TRUE); + test_BindToObject(HTTP_TEST, BINDTEST_EMULATE); + + trace("emulated http test (to object, redirect)...\n"); + test_BindToObject(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT); trace("emulated http test (to file)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); @@ -2927,7 +2945,7 @@ START_TEST(url) test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("about test (to object)...\n"); - test_BindToObject(ABOUT_TEST, FALSE); + test_BindToObject(ABOUT_TEST, 0); trace("emulated about test...\n"); test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -2936,7 +2954,7 @@ START_TEST(url) test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated about test (to object)...\n"); - test_BindToObject(ABOUT_TEST, TRUE); + test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE); trace("file test...\n"); test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); @@ -2945,7 +2963,7 @@ START_TEST(url) test_BindToStorage(FILE_TEST, 0, TYMED_FILE); trace("file test (to object)...\n"); - test_BindToObject(FILE_TEST, FALSE); + test_BindToObject(FILE_TEST, 0); trace("emulated file test...\n"); test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -2954,7 +2972,7 @@ START_TEST(url) test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated file test (to object)...\n"); - test_BindToObject(FILE_TEST, TRUE); + test_BindToObject(FILE_TEST, BINDTEST_EMULATE); trace("emulated its test...\n"); test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM);

1 0

Jacek Caban : urlmon: Correctly handle accept ranges in HttpProtocol_open_request.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 613ebdc8b4509446b25dfa5d8b2f67ec934d51b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613ebdc8b4509446b25dfa5d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:15:45 2009 +0100 urlmon: Correctly handle accept ranges in HttpProtocol_open_request. --- dlls/urlmon/http.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 2e47b11..f511724 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -232,7 +232,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ static HRESULT HttpProtocol_start_downloading(Protocol *prot) { HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); - LPWSTR content_type = 0, content_length = 0; + LPWSTR content_type, content_length, ranges; DWORD len = sizeof(DWORD); DWORD status_code; BOOL res; @@ -263,8 +263,11 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot) WARN("HttpQueryInfo failed: %d\n", GetLastError()); } - if(This->https) + ranges = query_http_info(This, HTTP_QUERY_ACCEPT_RANGES); + if(ranges) { IInternetProtocolSink_ReportProgress(This->base.protocol_sink, BINDSTATUS_ACCEPTRANGES, NULL); + heap_free(ranges); + } content_type = query_http_info(This, HTTP_QUERY_CONTENT_TYPE); if(content_type) {

1 0

Jacek Caban : urlmon: Added HTTP redirecting test.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: ce53f34458345d2a3a731a9c8c558f9fb812120b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce53f34458345d2a3a731a9c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:16:17 2009 +0100 urlmon: Added HTTP redirecting test. --- dlls/urlmon/tests/protocol.c | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5f48cfe..afaafcb 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -131,7 +131,7 @@ static const WCHAR gzipW[] = {'g','z','i','p',0}; static HRESULT expect_hrResult; static LPCWSTR file_name, http_url, expect_wsz; static IInternetProtocol *async_protocol = NULL; -static BOOL first_data_notif, http_is_first, http_post_test; +static BOOL first_data_notif, http_is_first, http_post_test, test_redirect; static int state = 0, prot_state, read_report_data; static DWORD bindf, ex_priority , pi; static IInternetProtocol *binding_protocol, *filtered_protocol; @@ -442,19 +442,23 @@ static void call_continue(PROTOCOLDATA *protocol_data) CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); CLEAR_CALLED(ReportProgress_CONNECTING); CLEAR_CALLED(ReportProgress_PROXYDETECTING); - } else todo_wine { - CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); - /* IE7 does call this */ - CLEAR_CALLED(ReportProgress_CONNECTING); - } + }else if(test_redirect) { + CHECK_CALLED(ReportProgress_FINDINGRESOURCE); + }else todo_wine { + CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); + /* IE7 does call this */ + CLEAR_CALLED(ReportProgress_CONNECTING); + } } if(tested_protocol == FTP_TEST) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); + if(test_redirect) + CHECK_CALLED(ReportProgress_REDIRECTING); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { SET_EXPECT(OnResponse); - if(tested_protocol == HTTPS_TEST) + if(tested_protocol == HTTPS_TEST || test_redirect) SET_EXPECT(ReportProgress_ACCEPTRANGES); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) @@ -478,6 +482,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(OnResponse); if(tested_protocol == HTTPS_TEST) CHECK_CALLED(ReportProgress_ACCEPTRANGES); + else if(test_redirect) + CLEAR_CALLED(ReportProgress_ACCEPTRANGES); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -616,7 +622,10 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, break; case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); - ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + if(test_redirect) + ok(!strcmp_wa(szStatusText, "http://test.winehq.org/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + else + ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ENCODING: CHECK_EXPECT(ReportProgress_ENCODING); @@ -1952,6 +1961,7 @@ static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; #define TEST_POST 0x10 #define TEST_EMULATEPROT 0x20 #define TEST_SHORT_READ 0x40 +#define TEST_REDIRECT 0x80 static void init_test(int prot, DWORD flags) { @@ -1977,6 +1987,7 @@ static void init_test(int prot, DWORD flags) emulate_prot = (flags & TEST_EMULATEPROT) != 0; wait_for_switch = TRUE; short_read = (flags & TEST_SHORT_READ) != 0; + test_redirect = (flags & TEST_REDIRECT) != 0; } static void test_priority(IInternetProtocol *protocol) @@ -2429,6 +2440,8 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags) SET_EXPECT(ReportProgress_FINDINGRESOURCE); SET_EXPECT(ReportProgress_CONNECTING); SET_EXPECT(ReportProgress_SENDINGREQUEST); + if(test_redirect) + SET_EXPECT(ReportProgress_REDIRECTING); SET_EXPECT(ReportProgress_PROXYDETECTING); if(prot == HTTP_TEST) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -2516,6 +2529,9 @@ static void test_http_protocol(void) {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', 'p','o','s','t','t','e','s','t','.','p','h','p',0}; + static const WCHAR redirect_url[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','r','e','d','i','r','e','c','t',0}; trace("Testing http protocol (not from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; @@ -2538,6 +2554,10 @@ static void test_http_protocol(void) trace("Testing http protocol (direct read)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; test_http_protocol_url(winehq_url, HTTP_TEST, TEST_DIRECT_READ); + + trace("Testing http protocol (redirected)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; + test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT); } static void test_https_protocol(void)

1 0

Jacek Caban : urlmon: Correctly handle INTERNET_STATUS_REDIRECT.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 840c52acb9c350e62d90a1d3d4cf269f541d3362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=840c52acb9c350e62d90a1d3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:16:00 2009 +0100 urlmon: Correctly handle INTERNET_STATUS_REDIRECT. --- dlls/urlmon/http.c | 5 ----- dlls/urlmon/protocol.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index f511724..15344e2 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * TODO: - * - Handle redirects as native. - */ - #include "urlmon_main.h" #include "wininet.h" diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 9b25cbf..3f3cbe5 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -151,6 +151,11 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex report_progress(protocol, BINDSTATUS_SENDINGREQUEST, (LPWSTR)status_info); break; + case INTERNET_STATUS_REDIRECT: + TRACE("%p INTERNET_STATUS_REDIRECT\n", protocol); + report_progress(protocol, BINDSTATUS_REDIRECTING, (LPWSTR)status_info); + break; + case INTERNET_STATUS_REQUEST_COMPLETE: request_complete(protocol, status_info); break;

1 0

Jacek Caban : urlmon: Added support for BINDSTATUS_REDIRECTING.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: efd869e00ac7ad86a3e8ce32181c56c07a2404c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd869e00ac7ad86a3e8ce321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:15:28 2009 +0100 urlmon: Added support for BINDSTATUS_REDIRECTING. --- dlls/urlmon/binding.c | 3 +++ dlls/urlmon/bindprot.c | 1 + dlls/urlmon/tests/url.c | 25 +++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 210e8e2..fc21d11 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -967,6 +967,9 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_CONNECTING: on_progress(This, 0, 0, BINDSTATUS_CONNECTING, szStatusText); break; + case BINDSTATUS_REDIRECTING: + on_progress(This, 0, 0, BINDSTATUS_REDIRECTING, szStatusText); + break; case BINDSTATUS_BEGINDOWNLOADDATA: fill_stgmed_buffer(This->stgmed_buf); break; diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 20472ba..07d6fc2 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -960,6 +960,7 @@ static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR statu switch(status_code) { case BINDSTATUS_FINDINGRESOURCE: case BINDSTATUS_CONNECTING: + case BINDSTATUS_REDIRECTING: case BINDSTATUS_BEGINDOWNLOADDATA: case BINDSTATUS_SENDINGREQUEST: case BINDSTATUS_CACHEFILENAMEAVAILABLE: diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5a2a8fb..ba0c134 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(GetBindInfoEx); DEFINE_EXPECT(OnStartBinding); DEFINE_EXPECT(OnProgress_FINDINGRESOURCE); DEFINE_EXPECT(OnProgress_CONNECTING); +DEFINE_EXPECT(OnProgress_REDIRECTING); DEFINE_EXPECT(OnProgress_SENDINGREQUEST); DEFINE_EXPECT(OnProgress_MIMETYPEAVAILABLE); DEFINE_EXPECT(OnProgress_BEGINDOWNLOADDATA); @@ -181,6 +182,7 @@ static IBinding *current_binding; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; static BOOL have_IHttpNegotiate2, use_bscex; +static BOOL test_redirect; static LPCWSTR urls[] = { WINE_ABOUT_URL, @@ -380,13 +382,21 @@ static DWORD WINAPI thread_proc(PVOID arg) SET_EXPECT(OnProgress_SENDINGREQUEST); hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_SENDINGREQUEST, NULL); - ok(hres == S_OK, "ReportProxgress failed: %08x\n", hres); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); WaitForSingleObject(complete_event, INFINITE); if(bind_to_object) CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); else CHECK_CALLED(OnProgress_SENDINGREQUEST); + if(test_redirect) { + SET_EXPECT(OnProgress_REDIRECTING); + hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, WINE_ABOUT_URL); + ok(hres == S_OK, "ReportProgress(BINDSTATUS_REFIRECTING) failed: %08x\n", hres); + WaitForSingleObject(complete_event, INFINITE); + CHECK_CALLED(OnProgress_REDIRECTING); + } + test_switch_fail(); SET_EXPECT(Continue); @@ -773,7 +783,7 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, IHttpNegotiate_Release(http_negotiate); ok(hres == S_OK, "OnResponse failed: %08x\n", hres); - if(test_protocol == HTTPS_TEST) { + if(test_protocol == HTTPS_TEST || test_redirect) { hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_ACCEPTRANGES, NULL); ok(hres == S_OK, "ReportProgress(BINDSTATUS_ACCEPTRANGES) failed: %08x\n", hres); } @@ -1275,6 +1285,12 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) SetEvent(complete_event); break; + case BINDSTATUS_REDIRECTING: + CHECK_EXPECT(OnProgress_REDIRECTING); + ok(!lstrcmpW(szStatusText, WINE_ABOUT_URL), "unexpected status text %s\n", + wine_dbgstr_w(szStatusText)); + SetEvent(complete_event); + break; case BINDSTATUS_SENDINGREQUEST: if(iface == &objbsc) CHECK_EXPECT(Obj_OnProgress_SENDINGREQUEST); @@ -2188,6 +2204,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_TOOBJECT 0x0002 #define BINDTEST_FILEDWLAPI 0x0004 #define BINDTEST_HTTPRESPONSE 0x0008 +#define BINDTEST_REDIRECT 0x0010 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2206,6 +2223,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) urls[HTTP_TEST] = SHORT_RESPONSE_URL; else urls[HTTP_TEST] = WINE_ABOUT_URL; + test_redirect = (flags & BINDTEST_REDIRECT) != 0; } static void test_BindToStorage(int protocol, DWORD flags, DWORD t) @@ -2893,6 +2911,9 @@ START_TEST(url) trace("emulated http test (to file)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); + trace("emulated http test (redirect)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, TYMED_ISTREAM); + trace("asynchronous https test...\n"); test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM);

1 0

Jacek Caban : urlmon: Pass flags to test_BindToStorage.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 6de5669d29c5fdf654cd7b5a953b2050f7fcafbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de5669d29c5fdf654cd7b5a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:15:08 2009 +0100 urlmon: Pass flags to test_BindToStorage. --- dlls/urlmon/tests/url.c | 62 +++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ecc4db7..5a2a8fb 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2184,9 +2184,10 @@ static BOOL test_RegisterBindStatusCallback(void) return ret; } -#define BINDTEST_EMULATE 1 -#define BINDTEST_TOOBJECT 2 -#define BINDTEST_FILEDWLAPI 4 +#define BINDTEST_EMULATE 0x0001 +#define BINDTEST_TOOBJECT 0x0002 +#define BINDTEST_FILEDWLAPI 0x0004 +#define BINDTEST_HTTPRESPONSE 0x0008 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2201,9 +2202,13 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) bind_to_object = (flags & BINDTEST_TOOBJECT) != 0; tymed = t; filedwl_api = (flags & BINDTEST_FILEDWLAPI) != 0; + if(flags & BINDTEST_HTTPRESPONSE) + urls[HTTP_TEST] = SHORT_RESPONSE_URL; + else + urls[HTTP_TEST] = WINE_ABOUT_URL; } -static void test_BindToStorage(int protocol, BOOL emul, DWORD t) +static void test_BindToStorage(int protocol, DWORD flags, DWORD t) { IMoniker *mon; HRESULT hres; @@ -2214,7 +2219,7 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) IUnknown *unk = (IUnknown*)0x00ff00ff; IBinding *bind; - init_bind_test(protocol, emul ? BINDTEST_EMULATE : 0, t); + init_bind_test(protocol, flags, t); SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtx(0, (IBindStatusCallback*)&bsc, NULL, &bctx); @@ -2571,7 +2576,7 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_CALLED(Obj_OnStopBinding); } - if(test_protocol != HTTP_TEST || emul || urls[test_protocol] == SHORT_RESPONSE_URL || !(bindf & BINDF_ASYNCHRONOUS)) { + if(test_protocol != HTTP_TEST || emul || !(bindf & BINDF_ASYNCHRONOUS)) { ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); }else { @@ -2842,7 +2847,7 @@ START_TEST(url) test_BindToStorage_fail(); trace("synchronous http test (COM not initialised)...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); CoInitialize(NULL); @@ -2850,13 +2855,13 @@ START_TEST(url) test_StdURLMoniker(); trace("synchronous http test...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); trace("synchronous http test (to object)...\n"); test_BindToObject(HTTP_TEST, FALSE); trace("synchronous file test...\n"); - test_BindToStorage(FILE_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); trace("synchronous file test (to object)...\n"); test_BindToObject(FILE_TEST, FALSE); @@ -2864,81 +2869,80 @@ START_TEST(url) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; trace("http test...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); trace("http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_FILE); + test_BindToStorage(HTTP_TEST, 0, TYMED_FILE); trace("http test (to object)...\n"); test_BindToObject(HTTP_TEST, FALSE); trace("http test (short response)...\n"); http_is_first = TRUE; - urls[HTTP_TEST] = SHORT_RESPONSE_URL; - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, FALSE); trace("emulated http test...\n"); - test_BindToStorage(HTTP_TEST, TRUE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("emulated http test (to object)...\n"); test_BindToObject(HTTP_TEST, TRUE); trace("emulated http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, TRUE, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("asynchronous https test...\n"); - test_BindToStorage(HTTPS_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); trace("emulated https test...\n"); - test_BindToStorage(HTTPS_TEST, TRUE, TYMED_ISTREAM); + test_BindToStorage(HTTPS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("about test...\n"); - test_BindToStorage(ABOUT_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(ABOUT_TEST, 0, TYMED_ISTREAM); trace("about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, FALSE, TYMED_FILE); + test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("about test (to object)...\n"); test_BindToObject(ABOUT_TEST, FALSE); trace("emulated about test...\n"); - test_BindToStorage(ABOUT_TEST, TRUE, TYMED_ISTREAM); + test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("emulated about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, TRUE, TYMED_FILE); + test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated about test (to object)...\n"); test_BindToObject(ABOUT_TEST, TRUE); trace("file test...\n"); - test_BindToStorage(FILE_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); trace("file test (to file)...\n"); - test_BindToStorage(FILE_TEST, FALSE, TYMED_FILE); + test_BindToStorage(FILE_TEST, 0, TYMED_FILE); trace("file test (to object)...\n"); test_BindToObject(FILE_TEST, FALSE); trace("emulated file test...\n"); - test_BindToStorage(FILE_TEST, TRUE, TYMED_ISTREAM); + test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("emulated file test (to file)...\n"); - test_BindToStorage(FILE_TEST, TRUE, TYMED_FILE); + test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated file test (to object)...\n"); test_BindToObject(FILE_TEST, TRUE); trace("emulated its test...\n"); - test_BindToStorage(ITS_TEST, TRUE, TYMED_ISTREAM); + test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("emulated its test (to file)...\n"); - test_BindToStorage(ITS_TEST, TRUE, TYMED_FILE); + test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated mk test...\n"); - test_BindToStorage(MK_TEST, TRUE, TYMED_ISTREAM); + test_BindToStorage(MK_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("test URLDownloadToFile for file protocol...\n"); test_URLDownloadToFile(FILE_TEST, FALSE); @@ -2952,7 +2956,7 @@ START_TEST(url) bindf |= BINDF_NOWRITECACHE; trace("ftp test...\n"); - test_BindToStorage(FTP_TEST, FALSE, TYMED_ISTREAM); + test_BindToStorage(FTP_TEST, 0, TYMED_ISTREAM); trace("test failures...\n"); test_BindToStorage_fail();

1 0

Henri Verbeet : wined3d: Use surface_is_offscreen() in flush_to_framebuffer_drawpixels().
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 97f04248fcf9b5005169c26900babdc46d0aed3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f04248fcf9b5005169c2690… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:35 2009 +0100 wined3d: Use surface_is_offscreen() in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 00051ed..1f8d8a7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1425,16 +1425,15 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm GLint skipBytes = 0; UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ IWineD3DDeviceImpl *myDevice = This->resource.device; - IWineD3DSwapChainImpl *swapchain; struct wined3d_context *context; /* Activate the correct context for the render target */ context = context_acquire(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); ENTER_GL(); - if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)This, &IID_IWineD3DSwapChain, (void **)&swapchain))) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + if (!surface_is_offscreen((IWineD3DSurface *)This)) + { + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)This->container); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); }

1 0

Henri Verbeet : wined3d: Get rid of the "swapchain" parameter to surface_get_gl_buffer().
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: a215d326a59415745fd6ba31deb2f2a0a0920788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a215d326a59415745fd6ba31d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:36 2009 +0100 wined3d: Get rid of the "swapchain" parameter to surface_get_gl_buffer(). Casting the container to "IWineD3DSwapChainImpl *" is always safe when SFLAG_SWAPCHAIN is set on the surface. Most callers don't have a real need for the swapchain, and end up calling GetContainer() just to pass it to surface_get_gl_buffer(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 14 ++++++------ dlls/wined3d/surface.c | 47 +++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f923a6f..2f27997 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2061,7 +2061,7 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit if (!surface_is_offscreen(rt)) { ENTER_GL(); - glDrawBuffer(surface_get_gl_buffer(rt, (IWineD3DSwapChain *)((IWineD3DSurfaceImpl *)rt)->container)); + glDrawBuffer(surface_get_gl_buffer(rt)); checkGLcall("glDrawBuffers()"); LEAVE_GL(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a55f3e6..8e97fb7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5304,9 +5304,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; - IWineD3DSwapChain *swapchain; - swapchain = get_swapchain(surface); if (!surface_is_offscreen(surface)) { TRACE("Surface %p is onscreen\n", surface); @@ -5314,7 +5312,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context = context_acquire(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(surface, swapchain)); + context_set_draw_buffer(context, surface_get_gl_buffer(surface)); } else { @@ -5712,8 +5710,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED gl_info = context->gl_info; - if (!surface_is_offscreen(src_surface)) { - GLenum buffer = surface_get_gl_buffer(src_surface, src_swapchain); + if (!surface_is_offscreen(src_surface)) + { + GLenum buffer = surface_get_gl_buffer(src_surface); TRACE("Source surface %p is onscreen\n", src_surface); /* Make sure the drawable is up to date. In the offscreen case @@ -5750,8 +5749,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED LEAVE_GL(); /* Attach dst surface to dst fbo */ - if (!surface_is_offscreen(dst_surface)) { - GLenum buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); + if (!surface_is_offscreen(dst_surface)) + { + GLenum buffer = surface_get_gl_buffer(dst_surface); TRACE("Destination surface %p is onscreen\n", dst_surface); /* Make sure the drawable is up to date. In the offscreen case diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1f8d8a7..f956927 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -661,20 +661,31 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi checkGLcall("set_compatible_renderbuffer"); } -GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain) { +GLenum surface_get_gl_buffer(IWineD3DSurface *iface) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DSwapChainImpl *swapchain_impl = (IWineD3DSwapChainImpl *)swapchain; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->container; - TRACE("(%p) : swapchain %p\n", This, swapchain); + TRACE("iface %p.\n", iface); - if (swapchain_impl->backBuffer && swapchain_impl->backBuffer[0] == iface) { - if(swapchain_impl->render_to_fbo) { + if (!(This->Flags & SFLAG_SWAPCHAIN)) + { + ERR("Surface %p is not on a swapchain.\n", iface); + return GL_NONE; + } + + if (swapchain->backBuffer && swapchain->backBuffer[0] == iface) + { + if (swapchain->render_to_fbo) + { TRACE("Returning GL_COLOR_ATTACHMENT0\n"); return GL_COLOR_ATTACHMENT0; } TRACE("Returning GL_BACK\n"); return GL_BACK; - } else if (swapchain_impl->frontBuffer == iface) { + } + else if (swapchain->frontBuffer == iface) + { TRACE("Returning GL_FRONT\n"); return GL_FRONT; } @@ -975,7 +986,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, const RECT *rect, v else { /* Onscreen surfaces are always part of a swapchain */ - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *) This->container); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); TRACE("Locking %#x buffer\n", buffer); glReadBuffer(buffer); checkGLcall("glReadBuffer"); @@ -1198,7 +1209,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) */ if (!surface_is_offscreen((IWineD3DSurface *)This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)This->container); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); TRACE("Locking %#x buffer\n", buffer); ENTER_GL(); @@ -1433,7 +1444,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm if (!surface_is_offscreen((IWineD3DSurface *)This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)This->container); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); } @@ -3100,8 +3111,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS * with single pixel copy calls */ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, - IWineD3DSwapChainImpl *swapchain, const WINED3DRECT *srect, const WINED3DRECT *drect, - BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) + const WINED3DRECT *srect, const WINED3DRECT *drect, BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; float xrel, yrel; @@ -3121,9 +3131,10 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer); - } else { - GLenum buffer = surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain); - glReadBuffer(buffer); + } + else + { + glReadBuffer(surface_get_gl_buffer(SrcSurface)); } checkGLcall("glReadBuffer"); @@ -3263,8 +3274,10 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer); - } else { - glReadBuffer(surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain)); + } + else + { + glReadBuffer(surface_get_gl_buffer(SrcSurface)); } /* TODO: Only back up the part that will be overwritten */ @@ -3697,7 +3710,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } else if((!stretchx) || rect.x2 - rect.x1 > Src->currentDesc.Width || rect.y2 - rect.y1 > Src->currentDesc.Height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n"); - fb_copy_to_texture_direct(This, SrcSurface, srcSwapchain, &srect, &rect, upsideDown, Filter); + fb_copy_to_texture_direct(This, SrcSurface, &srect, &rect, upsideDown, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, &srect, &rect, upsideDown, Filter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1834c77..b74868d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2517,7 +2517,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain) DECLSPEC_HIDDEN; +GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurface *iface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(IWineD3DSurface *iface,

1 0