wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Piotr Caban : mshtml/tests: Added asynchronous moniker to htmldoc tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: f7afa250f80b0c3e78f9c0726d09b8e7c96616f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7afa250f80b0c3e78f9c0726… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:35 2011 +0200 mshtml/tests: Added asynchronous moniker to htmldoc tests. --- dlls/mshtml/tests/htmldoc.c | 88 ++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3dac323..843b9cc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -177,6 +177,7 @@ static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, static BOOL editmode = FALSE; static BOOL inplace_deactivated, open_call; static DWORD status_code = HTTP_STATUS_OK; +static BOOL asynchronous_binding = FALSE; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -204,6 +205,7 @@ static const WCHAR http_urlW[] = static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; #define DOCHOST_DOCCANNAVIGATE 0 +#define WM_CONTINUE_BINDING (WM_APP+1) static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_MSHTML_QueryStatus(IHTMLDocument2*,DWORD); @@ -1054,6 +1056,11 @@ static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = iface; + return S_OK; + } + if(IsEqualGUID(&IID_IWinInetInfo, riid) || IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { *ppv = &WinInetHttpInfo; return S_OK; @@ -1076,6 +1083,8 @@ static ULONG WINAPI Binding_Release(IBinding *iface) static HRESULT WINAPI Binding_Abort(IBinding *iface) { CHECK_EXPECT(Abort); + if(asynchronous_binding) + PeekMessage(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE); return S_OK; } @@ -1188,18 +1197,53 @@ static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pcb, IMoni return E_NOTIMPL; } +static void continue_binding(IBindStatusCallback *callback) +{ + FORMATETC formatetc = {0xc02d, NULL, 1, -1, TYMED_ISTREAM}; + STGMEDIUM stgmedium; + HRESULT hres; + + static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + + hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, + wszTextHtml); + ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + + hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, + BINDSTATUS_BEGINDOWNLOADDATA, doc_url); + ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); + + SET_EXPECT(Read); + stgmedium.tymed = TYMED_ISTREAM; + U(stgmedium).pstm = &Stream; + stgmedium.pUnkForRelease = (IUnknown*)&Moniker; + hres = IBindStatusCallback_OnDataAvailable(callback, + BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, + sizeof(html_page)-1, &formatetc, &stgmedium); + ok(hres == S_OK, "OnDataAvailable failed: %08x\n", hres); + CHECK_CALLED(Read); + + hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, + BINDSTATUS_ENDDOWNLOADDATA, NULL); + ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres); + + SET_EXPECT(GetBindResult); + hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); + ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); + SET_CALLED(GetBindResult); /* IE7 */ + + IBindStatusCallback_Release(callback); +} + static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppv) { IBindStatusCallback *callback = NULL; - FORMATETC formatetc = {0xc02d, NULL, 1, -1, TYMED_ISTREAM}; - STGMEDIUM stgmedium; BINDINFO bindinfo; DWORD bindf; HRESULT hres; static OLECHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; - static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; CHECK_EXPECT(BindToStorage); @@ -1240,35 +1284,12 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon hres = IBindStatusCallback_OnStartBinding(callback, 0, &Binding); ok(hres == S_OK, "OnStartBinding failed: %08x\n", hres); - hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, - wszTextHtml); - ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); - - hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, - BINDSTATUS_BEGINDOWNLOADDATA, doc_url); - ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); - - SET_EXPECT(Read); - stgmedium.tymed = TYMED_ISTREAM; - U(stgmedium).pstm = &Stream; - stgmedium.pUnkForRelease = (IUnknown*)iface; - hres = IBindStatusCallback_OnDataAvailable(callback, - BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, - sizeof(html_page)-1, &formatetc, &stgmedium); - ok(hres == S_OK, "OnDataAvailable failed: %08x\n", hres); - CHECK_CALLED(Read); - - hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, - BINDSTATUS_ENDDOWNLOADDATA, NULL); - ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres); - - SET_EXPECT(GetBindResult); - hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); - ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); - SET_CALLED(GetBindResult); /* IE7 */ - - IBindStatusCallback_Release(callback); + if(asynchronous_binding) { + PostMessageW(container_hwnd, WM_CONTINUE_BINDING, (WPARAM)callback, 0); + return MK_S_ASYNCHRONOUS; + } + continue_binding(callback); return S_OK; } @@ -3533,6 +3554,11 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if(msg == WM_CONTINUE_BINDING) { + IBindStatusCallback *callback = (IBindStatusCallback*)wParam; + continue_binding(callback); + } + return DefWindowProc(hwnd, msg, wParam, lParam); }

1 0

Piotr Caban : mshtml/tests: Added IDocObjectService interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 21d500b37f19780742a7038acd52776e1b717530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d500b37f19780742a7038ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:23 2011 +0200 mshtml/tests: Added IDocObjectService interface. --- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/tests/htmldoc.c | 159 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 957b892..bd6faf6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -254,7 +254,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event update_title(doc_obj); } - if(doc_obj && doc_obj->doc_object_service) + if(doc_obj && doc_obj->usermode!=EDITMODE && doc_obj->doc_object_service) IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->IHTMLWindow2_iface, 0); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bdabfd5..3dac323 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -161,6 +161,11 @@ DEFINE_EXPECT(OnViewChange); DEFINE_EXPECT(EvaluateNewWindow); DEFINE_EXPECT(GetTravelLog); DEFINE_EXPECT(UpdateBackForwardState); +DEFINE_EXPECT(FireNavigateComplete2); +DEFINE_EXPECT(FireDocumentComplete); +DEFINE_EXPECT(GetPendingUrl); +DEFINE_EXPECT(ActiveElementChanged); +DEFINE_EXPECT(IsErrorUrl); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -2834,6 +2839,134 @@ static const IDispatchVtbl DispatchVtbl = { static IDispatch Dispatch = { &DispatchVtbl }; +static HRESULT WINAPI DocObjectService_QueryInterface( + IDocObjectService* This, + REFIID riid, + void **ppvObject) +{ + /* F62D9369-75EF-4578-8856-232802C76468 (ITridentService2) */ + return E_NOTIMPL; +} + +static ULONG WINAPI DocObjectService_AddRef( + IDocObjectService* This) +{ + return 2; +} + +static ULONG WINAPI DocObjectService_Release( + IDocObjectService* This) +{ + return 1; +} + +static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( + IDocObjectService* This, + IDispatch *pDispatch, + LPCWSTR lpszUrl, + DWORD dwFlags, + LPCWSTR lpszFrameName, + BYTE *pPostData, + DWORD cbPostData, + LPCWSTR lpszHeaders, + BOOL fPlayNavSound, + BOOL *pfCancel) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireNavigateComplete2( + IDocObjectService* This, + IHTMLWindow2 *pHTMLWindow2, + DWORD dwFlags) +{ + CHECK_EXPECT(FireNavigateComplete2); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadBegin( + IDocObjectService* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadComplete( + IDocObjectService* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDocumentComplete( + IDocObjectService* This, + IHTMLWindow2 *pHTMLWindow, + DWORD dwFlags) +{ + CHECK_EXPECT(FireDocumentComplete); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( + IDocObjectService* This, + IHTMLWindow2 *pHTMLWindow) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetPendingUrl( + IDocObjectService* This, + BSTR *pbstrPendingUrl) +{ + CHECK_EXPECT(GetPendingUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_ActiveElementChanged( + IDocObjectService* This, + IHTMLElement *pHTMLElement) +{ + CHECK_EXPECT(ActiveElementChanged); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetUrlSearchComponent( + IDocObjectService* This, + BSTR *pbstrSearch) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_IsErrorUrl( + IDocObjectService* This, + LPCWSTR lpszUrl, + BOOL *pfIsError) +{ + CHECK_EXPECT(IsErrorUrl); + return E_NOTIMPL; +} + +static IDocObjectServiceVtbl DocObjectServiceVtbl = { + DocObjectService_QueryInterface, + DocObjectService_AddRef, + DocObjectService_Release, + DocObjectService_FireBeforeNavigate2, + DocObjectService_FireNavigateComplete2, + DocObjectService_FireDownloadBegin, + DocObjectService_FireDownloadComplete, + DocObjectService_FireDocumentComplete, + DocObjectService_UpdateDesktopComponent, + DocObjectService_GetPendingUrl, + DocObjectService_ActiveElementChanged, + DocObjectService_GetUrlSearchComponent, + DocObjectService_IsErrorUrl +}; + +static IDocObjectService DocObjectService = { &DocObjectServiceVtbl }; + DEFINE_GUID(IID_ITabBrowserService, 0x5E8FA523,0x83D4,0x4DBE,0x81,0x99,0x4C,0x18,0xE4,0x85,0x87,0x25); static HRESULT WINAPI BrowserService_QueryInterface( @@ -2846,8 +2979,10 @@ static HRESULT WINAPI BrowserService_QueryInterface( if(IsEqualGUID(&IID_IShellBrowser, riid)) return E_NOINTERFACE; /* TODO */ - if(IsEqualGUID(&IID_IDocObjectService, riid)) - return E_NOINTERFACE; /* TODO */ + if(IsEqualGUID(&IID_IDocObjectService, riid)) { + *ppvObject = &DocObjectService; + return S_OK; + } if(IsEqualGUID(&IID_ITabBrowserService, riid)) return E_NOINTERFACE; /* TODO */ @@ -3665,9 +3800,11 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(IsErrorUrl); } else SET_EXPECT(GetTravelLog); + SET_EXPECT(GetPendingUrl); load_state = LD_DOLOAD; expect_LockContainer_fLock = TRUE; readystate_set_loading = TRUE; @@ -3709,9 +3846,11 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); + todo_wine CHECK_CALLED(IsErrorUrl); } else todo_wine CHECK_CALLED(GetTravelLog); + todo_wine CHECK_CALLED(GetPendingUrl); set_clientsite = container_locked = TRUE; @@ -3786,6 +3925,12 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_SETTITLE); SET_EXPECT(UpdateBackForwardState); } + if(!editmode && !(flags & DWL_EMPTY)) + SET_EXPECT(FireNavigateComplete2); + if(!editmode) + SET_EXPECT(FireDocumentComplete); + SET_EXPECT(ActiveElementChanged); + SET_EXPECT(IsErrorUrl); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, NULL, 0, 0)) { @@ -3847,6 +3992,12 @@ static void test_download(DWORD flags) SET_CALLED(Exec_SETTITLE); todo_wine CHECK_CALLED(UpdateBackForwardState); } + if(!editmode && !(flags & DWL_EMPTY)) + todo_wine CHECK_CALLED(FireNavigateComplete2); + if(!editmode) + CHECK_CALLED(FireDocumentComplete); + todo_wine CHECK_CALLED(ActiveElementChanged); + todo_wine CHECK_CALLED(IsErrorUrl); load_state = LD_COMPLETE; @@ -4957,6 +5108,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Read); + SET_EXPECT(GetPendingUrl); readystate_set_loading = TRUE; hres = IPersistStreamInit_Load(init, &Stream); @@ -4967,6 +5119,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) CHECK_CALLED(Exec_ShellDocView_37); CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Read); + todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank"); @@ -4988,6 +5141,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(Exec_ShellDocView_37); SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(GetPendingUrl); readystate_set_loading = TRUE; hres = IPersistStreamInit_InitNew(init); @@ -4997,6 +5151,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); CHECK_CALLED(OnChanged_READYSTATE); + todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank");

1 0

Piotr Caban : mshtml/tests: Added IBrowserService interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9ebe31016cea69d30f26962ebc49782a08c37700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ebe31016cea69d30f26962eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:14 2011 +0200 mshtml/tests: Added IBrowserService interface. --- dlls/mshtml/tests/htmldoc.c | 351 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 351 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ebe31016cea69d30f269…

1 0

Piotr Caban : mshtml/tests: Added IWinInetHttpInfo interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9b4ee3176e0ece3527b8c3f6a8c6cf65cc1c97cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4ee3176e0ece3527b8c3f6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:03 2011 +0200 mshtml/tests: Added IWinInetHttpInfo interface. --- dlls/mshtml/tests/htmldoc.c | 71 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d45eefb..2da187f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -167,6 +167,7 @@ static BOOL set_clientsite, container_locked; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE; static BOOL inplace_deactivated, open_call; +static DWORD status_code = HTTP_STATUS_OK; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -981,13 +982,73 @@ static const IStreamVtbl StreamVtbl = { static IStream Stream = { &StreamVtbl }; -static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WinInetHttpInfo_QueryInterface( + IWinInetHttpInfo* This, + REFIID riid, + void **ppvObject) { - if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) - return E_NOINTERFACE; /* TODO */ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} - if(IsEqualGUID(&IID_IWinInetInfo, riid)) - return E_NOINTERFACE; /* TODO */ +static ULONG WINAPI WinInetHttpInfo_AddRef( + IWinInetHttpInfo* This) +{ + return 2; +} + +static ULONG WINAPI WinInetHttpInfo_Release( + IWinInetHttpInfo* This) +{ + return 1; +} + +static HRESULT WINAPI WinInetHttpInfo_QueryOption( + IWinInetHttpInfo* This, + DWORD dwOption, + LPVOID pBuffer, + DWORD *pcbBuf) +{ + return E_NOTIMPL; /* TODO */ +} + +static HRESULT WINAPI WinInetHttpInfo_QueryInfo( + IWinInetHttpInfo* This, + DWORD dwOption, + LPVOID pBuffer, + DWORD *pcbBuf, + DWORD *pdwFlags, + DWORD *pdwReserved) +{ + ok(pdwReserved == NULL, "pdwReserved != NULL\n"); + + if(dwOption == (HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER)) { + ok(pBuffer != NULL, "pBuffer == NULL\n"); + ok(*pcbBuf == sizeof(DWORD), "*pcbBuf = %d\n", *pcbBuf); + ok(pdwFlags == NULL, "*pdwFlags != NULL\n"); + *((DWORD*)pBuffer) = status_code; + return S_OK; + } + + return E_NOTIMPL; /* TODO */ +} + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + WinInetHttpInfo_QueryInterface, + WinInetHttpInfo_AddRef, + WinInetHttpInfo_Release, + WinInetHttpInfo_QueryOption, + WinInetHttpInfo_QueryInfo +}; + +static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; + +static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IWinInetInfo, riid) || IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + *ppv = &WinInetHttpInfo; + return S_OK; + } ok(0, "unexpected call\n"); return E_NOINTERFACE;

1 0

Piotr Caban : mshtml: Report an error when navigation fails.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: c3a677d007607aa96b3564230956fe737483d75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a677d007607aa96b3564230… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:35:34 2011 +0200 mshtml: Report an error when navigation fails. --- dlls/mshtml/navigate.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 116 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bb71c79..db624d8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1110,11 +1110,105 @@ static HRESULT async_stop_request(nsChannelBSC *This) return S_OK; } +static void handle_navigation_error(nsChannelBSC *This, DWORD result) +{ + HTMLDocumentObj *doc; + IOleCommandTarget *olecmd; + BOOL is_error_url; + SAFEARRAY *sa; + SAFEARRAYBOUND bound; + VARIANT var, varOut; + LONG ind; + BSTR url, unk; + HRESULT hres; + + if(!This->window) + return; + + doc = This->window->doc_obj; + if(!doc || !doc->doc_object_service || !doc->client) + return; + + hres = IDocObjectService_IsErrorUrl(doc->doc_object_service, + This->window->url, &is_error_url); + if(FAILED(hres) || is_error_url) + return; + + hres = IOleClientSite_QueryInterface(doc->client, + &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + return; + + bound.lLbound = 0; + bound.cElements = 8; + sa = SafeArrayCreate(VT_VARIANT, 1, &bound); + if(!sa) { + IOleCommandTarget_Release(olecmd); + return; + } + + ind = 0; + V_VT(&var) = VT_I4; + V_I4(&var) = result; + SafeArrayPutElement(sa, &ind, &var); + + ind = 1; + V_VT(&var) = VT_BSTR; + url = SysAllocString(This->window->url); + V_BSTR(&var) = url; + SafeArrayPutElement(sa, &ind, &var); + + ind = 3; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&This->window->IHTMLWindow2_iface; + SafeArrayPutElement(sa, &ind, &var); + + /* FIXME: what are the following fields for? */ + ind = 2; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = NULL; + SafeArrayPutElement(sa, &ind, &var); + + ind = 4; + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = FALSE; + SafeArrayPutElement(sa, &ind, &var); + + ind = 5; + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = FALSE; + SafeArrayPutElement(sa, &ind, &var); + + ind = 6; + V_VT(&var) = VT_BSTR; + unk = SysAllocString(NULL); + V_BSTR(&var) = unk; + SafeArrayPutElement(sa, &ind, &var); + + ind = 7; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = NULL; + SafeArrayPutElement(sa, &ind, &var); + + V_VT(&var) = VT_ARRAY; + V_ARRAY(&var) = sa; + V_VT(&varOut) = VT_BOOL; + V_BOOL(&varOut) = VARIANT_TRUE; + IOleCommandTarget_Exec(olecmd, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); + + SysFreeString(url); + SysFreeString(unk); + SafeArrayDestroy(sa); + IOleCommandTarget_Release(olecmd); +} + static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(This->window && SUCCEEDED(result)) { + if(FAILED(result)) + handle_navigation_error(This, result); + else if(This->window) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK; @@ -1148,6 +1242,27 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW /* FIXME: We should find a better way to handle this */ set_wine_url(This->nschannel->uri, status_text); + break; + case BINDSTATUS_BEGINDOWNLOADDATA: { + IWinInetHttpInfo *http_info; + DWORD status, size = sizeof(DWORD); + HRESULT hres; + + if(!This->bsc.binding) + break; + + hres = IBinding_QueryInterface(This->bsc.binding, &IID_IWinInetHttpInfo, (void**)&http_info); + if(FAILED(hres)) + break; + + hres = IWinInetHttpInfo_QueryInfo(http_info, + HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); + IWinInetHttpInfo_Release(http_info); + if(FAILED(hres) || status == HTTP_STATUS_OK) + break; + + handle_navigation_error(This, status); + } } return S_OK;

1 0

Thomas Mullaly : urlmon: Added basic domain zone support to MapUrlToZone.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: e06d49ff6252412cf0375997c0b74aaf61539cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06d49ff6252412cf0375997c… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 13 19:26:45 2011 -0400 urlmon: Added basic domain zone support to MapUrlToZone. --- dlls/urlmon/sec_mgr.c | 357 ++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/sec_mgr.c | 28 ++-- dlls/urlmon/uri.c | 2 +- dlls/urlmon/urlmon_main.h | 2 + 4 files changed, 372 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e06d49ff6252412cf0375…

1 0

Thomas Mullaly : urlmon: Removed str_last_of in favor of memrchrW.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1b625bb1f817799928475d3e7407864dede5296b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b625bb1f817799928475d3e7… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 20 16:28:59 2011 -0400 urlmon: Removed str_last_of in favor of memrchrW. --- dlls/urlmon/uri.c | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0a92dad..fb51cc2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -597,21 +597,6 @@ static inline void pct_encode_val(WCHAR val, WCHAR *dest) { dest[2] = hexDigits[val & 0xf]; } -/* Scans the range of characters [str, end] and returns the last occurrence - * of 'ch' or returns NULL. - */ -static const WCHAR *str_last_of(const WCHAR *str, const WCHAR *end, WCHAR ch) { - const WCHAR *ptr = end; - - while(ptr >= str) { - if(*ptr == ch) - return ptr; - --ptr; - } - - return NULL; -} - /* Attempts to parse the domain name from the host. * * This function also includes the Top-level Domain (TLD) name @@ -636,12 +621,12 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, if(host_len < 4) return; - last_tld = str_last_of(host, end, '.'); + last_tld = memrchrW(host, '.', host_len); if(!last_tld) /* http://hostname -> has no domain name. */ return; - sec_last_tld = str_last_of(host, last_tld-1, '.'); + sec_last_tld = memrchrW(host, '.', last_tld-host); if(!sec_last_tld) { /* If the '.' is at the beginning of the host there * has to be at least 3 characters in the TLD for it @@ -692,7 +677,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, if(last_tld - (sec_last_tld+1) == 3) { for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { if(!StrCmpNIW(sec_last_tld+1, recognized_tlds[i].tld_name, 3)) { - const WCHAR *domain = str_last_of(host, sec_last_tld-1, '.'); + const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); if(!domain) *domain_start = 0; @@ -710,7 +695,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, * part of the TLD. * Ex: www.google.fo.uk -> google.fo.uk as the domain name. */ - const WCHAR *domain = str_last_of(host, sec_last_tld-1, '.'); + const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); if(!domain) *domain_start = 0; @@ -5801,10 +5786,10 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, /* Find the characters the will be copied over from * the base path. */ - end = str_last_of(base, base+(base_len-1), '/'); + end = memrchrW(base, '/', base_len); if(!end && data->scheme_type == URL_SCHEME_FILE) /* Try looking for a '\\'. */ - end = str_last_of(base, base+(base_len-1), '\\'); + end = memrchrW(base, '\\', base_len); } if(end) {

1 0

Vincent Povirk : gdiplus: Use the given HPALETTE in GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: a7444e8e2c4dcccbfe621e8e6945cef989499d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7444e8e2c4dcccbfe621e8e6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 16:03:29 2011 -0500 gdiplus: Use the given HPALETTE in GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/image.c | 56 +++++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 6 +--- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1916524..35ebd29 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3524,12 +3524,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if(!hbm || !bitmap) return InvalidParameter; - /* TODO: Support for device-dependent bitmaps */ - if(hpal){ - FIXME("no support for device-dependent bitmaps\n"); - return NotImplemented; - } - if (GetObjectA(hbm, sizeof(bm), &bm) != sizeof(bm)) return InvalidParameter; @@ -3626,6 +3620,56 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi GdipBitmapUnlockBits(*bitmap, &lockeddata); } + + if (retval == Ok && hpal) + { + WORD num_palette_entries; + PALETTEENTRY *palette_entries=NULL; + ColorPalette *palette=NULL; + int i; + + if (!GetObjectW(hpal, sizeof(num_palette_entries), &num_palette_entries)) + retval = GenericError; + + if (retval == Ok) + { + palette_entries = GdipAlloc(sizeof(PALETTEENTRY) * num_palette_entries); + palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); + + if (!palette_entries || !palette) + retval = OutOfMemory; + } + + if (retval == Ok) + { + if (!GetPaletteEntries(hpal, 0, num_palette_entries, palette_entries)) + retval = GenericError; + } + + if (retval == Ok) + { + palette->Flags = 0; + palette->Count = num_palette_entries; + + for (i=0; i<num_palette_entries; i++) + { + PALETTEENTRY * entry = &palette_entries[i]; + palette->Entries[i] = 0xff000000 | entry->peRed << 16 | + entry->peGreen << 8 | entry->peBlue; + } + + retval = GdipSetImagePalette((GpImage*)*bitmap, palette); + } + + GdipFree(palette_entries); + GdipFree(palette); + } + + if (retval != Ok) + { + GdipDisposeImage((GpImage*)*bitmap); + *bitmap = NULL; + } } return retval; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1e6a9e9..77aec93 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -917,10 +917,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipFree(LogPal); stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); - todo_wine - { - expect(Ok, stat); - } + expect(Ok, stat); + if (stat == Ok) GdipDisposeImage((GpImage*)gpbm);

1 0

Henri Verbeet : wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 57d70bfddae578398a74acec9cbe3ed4609d5fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d70bfddae578398a74acec9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:46 2011 +0200 wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader. --- dlls/wined3d/shader.c | 75 ++++++++++++++++++++++++++++++--------------- include/wine/wined3d.idl | 10 +++--- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0641b27..80ea5ea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1572,6 +1572,33 @@ static HRESULT shader_get_function(IWineD3DBaseShaderImpl *shader, void *data, U return WINED3D_OK; } +/* Set local constants for d3d8 shaders. */ +static HRESULT shader_set_local_constants_float(IWineD3DBaseShaderImpl *shader, + UINT start_idx, const float *src_data, UINT count) +{ + UINT end_idx = start_idx + count; + UINT i; + + if (end_idx > shader->baseShader.limits.constant_float) + { + WARN("end_idx %u > float constants limit %u.\n", + end_idx, shader->baseShader.limits.constant_float); + end_idx = shader->baseShader.limits.constant_float; + } + + for (i = start_idx; i < end_idx; ++i) + { + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); + if (!lconst) return E_OUTOFMEMORY; + + lconst->idx = i; + memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); + list_add_head(&shader->baseShader.constantsF, &lconst->entry); + } + + return WINED3D_OK; +} + static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, DWORD float_const_count) { @@ -1679,34 +1706,13 @@ static HRESULT STDMETHODCALLTYPE vertexshader_GetFunction(IWineD3DVertexShader * return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } -/* Set local constants for d3d8 shaders. */ static HRESULT STDMETHODCALLTYPE vertexshader_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { - IWineD3DVertexShaderImpl *shader =(IWineD3DVertexShaderImpl *)iface; - IWineD3DDeviceImpl *device = shader->baseShader.device; - UINT i, end_idx; - TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); - end_idx = start_idx + count; - if (end_idx > device->d3d_vshader_constantF) - { - WARN("end_idx %u > float constants limit %u.\n", end_idx, device->d3d_vshader_constantF); - end_idx = device->d3d_vshader_constantF; - } - - for (i = start_idx; i < end_idx; ++i) - { - local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); - if (!lconst) return E_OUTOFMEMORY; - - lconst->idx = i; - memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); - list_add_head(&shader->baseShader.constantsF, &lconst->entry); - } - - return WINED3D_OK; + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); } static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = @@ -1719,7 +1725,6 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = vertexshader_GetParent, /* IWineD3DBaseShader methods */ vertexshader_GetFunction, - /* IWineD3DVertexShader methods */ vertexshader_SetLocalConstantsF, }; @@ -1951,6 +1956,15 @@ static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShad return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeometryShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = { /* IUnknown methods */ @@ -1961,6 +1975,7 @@ static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = geometryshader_GetParent, /* IWineD3DBaseShader methods */ geometryshader_GetFunction, + geometryshader_SetLocalConstantsF, }; HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, @@ -2047,6 +2062,15 @@ static HRESULT STDMETHODCALLTYPE pixelshader_GetFunction(IWineD3DPixelShader *if return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE pixelshader_SetLocalConstantsF(IWineD3DPixelShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = { /* IUnknown methods */ @@ -2056,7 +2080,8 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = /* IWineD3DBase methods */ pixelshader_GetParent, /* IWineD3DBaseShader methods */ - pixelshader_GetFunction + pixelshader_GetFunction, + pixelshader_SetLocalConstantsF, }; void find_ps_compile_args(const struct wined3d_state *state, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index bc7d588..e56aea5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,6 +2395,11 @@ interface IWineD3DBaseShader : IWineD3DBase [out] void *data, [in, out] UINT *data_size ); + HRESULT SetLocalConstantsF( + [in] UINT start_idx, + [in] const float *src_data, + [in] UINT vector4f_count + ); } [ @@ -2404,11 +2409,6 @@ interface IWineD3DBaseShader : IWineD3DBase ] interface IWineD3DVertexShader : IWineD3DBaseShader { - HRESULT SetLocalConstantsF( - [in] UINT start_idx, - [in] const float *src_data, - [in] UINT vector4f_count - ); } [

1 0

Henri Verbeet : wined3d: Replace "is_srgb" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 19e66a0dc964b839eaef4699e80208096de05c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e66a0dc964b839eaef4699e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:45 2011 +0200 wined3d: Replace "is_srgb" in wined3d_texture with a flag. --- dlls/wined3d/texture.c | 36 +++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 10edf4a..1d42c34 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -57,7 +57,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->lod = 0; texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; - texture->is_srgb = FALSE; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) @@ -143,7 +142,12 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x, set_surface_desc %p.\n", texture, srgb, set_surface_desc); - texture->is_srgb = srgb; /* sRGB mode cache for preload() calls outside drawprim. */ + /* sRGB mode cache for preload() calls outside drawprim. */ + if (srgb) + texture->flags |= WINED3D_TEXTURE_IS_SRGB; + else + texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb); target = texture->target; @@ -270,7 +274,8 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, TRACE("texture %p, sampler_states %p.\n", texture, sampler_states); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, texture->is_srgb); + gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, + texture->flags & WINED3D_TEXTURE_IS_SRGB); /* This function relies on the correct texture being bound and loaded. */ @@ -646,7 +651,8 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = texture->level_count * texture->layer_count; - BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && texture->is_srgb; + BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + && (texture->flags & WINED3D_TEXTURE_IS_SRGB); struct gl_texture *gl_tex; UINT i; @@ -718,7 +724,7 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB break; default: - srgb_mode = texture->is_srgb; + srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; break; } @@ -1115,7 +1121,6 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { IWineD3DDeviceImpl *device = texture->resource.device; struct wined3d_context *context = NULL; - BOOL srgb_mode = texture->is_srgb; BOOL srgb_was_toggled = FALSE; unsigned int i; @@ -1125,9 +1130,17 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB context = context_acquire(device, NULL); else if (texture->bind_count > 0) { - srgb_mode = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; - srgb_was_toggled = texture->is_srgb != srgb_mode; - texture->is_srgb = srgb_mode; + BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; + BOOL sampler_srgb = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; + srgb_was_toggled = !texture_srgb != !sampler_srgb; + + if (srgb_was_toggled) + { + if (sampler_srgb) + texture->flags |= WINED3D_TEXTURE_IS_SRGB; + else + texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + } } /* If the texture is marked dirty or the sRGB sampler setting has changed @@ -1136,7 +1149,8 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { for (i = 0; i < texture->level_count; ++i) { - volume_load(volume_from_resource(texture->sub_resources[i]), i, srgb_mode); + volume_load(volume_from_resource(texture->sub_resources[i]), i, + texture->flags & WINED3D_TEXTURE_IS_SRGB); } } else if (srgb_was_toggled) @@ -1145,7 +1159,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { IWineD3DVolumeImpl *volume = volume_from_resource(texture->sub_resources[i]); volume_add_dirty_box(volume, NULL); - volume_load(volume, i, srgb_mode); + volume_load(volume, i, texture->flags & WINED3D_TEXTURE_IS_SRGB); } } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ec25e6..1fe633f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1890,6 +1890,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_COND_NP2 0x1 #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 +#define WINED3D_TEXTURE_IS_SRGB 0x4 struct wined3d_texture { @@ -1904,7 +1905,6 @@ struct wined3d_texture WINED3DTEXTUREFILTERTYPE filter_type; LONG bind_count; DWORD sampler; - BOOL is_srgb; DWORD flags; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011