wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Hans Leidekker : msi: Return length for the empty string in msi_string_lookup.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 31ea3f44ddd5f964e7479f1f10c53392f06f18e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ea3f44ddd5f964e7479f1f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 2 15:35:34 2012 +0100 msi: Return length for the empty string in msi_string_lookup. --- dlls/msi/string.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 5e2c574..486cdf9 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -352,8 +352,10 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) { if( id == 0 ) + { + if (len) *len = 0; return szEmpty; - + } if( id >= st->maxcount ) return NULL;

1 0

Hans Leidekker : wbemprox: Avoid a crash when serializing object text.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 6955b09023a0c74af01ecd6a9434ccd58429ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6955b09023a0c74af01ecd6a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 2 15:34:27 2012 +0100 wbemprox: Avoid a crash when serializing object text. --- dlls/wbemprox/class.c | 20 ++++++++++++-------- dlls/wbemprox/table.c | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 75bd612..994e76b 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -568,19 +568,23 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) *len = 0; for (i = 0; i < table->num_cols; i++) { - *len += sizeof(fmtW) / sizeof(fmtW[0]); - *len += strlenW( table->columns[i].name ); - value = get_value_bstr( table, row, i ); - *len += SysStringLen( value ); - SysFreeString( value ); + if ((value = get_value_bstr( table, row, i ))) + { + *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += strlenW( table->columns[i].name ); + *len += SysStringLen( value ); + SysFreeString( value ); + } } if (!(ret = SysAllocStringLen( NULL, *len ))) return NULL; p = ret; for (i = 0; i < table->num_cols; i++) { - value = get_value_bstr( table, row, i ); - p += sprintfW( p, fmtW, table->columns[i].name, value ); - SysFreeString( value ); + if ((value = get_value_bstr( table, row, i ))) + { + p += sprintfW( p, fmtW, table->columns[i].name, value ); + SysFreeString( value ); + } } return ret; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 43ab91d..c114e53 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -166,6 +166,7 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) case CIM_DATETIME: case CIM_STRING: + if (!val) return NULL; len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val );

1 0

Michael Stefaniuc : itss: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 815031d8325482cd09d3387564df1587f14d60f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815031d8325482cd09d338756… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 2 15:17:06 2012 +0100 itss: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/itss/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index dedf4e5..0509c9e 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -354,7 +354,7 @@ static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n ) DWORD sz; /* szFile[1] has space for one character already */ - sz = sizeof(ITS_IMonikerImpl) + strlenW( name )*sizeof(WCHAR); + sz = FIELD_OFFSET( ITS_IMonikerImpl, szFile[strlenW( name ) + 1] ); itsmon = HeapAlloc( GetProcessHeap(), 0, sz ); itsmon->IMoniker_iface.lpVtbl = &ITS_IMonikerImpl_Vtbl;

1 0

Michael Stefaniuc : gdi.exe16: Use FIELD_OFFSET to calculate the size of structs with variable length array .
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: fb724cfd7be65905eadcb832794f83a9bb1ff383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb724cfd7be65905eadcb8327… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 2 15:13:55 2012 +0100 gdi.exe16: Use FIELD_OFFSET to calculate the size of structs with variable length array. --- dlls/gdi.exe16/gdi.c | 2 +- dlls/gdi.exe16/metafile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index ef460b3..2bd070b 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -1982,7 +1982,7 @@ void WINAPI SetRectRgn16( HRGN16 hrgn, INT16 left, INT16 top, INT16 right, INT16 */ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, UINT16 handles ) { - HANDLETABLE *ht32 = HeapAlloc( GetProcessHeap(), 0, handles * sizeof(*ht32) ); + HANDLETABLE *ht32 = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(HANDLETABLE, objectHandle[handles] )); unsigned int i; for (i = 0; i < handles; i++) ht32->objectHandle[i] = HGDIOBJ_32(ht->objectHandle[i]); diff --git a/dlls/gdi.exe16/metafile.c b/dlls/gdi.exe16/metafile.c index dfde8f7..2f0ccfe 100644 --- a/dlls/gdi.exe16/metafile.c +++ b/dlls/gdi.exe16/metafile.c @@ -213,7 +213,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf, /* create the handle table */ hHT = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, - sizeof(HANDLETABLE16) * mh->mtNoObjects); + FIELD_OFFSET(HANDLETABLE16, objectHandle[mh->mtNoObjects])); spht = WOWGlobalLock16(hHT); seg = hmf | 7;

1 0

Michael Stefaniuc : localspl: Avoid using sizeof on structs with variable length array.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: e67deeb8a139f51e63d5f7142c259ca6cd235a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67deeb8a139f51e63d5f7142… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 2 15:11:26 2012 +0100 localspl: Avoid using sizeof on structs with variable length array. --- dlls/localspl/localmon.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index f4e1739..8737a06 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -513,7 +513,6 @@ cleanup: static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) { port_t * port; - DWORD len; DWORD type; TRACE("%s, %p)\n", debugstr_w(pName), phPort); @@ -525,12 +524,11 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) type = get_type_from_local_name(pName); if (!type) return FALSE; - len = (lstrlenW(pName) + 1) * sizeof(WCHAR); - port = heap_alloc(sizeof(port_t) + len); + port = heap_alloc(FIELD_OFFSET(port_t, nameW[lstrlenW(pName) + 1])); if (!port) return FALSE; port->type = type; - memcpy(port->nameW, pName, len); + lstrcpyW(port->nameW, pName); *phPort = port; EnterCriticalSection(&port_handles_cs); @@ -734,16 +732,14 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE */ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess, PHANDLE phXcv) { - DWORD len; xcv_t * xcv; TRACE("%s, 0x%x, %p)\n", debugstr_w(pName), GrantedAccess, phXcv); /* No checks for any field is done in Windows */ - len = (lstrlenW(pName) + 1) * sizeof(WCHAR); - xcv = heap_alloc( sizeof(xcv_t) + len); + xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[lstrlenW(pName) + 1])); if (xcv) { xcv->GrantedAccess = GrantedAccess; - memcpy(xcv->nameW, pName, len); + lstrcpyW(xcv->nameW, pName); *phXcv = xcv; EnterCriticalSection(&xcv_handles_cs); list_add_tail(&xcv_handles, &xcv->entry);

1 0

Jacek Caban : mshtml: Try to install ActiveX if it's not registered.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: d1f2b8a8093dd7a3917c2aa5e84fd8f72fe30e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f2b8a8093dd7a3917c2aa5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:50:09 2012 +0100 mshtml: Try to install ActiveX if it's not registered. --- dlls/mshtml/npplugin.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 288 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 192b8dc..aa74961 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -313,6 +313,292 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) return ret; } +typedef struct { + IBindStatusCallback IBindStatusCallback_iface; + IWindowForBindingUI IWindowForBindingUI_iface; + LONG ref; +} InstallCallback; + +static inline InstallCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, InstallCallback, IBindStatusCallback_iface); +} + +static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, + REFIID riid, void **ppv) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IBindStatusCallback_iface; + }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { + TRACE("(%p)->(IID_IBindStatusCallback %p)\n", This, ppv); + *ppv = &This->IBindStatusCallback_iface; + }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { + TRACE("(%p)->(IID_IWindowForBindingUI %p)\n", This, ppv); + *ppv = &This->IWindowForBindingUI_iface; + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI InstallCallback_AddRef(IBindStatusCallback *iface) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI InstallCallback_Release(IBindStatusCallback *iface) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface, + DWORD dwReserved, IBinding *pib) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%p)\n", This, pnPriority); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnLowResource(IBindStatusCallback *iface, DWORD dwReserved) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%x)\n", This, dwReserved); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, + ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, + HRESULT hresult, LPCWSTR szError) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_GetBindInfo(IBindStatusCallback *iface, + DWORD* grfBINDF, BINDINFO* pbindinfo) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + + TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); + + *grfBINDF = BINDF_ASYNCHRONOUS; + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, + DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + ERR("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, IUnknown* punk) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + ERR("(%p)\n", This); + return E_NOTIMPL; +} + +static IBindStatusCallbackVtbl InstallCallbackVtbl = { + InstallCallback_QueryInterface, + InstallCallback_AddRef, + InstallCallback_Release, + InstallCallback_OnStartBinding, + InstallCallback_GetPriority, + InstallCallback_OnLowResource, + InstallCallback_OnProgress, + InstallCallback_OnStopBinding, + InstallCallback_GetBindInfo, + InstallCallback_OnDataAvailable, + InstallCallback_OnObjectAvailable +}; + +static inline InstallCallback *impl_from_IWindowForBindingUI(IWindowForBindingUI *iface) +{ + return CONTAINING_RECORD(iface, InstallCallback, IWindowForBindingUI_iface); +} + +static HRESULT WINAPI WindowForBindingUI_QueryInterface(IWindowForBindingUI *iface, REFIID riid, void **ppv) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI WindowForBindingUI_AddRef(IWindowForBindingUI *iface) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); + *phwnd = NULL; + return S_OK; +} + +static const IWindowForBindingUIVtbl WindowForBindingUIVtbl = { + WindowForBindingUI_QueryInterface, + WindowForBindingUI_AddRef, + WindowForBindingUI_Release, + WindowForBindingUI_GetWindow +}; + +typedef struct { + struct list entry; + IUri *uri; +} install_entry_t; + +static struct list install_list = LIST_INIT(install_list); + +static CRITICAL_SECTION cs_install_list; +static CRITICAL_SECTION_DEBUG cs_install_list_dbg = +{ + 0, 0, &cs_install_list, + { &cs_install_list_dbg.ProcessLocksList, &cs_install_list_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": install_list") } +}; +static CRITICAL_SECTION cs_install_list = { &cs_install_list_dbg, -1, 0, 0, 0, 0 }; + +static void install_codebase(const WCHAR *url) +{ + InstallCallback *callback; + IBindCtx *bctx; + HRESULT hres; + + callback = heap_alloc(sizeof(*callback)); + if(!callback) + return; + + callback->IBindStatusCallback_iface.lpVtbl = &InstallCallbackVtbl; + callback->IWindowForBindingUI_iface.lpVtbl = &WindowForBindingUIVtbl; + callback->ref = 1; + + hres = CreateAsyncBindCtx(0, &callback->IBindStatusCallback_iface, NULL, &bctx); + IBindStatusCallback_Release(&callback->IBindStatusCallback_iface); + if(FAILED(hres)) + return; + + hres = AsyncInstallDistributionUnit(NULL, NULL, NULL, 0, 0, url, bctx, NULL, 0); + IBindCtx_Release(bctx); + if(FAILED(hres)) + WARN("FAILED: %08x\n", hres); +} + +static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) +{ + nsAString attr_str, val_str; + BOOL is_on_list = FALSE; + install_entry_t *iter; + IUri *uri = NULL; + nsresult nsres; + HRESULT hres; + + static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; + + nsAString_InitDepend(&attr_str, codebaseW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMElement_GetAttribute(nselem, &attr_str, &val_str); + nsAString_Finish(&attr_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *val; + + nsAString_GetData(&val_str, &val); + if(*val) { + hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); + if(FAILED(hres)) + uri = NULL; + } + }else { + ERR("GetAttribute failed: %08x\n", nsres); + } + + nsAString_Finish(&attr_str); + if(!uri) + return; + + EnterCriticalSection(&cs_install_list); + + LIST_FOR_EACH_ENTRY(iter, &install_list, install_entry_t, entry) { + BOOL eq; + + hres = IUri_IsEqual(uri, iter->uri, &eq); + if(SUCCEEDED(hres) && eq) { + TRACE("already proceeded\n"); + is_on_list = TRUE; + break; + } + } + + if(!is_on_list) { + iter = heap_alloc(sizeof(*iter)); + if(iter) { + IUri_AddRef(uri); + iter->uri = uri; + + list_add_tail(&install_list, &iter->entry); + } + } + + LeaveCriticalSection(&cs_install_list); + + if(!is_on_list) { + BSTR display_uri; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(SUCCEEDED(hres)) { + install_codebase(display_uri); + SysFreeString(display_uri); + } + } + + IUri_Release(uri); +} + static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; @@ -337,6 +623,8 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n } hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); + if(hres == REGDB_E_CLASSNOTREG) + check_codebase(window, nselem); if(FAILED(hres)) return NULL;

1 0

Alexandre Julliard : urlmon: Add po file support for resource translation.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: c9e951dfd3dc0048806c0a6916a069f97ccedbf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e951dfd3dc0048806c0a691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 14:35:48 2012 +0100 urlmon: Add po file support for resource translation. --- configure | 2 +- configure.ac | 2 +- dlls/urlmon/Makefile.in | 3 +- dlls/urlmon/{rsrc.rc => urlmon.rc} | 0 po/ar.po | 44 ++++++++++++++++++++++------ po/bg.po | 50 ++++++++++++++++++++++++++------ po/ca.po | 52 ++++++++++++++++++++++++++++----- po/cs.po | 56 +++++++++++++++++++++++++++++------ po/da.po | 52 ++++++++++++++++++++++++++++----- po/de.po | 52 ++++++++++++++++++++++++++++----- po/el.po | 44 ++++++++++++++++++++++------ po/en.po | 44 +++++++++++++++++++++++----- po/en_US.po | 44 +++++++++++++++++++++++----- po/eo.po | 50 +++++++++++++++++++++++++++----- po/es.po | 52 ++++++++++++++++++++++++++++----- po/fa.po | 44 ++++++++++++++++++++++------ po/fi.po | 52 ++++++++++++++++++++++++++++----- po/fr.po | 52 ++++++++++++++++++++++++++++----- po/he.po | 51 +++++++++++++++++++++++++++----- po/hi.po | 42 ++++++++++++++++++++++----- po/hu.po | 52 ++++++++++++++++++++++++++++----- po/it.po | 52 ++++++++++++++++++++++++++++----- po/ja.po | 52 ++++++++++++++++++++++++++++----- po/ko.po | 52 ++++++++++++++++++++++++++++----- po/lt.po | 52 ++++++++++++++++++++++++++++----- po/ml.po | 42 ++++++++++++++++++++++----- po/nb_NO.po | 54 ++++++++++++++++++++++++++++------ po/nl.po | 52 ++++++++++++++++++++++++++++----- po/or.po | 42 ++++++++++++++++++++++----- po/pa.po | 42 ++++++++++++++++++++++----- po/pl.po | 52 ++++++++++++++++++++++++++++----- po/pt_BR.po | 52 ++++++++++++++++++++++++++++----- po/pt_PT.po | 52 ++++++++++++++++++++++++++++----- po/rm.po | 44 +++++++++++++++++++++++----- po/ro.po | 51 +++++++++++++++++++++++++++----- po/ru.po | 52 ++++++++++++++++++++++++++++----- po/sk.po | 50 ++++++++++++++++++++++++++------ po/sl.po | 52 ++++++++++++++++++++++++++++----- po/sr_RS(a)cyrillic.po | 52 +++++++++++++++++++++++++++------ po/sr_RS(a)latin.po | 52 +++++++++++++++++++++++++++------ po/sv.po | 52 ++++++++++++++++++++++++++++----- po/te.po | 42 ++++++++++++++++++++++----- po/th.po | 44 ++++++++++++++++++++++------ po/tr.po | 47 +++++++++++++++++++++++++----- po/uk.po | 52 ++++++++++++++++++++++++++++----- po/wa.po | 44 +++++++++++++++++++++++----- po/wine.pot | 42 ++++++++++++++++++++++----- po/zh_CN.po | 52 ++++++++++++++++++++++++++++----- po/zh_TW.po | 52 ++++++++++++++++++++++++++++----- 49 files changed, 1841 insertions(+), 375 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9e951dfd3dc0048806c0…

1 0

Jacek Caban : urlmon: Added AsyncInstallDistributionUnit implementation.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 59055c4d45c674c2a9dc2efcb8d0a973f870f3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=59055c4d45c674c2a9dc2efcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:53 2012 +0100 urlmon: Added AsyncInstallDistributionUnit implementation. --- dlls/urlmon/Makefile.in | 2 + dlls/urlmon/axinstall.c | 399 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/download.c | 82 ++++++++-- dlls/urlmon/resource.h | 26 +++ dlls/urlmon/rsrc.rc | 35 ++++ dlls/urlmon/umon.c | 11 -- dlls/urlmon/urlmon_main.c | 2 + dlls/urlmon/urlmon_main.h | 19 ++ 9 files changed, 551 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59055c4d45c674c2a9dc2…

1 0

Jacek Caban : urlmon: Moved extracting callback from IBindCtx to separated function.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 8012d4ae717c685a9eab0faeaa5b95baa46a7cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8012d4ae717c685a9eab0faea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:36 2012 +0100 urlmon: Moved extracting callback from IBindCtx to separated function. --- dlls/urlmon/bindctx.c | 103 ++++++++++++++++++++++++++++--------------------- 1 files changed, 59 insertions(+), 44 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 79260ef..914ed9f 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; +static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; extern IID IID_IBindStatusCallbackHolder; @@ -51,6 +51,44 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) return SUCCEEDED(hres) ? ret : NULL; } +static IBindStatusCallback *bsch_from_bctx(IBindCtx *bctx) +{ + IBindStatusCallback *bsc; + IUnknown *unk; + HRESULT hres; + + hres = IBindCtx_GetObjectParam(bctx, bscb_holderW, &unk); + if(FAILED(hres)) + return NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&bsc); + IUnknown_Release(unk); + return SUCCEEDED(hres) ? bsc : NULL; +} + +static IBindStatusCallback *bsc_from_bctx(IBindCtx *bctx) +{ + BindStatusCallback *holder; + IBindStatusCallback *bsc; + HRESULT hres; + + bsc = bsch_from_bctx(bctx); + if(!bsc) + return NULL; + + hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); + if(FAILED(hres)) + return bsc; + + if(holder->callback) { + IBindStatusCallback_Release(bsc); + bsc = holder->callback; + } + + IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); + return bsc; +} + static inline BindStatusCallback *impl_from_IBindStatusCallbackEx(IBindStatusCallbackEx *iface) { return CONTAINING_RECORD(iface, BindStatusCallback, IBindStatusCallbackEx_iface); @@ -516,7 +554,6 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb { BindStatusCallback *holder; IBindStatusCallback *bsc, *prev = NULL; - IUnknown *unk; HRESULT hres; TRACE("(%p %p %p %x)\n", pbc, pbsc, ppbscPrevious, dwReserved); @@ -524,34 +561,30 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb if (!pbc || !pbsc) return E_INVALIDARG; - hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, &unk); - if(SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&bsc); - IUnknown_Release(unk); + bsc = bsch_from_bctx(pbc); + if(bsc) { + hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); if(SUCCEEDED(hres)) { - hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); - if(SUCCEEDED(hres)) { - if(ppbscPrevious) { - IBindStatusCallback_AddRef(holder->callback); - *ppbscPrevious = holder->callback; - } - - set_callback(holder, pbsc); - - IBindStatusCallback_Release(bsc); - IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); - return S_OK; - }else { - prev = bsc; + if(ppbscPrevious) { + IBindStatusCallback_AddRef(holder->callback); + *ppbscPrevious = holder->callback; } + + set_callback(holder, pbsc); + + IBindStatusCallback_Release(bsc); + IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); + return S_OK; + }else { + prev = bsc; } - IBindCtx_RevokeObjectParam(pbc, BSCBHolder); + IBindCtx_RevokeObjectParam(pbc, bscb_holderW); } hres = wrap_callback(pbsc, &bsc); if(SUCCEEDED(hres)) { - hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); + hres = IBindCtx_RegisterObjectParam(pbc, bscb_holderW, (IUnknown*)bsc); IBindStatusCallback_Release(bsc); } if(FAILED(hres)) { @@ -579,39 +612,21 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb */ HRESULT WINAPI RevokeBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc) { - BindStatusCallback *holder; IBindStatusCallback *callback; - IUnknown *unk; - BOOL dorevoke = FALSE; - HRESULT hres; TRACE("(%p %p)\n", pbc, pbsc); if (!pbc || !pbsc) return E_INVALIDARG; - hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, &unk); - if(FAILED(hres)) + callback = bsc_from_bctx(pbc); + if(!callback) return S_OK; - hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&callback); - IUnknown_Release(unk); - if(FAILED(hres)) - return S_OK; + if(callback == pbsc) + IBindCtx_RevokeObjectParam(pbc, bscb_holderW); - hres = IBindStatusCallback_QueryInterface(callback, &IID_IBindStatusCallbackHolder, (void**)&holder); - if(SUCCEEDED(hres)) { - if(pbsc == holder->callback) - dorevoke = TRUE; - IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); - }else if(pbsc == callback) { - dorevoke = TRUE; - } IBindStatusCallback_Release(callback); - - if(dorevoke) - IBindCtx_RevokeObjectParam(pbc, BSCBHolder); - return S_OK; }

1 0

Jacek Caban : wininet: Commit cache file as soon as all data is written.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 54639c5dc5c336662547726ce89322498e85e8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=54639c5dc5c336662547726ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:22 2012 +0100 wininet: Commit cache file as soon as all data is written. --- dlls/wininet/http.c | 51 ++++++++++++++++++++++++++++++--------------- dlls/wininet/tests/http.c | 2 +- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 73dd991..8937a39 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1815,18 +1815,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) TRACE("\n"); if(request->hCacheFile) { - WCHAR url[INTERNET_MAX_URL_LENGTH]; - CloseHandle(request->hCacheFile); - - if(HTTP_GetRequestURL(request, url)) { - DWORD headersLen; - - headersLen = request->rawHeaders ? strlenW(request->rawHeaders) : 0; - CommitUrlCacheEntryW(url, request->cacheFile, request->expires, - request->last_modified, NORMAL_CACHE_ENTRY, - request->rawHeaders, headersLen, NULL, 0); - } + DeleteFileW(request->cacheFile); } heap_free(request->cacheFile); @@ -2233,6 +2223,25 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, return INET_SetOption(hdr, option, buffer, size); } +static void commit_cache_entry(http_request_t *req) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + + TRACE("%p\n", req); + + CloseHandle(req->hCacheFile); + req->hCacheFile = NULL; + + if(HTTP_GetRequestURL(req, url)) { + DWORD headersLen; + + headersLen = req->rawHeaders ? strlenW(req->rawHeaders) : 0; + CommitUrlCacheEntryW(url, req->cacheFile, req->expires, + req->last_modified, NORMAL_CACHE_ENTRY, + req->rawHeaders, headersLen, NULL, 0); + } +} + static void create_cache_entry(http_request_t *req) { WCHAR url[INTERNET_MAX_URL_LENGTH]; @@ -2271,6 +2280,9 @@ static void create_cache_entry(http_request_t *req) b = WriteFile(req->hCacheFile, req->read_buf+req->read_pos, req->read_size, &written, NULL); if(!b) FIXME("WriteFile failed: %u\n", GetLastError()); + + if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) + commit_cache_entry(req); } } @@ -2362,13 +2374,18 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, read_mode); assert(*read <= size); - if(*read && req->hCacheFile) { - BOOL bres; - DWORD written; + if(req->hCacheFile) { + if(*read) { + BOOL bres; + DWORD written; - bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); - if(!bres) - FIXME("WriteFile failed: %u\n", GetLastError()); + bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); + if(!bres) + FIXME("WriteFile failed: %u\n", GetLastError()); + } + + if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) + commit_cache_entry(req); } return res; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 38d1845..c9bd0a4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1255,7 +1255,7 @@ static void test_http_cache(void) ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed: %u\n", GetLastError()); - file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); file_size = GetFileSize(file, NULL);

1 0

← Newer
1
...
64
65
66
67
68
69
70
71
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 November 2012