September 2018 - Wine-devel

[PATCH] dplayx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Sep '18

11 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dplayx/dplay.c | 12 ++++++------ dlls/dplayx/dplobby.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index fde068138e..65c7e4df5d 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4335,7 +4335,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, RegCloseKey(hkServiceProvider); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -4433,7 +4433,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, RegCloseKey(hkServiceProvider); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -4682,7 +4682,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -5811,7 +5811,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, dwIndex = 0; do { - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName); dwIndex++; } @@ -5836,8 +5836,8 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, HKEY hkServiceProvider; WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ]; DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent); - - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, &filetime); if (ret_value == ERROR_NO_MORE_ITEMS) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 944fea9ec6..30d76aa16d 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -782,7 +782,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -809,7 +809,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 TRACE( "Found Address Type GUID %s\n", atSubKey ); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -950,7 +950,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ -- 2.14.4

2 1

[PATCH 2/3] riched20: Add stub for ITextDocument2 interface.
by Jactry Zeng 11 Sep '18

11 Sep '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 473 ++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 8 + 2 files changed, 481 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5c7be5eaa9..6c21a8721c 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -46,6 +46,7 @@ DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xa DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); +DEFINE_GUID(IID_ITextDocument2, 0x01c25500, 0x4268, 0x11d1, 0x88, 0x3a, 0x3c, 0x8b, 0x00, 0xc1, 0x00, 0x00); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextFont, 0x8cc497c3, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); @@ -209,6 +210,7 @@ typedef struct IRichEditOleImpl { IUnknown IUnknown_inner; IRichEditOle IRichEditOle_iface; ITextDocument ITextDocument_iface; + ITextDocument2 ITextDocument2_iface; IUnknown *outer_unk; LONG ref; @@ -272,6 +274,11 @@ static inline IRichEditOleImpl *impl_from_ITextDocument(ITextDocument *iface) return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument_iface); } +static inline IRichEditOleImpl *impl_from_ITextDocument2(ITextDocument2 *iface) +{ + return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument2_iface); +} + static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); @@ -945,6 +952,8 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R *ppvObj = &This->IRichEditOle_iface; else if (IsEqualGUID(riid, &IID_ITextDocument)) *ppvObj = &This->ITextDocument_iface; + else if (IsEqualGUID(riid, &IID_ITextDocument2)) + *ppvObj = &This->ITextDocument2_iface; if (*ppvObj) { IUnknown_AddRef((IUnknown *)*ppvObj); @@ -4178,6 +4187,469 @@ static const ITextDocumentVtbl tdvt = { ITextDocument_fnRangeFromPoint }; +/* ITextDocument2 */ +static HRESULT WINAPI ITextDocument2_fnQueryInterface(ITextDocument2 *iface, + REFIID riid, void **obj) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, obj); +} + +static ULONG WINAPI ITextDocument2_fnAddRef(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return IRichEditOle_AddRef(&This->IRichEditOle_iface); +} + +static ULONG WINAPI ITextDocument2_fnRelease(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return IRichEditOle_Release(&This->IRichEditOle_iface); +} + +static HRESULT WINAPI ITextDocument2_fnGetTypeInfoCount(ITextDocument2 *iface, UINT *info) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_GetTypeInfoCount(&This->ITextDocument_iface, info); +} + +static HRESULT WINAPI ITextDocument2_fnGetTypeInfo(ITextDocument2 *iface, UINT info, LCID lcid, + ITypeInfo **type_info) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_GetTypeInfo(&This->ITextDocument_iface, info, lcid, type_info); +} + +static HRESULT WINAPI ITextDocument2_fnGetIDsOfNames(ITextDocument2 *iface, REFIID riid, LPOLESTR *name, + UINT name_count, LCID lcid, DISPID *dispid) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_GetIDsOfNames(&This->ITextDocument_iface, riid, name, name_count, lcid, dispid); +} + +static HRESULT WINAPI ITextDocument2_fnInvoke(ITextDocument2 *iface, DISPID dispid, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *dispparams, + VARIANT *var_result, EXCEPINFO *excepinfo, + UINT *arg_err) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + return ITextDocument_Invoke(&This->ITextDocument_iface, dispid, riid, lcid, flags, dispparams, + var_result, excepinfo, arg_err); +} + +static HRESULT WINAPI ITextDocument2_fnGetName(ITextDocument2 *iface, BSTR *name) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, name); + + return ITextDocument_GetName(&This->ITextDocument_iface, name); +} + +static HRESULT WINAPI ITextDocument2_fnGetSelection(ITextDocument2 *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, selection); + + return ITextDocument_GetSelection(&This->ITextDocument_iface, selection); +} + +static HRESULT WINAPI ITextDocument2_fnGetStoryCount(ITextDocument2 *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_GetStoryCount(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2_fnGetStoryRanges(ITextDocument2 *iface, ITextStoryRanges **story_ranges) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, story_ranges); + + return ITextDocument_GetStoryRanges(&This->ITextDocument_iface, story_ranges); +} + +static HRESULT WINAPI ITextDocument2_fnGetSaved(ITextDocument2 *iface, LONG *value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, value); + + return ITextDocument_GetSaved(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnSetSaved(ITextDocument2 *iface, LONG value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d)\n", This, value); + + return ITextDocument_SetSaved(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnGetDefaultTabStop(ITextDocument2 *iface, float *value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, value); + + return ITextDocument_GetDefaultTabStop(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnSetDefaultTabStop(ITextDocument2 *iface, float value) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%f)\n", This, value); + + return ITextDocument_SetDefaultTabStop(&This->ITextDocument_iface, value); +} + +static HRESULT WINAPI ITextDocument2_fnNew(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_New(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2_fnOpen(ITextDocument2 *iface, VARIANT *var, LONG flags, LONG codepage) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p, %d, %d)\n", This, var, flags, codepage); + + return ITextDocument_Open(&This->ITextDocument_iface, var, flags, codepage); +} + +static HRESULT WINAPI ITextDocument2_fnSave(ITextDocument2 *iface, VARIANT *var, LONG flags, LONG codepage) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p, %d, %d)\n", This, var, flags, codepage); + + return ITextDocument_Save(&This->ITextDocument_iface, var, flags, codepage); +} + +static HRESULT WINAPI ITextDocument2_fnFreeze(ITextDocument2 *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_Freeze(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2_fnUnfreeze(ITextDocument2 *iface, LONG *count) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%p)\n", This, count); + + return ITextDocument_Unfreeze(&This->ITextDocument_iface, count); +} + +static HRESULT WINAPI ITextDocument2_fnBeginEditCollection(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_BeginEditCollection(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2_fnEndEditCollection(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)\n", This); + + return ITextDocument_EndEditCollection(&This->ITextDocument_iface); +} + +static HRESULT WINAPI ITextDocument2_fnUndo(ITextDocument2 *iface, LONG count, LONG *prop) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %p)\n", This, count, prop); + + return ITextDocument_Undo(&This->ITextDocument_iface, count, prop); +} + +static HRESULT WINAPI ITextDocument2_fnRedo(ITextDocument2 *iface, LONG count, LONG *prop) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %p)\n", This, count, prop); + + return ITextDocument_Redo(&This->ITextDocument_iface, count, prop); +} + +static HRESULT WINAPI ITextDocument2_fnRange(ITextDocument2 *iface, LONG cp_active, LONG cp_anchor, + ITextRange **range) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %d, %p)\n", This, cp_active, cp_anchor, range); + + return ITextDocument_Range(&This->ITextDocument_iface, cp_active, cp_anchor, range); +} + +static HRESULT WINAPI ITextDocument2_fnRangeFromPoint(ITextDocument2 *iface, LONG x, LONG y, + ITextRange **range) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + TRACE("(%p)->(%d, %d, %p)\n", This, x, y, range); + + return ITextDocument_RangeFromPoint(&This->ITextDocument_iface, x, y, range); +} + +static HRESULT WINAPI ITextDocument2_fnAttachMsgFilter(ITextDocument2 *iface, IUnknown *filter) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, filter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSetEffectColor(ITextDocument2 *iface, LONG index, COLORREF cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, 0x%x): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetEffectColor(ITextDocument2 *iface, LONG index, COLORREF *cr) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, index, cr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetCaretType(ITextDocument2 *iface, LONG *type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSetCaretType(ITextDocument2 *iface, LONG type) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d): stub\n", This, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetImmContext(ITextDocument2 *iface, LONG *context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnReleaseImmContext(ITextDocument2 *iface, LONG context) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d): stub\n", This, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetPreferredFont(ITextDocument2 *iface, LONG cp, LONG charrep, + LONG options, LONG current_charrep, LONG current_fontsize, + BSTR *bstr, LONG *pitch_family, LONG *new_fontsize) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", This, cp, charrep, options, current_charrep, + current_fontsize, bstr, pitch_family, new_fontsize); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetNotificationMode(ITextDocument2 *iface, LONG *mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSetNotificationMode(ITextDocument2 *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetClientRect(ITextDocument2 *iface, LONG type, LONG *left, LONG *top, + LONG *right, LONG *bottom) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, type, left, top, right, bottom); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetSelectionEx(ITextDocument2 *iface, ITextSelection **selection) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, selection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetWindow(ITextDocument2 *iface, LONG *hwnd) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, hwnd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnGetFEFlags(ITextDocument2 *iface, LONG *flags) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%p): stub\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnUpdateWindow(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnCheckTextLimit(ITextDocument2 *iface, LONG cch, LONG *exceed) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, cch, exceed); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnIMEInProgress(ITextDocument2 *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnSysBeep(ITextDocument2 *iface) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnUpdate(ITextDocument2 *iface, LONG mode) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(0x%x): stub\n", This, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextDocument2_fnNotify(ITextDocument2 *iface, LONG notify) +{ + IRichEditOleImpl *This = impl_from_ITextDocument2(iface); + + FIXME("(%p)->(%d): stub\n", This, notify); + + return E_NOTIMPL; +} + +static const ITextDocument2Vtbl td2vt = { + ITextDocument2_fnQueryInterface, + ITextDocument2_fnAddRef, + ITextDocument2_fnRelease, + ITextDocument2_fnGetTypeInfoCount, + ITextDocument2_fnGetTypeInfo, + ITextDocument2_fnGetIDsOfNames, + ITextDocument2_fnInvoke, + ITextDocument2_fnGetName, + ITextDocument2_fnGetSelection, + ITextDocument2_fnGetStoryCount, + ITextDocument2_fnGetStoryRanges, + ITextDocument2_fnGetSaved, + ITextDocument2_fnSetSaved, + ITextDocument2_fnGetDefaultTabStop, + ITextDocument2_fnSetDefaultTabStop, + ITextDocument2_fnNew, + ITextDocument2_fnOpen, + ITextDocument2_fnSave, + ITextDocument2_fnFreeze, + ITextDocument2_fnUnfreeze, + ITextDocument2_fnBeginEditCollection, + ITextDocument2_fnEndEditCollection, + ITextDocument2_fnUndo, + ITextDocument2_fnRedo, + ITextDocument2_fnRange, + ITextDocument2_fnRangeFromPoint, + ITextDocument2_fnAttachMsgFilter, + ITextDocument2_fnSetEffectColor, + ITextDocument2_fnGetEffectColor, + ITextDocument2_fnGetCaretType, + ITextDocument2_fnSetCaretType, + ITextDocument2_fnGetImmContext, + ITextDocument2_fnReleaseImmContext, + ITextDocument2_fnGetPreferredFont, + ITextDocument2_fnGetNotificationMode, + ITextDocument2_fnSetNotificationMode, + ITextDocument2_fnGetClientRect, + ITextDocument2_fnGetSelectionEx, + ITextDocument2_fnGetWindow, + ITextDocument2_fnGetFEFlags, + ITextDocument2_fnUpdateWindow, + ITextDocument2_fnCheckTextLimit, + ITextDocument2_fnIMEInProgress, + ITextDocument2_fnSysBeep, + ITextDocument2_fnUpdate, + ITextDocument2_fnNotify +}; + /* ITextSelection */ static HRESULT WINAPI ITextSelection_fnQueryInterface( ITextSelection *me, @@ -5277,6 +5749,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->IUnknown_inner.lpVtbl = &reo_unk_vtbl; reo->IRichEditOle_iface.lpVtbl = &revt; reo->ITextDocument_iface.lpVtbl = &tdvt; + reo->ITextDocument2_iface.lpVtbl = &td2vt; reo->ref = 1; reo->editor = editor; reo->txtSel = NULL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index aaf52bcfdd..ab2af3fdb7 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -117,6 +117,7 @@ static void test_Interfaces(void) { IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; + ITextDocument2 *txtDoc2 = NULL; ITextSelection *txtSel = NULL, *txtSel2; IUnknown *punk; HRESULT hres; @@ -195,6 +196,13 @@ static void test_Interfaces(void) hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk); ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); + hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument2, (void **)&txtDoc2); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtDoc2 != NULL, "IRichEditOle_QueryInterface\n"); + EXPECT_REF(txtDoc2, 5); + EXPECT_REF(reOle, 5); + ITextDocument2_Release(txtDoc2); + ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); refcount = IRichEditOle_Release(reOle); -- 2.18.0

3 2

[PATCH 1/3] include: Add ITextDocument2 interface.
by Jactry Zeng 11 Sep '18

11 Sep '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/tom.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/tom.idl b/include/tom.idl index 357b0457a5..7e63e6c301 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -237,6 +237,35 @@ interface ITextDocument : IDispatch HRESULT RangeFromPoint([in]LONG x, [in]LONG y, [retval, out]ITextRange **ppRange); } +[ + object, + uuid(01C25500-4268-11D1-883A-3C8B00C10000) +] +interface ITextDocument2 : ITextDocument +{ + HRESULT AttachMsgFilter([in]IUnknown *filter); + HRESULT SetEffectColor([in]LONG index, [in]COLORREF cr); + HRESULT GetEffectColor([in]LONG index, [out]COLORREF *cr); + HRESULT GetCaretType([retval, out]LONG *type); + HRESULT SetCaretType([in]LONG type); + HRESULT GetImmContext([retval, out]LONG *context); + HRESULT ReleaseImmContext([in]LONG context); + HRESULT GetPreferredFont([in]LONG cp, [in]LONG codepage, [in]LONG option, [in]LONG current_codepage, [in]LONG current_fontsize, + [out]BSTR *bstr, [out]LONG *pitch_family, [out]LONG *new_fontsize); + HRESULT GetNotificationMode([retval, out]LONG *mode); + HRESULT SetNotificationMode([in]LONG mode); + HRESULT GetClientRect([in]LONG type, [out]LONG *left, [out]LONG *top, [out]LONG *right, [out]LONG *bottom); + HRESULT GetSelectionEx([retval, out]ITextSelection **selection); + HRESULT GetWindow([out]LONG *hwnd); + HRESULT GetFEFlags([out]LONG *flags); + HRESULT UpdateWindow(); + HRESULT CheckTextLimit([in]LONG cch, [out]LONG *exceed); + HRESULT IMEInProgress([in]LONG mode); + HRESULT SysBeep(); + HRESULT Update([in]LONG mode); + HRESULT Notify([in]LONG notify); +} + interface ITextFont; interface ITextPara; -- 2.18.0

3 2

[PATCH] riched20: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Sep '18

11 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 11 +++++------ dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 4 ++-- dlls/riched20/reader.c | 4 ++-- dlls/riched20/richole.c | 6 +++--- dlls/riched20/style.c | 4 ++-- dlls/riched20/wrap.c | 4 ++-- dlls/riched20/writer.c | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 12f1fa67c1..2571ce97bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -518,8 +518,8 @@ void ME_RTFCharAttrHook(RTF_Info *info) RTFFont *f = RTFGetFont(info, info->rtfParam); if (f) { - MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, sizeof(fmt.szFaceName)/sizeof(WCHAR)); - fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; + MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, ARRAY_SIZE(fmt.szFaceName)); + fmt.szFaceName[ARRAY_SIZE(fmt.szFaceName)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; fmt.bPitchAndFamily = f->rtfFPitch | (f->rtfFFamily << 4); @@ -5272,10 +5272,9 @@ static BOOL isurlneutral( WCHAR c ) /* Some shortcuts */ if (isalnum( c )) return FALSE; - if (c > neutral_chars[sizeof(neutral_chars) / sizeof(neutral_chars[0]) - 1]) return FALSE; + if (c > neutral_chars[ARRAY_SIZE( neutral_chars ) - 1]) return FALSE; - return !!bsearch( &c, neutral_chars, sizeof(neutral_chars) / sizeof(neutral_chars[0]), - sizeof(c), wchar_comp ); + return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ), sizeof(c), wchar_comp ); } /** @@ -5408,7 +5407,7 @@ static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, i unsigned int i; ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE, FALSE); - for (i = 0; i < sizeof(prefixes) / sizeof(*prefixes); i++) + for (i = 0; i < ARRAY_SIZE(prefixes); i++) { if (nChars < prefixes[i].length) continue; if (!memcmp(prefixes[i].text, bufferW, prefixes[i].length * sizeof(WCHAR))) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fcc4e105a3..44cf3cbe78 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -536,7 +536,7 @@ int ME_GetParaBorderWidth(const ME_Context* c, int flags) int idx = (flags >> 8) & 0xF; int width; - if (idx >= sizeof(border_details) / sizeof(border_details[0])) + if (idx >= ARRAY_SIZE(border_details)) { FIXME("Unsupported border value %d\n", idx); return 0; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 8f35342b8e..fcd7936807 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -206,7 +206,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) /* This is not base-26 (or 27) as zeros don't count unless they are leading zeros. It's simplest to start with the least significant letter, so first calculate how many letters are needed. */ - for (i = 0, total = 0; i < sizeof(letter_base) / sizeof(letter_base[0]); i++) + for (i = 0, total = 0; i < ARRAY_SIZE( letter_base ); i++) { total += letter_base[i]; if (num < total) break; @@ -228,7 +228,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) case PFN_UCROMAN: if (!num) num = 1; - for (i = 0; i < sizeof(roman_base) / sizeof(roman_base[0]); i++) + for (i = 0; i < ARRAY_SIZE( roman_base ); i++) { if (i > 0) { diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 339ca04949..8410241729 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2596,13 +2596,13 @@ RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) RTFFlushCPOutputBuffer(info); while (length) { - int fit = min(length, sizeof(info->OutputBuffer) / sizeof(WCHAR) - info->dwOutputCount); + int fit = min(length, ARRAY_SIZE(info->OutputBuffer) - info->dwOutputCount); memmove(info->OutputBuffer + info->dwOutputCount, string, fit * sizeof(WCHAR)); info->dwOutputCount += fit; length -= fit; string += fit; - if (sizeof(info->OutputBuffer) / sizeof(WCHAR) == info->dwOutputCount) + if (ARRAY_SIZE(info->OutputBuffer) == info->dwOutputCount) RTFFlushUnicodeOutputBuffer(info); } } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5c7be5eaa9..11b9920b57 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -97,7 +97,7 @@ void release_typelib(void) if (!typelib) return; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -633,7 +633,7 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) if (ITextFont_GetName(font, &str) == S_OK) { fmt.dwMask |= CFM_FACE; - lstrcpynW(fmt.szFaceName, str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + lstrcpynW(fmt.szFaceName, str, ARRAY_SIZE(fmt.szFaceName)); SysFreeString(str); } @@ -817,7 +817,7 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop fmt.wWeight = value->l; break; case FONT_NAME: - lstrcpynW(fmt.szFaceName, value->str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + lstrcpynW(fmt.szFaceName, value->str, ARRAY_SIZE(fmt.szFaceName)); break; default: FIXME("unhandled font property %d\n", propid); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 97e98a7a14..c3f3fc3f9a 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -41,7 +41,7 @@ BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); to->cbSize = sizeof(CHARFORMAT2W); if (f->dwMask & CFM_FACE) { - MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, ARRAY_SIZE(to->szFaceName)); } return TRUE; } @@ -61,7 +61,7 @@ BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) - MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, f->szFaceName, -1, to->szFaceName, ARRAY_SIZE(to->szFaceName)); /* copy the rest of the 2A structure to 2W */ CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e3a70f07d1..5a1c499034 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -260,7 +260,7 @@ static void layout_row( ME_DisplayItem *start, const ME_DisplayItem *end ) TRACE("%d runs\n", num_runs); if (!num_runs) return; - if (num_runs > sizeof(buf) / (sizeof(buf[0]) * 5)) + if (num_runs > ARRAY_SIZE( buf ) / 5) vis_to_log = heap_alloc( num_runs * sizeof(int) * 5 ); log_to_vis = vis_to_log + num_runs; @@ -766,7 +766,7 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) ME_Run *run; ME_DisplayItem *di; SCRIPT_ITEM buf[16], *items = buf; - int items_passed = sizeof( buf ) / sizeof( buf[0] ), num_items, cur_item; + int items_passed = ARRAY_SIZE( buf ), num_items, cur_item; SCRIPT_CONTROL control = { LANG_USER_DEFAULT, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0 }; SCRIPT_STATE state = { 0, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 0, 0 }; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index b1e99d642f..2bd97d8db2 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -760,7 +760,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) { CFE_STRIKEOUT, "\\strike", "\\strike0" }, }; - for (i = 0; i < sizeof(effects) / sizeof(effects[0]); i++) + for (i = 0; i < ARRAY_SIZE( effects ); i++) { if ((old_fmt->dwEffects ^ fmt->dwEffects) & effects[i].effect) strcat( props, fmt->dwEffects & effects[i].effect ? effects[i].on : effects[i].off ); -- 2.14.4

2 1

[PATCH] winhttp: Implement WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT.
by Hans Leidekker 11 Sep '18

11 Sep '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 6 +- dlls/winhttp/session.c | 138 ++++++++++++++++++++++++++++------------- dlls/winhttp/tests/winhttp.c | 68 +++++++++++++++++++- dlls/winhttp/winhttp_private.h | 6 +- 4 files changed, 169 insertions(+), 49 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3e6d2af396..80694da02e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1741,7 +1741,7 @@ static BOOL open_connection( request_t *request ) return FALSE; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->recv_timeout ); + netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); if (is_secure) { if (connect->session->proxy_server && @@ -1776,7 +1776,7 @@ static BOOL open_connection( request_t *request ) TRACE("using connection %p\n", netconn); netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->recv_timeout ); + netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); request->netconn = netconn; } @@ -2628,6 +2628,7 @@ static BOOL receive_response( request_t *request, BOOL async ) BOOL ret; DWORD size, query, status; + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { if (!(ret = read_reply( request ))) @@ -2665,6 +2666,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } + netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) refill_buffer( request, FALSE ); if (async) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b697d4febf..959cafa209 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -46,10 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#define DEFAULT_RESOLVE_TIMEOUT 0 -#define DEFAULT_CONNECT_TIMEOUT 20000 -#define DEFAULT_SEND_TIMEOUT 30000 -#define DEFAULT_RECEIVE_TIMEOUT 30000 +#define DEFAULT_RESOLVE_TIMEOUT 0 +#define DEFAULT_CONNECT_TIMEOUT 20000 +#define DEFAULT_SEND_TIMEOUT 30000 +#define DEFAULT_RECEIVE_TIMEOUT 30000 +#define DEFAULT_RECEIVE_RESPONSE_TIMEOUT ~0u void set_last_error( DWORD error ) { @@ -132,18 +133,27 @@ static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buf *(DWORD *)buffer = session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: *(DWORD *)buffer = session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: *(DWORD *)buffer = session->send_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - *(DWORD *)buffer = session->recv_timeout; + *(DWORD *)buffer = session->receive_timeout; + *buflen = sizeof(DWORD); + return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + *(DWORD *)buffer = session->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER ); @@ -193,31 +203,44 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_DISABLE_FEATURE: set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; + case WINHTTP_OPTION_RESOLVE_TIMEOUT: session->resolve_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: session->connect_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: session->send_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - session->recv_timeout = *(DWORD *)buffer; + session->receive_timeout = *(DWORD *)buffer; return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + session->receive_response_timeout = *(DWORD *)buffer; + return TRUE; + case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); return TRUE; + case WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); session->unload_event = *(HANDLE *)buffer; return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_SERVER: FIXME("WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %d\n", *(DWORD *)buffer); return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: FIXME("WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", *(DWORD *)buffer); return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); @@ -253,7 +276,8 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; - session->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; + session->receive_timeout = DEFAULT_RECEIVE_TIMEOUT; + session->receive_response_timeout = DEFAULT_RECEIVE_RESPONSE_TIMEOUT; list_init( &session->cookie_cache ); if (agent && !(session->agent = strdupW( agent ))) goto end; @@ -334,18 +358,27 @@ static BOOL connect_query_option( object_header_t *hdr, DWORD option, LPVOID buf *(DWORD *)buffer = connect->session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: *(DWORD *)buffer = connect->session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: *(DWORD *)buffer = connect->session->send_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - *(DWORD *)buffer = connect->session->recv_timeout; + *(DWORD *)buffer = connect->session->receive_timeout; *buflen = sizeof(DWORD); return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + *(DWORD *)buffer = connect->session->receive_response_timeout; + *buflen = sizeof(DWORD); + return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER ); @@ -795,16 +828,24 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: *(DWORD *)buffer = request->connect_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: *(DWORD *)buffer = request->send_timeout; *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - *(DWORD *)buffer = request->recv_timeout; + *(DWORD *)buffer = request->receive_timeout; + *buflen = sizeof(DWORD); + return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + *(DWORD *)buffer = request->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -927,14 +968,21 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_RESOLVE_TIMEOUT: request->resolve_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONNECT_TIMEOUT: request->connect_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_SEND_TIMEOUT: request->send_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_RECEIVE_TIMEOUT: - request->recv_timeout = *(DWORD *)buffer; + request->receive_timeout = *(DWORD *)buffer; + return TRUE; + + case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + request->receive_response_timeout = *(DWORD *)buffer; return TRUE; case WINHTTP_OPTION_USERNAME: @@ -977,6 +1025,7 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_FEATURE: if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) { @@ -989,9 +1038,11 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + case WINHTTP_OPTION_CONNECT_RETRIES: FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; + default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); @@ -1094,7 +1145,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->resolve_timeout = connect->session->resolve_timeout; request->connect_timeout = connect->session->connect_timeout; request->send_timeout = connect->session->send_timeout; - request->recv_timeout = connect->session->recv_timeout; + request->receive_timeout = connect->session->receive_timeout; + request->receive_response_timeout = connect->session->receive_response_timeout; if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; @@ -2024,8 +2076,6 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int { BOOL ret = TRUE; object_header_t *hdr; - request_t *request; - session_t *session; TRACE("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); @@ -2043,43 +2093,45 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int switch(hdr->type) { - case WINHTTP_HANDLE_TYPE_REQUEST: - request = (request_t *)hdr; - request->connect_timeout = connect; - - if (resolve < 0) resolve = 0; - request->resolve_timeout = resolve; - - if (send < 0) send = 0; - request->send_timeout = send; + case WINHTTP_HANDLE_TYPE_REQUEST: + { + request_t *request = (request_t *)hdr; + request->connect_timeout = connect; - if (receive < 0) receive = 0; - request->recv_timeout = receive; + if (resolve < 0) resolve = 0; + request->resolve_timeout = resolve; - if (request->netconn) - { - if (netconn_set_timeout( request->netconn, TRUE, send )) ret = FALSE; - if (netconn_set_timeout( request->netconn, FALSE, receive )) ret = FALSE; - } - break; + if (send < 0) send = 0; + request->send_timeout = send; - case WINHTTP_HANDLE_TYPE_SESSION: - session = (session_t *)hdr; - session->connect_timeout = connect; + if (receive < 0) receive = 0; + request->receive_timeout = receive; - if (resolve < 0) resolve = 0; - session->resolve_timeout = resolve; + if (request->netconn) + { + if (netconn_set_timeout( request->netconn, TRUE, send )) ret = FALSE; + if (netconn_set_timeout( request->netconn, FALSE, receive )) ret = FALSE; + } + break; + } + case WINHTTP_HANDLE_TYPE_SESSION: + { + session_t *session = (session_t *)hdr; + session->connect_timeout = connect; - if (send < 0) send = 0; - session->send_timeout = send; + if (resolve < 0) resolve = 0; + session->resolve_timeout = resolve; - if (receive < 0) receive = 0; - session->recv_timeout = receive; - break; + if (send < 0) send = 0; + session->send_timeout = send; - default: - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); - ret = FALSE; + if (receive < 0) receive = 0; + session->receive_timeout = receive; + break; + } + default: + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + ret = FALSE; } release_object( hdr ); if (ret) set_last_error( ERROR_SUCCESS ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a3c8507fea..1c72c07574 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1383,7 +1383,7 @@ static void test_set_default_proxy_config(void) set_default_proxy_reg_value( saved_proxy_settings, len, type ); } -static void test_Timeouts (void) +static void test_timeouts(void) { BOOL ret; DWORD value, size; @@ -1972,6 +1972,70 @@ static void test_Timeouts (void) ok(ret, "%u\n", GetLastError()); ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + /* response timeout */ + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == ~0u, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 30000; + ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + todo_wine ok(value == 0xbeefdead, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == ~0u, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 30000; + ret = WinHttpSetOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == ~0u, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 48878; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + todo_wine ok(value == 48879, "got %u\n", value); + + SetLastError(0xdeadbeef); + value = 48880; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + value = 0xdeadbeef; + size = sizeof(value); + ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); + ok(ret, "%u\n", GetLastError()); + ok(value == 48880, "got %u\n", value); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -4563,7 +4627,7 @@ START_TEST (winhttp) test_QueryOption(); test_set_default_proxy_config(); test_empty_headers_param(); - test_Timeouts(); + test_timeouts(); test_resolve_timeout(); test_credentials(); test_IWinHttpRequest_Invoke(); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 838561fe66..6b4e3b0405 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -98,7 +98,8 @@ typedef struct int resolve_timeout; int connect_timeout; int send_timeout; - int recv_timeout; + int receive_timeout; + int receive_response_timeout; LPWSTR proxy_server; LPWSTR proxy_bypass; LPWSTR proxy_username; @@ -198,7 +199,8 @@ typedef struct int resolve_timeout; int connect_timeout; int send_timeout; - int recv_timeout; + int receive_timeout; + int receive_response_timeout; LPWSTR status_text; DWORD content_length; /* total number of bytes to be read */ DWORD content_read; /* bytes read so far */ -- 2.11.0

2 2

[PATCH 1/4] msxml3: Allow creating floating attributes.
by Daniel Lehman 11 Sep '18

11 Sep '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/attribute.c | 9 ++++++++- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 637615b341..8eb2695128 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -50,6 +50,7 @@ typedef struct _domattr xmlnode node; IXMLDOMAttribute IXMLDOMAttribute_iface; LONG ref; + BOOL floating; } domattr; static const tid_t domattr_se_tids[] = { @@ -116,6 +117,11 @@ static ULONG WINAPI domattr_Release( if ( ref == 0 ) { destroy_xmlnode(&This->node); + if ( This->floating ) + { + xmlFreeNs( This->node.node->ns ); + xmlFreeNode( This->node.node ); + } heap_free( This ); } @@ -709,7 +715,7 @@ static dispex_static_data_t domattr_dispex = { domattr_iface_tids }; -IUnknown* create_attribute( xmlNodePtr attribute ) +IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating ) { domattr *This; @@ -719,6 +725,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->IXMLDOMAttribute_iface.lpVtbl = &domattr_vtbl; This->ref = 1; + This->floating = floating; init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->IXMLDOMAttribute_iface, &domattr_dispex); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6e00aa0116..4faeed400c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI domelem_getAttributeNode( if (attr) { - IUnknown *unk = create_attribute((xmlNodePtr)attr); + IUnknown *unk = create_attribute((xmlNodePtr)attr, FALSE); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 94ef66b23d..abc6ab3465 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -252,7 +252,7 @@ extern IUnknown *create_domdoc( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_xmldoc( void ) DECLSPEC_HIDDEN; extern IXMLDOMNode *create_node( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_element( xmlNodePtr ) DECLSPEC_HIDDEN; -extern IUnknown *create_attribute( xmlNodePtr ) DECLSPEC_HIDDEN; +extern IUnknown *create_attribute( xmlNodePtr, BOOL ) DECLSPEC_HIDDEN; extern IUnknown *create_text( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_pi( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_comment( xmlNodePtr ) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index bcb4181374..fc18935b69 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2271,7 +2271,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_element( node ); break; case XML_ATTRIBUTE_NODE: - pUnk = create_attribute( node ); + pUnk = create_attribute( node, FALSE ); break; case XML_TEXT_NODE: pUnk = create_text( node ); -- 2.17.1

2 4

[PATCH] ntoskrnl: Add ExReleaseResourceLite stub.
by Gijs Vermeulen 11 Sep '18

11 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45800 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 292f89c2e7..804a938372 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3986,3 +3986,8 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) FIXME("stub: %d %d\n", component, level); return STATUS_NOT_IMPLEMENTED; } + +void WINAPI ExReleaseResourceLite(PERESOURCE resource) +{ + FIXME("stub: %p\n", resource); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e867dbe680..12f9ddb096 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -9,7 +9,7 @@ @ stdcall -norelay ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -norelay ExReleaseFastMutexUnsafe(ptr) -@ stub ExReleaseResourceLite +@ stdcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @ stub ExReleaseRundownProtectionEx @ stub ExRundownCompleted -- 2.18.0

1 0

[PATCH] mfplat: Correct spec for MFTRegisterLocal
by Alistair Leslie-Hughes 10 Sep '18

10 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/mfplat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 42b0b86f45..f6064476d7 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) +@ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stdcall MFTUnregisterLocal(ptr) -- 2.18.0

1 0

[PATCH 3/4] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge 10 Sep '18

10 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] wsdapi: Implement matching of names in MatchProbeEx.
by Owen Rudge 10 Sep '18

10 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 58 ++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 ++++++ dlls/wsdapi/wsdapi_internal.h | 6 ++++ 3 files changed, 69 insertions(+), 4 deletions(-)

1 0