June 2012 - Wine-Commits - list.winehq.org

Aric Stewart : quartz: Allocate surfaces in VMR-9.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 82a562a603f75b08802b8dc569225689ca7dd491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a562a603f75b08802b8dc56… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 6 13:47:16 2012 -0500 quartz: Allocate surfaces in VMR-9. --- dlls/quartz/vmr9.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 165 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a470fd2..8fa1b15 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -132,8 +132,12 @@ typedef struct IDirect3DDevice9 *d3d9_dev; IDirect3D9 *d3d9_ptr; + IDirect3DSurface9 **d3d9_surfaces; IDirect3DVertexBuffer9 *d3d9_vertex; + HMONITOR hMon; + DWORD num_surfaces; + BOOL reset; VMR9AllocationInfo info; VMR9Impl* pVMR9; @@ -1349,9 +1353,22 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) if (!refCount) { + int i; TRACE("Destroying\n"); IUnknown_Release(This->d3d9_ptr); + TRACE("Number of surfaces: %u\n", This->num_surfaces); + for (i = 0; i < This->num_surfaces; ++i) + { + IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; + TRACE("Releasing surface %p\n", surface); + if (surface) + IUnknown_Release(surface); + } + + CoTaskMemFree(This->d3d9_surfaces); + This->d3d9_surfaces = NULL; + This->num_surfaces = 0; if (This->d3d9_vertex) { IUnknown_Release(This->d3d9_vertex); @@ -1527,6 +1544,29 @@ static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); } +static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_out) +{ + UINT d3d9_adapter; + HMONITOR mon; + + mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONULL); + if (!mon) + d3d9_adapter = 0; + else + { + for (d3d9_adapter = 0; d3d9_adapter < IDirect3D9_GetAdapterCount(d3d9); ++d3d9_adapter) + { + if (mon == IDirect3D9_GetAdapterMonitor(d3d9, d3d9_adapter)) + break; + } + if (d3d9_adapter >= IDirect3D9_GetAdapterCount(d3d9)) + d3d9_adapter = 0; + } + if (mon_out) + *mon_out = mon; + return d3d9_adapter; +} + static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); @@ -1558,6 +1598,116 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator return S_OK; } +/* Recreate all surfaces (If allocated as D3DPOOL_DEFAULT) and survive! */ +static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPresenterImpl *This) +{ + struct VERTEX t_vert[4]; + UINT width, height; + INT i; + void *bits = NULL; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + + if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) + { + ERR("No window\n"); + return E_FAIL; + } + + if (!This->d3d9_surfaces || !This->reset) + return S_OK; + + This->reset = FALSE; + TRACE("RESETTING\n"); + if (This->d3d9_vertex) + { + IDirect3DVertexBuffer9_Release(This->d3d9_vertex); + This->d3d9_vertex = NULL; + } + + for (i = 0; i < This->num_surfaces; ++i) + { + IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; + TRACE("Releasing surface %p\n", surface); + if (surface) + IUnknown_Release(surface); + } + ZeroMemory(This->d3d9_surfaces, sizeof(IDirect3DSurface9 *) * This->num_surfaces); + + /* Now try to create the d3d9 device */ + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.hDeviceWindow = This->pVMR9->baseControlWindow.baseWindow.hWnd; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + + if (This->d3d9_dev) + IDirect3DDevice9_Release(This->d3d9_dev); + This->d3d9_dev = NULL; + hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.baseWindow.hWnd, &This->hMon), D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); + if (FAILED(hr)) + { + hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.baseWindow.hWnd, &This->hMon), D3DDEVTYPE_HAL, NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); + if (FAILED(hr)) + { + ERR("--> Creating device: %08x\n", hr); + return S_OK; + } + } + IVMRSurfaceAllocatorNotify9_ChangeD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); + + IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(This->SurfaceAllocatorNotify, &This->info, &This->num_surfaces, This->d3d9_surfaces); + + This->reset = FALSE; + + if (!(This->info.dwFlags & VMR9AllocFlag_TextureSurface)) + return S_OK; + + hr = IDirect3DDevice9_CreateVertexBuffer(This->d3d9_dev, 4 * sizeof(struct VERTEX), D3DUSAGE_WRITEONLY, USED_FVF, + This->info.Pool, &This->d3d9_vertex, NULL); + + width = This->info.dwWidth; + height = This->info.dwHeight; + + for (i = 0; i < sizeof(t_vert) / sizeof(t_vert[0]); ++i) + { + if (i % 2) + { + t_vert[i].x = (float)This->pVMR9->target_rect.right - (float)This->pVMR9->target_rect.left - 0.5f; + t_vert[i].u = (float)This->pVMR9->source_rect.right / (float)width; + } + else + { + t_vert[i].x = -0.5f; + t_vert[i].u = (float)This->pVMR9->source_rect.left / (float)width; + } + + if (i % 4 < 2) + { + t_vert[i].y = -0.5f; + t_vert[i].v = (float)This->pVMR9->source_rect.bottom / (float)height; + } + else + { + t_vert[i].y = (float)This->pVMR9->target_rect.bottom - (float)This->pVMR9->target_rect.top - 0.5f; + t_vert[i].v = (float)This->pVMR9->source_rect.top / (float)height; + } + t_vert[i].z = 0.0f; + t_vert[i].rhw = 1.0f; + } + + FIXME("Vertex rectangle:\n"); + FIXME("X, Y: %f, %f\n", t_vert[0].x, t_vert[0].y); + FIXME("X, Y: %f, %f\n", t_vert[3].x, t_vert[3].y); + FIXME("TOP, LEFT: %f, %f\n", t_vert[0].u, t_vert[0].v); + FIXME("DOWN, BOTTOM: %f, %f\n", t_vert[3].u, t_vert[3].v); + + IDirect3DVertexBuffer9_Lock(This->d3d9_vertex, 0, sizeof(t_vert), &bits, 0); + memcpy(bits, t_vert, sizeof(t_vert)); + IDirect3DVertexBuffer9_Unlock(This->d3d9_vertex); + + return S_OK; +} + static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); @@ -1569,7 +1719,17 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * return E_FAIL; } - return E_NOTIMPL; + VMR9_SurfaceAllocator_UpdateDeviceReset(This); + + if (surfaceindex >= This->num_surfaces) + { + ERR("surfaceindex is greater than num_surfaces\n"); + return E_FAIL; + } + *surface = This->d3d9_surfaces[surfaceindex]; + IUnknown_AddRef(*surface); + + return S_OK; } static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 *iface, IVMRSurfaceAllocatorNotify9 *allocnotify) @@ -1635,9 +1795,13 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID This->refCount = 1; This->pVMR9 = parent; + This->d3d9_surfaces = NULL; This->d3d9_dev = NULL; + This->hMon = 0; This->d3d9_vertex = NULL; + This->num_surfaces = 0; This->SurfaceAllocatorNotify = NULL; + This->reset = FALSE; *ppv = This; return S_OK;

1 0

Aric Stewart : quartz: Implement default Surface Allocator for vmr9.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 3d46f56a1426d65be321c423a8ec66e6c22c3e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d46f56a1426d65be321c423a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 6 13:47:13 2012 -0500 quartz: Implement default Surface Allocator for vmr9. --- dlls/quartz/vmr9.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index efd14a1..a470fd2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -126,6 +126,7 @@ static inline VMR9Impl *impl_from_IVMRSurfaceAllocatorNotify9( IVMRSurfaceAlloca typedef struct { IVMRImagePresenter9 IVMRImagePresenter9_iface; + IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9_iface; LONG refCount; @@ -136,6 +137,7 @@ typedef struct VMR9AllocationInfo info; VMR9Impl* pVMR9; + IVMRSurfaceAllocatorNotify9 *SurfaceAllocatorNotify; } VMR9DefaultAllocatorPresenterImpl; static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRImagePresenter9( IVMRImagePresenter9 *iface) @@ -143,6 +145,11 @@ static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRImagePresenter9( return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRImagePresenter9_iface); } +static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRSurfaceAllocatorEx9( IVMRSurfaceAllocatorEx9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRSurfaceAllocatorEx9_iface); +} + static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID * ppv); static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) @@ -1309,6 +1316,8 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if *ppv = (LPVOID)&(This->IVMRImagePresenter9_iface); else if (IsEqualIID(riid, &IID_IVMRImagePresenter9)) *ppv = &This->IVMRImagePresenter9_iface; + else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9)) + *ppv = &This->IVMRSurfaceAllocatorEx9_iface; if (*ppv) { @@ -1497,6 +1506,95 @@ static const IVMRImagePresenter9Vtbl VMR9_ImagePresenter = VMR9_ImagePresenter_PresentImage }; +static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocatorEx9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + + return VMR9_ImagePresenter_QueryInterface(&This->IVMRImagePresenter9_iface, riid, ppv); +} + +static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocatorEx9 *iface) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + + return VMR9_ImagePresenter_AddRef(&This->IVMRImagePresenter9_iface); +} + +static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + + return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); +} + +static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + + if (This->pVMR9->mode != VMR9Mode_Windowed && !This->pVMR9->hWndClippingWindow) + { + ERR("No window set\n"); + return VFW_E_WRONG_STATE; + } + + This->info = *allocinfo; + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + HRESULT hr; + + if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) + { + return S_OK; + } + + hr = SendMessageW(This->pVMR9->baseControlWindow.baseWindow.hWnd, WM_CLOSE, 0, 0); + FIXME("SendMessageW: %08x\n", hr); + BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); + + return S_OK; +} + +static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + + /* Update everything first, this is needed because the surface might be destroyed in the reset */ + if (!This->d3d9_dev) + { + TRACE("Device has left me!\n"); + return E_FAIL; + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 *iface, IVMRSurfaceAllocatorNotify9 *allocnotify) +{ + VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + + TRACE("(%p/%p)->(...)\n", iface, This); + + /* No AddRef taken here or the base VMR9 filter would never be destroied */ + This->SurfaceAllocatorNotify = allocnotify; + return S_OK; +} + +static const IVMRSurfaceAllocatorEx9Vtbl VMR9_SurfaceAllocator = +{ + VMR9_SurfaceAllocator_QueryInterface, + VMR9_SurfaceAllocator_AddRef, + VMR9_SurfaceAllocator_Release, + VMR9_SurfaceAllocator_InitializeDevice, + VMR9_SurfaceAllocator_TerminateDevice, + VMR9_SurfaceAllocator_GetSurface, + VMR9_SurfaceAllocator_AdviseNotify, + NULL /* This isn't the SurfaceAllocatorEx type yet, working on it */ +}; + static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID * ppv) { HRESULT hr = S_OK; @@ -1533,11 +1631,13 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID } This->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; + This->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; This->refCount = 1; This->pVMR9 = parent; This->d3d9_dev = NULL; This->d3d9_vertex = NULL; + This->SurfaceAllocatorNotify = NULL; *ppv = This; return S_OK;

1 0

Jacek Caban : wininet: Store request object instead of handle in error dialog.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: b5fec3c03380c066d36531d963a8d54596fb241d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5fec3c03380c066d36531d96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:41:08 2012 +0200 wininet: Store request object instead of handle in error dialog. --- dlls/wininet/dialogs.c | 83 +++++++++++++++++++++++++++-------------- dlls/wininet/tests/internet.c | 4 +- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7bcfb15..bd80ea3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -50,8 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); struct WININET_ErrorDlgParams { + http_request_t *req; HWND hWnd; - HINTERNET hRequest; DWORD dwError; DWORD dwFlags; LPVOID* lppvData; @@ -317,7 +317,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam ); /* extract the Realm from the proxy response and show it */ - if( WININET_GetAuthRealm( params->hRequest, + if( WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); @@ -325,7 +325,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( } /* extract the name of the proxy server */ - if( WININET_GetProxyServer( params->hRequest, + if( WININET_GetProxyServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { hitem = GetDlgItem( hdlg, IDC_PROXY ); @@ -360,14 +360,14 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && - WININET_GetAuthRealm( params->hRequest, + WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) && - WININET_GetProxyServer( params->hRequest, + WININET_GetProxyServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } - WININET_SetAuthorization( params->hRequest, username, password, TRUE ); + WININET_SetAuthorization( params->req->hdr.hInternet, username, password, TRUE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -401,7 +401,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam ); /* extract the Realm from the response and show it */ - if( WININET_GetAuthRealm( params->hRequest, + if( WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); @@ -409,7 +409,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( } /* extract the name of the server */ - if( WININET_GetServer( params->hRequest, + if( WININET_GetServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { hitem = GetDlgItem( hdlg, IDC_SERVER ); @@ -444,14 +444,14 @@ static INT_PTR WINAPI WININET_PasswordDialog( hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && - WININET_GetAuthRealm( params->hRequest, + WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) && - WININET_GetServer( params->hRequest, + WININET_GetServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } - WININET_SetAuthorization( params->hRequest, username, password, FALSE ); + WININET_SetAuthorization( params->req->hdr.hInternet, username, password, FALSE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -524,9 +524,10 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) { + http_request_t *req = params->req; DWORD flags, size = sizeof(flags); - InternetQueryOptionW( params->hRequest, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size ); + InternetQueryOptionW( req->hdr.hInternet, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size ); switch( params->dwError ) { case ERROR_INTERNET_INVALID_CA: @@ -549,7 +550,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; break; } - res = InternetSetOptionW( params->hRequest, INTERNET_OPTION_SECURITY_FLAGS, &flags, size ); + res = InternetSetOptionW( params->req->hdr.hInternet, INTERNET_OPTION_SECURITY_FLAGS, &flags, size ); if(!res) WARN("InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS) failed.\n"); } @@ -592,7 +593,6 @@ static INT WININET_GetConnectionStatus( HINTERNET hRequest ) return dwStatus; } - /*********************************************************************** * InternetErrorDlg */ @@ -600,15 +600,24 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, DWORD dwError, DWORD dwFlags, LPVOID* lppvData) { struct WININET_ErrorDlgParams params; - INT dwStatus; + http_request_t *req = NULL; + DWORD res = ERROR_SUCCESS; TRACE("%p %p %d %08x %p\n", hWnd, hRequest, dwError, dwFlags, lppvData); if( !hWnd && !(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) ) return ERROR_INVALID_HANDLE; + if(hRequest) { + req = (http_request_t*)get_handle_object(hRequest); + if(!req) + return ERROR_INVALID_HANDLE; + if(req->hdr.htype != WH_HHTTPREQ) + return ERROR_SUCCESS; /* Yes, that was tested */ + } + + params.req = req; params.hWnd = hWnd; - params.hRequest = hRequest; params.dwError = dwError; params.dwFlags = dwFlags; params.lppvData = lppvData; @@ -616,40 +625,58 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, switch( dwError ) { case ERROR_SUCCESS: - case ERROR_INTERNET_INCORRECT_PASSWORD: + case ERROR_INTERNET_INCORRECT_PASSWORD: { + DWORD dwStatus; + if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) - return 0; + break; + if(!req) + return ERROR_INVALID_HANDLE; dwStatus = WININET_GetConnectionStatus( hRequest ); switch (dwStatus) { case HTTP_STATUS_PROXY_AUTH_REQ: - return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), - hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), + hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + break; case HTTP_STATUS_DENIED: - return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), + res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), hWnd, WININET_PasswordDialog, (LPARAM) &params ); + break; default: WARN("unhandled status %u\n", dwStatus); - return 0; } + break; + } case ERROR_INTERNET_SEC_CERT_ERRORS: case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: - if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) - return ERROR_CANCELLED; + if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { + res = ERROR_CANCELLED; + break; + } + if(!req) + return ERROR_INVALID_HANDLE; + if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) FIXME("%08x contains unsupported flags.\n", dwFlags); - return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), - hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); + res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), + hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); + break; case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_POST_IS_NON_SECURE: FIXME("Need to display dialog for error %d\n", dwError); - return ERROR_SUCCESS; + res = ERROR_SUCCESS; + break; + default: + res = ERROR_NOT_SUPPORTED; } - return ERROR_NOT_SUPPORTED; + if(req) + WININET_Release(&req->hdr); + return res; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3567cc8..57fc7c4 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1303,11 +1303,11 @@ static void test_InternetErrorDlg(void) res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, flags, NULL); if(res == ERROR_CALL_NOT_IMPLEMENTED) { - todo_wine ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); + ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); continue; } else - todo_wine ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); + ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); /* With a valid req */ if(i == ERROR_INTERNET_NEED_UI)

1 0

Jacek Caban : wininet: Set SECURITY_FLAG_SECURE when error dialog ignores invalid certificate.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 964e538ba9f466648e4939dd9d1d28ce725db2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964e538ba9f466648e4939dd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:41:22 2012 +0200 wininet: Set SECURITY_FLAG_SECURE when error dialog ignores invalid certificate. --- dlls/wininet/dialogs.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index bd80ea3..66a666b 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -550,9 +550,11 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; break; } - res = InternetSetOptionW( params->req->hdr.hInternet, INTERNET_OPTION_SECURITY_FLAGS, &flags, size ); - if(!res) - WARN("InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS) failed.\n"); + /* FIXME: Use helper function */ + flags |= SECURITY_FLAG_SECURE; + req->security_flags |= flags; + if(req->netconn) + req->netconn->security_flags |= flags; } EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED );

1 0

Jacek Caban : wininet: Added support for ERROR_INTERNET_SEC_CERT_REV_FAILED in InternetErrorDlg.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 448f2452c4df01cf75bacd1c0f986aa326458eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=448f2452c4df01cf75bacd1c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:41:35 2012 +0200 wininet: Added support for ERROR_INTERNET_SEC_CERT_REV_FAILED in InternetErrorDlg. --- dlls/wininet/dialogs.c | 4 ++++ dlls/wininet/tests/internet.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 66a666b..a032ebb 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -539,6 +539,9 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( case ERROR_INTERNET_SEC_CERT_CN_INVALID: flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; break; + case ERROR_INTERNET_SEC_CERT_REV_FAILED: + flags |= SECURITY_FLAG_IGNORE_REVOCATION; + break; case ERROR_INTERNET_SEC_CERT_ERRORS: if(flags & _SECURITY_FLAG_CERT_REV_FAILED) flags |= SECURITY_FLAG_IGNORE_REVOCATION; @@ -655,6 +658,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: + case ERROR_INTERNET_SEC_CERT_REV_FAILED: if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { res = ERROR_CANCELLED; break; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 57fc7c4..f2ea04f 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1256,7 +1256,7 @@ static void test_InternetErrorDlg(void) { ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR, ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_INSERT_CDROM , ERROR_CANCELLED, FLAG_TODO|FLAG_NEEDREQ|FLAG_UNIMPL }, { ERROR_INTERNET_SEC_CERT_ERRORS , ERROR_CANCELLED, 0 }, - { ERROR_INTERNET_SEC_CERT_REV_FAILED , ERROR_CANCELLED, FLAG_TODO }, + { ERROR_INTERNET_SEC_CERT_REV_FAILED , ERROR_CANCELLED, 0 }, { ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION , ERROR_HTTP_COOKIE_DECLINED, FLAG_TODO }, { ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT , ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO },

1 0

Piotr Caban : msvcp90: Added codecvt<char> implementation.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 2baabaefe8e21767d1b691143fb654cd75874c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2baabaefe8e21767d1b691143… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 7 12:54:00 2012 +0200 msvcp90: Added codecvt<char> implementation. --- dlls/msvcp90/locale.c | 217 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 60 ++++++------ 2 files changed, 247 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2baabaefe8e21767d1b69…

1 0

Piotr Caban : msvcp90: Added codecvt_base class implementation.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 679b0d4843180692582b8427d0c382948435d03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=679b0d4843180692582b8427d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 7 12:53:38 2012 +0200 msvcp90: Added codecvt_base class implementation. --- dlls/msvcp90/locale.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 38 +++++++------- 2 files changed, 139 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=679b0d4843180692582b8…

1 0

Jacek Caban : wininet: Added support for undocumented InternetSetOption(99) call.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: d8b5f468ab4351845ff527ed04b84e9b687d482d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b5f468ab4351845ff527ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:40:45 2012 +0200 wininet: Added support for undocumented InternetSetOption(99) call. --- dlls/wininet/http.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e263d8a..620fcf7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2190,6 +2190,15 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, http_request_t *req = (http_request_t*)hdr; switch(option) { + case 99: /* Undocumented, seems to be INTERNET_OPTION_SECURITY_FLAGS with argument validation */ + TRACE("Undocumented option 99\n"); + + if (!buffer || size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + if(*(DWORD*)buffer & ~SECURITY_SET_MASK) + return ERROR_INTERNET_OPTION_NOT_SETTABLE; + + /* fall through */ case INTERNET_OPTION_SECURITY_FLAGS: { DWORD flags;

1 0

Michael Stefaniuc : mscoree: Remove duplicated include.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: b168da775283c2c0829dc0adfbadc37ebb6aba62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b168da775283c2c0829dc0adf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 7 01:01:39 2012 +0200 mscoree: Remove duplicated include. --- dlls/mscoree/corruntimehost.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 3f2b9a2..d5c94c1 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -40,7 +40,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree );

1 0

Michael Stefaniuc : wineqtdecoder: Remove duplicated assert.h include.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 9d32c2877184c1e263a206445203337529f2c170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d32c2877184c1e263a206445… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 7 01:01:30 2012 +0200 wineqtdecoder: Remove duplicated assert.h include. --- dlls/wineqtdecoder/qtdatahandler.c | 2 -- dlls/wineqtdecoder/qtsplitter.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index be003c3..9c839aa 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -119,8 +119,6 @@ #include "winuser.h" #include "dshow.h" -#include <assert.h> - #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 46ce23e..b584198 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -120,8 +120,6 @@ #include "winuser.h" #include "dshow.h" -#include <assert.h> - #include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h"

1 0