Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [AVIFIL32] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1713a3c601deb2196e67… commit f1713a3c601deb2196e67825e1958abef72c4666 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:04:19 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:04:19 2018 +0100 [AVIFIL32] Sync with Wine 3.0. CORE-14225 --- dll/win32/avifil32/CMakeLists.txt | 3 - dll/win32/avifil32/avifil32.idl | 25 ++++---- dll/win32/avifil32/avifile_ifaces.idl | 105 ---------------------------------- dll/win32/avifil32/avifile_private.h | 1 - dll/win32/avifil32/factory.c | 8 +-- dll/win32/avifil32/getframe.c | 102 +++++++++++++++++---------------- media/doc/README.WINE | 2 +- 7 files changed, 65 insertions(+), 181 deletions(-) diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt index 303cc83b04..19fc0d3324 100644 --- a/dll/win32/avifil32/CMakeLists.txt +++ b/dll/win32/avifil32/CMakeLists.txt @@ -5,7 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__ -DENTRY_PREFIX=avifil32_) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) -add_rpcproxy_files(avifil32.idl) list(APPEND SOURCE acmstream.c @@ -18,14 +17,12 @@ list(APPEND SOURCE icmstream.c tmpfile.c wavfile.c - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c avifile_private.h) add_library(avifil32 SHARED ${SOURCE} guid.c rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/avifil32_p.c ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) diff --git a/dll/win32/avifil32/avifil32.idl b/dll/win32/avifil32/avifil32.idl index e23c176051..1f50f154ae 100644 --- a/dll/win32/avifil32/avifil32.idl +++ b/dll/win32/avifil32/avifil32.idl @@ -18,42 +18,39 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep proxy #pragma makedep register -#include "avifile_ifaces.idl" - -[ - helpstring("IAVIStream & IAVIFile Proxy"), - threading(both), - uuid(0002000d-0000-0000-c000-000000000046) -] -coclass PSFactoryBuffer { interface IFactoryBuffer; } - [ helpstring("Microsoft AVI Files"), - threading(both), + threading(apartment), uuid(00020000-0000-0000-C000-000000000046) ] coclass AVIFile { interface IAVIFile; } [ helpstring("AVI Compressed Stream"), - threading(both), + threading(apartment), uuid(00020001-0000-0000-c000-000000000046) ] coclass ICMStream { interface IAVIStream; } [ helpstring("Microsoft Wave File"), - threading(both), + threading(apartment), uuid(00020003-0000-0000-c000-000000000046) ] coclass WAVFile { interface IAVIFile; } +[ + helpstring("IAVIStream & IAVIFile Proxy"), + threading(apartment), + uuid(0002000d-0000-0000-c000-000000000046) +] +coclass AVIProxy { } + [ helpstring("ACM Compressed Audio Stream"), - threading(both), + threading(apartment), uuid(0002000f-0000-0000-c000-000000000046) ] coclass ACMStream { interface IAVIStream; } diff --git a/dll/win32/avifil32/avifile_ifaces.idl b/dll/win32/avifil32/avifile_ifaces.idl deleted file mode 100644 index f9280e5728..0000000000 --- a/dll/win32/avifil32/avifile_ifaces.idl +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Proxy support for avifil32 - * - * Copyright 2016 Dmitry Timoshkov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* - * These interface descriptions are supposed to be used for automatic proxy - * generation by an IDL compiler. - * - * While it's possible to convert include/vfw.h to an .idl, that's proved to - * be a major waste of an effort because the resulting interface descriptions - * can't be used for automatic proxy generation since they are not compatible - * with IDL compiler restrictions for proxies, and fixing them up would make - * generated vfw.h source incompatible with PSDK's equivalent. - */ - -import "wtypes.idl"; -import "unknwn.idl"; - -typedef struct _AVISTREAMINFOW -{ - DWORD fccType; - DWORD fccHandler; - DWORD dwFlags; - DWORD dwCaps; - WORD wPriority; - WORD wLanguage; - DWORD dwScale; - DWORD dwRate; - DWORD dwStart; - DWORD dwLength; - DWORD dwInitialFrames; - DWORD dwSuggestedBufferSize; - DWORD dwQuality; - DWORD dwSampleSize; - RECT rcFrame; - DWORD dwEditCount; - DWORD dwFormatChangeCount; - WCHAR szName[64]; -} AVISTREAMINFOW; - -[ - object, - uuid(00020021-0000-0000-c000-000000000046) -] -interface IAVIStream : IUnknown -{ - HRESULT Create(LPARAM lParam1, LPARAM lParam2); - HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); - LONG FindSample(LONG lPos, LONG lFlags); - HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); - HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); - HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); - HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); - HRESULT Delete(LONG lStart, LONG lSamples); - HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); - HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); - HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); -}; - -typedef struct _AVIFILEINFOW -{ - DWORD dwMaxBytesPerSec; - DWORD dwFlags; - DWORD dwCaps; - DWORD dwStreams; - DWORD dwSuggestedBufferSize; - DWORD dwWidth; - DWORD dwHeight; - DWORD dwScale; - DWORD dwRate; - DWORD dwLength; - DWORD dwEditCount; - WCHAR szFileType[64]; -} AVIFILEINFOW; - -[ - object, - uuid(00020020-0000-0000-c000-000000000046) -] -interface IAVIFile : IUnknown -{ - HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); - HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); - HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); - HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); - HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); - HRESULT EndRecord(void); - HRESULT DeleteStream(DWORD fccType, LONG lParam); -}; diff --git a/dll/win32/avifil32/avifile_private.h b/dll/win32/avifil32/avifile_private.h index cf03c2572e..fed58504a5 100644 --- a/dll/win32/avifil32/avifile_private.h +++ b/dll/win32/avifil32/avifile_private.h @@ -69,6 +69,5 @@ extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; -extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; #endif /* __AVIFILE_PRIVATE_H */ diff --git a/dll/win32/avifil32/factory.c b/dll/win32/avifil32/factory.c index 0ef0e338a9..5689241d67 100644 --- a/dll/win32/avifil32/factory.c +++ b/dll/win32/avifil32/factory.c @@ -166,18 +166,12 @@ LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) */ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { - HRESULT hr; - TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); if (pclsid == NULL || piid == NULL || ppv == NULL) return E_FAIL; - hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv); - if (SUCCEEDED(hr)) - return hr; - - return avifil32_DllGetClassObject(pclsid,piid,ppv); + return AVIFILE_CreateClassFactory(pclsid,piid,ppv); } /***************************************************************************** diff --git a/dll/win32/avifil32/getframe.c b/dll/win32/avifil32/getframe.c index 06ac404528..1229876506 100644 --- a/dll/win32/avifil32/getframe.c +++ b/dll/win32/avifil32/getframe.c @@ -394,6 +394,8 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); + + return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -403,64 +405,64 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } - } - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; + } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; - } - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; + + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) + return AVIERR_OK; + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) - return AVIERR_OK; - AVIFILE_CloseCompressor(This); + AVIFILE_CloseCompressor(This); - return AVIERR_COMPRESSOR; + return AVIERR_COMPRESSOR; + } } static const struct IGetFrameVtbl igetframeVtbl = { diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3d7771da6c..239c5fd0d8 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -48,7 +48,7 @@ reactos/dll/win32/advpack # Synced to WineStaging-2.9 reactos/dll/win32/atl # Synced to Wine-3.0 reactos/dll/win32/atl80 # Synced to Wine-3.0 reactos/dll/win32/atl100 # Synced to Wine-3.0 -reactos/dll/win32/avifil32 # Synced to WineStaging-2.9 +reactos/dll/win32/avifil32 # Synced to Wine-3.0 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-2.9

6 years, 11 months

01/01: [ATL][ATL80][ATL100] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c96b06291c131391d532… commit 9c96b06291c131391d53241abade51e2e66f3b44 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:01:06 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:01:06 2018 +0100 [ATL][ATL80][ATL100] Sync with Wine 3.0. CORE-14225 --- dll/win32/atl/atl.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ media/doc/README.WINE | 6 +-- 2 files changed, 132 insertions(+), 3 deletions(-) diff --git a/dll/win32/atl/atl.c b/dll/win32/atl/atl.c index 79fbd9c206..ce0d616c9a 100644 --- a/dll/win32/atl/atl.c +++ b/dll/win32/atl/atl.c @@ -481,6 +481,7 @@ void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *winmod) /*********************************************************************** * AtlComModuleGetClassObject [atl100.15] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) { _ATL_OBJMAP_ENTRY **iter; @@ -505,10 +506,37 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, WARN("Class %s not found\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; } +#else +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) +{ + _ATL_OBJMAP_ENTRY_EX **iter; + HRESULT hres; + + TRACE("(%p %s %s %p)\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(!pm) + return E_INVALIDARG; + + for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) { + if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { + if(!(*iter)->pCache->pCF) + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCache->pCF); + if((*iter)->pCache->pCF) + hres = IUnknown_QueryInterface((*iter)->pCache->pCF, riid, ppv); + TRACE("returning %p (%08x)\n", *ppv, hres); + return hres; + } + } + + WARN("Class %s not found\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} +#endif /*********************************************************************** * AtlComModuleRegisterClassObjects [atl100.17] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) { _ATL_OBJMAP_ENTRY **iter; @@ -536,10 +564,40 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD c return S_OK; } +#else +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) +{ + _ATL_OBJMAP_ENTRY_EX **iter; + IUnknown *unk; + HRESULT hres; + + TRACE("(%p %x %x)\n", module, context, flags); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)->pfnGetClassObject) + continue; + + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = CoRegisterClassObject((*iter)->pclsid, unk, context, flags, &(*iter)->pCache->dwRegister); + IUnknown_Release(unk); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} +#endif /*********************************************************************** * AtlComModuleRevokeClassObjects [atl100.20] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) { _ATL_OBJMAP_ENTRY **iter; @@ -558,10 +616,31 @@ HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return S_OK; } +#else +HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) +{ + _ATL_OBJMAP_ENTRY_EX **iter; + HRESULT hres; + + TRACE("(%p)\n", module); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + hres = CoRevokeClassObject((*iter)->pCache->dwRegister); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} +#endif /*********************************************************************** * AtlComModuleUnregisterServer [atl100.22] */ +#if _ATL_VER < _ATL_VER_110 HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) { const struct _ATL_CATMAP_ENTRY *catmap; @@ -610,6 +689,56 @@ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeL return S_OK; } +#else +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + const struct _ATL_CATMAP_ENTRY *catmap; + _ATL_OBJMAP_ENTRY_EX **iter; + HRESULT hres; + + TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); + + for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { + if(!*iter || (clsid && !IsEqualCLSID((*iter)->pclsid, clsid))) + continue; + + TRACE("Unregistering clsid %s\n", debugstr_guid((*iter)->pclsid)); + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, FALSE); + if(FAILED(hres)) + return hres; + } + + hres = (*iter)->pfnUpdateRegistry(FALSE); + if(FAILED(hres)) + return hres; + } + + if(bRegTypeLib) { + ITypeLib *typelib; + TLIBATTR *attr; + BSTR path; + + hres = AtlLoadTypeLib(mod->m_hInstTypeLib, NULL, &path, &typelib); + if(FAILED(hres)) + return hres; + + SysFreeString(path); + hres = ITypeLib_GetLibAttr(typelib, &attr); + if(SUCCEEDED(hres)) { + hres = UnRegisterTypeLib(&attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, attr->lcid, attr->syskind); + ITypeLib_ReleaseTLibAttr(typelib, attr); + } + ITypeLib_Release(typelib); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} +#endif #endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2de694b13d..3d7771da6c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -45,9 +45,9 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-2.16 reactos/dll/win32/activeds # Synced to WineStaging-2.9 reactos/dll/win32/actxprxy # Synced to WineStaging-2.9 reactos/dll/win32/advpack # Synced to WineStaging-2.9 -reactos/dll/win32/atl # Synced to WineStaging-2.9 -reactos/dll/win32/atl80 # Synced to WineStaging-2.9 -reactos/dll/win32/atl100 # Synced to WineStaging-2.9 +reactos/dll/win32/atl # Synced to Wine-3.0 +reactos/dll/win32/atl80 # Synced to Wine-3.0 +reactos/dll/win32/atl100 # Synced to Wine-3.0 reactos/dll/win32/avifil32 # Synced to WineStaging-2.9 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync

6 years, 11 months

01/01: [INCLUDE/WINE] Update atlbase.h. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c8b42be0f49e4af31fcb… commit 4c8b42be0f49e4af31fcb0ccaa89afd39514756a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Jan 19 00:00:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Jan 19 00:00:10 2018 +0100 [INCLUDE/WINE] Update atlbase.h. CORE-14225 --- sdk/include/reactos/wine/atlbase.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sdk/include/reactos/wine/atlbase.h b/sdk/include/reactos/wine/atlbase.h index 1f91f55895..1e0d76082f 100644 --- a/sdk/include/reactos/wine/atlbase.h +++ b/sdk/include/reactos/wine/atlbase.h @@ -28,7 +28,9 @@ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 +#define _ATL_VER_90 0x0900 #define _ATL_VER_100 0x0a00 +#define _ATL_VER_110 0x0b00 #ifndef _ATL_VER #define _ATL_VER _ATL_VER_100 @@ -92,6 +94,23 @@ typedef struct _ATL_OBJMAP_ENTRYW_TAG void (WINAPI *pfnObjectMain)(BOOL bStarting); } _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY; +typedef struct _ATL_OBJMAP_CACHE +{ + IUnknown *pCF; + DWORD dwRegister; +} _ATL_OBJMAP_CACHE; + +typedef struct _ATL_OBJMAP_ENTRY110 +{ + const CLSID* pclsid; + HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister); + _ATL_CREATORFUNC* pfnGetClassObject; + _ATL_CREATORFUNC* pfnCreateInstance; + _ATL_OBJMAP_CACHE* pCache; + _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; + _ATL_CATMAPFUNC* pfnGetCategoryMap; + void (WINAPI *pfnObjectMain)(BOOL bStarting); +} _ATL_OBJMAP_ENTRY110, _ATL_OBJMAP_ENTRY_EX; typedef struct _ATL_TERMFUNC_ELEM_TAG { @@ -184,6 +203,16 @@ typedef struct _ATL_WIN_MODULE70 CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; } _ATL_WIN_MODULE70; +#if _ATL_VER >= _ATL_VER_110 +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY_EX **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY_EX **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; +#else typedef struct _ATL_COM_MODULE70 { UINT cbSize; @@ -192,6 +221,7 @@ typedef struct _ATL_COM_MODULE70 _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; CComCriticalSection m_csObjMap; } _ATL_COM_MODULE70, _ATL_COM_MODULE; +#endif #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE;

6 years, 11 months

01/01: [COMDLG32] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b53d60cfc591ba94db6a7… commit b53d60cfc591ba94db6a7264d74f55a48bbe4856 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Jan 18 23:52:46 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Jan 18 23:52:46 2018 +0100 [COMDLG32] Sync with Wine 3.0. CORE-14225 --- dll/win32/comdlg32/filedlg.c | 34 +++++++++++++++++----------------- dll/win32/comdlg32/fontdlg.c | 27 +++++++++++++++++++++++++-- media/doc/README.WINE | 2 +- 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index b3b40e67e6..457ee9b13e 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -442,23 +442,6 @@ static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) ret = FALSE; } - /* set the lpstrFileTitle */ - if (ret && info->ofnInfos->lpstrFile && info->ofnInfos->lpstrFileTitle) - { - if (info->unicode) - { - LPOPENFILENAMEW ofn = info->ofnInfos; - WCHAR *file_title = PathFindFileNameW(ofn->lpstrFile); - lstrcpynW(ofn->lpstrFileTitle, file_title, ofn->nMaxFileTitle); - } - else - { - LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)info->ofnInfos; - char *file_title = PathFindFileNameA(ofn->lpstrFile); - lstrcpynA(ofn->lpstrFileTitle, file_title, ofn->nMaxFileTitle); - } - } - if (current_dir) { SetCurrentDirectoryW(current_dir); @@ -2677,6 +2660,23 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - tempFileA) + 1 : 0; } + /* set the lpstrFileTitle */ + if(fodInfos->ofnInfos->lpstrFileTitle) + { + LPWSTR lpstrFileTitle = PathFindFileNameW(lpstrPathAndFile); + if(fodInfos->unicode) + { + LPOPENFILENAMEW ofn = fodInfos->ofnInfos; + lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle); + } + else + { + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; + WideCharToMultiByte(CP_ACP, 0, lpstrFileTitle, -1, + ofn->lpstrFileTitle, ofn->nMaxFileTitle, NULL, NULL); + } + } + /* copy currently selected filter to lpstrCustomFilter */ if (fodInfos->ofnInfos->lpstrCustomFilter) { diff --git a/dll/win32/comdlg32/fontdlg.c b/dll/win32/comdlg32/fontdlg.c index 6cc8c897bc..d4c90df05b 100644 --- a/dll/win32/comdlg32/fontdlg.c +++ b/dll/win32/comdlg32/fontdlg.c @@ -923,14 +923,37 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO int i; long l; HDC hdc; + BOOL cmb_selected_by_edit = FALSE; if (!lpcf) return FALSE; + if(HIWORD(wParam) == CBN_EDITCHANGE) + { + int idx; + WCHAR str_edit[256], str_cmb[256]; + int cmb = LOWORD(wParam); + + GetDlgItemTextW(hDlg, cmb, str_edit, sizeof(str_edit) / sizeof(str_edit[0])); + idx = SendDlgItemMessageW(hDlg, cmb, CB_FINDSTRING, -1, (LPARAM)str_edit); + if(idx != -1) + { + SendDlgItemMessageW(hDlg, cmb, CB_GETLBTEXT, idx, (LPARAM)str_cmb); + + /* Select listbox entry only if we have an exact match */ + if(lstrcmpiW(str_edit, str_cmb) == 0) + { + SendDlgItemMessageW(hDlg, cmb, CB_SETCURSEL, idx, 0); + SendDlgItemMessageW(hDlg, cmb, CB_SETEDITSEL, 0, -1); /* Remove edit field selection */ + cmb_selected_by_edit = TRUE; + } + } + } + TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam); switch (LOWORD(wParam)) { case cmb1: - if (HIWORD(wParam)==CBN_SELCHANGE) + if (HIWORD(wParam) == CBN_SELCHANGE || cmb_selected_by_edit) { INT pointsize; /* save current pointsize */ LONG pstyle; /* save current style */ @@ -981,7 +1004,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO case cmb2: case cmb3: case cmb5: - if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED ) + if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == BN_CLICKED || cmb_selected_by_edit) { WCHAR str[256]; WINDOWINFO wininfo; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 270a296417..2de694b13d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -55,7 +55,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-2.9 reactos/dll/win32/clusapi # Synced to WineStaging-2.9 reactos/dll/win32/comcat # Synced to WineStaging-2.9 reactos/dll/win32/comctl32 # Synced to Wine-3.0 -reactos/dll/win32/comdlg32 # Synced to WineStaging-2.16 +reactos/dll/win32/comdlg32 # Synced to Wine-3.0 reactos/dll/win32/compstui # Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9 reactos/dll/win32/crypt32 # Synced to WineStaging-2.16

6 years, 11 months

01/01: [COMCTL32_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d320bc25fb266bee8125… commit 0d320bc25fb266bee81257975cfd81c883fbc69d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Jan 18 23:49:50 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Jan 18 23:49:50 2018 +0100 [COMCTL32_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/comctl32/CMakeLists.txt | 12 +- modules/rostests/winetests/comctl32/combo.c | 1194 ++++++++ modules/rostests/winetests/comctl32/comboex.c | 608 ---- modules/rostests/winetests/comctl32/edit.c | 3024 ++++++++++++++++++++ modules/rostests/winetests/comctl32/imagelist.c | 885 +++--- modules/rostests/winetests/comctl32/listbox.c | 1851 ++++++++++++ modules/rostests/winetests/comctl32/listview.c | 464 ++- modules/rostests/winetests/comctl32/misc.c | 2 +- modules/rostests/winetests/comctl32/msg.h | 7 +- modules/rostests/winetests/comctl32/propsheet.c | 32 +- modules/rostests/winetests/comctl32/rsrc.rc | 62 +- modules/rostests/winetests/comctl32/static.c | 168 ++ modules/rostests/winetests/comctl32/syslink.c | 114 +- modules/rostests/winetests/comctl32/taskdialog.c | 264 ++ modules/rostests/winetests/comctl32/testlist.c | 10 +- modules/rostests/winetests/comctl32/tooltips.c | 64 +- modules/rostests/winetests/comctl32/treeview.c | 5 + modules/rostests/winetests/comctl32/updown.c | 112 +- 18 files changed, 7661 insertions(+), 1217 deletions(-) diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index f72f87a169..9212bc0fe1 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -1,16 +1,18 @@ remove_definitions(-D_WIN32_WINNT=0x502 -D_WIN32_IE=0x600) -add_definitions(-DUSE_WINE_TODOS) +add_definitions(-DUSE_WINE_TODOS -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE animate.c - comboex.c + combo.c datetime.c dpa.c + edit.c header.c imagelist.c ipaddress.c + listbox.c listview.c misc.c monthcal.c @@ -19,6 +21,7 @@ list(APPEND SOURCE progress.c propsheet.c rebar.c + static.c status.c syslink.c tab.c @@ -43,5 +46,10 @@ endif() set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32) + +if(MSVC) + add_importlibs(comctl32_winetest ntdll) +endif() + add_pch(comctl32_winetest precomp.h SOURCE) add_rostests_file(TARGET comctl32_winetest) diff --git a/modules/rostests/winetests/comctl32/combo.c b/modules/rostests/winetests/comctl32/combo.c new file mode 100644 index 0000000000..ca493c0cea --- /dev/null +++ b/modules/rostests/winetests/comctl32/combo.c @@ -0,0 +1,1194 @@ +/* Unit test suite for ComboBox and ComboBoxEx32 controls. + * + * Copyright 2005 Jason Edmeades + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "precomp.h" + +#define EDITBOX_SEQ_INDEX 0 +#define NUM_MSG_SEQUENCES 1 + +#define EDITBOX_ID 0 +#define COMBO_ID 1995 + +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) + +#define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ + r.bottom == _bottom && r.right == _right, "Invalid rect %s vs (%d,%d)-(%d,%d)\n", \ + wine_dbgstr_rect(&r), _left, _top, _right, _bottom); + + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + +static HWND hComboExParentWnd, hMainWnd; +static HINSTANCE hMainHinst; +static const char ComboExTestClass[] = "ComboExTestClass"; + +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); + +#define MAX_CHARS 100 +static char *textBuffer = NULL; + +static BOOL received_end_edit = FALSE; + +static void get_combobox_info(HWND hwnd, COMBOBOXINFO *info) +{ + BOOL ret; + + info->cbSize = sizeof(*info); + ret = GetComboBoxInfo(hwnd, info); + ok(ret, "Failed to get combobox info structure, error %d\n", GetLastError()); +} + +static HWND createComboEx(DWORD style) { + return CreateWindowExA(0, WC_COMBOBOXEXA, NULL, style, 0, 0, 300, 300, + hComboExParentWnd, NULL, hMainHinst, NULL); +} + +static LONG addItem(HWND cbex, int idx, const char *text) { + COMBOBOXEXITEMA cbexItem; + memset(&cbexItem, 0x00, sizeof(cbexItem)); + cbexItem.mask = CBEIF_TEXT; + cbexItem.iItem = idx; + cbexItem.pszText = (char*)text; + cbexItem.cchTextMax = 0; + return SendMessageA(cbex, CBEM_INSERTITEMA, 0, (LPARAM)&cbexItem); +} + +static LONG setItem(HWND cbex, int idx, const char *text) { + COMBOBOXEXITEMA cbexItem; + memset(&cbexItem, 0x00, sizeof(cbexItem)); + cbexItem.mask = CBEIF_TEXT; + cbexItem.iItem = idx; + cbexItem.pszText = (char*)text; + cbexItem.cchTextMax = 0; + return SendMessageA(cbex, CBEM_SETITEMA, 0, (LPARAM)&cbexItem); +} + +static LONG delItem(HWND cbex, int idx) { + return SendMessageA(cbex, CBEM_DELETEITEM, idx, 0); +} + +static LONG getItem(HWND cbex, int idx, COMBOBOXEXITEMA *cbItem) { + memset(cbItem, 0x00, sizeof(COMBOBOXEXITEMA)); + cbItem->mask = CBEIF_TEXT; + cbItem->pszText = textBuffer; + cbItem->iItem = idx; + cbItem->cchTextMax = 100; + return SendMessageA(cbex, CBEM_GETITEMA, 0, (LPARAM)cbItem); +} + +static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = EDITBOX_ID; + + if (message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCPAINT && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + add_message(sequences, EDITBOX_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} + +static HWND subclass_editbox(HWND hwndComboEx) +{ + WNDPROC oldproc; + HWND hwnd; + + hwnd = (HWND)SendMessageA(hwndComboEx, CBEM_GETEDITCONTROL, 0, 0); + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)editbox_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + + return hwnd; +} + +static void test_comboex(void) +{ + HWND myHwnd = 0; + LONG res; + COMBOBOXEXITEMA cbexItem; + static const char *first_item = "First Item", + *second_item = "Second Item", + *third_item = "Third Item", + *middle_item = "Between First and Second Items", + *replacement_item = "Between First and Second Items", + *out_of_range_item = "Out of Range Item"; + + /* Allocate space for result */ + textBuffer = HeapAlloc(GetProcessHeap(), 0, MAX_CHARS); + + /* Basic comboboxex test */ + myHwnd = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + /* Add items onto the end of the combobox */ + res = addItem(myHwnd, -1, first_item); + ok(res == 0, "Adding simple item failed (%d)\n", res); + res = addItem(myHwnd, -1, second_item); + ok(res == 1, "Adding simple item failed (%d)\n", res); + res = addItem(myHwnd, 2, third_item); + ok(res == 2, "Adding simple item failed (%d)\n", res); + res = addItem(myHwnd, 1, middle_item); + ok(res == 1, "Inserting simple item failed (%d)\n", res); + + /* Add an item completely out of range */ + res = addItem(myHwnd, 99, out_of_range_item); + ok(res == -1, "Adding using out of range index worked unexpectedly (%d)\n", res); + res = addItem(myHwnd, 5, out_of_range_item); + ok(res == -1, "Adding using out of range index worked unexpectedly (%d)\n", res); + /* Removed: Causes traps on Windows XP + res = addItem(myHwnd, -2, "Out Of Range Item"); + ok(res == -1, "Adding out of range worked unexpectedly (%ld)\n", res); + */ + + /* Get an item completely out of range */ + res = getItem(myHwnd, 99, &cbexItem); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); + res = getItem(myHwnd, 4, &cbexItem); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); + res = getItem(myHwnd, -2, &cbexItem); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); + + /* Get an item in range */ + res = getItem(myHwnd, 0, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); + ok(strcmp(first_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + res = getItem(myHwnd, 1, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); + ok(strcmp(middle_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + res = getItem(myHwnd, 2, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); + ok(strcmp(second_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + res = getItem(myHwnd, 3, &cbexItem); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); + ok(strcmp(third_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + + /* Set an item completely out of range */ + res = setItem(myHwnd, 99, replacement_item); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); + res = setItem(myHwnd, 4, replacement_item); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); + res = setItem(myHwnd, -2, replacement_item); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); + + /* Set an item in range */ + res = setItem(myHwnd, 0, replacement_item); + ok(res != 0, "Setting first item failed (%d)\n", res); + res = setItem(myHwnd, 3, replacement_item); + ok(res != 0, "Setting last item failed (%d)\n", res); + + /* Remove items completely out of range (4 items in control at this point) */ + res = delItem(myHwnd, -1); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); + res = delItem(myHwnd, 4); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); + + /* Remove items in range (4 items in control at this point) */ + res = delItem(myHwnd, 3); + ok(res == 3, "Deleting using out of range index failed (%d)\n", res); + res = delItem(myHwnd, 0); + ok(res == 2, "Deleting using out of range index failed (%d)\n", res); + res = delItem(myHwnd, 0); + ok(res == 1, "Deleting using out of range index failed (%d)\n", res); + res = delItem(myHwnd, 0); + ok(res == 0, "Deleting using out of range index failed (%d)\n", res); + + /* Remove from an empty box */ + res = delItem(myHwnd, 0); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); + + + /* Cleanup */ + HeapFree(GetProcessHeap(), 0, textBuffer); + DestroyWindow(myHwnd); +} + +static void test_comboex_WM_LBUTTONDOWN(void) +{ + HWND hComboEx, hCombo, hEdit, hList; + COMBOBOXINFO cbInfo; + UINT x, y, item_height; + LRESULT result; + UINT i; + int idx; + RECT rect; + WCHAR buffer[3]; + static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; + static const WCHAR stringFormat[] = {'%','2','d','\0'}; + + hComboEx = CreateWindowExA(0, WC_COMBOBOXEXA, NULL, + WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, + hComboExParentWnd, NULL, hMainHinst, NULL); + + for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ + COMBOBOXEXITEMW cbexItem; + wsprintfW(buffer, stringFormat, choices[i]); + + memset(&cbexItem, 0x00, sizeof(cbexItem)); + cbexItem.mask = CBEIF_TEXT; + cbexItem.iItem = i; + cbexItem.pszText = buffer; + cbexItem.cchTextMax = 0; + ok(SendMessageW(hComboEx, CBEM_INSERTITEMW, 0, (LPARAM)&cbexItem) >= 0, + "Failed to add item %d\n", i); + } + + hCombo = (HWND)SendMessageA(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + hEdit = (HWND)SendMessageA(hComboEx, CBEM_GETEDITCONTROL, 0, 0); + + get_combobox_info(hCombo, &cbInfo); + hList = cbInfo.hwndList; + + ok(GetFocus() == hComboExParentWnd, + "Focus not on Main Window, instead on %p\n", GetFocus()); + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + result = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + ok(SendMessageA(hComboEx, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + idx = SendMessageA(hCombo, CB_GETTOPINDEX, 0, 0); + ok(idx == 0, "For TopIndex expected %d, got %d\n", 0, idx); + + result = SendMessageA(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + + /* Click on the 5th item in the list */ + item_height = SendMessageA(hCombo, CB_GETITEMHEIGHT, 0, 0); + ok(GetClientRect(hList, &rect), "Failed to get list's client rect.\n"); + x = rect.left + (rect.right-rect.left)/2; + y = item_height/2 + item_height*4; + result = SendMessageA(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y)); + ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + + result = SendMessageA(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ + "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", + GetFocus()); + ok(SendMessageA(hComboEx, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should still be visible.\n"); + + result = SendMessageA(hList, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!result, "WM_LBUTTONUP was not processed. LastError=%d\n", + GetLastError()); + todo_wine ok(GetFocus() == hEdit || + broken(GetFocus() == hCombo), /* win98 */ + "Focus not on ComboBoxEx's Edit Control, instead on %p\n", + GetFocus()); + + result = SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0); + ok(!result || + broken(result != 0), /* win98 */ + "The dropdown list should have been rolled up.\n"); + idx = SendMessageA(hComboEx, CB_GETCURSEL, 0, 0); + ok(idx == 4 || + broken(idx == -1), /* win98 */ + "Current Selection: expected %d, got %d\n", 4, idx); + ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); + + SetFocus( hComboExParentWnd ); + ok( GetFocus() == hComboExParentWnd, "got %p\n", GetFocus() ); + SetFocus( hComboEx ); + ok( GetFocus() == hEdit, "got %p\n", GetFocus() ); + + DestroyWindow(hComboEx); +} + +static void test_comboex_CB_GETLBTEXT(void) +{ + HWND hCombo; + CHAR buff[1]; + COMBOBOXEXITEMA item; + LRESULT ret; + + hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + /* set text to null */ + addItem(hCombo, 0, NULL); + + buff[0] = 'a'; + item.mask = CBEIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = 1; + ret = SendMessageA(hCombo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(ret != 0, "CBEM_GETITEM failed\n"); + ok(buff[0] == 0, "\n"); + + ret = SendMessageA(hCombo, CB_GETLBTEXTLEN, 0, 0); + ok(ret == 0, "Expected zero length\n"); + + ret = SendMessageA(hCombo, CB_GETLBTEXTLEN, 0, 0); + ok(ret == 0, "Expected zero length\n"); + + buff[0] = 'a'; + ret = SendMessageA(hCombo, CB_GETLBTEXT, 0, (LPARAM)buff); + ok(ret == 0, "Expected zero length\n"); + ok(buff[0] == 0, "Expected null terminator as a string, got %s\n", buff); + + DestroyWindow(hCombo); +} + +static void test_comboex_WM_WINDOWPOSCHANGING(void) +{ + HWND hCombo; + WINDOWPOS wp; + RECT rect; + int combo_height; + int ret; + + hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + ok(hCombo != NULL, "createComboEx failed\n"); + ret = GetWindowRect(hCombo, &rect); + ok(ret, "GetWindowRect failed\n"); + combo_height = rect.bottom - rect.top; + ok(combo_height > 0, "wrong combo height\n"); + + /* Test height > combo_height */ + wp.x = rect.left; + wp.y = rect.top; + wp.cx = (rect.right - rect.left); + wp.cy = combo_height * 2; + wp.flags = 0; + wp.hwnd = hCombo; + wp.hwndInsertAfter = NULL; + + ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); + ok(ret == 0, "expected 0, got %x\n", ret); + ok(wp.cy == combo_height, + "Expected height %d, got %d\n", combo_height, wp.cy); + + /* Test height < combo_height */ + wp.x = rect.left; + wp.y = rect.top; + wp.cx = (rect.right - rect.left); + wp.cy = combo_height / 2; + wp.flags = 0; + wp.hwnd = hCombo; + wp.hwndInsertAfter = NULL; + + ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); + ok(ret == 0, "expected 0, got %x\n", ret); + ok(wp.cy == combo_height, + "Expected height %d, got %d\n", combo_height, wp.cy); + + ret = DestroyWindow(hCombo); + ok(ret, "DestroyWindow failed\n"); +} + +static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + NMHDR *hdr = (NMHDR*)lParam; + switch(hdr->code){ + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *edit_info = (NMCBEENDEDITA*)hdr; + if(edit_info->iWhy==CBENF_DROPDOWN){ + received_end_edit = TRUE; + } + break; + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *edit_info = (NMCBEENDEDITW*)hdr; + if(edit_info->iWhy==CBENF_DROPDOWN){ + received_end_edit = TRUE; + } + break; + } + } + return 0; +} + +static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_NOTIFY: + return ComboExTestOnNotify(hWnd,msg,wParam,lParam); + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + + return 0L; +} + +static BOOL init(void) +{ + HMODULE hComctl32; + BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + WNDCLASSA wc; + INITCOMMONCONTROLSEX iccex; + + hComctl32 = GetModuleHandleA("comctl32.dll"); + pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); + if (!pInitCommonControlsEx) + { + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + return FALSE; + } + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_USEREX_CLASSES; + pInitCommonControlsEx(&iccex); + + pSetWindowSubclass = (void*)GetProcAddress(hComctl32, (LPSTR)410); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = ComboExTestClass; + wc.lpfnWndProc = ComboExTestWndProc; + RegisterClassA(&wc); + + hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ShowWindow(hMainWnd, SW_SHOW); + + hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + ok(hComboExParentWnd != NULL, "failed to create parent window\n"); + + hMainHinst = GetModuleHandleA(NULL); + + return hComboExParentWnd != NULL; +} + +static void cleanup(void) +{ + MSG msg; + + PostMessageA(hComboExParentWnd, WM_CLOSE, 0, 0); + while (GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + DestroyWindow(hComboExParentWnd); + UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); + + DestroyWindow(hMainWnd); +} + +static void test_comboex_subclass(void) +{ + HWND hComboEx, hCombo, hEdit; + + hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + hCombo = (HWND)SendMessageA(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + ok(hCombo != NULL, "Failed to get internal combo\n"); + hEdit = (HWND)SendMessageA(hComboEx, CBEM_GETEDITCONTROL, 0, 0); + ok(hEdit != NULL, "Failed to get internal edit\n"); + + if (pSetWindowSubclass) + { + ok(GetPropA(hCombo, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); + ok(GetPropA(hEdit, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); + } + + DestroyWindow(hComboEx); +} + +static const struct message test_setitem_edit_seq[] = { + { WM_SETTEXT, sent|id, 0, 0, EDITBOX_ID }, + { EM_SETSEL, sent|id|wparam|lparam, 0, 0, EDITBOX_ID }, + { EM_SETSEL, sent|id|wparam|lparam, 0, -1, EDITBOX_ID }, + { 0 } +}; + +static void test_comboex_get_set_item(void) +{ + char textA[] = "test"; + HWND hComboEx; + COMBOBOXEXITEMA item; + BOOL ret; + + hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + subclass_editbox(hComboEx); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_TEXT; + item.pszText = textA; + item.iItem = -1; + ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + ok_sequence(sequences, EDITBOX_SEQ_INDEX, test_setitem_edit_seq, "set item data for edit", FALSE); + + /* get/set lParam */ + item.mask = CBEIF_LPARAM; + item.iItem = -1; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.lParam == 0, "Expected zero, got %lx\n", item.lParam); + + item.lParam = 0x1abe11ed; + ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + item.lParam = 0; + ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.lParam == 0x1abe11ed, "Expected 0x1abe11ed, got %lx\n", item.lParam); + + DestroyWindow(hComboEx); +} + +static HWND create_combobox(DWORD style) +{ + return CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); +} + +static int font_height(HFONT hFont) +{ + TEXTMETRICA tm; + HFONT hFontOld; + HDC hDC; + + hDC = CreateCompatibleDC(NULL); + hFontOld = SelectObject(hDC, hFont); + GetTextMetricsA(hDC, &tm); + SelectObject(hDC, hFontOld); + DeleteDC(hDC); + + return tm.tmHeight; +} + +static void test_combo_setitemheight(DWORD style) +{ + HWND hCombo = create_combobox(style); + RECT r; + int i; + + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, font_height(GetStockObject(SYSTEM_FONT)) + 8); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105); + + for (i = 1; i < 30; i++) + { + SendMessageA(hCombo, CB_SETITEMHEIGHT, -1, i); + GetClientRect(hCombo, &r); + ok((r.bottom - r.top) == (i + 6), "Unexpected client rect height.\n"); + } + + DestroyWindow(hCombo); +} + +static void test_combo_setfont(DWORD style) +{ + HFONT hFont1, hFont2; + HWND hCombo; + RECT r; + int i; + + hCombo = create_combobox(style); + hFont1 = CreateFontA(10, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + hFont2 = CreateFontA(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, font_height(GetStockObject(SYSTEM_FONT)) + 8); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105); + + /* The size of the dropped control is initially equal to the size + of the window when it was created. The size of the calculated + dropped area changes only by how much the selection area + changes, not by how much the list area changes. */ + if (font_height(hFont1) == 10 && font_height(hFont2) == 8) + { + SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 18); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1))); + + SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont2, FALSE); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 16); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont2))); + + SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 18); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1))); + } + else + { + ok(0, "Expected Marlett font heights 10/8, got %d/%d\n", + font_height(hFont1), font_height(hFont2)); + } + + for (i = 1; i < 30; i++) + { + HFONT hFont = CreateFontA(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + int height = font_height(hFont); + + SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont, FALSE); + GetClientRect(hCombo, &r); + ok((r.bottom - r.top) == (height + 8), "Unexpected client rect height.\n"); + SendMessageA(hCombo, WM_SETFONT, 0, FALSE); + DeleteObject(hFont); + } + + DestroyWindow(hCombo); + DeleteObject(hFont1); + DeleteObject(hFont2); +} + +static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); +static LPCSTR expected_edit_text; +static LPCSTR expected_list_text; +static BOOL selchange_fired; + +static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + switch (wparam) + { + case MAKEWPARAM(COMBO_ID, CBN_SELCHANGE): + { + HWND hCombo = (HWND)lparam; + char list[20], edit[20]; + int idx; + + memset(list, 0, sizeof(list)); + memset(edit, 0, sizeof(edit)); + + idx = SendMessageA(hCombo, CB_GETCURSEL, 0, 0); + SendMessageA(hCombo, CB_GETLBTEXT, idx, (LPARAM)list); + SendMessageA(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + + ok(!strcmp(edit, expected_edit_text), "edit: got %s, expected %s\n", + edit, expected_edit_text); + ok(!strcmp(list, expected_list_text), "list: got %s, expected %s\n", + list, expected_list_text); + + selchange_fired = TRUE; + } + break; + } + break; + } + + return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); +} + +static void test_selection(DWORD style, const char * const text[], const int *edit, const int *list) +{ + HWND hCombo; + INT idx; + + hCombo = create_combobox(style); + + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)text[0]); + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)text[1]); + SendMessageA(hCombo, CB_SETCURSEL, -1, 0); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + idx = SendMessageA(hCombo, CB_GETCURSEL, 0, 0); + ok(idx == -1, "expected selection -1, got %d\n", idx); + + /* keyboard navigation */ + + expected_list_text = text[list[0]]; + expected_edit_text = text[edit[0]]; + selchange_fired = FALSE; + SendMessageA(hCombo, WM_KEYDOWN, VK_DOWN, 0); + ok(selchange_fired, "CBN_SELCHANGE not sent!\n"); + + expected_list_text = text[list[1]]; + expected_edit_text = text[edit[1]]; + selchange_fired = FALSE; + SendMessageA(hCombo, WM_KEYDOWN, VK_DOWN, 0); + ok(selchange_fired, "CBN_SELCHANGE not sent!\n"); + + expected_list_text = text[list[2]]; + expected_edit_text = text[edit[2]]; + selchange_fired = FALSE; + SendMessageA(hCombo, WM_KEYDOWN, VK_UP, 0); + ok(selchange_fired, "CBN_SELCHANGE not sent!\n"); + + /* programmatic navigation */ + + expected_list_text = text[list[3]]; + expected_edit_text = text[edit[3]]; + selchange_fired = FALSE; + SendMessageA(hCombo, CB_SETCURSEL, list[3], 0); + ok(!selchange_fired, "CBN_SELCHANGE sent!\n"); + + expected_list_text = text[list[4]]; + expected_edit_text = text[edit[4]]; + selchange_fired = FALSE; + SendMessageA(hCombo, CB_SETCURSEL, list[4], 0); + ok(!selchange_fired, "CBN_SELCHANGE sent!\n"); + + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(hCombo); +} + +static void test_combo_CBN_SELCHANGE(void) +{ + static const char * const text[] = { "alpha", "beta", "" }; + static const int sel_1[] = { 2, 0, 1, 0, 1 }; + static const int sel_2[] = { 0, 1, 0, 0, 1 }; + + test_selection(CBS_SIMPLE, text, sel_1, sel_2); + test_selection(CBS_DROPDOWN, text, sel_1, sel_2); + test_selection(CBS_DROPDOWNLIST, text, sel_2, sel_2); +} + +static void test_combo_changesize(DWORD style) +{ + INT ddheight, clheight, ddwidth, clwidth; + HWND hCombo; + RECT rc; + + hCombo = create_combobox(style); + + /* get initial measurements */ + GetClientRect( hCombo, &rc); + clheight = rc.bottom - rc.top; + clwidth = rc.right - rc.left; + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); + ddheight = rc.bottom - rc.top; + ddwidth = rc.right - rc.left; + /* use MoveWindow to move & resize the combo */ + /* first make it slightly smaller */ + MoveWindow( hCombo, 10, 10, clwidth - 2, clheight - 2, TRUE); + GetClientRect( hCombo, &rc); + ok( rc.right - rc.left == clwidth - 2, "clientrect width is %d vs %d\n", + rc.right - rc.left, clwidth - 2); + ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", + rc.bottom - rc.top, clheight); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); + ok( rc.right - rc.left == clwidth - 2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, clwidth - 2); + ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", + rc.bottom - rc.top, ddheight); + ok( rc.right - rc.left == ddwidth -2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, ddwidth - 2); + /* new cx, cy is slightly bigger than the initial values */ + MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); + GetClientRect( hCombo, &rc); + ok( rc.right - rc.left == clwidth + 2, "clientrect width is %d vs %d\n", + rc.right - rc.left, clwidth + 2); + ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", + rc.bottom - rc.top, clheight); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); + ok( rc.right - rc.left == clwidth + 2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, clwidth + 2); + todo_wine { + ok( rc.bottom - rc.top == clheight + 2, "drop-down rect height is %d vs %d\n", + rc.bottom - rc.top, clheight + 2); + } + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, -1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, clwidth - 1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, clwidth << 1, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + DestroyWindow(hCombo); +} + +static void test_combo_editselection(void) +{ + COMBOBOXINFO cbInfo; + INT start, end; + char edit[20]; + HWND hCombo; + HWND hEdit; + DWORD len; + + /* Build a combo */ + hCombo = create_combobox(CBS_SIMPLE); + + get_combobox_info(hCombo, &cbInfo); + hEdit = cbInfo.hwndItem; + + /* Initially combo selection is empty*/ + len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Set some text, and press a key to replace it */ + edit[0] = 0x00; + SendMessageA(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason1"); + SendMessageA(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason1")==0, "Unexpected text retrieved %s\n", edit); + + /* Now what is the selection - still empty */ + SendMessageA(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + ok(start==0, "Unexpected start position for selection %d\n", start); + ok(end==0, "Unexpected end position for selection %d\n", end); + len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Give it focus, and it gets selected */ + SendMessageA(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + SendMessageA(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + ok(start==0, "Unexpected start position for selection %d\n", start); + ok(end==6, "Unexpected end position for selection %d\n", end); + len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now emulate a key press */ + edit[0] = 0x00; + SendMessageA(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessageA(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "A")==0, "Unexpected text retrieved %s\n", edit); + + len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now what happens when it gets more focus a second time - it doesn't reselect */ + SendMessageA(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + DestroyWindow(hCombo); + + /* Start again - Build a combo */ + hCombo = create_combobox(CBS_SIMPLE); + get_combobox_info(hCombo, &cbInfo); + hEdit = cbInfo.hwndItem; + + /* Set some text and give focus so it gets selected */ + edit[0] = 0x00; + SendMessageA(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason2"); + SendMessageA(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2")==0, "Unexpected text retrieved %s\n", edit); + + SendMessageA(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + + /* Now what is the selection */ + SendMessageA(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + ok(start==0, "Unexpected start position for selection %d\n", start); + ok(end==6, "Unexpected end position for selection %d\n", end); + len = SendMessageA(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now change the selection to the apparently invalid start -1, end -1 and + show it means no selection (ie start -1) but cursor at end */ + SendMessageA(hCombo, CB_SETEDITSEL, 0, -1); + edit[0] = 0x00; + SendMessageA(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessageA(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2A")==0, "Unexpected text retrieved %s\n", edit); + DestroyWindow(hCombo); +} + +static WNDPROC edit_window_proc; +static long setsel_start = 1, setsel_end = 1; +static HWND hCBN_SetFocus, hCBN_KillFocus; + +static LRESULT CALLBACK combobox_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == EM_SETSEL) + { + setsel_start = wParam; + setsel_end = lParam; + } + return CallWindowProcA(edit_window_proc, hwnd, msg, wParam, lParam); +} + +static LRESULT CALLBACK test_window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case CBN_SETFOCUS: + hCBN_SetFocus = (HWND)lParam; + break; + case CBN_KILLFOCUS: + hCBN_KillFocus = (HWND)lParam; + break; + } + break; + case WM_NEXTDLGCTL: + SetFocus((HWND)wParam); + break; + } + return CallWindowProcA(old_parent_proc, hwnd, msg, wParam, lParam); +} + +static void test_combo_editselection_focus(DWORD style) +{ + static const char wine_test[] = "Wine Test"; + HWND hCombo, hEdit, hButton; + char buffer[16] = {0}; + COMBOBOXINFO cbInfo; + DWORD len; + + hCombo = create_combobox(style); + get_combobox_info(hCombo, &cbInfo); + hEdit = cbInfo.hwndItem; + + hButton = CreateWindowA("Button", "OK", WS_VISIBLE|WS_CHILD|BS_DEFPUSHBUTTON, + 5, 50, 100, 20, hMainWnd, NULL, + (HINSTANCE)GetWindowLongPtrA(hMainWnd, GWLP_HINSTANCE), NULL); + + old_parent_proc = (WNDPROC)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)test_window_proc); + edit_window_proc = (WNDPROC)SetWindowLongPtrA(hEdit, GWLP_WNDPROC, (ULONG_PTR)combobox_subclass_proc); + + SendMessageA(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + ok(setsel_start == 0, "Unexpected EM_SETSEL start value; got %ld\n", setsel_start); + todo_wine ok(setsel_end == INT_MAX, "Unexpected EM_SETSEL end value; got %ld\n", setsel_end); + ok(hCBN_SetFocus == hCombo, "Wrong handle set by CBN_SETFOCUS; got %p\n", hCBN_SetFocus); + ok(GetFocus() == hEdit, "hEdit should have keyboard focus\n"); + + SendMessageA(hMainWnd, WM_NEXTDLGCTL, (WPARAM)hButton, TRUE); + ok(setsel_start == 0, "Unexpected EM_SETSEL start value; got %ld\n", setsel_start); + todo_wine ok(setsel_end == 0, "Unexpected EM_SETSEL end value; got %ld\n", setsel_end); + ok(hCBN_KillFocus == hCombo, "Wrong handle set by CBN_KILLFOCUS; got %p\n", hCBN_KillFocus); + ok(GetFocus() == hButton, "hButton should have keyboard focus\n"); + + SendMessageA(hCombo, WM_SETTEXT, 0, (LPARAM)wine_test); + SendMessageA(hMainWnd, WM_NEXTDLGCTL, (WPARAM)hCombo, TRUE); + ok(setsel_start == 0, "Unexpected EM_SETSEL start value; got %ld\n", setsel_start); + todo_wine ok(setsel_end == INT_MAX, "Unexpected EM_SETSEL end value; got %ld\n", setsel_end); + ok(hCBN_SetFocus == hCombo, "Wrong handle set by CBN_SETFOCUS; got %p\n", hCBN_SetFocus); + ok(GetFocus() == hEdit, "hEdit should have keyboard focus\n"); + SendMessageA(hCombo, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + ok(!strcmp(buffer, wine_test), "Unexpected text in edit control; got '%s'\n", buffer); + + SendMessageA(hMainWnd, WM_NEXTDLGCTL, (WPARAM)hButton, TRUE); + ok(setsel_start == 0, "Unexpected EM_SETSEL start value; got %ld\n", setsel_start); + todo_wine ok(setsel_end == 0, "Unexpected EM_SETSEL end value; got %ld\n", setsel_end); + ok(hCBN_KillFocus == hCombo, "Wrong handle set by CBN_KILLFOCUS; got %p\n", hCBN_KillFocus); + ok(GetFocus() == hButton, "hButton should have keyboard focus\n"); + len = SendMessageA(hCombo, CB_GETEDITSEL, 0, 0); + ok(len == 0, "Unexpected text selection; start: %u, end: %u\n", LOWORD(len), HIWORD(len)); + + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(hButton); + DestroyWindow(hCombo); +} + +static void test_combo_listbox_styles(DWORD cb_style) +{ + DWORD style, exstyle, expect_style, expect_exstyle; + COMBOBOXINFO info; + HWND combo; + + expect_style = WS_CHILD|WS_CLIPSIBLINGS|LBS_COMBOBOX|LBS_HASSTRINGS|LBS_NOTIFY; + if (cb_style == CBS_SIMPLE) + { + expect_style |= WS_VISIBLE; + expect_exstyle = WS_EX_CLIENTEDGE; + } + else + { + expect_style |= WS_BORDER; + expect_exstyle = WS_EX_TOOLWINDOW; + } + + combo = create_combobox(cb_style); + get_combobox_info(combo, &info); + + style = GetWindowLongW( info.hwndList, GWL_STYLE ); + exstyle = GetWindowLongW( info.hwndList, GWL_EXSTYLE ); + ok(style == expect_style, "%08x: got %08x\n", cb_style, style); + ok(exstyle == expect_exstyle, "%08x: got %08x\n", cb_style, exstyle); + + if (cb_style != CBS_SIMPLE) + expect_exstyle |= WS_EX_TOPMOST; + + SendMessageW(combo, CB_SHOWDROPDOWN, TRUE, 0 ); + style = GetWindowLongW( info.hwndList, GWL_STYLE ); + exstyle = GetWindowLongW( info.hwndList, GWL_EXSTYLE ); + ok(style == (expect_style | WS_VISIBLE), "%08x: got %08x\n", cb_style, style); + ok(exstyle == expect_exstyle, "%08x: got %08x\n", cb_style, exstyle); + + SendMessageW(combo, CB_SHOWDROPDOWN, FALSE, 0 ); + style = GetWindowLongW( info.hwndList, GWL_STYLE ); + exstyle = GetWindowLongW( info.hwndList, GWL_EXSTYLE ); + ok(style == expect_style, "%08x: got %08x\n", cb_style, style); + ok(exstyle == expect_exstyle, "%08x: got %08x\n", cb_style, exstyle); + + DestroyWindow(combo); +} + +static void test_combo_WS_VSCROLL(void) +{ + HWND hCombo, hList; + COMBOBOXINFO info; + DWORD style; + int i; + + hCombo = create_combobox(CBS_DROPDOWNLIST); + + get_combobox_info(hCombo, &info); + hList = info.hwndList; + + for (i = 0; i < 3; i++) + { + char buffer[2]; + sprintf(buffer, "%d", i); + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); + } + + style = GetWindowLongA(info.hwndList, GWL_STYLE); + SetWindowLongA(hList, GWL_STYLE, style | WS_VSCROLL); + + SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE, 0); + SendMessageA(hCombo, CB_SHOWDROPDOWN, FALSE, 0); + + style = GetWindowLongA(hList, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Style does not include WS_VSCROLL\n"); + + DestroyWindow(hCombo); +} + +START_TEST(combo) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + + if (!init()) + return; + + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + + /* ComboBoxEx32 tests. */ + test_comboex(); + test_comboex_WM_LBUTTONDOWN(); + test_comboex_CB_GETLBTEXT(); + test_comboex_WM_WINDOWPOSCHANGING(); + test_comboex_subclass(); + test_comboex_get_set_item(); + + if (!load_v6_module(&ctx_cookie, &hCtx)) + { + cleanup(); + return; + } + + /* ComboBox control tests. */ + test_combo_WS_VSCROLL(); + test_combo_setfont(CBS_DROPDOWN); + test_combo_setfont(CBS_DROPDOWNLIST); + test_combo_setitemheight(CBS_DROPDOWN); + test_combo_setitemheight(CBS_DROPDOWNLIST); + test_combo_CBN_SELCHANGE(); + test_combo_changesize(CBS_DROPDOWN); + test_combo_changesize(CBS_DROPDOWNLIST); + test_combo_editselection(); + test_combo_editselection_focus(CBS_SIMPLE); + test_combo_editselection_focus(CBS_DROPDOWN); + test_combo_listbox_styles(CBS_SIMPLE); + test_combo_listbox_styles(CBS_DROPDOWN); + test_combo_listbox_styles(CBS_DROPDOWNLIST); + + cleanup(); + unload_v6_module(ctx_cookie, hCtx); +} diff --git a/modules/rostests/winetests/comctl32/comboex.c b/modules/rostests/winetests/comctl32/comboex.c deleted file mode 100644 index 947a871a6b..0000000000 --- a/modules/rostests/winetests/comctl32/comboex.c +++ /dev/null @@ -1,608 +0,0 @@ -/* Unit test suite for comboex control. - * - * Copyright 2005 Jason Edmeades - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "precomp.h" - -#define EDITBOX_SEQ_INDEX 0 -#define NUM_MSG_SEQUENCES 1 - -#define EDITBOX_ID 0 - -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) - -static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; - -static HWND hComboExParentWnd; -static HINSTANCE hMainHinst; -static const char ComboExTestClass[] = "ComboExTestClass"; - -static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); - -#define MAX_CHARS 100 -static char *textBuffer = NULL; - -static BOOL received_end_edit = FALSE; - -static HWND createComboEx(DWORD style) { - return CreateWindowExA(0, WC_COMBOBOXEXA, NULL, style, 0, 0, 300, 300, - hComboExParentWnd, NULL, hMainHinst, NULL); -} - -static LONG addItem(HWND cbex, int idx, const char *text) { - COMBOBOXEXITEMA cbexItem; - memset(&cbexItem, 0x00, sizeof(cbexItem)); - cbexItem.mask = CBEIF_TEXT; - cbexItem.iItem = idx; - cbexItem.pszText = (char*)text; - cbexItem.cchTextMax = 0; - return SendMessageA(cbex, CBEM_INSERTITEMA, 0, (LPARAM)&cbexItem); -} - -static LONG setItem(HWND cbex, int idx, const char *text) { - COMBOBOXEXITEMA cbexItem; - memset(&cbexItem, 0x00, sizeof(cbexItem)); - cbexItem.mask = CBEIF_TEXT; - cbexItem.iItem = idx; - cbexItem.pszText = (char*)text; - cbexItem.cchTextMax = 0; - return SendMessageA(cbex, CBEM_SETITEMA, 0, (LPARAM)&cbexItem); -} - -static LONG delItem(HWND cbex, int idx) { - return SendMessageA(cbex, CBEM_DELETEITEM, idx, 0); -} - -static LONG getItem(HWND cbex, int idx, COMBOBOXEXITEMA *cbItem) { - memset(cbItem, 0x00, sizeof(COMBOBOXEXITEMA)); - cbItem->mask = CBEIF_TEXT; - cbItem->pszText = textBuffer; - cbItem->iItem = idx; - cbItem->cchTextMax = 100; - return SendMessageA(cbex, CBEM_GETITEMA, 0, (LPARAM)cbItem); -} - -static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static LONG defwndproc_counter = 0; - struct message msg = { 0 }; - LRESULT ret; - - msg.message = message; - msg.flags = sent|wparam|lparam; - if (defwndproc_counter) msg.flags |= defwinproc; - msg.wParam = wParam; - msg.lParam = lParam; - msg.id = EDITBOX_ID; - - if (message != WM_PAINT && - message != WM_ERASEBKGND && - message != WM_NCPAINT && - message != WM_NCHITTEST && - message != WM_GETTEXT && - message != WM_GETICON && - message != WM_DEVICECHANGE) - { - add_message(sequences, EDITBOX_SEQ_INDEX, &msg); - } - - defwndproc_counter++; - ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); - defwndproc_counter--; - return ret; -} - -static HWND subclass_editbox(HWND hwndComboEx) -{ - WNDPROC oldproc; - HWND hwnd; - - hwnd = (HWND)SendMessageA(hwndComboEx, CBEM_GETEDITCONTROL, 0, 0); - oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, - (LONG_PTR)editbox_subclass_proc); - SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); - - return hwnd; -} - -static void test_comboboxex(void) { - HWND myHwnd = 0; - LONG res; - COMBOBOXEXITEMA cbexItem; - static const char *first_item = "First Item", - *second_item = "Second Item", - *third_item = "Third Item", - *middle_item = "Between First and Second Items", - *replacement_item = "Between First and Second Items", - *out_of_range_item = "Out of Range Item"; - - /* Allocate space for result */ - textBuffer = HeapAlloc(GetProcessHeap(), 0, MAX_CHARS); - - /* Basic comboboxex test */ - myHwnd = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); - - /* Add items onto the end of the combobox */ - res = addItem(myHwnd, -1, first_item); - ok(res == 0, "Adding simple item failed (%d)\n", res); - res = addItem(myHwnd, -1, second_item); - ok(res == 1, "Adding simple item failed (%d)\n", res); - res = addItem(myHwnd, 2, third_item); - ok(res == 2, "Adding simple item failed (%d)\n", res); - res = addItem(myHwnd, 1, middle_item); - ok(res == 1, "Inserting simple item failed (%d)\n", res); - - /* Add an item completely out of range */ - res = addItem(myHwnd, 99, out_of_range_item); - ok(res == -1, "Adding using out of range index worked unexpectedly (%d)\n", res); - res = addItem(myHwnd, 5, out_of_range_item); - ok(res == -1, "Adding using out of range index worked unexpectedly (%d)\n", res); - /* Removed: Causes traps on Windows XP - res = addItem(myHwnd, -2, "Out Of Range Item"); - ok(res == -1, "Adding out of range worked unexpectedly (%ld)\n", res); - */ - - /* Get an item completely out of range */ - res = getItem(myHwnd, 99, &cbexItem); - ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); - res = getItem(myHwnd, 4, &cbexItem); - ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); - res = getItem(myHwnd, -2, &cbexItem); - ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); - - /* Get an item in range */ - res = getItem(myHwnd, 0, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); - ok(strcmp(first_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); - - res = getItem(myHwnd, 1, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); - ok(strcmp(middle_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); - - res = getItem(myHwnd, 2, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); - ok(strcmp(second_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); - - res = getItem(myHwnd, 3, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); - ok(strcmp(third_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); - - /* Set an item completely out of range */ - res = setItem(myHwnd, 99, replacement_item); - ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); - res = setItem(myHwnd, 4, replacement_item); - ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); - res = setItem(myHwnd, -2, replacement_item); - ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); - - /* Set an item in range */ - res = setItem(myHwnd, 0, replacement_item); - ok(res != 0, "Setting first item failed (%d)\n", res); - res = setItem(myHwnd, 3, replacement_item); - ok(res != 0, "Setting last item failed (%d)\n", res); - - /* Remove items completely out of range (4 items in control at this point) */ - res = delItem(myHwnd, -1); - ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); - res = delItem(myHwnd, 4); - ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); - - /* Remove items in range (4 items in control at this point) */ - res = delItem(myHwnd, 3); - ok(res == 3, "Deleting using out of range index failed (%d)\n", res); - res = delItem(myHwnd, 0); - ok(res == 2, "Deleting using out of range index failed (%d)\n", res); - res = delItem(myHwnd, 0); - ok(res == 1, "Deleting using out of range index failed (%d)\n", res); - res = delItem(myHwnd, 0); - ok(res == 0, "Deleting using out of range index failed (%d)\n", res); - - /* Remove from an empty box */ - res = delItem(myHwnd, 0); - ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); - - - /* Cleanup */ - HeapFree(GetProcessHeap(), 0, textBuffer); - DestroyWindow(myHwnd); -} - -static void test_WM_LBUTTONDOWN(void) -{ - HWND hComboEx, hCombo, hEdit, hList; - COMBOBOXINFO cbInfo; - UINT x, y, item_height; - LRESULT result; - UINT i; - int idx; - RECT rect; - WCHAR buffer[3]; - static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; - static const WCHAR stringFormat[] = {'%','2','d','\0'}; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); - - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } - - hComboEx = CreateWindowExA(0, WC_COMBOBOXEXA, NULL, - WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, - hComboExParentWnd, NULL, hMainHinst, NULL); - - for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ - COMBOBOXEXITEMW cbexItem; - wsprintfW(buffer, stringFormat, choices[i]); - - memset(&cbexItem, 0x00, sizeof(cbexItem)); - cbexItem.mask = CBEIF_TEXT; - cbexItem.iItem = i; - cbexItem.pszText = buffer; - cbexItem.cchTextMax = 0; - ok(SendMessageW(hComboEx, CBEM_INSERTITEMW, 0, (LPARAM)&cbexItem) >= 0, - "Failed to add item %d\n", i); - } - - hCombo = (HWND)SendMessageA(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); - hEdit = (HWND)SendMessageA(hComboEx, CBEM_GETEDITCONTROL, 0, 0); - - cbInfo.cbSize = sizeof(COMBOBOXINFO); - result = pGetComboBoxInfo(hCombo, &cbInfo); - ok(result, "Failed to get combobox info structure. LastError=%d\n", - GetLastError()); - hList = cbInfo.hwndList; - - ok(GetFocus() == hComboExParentWnd, - "Focus not on Main Window, instead on %p\n", GetFocus()); - - /* Click on the button to drop down the list */ - x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; - y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; - result = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); - ok(result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", - GetLastError()); - ok(GetFocus() == hCombo || - broken(GetFocus() != hCombo), /* win98 */ - "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", - GetFocus()); - ok(SendMessageA(hComboEx, CB_GETDROPPEDSTATE, 0, 0), - "The dropdown list should have appeared after clicking the button.\n"); - idx = SendMessageA(hCombo, CB_GETTOPINDEX, 0, 0); - ok(idx == 0, "For TopIndex expected %d, got %d\n", 0, idx); - - result = SendMessageA(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); - ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", - GetLastError()); - ok(GetFocus() == hCombo || - broken(GetFocus() != hCombo), /* win98 */ - "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", - GetFocus()); - - /* Click on the 5th item in the list */ - item_height = SendMessageA(hCombo, CB_GETITEMHEIGHT, 0, 0); - ok(GetClientRect(hList, &rect), "Failed to get list's client rect.\n"); - x = rect.left + (rect.right-rect.left)/2; - y = item_height/2 + item_height*4; - result = SendMessageA(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y)); - ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n", - GetLastError()); - ok(GetFocus() == hCombo || - broken(GetFocus() != hCombo), /* win98 */ - "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", - GetFocus()); - - result = SendMessageA(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); - ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", - GetLastError()); - ok(GetFocus() == hCombo || - broken(GetFocus() != hCombo), /* win98 */ - "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", - GetFocus()); - ok(SendMessageA(hComboEx, CB_GETDROPPEDSTATE, 0, 0), - "The dropdown list should still be visible.\n"); - - result = SendMessageA(hList, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); - ok(!result, "WM_LBUTTONUP was not processed. LastError=%d\n", - GetLastError()); - todo_wine ok(GetFocus() == hEdit || - broken(GetFocus() == hCombo), /* win98 */ - "Focus not on ComboBoxEx's Edit Control, instead on %p\n", - GetFocus()); - - result = SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0); - ok(!result || - broken(result != 0), /* win98 */ - "The dropdown list should have been rolled up.\n"); - idx = SendMessageA(hComboEx, CB_GETCURSEL, 0, 0); - ok(idx == 4 || - broken(idx == -1), /* win98 */ - "Current Selection: expected %d, got %d\n", 4, idx); - ok(received_end_edit, "Expected to receive a CBEN_ENDEDIT message\n"); - - SetFocus( hComboExParentWnd ); - ok( GetFocus() == hComboExParentWnd, "got %p\n", GetFocus() ); - SetFocus( hComboEx ); - ok( GetFocus() == hEdit, "got %p\n", GetFocus() ); - - DestroyWindow(hComboEx); -} - -static void test_CB_GETLBTEXT(void) -{ - HWND hCombo; - CHAR buff[1]; - COMBOBOXEXITEMA item; - LRESULT ret; - - hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); - - /* set text to null */ - addItem(hCombo, 0, NULL); - - buff[0] = 'a'; - item.mask = CBEIF_TEXT; - item.iItem = 0; - item.pszText = buff; - item.cchTextMax = 1; - ret = SendMessageA(hCombo, CBEM_GETITEMA, 0, (LPARAM)&item); - ok(ret != 0, "CBEM_GETITEM failed\n"); - ok(buff[0] == 0, "\n"); - - ret = SendMessageA(hCombo, CB_GETLBTEXTLEN, 0, 0); - ok(ret == 0, "Expected zero length\n"); - - ret = SendMessageA(hCombo, CB_GETLBTEXTLEN, 0, 0); - ok(ret == 0, "Expected zero length\n"); - - buff[0] = 'a'; - ret = SendMessageA(hCombo, CB_GETLBTEXT, 0, (LPARAM)buff); - ok(ret == 0, "Expected zero length\n"); - ok(buff[0] == 0, "Expected null terminator as a string, got %s\n", buff); - - DestroyWindow(hCombo); -} - -static void test_WM_WINDOWPOSCHANGING(void) -{ - HWND hCombo; - WINDOWPOS wp; - RECT rect; - int combo_height; - int ret; - - hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); - ok(hCombo != NULL, "createComboEx failed\n"); - ret = GetWindowRect(hCombo, &rect); - ok(ret, "GetWindowRect failed\n"); - combo_height = rect.bottom - rect.top; - ok(combo_height > 0, "wrong combo height\n"); - - /* Test height > combo_height */ - wp.x = rect.left; - wp.y = rect.top; - wp.cx = (rect.right - rect.left); - wp.cy = combo_height * 2; - wp.flags = 0; - wp.hwnd = hCombo; - wp.hwndInsertAfter = NULL; - - ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); - ok(ret == 0, "expected 0, got %x\n", ret); - ok(wp.cy == combo_height, - "Expected height %d, got %d\n", combo_height, wp.cy); - - /* Test height < combo_height */ - wp.x = rect.left; - wp.y = rect.top; - wp.cx = (rect.right - rect.left); - wp.cy = combo_height / 2; - wp.flags = 0; - wp.hwnd = hCombo; - wp.hwndInsertAfter = NULL; - - ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); - ok(ret == 0, "expected 0, got %x\n", ret); - ok(wp.cy == combo_height, - "Expected height %d, got %d\n", combo_height, wp.cy); - - ret = DestroyWindow(hCombo); - ok(ret, "DestroyWindow failed\n"); -} - -static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - NMHDR *hdr = (NMHDR*)lParam; - switch(hdr->code){ - case CBEN_ENDEDITA: - { - NMCBEENDEDITA *edit_info = (NMCBEENDEDITA*)hdr; - if(edit_info->iWhy==CBENF_DROPDOWN){ - received_end_edit = TRUE; - } - break; - } - case CBEN_ENDEDITW: - { - NMCBEENDEDITW *edit_info = (NMCBEENDEDITW*)hdr; - if(edit_info->iWhy==CBENF_DROPDOWN){ - received_end_edit = TRUE; - } - break; - } - } - return 0; -} - -static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch(msg) { - - case WM_DESTROY: - PostQuitMessage(0); - break; - case WM_NOTIFY: - return ComboExTestOnNotify(hWnd,msg,wParam,lParam); - default: - return DefWindowProcA(hWnd, msg, wParam, lParam); - } - - return 0L; -} - -static BOOL init(void) -{ - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - WNDCLASSA wc; - INITCOMMONCONTROLSEX iccex; - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return FALSE; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_USEREX_CLASSES; - pInitCommonControlsEx(&iccex); - - pSetWindowSubclass = (void*)GetProcAddress(hComctl32, (LPSTR)410); - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = GetModuleHandleA(NULL); - wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); - wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); - wc.lpszMenuName = NULL; - wc.lpszClassName = ComboExTestClass; - wc.lpfnWndProc = ComboExTestWndProc; - RegisterClassA(&wc); - - hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); - ok(hComboExParentWnd != NULL, "failed to create parent window\n"); - - hMainHinst = GetModuleHandleA(NULL); - - return hComboExParentWnd != NULL; -} - -static void cleanup(void) -{ - MSG msg; - - PostMessageA(hComboExParentWnd, WM_CLOSE, 0, 0); - while (GetMessageA(&msg,0,0,0)) { - TranslateMessage(&msg); - DispatchMessageA(&msg); - } - - DestroyWindow(hComboExParentWnd); - UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); -} - -static void test_comboboxex_subclass(void) -{ - HWND hComboEx, hCombo, hEdit; - - hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); - - hCombo = (HWND)SendMessageA(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); - ok(hCombo != NULL, "Failed to get internal combo\n"); - hEdit = (HWND)SendMessageA(hComboEx, CBEM_GETEDITCONTROL, 0, 0); - ok(hEdit != NULL, "Failed to get internal edit\n"); - - if (pSetWindowSubclass) - { - ok(GetPropA(hCombo, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); - ok(GetPropA(hEdit, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); - } - - DestroyWindow(hComboEx); -} - -static const struct message test_setitem_edit_seq[] = { - { WM_SETTEXT, sent|id, 0, 0, EDITBOX_ID }, - { EM_SETSEL, sent|id|wparam|lparam, 0, 0, EDITBOX_ID }, - { EM_SETSEL, sent|id|wparam|lparam, 0, -1, EDITBOX_ID }, - { 0 } -}; - -static void test_get_set_item(void) -{ - char textA[] = "test"; - HWND hComboEx; - COMBOBOXEXITEMA item; - BOOL ret; - - hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); - - subclass_editbox(hComboEx); - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - - memset(&item, 0, sizeof(item)); - item.mask = CBEIF_TEXT; - item.pszText = textA; - item.iItem = -1; - ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); - - ok_sequence(sequences, EDITBOX_SEQ_INDEX, test_setitem_edit_seq, "set item data for edit", FALSE); - - /* get/set lParam */ - item.mask = CBEIF_LPARAM; - item.iItem = -1; - item.lParam = 0xdeadbeef; - ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); - ok(item.lParam == 0, "Expected zero, got %lx\n", item.lParam); - - item.lParam = 0x1abe11ed; - ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); - - item.lParam = 0; - ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); - ok(item.lParam == 0x1abe11ed, "Expected 0x1abe11ed, got %lx\n", item.lParam); - - DestroyWindow(hComboEx); -} - -START_TEST(comboex) -{ - if (!init()) - return; - - init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - - test_comboboxex(); - test_WM_LBUTTONDOWN(); - test_CB_GETLBTEXT(); - test_WM_WINDOWPOSCHANGING(); - test_comboboxex_subclass(); - test_get_set_item(); - - cleanup(); -} diff --git a/modules/rostests/winetests/comctl32/edit.c b/modules/rostests/winetests/comctl32/edit.c new file mode 100644 index 0000000000..47196245a4 --- /dev/null +++ b/modules/rostests/winetests/comctl32/edit.c @@ -0,0 +1,3024 @@ +/* Unit test suite for edit control. + * + * Copyright 2004 Vitaliy Margolen + * Copyright 2005 C. Scott Ananian + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "precomp.h" + +#ifndef ES_COMBO +#define ES_COMBO 0x200 +#endif + +#define ID_EDITTESTDBUTTON 0x123 +#define ID_EDITTEST2 99 +#define MAXLEN 200 + +struct edit_notify { + int en_change, en_maxtext, en_update; +}; + +static struct edit_notify notifications; + +static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static int num_ok_commands = 0; + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases related to bug 12319 */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 1: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for pressing enter */ + case 3: + num_ok_commands = 0; + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + num_ok_commands++; + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hfocus = GetFocus(); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hedit2 = GetDlgItem(hdlg, 1001); + HWND hedit3 = GetDlgItem(hdlg, 1002); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if (hfocus == hedit) + EndDialog(hdlg, 1111); + else if (hfocus == hedit2) + EndDialog(hdlg, 2222); + else if (hfocus == hedit3) + EndDialog(hdlg, 3333); + else + EndDialog(hdlg, 4444); + break; + case 1: + if ((hfocus == hedit) && (num_ok_commands == 0)) + EndDialog(hdlg, 11); + else + EndDialog(hdlg, 22); + break; + default: + EndDialog(hdlg, 5555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* from bug 11841 */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* more test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* more test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* multiple tab tests */ + case 9: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 10: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + int len; + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hcancel = GetDlgItem(hdlg, IDCANCEL); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + if (len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if (hfocus == hok) + EndDialog(hdlg, 11); + else if (hfocus == hcancel) + EndDialog(hdlg, 22); + else if (hfocus == hedit) + EndDialog(hdlg, 33); + else + EndDialog(hdlg, 44); + break; + + default: + EndDialog(hdlg, 555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if ((hfocus == hedit) && len == 2) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static HINSTANCE hinst; +static HWND hwndET2; +static const char szEditTest2Class[] = "EditTest2Class"; +static const char szEditTest3Class[] = "EditTest3Class"; +static const char szEditTest4Class[] = "EditTest4Class"; +static const char szEditTextPositionClass[] = "EditTextPositionWindowClass"; + +static HWND create_editcontrol (DWORD style, DWORD exstyle) +{ + HWND handle; + + handle = CreateWindowExA(exstyle, + "EDIT", + "Test Text", + style, + 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok (handle != NULL, "CreateWindow EDIT Control failed\n"); + assert (handle); + if (winetest_interactive) + ShowWindow (handle, SW_SHOW); + return handle; +} + +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, WC_EDITW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + +static HWND create_child_editcontrol (DWORD style, DWORD exstyle) +{ + HWND parentWnd; + HWND editWnd; + RECT rect; + BOOL b; + SetRect(&rect, 0, 0, 300, 300); + b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + ok(b, "AdjustWindowRect failed\n"); + + parentWnd = CreateWindowExA(0, + szEditTextPositionClass, + "Edit Test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + rect.right - rect.left, rect.bottom - rect.top, + NULL, NULL, hinst, NULL); + ok (parentWnd != NULL, "CreateWindow EDIT Test failed\n"); + assert(parentWnd); + + editWnd = CreateWindowExA(exstyle, + "EDIT", + "Test Text", + WS_CHILD | style, + 0, 0, 300, 300, + parentWnd, NULL, hinst, NULL); + ok (editWnd != NULL, "CreateWindow EDIT Test Text failed\n"); + assert(editWnd); + if (winetest_interactive) + ShowWindow (parentWnd, SW_SHOW); + return editWnd; +} + +static void destroy_child_editcontrol (HWND hwndEdit) +{ + if (GetParent(hwndEdit)) + DestroyWindow(GetParent(hwndEdit)); + else { + trace("Edit control has no parent!\n"); + DestroyWindow(hwndEdit); + } +} + +static LONG get_edit_style (HWND hwnd) +{ + return GetWindowLongA( hwnd, GWL_STYLE ) & ( + ES_LEFT | +/* FIXME: not implemented + ES_CENTER | + ES_RIGHT | + ES_OEMCONVERT | +*/ + ES_MULTILINE | + ES_UPPERCASE | + ES_LOWERCASE | + ES_PASSWORD | + ES_AUTOVSCROLL | + ES_AUTOHSCROLL | + ES_NOHIDESEL | + ES_COMBO | + ES_READONLY | + ES_WANTRETURN | + ES_NUMBER + ); +} + +static void set_client_height(HWND Wnd, unsigned Height) +{ + RECT ClientRect, WindowRect; + + GetWindowRect(Wnd, &WindowRect); + GetClientRect(Wnd, &ClientRect); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left, + Height + (WindowRect.bottom - WindowRect.top) - + (ClientRect.bottom - ClientRect.top), + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + + /* Workaround for a bug in Windows' edit control + (multi-line mode) */ + GetWindowRect(Wnd, &WindowRect); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left + 1, + WindowRect.bottom - WindowRect.top + 1, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left, + WindowRect.bottom - WindowRect.top, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + + GetClientRect(Wnd, &ClientRect); + ok(ClientRect.bottom - ClientRect.top == Height, + "The client height should be %d, but is %d\n", + Height, ClientRect.bottom - ClientRect.top); +} + +static void test_edit_control_1(void) +{ + HWND hwEdit; + MSG msMessage; + int i; + LONG r; + + msMessage.message = WM_KEYDOWN; + + trace("EDIT: Single line\n"); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL), "Wrong style expected 0xc0 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Single line want returns\n"); + hwEdit = create_editcontrol(ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN), "Wrong style expected 0x10c0 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Multiline line\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0xc4 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Multi line want returns\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0x10c4 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); +} + +/* WM_SETTEXT is implemented by selecting all text, and then replacing the + * selection. This test checks that the first 'select all' doesn't generate + * an UPDATE message which can escape and (via a handler) change the + * selection, which would cause WM_SETTEXT to break. This old bug + * was fixed 18-Mar-2005; we check here to ensure it doesn't regress. + */ +static void test_edit_control_2(void) +{ + HWND hwndMain, phwnd; + char szLocalString[MAXLEN]; + LONG r, w = 150, h = 50; + POINT cpos; + + /* Create main and edit windows. */ + hwndMain = CreateWindowA(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + if (winetest_interactive) + ShowWindow (hwndMain, SW_SHOW); + + hwndET2 = CreateWindowA("EDIT", NULL, + WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, w, h, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndET2); + if (winetest_interactive) + ShowWindow (hwndET2, SW_SHOW); + + trace("EDIT: SETTEXT atomicity\n"); + /* Send messages to "type" in the word 'foo'. */ + r = SendMessageA(hwndET2, WM_CHAR, 'f', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + /* 'foo' should have been changed to 'bar' by the UPDATE handler. */ + GetWindowTextA(hwndET2, szLocalString, MAXLEN); + ok(strcmp(szLocalString, "bar")==0, + "Wrong contents of edit: %s\n", szLocalString); + + /* try setting the caret before it's visible */ + r = SetCaretPos(0, 0); + todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); + phwnd = SetFocus(hwndET2); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL\n"); + r = SetCaretPos(0, 0); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == 0 && cpos.y == 0, "Wrong caret position, expected: (0,0), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(-1, -1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == -1 && cpos.y == -1, "Wrong caret position, expected: (-1,-1), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(w << 1, h << 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w << 1) && cpos.y == (h << 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w << 1, h << 1, cpos.x, cpos.y); + r = SetCaretPos(w, h); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == w && cpos.y == h, "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w, h, cpos.x, cpos.y); + r = SetCaretPos(w - 1, h - 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w - 1) && cpos.y == (h - 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w - 1, h - 1, cpos.x, cpos.y); + + DestroyWindow(hwndET2); + DestroyWindow(hwndMain); +} + +static void ET2_check_change(void) +{ + char szLocalString[MAXLEN]; + /* This EN_UPDATE handler changes any 'foo' to 'bar'. */ + GetWindowTextA(hwndET2, szLocalString, MAXLEN); + if (!strcmp(szLocalString, "foo")) + { + strcpy(szLocalString, "bar"); + SendMessageA(hwndET2, WM_SETTEXT, 0, (LPARAM)szLocalString); + } + /* always leave the cursor at the end. */ + SendMessageA(hwndET2, EM_SETSEL, MAXLEN - 1, MAXLEN - 1); +} + +static void ET2_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + if (id == ID_EDITTEST2 && codeNotify == EN_UPDATE) + ET2_check_change(); +} + +static LRESULT CALLBACK ET2_WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + ET2_OnCommand(hwnd, LOWORD(wParam), (HWND)lParam, HIWORD(wParam)); + break; + } + return DefWindowProcA(hwnd, iMsg, wParam, lParam); +} + +static void zero_notify(void) +{ + notifications.en_change = 0; + notifications.en_maxtext = 0; + notifications.en_update = 0; +} + +#define test_notify(enchange, enmaxtext, enupdate) \ +do { \ + ok(notifications.en_change == enchange, "expected %d EN_CHANGE notifications, " \ + "got %d\n", enchange, notifications.en_change); \ + ok(notifications.en_maxtext == enmaxtext, "expected %d EN_MAXTEXT notifications, " \ + "got %d\n", enmaxtext, notifications.en_maxtext); \ + ok(notifications.en_update == enupdate, "expected %d EN_UPDATE notifications, " \ + "got %d\n", enupdate, notifications.en_update); \ +} while(0) + +static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case EN_MAXTEXT: + notifications.en_maxtext++; + break; + case EN_UPDATE: + notifications.en_update++; + break; + case EN_CHANGE: + notifications.en_change++; + break; + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response + * to these messages. + */ +static void test_edit_control_3(void) +{ + static const char *str = "this is a long string."; + static const char *str2 = "this is a long string.\r\nthis is a long string.\r\nthis is a long string.\r\nthis is a long string."; + HWND hWnd, hParent; + int len, dpi; + HDC hDC; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + + trace("EDIT: Test notifications\n"); + + hParent = CreateWindowExA(0, + szEditTest3Class, + NULL, + 0, + CW_USEDEFAULT, CW_USEDEFAULT, 10, 10, + NULL, NULL, NULL, NULL); + assert(hParent); + + trace("EDIT: Single line, no ES_AUTOHSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + 0, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + if (len == lstrlenA(str)) /* Win 8 */ + test_notify(1, 0, 1); + else + test_notify(1, 1, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == len, "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessageA(hParent, WM_SETFOCUS, 0, (LPARAM)hWnd); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + DestroyWindow(hWnd); + + trace("EDIT: Single line, ES_AUTOHSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_AUTOHSCROLL, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, no ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + if (len == lstrlenA(str)) /* Win 8 */ + test_notify(1, 0, 1); + else + { + ok(0 == len, "text should have been truncated, expected 0, got %d\n", len); + test_notify(1, 1, 1); + } + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0), "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE | ES_AUTOHSCROLL, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(0 == len, "text should have been truncated, expected 0, got %d\n", len); + test_notify(1, 1, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0), "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, ES_AUTOHSCROLL and ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); +} + +static void test_char_from_pos(void) +{ + int lo, hi, mid, ret, i; + HWND hwEdit; + + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); +} + +/* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL + * truncates text that doesn't fit. + */ +static void test_edit_control_5(void) +{ + static const char *str = "test\r\ntest"; + HWND parentWnd; + HWND hWnd; + int len; + RECT rc1 = { 10, 10, 11, 11}; + RECT rc; + + /* first show that a non-child won't do for this test */ + hWnd = CreateWindowExA(0, + "EDIT", + str, + 0, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + /* size of non-child edit control is (much) bigger than requested */ + GetWindowRect( hWnd, &rc); + ok( rc.right - rc.left > 20, "size of the window (%d) is smaller than expected\n", + rc.right - rc.left); + DestroyWindow(hWnd); + /* so create a parent, and give it edit controls children to test with */ + parentWnd = CreateWindowExA(0, + szEditTextPositionClass, + "Edit Test", WS_VISIBLE | + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 250, 250, + NULL, NULL, hinst, NULL); + assert(parentWnd); + ShowWindow( parentWnd, SW_SHOW); + /* single line */ + hWnd = CreateWindowExA(0, + "EDIT", + str, WS_VISIBLE | WS_BORDER | + WS_CHILD, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + /* multi line */ + hWnd = CreateWindowExA(0, + "EDIT", + str, + WS_CHILD | ES_MULTILINE, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + DestroyWindow(parentWnd); +} + +/* Test WM_GETTEXT processing + * after destroy messages + */ +static void test_edit_control_6(void) +{ + static const char *str = "test\r\ntest"; + char buf[MAXLEN]; + HWND hWnd; + LONG ret; + + hWnd = CreateWindowExA(0, "EDIT", "Test", 0, 10, 10, 1, 1, NULL, NULL, hinst, NULL); + ok(hWnd != NULL, "Failed to create edit control.\n"); + + ret = SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + ok(ret == TRUE, "Expected %d, got %d\n", TRUE, ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret); + ok(!strcmp(buf, str), "Expected %s, got %s\n", str, buf); + + buf[0] = 0; + ret = SendMessageA(hWnd, WM_DESTROY, 0, 0); +todo_wine + ok(ret == 1, "Unexpected return value %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret); + ok(!strcmp(buf, str), "Expected %s, got %s\n", str, buf); + + buf[0] = 0; + ret = SendMessageA(hWnd, WM_NCDESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); +todo_wine { + ok(ret == strlen("Test"), "Unexpected text length %d\n", ret); + ok(!strcmp(buf, "Test"), "Unexpected text %s\n", buf); +} + DestroyWindow(hWnd); +} + +static void test_edit_control_limittext(void) +{ + HWND hwEdit; + DWORD r; + + /* Test default limit for single-line control */ + trace("EDIT: buffer limit for single-line\n"); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); + SendMessageA(hwEdit, EM_SETLIMITTEXT, 0, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok( r == 2147483646, "got limit %u (expected 2147483646)\n", r); + DestroyWindow(hwEdit); + + /* Test default limit for multi-line control */ + trace("EDIT: buffer limit for multi-line\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); + SendMessageA(hwEdit, EM_SETLIMITTEXT, 0, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok( r == 4294967295U, "got limit %u (expected 4294967295)\n", r); + DestroyWindow(hwEdit); +} + +/* Test EM_SCROLL */ +static void test_edit_control_scroll(void) +{ + static const char *single_line_str = "a"; + static const char *multiline_str = "Test\r\nText"; + HWND hwEdit; + LONG ret; + + /* Check the return value when EM_SCROLL doesn't scroll + * anything. Should not return true unless any lines were actually + * scrolled. */ + hwEdit = CreateWindowA( + "EDIT", + single_line_str, + WS_VSCROLL | ES_MULTILINE, + 1, 1, 100, 100, + NULL, NULL, hinst, NULL); + + assert(hwEdit); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_LINEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_LINEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); + + /* SB_PAGEDOWN while at the beginning of a buffer with few lines + should not cause EM_SCROLL to return a negative value of + scrolled lines that would put us "before" the beginning. */ + hwEdit = CreateWindowA( + "EDIT", + multiline_str, + WS_VSCROLL | ES_MULTILINE, + 0, 0, 100, 100, + NULL, NULL, hinst, NULL); + assert(hwEdit); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); +} + +static void test_margins_usefontinfo(UINT charset) +{ + INT margins, threshold, expect, empty_expect, small_expect; + HWND hwnd; + HDC hdc; + SIZE size; + BOOL cjk; + LOGFONTA lf; + HFONT hfont; + RECT rect; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Big window rectangle */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + expect = MAKELONG(size.cx / 2, size.cx / 2); + small_expect = 0; + empty_expect = size.cx >= 28 ? small_expect : expect; + + charset = GetTextCharset(hdc); + switch (charset) + { + case SHIFTJIS_CHARSET: + case HANGUL_CHARSET: + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + cjk = TRUE; + break; + default: + cjk = FALSE; + } + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) > 0 && LOWORD(margins) > 0, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + expect = empty_expect = small_expect = margins; + } + DestroyWindow(hwnd); + + threshold = (size.cx / 2 + size.cx) * 2; + + /* Size below which non-cjk margins are zero */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold - 1, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == small_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + /* Size at which non-cjk margins become non-zero */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + /* Empty rect */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == empty_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + DeleteObject(hfont); +} + +static void test_margins(void) +{ + DWORD old_margins, new_margins; + RECT old_rect, new_rect; + INT old_right_margin; + HWND hwEdit; + + hwEdit = create_editcontrol(WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + old_right_margin = HIWORD(old_margins); + + /* Check if setting the margins works */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN, MAKELONG(10, 0)); + new_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(new_margins) == 10, "Wrong left margin: %d\n", LOWORD(new_margins)); + ok(HIWORD(new_margins) == old_right_margin, "Wrong right margin: %d\n", HIWORD(new_margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_RIGHTMARGIN, MAKELONG(0, 10)); + new_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(new_margins) == 10, "Wrong left margin: %d\n", LOWORD(new_margins)); + ok(HIWORD(new_margins) == 10, "Wrong right margin: %d\n", HIWORD(new_margins)); + + /* The size of the rectangle must decrease if we increase the margin */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(5, 5)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(15, 20)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(new_rect.left == old_rect.left + 10, "The left border of the rectangle is wrong\n"); + ok(new_rect.right == old_rect.right - 15, "The right border of the rectangle is wrong\n"); + ok(new_rect.top == old_rect.top, "The top border of the rectangle must not change\n"); + ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle must not change\n"); + + /* If we set the margin to same value as the current margin, + the rectangle must not change */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); + SetRect(&old_rect, 1, 1, 99, 99); + SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + /* The lParam argument of the WM_SIZE message should be ignored. */ + + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MINIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MAXIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + DestroyWindow (hwEdit); + + test_margins_usefontinfo(ANSI_CHARSET); + test_margins_usefontinfo(EASTEUROPE_CHARSET); + + test_margins_usefontinfo(SHIFTJIS_CHARSET); + test_margins_usefontinfo(HANGUL_CHARSET); + test_margins_usefontinfo(CHINESEBIG5_CHARSET); + /* Don't test JOHAB_CHARSET. Treated as CJK by Win 8, + but not by < Win 8 and Win 10. */ + + test_margins_usefontinfo(DEFAULT_CHARSET); +} + +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static void test_margins_font_change(void) +{ + DWORD margins, font_margins, ret; + HFONT hfont, hfont2; + HWND hwEdit; + LOGFONTA lf; + HDC hdc; + + hdc = GetDC(0); + ret = EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0); + ReleaseDC(0, hdc); + if (ret) + { + trace("Arial not found - skipping font change margin tests\n"); + return; + } + + hwEdit = create_child_editcontrol(0, 0); + + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 16; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + lf.lfHeight = 30; + hfont2 = CreateFontIndirectA(&lf); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + font_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(font_margins) != 0, "got %d\n", LOWORD(font_margins)); + ok(HIWORD(font_margins) != 0, "got %d\n", HIWORD(font_margins)); + + /* With 'small' edit controls, test that the margin doesn't get set */ + SetWindowPos(hwEdit, NULL, 10, 10, 16, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + /* Above a certain size threshold then the margin is updated */ + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, 0, 0); + + DeleteObject(hfont2); + DeleteObject(hfont); + destroy_child_editcontrol(hwEdit); + +} + +#define edit_pos_ok(exp, got, txt) \ + ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); + +#define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ +do { \ + RECT format_rect; \ + int left_margin; \ + set_client_height(hwEdit, set_height); \ + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM) &format_rect); \ + left_margin = LOWORD(SendMessageA(hwEdit, EM_GETMARGINS, 0, 0)); \ + edit_pos_ok(test_top, format_rect.top, vertical position); \ + edit_pos_ok((int)test_height, format_rect.bottom - format_rect.top, height); \ + edit_pos_ok(test_left, format_rect.left - left_margin, left); \ +} while(0) + +static void test_text_position_style(DWORD style) +{ + HWND hwEdit; + HFONT font, oldFont; + HDC dc; + TEXTMETRICA metrics; + INT b, bm, b2, b3; + BOOL xb, single_line = !(style & ES_MULTILINE); + + b = GetSystemMetrics(SM_CYBORDER) + 1; + b2 = 2 * b; + b3 = 3 * b; + bm = b2 - 1; + + /* Get a stock font for which we can determine the metrics */ + font = GetStockObject(SYSTEM_FONT); + ok (font != NULL, "GetStockObject SYSTEM_FONT failed\n"); + dc = GetDC(NULL); + ok (dc != NULL, "GetDC() failed\n"); + oldFont = SelectObject(dc, font); + xb = GetTextMetricsA(dc, &metrics); + ok (xb, "GetTextMetrics failed\n"); + SelectObject(dc, oldFont); + ReleaseDC(NULL, dc); + + /* Windows' edit control has some bugs in multi-line mode: + * - Sometimes the format rectangle doesn't get updated + * (see workaround in set_client_height()) + * - If the height of the control is smaller than the height of a text + * line, the format rectangle is still as high as a text line + * (higher than the client rectangle) and the caret is not shown + */ + + /* Edit controls that are in a parent window */ + + hwEdit = create_child_editcontrol(style | WS_VISIBLE, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 2, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + bm, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b2, b, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_VISIBLE, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + destroy_child_editcontrol(hwEdit); + + + /* Edit controls that are popup windows */ + + hwEdit = create_editcontrol(style | WS_POPUP, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 2, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP | WS_BORDER, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + bm, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b2, b, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP | WS_BORDER, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + DestroyWindow(hwEdit); +} + +static void test_text_position(void) +{ + trace("EDIT: Text position (Single line)\n"); + test_text_position_style(ES_AUTOHSCROLL | ES_AUTOVSCROLL); + trace("EDIT: Text position (Multi line)\n"); + test_text_position_style(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL); +} + +static void test_espassword(void) +{ + HWND hwEdit; + LONG r; + char buffer[1024]; + const char* password = "secret"; + + hwEdit = create_editcontrol(ES_PASSWORD, 0); + r = get_edit_style(hwEdit); + ok(r == ES_PASSWORD, "Wrong style expected ES_PASSWORD got: 0x%x\n", r); + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) password); + ok(r == TRUE, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, cut (ctrl-x) */ + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == strlen(password), "Expected: %s, got len %d\n", password, r); + ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); + + r = OpenClipboard(hwEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* select all, copy (ctrl-c) and paste (ctrl-v) */ + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, WM_CHAR, 3, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 22, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: 0, got: %d\n", r); + ok(strcmp(buffer, "") == 0, "expected empty string, got %s\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_undo(void) +{ + HWND hwEdit; + LONG r; + DWORD cpMin, cpMax; + char buffer[1024]; + const char* text = "undo this"; + + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) text); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, */ + cpMin = cpMax = 0xdeadbeef; + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, EM_GETSEL, (WPARAM) &cpMin, (LPARAM) &cpMax); + ok((strlen(text) << 16) == r, "Unexpected length %d\n", r); + ok(0 == cpMin, "Expected: %d, got %d\n", 0, cpMin); + ok(9 == cpMax, "Expected: %d, got %d\n", 9, cpMax); + + /* cut (ctrl-x) */ + r = SendMessageA(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + /* undo (ctrl-z) */ + r = SendMessageA(hwEdit, WM_CHAR, 26, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(strlen(text) == r, "Unexpected length %d\n", r); + ok(0 == strcmp(buffer, text), "expected %s, got %s\n", text, buffer); + + /* undo again (ctrl-z) */ + r = SendMessageA(hwEdit, WM_CHAR, 26, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + DestroyWindow(hwEdit); +} + +static void test_enter(void) +{ + char buffer[16]; + HWND hwEdit; + LONG r; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(2 == r, "Expected: %d, got len %d\n", 2, r); + ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); + + /* single line with ES_WANTRETURN */ + hwEdit = create_editcontrol(ES_WANTRETURN, 0); + r = get_edit_style(hwEdit); + ok(ES_WANTRETURN == r, "Wrong style expected ES_WANTRETURN got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_tab(void) +{ + char buffer[16]; + HWND hwEdit; + LONG r; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_TAB, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(1 == r, "Expected: %d, got len %d\n", 1, r); + ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_TAB, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_edit_dialog(void) +{ + int r; + + /* from bug 11841 */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests with an editable edit control */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* multiple tab tests */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 9); + ok(22 == r, "Expected %d, got %d\n", 22, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 10); + ok(33 == r, "Expected %d, got %d\n", 33, r); +} + +static void test_multi_edit_dialog(void) +{ + int r; + + /* test for multiple edit dialogs (bug 12319) */ + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 0); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 1); + ok(1111 == r, "Expected %d, got %d\n", 1111, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 2); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 3); + ok(11 == r, "Expected %d, got %d\n", 11, r); +} + +static void test_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 1); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + +static void test_singleline_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 0); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 6); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 0); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 6); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + +static int child_edit_wmkeydown_num_messages = 0; +static INT_PTR CALLBACK child_edit_wmkeydown_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DESTROY: + case WM_NCDESTROY: + break; + + default: + child_edit_wmkeydown_num_messages++; + break; + } + + return FALSE; +} + +static void test_child_edit_wmkeydown(void) +{ + HWND hwEdit, hwParent; + int r; + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)child_edit_wmkeydown_proc); + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages); + destroy_child_editcontrol(hwEdit); +} + +static BOOL got_en_setfocus = FALSE; +static BOOL got_wm_capturechanged = FALSE; +static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); + +static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + got_en_setfocus = TRUE; + break; + } + break; + case WM_CAPTURECHANGED: + if (hWnd != (HWND)lParam) + { + got_wm_capturechanged = TRUE; + EndMenu(); + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +struct context_menu_messages +{ + unsigned int wm_command, em_setsel; +}; + +static struct context_menu_messages menu_messages; + +static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_ENTERIDLE: + if (wParam == MSGF_MENU) + { + HWND hwndMenu = (HWND)lParam; + MENUBARINFO mbi = { sizeof(mbi) }; + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) + { + MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; + if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) + { + if (mii.fState & MFS_HILITE) + { + PostMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hwnd, WM_KEYUP, VK_RETURN, 0x1c0001); + } + else + { + PostMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0x500001); + PostMessageA(hwnd, WM_KEYUP, VK_DOWN, 0x500001); + } + } + } + } + break; + case WM_COMMAND: + menu_messages.wm_command++; + break; + case EM_SETSEL: + menu_messages.em_setsel++; + break; + } + return CallWindowProcA(p_edit_proc, hwnd, msg, wParam, lParam); +} + +static void test_contextmenu(void) +{ + HWND hwndMain, hwndEdit; + MSG msg; + + hwndMain = CreateWindowA(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + + hwndEdit = CreateWindowA("EDIT", NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, 150, 50, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndEdit); + + SetFocus(NULL); + SetCapture(hwndMain); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + ok(got_en_setfocus, "edit box didn't get focused\n"); + ok(got_wm_capturechanged, "main window capture did not change\n"); + + DestroyWindow(hwndEdit); + + hwndEdit = CreateWindowA("EDIT", "Test Text", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hwndMain, NULL, hinst, NULL); + memset(&menu_messages, 0, sizeof(menu_messages)); + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, + (ULONG_PTR)child_edit_menu_proc); + + SetFocus(hwndEdit); + SendMessageA(hwndEdit, WM_SETTEXT, 0, (LPARAM)"foo"); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(-1, -1)); + while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok(menu_messages.wm_command == 0, + "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); + ok(menu_messages.em_setsel == 1, + "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); + + DestroyWindow(hwndEdit); + DestroyWindow(hwndMain); +} + +static BOOL register_classes(void) +{ + WNDCLASSA test2; + WNDCLASSA test3; + WNDCLASSA test4; + WNDCLASSA text_position; + + test2.style = 0; + test2.lpfnWndProc = ET2_WndProc; + test2.cbClsExtra = 0; + test2.cbWndExtra = 0; + test2.hInstance = hinst; + test2.hIcon = NULL; + test2.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + test2.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test2.lpszMenuName = NULL; + test2.lpszClassName = szEditTest2Class; + if (!RegisterClassA(&test2)) return FALSE; + + test3.style = 0; + test3.lpfnWndProc = edit3_wnd_procA; + test3.cbClsExtra = 0; + test3.cbWndExtra = 0; + test3.hInstance = hinst; + test3.hIcon = 0; + test3.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + test3.hbrBackground = GetStockObject(WHITE_BRUSH); + test3.lpszMenuName = NULL; + test3.lpszClassName = szEditTest3Class; + if (!RegisterClassA(&test3)) return FALSE; + + test4.style = 0; + test4.lpfnWndProc = edit4_wnd_procA; + test4.cbClsExtra = 0; + test4.cbWndExtra = 0; + test4.hInstance = hinst; + test4.hIcon = NULL; + test4.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + test4.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test4.lpszMenuName = NULL; + test4.lpszClassName = szEditTest4Class; + if (!RegisterClassA(&test4)) return FALSE; + + text_position.style = CS_HREDRAW | CS_VREDRAW; + text_position.cbClsExtra = 0; + text_position.cbWndExtra = 0; + text_position.hInstance = hinst; + text_position.hIcon = NULL; + text_position.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + text_position.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + text_position.lpszMenuName = NULL; + text_position.lpszClassName = szEditTextPositionClass; + text_position.lpfnWndProc = DefWindowProcA; + if (!RegisterClassA(&text_position)) return FALSE; + + return TRUE; +} + +static void UnregisterWindowClasses (void) +{ + UnregisterClassA(szEditTest2Class, hinst); + UnregisterClassA(szEditTest3Class, hinst); + UnregisterClassA(szEditTest4Class, hinst); + UnregisterClassA(szEditTextPositionClass, hinst); +} + +static void test_fontsize(void) +{ + HWND hwEdit; + HFONT hfont; + HDC hDC; + LOGFONTA lf; + LONG r; + char szLocalString[MAXLEN]; + int dpi; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + + memset(&lf,0,sizeof(LOGFONTA)); + strcpy(lf.lfFaceName,"Arial"); + lf.lfHeight = -300; /* taller than the edit box */ + lf.lfWeight = 500; + hfont = CreateFontIndirectA(&lf); + + trace("EDIT: Oversized font (Multi line)\n"); + hwEdit= CreateWindowA("EDIT", NULL, ES_MULTILINE|ES_AUTOHSCROLL, + 0, 0, (150 * dpi) / 96, (50 * dpi) / 96, NULL, NULL, + hinst, NULL); + + SendMessageA(hwEdit,WM_SETFONT,(WPARAM)hfont,0); + + if (winetest_interactive) + ShowWindow (hwEdit, SW_SHOW); + + r = SendMessageA(hwEdit, WM_CHAR, 'A', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 'B', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 'C', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + GetWindowTextA(hwEdit, szLocalString, MAXLEN); + ok(strcmp(szLocalString, "ABC")==0, + "Wrong contents of edit: %s\n", szLocalString); + + r = SendMessageA(hwEdit, EM_POSFROMCHAR,0,0); + ok(r != -1,"EM_POSFROMCHAR failed index 0\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,1,0); + ok(r != -1,"EM_POSFROMCHAR failed index 1\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,2,0); + ok(r != -1,"EM_POSFROMCHAR failed index 2\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,3,0); + ok(r == -1,"EM_POSFROMCHAR succeeded index 3\n"); + + DestroyWindow (hwEdit); + DeleteObject(hfont); +} + +struct dialog_mode_messages +{ + int wm_getdefid, wm_close, wm_command, wm_nextdlgctl; +}; + +static struct dialog_mode_messages dm_messages; + +static void zero_dm_messages(void) +{ + dm_messages.wm_command = 0; + dm_messages.wm_close = 0; + dm_messages.wm_getdefid = 0; + dm_messages.wm_nextdlgctl = 0; +} + +#define test_dm_messages(wmcommand, wmclose, wmgetdefid, wmnextdlgctl) \ + ok(dm_messages.wm_command == wmcommand, "expected %d WM_COMMAND messages, " \ + "got %d\n", wmcommand, dm_messages.wm_command); \ + ok(dm_messages.wm_close == wmclose, "expected %d WM_CLOSE messages, " \ + "got %d\n", wmclose, dm_messages.wm_close); \ + ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ + ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ + "got %d\n", wmnextdlgctl, dm_messages.wm_nextdlgctl) + +static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + dm_messages.wm_command++; + break; + case DM_GETDEFID: + dm_messages.wm_getdefid++; + return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID); + case WM_NEXTDLGCTL: + dm_messages.wm_nextdlgctl++; + break; + case WM_CLOSE: + dm_messages.wm_close++; + break; + } + + return DefWindowProcA(hwnd, iMsg, wParam, lParam); +} + +static void test_dialogmode(void) +{ + HWND hwEdit, hwParent, hwButton; + MSG msg= {0}; + int len, r; + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, 0); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE, 0); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_BACK; + msg.lParam = 0xe0001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_BACK, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + DestroyWindow(hwEdit); + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + zero_dm_messages(); + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_TAB; + msg.lParam = 0xf0001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_TAB, (LPARAM)&msg); + ok(0x89 == r, "expected 0x89, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_ESCAPE; + msg.lParam = 0x10001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_ESCAPE, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 1); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 0); + zero_dm_messages(); + + hwButton = CreateWindowA("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, + 100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL); + ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 1); + zero_dm_messages(); + + DestroyWindow(hwButton); + destroy_child_editcontrol(hwEdit); +} + +static void test_EM_GETHANDLE(void) +{ + static const WCHAR str1W[] = {'1','1','1','1','+','1','1','1','1','+','1','1','1','1','#',0}; + static const WCHAR str2W[] = {'2','2','2','2','-','2','2','2','2','-','2','2','2','2','-','2','2','2','2','#',0}; + static const char str0[] = "untouched"; + static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; + static const char str2[] = "2222-2222-2222-2222#"; + static const char str3[] = "3333*3333*3333*3333*3333#"; + CHAR current[42]; + HWND hEdit; + HLOCAL hmem; + HLOCAL hmem2; + HLOCAL halloc; + WCHAR *buffer; + int len; + int r; + + trace("EDIT: EM_GETHANDLE\n"); + + /* EM_GETHANDLE is not supported for a single line edit control */ + hEdit = create_editcontrol(WS_BORDER, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem == NULL, "got %p (expected NULL)\n", hmem); + DestroyWindow(hEdit); + + /* EM_GETHANDLE needs a multiline edit control */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + /* The buffer belongs to the app now. According to MSDN, the app has to LocalFree the + buffer, LocalAlloc a new buffer and pass it to the edit control with EM_SETHANDLE. */ + + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + len = lstrlenW(buffer); +todo_wine + ok(len == lstrlenW(str1W) && !lstrcmpW(buffer, str1W), "Unexpected buffer contents %s, length %d.\n", + wine_dbgstr_w(buffer), len); + LocalUnlock(hmem); + + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok(r == lstrlenA(str1_1) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); +todo_wine + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); +todo_wine + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + /* use LocalAlloc first to get a different handle */ + halloc = LocalAlloc(LMEM_MOVEABLE, 42); + ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); + /* prepare our new memory */ + buffer = LocalLock(halloc); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + lstrcpyW(buffer, str2W); + LocalUnlock(halloc); + + /* LocalFree the old memory handle before EM_SETHANDLE the new handle */ + LocalFree(hmem); + /* use LocalAlloc after the LocalFree to likely consume the handle */ + hmem2 = LocalAlloc(LMEM_MOVEABLE, 42); + ok(hmem2 != NULL, "got %p (expected != NULL)\n", hmem2); + + SendMessageA(hEdit, EM_SETHANDLE, (WPARAM)halloc, 0); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str2), "got %d (expected %d)\n", len, lstrlenA(str2)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok(r == lstrlenA(str2) && !lstrcmpA(current, str2), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str2), str2); + + /* set a different text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str3); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str3)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str3)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str3)) && !lstrcmpA(current, str3), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str3), str3); + + LocalFree(hmem2); + DestroyWindow(hEdit); + + /* Some apps have bugs ... */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + /* everything is normal up to EM_GETHANDLE */ + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + /* Some messages still work while other messages fail. + After LocalFree the memory handle, messages can crash the app */ + + /* A buggy editor used EM_GETHANDLE twice */ + hmem2 = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem2 == hmem, "got %p (expected %p)\n", hmem2, hmem); + + /* Let the edit control free the memory handle */ + SendMessageA(hEdit, EM_SETHANDLE, (WPARAM)hmem2, 0); + + DestroyWindow(hEdit); +} + +static void test_paste(void) +{ + static const char *str = "this is a simple text"; + static const char *str2 = "first line\r\nsecond line"; + HWND hEdit, hMultilineEdit; + HANDLE hmem, hmem_ret; + char *buffer; + int r, len; + + hEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hMultilineEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + + /* Prepare clipboard data with simple text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste single line */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str) == len, "got %d\n", len); + + /* Prepare clipboard data with multiline text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str2); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste multiline text in singleline edit - should be cut */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen("first line") == len, "got %d\n", len); + + /* Paste multiline text in multiline edit */ + SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); + len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str2) == len, "got %d\n", len); + + /* Cleanup */ + DestroyWindow(hEdit); + DestroyWindow(hMultilineEdit); +} + +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + todo_wine_if(i == 0) + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + +START_TEST(edit) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + BOOL b; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + hinst = GetModuleHandleA(NULL); + b = register_classes(); + ok(b, "Failed to register test classes.\n"); + if (!b) return; + + test_edit_control_1(); + test_edit_control_2(); + test_edit_control_3(); + test_char_from_pos(); + test_edit_control_5(); + test_edit_control_6(); + test_edit_control_limittext(); + test_edit_control_scroll(); + test_margins(); + test_margins_font_change(); + test_text_position(); + test_espassword(); + test_undo(); + test_enter(); + test_tab(); + test_edit_dialog(); + test_multi_edit_dialog(); + test_wantreturn_edit_dialog(); + test_singleline_wantreturn_edit_dialog(); + test_child_edit_wmkeydown(); + test_fontsize(); + test_dialogmode(); + test_contextmenu(); + test_EM_GETHANDLE(); + test_paste(); + test_EM_GETLINE(); + + UnregisterWindowClasses(); + + unload_v6_module(ctx_cookie, hCtx); +} diff --git a/modules/rostests/winetests/comctl32/imagelist.c b/modules/rostests/winetests/comctl32/imagelist.c index 57e7f5c069..55466ac37a 100644 --- a/modules/rostests/winetests/comctl32/imagelist.c +++ b/modules/rostests/winetests/comctl32/imagelist.c @@ -49,6 +49,7 @@ typedef struct _ILHEAD #include "poppack.h" static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*); static BOOL (WINAPI *pImageList_SetImageCount)(HIMAGELIST,UINT); @@ -56,6 +57,22 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); +static BOOL (WINAPI *pImageList_BeginDrag)(HIMAGELIST, int, int, int); +static HIMAGELIST (WINAPI *pImageList_GetDragImage)(POINT *, POINT *); +static void (WINAPI *pImageList_EndDrag)(void); +static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); +static BOOL (WINAPI *pImageList_SetDragCursorImage)(HIMAGELIST, int, int, int); +static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); +static BOOL (WINAPI *pImageList_Remove)(HIMAGELIST, int); +static INT (WINAPI *pImageList_ReplaceIcon)(HIMAGELIST, int, HICON); +static BOOL (WINAPI *pImageList_Replace)(HIMAGELIST, int, HBITMAP, HBITMAP); +static HIMAGELIST (WINAPI *pImageList_Merge)(HIMAGELIST, int, HIMAGELIST, int, int, int); +static BOOL (WINAPI *pImageList_GetImageInfo)(HIMAGELIST, int, IMAGEINFO *); +static BOOL (WINAPI *pImageList_Write)(HIMAGELIST, IStream *); +static HIMAGELIST (WINAPI *pImageList_Read)(IStream *); +static BOOL (WINAPI *pImageList_Copy)(HIMAGELIST, int, HIMAGELIST, int, UINT); +static HIMAGELIST (WINAPI *pImageList_LoadImageW)(HINSTANCE, LPCWSTR, int, int, COLORREF, UINT, UINT); static HINSTANCE hinst; @@ -69,6 +86,11 @@ static void force_redraw(HWND hwnd) Sleep(1000); } +static BOOL is_v6_test(void) +{ + return pHIMAGELIST_QueryInterface != NULL; +} + /* These macros build cursor/bitmap data in 4x4 pixel blocks */ #define B(x,y) ((x?0xf0:0)|(y?0xf:0)) #define ROW1(a,b,c,d,e,f,g,h) B(a,b),B(c,d),B(e,f),B(g,h) @@ -112,14 +134,16 @@ static const BYTE bitmap_bits[48*48/8] = static HIMAGELIST createImageList(int cx, int cy) { /* Create an ImageList and put an image into it */ - HIMAGELIST himl = ImageList_Create(cx, cy, ILC_COLOR, 1, 1); + HIMAGELIST himl = pImageList_Create(cx, cy, ILC_COLOR, 1, 1); HBITMAP hbm = CreateBitmap(48, 48, 1, 1, bitmap_bits); - ImageList_Add(himl, hbm, NULL); + + ok(himl != NULL, "Failed to create image list, %d x %d.\n", cx, cy); + pImageList_Add(himl, hbm, NULL); DeleteObject(hbm); return himl; } -static HWND create_a_window(void) +static HWND create_window(void) { char className[] = "bmwnd"; char winName[] = "Test Bitmap"; @@ -246,41 +270,41 @@ static void test_begindrag(void) int count; POINT hotspot; - count = ImageList_GetImageCount(himl); + count = pImageList_GetImageCount(himl); ok(count > 2, "Tests need an ImageList with more than 2 images\n"); /* Two BeginDrag() without EndDrag() in between */ - ret = ImageList_BeginDrag(himl, 1, 0, 0); - drag = ImageList_GetDragImage(NULL, NULL); + ret = pImageList_BeginDrag(himl, 1, 0, 0); + drag = pImageList_GetDragImage(NULL, NULL); ok(ret && drag, "ImageList_BeginDrag() failed\n"); - ret = ImageList_BeginDrag(himl, 0, 3, 5); + ret = pImageList_BeginDrag(himl, 0, 3, 5); ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); ... 5112 lines suppressed ...

6 years, 11 months

01/01: [COMCTL32] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edd99e8ccc10db74b2ec8… commit edd99e8ccc10db74b2ec8eb84bd7353386eb5e03 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Jan 18 23:49:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Jan 18 23:49:20 2018 +0100 [COMCTL32] Sync with Wine 3.0. CORE-14225 --- dll/win32/comctl32/comctl32.h | 17 ++- dll/win32/comctl32/commctrl.c | 3 +- dll/win32/comctl32/imagelist.c | 5 +- dll/win32/comctl32/listview.c | 112 +++++++++---------- dll/win32/comctl32/rebar.c | 6 +- dll/win32/comctl32/status.c | 4 + dll/win32/comctl32/syslink.c | 12 +-- dll/win32/comctl32/taskdialog.c | 109 ++++++++++++++++--- dll/win32/comctl32/tooltips.c | 232 ++++++++++++++++------------------------ dll/win32/comctl32/updown.c | 11 +- media/doc/README.WINE | 2 +- 11 files changed, 275 insertions(+), 238 deletions(-) diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h index e347efd22c..17b6767bfe 100644 --- a/dll/win32/comctl32/comctl32.h +++ b/dll/win32/comctl32/comctl32.h @@ -77,6 +77,8 @@ typedef struct extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; +#ifdef __REACTOS__ + typedef struct _BUTTON_DATA { LONG state; HFONT font; @@ -92,6 +94,8 @@ static inline PBUTTON_DATA _GetButtonData(HWND hwnd) return (PBUTTON_DATA)GetWindowLongPtrW( hwnd, 0 ); } +#endif /* __REACTOS__ */ + /* Internal function */ HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN; @@ -104,6 +108,10 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; +#ifndef __REACTOS__ +#define COMCTL32_VERSION_MINOR 81 +#endif + /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { SUBCLASSPROC subproc; @@ -175,18 +183,21 @@ extern void TREEVIEW_Register(void) DECLSPEC_HIDDEN; extern void TREEVIEW_Unregister(void) DECLSPEC_HIDDEN; extern void UPDOWN_Register(void) DECLSPEC_HIDDEN; extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; +#ifdef __REACTOS__ extern void BUTTON_Register(); extern void BUTTON_Unregister(); -#ifdef __REACTOS__ extern void TOOLBARv6_Register(void) DECLSPEC_HIDDEN; extern void TOOLBARv6_Unregister(void) DECLSPEC_HIDDEN; -#endif +#endif /* __REACTOS__ */ int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN; - +#ifdef __REACTOS__ extern void THEMING_Initialize(HANDLE hActCtx5, HANDLE hActCtx6) DECLSPEC_HIDDEN; +#else +extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; +#endif extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; extern void THEMING_SetSubclassData(HWND, ULONG_PTR) DECLSPEC_HIDDEN; diff --git a/dll/win32/comctl32/commctrl.c b/dll/win32/comctl32/commctrl.c index df063c0313..1bdc71d6ad 100644 --- a/dll/win32/comctl32/commctrl.c +++ b/dll/win32/comctl32/commctrl.c @@ -275,7 +275,7 @@ BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) return TRUE; } -#endif +#endif /* __REACTOS__ */ /*********************************************************************** * DllMain [Internal] @@ -1120,7 +1120,6 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); - return S_OK; } diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index a47f879cf3..c07600217b 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -283,7 +283,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) + if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; } @@ -2132,7 +2132,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) color |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 064de9536b..00c6ba2ad7 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -1001,7 +1001,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP return ret; } - /* if dipsinfo holder changed notification code then convert */ + /* if dispinfo holder changed notification code then convert */ if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW) && (pdi->item.mask & LVIF_TEXT)) { length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); @@ -1055,7 +1055,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRA COLORREF backcolor, textcolor; /* apparently, for selected items, we have to override the returned values */ - if (!SubItem || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + if (!SubItem) { if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) { @@ -3843,33 +3843,44 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) * None. */ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coords_orig, - const POINT *coords_offs, const POINT *offset, INT scroll) { BOOL controlDown = FALSE; LVITEMW item; ITERATOR old_elems, new_elems; RECT rect; + POINT coords_offs, offset; - if (coords_offs->x > infoPtr->marqueeOrigin.x) + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig->x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig->y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + if (coords_offs.x > infoPtr->marqueeOrigin.x) { rect.left = infoPtr->marqueeOrigin.x; - rect.right = coords_offs->x; + rect.right = coords_offs.x; } else { - rect.left = coords_offs->x; + rect.left = coords_offs.x; rect.right = infoPtr->marqueeOrigin.x; } - if (coords_offs->y > infoPtr->marqueeOrigin.y) + if (coords_offs.y > infoPtr->marqueeOrigin.y) { rect.top = infoPtr->marqueeOrigin.y; - rect.bottom = coords_offs->y; + rect.bottom = coords_offs.y; } else { - rect.top = coords_offs->y; + rect.top = coords_offs.y; rect.bottom = infoPtr->marqueeOrigin.y; } @@ -3895,7 +3906,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord infoPtr->marqueeRect = rect; infoPtr->marqueeDrawRect = rect; - OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + OffsetRect(&infoPtr->marqueeDrawRect, offset.x, offset.y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); iterator_remove_common_items(&old_elems, &new_elems); @@ -3960,9 +3971,7 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent { LISTVIEW_INFO *infoPtr; SCROLLINFO scrollInfo; - POINT coords_orig; - POINT coords_offs; - POINT offset; + POINT coords; INT scroll = 0; infoPtr = (LISTVIEW_INFO *) idEvent; @@ -3971,19 +3980,8 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent return; /* Get the current cursor position and convert to client coordinates */ - GetCursorPos(&coords_orig); - ScreenToClient(hWnd, &coords_orig); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; + GetCursorPos(&coords); + ScreenToClient(hWnd, &coords); scrollInfo.cbSize = sizeof(SCROLLINFO); scrollInfo.fMask = SIF_ALL; @@ -4007,12 +4005,12 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent scroll |= SCROLL_RIGHT; } - if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || - ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || - ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || - ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + if (((coords.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords.y <= 0) && (scroll & SCROLL_UP)) || + ((coords.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) { - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + LISTVIEW_MarqueeHighlight(infoPtr, &coords, scroll); } } @@ -4034,6 +4032,9 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN RECT rect; POINT pt; + pt.x = x; + pt.y = y; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; @@ -4046,24 +4047,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (infoPtr->bMarqueeSelect) { - POINT coords_orig; - POINT coords_offs; - POINT offset; - - coords_orig.x = x; - coords_orig.y = y; - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(y, infoPtr->rcList.bottom), 0); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; - /* Enable the timer if we're going outside our bounds, in case the user doesn't move the mouse again */ @@ -4082,13 +4065,10 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); + LISTVIEW_MarqueeHighlight(infoPtr, &pt, 0); return 0; } - pt.x = x; - pt.y = y; - ht.pt = pt; LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); @@ -4808,7 +4788,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT while (iterator_next(subitems)) { DWORD subitemstage = CDRF_DODEFAULT; - NMLVCUSTOMDRAW temp_nmlvcd; /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */ if (subitems->nItem) @@ -4835,16 +4814,19 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); + else + { + nmlvcd.clrTextBk = infoPtr->clrTextBk; + nmlvcd.clrText = infoPtr->clrText; + } - /* - * A selection should neither affect the colors in the post paint notification nor - * affect the colors of the next drawn subitem. Copy the structure to prevent this. - */ - temp_nmlvcd = nmlvcd; - prepaint_setup(infoPtr, hdc, &temp_nmlvcd, subitems->nItem); + if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); if (!(subitemstage & CDRF_SKIPDEFAULT)) - LISTVIEW_DrawItemPart(infoPtr, &lvItem, &temp_nmlvcd, &pos); + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); if (subitemstage & CDRF_NOTIFYPOSTPAINT) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd); @@ -8864,6 +8846,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl if (infoPtr->nFocusedItem >= nItems) { LISTVIEW_SetItemFocus(infoPtr, -1); + infoPtr->nFocusedItem = -1; SetRectEmpty(&infoPtr->rcFocus); } } @@ -9483,7 +9466,7 @@ static VOID CALLBACK LISTVIEW_DelayedEditItem(HWND hwnd, UINT uMsg, UINT_PTR idE * Success: TRUE * Failure: FALSE */ -static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) +static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr; LOGFONTW logFont; @@ -9545,7 +9528,8 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) if (!(infoPtr->hdpaPosX = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaPosY = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaColumns = DPA_Create(10))) goto fail; - return TRUE; + + return DefWindowProcW(hwnd, WM_NCCREATE, wParam, (LPARAM)lpcs); fail: DestroyWindow(infoPtr->hwndHeader); @@ -11711,7 +11695,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_Command(infoPtr, wParam, lParam); case WM_NCCREATE: - return LISTVIEW_NCCreate(hwnd, (LPCREATESTRUCTW)lParam); + return LISTVIEW_NCCreate(hwnd, wParam, (LPCREATESTRUCTW)lParam); case WM_CREATE: return LISTVIEW_Create(hwnd, (LPCREATESTRUCTW)lParam); diff --git a/dll/win32/comctl32/rebar.c b/dll/win32/comctl32/rebar.c index d4896142bd..38a700407a 100644 --- a/dll/win32/comctl32/rebar.c +++ b/dll/win32/comctl32/rebar.c @@ -613,6 +613,7 @@ REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) oldcolor = SetTextColor (hdc, new); } +#ifdef __REACTOS__ if (!theme) { DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText, DT_CENTER | DT_VCENTER | DT_SINGLELINE); @@ -621,6 +622,10 @@ REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) { DrawThemeText(theme, hdc, 0, 0, lpBand->lpText, -1, DT_CENTER | DT_VCENTER | DT_SINGLELINE, 0, &lpBand->rcCapText); } +#else + DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); +#endif if (oldBkMode != TRANSPARENT) SetBkMode (hdc, oldBkMode); @@ -1843,7 +1848,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) oldrow = -1; for(i=0; i<infoPtr->uNumBands; i++) { RECT rcBand; - lpBand = REBAR_GetBand(infoPtr, i); if (HIDDENBAND(lpBand)) continue; translate_rect(infoPtr, &rcBand, &lpBand->rcBand); diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c index e18a47ed85..cdfad321a6 100644 --- a/dll/win32/comctl32/status.c +++ b/dll/win32/comctl32/status.c @@ -196,10 +196,14 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else { r.left += x; +#ifdef __REACTOS__ if (!theme) DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); else DrawThemeText(theme, hdc, SP_PANE, 0, part->text, -1, DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX, 0, &r); +#else + DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); +#endif } } diff --git a/dll/win32/comctl32/syslink.c b/dll/win32/comctl32/syslink.c index 675ef62422..d54b0f5f35 100644 --- a/dll/win32/comctl32/syslink.c +++ b/dll/win32/comctl32/syslink.c @@ -1463,7 +1463,7 @@ static BOOL SYSLINK_NoNextLink (const SYSLINK_INFO *infoPtr, BOOL Prev) * SYSLINK_GetIdealSize * Calculates the ideal size of a link control at a given maximum width. */ -static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize) +static LONG SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, SIZE *lpSize) { RECT rc; HDC hdc; @@ -1484,6 +1484,8 @@ static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, L lpSize->cx = rc.right; lpSize->cy = rc.bottom; } + + return rc.bottom; } /*********************************************************************** @@ -1655,11 +1657,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case LM_GETIDEALHEIGHT: if (lParam) - { - /* LM_GETIDEALSIZE */ - SYSLINK_GetIdealSize(infoPtr, (int)wParam, (LPSIZE)lParam); - } - return SYSLINK_GetIdealHeight(infoPtr); + return SYSLINK_GetIdealSize(infoPtr, (int)wParam, (SIZE *)lParam); + else + return SYSLINK_GetIdealHeight(infoPtr); case WM_SETFOCUS: return SYSLINK_SetFocus(infoPtr); diff --git a/dll/win32/comctl32/taskdialog.c b/dll/win32/comctl32/taskdialog.c index 9cf2726786..339ebcea18 100644 --- a/dll/win32/comctl32/taskdialog.c +++ b/dll/win32/comctl32/taskdialog.c @@ -43,6 +43,15 @@ struct taskdialog_control unsigned int template_size; }; +struct taskdialog_button_desc +{ + int id; + const WCHAR *text; + unsigned int width; + unsigned int line; + HINSTANCE hinst; +}; + struct taskdialog_template_desc { const TASKDIALOGCONFIG *taskconfig; @@ -53,15 +62,14 @@ struct taskdialog_template_desc LONG x_baseunit; LONG y_baseunit; HFONT font; + struct taskdialog_button_desc *default_button; }; -struct taskdialog_button_desc +struct taskdialog_info { - int id; - const WCHAR *text; - unsigned int width; - unsigned int line; - HINSTANCE hinst; + HWND hwnd; + PFTASKDIALOGCALLBACK callback; + LONG_PTR callback_data; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -128,7 +136,7 @@ static void taskdialog_get_text_extent(const struct taskdialog_template_desc *de } static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc, WORD id, const WCHAR *class, - HINSTANCE hInstance, const WCHAR *text, short x, short y, short cx, short cy) + HINSTANCE hInstance, const WCHAR *text, DWORD style, short x, short y, short cx, short cy) { struct taskdialog_control *control = Alloc(sizeof(*control)); unsigned int size, class_size, text_size; @@ -155,7 +163,7 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc control->template = template = Alloc(size); control->template_size = size; - template->style = WS_VISIBLE; + template->style = WS_VISIBLE | style; template->dwExtendedStyle = 0; template->x = x; template->y = y; @@ -183,7 +191,7 @@ static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc taskdialog_get_text_extent(desc, str, TRUE, &sz); desc->dialog_height += DIALOG_SPACING; - size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, DIALOG_SPACING, + size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, 0, DIALOG_SPACING, desc->dialog_height, sz.cx, sz.cy); desc->dialog_height += sz.cy + DIALOG_SPACING; return size; @@ -211,6 +219,9 @@ static void taskdialog_init_button(struct taskdialog_button_desc *button, struct button->width = max(DIALOG_BUTTON_WIDTH, sz.cx + DIALOG_SPACING * 2); button->line = 0; button->hinst = custom_button ? desc->taskconfig->hInstance : COMCTL32_hModule; + + if (id == desc->taskconfig->nDefaultButton) + desc->default_button = button; } static void taskdialog_init_common_buttons(struct taskdialog_template_desc *desc, struct taskdialog_button_desc *buttons, @@ -267,6 +278,9 @@ static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc if (count == 0) taskdialog_init_button(&buttons[count++], desc, IDOK, MAKEINTRESOURCEW(IDS_BUTTON_OK), FALSE); + if (!desc->default_button) + desc->default_button = &buttons[0]; + /* For easy handling just allocate as many lines as buttons, the worst case. */ line_widths = Alloc(count * sizeof(*line_widths)); @@ -321,14 +335,16 @@ static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc location_x = alignment; for (i = 0; i < count; i++) { + DWORD style = &buttons[i] == desc->default_button ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON; + if (i > 0 && buttons[i].line != buttons[i - 1].line) /* New line */ { location_x = alignment; desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING; } - size += taskdialog_add_control(desc, buttons[i].id, WC_BUTTONW, buttons[i].hinst, buttons[i].text, location_x, - desc->dialog_height, buttons[i].width, DIALOG_BUTTON_HEIGHT); + size += taskdialog_add_control(desc, buttons[i].id, WC_BUTTONW, buttons[i].hinst, buttons[i].text, style, + location_x, desc->dialog_height, buttons[i].width, DIALOG_BUTTON_HEIGHT); location_x += buttons[i].width + DIALOG_SPACING; } @@ -376,6 +392,20 @@ static unsigned int taskdialog_get_reference_rect(const struct taskdialog_templa return info.rcWork.right - info.rcWork.left; } +static WCHAR *taskdialog_get_exe_name(const TASKDIALOGCONFIG *taskconfig, WCHAR *name, DWORD length) +{ + DWORD len = GetModuleFileNameW(NULL, name, length); + if (len && len < length) + { + WCHAR *p; + if ((p = strrchrW(name, '/'))) name = p + 1; + if ((p = strrchrW(name, '\\'))) name = p + 1; + return name; + } + else + return NULL; +} + static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfig) { struct taskdialog_control *control, *control2; @@ -386,15 +416,19 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi const WCHAR *titleW = NULL; DLGTEMPLATE *template; NONCLIENTMETRICSW ncm; + WCHAR pathW[MAX_PATH]; RECT ref_rect; char *ptr; HDC hdc; /* Window title */ if (!taskconfig->pszWindowTitle) - FIXME("use executable name for window title\n"); + titleW = taskdialog_get_exe_name(taskconfig, pathW, sizeof(pathW)/sizeof(pathW[0])); else if (IS_INTRESOURCE(taskconfig->pszWindowTitle)) - FIXME("load window title from resources\n"); + { + if (!LoadStringW(taskconfig->hInstance, LOWORD(taskconfig->pszWindowTitle), (WCHAR *)&titleW, 0)) + titleW = taskdialog_get_exe_name(taskconfig, pathW, sizeof(pathW)/sizeof(pathW[0])); + } else titleW = taskconfig->pszWindowTitle; if (!titleW) @@ -423,6 +457,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi desc.dialog_height = 0; desc.dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); desc.dialog_width = min(desc.dialog_width, screen_width); + desc.default_button = NULL; size += taskdialog_add_main_instruction(&desc); size += taskdialog_add_content(&desc); @@ -466,20 +501,54 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi return template; } +static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) +{ + return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, + dialog_info->callback_data) : S_OK; +} + +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) +{ + if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) + EndDialog(dialog_info->hwnd, command_id); +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; + struct taskdialog_info *dialog_info; + TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); + if (msg != WM_INITDIALOG) + dialog_info = GetPropW(hwnd, taskdialog_info_propnameW); + switch (msg) { + case TDM_CLICK_BUTTON: + taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + break; + case WM_INITDIALOG: + dialog_info = (struct taskdialog_info *)lParam; + dialog_info->hwnd = hwnd; + SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + + taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); + break; + case WM_SHOWWINDOW: + taskdialog_notify(dialog_info, TDN_CREATED, 0, 0); + break; case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - WORD command_id = LOWORD(wParam); - EndDialog(hwnd, command_id); + taskdialog_on_button_click(dialog_info, LOWORD(wParam)); return TRUE; } break; + case WM_DESTROY: + taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); + RemovePropW(hwnd, taskdialog_info_propnameW); + break; } return FALSE; } @@ -490,13 +559,21 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *button, int *radio_button, BOOL *verification_flag_checked) { + struct taskdialog_info dialog_info; DLGTEMPLATE *template; INT ret; TRACE("%p, %p, %p, %p\n", taskconfig, button, radio_button, verification_flag_checked); + if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) + return E_INVALIDARG; + + dialog_info.callback = taskconfig->pfCallback; + dialog_info.callback_data = taskconfig->lpCallbackData; + template = create_taskdialog_template(taskconfig); - ret = DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, taskdialog_proc, 0); + ret = (short)DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, + taskdialog_proc, (LPARAM)&dialog_info); Free(template); if (button) *button = ret; diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index f92dd1b8d1..b3144934c6 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -392,7 +392,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too } } else { - ERR("recursive text callback!\n"); + ERR("recursive text callback\n"); buffer[0] = '\0'; } @@ -448,7 +448,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too } } else { - ERR("recursive text callback!\n"); + ERR("recursive text callback\n"); buffer[0] = '\0'; } @@ -577,13 +577,13 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) NMHDR hdr; int ptfx = 0; DWORD style = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - INT nTool; + INT nTool, current; if (track_activate) { if (infoPtr->nTrackTool == -1) { - TRACE("invalid tracking tool (-1)!\n"); + TRACE("invalid tracking tool %d\n", infoPtr->nTrackTool); return; } nTool = infoPtr->nTrackTool; @@ -592,25 +592,29 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { if (infoPtr->nTool == -1) { - TRACE("invalid tool (-1)!\n"); - return; + TRACE("invalid tool %d\n", infoPtr->nTool); + return; } nTool = infoPtr->nTool; } - TRACE("Show tooltip pre %d! (%p)\n", nTool, infoPtr->hwndSelf); + TRACE("Show tooltip pre %d, %p\n", nTool, infoPtr->hwndSelf); + + current = infoPtr->nCurrentTool; + if (!track_activate) + infoPtr->nCurrentTool = infoPtr->nTool; TOOLTIPS_GetTipText (infoPtr, nTool, infoPtr->szTipText); if (infoPtr->szTipText[0] == '\0') + { + infoPtr->nCurrentTool = current; return; + } toolPtr = &infoPtr->tools[nTool]; - if (!track_activate) - infoPtr->nCurrentTool = infoPtr->nTool; - - TRACE("Show tooltip %d!\n", nTool); + TRACE("Show tooltip %d\n", nTool); hdr.hwndFrom = infoPtr->hwndSelf; hdr.idFrom = toolPtr->uId; @@ -820,9 +824,9 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) if (!track_activate) { SetTimer (infoPtr->hwndSelf, ID_TIMERPOP, infoPtr->nAutoPopTime, 0); - TRACE("timer 2 started!\n"); + TRACE("timer 2 started\n"); SetTimer (infoPtr->hwndSelf, ID_TIMERLEAVE, infoPtr->nReshowTime, 0); - TRACE("timer 3 started!\n"); + TRACE("timer 3 started\n"); } } @@ -833,7 +837,7 @@ TOOLTIPS_Hide (TOOLTIPS_INFO *infoPtr) TTTOOL_INFO *toolPtr; NMHDR hdr; - TRACE("Hide tooltip %d! (%p)\n", infoPtr->nCurrentTool, infoPtr->hwndSelf); + TRACE("Hide tooltip %d, %p.\n", infoPtr->nCurrentTool, infoPtr->hwndSelf); if (infoPtr->nCurrentTool == -1) return; @@ -942,8 +946,16 @@ TOOLTIPS_GetToolFromPoint (const TOOLTIPS_INFO *infoPtr, HWND hwnd, const POINT } static inline void -TOOLTIPS_CopyInfoT (const TTTOOL_INFO *toolPtr, TTTOOLINFOW *ti, BOOL isW) +TOOLTIPS_CopyInfoT (const TOOLTIPS_INFO *infoPtr, INT index, TTTOOLINFOW *ti, BOOL isW) { + const TTTOOL_INFO *toolPtr = &infoPtr->tools[index]; + + ti->uFlags = toolPtr->uFlags; + ti->hwnd = toolPtr->hwnd; + ti->uId = toolPtr->uId; + ti->rect = toolPtr->rect; + ti->hinst = toolPtr->hinst; + if (ti->lpszText) { if (toolPtr->lpszText == NULL || IS_INTRESOURCE(toolPtr->lpszText) || @@ -956,6 +968,11 @@ TOOLTIPS_CopyInfoT (const TTTOOL_INFO *toolPtr, TTTOOLINFOW *ti, BOOL isW) WideCharToMultiByte(CP_ACP, 0, toolPtr->lpszText, -1, (LPSTR)ti->lpszText, MAX_TEXT_SIZE_A, NULL, NULL); } + + if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) + ti->lParam = toolPtr->lParam; + + /* lpReserved is intentionally not set. */ } static BOOL @@ -1011,8 +1028,7 @@ TOOLTIPS_Activate (TOOLTIPS_INFO *infoPtr, BOOL activate) { infoPtr->bActive = activate; - if (infoPtr->bActive) - TRACE("activate!\n"); + TRACE("activate %d\n", activate); if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1)) TOOLTIPS_Hide (infoPtr); @@ -1029,9 +1045,8 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) if (!ti) return FALSE; - TRACE("add tool (%p) %p %ld%s!\n", - infoPtr->hwndSelf, ti->hwnd, ti->uId, - (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); + TRACE("add tool (%p) %p %ld%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId, + (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) return FALSE; @@ -1067,27 +1082,18 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) } else if (ti->lpszText) { if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { - TRACE("add CALLBACK!\n"); + TRACE("add CALLBACK\n"); toolPtr->lpszText = LPSTR_TEXTCALLBACKW; } else if (isW) { - __TRY - { - INT len = lstrlenW (ti->lpszText); - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); - toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); - strcpyW (toolPtr->lpszText, ti->lpszText); - } - __EXCEPT_PAGE_FAULT - { - WARN("Invalid lpszText.\n"); - return FALSE; - } - __ENDTRY + INT len = lstrlenW (ti->lpszText); + TRACE("add text %s\n", debugstr_w(ti->lpszText)); + toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); + strcpyW (toolPtr->lpszText, ti->lpszText); } else { INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); - TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText); + TRACE("add text \"%s\"\n", debugstr_a((char *)ti->lpszText)); toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len); } @@ -1107,7 +1113,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) SetWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1, (DWORD_PTR)infoPtr->hwndSelf); } - TRACE("subclassing installed!\n"); + TRACE("subclassing installed\n"); } nResult = SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, @@ -1119,12 +1125,19 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->bNotifyUnicode = TRUE; TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); } else { - TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); + TRACE (" -- WM_NOTIFYFORMAT returns: %d\n", nResult); } return TRUE; } +static void TOOLTIPS_ResetSubclass (const TTTOOL_INFO *toolPtr) +{ + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); +} static LRESULT TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) @@ -1157,15 +1170,7 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) Free (toolPtr->lpszText); } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } - } + TOOLTIPS_ResetSubclass (toolPtr); /* delete tool from tool list */ if (infoPtr->uNumTools == 1) { @@ -1218,28 +1223,14 @@ static LRESULT TOOLTIPS_EnumToolsT (const TOOLTIPS_INFO *infoPtr, UINT uIndex, TTTOOLINFOW *ti, BOOL isW) { - TTTOOL_INFO *toolPtr; - - if (!ti) return FALSE; - if (ti->cbSize < TTTOOLINFOW_V1_SIZE) + if (!ti || ti->cbSize < TTTOOLINFOW_V1_SIZE) return FALSE; if (uIndex >= infoPtr->uNumTools) return FALSE; TRACE("index=%u\n", uIndex); - toolPtr = &infoPtr->tools[uIndex]; - - /* copy tool data */ - ti->uFlags = toolPtr->uFlags; - ti->hwnd = toolPtr->hwnd; - ti->uId = toolPtr->uId; - ti->rect = toolPtr->rect; - ti->hinst = toolPtr->hinst; - TOOLTIPS_CopyInfoT (toolPtr, ti, isW); - - if (ti->cbSize >= TTTOOLINFOA_V2_SIZE) - ti->lParam = toolPtr->lParam; + TOOLTIPS_CopyInfoT (infoPtr, uIndex, ti, isW); return TRUE; } @@ -1269,31 +1260,15 @@ TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolI static LRESULT TOOLTIPS_GetCurrentToolT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) { - TTTOOL_INFO *toolPtr; - if (ti) { if (ti->cbSize < TTTOOLINFOW_V1_SIZE) return FALSE; - if (infoPtr->nCurrentTool > -1) { - toolPtr = &infoPtr->tools[infoPtr->nCurrentTool]; - - /* copy tool data */ - ti->uFlags = toolPtr->uFlags; - ti->rect = toolPtr->rect; - ti->hinst = toolPtr->hinst; - TOOLTIPS_CopyInfoT (toolPtr, ti, isW); - - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) - ti->lParam = toolPtr->lParam; - - return TRUE; - } - else - return FALSE; + if (infoPtr->nCurrentTool != -1) + TOOLTIPS_CopyInfoT (infoPtr, infoPtr->nCurrentTool, ti, isW); } - else - return (infoPtr->nCurrentTool != -1); + + return infoPtr->nCurrentTool != -1; } @@ -1398,8 +1373,8 @@ TOOLTIPS_GetToolCount (const TOOLTIPS_INFO *infoPtr) static LRESULT TOOLTIPS_GetToolInfoT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) { - TTTOOL_INFO *toolPtr; INT nTool; + HWND hwnd; if (!ti) return FALSE; if (ti->cbSize < TTTOOLINFOW_V1_SIZE) @@ -1413,16 +1388,9 @@ TOOLTIPS_GetToolInfoT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) TRACE("tool %d\n", nTool); - toolPtr = &infoPtr->tools[nTool]; - - /* copy tool data */ - ti->uFlags = toolPtr->uFlags; - ti->rect = toolPtr->rect; - ti->hinst = toolPtr->hinst; - TOOLTIPS_CopyInfoT (toolPtr, ti, isW); - - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) - ti->lParam = toolPtr->lParam; + hwnd = ti->hwnd; + TOOLTIPS_CopyInfoT (infoPtr, nTool, ti, isW); + ti->hwnd = hwnd; return TRUE; } @@ -1432,7 +1400,6 @@ static LRESULT TOOLTIPS_HitTestT (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit, BOOL isW) { - TTTOOL_INFO *toolPtr; INT nTool; if (lptthit == 0) @@ -1442,21 +1409,11 @@ TOOLTIPS_HitTestT (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit, if (nTool == -1) return FALSE; - TRACE("tool %d!\n", nTool); + TRACE("tool %d\n", nTool); /* copy tool data */ - if (lptthit->ti.cbSize >= TTTOOLINFOW_V1_SIZE) { - toolPtr = &infoPtr->tools[nTool]; - - lptthit->ti.uFlags = toolPtr->uFlags; - lptthit->ti.hwnd = toolPtr->hwnd; - lptthit->ti.uId = toolPtr->uId; - lptthit->ti.rect = toolPtr->rect; - lptthit->ti.hinst = toolPtr->hinst; - TOOLTIPS_CopyInfoT (toolPtr, &lptthit->ti, isW); - if (lptthit->ti.cbSize >= TTTOOLINFOW_V2_SIZE) - lptthit->ti.lParam = toolPtr->lParam; - } + if (lptthit->ti.cbSize >= TTTOOLINFOW_V1_SIZE) + TOOLTIPS_CopyInfoT (infoPtr, nTool, &lptthit->ti, isW); return TRUE; } @@ -1499,7 +1456,7 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) INT nOldTool; if (!lpMsg) { - ERR("lpMsg == NULL!\n"); + ERR("lpMsg == NULL\n"); return 0; } @@ -1530,14 +1487,14 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) } else if (nOldTool == -1) { /* Moved from outside */ if(infoPtr->bActive) { SetTimer(infoPtr->hwndSelf, ID_TIMERSHOW, infoPtr->nInitialTime, 0); - TRACE("timer 1 started!\n"); + TRACE("timer 1 started\n"); } } else { /* Moved from one to another */ TOOLTIPS_Hide (infoPtr); KillTimer(infoPtr->hwndSelf, ID_TIMERLEAVE); if(infoPtr->bActive) { SetTimer (infoPtr->hwndSelf, ID_TIMERSHOW, infoPtr->nReshowTime, 0); - TRACE("timer 1 started!\n"); + TRACE("timer 1 started\n"); } } } else if(infoPtr->nCurrentTool != -1) { /* restart autopop */ @@ -1547,7 +1504,7 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) } else if(infoPtr->nTool != -1 && infoPtr->bActive) { /* previous show attempt didn't result in tooltip so try again */ SetTimer(infoPtr->hwndSelf, ID_TIMERSHOW, infoPtr->nInitialTime, 0); - TRACE("timer 1 started!\n"); + TRACE("timer 1 started\n"); } break; } @@ -1703,7 +1660,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->hinst = ti->hinst; if (IS_INTRESOURCE(ti->lpszText)) { - TRACE("set string id %x!\n", LOWORD(ti->lpszText)); + TRACE("set string id %x\n", LOWORD(ti->lpszText)); toolPtr->lpszText = ti->lpszText; } else { @@ -1762,7 +1719,7 @@ TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOO /* activate */ infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoT (infoPtr, (const TTTOOLINFOW*)ti); if (infoPtr->nTrackTool != -1) { - TRACE("activated!\n"); + TRACE("activated\n"); infoPtr->bTrackActive = TRUE; TOOLTIPS_TrackShow (infoPtr); } @@ -1774,7 +1731,7 @@ TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOO infoPtr->bTrackActive = FALSE; infoPtr->nTrackTool = -1; - TRACE("deactivated!\n"); + TRACE("deactivated\n"); } return 0; @@ -1919,16 +1876,9 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + TOOLTIPS_ResetSubclass (toolPtr); } - } + Free (infoPtr->tools); } @@ -1997,7 +1947,7 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if ((nTool > -1) && (nTool < infoPtr->uNumTools)) { if (infoPtr->tools[nTool].uFlags & TTF_TRANSPARENT) { - TRACE("-- in transparent mode!\n"); + TRACE("-- in transparent mode\n"); return HTTRANSPARENT; } } @@ -2073,9 +2023,8 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) lf.lfWeight = FW_BOLD; infoPtr->hTitleFont = CreateFontIndirectW(&lf); - if (redraw && infoPtr->nCurrentTool != -1) { - FIXME("full redraw needed!\n"); - } + if (redraw && infoPtr->nCurrentTool != -1) + FIXME("full redraw needed\n"); return 0; } @@ -2124,7 +2073,7 @@ TOOLTIPS_Timer (TOOLTIPS_INFO *infoPtr, INT iTimer) { INT nOldTool; - TRACE("timer %d (%p) expired!\n", iTimer, infoPtr->hwndSelf); + TRACE("timer %d (%p) expired\n", iTimer, infoPtr->hwndSelf); switch (iTimer) { case ID_TIMERSHOW: @@ -2178,12 +2127,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2191,17 +2141,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); } diff --git a/dll/win32/comctl32/updown.c b/dll/win32/comctl32/updown.c index 9aff605dc8..0a53c7baf6 100644 --- a/dll/win32/comctl32/updown.c +++ b/dll/win32/comctl32/updown.c @@ -607,11 +607,11 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) RECT budRect; /* new coord for the buddy */ int x, width; /* new x position and width for the up-down */ WCHAR buddyClass[40]; - HWND ret; + HWND old_buddy; TRACE("(hwnd=%p, bud=%p)\n", infoPtr->Self, bud); - ret = infoPtr->Buddy; + old_buddy = infoPtr->Buddy; /* there is already a buddy assigned */ if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, @@ -648,7 +648,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) x = budRect.right+DEFAULT_XSEP; } else { /* nothing to do */ - return ret; + return old_buddy; } /* first adjust the buddy to accommodate the up/down */ @@ -677,14 +677,15 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) budRect.top - DEFAULT_ADDTOP, width, budRect.bottom - budRect.top + DEFAULT_ADDTOP + DEFAULT_ADDBOT, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER); - } else { + } else if (!(infoPtr->dwStyle & UDS_HORZ) && old_buddy != NULL) { RECT rect; GetWindowRect(infoPtr->Self, &rect); MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Self), (POINT *)&rect, 2); SetWindowPos(infoPtr->Self, 0, rect.left, rect.top, DEFAULT_WIDTH, rect.bottom - rect.top, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER); } - return ret; + + return old_buddy; } /*********************************************************************** diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3910789a16..270a296417 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -54,7 +54,7 @@ reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-2.9 reactos/dll/win32/clusapi # Synced to WineStaging-2.9 reactos/dll/win32/comcat # Synced to WineStaging-2.9 -reactos/dll/win32/comctl32 # Synced to WineStaging-2.16 +reactos/dll/win32/comctl32 # Synced to Wine-3.0 reactos/dll/win32/comdlg32 # Synced to WineStaging-2.16 reactos/dll/win32/compstui # Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9

6 years, 11 months

01/01: [PSDK] Update commctrl.h. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65ab703cd515aa5e624f3… commit 65ab703cd515aa5e624f3a5783988f690ca79ccb Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Jan 18 23:37:48 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Jan 18 23:48:30 2018 +0100 [PSDK] Update commctrl.h. CORE-14225 --- sdk/include/psdk/commctrl.h | 58 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/commctrl.h b/sdk/include/psdk/commctrl.h index 5232aa9081..eab908dcc3 100644 --- a/sdk/include/psdk/commctrl.h +++ b/sdk/include/psdk/commctrl.h @@ -4724,6 +4724,7 @@ typedef struct { #define LM_HITTEST (WM_USER+0x300) #define LM_GETIDEALHEIGHT (WM_USER+0x301) +#define LM_GETIDEALSIZE (LM_GETIDEALHEIGHT) #define LM_SETITEM (WM_USER+0x302) #define LM_GETITEM (WM_USER+0x303) @@ -5064,10 +5065,65 @@ enum _TASKDIALOG_FLAGS TDF_POSITION_RELATIVE_TO_WINDOW = 0x1000, TDF_RTL_LAYOUT = 0x2000, TDF_NO_DEFAULT_RADIO_BUTTON = 0x4000, - TDF_CAN_BE_MINIMIZED = 0x8000 + TDF_CAN_BE_MINIMIZED = 0x8000, + TDF_NO_SET_FOREGROUND = 0x10000, + TDF_SIZE_TO_CONTENT = 0x01000000 }; typedef int TASKDIALOG_FLAGS; +typedef enum _TASKDIALOG_MESSAGES +{ + TDM_NAVIGATE_PAGE = WM_USER + 101, + TDM_CLICK_BUTTON = WM_USER + 102, + TDM_SET_MARQUEE_PROGRESS_BAR = WM_USER + 103, + TDM_SET_PROGRESS_BAR_STATE = WM_USER + 104, + TDM_SET_PROGRESS_BAR_RANGE = WM_USER + 105, + TDM_SET_PROGRESS_BAR_POS = WM_USER + 106, + TDM_SET_PROGRESS_BAR_MARQUEE = WM_USER + 107, + TDM_SET_ELEMENT_TEXT = WM_USER + 108, + TDM_CLICK_RADIO_BUTTON = WM_USER + 110, + TDM_ENABLE_BUTTON = WM_USER + 111, + TDM_ENABLE_RADIO_BUTTON = WM_USER + 112, + TDM_CLICK_VERIFICATION = WM_USER + 113, + TDM_UPDATE_ELEMENT_TEXT = WM_USER + 114, + TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = WM_USER + 115, + TDM_UPDATE_ICON = WM_USER + 116, +} TASKDIALOG_MESSAGES; + +typedef enum _TASKDIALOG_NOTIFICATIONS +{ + TDN_CREATED, + TDN_NAVIGATED, + TDN_BUTTON_CLICKED, + TDN_HYPERLINK_CLICKED, + TDN_TIMER, + TDN_DESTROYED, + TDN_RADIO_BUTTON_CLICKED, + TDN_DIALOG_CONSTRUCTED, + TDN_VERIFICATION_CLICKED, + TDN_HELP, + TDN_EXPANDO_BUTTON_CLICKED, +} TASKDIALOG_NOTIFICATIONS; + +typedef enum _TASKDIALOG_ELEMENTS +{ + TDE_CONTENT, + TDE_EXPANDED_INFORMATION, + TDE_FOOTER, + TDE_MAIN_INSTRUCTION, +} TASKDIALOG_ELEMENTS; + +typedef enum _TASKDIALOG_ICON_ELEMENTS +{ + TDIE_ICON_MAIN, + TDIE_ICON_FOOTER, +} TASKDIALOG_ICON_ELEMENTS; + +#define TD_WARNING_ICON MAKEINTRESOURCEW(-1) +#define TD_ERROR_ICON MAKEINTRESOURCEW(-2) +#define TD_INFORMATION_ICON MAKEINTRESOURCEW(-3) +#define TD_SHIELD_ICON MAKEINTRESOURCEW(-4) + enum _TASKDIALOG_COMMON_BUTTON_FLAGS { TDCBF_OK_BUTTON = 0x0001,

6 years, 11 months

01/01: [FREETYPE] Update to v2.9.0 and use this as a chance to slim down our lib a bit. CORE-14220

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7443856522313177e2f3… commit b7443856522313177e2f3ff5d056d5519b4fcc75 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Jan 18 13:34:21 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Jan 18 23:29:50 2018 +0100 [FREETYPE] Update to v2.9.0 and use this as a chance to slim down our lib a bit. CORE-14220 --- media/doc/3rd Party Files.txt | 2 +- sdk/lib/3rdparty/freetype/CMakeLists.txt | 8 +- sdk/lib/3rdparty/freetype/ChangeLog | 6489 ++++++++++---------- sdk/lib/3rdparty/freetype/README | 20 +- sdk/lib/3rdparty/freetype/autogen.sh | 2 +- sdk/lib/3rdparty/freetype/configure | 2 +- sdk/lib/3rdparty/freetype/devel/ft2build.h | 2 +- sdk/lib/3rdparty/freetype/devel/ftoption.h | 58 +- .../freetype/include/freetype/config/ftconfig.h | 99 +- .../freetype/include/freetype/config/ftheader.h | 128 +- .../freetype/include/freetype/config/ftoption.h | 89 +- .../freetype/include/freetype/config/ftstdlib.h | 2 +- .../3rdparty/freetype/include/freetype/freetype.h | 245 +- .../3rdparty/freetype/include/freetype/ftadvanc.h | 2 +- .../3rdparty/freetype/include/freetype/ftautoh.h | 533 -- .../3rdparty/freetype/include/freetype/ftbbox.h | 4 +- sdk/lib/3rdparty/freetype/include/freetype/ftbdf.h | 2 +- .../3rdparty/freetype/include/freetype/ftbitmap.h | 4 +- .../3rdparty/freetype/include/freetype/ftbzip2.h | 2 +- .../3rdparty/freetype/include/freetype/ftcache.h | 17 +- .../3rdparty/freetype/include/freetype/ftcffdrv.h | 321 - .../freetype/include/freetype/ftchapters.h | 3 + sdk/lib/3rdparty/freetype/include/freetype/ftcid.h | 4 +- .../3rdparty/freetype/include/freetype/ftdriver.h | 1225 ++++ .../3rdparty/freetype/include/freetype/fterrdef.h | 2 +- .../3rdparty/freetype/include/freetype/fterrors.h | 2 +- .../3rdparty/freetype/include/freetype/ftfntfmt.h | 2 +- .../3rdparty/freetype/include/freetype/ftgasp.h | 2 +- .../3rdparty/freetype/include/freetype/ftglyph.h | 6 +- .../3rdparty/freetype/include/freetype/ftgxval.h | 10 +- .../3rdparty/freetype/include/freetype/ftgzip.h | 5 +- .../3rdparty/freetype/include/freetype/ftimage.h | 36 +- .../3rdparty/freetype/include/freetype/ftincrem.h | 15 +- .../3rdparty/freetype/include/freetype/ftlcdfil.h | 23 +- .../3rdparty/freetype/include/freetype/ftlist.h | 2 +- sdk/lib/3rdparty/freetype/include/freetype/ftlzw.h | 2 +- sdk/lib/3rdparty/freetype/include/freetype/ftmac.h | 2 +- sdk/lib/3rdparty/freetype/include/freetype/ftmm.h | 110 +- .../3rdparty/freetype/include/freetype/ftmodapi.h | 23 +- .../3rdparty/freetype/include/freetype/ftmoderr.h | 2 +- .../3rdparty/freetype/include/freetype/ftotval.h | 2 +- .../3rdparty/freetype/include/freetype/ftoutln.h | 11 +- .../3rdparty/freetype/include/freetype/ftparams.h | 205 + .../3rdparty/freetype/include/freetype/ftpcfdrv.h | 105 - sdk/lib/3rdparty/freetype/include/freetype/ftpfr.h | 2 +- .../3rdparty/freetype/include/freetype/ftrender.h | 4 +- .../3rdparty/freetype/include/freetype/ftsizes.h | 2 +- .../3rdparty/freetype/include/freetype/ftsnames.h | 50 +- .../3rdparty/freetype/include/freetype/ftstroke.h | 12 +- .../3rdparty/freetype/include/freetype/ftsynth.h | 2 +- .../3rdparty/freetype/include/freetype/ftsystem.h | 2 +- .../3rdparty/freetype/include/freetype/fttrigon.h | 2 +- .../3rdparty/freetype/include/freetype/ftttdrv.h | 328 - .../3rdparty/freetype/include/freetype/fttypes.h | 4 +- .../3rdparty/freetype/include/freetype/ftwinfnt.h | 4 +- .../freetype/include/freetype/internal/autohint.h | 2 +- .../freetype/internal/cffotypes.h} | 103 +- .../cff => include/freetype/internal}/cfftypes.h | 9 +- .../freetype/include/freetype/internal/ftcalc.h | 2 +- .../freetype/include/freetype/internal/ftdebug.h | 2 +- .../freetype/internal/{ftdriver.h => ftdrv.h} | 12 +- .../freetype/include/freetype/internal/ftgloadr.h | 2 +- .../freetype/include/freetype/internal/ftmemory.h | 4 +- .../freetype/include/freetype/internal/ftobjs.h | 83 +- .../freetype/include/freetype/internal/ftpic.h | 2 +- .../freetype/internal/ftpsprop.h} | 27 +- .../freetype/include/freetype/internal/ftrfork.h | 2 +- .../freetype/include/freetype/internal/ftserv.h | 103 +- .../freetype/include/freetype/internal/ftstream.h | 6 +- .../freetype/include/freetype/internal/fttrace.h | 9 +- .../freetype/include/freetype/internal/ftvalid.h | 2 +- .../freetype/include/freetype/internal/internal.h | 8 +- .../freetype/include/freetype/internal/psaux.h | 501 +- .../freetype/include/freetype/internal/pshints.h | 2 +- .../include/freetype/internal/services/svbdf.h | 2 +- .../include/freetype/internal/services/svcfftl.h | 112 + .../include/freetype/internal/services/svcid.h | 2 +- .../include/freetype/internal/services/svfntfmt.h | 2 +- .../include/freetype/internal/services/svgldict.h | 6 +- .../include/freetype/internal/services/svgxval.h | 2 +- .../include/freetype/internal/services/svkern.h | 2 +- .../include/freetype/internal/services/svmetric.h | 2 +- .../include/freetype/internal/services/svmm.h | 57 +- .../include/freetype/internal/services/svotval.h | 2 +- .../include/freetype/internal/services/svpfr.h | 2 +- .../include/freetype/internal/services/svpostnm.h | 2 +- .../include/freetype/internal/services/svprop.h | 2 +- .../include/freetype/internal/services/svpscmap.h | 2 +- .../include/freetype/internal/services/svpsinfo.h | 2 +- .../include/freetype/internal/services/svsfnt.h | 2 +- .../include/freetype/internal/services/svttcmap.h | 2 +- .../include/freetype/internal/services/svtteng.h | 2 +- .../include/freetype/internal/services/svttglyf.h | 2 +- .../include/freetype/internal/services/svwinfnt.h | 2 +- .../freetype/include/freetype/internal/sfnt.h | 2 +- .../freetype/include/freetype/internal/t1types.h | 2 +- .../freetype/include/freetype/internal/tttypes.h | 12 +- .../3rdparty/freetype/include/freetype/t1tables.h | 11 +- .../3rdparty/freetype/include/freetype/ttnameid.h | 4 +- .../3rdparty/freetype/include/freetype/tttables.h | 2 +- .../3rdparty/freetype/include/freetype/tttags.h | 2 +- .../3rdparty/freetype/include/freetype/ttunpat.h | 63 - sdk/lib/3rdparty/freetype/include/ft2build.h | 2 +- sdk/lib/3rdparty/freetype/modules.cfg | 4 +- sdk/lib/3rdparty/freetype/src/autofit/afangles.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afblue.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afblue.cin | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afblue.dat | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afblue.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afblue.hin | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afcjk.c | 6 +- sdk/lib/3rdparty/freetype/src/autofit/afcjk.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afcover.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afdummy.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afdummy.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/aferrors.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afglobal.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afglobal.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afhints.c | 15 +- sdk/lib/3rdparty/freetype/src/autofit/afhints.h | 4 +- sdk/lib/3rdparty/freetype/src/autofit/afindic.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afindic.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/aflatin.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/aflatin.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/aflatin2.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afloader.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afloader.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afmodule.c | 4 +- sdk/lib/3rdparty/freetype/src/autofit/afmodule.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afpic.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afpic.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afranges.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afranges.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afscript.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afshaper.c | 33 +- sdk/lib/3rdparty/freetype/src/autofit/afshaper.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afstyles.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/aftypes.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afwarp.c | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afwarp.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/afwrtsys.h | 2 +- sdk/lib/3rdparty/freetype/src/autofit/autofit.c | 2 +- sdk/lib/3rdparty/freetype/src/base/basepic.c | 2 +- sdk/lib/3rdparty/freetype/src/base/basepic.h | 2 +- sdk/lib/3rdparty/freetype/src/base/ftadvanc.c | 16 +- sdk/lib/3rdparty/freetype/src/base/ftapi.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftbase.c | 3 +- sdk/lib/3rdparty/freetype/src/base/ftbase.h | 8 +- sdk/lib/3rdparty/freetype/src/base/ftbbox.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftbdf.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftbitmap.c | 75 +- sdk/lib/3rdparty/freetype/src/base/ftcalc.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftcid.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftdbgmem.c | 10 +- sdk/lib/3rdparty/freetype/src/base/ftdebug.c | 4 +- sdk/lib/3rdparty/freetype/src/base/ftfntfmt.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftfstype.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftgasp.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftgloadr.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftglyph.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftgxval.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftinit.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftlcdfil.c | 55 +- sdk/lib/3rdparty/freetype/src/base/ftmac.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftmm.c | 81 +- sdk/lib/3rdparty/freetype/src/base/ftobjs.c | 470 +- sdk/lib/3rdparty/freetype/src/base/ftotval.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftoutln.c | 6 +- sdk/lib/3rdparty/freetype/src/base/ftpatent.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftpfr.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftpic.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftpsprop.c | 285 + sdk/lib/3rdparty/freetype/src/base/ftrfork.c | 4 +- sdk/lib/3rdparty/freetype/src/base/ftsnames.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftstream.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftstroke.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftsynth.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftsystem.c | 2 +- sdk/lib/3rdparty/freetype/src/base/fttrigon.c | 2 +- sdk/lib/3rdparty/freetype/src/base/fttype1.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftutil.c | 2 +- sdk/lib/3rdparty/freetype/src/base/ftwinfnt.c | 2 +- sdk/lib/3rdparty/freetype/src/bdf/README | 2 +- sdk/lib/3rdparty/freetype/src/bdf/bdfdrivr.c | 2 +- sdk/lib/3rdparty/freetype/src/bdf/bdflib.c | 12 +- sdk/lib/3rdparty/freetype/src/bzip2/ftbzip2.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcache.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcbasic.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftccache.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftccache.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftccback.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftccmap.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcerror.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcglyph.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcglyph.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcimage.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcimage.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcmanag.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcmru.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcmru.h | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcsbits.c | 2 +- sdk/lib/3rdparty/freetype/src/cache/ftcsbits.h | 2 +- sdk/lib/3rdparty/freetype/src/cff/cff.c | 13 +- sdk/lib/3rdparty/freetype/src/cff/cffcmap.c | 2 +- sdk/lib/3rdparty/freetype/src/cff/cffcmap.h | 4 +- sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c | 381 +- sdk/lib/3rdparty/freetype/src/cff/cffdrivr.h | 2 +- sdk/lib/3rdparty/freetype/src/cff/cfferrs.h | 2 +- sdk/lib/3rdparty/freetype/src/cff/cffgload.c | 2729 +------- sdk/lib/3rdparty/freetype/src/cff/cffgload.h | 187 +- sdk/lib/3rdparty/freetype/src/cff/cffload.c | 66 +- sdk/lib/3rdparty/freetype/src/cff/cffload.h | 9 +- sdk/lib/3rdparty/freetype/src/cff/cffobjs.c | 120 +- sdk/lib/3rdparty/freetype/src/cff/cffobjs.h | 106 +- sdk/lib/3rdparty/freetype/src/cff/cffparse.c | 27 +- sdk/lib/3rdparty/freetype/src/cff/cffparse.h | 4 +- sdk/lib/3rdparty/freetype/src/cff/cffpic.c | 2 +- sdk/lib/3rdparty/freetype/src/cff/cffpic.h | 7 +- sdk/lib/3rdparty/freetype/src/cff/cfftoken.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/ciderrs.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidgload.c | 87 +- sdk/lib/3rdparty/freetype/src/cid/cidgload.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidload.c | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidload.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidobjs.c | 40 +- sdk/lib/3rdparty/freetype/src/cid/cidobjs.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidparse.c | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidparse.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidriver.c | 22 +- sdk/lib/3rdparty/freetype/src/cid/cidriver.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/cidtoken.h | 2 +- sdk/lib/3rdparty/freetype/src/cid/type1cid.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/README | 12 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvalid.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvalid.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvbsln.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxverror.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvfeat.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvfeat.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvfgen.c | 4 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvjust.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvkern.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmod.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmod.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort0.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort2.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort4.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort5.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx.h | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx0.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx1.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx4.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvmorx5.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvopbd.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvprop.c | 2 +- sdk/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c | 2 +- sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c | 2 +- sdk/lib/3rdparty/freetype/src/gzip/zconf.h | 284 - sdk/lib/3rdparty/freetype/src/lzw/ftlzw.c | 2 +- sdk/lib/3rdparty/freetype/src/lzw/ftzopen.c | 2 +- sdk/lib/3rdparty/freetype/src/lzw/ftzopen.h | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvalid.c | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvalid.h | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvbase.c | 35 +- sdk/lib/3rdparty/freetype/src/otvalid/otvcommn.c | 30 +- sdk/lib/3rdparty/freetype/src/otvalid/otvcommn.h | 54 +- sdk/lib/3rdparty/freetype/src/otvalid/otverror.h | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvgdef.c | 113 +- sdk/lib/3rdparty/freetype/src/otvalid/otvgpos.c | 56 +- sdk/lib/3rdparty/freetype/src/otvalid/otvgpos.h | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvgsub.c | 36 +- sdk/lib/3rdparty/freetype/src/otvalid/otvjstf.c | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvmod.c | 2 +- sdk/lib/3rdparty/freetype/src/otvalid/otvmod.h | 2 +- sdk/lib/3rdparty/freetype/src/pcf/pcfdrivr.c | 2 +- sdk/lib/3rdparty/freetype/src/pcf/pcfread.c | 6 +- sdk/lib/3rdparty/freetype/src/pfr/pfr.c | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrcmap.c | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrcmap.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrdrivr.c | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrdrivr.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrerror.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrgload.c | 12 +- sdk/lib/3rdparty/freetype/src/pfr/pfrgload.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrload.c | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrload.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.h | 2 +- sdk/lib/3rdparty/freetype/src/pfr/pfrtypes.h | 2 +- sdk/lib/3rdparty/freetype/src/psaux/afmparse.c | 2 +- sdk/lib/3rdparty/freetype/src/psaux/afmparse.h | 2 +- .../src/{cff/cffgload.c => psaux/cffdecode.c} | 1506 +---- sdk/lib/3rdparty/freetype/src/psaux/cffdecode.h | 64 + .../src/{cff/cf2arrst.c => psaux/psarrst.c} | 10 +- .../src/{cff/cf2arrst.h => psaux/psarrst.h} | 10 +- sdk/lib/3rdparty/freetype/src/psaux/psaux.c | 13 +- sdk/lib/3rdparty/freetype/src/psaux/psauxerr.h | 2 +- sdk/lib/3rdparty/freetype/src/psaux/psauxmod.c | 56 +- sdk/lib/3rdparty/freetype/src/psaux/psauxmod.h | 11 +- .../src/{cff/cf2blues.c => psaux/psblues.c} | 12 +- .../src/{cff/cf2blues.h => psaux/psblues.h} | 10 +- sdk/lib/3rdparty/freetype/src/psaux/psconv.c | 2 +- sdk/lib/3rdparty/freetype/src/psaux/psconv.h | 2 +- .../src/{cff/cf2error.c => psaux/pserror.c} | 6 +- .../src/{cff/cf2error.h => psaux/pserror.h} | 10 +- .../src/{cff/cf2fixed.h => psaux/psfixed.h} | 8 +- .../freetype/src/{cff/cf2font.c => psaux/psfont.c} | 85 +- .../freetype/src/{cff/cf2font.h => psaux/psfont.h} | 20 +- .../freetype/src/{cff/cf2ft.c => psaux/psft.c} | 357 +- .../freetype/src/{cff/cf2ft.h => psaux/psft.h} | 108 +- .../freetype/src/{cff/cf2glue.h => psaux/psglue.h} | 16 +- .../src/{cff/cf2hints.c => psaux/pshints.c} | 78 +- .../src/{cff/cf2hints.h => psaux/pshints.h} | 9 +- .../src/{cff/cf2intrp.c => psaux/psintrp.c} | 1237 +++- .../src/{cff/cf2intrp.h => psaux/psintrp.h} | 12 +- sdk/lib/3rdparty/freetype/src/psaux/psobjs.c | 753 ++- sdk/lib/3rdparty/freetype/src/psaux/psobjs.h | 103 +- .../freetype/src/{cff/cf2read.c => psaux/psread.c} | 8 +- .../freetype/src/{cff/cf2read.h => psaux/psread.h} | 8 +- .../src/{cff/cf2stack.c => psaux/psstack.c} | 12 +- .../src/{cff/cf2stack.h => psaux/psstack.h} | 8 +- .../src/{cff/cf2types.h => psaux/pstypes.h} | 8 +- sdk/lib/3rdparty/freetype/src/psaux/t1cmap.c | 2 +- sdk/lib/3rdparty/freetype/src/psaux/t1cmap.h | 2 +- sdk/lib/3rdparty/freetype/src/psaux/t1decode.c | 350 +- sdk/lib/3rdparty/freetype/src/psaux/t1decode.h | 12 +- sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c | 4 +- sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.h | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshglob.c | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshglob.h | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshinter.c | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshmod.c | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshmod.h | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshnterr.h | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshpic.c | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshpic.h | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshrec.c | 2 +- sdk/lib/3rdparty/freetype/src/pshinter/pshrec.h | 2 +- sdk/lib/3rdparty/freetype/src/psnames/psmodule.c | 2 +- sdk/lib/3rdparty/freetype/src/psnames/psmodule.h | 2 +- sdk/lib/3rdparty/freetype/src/psnames/psnamerr.h | 2 +- sdk/lib/3rdparty/freetype/src/psnames/psnames.c | 2 +- sdk/lib/3rdparty/freetype/src/psnames/pspic.c | 2 +- sdk/lib/3rdparty/freetype/src/psnames/pspic.h | 2 +- sdk/lib/3rdparty/freetype/src/psnames/pstables.h | 2 +- sdk/lib/3rdparty/freetype/src/raster/ftmisc.h | 2 +- sdk/lib/3rdparty/freetype/src/raster/ftraster.c | 2 +- sdk/lib/3rdparty/freetype/src/raster/ftraster.h | 2 +- sdk/lib/3rdparty/freetype/src/raster/ftrend1.c | 111 +- sdk/lib/3rdparty/freetype/src/raster/ftrend1.h | 2 +- sdk/lib/3rdparty/freetype/src/raster/raster.c | 2 +- sdk/lib/3rdparty/freetype/src/raster/rasterrs.h | 2 +- sdk/lib/3rdparty/freetype/src/raster/rastpic.c | 2 +- sdk/lib/3rdparty/freetype/src/raster/rastpic.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/pngshim.c | 61 +- sdk/lib/3rdparty/freetype/src/sfnt/pngshim.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/sfdriver.c | 9 +- sdk/lib/3rdparty/freetype/src/sfnt/sfdriver.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/sferrors.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/sfnt.c | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/sfntpic.c | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/sfntpic.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c | 10 +- sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttbdf.c | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttbdf.h | 6 +- sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c | 20 +- sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttcmapc.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttkern.c | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttkern.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttload.c | 4 +- sdk/lib/3rdparty/freetype/src/sfnt/ttload.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttmtx.c | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttmtx.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttpost.h | 2 +- sdk/lib/3rdparty/freetype/src/sfnt/ttsbit.c | 7 +- sdk/lib/3rdparty/freetype/src/sfnt/ttsbit.h | 2 +- sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c | 83 +- sdk/lib/3rdparty/freetype/src/smooth/ftgrays.h | 2 +- sdk/lib/3rdparty/freetype/src/smooth/ftsmerrs.h | 2 +- sdk/lib/3rdparty/freetype/src/smooth/ftsmooth.c | 287 +- sdk/lib/3rdparty/freetype/src/smooth/ftsmooth.h | 2 +- sdk/lib/3rdparty/freetype/src/smooth/ftspic.c | 2 +- sdk/lib/3rdparty/freetype/src/smooth/ftspic.h | 2 +- sdk/lib/3rdparty/freetype/src/smooth/smooth.c | 2 +- sdk/lib/3rdparty/freetype/src/tools/afblue.pl | 2 +- .../freetype/src/tools/docmaker/content.py | 33 +- .../freetype/src/tools/docmaker/docmaker.py | 2 +- .../freetype/src/tools/docmaker/formatter.py | 2 +- .../freetype/src/tools/docmaker/sources.py | 4 +- .../3rdparty/freetype/src/tools/docmaker/tohtml.py | 4 +- .../3rdparty/freetype/src/tools/docmaker/utils.py | 2 +- sdk/lib/3rdparty/freetype/src/tools/glnames.py | 6 +- sdk/lib/3rdparty/freetype/src/truetype/truetype.c | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c | 13 +- sdk/lib/3rdparty/freetype/src/truetype/ttdriver.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/tterrors.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttgload.c | 107 +- sdk/lib/3rdparty/freetype/src/truetype/ttgload.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c | 554 +- sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.h | 10 +- sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c | 28 +- sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c | 83 +- sdk/lib/3rdparty/freetype/src/truetype/ttobjs.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttpic.c | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttpic.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttpload.c | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttpload.h | 2 +- sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.c | 28 +- sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1afm.c | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1afm.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1driver.c | 21 +- sdk/lib/3rdparty/freetype/src/type1/t1driver.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1errors.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1gload.c | 120 +- sdk/lib/3rdparty/freetype/src/type1/t1gload.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1load.c | 95 +- sdk/lib/3rdparty/freetype/src/type1/t1load.h | 6 +- sdk/lib/3rdparty/freetype/src/type1/t1objs.c | 42 +- sdk/lib/3rdparty/freetype/src/type1/t1objs.h | 8 +- sdk/lib/3rdparty/freetype/src/type1/t1parse.c | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1parse.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/t1tokens.h | 2 +- sdk/lib/3rdparty/freetype/src/type1/type1.c | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42drivr.c | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42drivr.h | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42error.h | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42objs.c | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42objs.h | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42parse.c | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42parse.h | 2 +- sdk/lib/3rdparty/freetype/src/type42/t42types.h | 2 +- sdk/lib/3rdparty/freetype/src/type42/type42.c | 2 +- sdk/lib/3rdparty/freetype/src/winfonts/fnterrs.h | 2 +- sdk/lib/3rdparty/freetype/src/winfonts/winfnt.c | 2 +- sdk/lib/3rdparty/freetype/src/winfonts/winfnt.h | 2 +- 453 files changed, 12269 insertions(+), 11860 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 463f347f09..ccd1a755b8 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -23,7 +23,7 @@ Used Version: 1.1 Website: http://www.geocities.com/dborca/opengl/tc.html Title: FreeType -Used Version: 2.8.1 +Used Version: 2.9.0 Website: http://www.freetype.org Title: Mesa3D diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index 6a41e3dcf7..0f2f5a34c3 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -11,12 +11,7 @@ list(APPEND SOURCE src/base/ftbbox.c src/base/ftbitmap.c src/base/ftcalc.c - src/base/ftcid.c - src/base/ftdbgmem.c - src/base/ftdebug.c src/base/ftfntfmt.c - src/base/ftfstype.c - src/base/ftgasp.c src/base/ftgloadr.c src/base/ftglyph.c src/base/ftgxval.c @@ -29,6 +24,7 @@ list(APPEND SOURCE src/base/ftoutln.c src/base/ftpatent.c src/base/ftpfr.c + src/base/ftpsprop.c src/base/ftrfork.c src/base/ftsnames.c src/base/ftstream.c @@ -40,8 +36,6 @@ list(APPEND SOURCE src/base/ftutil.c src/base/ftwinfnt.c src/bdf/bdf.c - src/bzip2/ftbzip2.c - src/cache/ftcache.c src/cff/cff.c src/cid/type1cid.c src/gzip/ftgzip.c diff --git a/sdk/lib/3rdparty/freetype/ChangeLog b/sdk/lib/3rdparty/freetype/ChangeLog index f6de03c78e..fa38730b73 100644 --- a/sdk/lib/3rdparty/freetype/ChangeLog +++ b/sdk/lib/3rdparty/freetype/ChangeLog @@ -1,13 +1,12 @@ -2017-09-16 Werner Lemberg <wl(a)gnu.org> +2018-01-08 Werner Lemberg <wl(a)gnu.org> - * Version 2.8.1 released. - ========================= + * Version 2.9 released. + ======================= - Tag sources with `VER-2-8-1'. + Tag sources with `VER-2-9'. - * docs/VERSION.TXT: Add entry for version 2.8.1. - * docs/CHANGES: Updated. + * docs/VERSION.TXT: Add entry for version 2.9. * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, builds/windows/vc2005/index.html, @@ -21,5195 +20,4915 @@ builds/windows/visualce/freetype.dsp, builds/windows/visualce/freetype.vcproj, builds/windows/visualce/index.html, + builds/windows/ftver.rc, builds/wince/vc2005-ce/freetype.vcproj, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.8/2.8.1/, s/28/281/. + builds/wince/vc2008-ce/index.html: s/2.8.1/2.9/, s/281/29/. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 9. + (FREETYPE_PATCH): Set to 0. - * builds/unix/configure.raw (version_info): Set to 21:0:15. + * builds/unix/configure.raw (version_info): Set to 22:0:16. * CMakeLists.txt (VERSION_PATCH): Set to 1. -2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> +2018-01-07 Werner Lemberg <wl(a)gnu.org> - [sfnt] lowest gcc for vectors (e1d0249e) is changed to 4.7. + Add check for librt, needed for `ftbench' (#52824). - __builtin_shuffle() was introduced in gcc-4.7. The lowest - gcc to enable vector operation is delayed from 4.6 to 4.7. + * builds/unix/configure.raw (LIB_CLOCK_GETTIME): Define; this will + hold `-lrt' if necessary. - * src/sfnt/pngshim.c (premultiply_data): Fix cpp-macro to - enable the vector operation, to change the lowest gcc version - from 4.6 to 4.7. + * builds/unix/unix-cc.in (LIB_CLOCK_GETTIME): New variable. -2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> +2018-01-07 Ewald Hew <ewaldhew(a)gmail.com> - [cache] Fix a possible overflow by signed integer comparison. + [psaux] Fix Type 1 glyphs with too many stem hints. - Improve the code by 5d3ff05615dda6d1325ed612381a17a0df04c975 , - issues are found by Behdad Esfahbod and Werner Lemberg. + According to the CFF specification, charstrings can have up to 96 stem + hints. Due to hint replacement routines in Type 1 charstrings, some + glyphs are rejected by the Adobe engine, which implements the above + limit. This fix turns off hinting for such glyphs. - * src/cache/ftcbasic.c (FTC_ImageCache_Lookup): Replace - a subtraction to check higher bit by a bit operation, - and cpp-conditionalize for appropriate systems. Add better - documentation to the comment. - (FTC_ImageCache_LookupScaler): Ditto. - (FTC_SBitCache_Lookup): Ditto. - (FTC_SBitCache_LookupScaler): Ditto. + * src/psaux/pshints.c (cf2_hintmap_build): Reset the error from calling + `cf2_hintmask_setAll' on a problematic Type 1 charstring and turn off + hinting. -2017-09-13 Werner Lemberg <wl(a)gnu.org> +2018-01-06 Werner Lemberg <wl(a)gnu.org> - [autofit] Really fix #41334 (#52000). + Add `FT_Done_MM_Var'. - * src/autofit/aflatin.c (af_latin_hints_compute_segments): Set - `segment->delta' everywhere. + This is necessary in case the application's memory routines differ + from FreeType. A typical example is a Python application on Windows + that calls FreeType compiled as a DLL via the `ctypes' interface. -2017-09-12 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + * include/freetype/ftmm.h, src/base/ftmm.c (FT_Done_MM_Var): Declare + and define. - [autofit, sfnt] Fix for `make multi'. + * docs/CHANGES: Updated. - * src/autofit/afshaper.c: Include FT_ADVANCE_H, to use - FT_Get_Advance() in it. - * src/sfnt/ttcmap.c: Include FT_SERVICE_POSTSCRIPT_CMAPS_H - to use PS_Unicodes in it, also include `ttpost.h' to use - tt_face_get_ps_name() in it. +2018-01-03 Werner Lemberg <wl(a)gnu.org> -2017-09-11 Azzuro <azzuro(a)team-mediaportal.com> + [truetype] Round offsets of glyph components only if hinting is on. - [build] Improve builds with different MS Visual Studio versions. + * src/truetype/ttgload.c (TT_Process_Composite_Component): Implement + it. - * builds/windows/vc2010/freetype.vcxproj: Switch platform toolset - according to the Visual Studio version. +2018-01-03 Werner Lemberg <wl(a)gnu.org> -2017-09-11 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttgxvar.c (ft_var_to_design): Remove dead code. - * src/sfnt/ttkern.c (tt_face_load_kern): Reject format 2 tables. + This is a better fix than the previous commit, which is now + reverted. - Reported by Behdad. +2018-01-03 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-09-09 Werner Lemberg <wl(a)gnu.org> + Move internal LCD-related declarations. - [autofit] Improve communication with ftgrid. + * include/freetype/ftlcdfil.h (ft_lcd_padding, ft_lcd_filter_fir): + Move from here... + * include/freetype/internal/ftobjs.h: ... to here. - * src/autofit/afhints.c (af_glyph_hints_get_segment_offset): - Provide values in font units. +2018-01-03 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + * include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF) + [_MSC_VER]: Limit Visual C++ attributes. - [base] Remove a check for resource ID in the resource fork driver. +2018-01-03 Werner Lemberg <wl(a)gnu.org> - LastResort.dfont has a marginal resource ID 0xFFFF for sfnt - resource. Inside Macintosh: More Macintosh Toolbox, `Resource IDs' - (1-46), tells that some IDs are reserved and should not be used. - FreeType2 just uses resource ID to sort the fragmented resource. - To accept the marginal fonts, the checking is removed. + [truetype] Make blend/design coordinate round-tripping work. - * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Remove res_id - validity check, fix a trace message format. + Behdad reported that setting blend coordinates, then getting design + coordinates did incorrectly return the default instance's + coordinates. -2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> + * src/truetype/ttgxvar.c (tt_set_mm_blend): Fix it. - [sfnt, truetype] Register the tags for marginal fonts. +2017-12-31 Werner Lemberg <wl(a)gnu.org> - The first 32bit of standard TrueType variants is 0x00010000, - `OTTO', `ttcf', `true' or `typ1'. 2 marginal dfonts on legacy Mac - OS X, Keyboard.dfont and LastResort.dfont, have the sfnt resources - starting 0xA5 followed by `kbd' or `lst'. Considering the following - data could be parsed as conventional TrueType fonts, the header - checking is updated to allow these tags. It seems that recent Mac - OS X has already switched to normal TTF for these fonts. + * src/sfnt/ttcmap.c (tt_cmap2_char_next): Fix endless loop. - See the discussion at - http://u88.n24.queensu.ca/exiftool/forum/index.php?topic=3931.0 + Reported as - * include/freetype/tttags.h (TTAG_0xA5kbd, TTAG_0xA5lst): New header - tags for Keyboard.dfont and LastResort.dfont. - * src/sfnt/sfobjs.c (sfnt_open_font): Accept the sfnt resource - starts with TTAG_0xA5kbd or TTAG_0xA5lst. - * src/truetype/ttobjs.c (tt_face_init): Accept the face with the - format tag is TTAG_0xA5kbd or TTAG_0xA5lst. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4838 -2017-09-05 Werner Lemberg <wl(a)gnu.org> +2017-12-31 Werner Lemberg <wl(a)gnu.org> - Fix multiple calls of `FT_Bitmap_Convert'. + Synchronize other Windows project files. - The documentation of `FT_Bitmap_Convert' says that multiple calls do - proper reallocation of the target FT_Bitmap object. However, this - failed for the sequence + * builds/windows/*: Add missing files. - non-empty bitmap - empty bitmap - non-empty bitmap +2017-12-31 Werner Lemberg <wl(a)gnu.org> - Reason was that `FT_Bitmap_Convert' only reallocated the bitmap - buffer if it became too small; it didn't make the buffer smaller. - For an empty bitmap following a non-empty one, only the buffer - dimension got set to zero, without deallocation. If the next call - was a non-empty buffer again, an assertion in `ft_mem_qrealloc' was - triggered. + Update Visual C 2010 project files. - * src/base/ftbitmap.c (FT_Bitmap_Convert): Always reallocate target - buffer to the correct size. + Problem reported by Hin-Tak. - * docs/CHANGES: Document it. + * builds/windows/vc2010/freetype.vcxproj: Add files `ftbdf.c' and + `ftcid.c'. + Sort entries. + * builds/windows/vc2010/freetype.vcxproj.filter: Ditto. + Fix members of `FT_MODULE' group. -2017-09-05 Werner Lemberg <wl(a)gnu.org> +2017-12-30 Werner Lemberg <wl(a)gnu.org> - [bdf] Fix size and resolution handling. + * builds/vms/ftconfig.h: Synchronize with unix `ftconfig.in' file. - * src/bdf/bdfdrivr.c (BDF_Face_Init): Use `SIZE' values if - `POINT_SIZE', `RESOLUTION_X', or `RESOLUTION_Y' properties are - missing. +2017-12-28 Werner Lemberg <wl(a)gnu.org> - * docs/CHANGES: Document it. + * builds/unix/ftconfig.in: Synchronize with main `ftconfig.h' file. -2017-08-25 Alexei Podtelezhnikov <apodtele(a)gmail.com> + Reported by Nikolaus. - Swap `ALLOC_MULT' arguments (#51833). +2017-12-27 Werner Lemberg <wl(a)gnu.org> - * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Updated. - * src/winfonts/winfnt.c (FNT_Load_Glyph): Updated. - * src/raster/ftrend1.c (ft_raster1_render): Updated. + Fix compiler warnings. -2017-08-23 Werner Lemberg <wl(a)gnu.org> + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Make `pitch' and + `new_pitch' unsigned. - [sfnt] Fix clang compilation (#51788). + * src/base/ftpsprop.c: Include FT_INTERNAL_POSTSCRIPT_PROPS_H. - * src/sfnt/pngshim.c (premultiply_data): Use vectors instead of - scalars. - (vector_shuffle): New macro to take care of a different built-in - function name on clang. +2017-12-27 Werner Lemberg <wl(a)gnu.org> -2017-08-22 Werner Lemberg <wl(a)gnu.org> + Fixes for `make multi'. - [base] Don't zero out allocated memory twice (#51816). + * include/freetype/internal/ftpsprop.h: Use `FT_BASE_CALLBACK'. + (ps_property_get): Harmonize declaration with corresponding + function typedef. - Patch applied from bug report. + * include/freety[e/internal/fttrace.h: Add `trace_psprops'. - * src/base/ftutil.c (ft_mem_qrealloc): Use low-level allocation to - avoid unnecessary overhead. + * src/base/ftpsprop.c: Include necessary header files. + (FT_COMPONENT): Define. + (ps_property_set): Tag with `FT_BASE_CALLBACK_DEF'. + (ps_property_get): Tag with `FT_BASE_CALLBACK_DEF'. + Harmonize declaration with corresponding function typedef. -2017-08-22 Werner Lemberg <wl(a)gnu.org> +2017-12-27 Werner Lemberg <wl(a)gnu.org> - [truetype] Integer overflow. + Provide support for intra-module callback functions. - Changes triggered by + This is needed especially for `make multi' with C++. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3107 + * include/freetype/config/ftconfig.h (FT_BASE_CALLBACK, + FT_BASE_CALLBACK_DEF): New macros. - * src/truetype/ttinterp.c (Ins_MDRP, Ins_MIRP, Ins_ALIGNPTS): Use - NEG_LONG. +2017-12-25 Ewald Hew <ewaldhew(a)gmail.com> -2017-08-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> + Move PostScript drivers' property handlers to `base'. - [sfnt] Avoid synthetic unicode for symbol fonts with PUA. + This reduces the amount of duplicated code across PostScript + drivers. - Reported as + * src/cff/cffdrivr.c, src/cid/cidriver.c, src/type1/t1driver.c + ({cff,cid,t1}_property_{get,set}): Moved to... + * include/freetype/internal/ftpsprop.h: ...this new file. + (ps_property_{get,set}): New functions to replace moved ones. - https://bugs.chromium.org/p/chromium/issues/detail?id=754574 + * src/base/ftpsprop.c: New file that implements above functions. - * src/sfnt/sfobjs.c (sfnt_load_face): Check for FT_ENCODING_MS_SYMBOL. + * include/freetype/internal/internal.h + (FT_INTERNAL_POSTSCRIPT_PROPS_H): New macro. -2017-08-16 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffdrivr.c, src/cid/cidriver.c, src/type1/t1driver.c: + Updated. - * src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings. + * src/base/Jamfile, src/base/rules.mk (BASE_SRC), src/base/ftbase.c: + Updated. -2017-08-15 Behdad Esfahbod <behdad(a)behdad.org> +2017-12-20 Werner Lemberg <wl(a)gnu.org> - [sfnt] Speed up PNG image loading. + Speed up FT_Set_Var_{Design,Blend}_Coordinates if curr == new. - This reduces the overhead of `premultiply_data' by 60%. + We exit early if the current design or blend coordinates are + identical to the new ones. - * src/sfnt/pngshim.c (premultiply_data): Provide code which uses - gcc's (and clang's) `vector_byte' attribute to process 4 pixels at a - time. + * src/truetype/ttgxvar.c (tt_set_mm_blend, TT_Set_Var_Design): + Implement it, returning internal error code -1 if there will be no + variation change. -2017-08-11 Werner Lemberg <wl(a)gnu.org> + * src/type1/t1load.c (t1_set_mm_blend): Ditto. - [sfnt, truetype] Improve handling of missing sbits. + * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, + FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Updated. - Requested by Behdad. +2017-12-18 Werner Lemberg <wl(a)gnu.org> - Modern bitmap-only SFNTs like `NotoColorEmoji.ttf' don't contain - entries in the bitmap strike(s) for empty glyphs. Instead, they - rely that a space glyph gets created from the font's metrics data. - This commit makes FreeType behave accordingly. + [sfnt] Fix charmap type 2 iterator (#52646). - * include/freetype/fterrdef.h (FT_Err_Missing_Bitmap): New error - code. + The subsetted demo font of the report that exhibits the bug has a + very unusual type 2 cmap for Unicode(!): It contains only two + sub-headers, one for one-byte characters (covering the range 0x20 to + 0xFA), and a second one for higher byte 0x01 (just for character + code U+0131). - * src/sfnt/ttsbit.c (tt_sbit_decoder_load_image): Change error codes - to make a distinction between a missing bitmap in a composite and a - simple missing bitmap. + Before this commit, the iterator wasn't able to correctly handle a + sub-header for higher byte 0x01. - * src/truetype/ttgload.c (TT_Load_Glyph): For a missing bitmap (in a - bitmap-only font), synthesize an empty bitmap glyph if metrics are - available. + * src/sfnt/ttcmap.c (tt_cmap2_char_next): Fix character increment + for outer loop. -2017-08-10 Werner Lemberg <wl(a)gnu.org> +2017-12-18 Matthias Clasen <matthias.clasen(a)gmail.com> - [base] Minor API improvement for default variation axis setting. + [truetype] Fix clamping, minor tracing code beautification. - * src/base/ftmm.c (FT_Set_MM_Design_Coordinates, - FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, - FT_Set_Var_Blend_Coordinates): Allow coords==NULL if num_coords==0. + * src/truetype/ttgxvar.c (ft_var_to_normalized): Trace number of + design coordinates. + Use clamped value. - * docs/CHANGES: Updated. +2017-12-18 Werner Lemberg <wl(a)gnu.org> -2017-08-08 Werner Lemberg <wl(a)gnu.org> + * src/*/*: Only use `ft_' and `FT_' variants of stdc library stuff. - [psnames] Really fix issue #49949. +2017-12-18 Werner Lemberg <wl(a)gnu.org> - We now use a separate preprocessor macro to handle both definition - and declaration of the glyph name arrays. + * src/truetype/ttgxvar.c (tt_face_vary_cvt): Add size guard (#52688). - * src/psnames/psmodule.c (DEFINE_PS_TABLE_DATA): New macro. +2017-12-18 Werner Lemberg <wl(a)gnu.org> - * src/tools/glnames.py (StringTable::dump, - StringTable::dump_sublist): Use `DEFINE_PS_TABLE_DATA'. - (dump_encoding): Ditto. - (main): Use `wb' mode for writing the output file, which works on - Windows also. + [truetype] Fix previous commit. - * src/psnames/pstables.h: Regenerated. + * src/truetype/ttgload.c (TT_Process_Simple_Glyph): Correctly handle + unhinted phantom points, which must be properly scaled. -2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> +2017-12-18 Werner Lemberg <wl(a)gnu.org> - [smooth] Harmony LCD rendering. + [truetype] Don't apply HVAR and VVAR deltas twice (#52683). - This is a new technology for LCD-optimized rendering. It capitalizes - on the fact that each color channel grid is shifted by a third of a - pixel. Therefore it is logical to render 3 separate monochrome - bitmaps shifting the outline by 1/3 pixel, and then combine them. - Importantly, the resulting output does not require additional LCD - filtering. + * src/truetype/ttgload.c (TT_Process_Simple_Glyph): Always adjust + `pp1' to `pp4', except if we have an HVAR and/or VVAR table. - * src/smooth/ftsmooth.c (ft_smooth_render_generic) - [!FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Implement new LCD-optimized - rendering. + * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Handle + alternative code branch identically w.r.t. presence of an HVAR + and/or VVAR table. - * include/freetype/ftlcdfil.h, include/freetype/freetype.h, - include/freetype/config/ftoption.h, devel/ftoption.h: Updated - documentation. +2017-12-17 Jonathan Kew <jfkthame(a)gmail.com> -2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> + [truetype] Correctly handle variation font phantom points (#52683). - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Clean up. + * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Fix phantom + point indices. -2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> +2017-12-17 Jonathan Kew <jfkthame(a)gmail.com> - * src/sfnt/ttpost.c (format): Use otspec-compliant versions. + Fix incorrect advance width scaling (#52683). -2017-08-05 Werner Lemberg <wl(a)gnu.org> + * src/base/ftadvance.c (FT_Get_Advances): Always respect the + FT_LOAD_NO_SCALE flag if present. - [truetype] Integer overflow. +2017-12-16 Alexei Podtelezhnikov <apodtele(a)gmail.com> - Reported as + * builds/windows/vc2010/freetype.vcxproj: AfterBuild copy. + * objs/.gitignore: Ignore almost everything. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2868 +2017-12-11 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttinterp.c (Ins_ALIGNRP): Use NEG_LONG. + Fix compiler warning (#52640). -2017-08-05 Werner Lemberg <wl(a)gnu.org> + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Remove unused + variable. - [base, truetype] New function `FT_Get_Var_Axis_Flags'. +2017-12-08 Azzuro <azzuro(a)team-mediaportal.com> - The reserved `flags' field got a value in OpenType version 1.8.2; - unfortunately, the public `FT_Var_Axis' structure misses the - corresponding element. Since we can't add a new field, we add an - access function. + * builds/windows/vc2010/freetype.vcxproj: Adjust output directory. - * src/base/ftmm.c (FT_Get_Var_Axis_Flags): New function. + This allows builds with different configurations in parallel. - * include/freetype/ftmm.h (FT_VAR_AXIS_FLAG_HIDDEN): New macro. - Updated. +2017-12-08 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Increase allocated memory - of `mmvar' to hold axis flags. - Fill the axis flags array. + Fix `make setup dos', second try (#52622). - * docs/CHANGES: Updated. + * builds/detect.mk (dos_setup): Don't use literal `>' character at + all. Mixing the different escaping rules from make, dos, and + windows is too fragile. -2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> +2017-12-08 Werner Lemberg <wl(a)gnu.org> - [truetype] Fix metrics of B/W hinting in v40 mode. + [docmaker] Fix code section parsing. - Phantom points are now saved outside v40 backwards compatibility - mode. This fixes the jumping glyphs when switching between v35 and - v40 monochrome mode. + Stuff like - * src/truetype/ttgload.c (TT_Hint_Glyph): Fix inversed bool logic. + { + <bla> + } -2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> + confused the parser, which incorrectly treated `<bla>' as a markup + tag. - [truetype] Do not set any ClearType flags in v40 monochrome mode. + * src/tools/docmaker/content.py (ContentProcessor::process_content): + Apply `re_markup_tags' only outside of code sections. - This fixes weird behavior of instructions that resulted in rendering - differences between v35 and v40 in monochrome mode, e.g., in - `timesbi.ttf'. +2017-12-08 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttinterp.c (Ins_GETINFO) - [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Check - `subpixel_hinting_lean'. + New `ftdriver.h' file, covering all driver modules. -2017-08-01 Werner Lemberg <wl(a)gnu.org> + This reduces redundancy and increases synergy; it also reduces the + number of header files. - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko. + * include/freetype/config/ftheader.h (FT_DRIVER_H): New macro. + (FT_AUTOHINTER_H, FT_CFF_DRIVER_H, FT_TRUETYPE_DRIVER_H, + FT_PCF_DRIVER_H, FT_TYPE1_DRIVER_H): Make them aliases to + FT_DRIVER_H. -2017-08-01 Behdad Esfahbod <behdad(a)behdad.org> + * include/freetype/ftautoh.h, include/freetype/ftcffdrv.h, + include/freetype/ftpcfdrv.h, include/freetype/ftt1drv.h, + include/freetype/ftttdrv.h: Replaced with... + * include/freetype/ftdriver.h: ...this new file. + (FT_CFF_HINTING_ADOBE, FT_T1_HINTING_ADOBE): Renamed to... + (FT_HINTING_ADOBE): ... this new macro. + (FT_CFF_HINTING_FREETYPE, FT_T1_HINTING_FREETYPE): Renamed to... + (FT_HINTING_FREETYPE): ... this new macro. - [truetype] Fix loading of named instances. + * src/*/*: Updated accordingly. - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Preserve file position - while loading the `avar' table. +2017-12-08 Werner Lemberg <wl(a)gnu.org> -2017-08-01 Werner Lemberg <wl(a)gnu.org> + Move `ftdriver.h' to `ftdrv.h'. - [sfnt, truetype] Minor adjustments for OpenType 1.8.2. + * include/freetype/internal/ftdriver.h: Renamed to... + * include/freetype/internal/ftdrv.h: ... this name. - * src/sfnt/sfobjs.c (sfnt_load_face): The units per EM value has now - (tighter) limits. + * include/freetype/internal/internal.h (FT_INTERNAL_DRIVER_H): + Updated. - * src/truetype/ttgload.c (load_truetype_glyph): The new OpenType - version explicitly allows all negative values for the number of - contours if we have a composite glyph (this is for better backwards - compatibility I guess), but it still recommends value -1. +2017-12-08 Werner Lemberg <wl(a)gnu.org> -2017-07-26 Werner Lemberg <wl(a)gnu.org> + Fix access to uninitalized memory (#52613). - [cff] Integer overflow. + Also reported as - Reported as + https://bugs.chromium.org/p/chromium/issues/detail?id=791317 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2738 + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): If increasing the + bitmap size needs a larger bitmap buffer, assure that the new memory + areas are initialized also. - * src/cff/cf2hints.c (cf2_glyphpath_computeOffset, - cf2_glyphpath_curveTo): Use ADD_INT32. +2017-12-08 Werner Lemberg <wl(a)gnu.org> -2017-07-13 Werner Lemberg <wl(a)gnu.org> + Fix `make setup dos' (#52622). - [base] Fix memory leak. + * builds/detect.mk (dos_setup): Properly escape literal `>' + character. - Reported as +2017-12-07 Werner Lemberg <wl(a)gnu.org> - https://bugs.chromium.org/p/chromium/issues/detail?id=738362 + Fix C++ compilation. - * src/base/ftglyph.c (FT_Get_Glyph): Do proper deallocation in case - of error. + * src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary. -2017-07-12 Werner Lemberg <wl(a)gnu.org> + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning. - [base] Integer overflow. +2017-12-07 Werner Lemberg <wl(a)gnu.org> - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2573 + Fix `make multi'. - * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use - FT_PIX_CEIL_LONG and FT_PIX_ROUND_LONG. + * include/freetype/internal/fttrace.h: Remove unused tracing macros. + s/pshalgo2/pshalgo/. + Add `trace_cffdecode'. + * src/pshinter/pshalgo.c (FT_COMPONENT): Updated. -2017-07-12 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffload.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H. + * src/cff/cffobjs.c: Include FT_SERVICE_METRICS_VARIATIONS_H and + FT_SERVICE_CFF_TABLE_LOAD_H. - * src/truetype/ttpload.c (tt_face_get_location): Off-by-one typo. + * src/cid/cidriver.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H. - Also improve tracing message. + * src/psaux/cffdecode.c: Include FT_FREETYPE_H and + FT_INTERNAL_DEBUG_H. + (FT_COMPONENT): Define. + * src/psaux/cffdecode.h: Include FT_INTERNAL_POSTSCRIPT_AUX_H. + * src/psaux/psauxmod.h: Include FT_INTERNAL_POSTSCRIPT_AUX_H. + Declare `cff_builder_funcs' and `ps_builder_funcs'. + * src/psaux/psft.c: Include `psobjs.h' and `cffdecode.h'. + * src/psaux/psobjs.c : Include `psauxmod.h'. - Problem reported as +2017-12-07 Werner Lemberg <wl(a)gnu.org> - https://bugs.chromium.org/p/chromium/issues/detail?id=738919 + * include/freetype/config/ftheader.h: Some clean-up. -2017-07-07 Werner Lemberg <wl(a)gnu.org> + This commit removes documentation of deprecated macros and does some + minor streamlining. - [cff] Integer overflow. +2017-12-06 Werner Lemberg <wl(a)gnu.org> - Reported as + * builds/symbian/bld.inf: Updated. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2517 +2017-12-06 Werner Lemberg <wl(a)gnu.org> - * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32. + New header file `ftparams.h' that collects all parameter tags. -2017-07-05 Werner Lemberg <wl(a)gnu.org> + * include/freetype/config/ftheader.h (FT_PARAMETER_TAGS_H): New + macro. + (FT_TRUETYPE_UNPATENTED_H, FT_UNPATENTED_HINTING_H): Define it to + `ftparams.h'. - * src/sfnt/ttcmap.c (tt_cmap_unicode_class_rec): Fix warning. + * include/freetype/ftautoh.h, include/freetype/ftcffdrv.h, + include/freetype/ftincrem.h, include/freetype/ftlcdfil.h, + include/freetype/ftsnames.h, include/freetype/ftt1drv.h: Include + FT_PARAMETER_TAGS_H. + Move FT_PARAM_TAG_XXX definitions to... + * include/freetype/ftparams.h: ...this new file. -2017-07-05 Werner Lemberg <wl(a)gnu.org> + * include/freetype/ttunpat.h: Remove. No longer needed. - * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Fix warning (#51395). +2017-12-05 Werner Lemberg <wl(a)gnu.org> -2017-07-04 Werner Lemberg <wl(a)gnu.org> + Improve tracing messages by using singular and plural forms. - [truetype] Prevent address overflow (#51365). + * src/*/*.c: Implement it. - * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Add guard. +2017-12-04 Werner Lemberg <wl(a)gnu.org> -2017-07-03 Alexei Podtelezhnikov <apodtele(a)gmail.com> + [truetype] Allow shared points in `cvar' table (#52532). - * src/base/ftlcdfil.c (ft_lcd_filter_fir): Improve code. + * src/truetype/ttgxvar.c (tt_face_vary_cvt): Implement it by copying + and adjusting the corresponding code from + `TT_Vary_Apply_Glyph_Deltas'. -2017-07-03 Werner Lemberg <wl(a)gnu.org> +2017-11-28 Werner Lemberg <wl(a)gnu.org> - [truetype] Integer overflow. + [truetype] Improving tracing of composite glyphs. - Reported as + * src/truetype/ttgload.c (TT_Load_Composite_Glyph) + [FT_DEBUG_LEVEL_TRACE]: Show composite glyph information. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2455 +2017-11-27 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttinterp.c (Ins_SCFS): Use SUB_LONG. + [type1] Allow (again) `/Encoding' with >256 elements (#52464). -2017-07-01 Alexei Podtelezhnikov <apodtele(a)gmail.com> + In version 2.6.1, this has been disallowed to better reject + malformed fonts; however, this restriction was too strong. This + time, we only take the first 256 elements into account, since + encoding arrays are always accessed with a 8bit integer, according + to the PostScript Language Reference. - * src/sfnt/sfobjs.c (sfnt_load_face): Ignore No_Unicode_Glyph_Name. + * src/type1/t1load.c (parse_encoding): Implement it. -2017-06-28 Ben Wagner <bungeman(a)google.com> +2017-11-27 Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> - Avoid Microsoft compiler warnings (#51331). + Fix last commit (#52522). - While clang's sanitizer recommends a cast to unsigned for safe - negation (to handle -INT_MIN), both MSVC and Visualc emit warning - C4146 if an unsigned value gets negated. + * builds/freetype.mk: Set `FT_OPTION_H' and `FTOPTION_FLAG' + properly if we have `ftoption.h' in `BUILD_DIR'. - * include/freetype/internal/ftcalc.h (NEG_LONG, NEG_INT32), - src/base/ftcalc.c (FT_MOVE_SIGN): Replace negation with a - subtraction. +2017-11-24 Werner Lemberg <wl(a)gnu.org> -2017-06-27 Werner Lemberg <wl(a)gnu.org> + [unix] Install a massaged `ftoption.h' file (#51780). - * src/cff/cffparse.c (do_fixed): Fix typo. + * builds/unix/configure.raw (ftoption_set, ftoption_unset): New + auxiliary functions to construct... + (FTOPTION_H_SED): ... this new variable. + Apply it as a sed argument while copying `ftoption.h' to the + `builds/unix' directory (using `AC_CONFIG_FILES'). + Simplify code of test that checks cpp's computation of bit length + (the test previously created an empty `ftoption.h' file and deleted + it immediately afterwards); without this change, it can happen on my + GNU/Linux box that `configure's execution of `config.status' doesn't + create `ftoption.h' (no idea why this happens). - Spotted by chris <chris(a)gcjd.org>. + * builds/unix/install.mk (install): Install + `builds/unix/ftoption.h'. -2017-06-27 Werner Lemberg <wl(a)gnu.org> + * builds/unix/unix-def.in (DISTCLEAN): Updated. - [truetype] Integer overflows. + * builds/unix/.gitignore: Updated. - Reported as +2017-11-23 Tor Andersson <tor.andersson(a)artifex.com> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2384 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2391 + Silence unused function warnings (#52465). - * src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix): Use - NEG_LONG. + Some static function declarations cause unused function warnings if + certain config options are turned off via `ftoption.h'. - * src/truetype/ttinterp.c (Ins_SxVTL): Use NEG_LONG. + * src/base/ftbase.h, src/base/ftrfork.c, src/sfnt/ttbdf.h, + src/truetype/ttgxvar.h: Add #ifdef guards around these sections. -2017-06-24 Werner Lemberg <wl(a)gnu.org> +2017-11-22 Ewald Hew <ewaldhew(a)gmail.com> - [truetype] Integer overflows. + * src/psaux/psft.c (cf2_setGlyphWidth): Check format before setting. Reported as - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2364 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4377 - * src/truetype/ttinterp.c (Ins_ISECT): Use NEG_LONG. +2017-11-22 Ewald Hew <ewaldhew(a)gmail.com> -2017-06-22 Werner Lemberg <wl(a)gnu.org> + [psaux] Fix CFF advance widths. (#52466) - [cff, truetype] Integer overflows. + Glyph advance widths were being written to the new `PS_Decoder' but not + saved to the underlying format specific decoder. This caused pure CFF + fonts to have bad advance width. - Reported as + * include/freetype/internal/psaux.h (PS_Decoder): Change `glyph_width' + field to pointer. + Remove unused fields. + * src/psaux/psobjs.c (ps_decoder_init): Change `glyph_width' from copy + to reference. + Remove unused. + * src/psaux/psft.c (cf2_setGlyphWidth): Update code. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2323 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2328 +2017-11-15 Vlad Tsyrklevich <vtsyrklevich(a)google.com> - * src/cff/cf2blues.c (cf2_blues_capture): Use ADD_INT32 and - SUB_INT32. + * include/freetype/ftrender.h: Fix `FT_Renderer_RenderFunc' type. - * src/truetype/ttinterp.c (Ins_SDPVTL): Use SUB_LONG and NEG_LONG. +2017-11-14 Nikolaus Waxweiler <madigens(a)gmail.com> -2017-06-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> + Use Adobe hinting engine for `light' hinting of both CFF and Type 1. - [sfnt] Synthesize a Unicode charmap if one is missing. + Since Ewald Hew factored the Adobe hinting engine out of the CFF + driver code, we can now use it on Type 1 (and CID) font formats, as + both have the same hinting philosophy. - * src/sfnt/ttcmap.h (tt_cmap_unicode_class_rec): Declare it. - * src/sfnt/ttcmap.c (tt_get_glyph_name, tt_cmap_unicode_init, - tt_cmap_unicode_done, tt_cmap_unicode_char_index, - tt_cmap_unicode_char_next, tt_cmap_unicode_class_rec): Implement - synthetic Unicode charmap class. - (tt_get_cmap_info): Make sure the callback is available. + This change activates the Adobe hinter when in LIGHT mode, and + therefore always unless explicitly asking for the auto-hinter. This + makes LIGHT behavior consistent with CFF fonts. As of this commit, + the hinting engine table looks as follows. - * src/sfnt/sfobjs.c (sfnt_load_face) - [FT_CONFIG_OPTION_POSTSCRIPT_NAMES]: If Unicode charmap is missing, - synthesize one. + LIGHT NORMAL + ------------------------- + TrueType Auto v40 + CFF Adobe Adobe + Type 1 Adobe Adobe - * include/freetype/config/ftoption.h: Document it. - * devel/ftoption.h: Ditto. +2017-11-10 Yuri Levchenko <yuri_levchenko(a)boolat.com> -2017-06-20 Tony Theodore <tonyt(a)logyst.com> + * CMakeLists.txt: Add `DISABLE_FORCE_DEBUG_PREFIX' option. - Fix pkg-config in freetype-config for cross-compiling (#51274). +2017-11-06 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * builds/unix/unix-def.in (PKG_CONFIG): New variable. - (freetype-config): Use it in sed expression. + * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition. - * builds/unix/freetype-config.in: s/pkg-config/%PKG_CONFIG%/. +2017-11-06 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-06-20 Werner Lemberg <wl(a)gnu.org> + * src/smooth/ftgrays.c (gray_set_cell): Fix uninitialized variables. - [cff, truetype] Integer overflows. +2017-11-03 Ewald Hew <ewaldhew(a)gmail.com> - Reported as + [psaux] Fix PostScript interpreter rewinding in Type 1 mode. (#52251) - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2300 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2313 + The interpreter in Type 1 mode rewinds the charstring after collecting + all hints for building the initial hintmap (commit d52dd7f). However, + some charstrings use `endchar' in a final subroutine call, rewinding to + the start of that subroutine, and only a small section of the actual + glyph is drawn. - * src/cff/cf2hints.c (cf2_hintmap_adjustHints): Use ADD_INT32. + * src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdENDCHAR>: + Ensure we are on the top level charstring before rewinding. - * src/truetype/ttinterp.c (Ins_ABS): Avoid FT_ABS. +2017-11-03 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> -2017-06-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> + [truetype] Add more tricky fonts. - [base, smooth] LCD filtering cleanups. + See the report by Yang Yinsen. + https://lists.gnu.org/archive/html/freetype-devel/2017-11/msg00000.html - * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy): - Clean up, start filtering from the bottom-left origin. + * src/truetype/ttobjs.c (trick_names): Add `DFGothic-EB', + `DFGyoSho-Lt', `DFHSGothic-W5', `DFHSMincho-W3' and `DFHSMincho-W7'. + (tt_check_trickyness_sfnt_ids): Add checksums for DFGothic-EB, + DFGyoSho-Lt, DFHSGothic-W5, DFHSMincho-W3 and DFHSMincho-W7. Also + add checksums for DLCLiShu and DLCHayBold which their family names + were already listed but their checksums were previously unknown. - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Updated. +2017-11-01 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-06-16 Werner Lemberg <wl(a)gnu.org> + [smooth] Fix complex rendering at high ppem. - [truetype] Integer overflows. + We used to split large glyphs into horizontal bands and continue + bisecting them still horizontally if that was not enough. This is + guaranteed to fail when a single scanline cannot fit into the + rendering memory pool. Now we bisect the bands vertically so that + the smallest unit is a column of the band height, which is guranteed + to fit into memory. - Reported as + * src/smooth/ftgrays.c (gray_convert_glyph): Implement it. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2270 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2276 +2017-10-20 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/truetype/ttinterp.c (Ins_MDRP, _iup_worker_interpolate): Use - ADD_LONG and SUB_LONG. + [smooth] Improve complex rendering at high ppem. -2017-06-15 Werner Lemberg <wl(a)gnu.org> + At large sizes almost but not exactly horizontal segments can quickly + drain the rendering pool. This patch at least avoids filling the pool + with trivial cells. Beyond this, we can only increase the pool size. - [bdf, cff] Integer overflows. + Reported, analyzed, and tested by Colin Fahey. - Reported as + * src/smooth/ftgrays.c (gray_set_cell): Do not record trivial cells. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2244 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2261 +2017-10-20 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/bdf/bdfdrivr.c (BDF_Face_Init): Replace calls to FT_ABS with - direct code to avoid value negation. + [base] Improve tracing in FT_Load_Glyph, FT_*_Size. - * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32 and - ADD_INT32. + * src/base/ftobjs.c (FT_Load_Glyph): Tag tracing messages with + function name, glyph index, and load flags. + (FT_Select_Metrics, FT_Request_Metrics): Remove all tracing. + (FT_Select_Size, FT_Request_Size): Improve tracing. -2017-06-13 Werner Lemberg <wl(a)gnu.org> +2017-10-18 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/winfonts/winfnt.c (FNT_Face_Init): Don't set active encoding. + [base] Improve tracing in FT_Render_Glyph. - FreeType only sets a default active encoding for Unicode. + * src/base/ftobjs.c (FT_Render_Glyph_Internal): Add total coverage + calculations and downgrade Netpbm dump to bitmap:7. -2017-06-13 Werner Lemberg <wl(a)gnu.org> +2017-10-15 Ewald Hew <ewaldhew(a)gmail.com> - [cff, truetype] Integer overflows. + [cff] Fix segfault on missing `psaux' (#52218) - Reported as + * src/cff/cffload.c (cff_done_blend): Add a check for possible nullptr. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2216 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2218 + * modules.cfg: Update dependency list. - * src/cff/cf2fixed.h (cf2_fixedAbs): Use NEG_INT32. +2017-10-15 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/truetype/ttinterp.c (Ins_IP): Use SUB_LONG. + [base, cff] Fix MSVC warnings. -2017-06-11 Werner Lemberg <wl(a)gnu.org> + * src/base/ftobjs.c (FT_New_Library): C4702: unreachable code. + (ft_glyphslot_preset_bitmap): C4244: possible loss of data. + * src/cff/cffload.c (cff_blend_doBlend): C4244: possible loss of data. + Turn `sum' into unsigned. - [cff] Integer overflows. +2017-10-14 Alexei Podtelezhnikov <apodtele(a)gmail.com> - Reported as + [base] Netpbm image tracing. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2200 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2210 + * src/base/ftobjs.c (FT_Load_Glyph): Trace bitmap size. + (FT_Render_Glyph_Internal): Trace bitmap in Netpbm format. - * src/cff/cf2hints.c (cf2_hintmap_insertHint): Use SUB_INT32 and - ADD_INT32. + * src/smooth/ftgrays.c (gray_sweep): Sweep remnants of span tracing. - * src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO>: Use - ADD_INT32. +2017-10-14 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-06-10 Werner Lemberg <wl(a)gnu.org> + * builds/windows/ftdebug.c (FT_Message): Print to stderr. + * builds/wince/ftdebug.c (FT_Message): Ditto. - [truetype] Fix TT_Set_Var_Design. +2017-10-14 Behdad Esfahbod <behdad(a)behdad.org> - Reported by Nikolaus Waxweiler <madigens(a)gmail.com>. + [afshaper] Delay creating `hb_set' objects until needed. - * src/truetype/ttgxvar.c (TT_Set_Var_Design): Correctly handle the - case where we have less input coordinates than axes. + In runs on Noto Naskh Arabic, this results in 89 sets created + instead of 340 before. Makes auto-hinter setup with HarfBuzz + enabled 20% to 30% faster. -2017-06-10 Werner Lemberg <wl(a)gnu.org> + * src/autofit/afshaper.c (af_shaper_get_coverage): Implement it. - * src/base/ftcalc.c (FT_DivFix): Fix embarrassing typo. +2017-10-12 Ewald Hew <ewaldhew(a)gmail.com> - Bug introduced 2017-05-28. + [type1, cid] Add hinting engine switch. -2017-06-09 Werner Lemberg <wl(a)gnu.org> + Implement property service in `type1' and `cid' drivers to allow + switching between FreeType or Adobe hinting engine when both are + available. - [cff, truetype] Integer overflows. + * src/cid/cidriver.c (cid_property_{set,get}, cid_services), + src/type1/t1driver.c (t1_property_{set,get}, t1_services): Add + Properties service. - Reported as + * src/cid/cidobjs.c (cid_driver_init), src/type1/t1objs.c + (T1_Driver_Init): Add default property values. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2144 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2151 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2153 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2173 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2186 +2017-10-12 Ewald Hew <ewaldhew(a)gmail.com> - * src/cff/cf2blues.c (cf2_blues_init): Use SUB_INT32. + Add T1_CONFIG_OPTION_OLD_ENGINE configuration option. - * src/truetype/ttinterp.c (Round_None, Round_To_Grid, - Round_To_Half_Grid, Round_Down_To_Grid, Round_Up_To_Grid, - Round_To_Double_Grid, Round_Super, Round_Super_45): Use ADD_LONG, - SUB_LONG, NEG_LONG, FT_PIX_ROUND_LONG, FT_PIX_CEIL_LONG, - FT_PAD_ROUND_LONG - (Ins_SxVTL, Ins_MIRP): Use SUB_LONG. - (_iup_worker_shift): Use SUB_LONG and ADD_LONG. + This controls whether the old Type 1 engine gets compiled into FreeType. + It is disabled by default. -2017-06-09 Werner Lemberg <wl(a)gnu.org> + * devel/ftoption.h, include/freetype/config/ftoption.h + (T1_CONFIG_OPTION_OLD_ENGINE): New macro. - Provide more macros for flooring, ceiling, and rounding. + * include/freetype/internal/psaux.h (PS_Decoder): Remove unused field. + * include/freetype/internal/psaux.h, src/cid/cidgload.c + (cid_load_glyph), src/psaux/psauxmod.c, src/psaux/psobjs.c + (ps_builder_add_point), src/psaux/t1decode.c + (t1_lookup_glyph_by_stdcharcode, t1_decoder_parse_glyph, + t1operator_seac, t1_decoder_parse_charstrings), src/psaux/t1decode.h, + src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Surround + relevant code with macro. + Minor code changes. - These versions don't produce run-time errors due to integer - overflow. +2017-10-12 Ewald Hew <ewaldhew(a)gmail.com> - * include/freetype/internal/ftobjs.h: Include FT_INTERNAL_CALC_H. - (FT_PAD_ROUND_LONG, FT_PAD_CEIL_LONG, FT_PIX_ROUND_LONG, - FT_PIX_CEIL_LONG): New macros. - (FT_PAD_ROUND_INT32, FT_PAD_CEIL_INT32, FT_PIX_ROUND_INT32, - FT_PIX_CEIL_INT32): New macros. + Extract width parsing from Type 1 parser. -2017-06-09 Werner Lemberg <wl(a)gnu.org> + Duplicate the fast advance width calculations from the old parser. + This is to facilitate adding options for compiling out the old parser. - Remove unused macros. + * src/psaux/t1decode.{c,h} (t1_decoder_parse_metrics): New function. + * include/freetype/internal/psaux.h (T1_Decoder_Funcs): New entry + `parse_metrics'. + * src/psaux/psauxmod.c: Set the new entry. - * include/freetype/internal/ftcalc.h (ADD_INT, SUB_INT, MUL_INT, - NEG_INT): Deleted. + * src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String), + src/cid/cidgload.c (cid_load_glyph): Separate + conditional for selecting engine. -2017-06-09 Werner Lemberg <wl(a)gnu.org> +2017-10-09 Werner Lemberg <wl(a)gnu.org> - */*: Remove `OVERFLOW_' prefix. + * src/base/ftoutln.c (FT_Outline_Translate): Fix integer overflow. - This increases readability. + Reported as -2017-06-07 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/chromium/issues/detail?id=772775 - [cff, truetype] Integer overflows. +2017-10-08 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Integer overflows. Reported as - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2133 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2137 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3579 - * src/cff/cf2hints.c (cf2_hint_init): Use OVERFLOW_SUB_INT32. +2017-10-07 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttinterp.c (PROJECT, DUALPROJ): Use - OVERFLOW_SUB_LONG. + [sfnt] Adjust behaviour of PS font names for variation fonts. -2017-06-06 Werner Lemberg <wl(a)gnu.org> + * src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Use a named instance's + PS name only if no variation is applied. - [cff] Integer overflows. +2017-10-07 Werner Lemberg <wl(a)gnu.org> - Reported as + [cff, truetype] Adjust behaviour of named instances. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2109 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2110 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2122 + This commit completely separates the interaction between named + instances and variation functions. In particular, resetting the + variation returns to the current named instance (if set) and not to + the base font. - * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. + As a side effect, variation functions no longer change the named + instance index. - * src/cff/cf2hints.c (cf2_hintmap_map): Synchronize if-else - branches. + * src/cff/cffobjs.c (cff_face_init): Use MM service's `set_instance' + function. + Also apply `MVAR' table to named instances. -2017-06-05 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Add cast. + (tt_set_mm_blend): No longer check whether requested variation + coincides with a named instance. + (TT_Set_Var_Design): Use current named instance for default + coordinates. + * src/truetype/ttobjs.c (tt_face_init): Use `TT_Set_Named_Instance'. - [cff] Integer overflow. +2017-10-07 Werner Lemberg <wl(a)gnu.org> - Reported as + Make `FT_Set_Named_Instance' work. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2089 + * src/cff/cffdrivr.c (cff_set_instance): New function. + (cff_service_multi_masters): Register it. - * src/cff/cffload.c (cff_blend_doBlend): User OVERFLOW_ADD_INT32. + * src/truetype/ttgxvar.c (TT_Set_Named_Instance): New function. + * src/truetype/ttgxvar.h: Updated. + * src/truetype/ttdriver.c (tt_service_gx_multi_masters): Register + it. -2017-06-04 Werner Lemberg <wl(a)gnu.org> + * src/type1/t1load.c (T1_Reset_MM_Blend): New function. + * src/type1/t1load.h: Updated. + * src/type1/t1driver.c (t1_service_multi_masters): Register it. - [cff, truetype] Integer overflows. +2017-10-07 Werner Lemberg <wl(a)gnu.org> - Reported as + Make `FT_FACE_FLAG_VARIATION' work. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2075 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2088 + * include/freetype/internal/tttypes.h (TT_Face): Remove + `is_default_instance'; this can be replaced with a combination of + `FT_IS_VARIATION' and `FT_IS_INSTANCE'. - * src/cff/cf2font.c (cf2_font_setup): Use OVERFLOW_MUL_INT32. + * src/cff/cffdrivr.c (cff_get_advances): Updated. - * src/truetype/ttinterp.c (Ins_ISECT): Use OVERFLOW_MUL_LONG, - OVERFLOW_ADD_LONG, and OVERFLOW_SUB_LONG. + * src/sfnt/sfdriver.c (sfnt_get_ps_name), src/sfnt/sfobjs.c + (sfnt_init_face): Updated. -2017-06-03 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttdriver.c (tt_get_advances), src/truetype/ttgload.c + (TT_Process_Simple_Glyph, load_truetype_glyph, IS_DEFAULT_INSTANCE), + src/truetype/ttgxvar.c (tt_set_mm_blend): Updated. + * src/truetype/ttgxvar.c (TT_Set_MM_Blend, TT_Set_Var_Design): + Handle `FT_FACE_FLAG_VARIATION'. - [base, cff, truetype] Integer overflows. + * src/type1/t1load.c (T1_Set_MM_Blend, T1_Set_MM_Design): Handle + `FT_FACE_FLAG_VARIATION'. - Reported as +2017-10-07 Werner Lemberg <wl(a)gnu.org> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2060 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2062 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2063 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2068 + New function `FT_Set_Named_Instance'. - * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use - OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. + No effect yet. - * src/cff/cf2blues.c (cf2_blues_capture), src/cff/cf2hints.c - (cf2_hintmap_adjustHints): Use OVERFLOW_SUB_INT32. + * src/base/ftmm.c (FT_Set_Named_Instance): New function. - * src/truetype/ttgload.c (compute_glyph_metrics): User - OVERFLOW_SUB_LONG. + * include/freetype/ftmm.h: Updated. - * src/truetype/ttinterp.c (Direct_Move, Direct_Move_Orig, - Direct_Move_X, Direct_Move_Y, Direct_Move_Orig_X, - Direct_Move_Orig_Y, Move_Zp2_Point, Ins_MSIRP): Use - OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. +2017-10-07 Werner Lemberg <wl(a)gnu.org> -2017-06-03 Werner Lemberg <wl(a)gnu.org> + Add macros for checking whether a font variation is active. - * builds/unix/freetype-config.in: Fix pkg-config test (#51162). + * include/freetype/freetype.h (FT_FACE_FLAG_VARIATION, + FT_IS_VARIATION): New macros. + No effect yet. - Patch directly taken from bug report. +2017-10-07 Werner Lemberg <wl(a)gnu.org> -2017-06-03 Werner Lemberg <wl(a)gnu.org> + Add framework for setting named instance in MM service. - [bdf] Synchronize sanity checks with pcf driver. + * include/freetype/internal/services/svmm.h (FT_Set_Instance_Func): + New function typedef. + (MultiMasters): Add `set_instance' member. + (FT_DEFINE_SERVICE_MULTIMASTERSREC): Updated. - Reported as + * src/cff/cffdrivr.c (cff_service_multi_masters), + src/truetype/ttdriver (tt_service_gx_multi_masters), + src/type1/t1driver.c (t1_service_multi_masters): Updated. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2054 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2058 +2017-10-07 Werner Lemberg <wl(a)gnu.org> - * src/bdf/bdfdrivr.c (BDF_Face_Init): Check font ascent and descent. - Check AVERAGE_WIDTH, POINT_SIZE, PIXEL_SIZE, RESOLUTION_X, and - RESOLUTION_Y properties. + [type1] Minor code shuffling. -2017-06-03 Werner Lemberg <wl(a)gnu.org> + * src/type1/t1load.c (T1_Set_MM_Blend): Make it a wrapper of... + (t1_set_mm_blend): ...this new function. + (T1_Set_MM_Design): Use `t1_set_mm_blend'. - [cff, truetype] Integer overflows. +2017-10-05 Werner Lemberg <wl(a)gnu.org> + + * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Fix integer + overflow. Reported as - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2047 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2057 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3539 - * src/cff/cf2hints.c (cf2_hintmap_map): Use OVERFLOW_SUB_INT32. +2017-10-05 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttinterp.c (Ins_ADD): Use OVERFLOW_ADD_LONG. - (Ins_SUB): Use OVERFLOW_SUB_LONG. - (Ins_NEG): Use NEG_LONG. + Fix compiler warnings. -2017-06-03 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffdrivr.c (cff_ps_get_font_extra): Avoid code that relies + on numeric overflow. + Add cast. - ftcalc.h: Avoid left-shift of negative numbers. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix variable + types, add cast. - Reported as +2017-10-04 John Tytgat <John.Tytgat(a)esko.com> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2055 + [cff] Add support for `FSType'. - * include/freetype/internal/ftcalc.h (INT_TO_F26DOT6, - INT_TO_F2DOT14, INT_TO_FIXED, F2DOT14_TO_FIXED): Use multiplication. + * include/freetype/internal/cfftypes.h (CFF_FontRec): Add + `font_extra' entry. -2017-06-02 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffdrivr.c (cff_ps_get_font_extra): New function to + retrieve FSType info from the embedded PostScript data. + (cff_service_ps_info): Register function. - [cff] Even more integer overflows. + * src/cff/cffload.c (cff_font_done): Free `font_extra'. - Reported as +2017-09-30 Alexei Podtelezhnikov <apodtele(a)gmail.com> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2046 + Signedness fixes in bitmap presetting. - * src/cff/cf2intrp.c (cf2_doStems, cf2_interpT2CharString): Use - OVERFLOW_ADD_INT32. + Reported as -2017-06-02 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3514. - [cff] More integer overflows. + * src/raster/ftrend1.c (ft_raster1_render): Exlicitly signed height. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Ditto. + * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Explicitly unsigned + subtraction. - Reported as +2017-09-29 Alexei Podtelezhnikov <apodtele(a)gmail.com> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2032 + Bitmap metrics presetting [2/2]. - * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. + * src/base/ftobjs.c (FT_Load_Glyph): Preset the bitmap metrics when + appropriate but `FT_Render_Glyph' is not called. + * include/freetype/freetype.h (FT_GlyphSlotRec): Document the change. -2017-06-02 Werner Lemberg <wl(a)gnu.org> +2017-09-28 Alexei Podtelezhnikov <apodtele(a)gmail.com> - [bdf] Don't left-shift negative numbers. + [smooth, raster] Miscellaneous cleanups. - Reported as + * src/raster/ftrend1.c (ft_raster1_render): Clean up the exit. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Reduce + translations and clean up the exit. + (ft_smooth_render_lcd, ft_smooth_render_lcd): Remove unused `error'. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2031 +2017-09-28 Ben Wagner <bungeman(a)google.com> - * src/bdf/bdfdrivr.c (BDF_Face_Init): Use multiplication. + [truetype] Really, really fix #52082. -2017-06-02 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttinterp.c (Ins_MDRP): Correct conditional. - [bdf] Fix integer scanning routines. +2017-09-28 Werner Lemberg <wl(a)gnu.org> - Reported as + * src/psaux/psintrp.c (cf2_doStems): Fix integer overflow. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2029 + Reported as - * src/bdf/bdflib.c (_bdf_atoul, _bdf_atol, _bdf_atous, _bdf_atos): - Stop scanning if result would overflow. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3510 -2017-06-02 Werner Lemberg <wl(a)gnu.org> +2017-09-28 Ewald Hew <ewaldhew(a)gmail.com> - [cff] Fix integer overflows. + * src/cid/cidgload.c (cid_slot_load_glyph): Fix memory leak. Reported as - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2027 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2028 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3489 - * src/cff/cf2hints.c (cf2_hintmap_insertHint), src/cff/cf2intrp.c - (cf2_doFlex): Use OVERFLOW_ADD_INT32 and OVERFLOW_SUB_INT32. +2017-09-28 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-06-01 Werner Lemberg <wl(a)gnu.org> + Bitmap metrics presetting [1/2]. - [smooth] Some 32bit integer overflow run-time errors. + This mainly just extracts the code for presetting the bitmap metrics + from the monochrome, grayscale, and LCD renderers into a separate + function. - * src/smooth/ftgrays.c [STANDALONE] (OVERFLOW_ADD_LONG, - OVERFLOW_SUB_LONG, OVERFLOW_MUL_LONG, NEG_LONG): New macros. - [!STANDALONE]: Include FT_INTERNAL_CALC_H. - (gray_render_cubic): Use those macros where appropriate. + * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): New function that + calculates prospective bitmap metrics for the given rendering mode. + * include/freetype/internal/ftobjs.h (ft_glyphslot_preset_bitmap): + Declare it. -2017-06-01 Werner Lemberg <wl(a)gnu.org> + * src/base/ftlcdfil.c (ft_lcd_padding): New helper function that adds + padding to CBox taking into account pecularities of LCD rendering. + * include/freetype/ftlcdfil.h (ft_lcd_padding): Declare it. - * src/base/ftglyph.c (FT_Get_Glyph): Check `slot->advance'. + * src/raster/ftrend1.c (ft_raster1_render): Reworked to use + `ft_glyphslot_preset_bitmap'. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Ditto. + (ft_smooth_render_lcd, ft_smooth_render_lcd): The pixel_mode setting + is moved to `ft_glyphslot_preset_bitmap'. -2017-06-01 Werner Lemberg <wl(a)gnu.org> +2017-09-28 Ewald Hew <ewaldhew(a)gmail.com> - [psaux] 32bit integer overflow tun-time errors (#46149). + [psaux] Fix compiler warning. - * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Use - OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG where appropriate. + * src/psaux/pshints.c (cf2_hintmap_dump): Add switch for tracing + code. -2017-06-01 Werner Lemberg <wl(a)gnu.org> +2017-09-27 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter again. + * src/sfnt/ttload.c (tt_face_load_font_dir): Fix compiler warning. - Problem reported by Marek Kašík <mkasik(a)redhat.com>. +2017-09-25 Werner Lemberg <wl(a)gnu.org> - The problematic font that exceeds the old limit is Padauk-Bold, - version 3.002, containing bytecode generated by a buggy version of - ttfautohint. + [psaux] Fix compiler warnings. -2017-05-31 Werner Lemberg <wl(a)gnu.org> + * src/psaux/psft.c (cf2_initLocalRegionBuffer): Remove redundant + test. - [cff] 32bit integer overflow run-time errors 2/2 (#46149). + * src/psaux/psintrp.c (cf2_interpT2CharString) + <cf2_escCALLOTHERSUBR>: Add casts. - This commit handles the new engine. + * src/psaux/psobjs.c (ps_decoder_init): Add cast. - * include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT32, - OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, NEG_INT, NEG_LONG, - NEG_INT32): New macros. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/cff/cf2ft.c (cf2_getScaleAndHintFlag): Use OVERFLOW_ADD_INT32. + [psaux] Minor fixes. - * src/cff/cf2hints.c (cf2_getWindingMomentum, cf2_hint_init, - cf2_hintmap_map, cf2_glyphpath_hintPoint, - cf2_glyphpath_computeIntersection, cf2_glyphpath_computeOffset, - cf2_glyphpath_lineTo, cf2_glyphpath_curveTo): Use - OVERFLOW_ADD_INT32, OVERFLOW_SUB_INT32, OVERFLOW_MUL_INT32, and - NEG_INT32 where appropriate. + * include/freetype/internal/psaux.h, src/psaux/psobjs.{c,h}: + Rearrange `ps_builder_init' arguments to conventional order. - * src/cff/cf2intrp.c (cf2_doFlex, cf2_doBlend, - cf2_interpT2CharString): Ditto. - Also add some other code where needed to avoid overflow. + * src/psaux/psft.c (cf2_decoder_parse_charstrings): Add a check and + notice for `SubFont' in Type 1 mode. -2017-05-30 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [cff] 32bit integer overflow run-time errors 1/2 (#46149). + [psaux] Move `psdecode' into `psobjs'. - This commit handles the old engine. + As the former only contains a single procedure, move it into + `psobjs' for simplicity. Also change the parameter order to the + conventional one. - * src/cff/cffgload.c: Include FT_INTERNAL_CALC_H. - (cff_decoder_parse_charstrings): Use OVERFLOW_ADD_LONG and - OVERFLOW_SUB_LONG where needed. + * src/psaux/psdecode.c (ps_decoder_init): Moved to... + * src/psaux/psobjs.c: ...Here. + * src/psaux/psdecode.h, src/psaux/psobjs.h: Ditto. - * src/cff/cffparse.c: Include FT_INTERNAL_CALC_H. - (power_ten_limits): New static array. - (do_fixed): Use it to prevent multiplication overflow. - (cff_parser_run): Use OVERFLOW_ADD_LONG. + * include/freetype/internal/psaux.h (PSAux_ServiceRec): Update + `ps_decoder_init' function signature. -2017-05-30 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffgload.c, src/cid/cidgload.c, src/type1/t1gload.c: + Update calls. - [psaux] Correctly handle sequences of multiple number signs. + * src/psaux/psaux.c, src/psaux/psauxmod.c: Update includes. - * src/psaux/psconv.c (PS_Conv_Strtol, PS_Conv_ToFixed): Return zero - if we encounter more than a single sign. + * src/psaux/Jamfile (_sources), src/psaux/rules.mk (PSAUX_DRV_SRC): + Update file references. -2017-05-29 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [pcf] 32bit integer overflow run-time errors (#46149). + [psaux] Fix Type 1 hinting. - * src/pcf/pcfread.c (pcf_get_accel): Add sanity checks for - `fontAscent' and `fontDescent'. - (pcf_load_font): Add sanity checks for global height. - Add sanity checks for AVERAGE_WIDTH, POINT_SIZE, PIXEL_SIZE, - RESOLUTION_X, and RESOLUTION_Y properties. + Type 1 hinting breaks sometimes when mid-charstring hints should + have been in the initial hintmap. This fix adds a preprocessing + pass that reads all hints and builds the correct initial hintmap + first, before proceeding to build the glyph outline. -2017-05-29 Werner Lemberg <wl(a)gnu.org> + * src/psaux/psintrp.c (cf2_interpT2CharString): New + `initial_map_ready' boolean flag. + Ignore outline commands and hint changes on first pass. + <cf2_cmdENDCHAR>: Add section to build hintmap and rewind. - Handle some integer overflow run-time errors (#46149, #48979). +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - This commit (mainly for 32bit CPUs) is the first of a series of - similar commits to handle known integer overflows. Basically, all - of them are harmless, since they affect rendering of glyphs only, - not posing security threats. It is expected that fuzzying will show - up more overflows, to be fixed in due course. + [psaux] Add tracing for hints. - The idea is to mark places where overflows can occur, using macros - that simply cast to unsigned integers, because overflow arithmetic - is well defined in this case. Doing so suppresses run-time errors - of sanitizers without adding computational overhead. + * src/psaux/pshints.c (cf2_hintmap_dump): New function. + (cf2_hintmap_insertHint): Trace incoming and inserted hints. + (cf2_hintmap_build): Dump hintmap before and after hint adjustment. - * include/freetype/internal/ftcalc.h (OVERFLOW_ADD_INT, - OVERFLOW_SUB_INT, OVERFLOW_MUL_INT, OVERFLOW_ADD_LONG, - OVERFLOW_SUB_LONG, OVERFLOW_MUL_LONG): New macros. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/base/ftcalc.c (FT_RoundFix, FT_CeilFix, FT_Matrix_Multiply, - FT_Matrix_Multiply_Scaled, FT_Vector_Transform_Scaled, - ft_corner_orientation): Use new macros. + [psaux] Minor fixes. - * src/base/ftoutln.c (FT_Outline_Get_Orientation): Use new macros. + * src/psaux/psintrp.c (cf2_interpT2CharString): Fix check for pop + results. + s/font->decoder/decoder/ where necessary. + <cf2_cmdHSTEM, cf2_cmdVSTEM, cf2_escHSTEM3, cf2_escVSTEM3>: Use + offset parameter in `cf2_doStems' instead of doing correction for + left-sidebearing. -2017-05-28 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * include/freetype/internal/ftcalc.h (FLOAT_TO_FIXED): Remove. + [cid] Use the new engine. - This macro is not used. + * src/cid/cidgload.c: Update includes. + (cid_load_glyph, cid_slot_load_glyph): Implement changes to glyph + loading code as with `type1' module. -2017-05-28 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [cff] s/cf2_floatToFixed/cf2_doubleToFixed/. + [cid] Add Adobe engine configuration. - The new name better describes what the macro actually does; - additionally, we don't need a trailing `f' for literals (there was - only a single such instance in the code, but this caused a clang - warning because the macro itself uses `double' literals). + This is similar to what was done in the `type1' module. - * src/cff/cf2blues.c, src/cff/cf2blues.h, src/cff/cf2fixed.h, - src/cff/cf2font.c, src/cff/cf2hints.c: Updated. + * src/cid/cidriver.c (t1cid_driver_class): Update declaration. + * src/cid/cidobjs.c: Include FT_TYPE1_DRIVER_H. + (cid_driver_init): Update code. -2017-05-28 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - Fix negation of INT_MIN and LONG_MIN (#46149). + [psaux] Change subfont synthesis for CID fonts. - * src/base/ftcalc.c (FT_MOVE_SIGN): Add argument to pass unsigned - value, to be used as the result. - (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix, FT_MulFix, - FT_Vector_NormLen): Updated. + Change `t1_make_subfont' to take in the Private dict record as an + argument. This is because Type 1 and CID font records in FreeType + have this in different places. -2017-05-27 Werner Lemberg <wl(a)gnu.org> + * src/psaux/psobjs.c (t1_make_subfont): Change `T1_Face' to + `FT_Face' so that CID is also accepted. + Take `PS_Private' as an argument and let caller figure out where the + Private dict actually is. + Update references. - [truetype] Fix handling of design coordinates (#51127). + * include/freetype/internal/psaux.h, src/psaux/psobjs.h: Update + declaration. - * src/truetype/ttgxvar.c (tt_set_mm_blend): Compute all design - coordinates if we have to create the `blends->coord' array. - (TT_Get_MM_Blend, TT_Get_Var_Design): Select default instance - coordinates if no instance is selected yet. + * src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Update + call. -2017-05-24 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [bdf, pcf] Support ISO646.1991-IRV character encoding (aka ASCII). + [type1] Switch to Adobe engine. - Problem reported by Marek Kašík <mkasik(a)redhat.com>, cf. + * src/type1/t1objs.c (T1_Driver_Init): Set default to Adobe engine. - https://bugzilla.redhat.com/show_bug.cgi?id=1451795 +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c - (PCF_Face_Init): Implement it. + [psaux] Extend Adobe interpreter (seac). -2017-05-20 Nikolaus Waxweiler <madigens(a)gmail.com> + This concludes the changes needed to add Type 1 support. - [truetype] Always use interpreter v35 for B/W rendering (#51051). + * src/psaux/psintrp.c: Update includes. + (cf2_interpT2CharString) <cf2_escSEAC>: Implement this similarly to + implied seac for CFF. - * src/truetype/ttgload.c (tt_loader_init) - [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Adjust - `subpixel_hinting_lean', `grayscale_cleartype', and - `vertical_lcd_lean' accordingly. + * src/psaux/t1decode.c (t1_lookup_glyph_by_stdcharcode_ps): New + function to look up the glyph index. - * src/truetype/ttinterp.c (Ins_GETINFO): Updated. - (TT_RunIns): Update `backward_compatibility' flag. + * src/psaux/psft.c (cf2_getT1SeacComponent, + cf2_freeT1SeacComponent): New functions to get the charstrings for + seac components. -2017-05-20 Alexei Podtelezhnikov <apodtele(a)gmail.com> + * src/psaux/t1decode.h, src/psaux/psft.h: Update declarations. - [smooth] Implement minimal dynamic padding for LCD filtering. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - Extra bitmap padding for LCD filtering depends on the filter. The - default 5-tap filter needs 2 extra subpixels. The light 3-tap filter - needs only 1 extra subpixel. This space could be already available - due to rounding. In order to optimize the padding, we now expand - CBox for the given filter weights before rounding. + [psaux] Extend Adobe interpreter (flex in callothersubr). - This change breaks current Skia (and Firefox). + * src/psaux/psintrp.c (cf2_interpT2CharString) + <cf2_escCALLOTHERSUBR>: Fix Flex feature handling (OtherSubrs 0, 1, + 2). + <cf2_cmdRMOVETO>: Do not actually move the `glyphPath' while doing + flex. This is to avoid closing the current contour. - * include/freetype/internal/ftobjs.h (FT_LibraryRec) - [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Remove `lcd_extra' field. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights, - FT_Library_SetLcdFilter): Remove `lcd_extra' initializations. + [psaux] Extend Adobe interpreter (callothersubr). - * src/smooth/ftsmooth.c (ft_smooth_render_generic): Implement dymanic - LCD padding. + * src/psaux/psintrp.c (cf2_interpT2CharString) + <cf2_escCALLOTHERSUBR>: Copy code from + `t1_decoder_parse_charstrings' (in `t1decode.c'). + OtherSubr 3 (change hints) should reset the hintmask, so that the + new hints are applied. + Fix function calls and stack access. -2017-05-15 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [sfnt] Return proper scaling values for SBIX bitmaps. + [psaux] Extend Adobe interpreter (pop). - Problem reported by Hin-Tak Leung <htl10(a)users.sourceforge.net>. + * src/psaux/psintrp.c (cf2_interpT2CharString): Change how unhandled + OtherSubr results are stored. Implement the PostScript stack using + an array. + <cf2_escPOP>: Ensure that the stack is not cleared after getting + `OtherSubr' results. + Fix stack access. - * src/sfnt/ttsbit.c (tt_face_load_strike_metrics): Implement it. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> -2017-05-15 Werner Lemberg <wl(a)gnu.org> + [psaux] Extend Adobe interpreter (callsubr). - [truetype] Fix error handling for embedded bitmaps. + * src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdCALLSUBR>: + Type 1 mode. - Problem reported by Hin-Tak Leung <htl10(a)users.sourceforge.net>. + * src/psaux/psft.c (cf2_initLocalRegionBuffer): Add Type 1 mode. - * src/truetype/ttgload.c (TT_Load_Glyph) - [TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Handle error if font is not - scalable. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> -2017-05-15 Alexei Podtelezhnikov <apodtele(a)gmail.com> + [psaux] Extend Adobe interpreter (div, four-byte numbers). - [autofit] Make autohint warping NORMAL option. + * src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_escDIV>: Add + Type 1 mode. Type 1 requires large integers to be followed by + `div'; cf. `Adobe Type 1 Font Format', section 6.2. + <op == 255>: Push Type 1 four-byte numbers as `Int' always. This is + to ensure `div' and `callsubr' get values they can use. - This moves warping option from LIGHT to NORMAL mode. This makes LIGHT - truly void of hinting in x-direction, with left side bearing never - changed and right side bearing only altered by advance rounding. - Therefore, LIGHT is now ready to return fractional advance. As a - NORMAL option, warping substitutes normal hinting. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afcjk.c (af_cjk_hints_apply): Updated. - * src/autofit/aflatin.c (af_latin_hints_apply): Updated. - * src/autofit/aflatin2.c (af_latin2_hints_apply): Updated. + [psaux] Extend Adobe interpreter (hints). - * src/autofit/afloader.c (af_loader_load_glyph): Handle warping - phantom points as normal. + * src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdHSTEM, + cf2_cmdVSTEM>: Add correction for left sidebearing in Type 1 mode. + Allow adding hints mid-charstring. + <cf2_escVSTEM3, cf2_escHSTEM3>: Translate into equivalent commands + for three normal stem hints. This requires some recalculation of + stem positions. + Correction for left sidebearing. -2017-05-14 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - Remove remnants of raster pool. + [psaux] Extend Adobe interpreter (hsbw, sbw). - * include/freetype/internal/ftobjs.h (FT_LibraryRec): Remove - `raster_pool' and `raster_pool_size' fields. + * src/psaux/psintrp.c (cf2_doStems): `hsbw' or `sbw' must be the + first operation in a Type 1 charstring. + (cf2_interpT2CharString): Remove unused variables. + <cf2_cmdHMOVETO, cf2_cmdVMOVETO, cf2_cmdRMOVETO>: `hsbw' or `sbw' + must be the first operation in a Type 1 charstring. + <cf2_cmdHSBW, cf2_escSBW>: Fix data access and add correction for + left sidebearing. - * src/base/ftobjs.c (FT_New_Library), src/raster/ftrend1.c - (ft_raster1_init), src/smooth/ftsmooth.c (ft_smooth_init): Updated. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> -2017-05-13 Werner Lemberg <wl(a)gnu.org> + [psaux] Extend Adobe interpreter (setcurrentpoint). - * Version 2.8 released. - ======================= + * src/psaux/psintrp.c (cf2_interpT2CharString) + <cf2_escSETCURRENTPT>: Fix stack access. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - Tag sources with `VER-2-8'. + [psaux] Extend Adobe interpreter (closepath). - * docs/VERSION.TXT: Add entry for version 2.8. - * docs/CHANGES: Updated. + * src/psaux/psintrp.c (cf2_interpT2CharString) <c2f_cmdCLOSEPATH>: + Use the right builder function. We can use the `haveWidth' boolean + already present, instead of implementing `parse_state'. - * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, - builds/windows/vc2005/index.html, - builds/windows/vc2008/freetype.vcproj, - builds/windows/vc2008/index.html, - builds/windows/vc2010/freetype.vcxproj, - builds/windows/vc2010/index.html, - builds/windows/visualc/freetype.dsp, - builds/windows/visualc/freetype.vcproj, - builds/windows/visualc/index.html, - builds/windows/visualce/freetype.dsp, - builds/windows/visualce/freetype.vcproj, - builds/windows/visualce/index.html, - builds/wince/vc2005-ce/freetype.vcproj, - builds/wince/vc2005-ce/index.html, - builds/wince/vc2008-ce/freetype.vcproj, - builds/wince/vc2008-ce/index.html: s/2.7.1/2.8/, s/271/28/. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * include/freetype/freetype.h (FREETYPE_MINOR): Set to 8. - (FREETYPE_PATCH): Set to 0. + [psaux] Add Type 1 operations to Adobe CFF interpreter. - * builds/unix/configure.raw (version_info): Set to 20:0:14. - * CMakeLists.txt (VERSION_MINOR): Set to 8. - (VERSION_PATCH): Set to 0. + The following Type 1 specific ops have been added (copied from + `t1decode'): -2017-05-12 Hin-Tak Leung <htl10(a)users.sourceforge.net> + closepath + vstem3 + hstem3 + seac + sbw + callothersubr + pop + setcurrentpoint + hsbw - Fix `FT_UINT_TO_POINTER' macro for Windows. + The following require a Type 1 mode, because of differences in + specification: - * builds/unix/ftconfig.in, builds/vms/ftconfig.h, - include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER) [_WIN64]: - Fix definition. + hstem + vstem + vmoveto + callsubr + div + rmoveto + hmoveto + Numbers -2017-05-11 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + The subsequent commits will implement these changes and adapt + accesses of data and objects to the new interpreter. - [autofit] Add support for Chakma script. + NOTE: Will not compile in the meantime! - * src/autofit/afblue.dat: Add blue zone data for Chakma. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/psaux/psintrp.c: Add opcodes to enum. + (cf2_interpT2CharString): Copy relevant code over from + `t1_decoder_parse_charstrings' (in `t1decode.c'). - * src/autofit/afscript.h: Add Chakma standard character. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Chakma data. + [type1] Fixes for rendering. -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + The Type 1 advance width calculation passes null for glyph slot, + etc, which can cause null pointer access in the new interpreter. + Fall back to the old one for now. - [autofit] Add support for Kayah Li script. + Fix the large glyph retry code and ensure hinting and scaling flags + are set properly. - * src/autofit/afblue.dat: Add blue zone data for Kayah Li. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Add a + check for metrics_only. + Set the `force_scaling' flag. + (T1_Parse_Glyph): Updated. + (T1_Load_Glyph): Add `hinting' and `scaled' flags. - * src/autofit/afscript.h: Add Kayah Li standard character. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Kayah Li data. + [psaux] Add missing objects (2/2). -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + Synthesize a `SubFont' object for Type 1 fonts. This is used in the + interpreter to access Private dict data, which are stored in + different places for Type 1 and CFF. This allows the same data to + be used in either mode. - [autofit] Add support for Bamum script. + * src/psaux/psobjs.c (t1_make_subfont): New procedure to copy + required values to a dummy `CFF_SubFont' object. This is similar to + `cff_make_private_dict'. + * src/psaux/psobjs.h: Add the new declaration. - * src/autofit/afblue.dat: Add blue zone data for Bamum. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * include/freetype/internal/psaux.h, src/psaux/psauxmod.c: Ditto. + Add this to the PSAux Service for future use with CID fonts. - * src/autofit/afscript.h: Add Bamum standard character. + * src/type1/t1gload.c: Include FT_INTERNAL_CFF_TYPES_H. + (T1_Parse_Glyph_And_Get_Char_String): Add the call. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Bamum data. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [psaux] Add missing objects for Type 1 (1/2). - [autofit] Add support for Saurashtra script. + Move `CF2_Font' instance to `PS_Decoder'. This is the context for + the interpreter and since it is currently stored in `CFF_Font', is + unavailable in Type 1 mode. - * src/autofit/afblue.dat: Add blue zone data for Saurashtra. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * include/freetype/internal/psaux.h (T1_Decoder, PS_Decoder): New + `cf2_instance' field. - * src/autofit/afscript.h: Add Saurashtra standard character. + * src/psaux/psdecode.c (ps_decoder_init): Copy `cf2_instance' to + `PS_Decoder'. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Saurashtra - data. + * src/psaux/t1decode.c (t1_decoder_done): Add finalization code. -2017-05-10 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + * src/psaux/psft.c (cf2_decoder_parse_charstrings): Update accesses. - [autofit] Add support for Buhid script. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afblue.dat: Add blue zone data for Buhid. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + Allow `type1' module to use the Adobe engine. - * src/autofit/afscript.h: Add Buhid standard character. + Add the callback and some conditionals to switch between the two + engines. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Buhid data. + * include/freetype/internal/psaux.h (T1_Decoder_FuncsRec): Change + function declarations. + * src/psaux/psauxmod.c (T1_Decoder_FuncsRec): Register the + callbacks. -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + * src/psaux/psobjs.c (ps_builder_add_point): Add conditionals for + number conversion. - [autofit] Add support for Shavian script. + * src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Add code + to choose which renderer to use. - * src/autofit/afblue.dat: Add blue zone data for Shavian. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/cid/cidgload.c (cid_load_glyph): Update call. + * src/base/ftobjs.c, src/psaux/psobjs.c, src/type1/t1gload.c: Update + includes. - * src/autofit/afscript.h: Add Shavian standard character. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Shavian data. + [type1] Add Adobe engine configuration. -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + Use the previously changed PS_Driver in type1 module to store + hinting engine configuration. - [autofit] Add support for Vai script. + * include/freetype/ftt1drv.h: New file. + Duplicate and rename config options from CFF. + * include/freetype/config/ftheader.h (FT_TYPE1_DRIVER_H): New macro. - * src/autofit/afblue.dat: Add blue zone data for Vai. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/type1/t1driver.c (t1_driver_class): Update declaration. + * src/type1/t1objs.c: Include FT_TYPE1_DRIVER_H. + (T1_Driver_Init): Update code. - * src/autofit/afscript.h: Add Vai standard character. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Vai data. + [cff] Move and rename `CFF_Driver'. -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + This is so that we can use the same hinting engine parameters for + Type 1. - [autofit] Add support for Osmanya script. + * include/freetype/internal/cffotypes.h (CFF_Driver): Rename and + move to... + * include/freetype/internal/psaux.h (PS_Driver): ...here. - * src/autofit/afblue.dat: Add blue zone data for Osmanya. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/cff/cffdrivr.c, src/cff/cffgload.c, src/cff/cffload.c, + src/cff/cffobjs.c, src/cff/cffobjs.h, src/psaux/psft.c, + src/psaux/psobjs.c: Update references. - * src/autofit/afscript.h: Add Osmanya standard character. +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Osmanya data. + [psaux, type1] Reorganize object fields. -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + Make some fields more generic, so that we can access them the same + way regardless of Type 1 or CFF. - [autofit] Add support for Coptic script. + * include/freetype/internal/psaux.h (PS_Builder): Change `TT_Face' + to `FT_Face'. + Remove unused fields. - * src/autofit/afblue.dat: Add blue zone data for Coptic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/psaux/psft.c: Update all accesses of `PS_Builder.face'. + Add some asserts to guard against casting `T1_Face' as `TT_Face'. - * src/autofit/afscript.h: Add Coptic standard character. + * src/type1/t1objs.h (T1_GlyphSlot): Reorder fields to follow + `CFF_GlyphSlot', so that we can pretend they are the same in the + interpreter. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Coptic data. + * src/psaux/psobjs.c (ps_builder_init, ps_builder_add_point): + Updated with above changes. -2017-05-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [autofit] Add support for Carian script. + [psaux] Prepare for Type 1 mode. - * src/autofit/afblue.dat: Add blue zone data for Carian. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + Add some checks for Type 1 data passing through. - * src/autofit/afscript.h: Add Carian standard character. + * src/psaux/psfont.h (CF2_Font): Add `isT1' flag. + * src/psaux/psfont.c (cf2_font_setup): Skip the variations and blend + code which is not applicable for Type 1. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Carian data. + * src/psaux/psft.c (cf2_decoder_parse_charstrings): Avoid accessing + `decoder->cff' in Type 1 mode. + Copy `is_t1' flag to `CF2_Font'. -2017-05-07 Werner Lemberg <wl(a)gnu.org> +2017-09-25 Ewald Hew <ewaldhew(a)gmail.com> - [truetype] Add tricky font `DFGirl-W6-WIN-BF' (from Dynalab). + [psaux, cff] Use the new objects. - Reported by Roy Tam <roytam(a)gmail.com>. + * include/freetype/internal/psaux.h, src/psaux/psauxmod.c: Fix + switching between new and old engines. - * src/truetype/ttobjs.c (tt_check_trickyness_family): Implement it. + * src/cff/cffgload.c, src/cff/cffparse.c: Update calls. -2017-05-07 Roy Tam <roytam(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> + * src/psaux/psblues.c, src/psaux/psfont.c, src/psaux/psfont.h, + src/psaux/psft.c, src/psaux/psft.h, src/psaux/psintrp.c: Update all + to use new objects. - [truetype] More tricky fonts (mainly from Dynalab). +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - * src/truetype/ttobjs.c (tt_check_trickyness_family, - tt_check_trickyness_sfnt_ids): Add them. + [psaux] Objects for new interpreter (part 2). -2017-05-07 Werner Lemberg <wl(a)gnu.org> + Make the new objects copy over values. They are essentially wrapper + types for the different decoders/builders. - [truetype] Add tricky font `DLCHayMedium' (from Dynalab). + * include/freetype/internal/psaux.h: Update declarations. + (PS_Builder): Add `is_t1' flag. + (PS_Decoder_{Get,Free}_Glyph_Callback): Renamed to... + (CFF_Decoder_{Get,Free}_Glyph_Callback: ... this. + (PS_Decoder): Updated. + Add `t1_parse_callback' member. + (PSAux_ServiceRec): Add `ps_decoder_init' member. - Reported by Roy Tam <roytam(a)gmail.com>. + * src/psaux/psdecode.h, src/psaux/psobjs.h: Update declarations. - * src/truetype/ttobjs.c (tt_check_trickyness_family): Implement it. + * src/psaux/psdecode.c, src/psaux/psobjs.c: Implement copy with two + modes. -2017-05-03 Werner Lemberg <wl(a)gnu.org> + * src/psaux/psauxmod.c: Add builder and decoder functions to `PSAux' + service. - */*: s/backwards compatibility/backward compatibility/. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> -2017-05-03 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [psaux] Add objects for new interpreter. - [autofit] Add support for Unified Canadian Syllabics script. + Introduce `PS_Decoder' and `PS_Builder' which include all fields + from either Type 1 or CFF decoders/builders. - * src/autofit/afblue.dat: Add blue zone data for Unified Canadian - Syllabics. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * include/freetype/internal/psaux.h (PS_Builder, PS_Decoder): New + structs. - * src/autofit/afscript.h: Add Unified Canadian Syllabics standard - character. + * src/psaux/psobjs.c, src/psaux/psobjs.h: Add `PS_Builder' + functions. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Unified - Canadian Syllabics data. + * src/psaux/psdecode.c, src/psaux/psdecode.h: New files to hold + `PS_Decoder' initialization functions. -2017-05-03 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org> + * src/psaux/psaux.c, src/psaux/Jamfile (_sources), + src/psaux/rules.mk (PSAUX_DRV_SRC): Updated. - [autofit] Add blue-zone support for Sundanese script. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - This essentially moves the Sundanese script from the `Indic' hinter - to the `Latin' hinter. + [psaux] Rename files. - * src/autofit/afblue.dat: Add blue zone data for Sundanese. + Replace the `cf2' file name prefix with `ps' as the Adobe engine + will be used for both PostScript Types 1 and 2 (CFF) instead of just + CFF. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + s/cf2/ps/ for all following. - * src/autofit/afscript.h: Add Sundanese standard character and move - data out of AF_CONFIG_OPTION_INDIC block. + * src/psaux/cf2*: Rename files. + * src/psaux/*: Update includes. - * src/autofit/afranges.c: Move Sundanese data out of - AF_CONFIG_OPTION_INDIC block. + * src/psaux/Jamfile (_sources), src/psaux/rules.mk (PSAUX_DRC_SRC, + PSAUX_DRV_H): Update file references. - * src/autofit/afstyles.h: Update Sundanese data; in particular, use - AF_WRITING_SYSTEM_LATIN. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> -2017-05-03 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [psaux] Minor fix. - [autofit] Add support for Avestan script. + Use `MultiMasters' service in `psaux' instead of a call to `cff'. + The project builds if CFF_CONFIG_OPTION_OLD_ENGINE is not defined. - * src/autofit/afblue.dat: Add blue zone data for Avestan. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/psaux/cf2ft.c: Update includes. + (cf2_getNormalizedVector): Use `mm->get_var_blend' instead of + `cff_get_var_blend'. - * src/autofit/afscript.h: Add Avestan standard character. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Avestan data. + [psaux, cff] Move `cff_random' into `psaux' service. -2017-05-02 Behdad Esfahbod <behdad(a)behdad.org> + NOTE: Does not compile! - [truetype] Make `IUP' gvar deltas do the same as Apple (#50832). + Minor fix to allow both `cff' and `psaux' to use `cff_random'. - When points are not touched by gvar interpolation deltas, FreeType - gave a slightly different result than Apple's CoreText. + * src/cff/cffload.c (cff_random): Move to... + * src/psaux/psobjs.c: Here. + * src/cff/cffload.h: Move corresponding declaration to + `src/psaux/psobjs.h'. - The OpenType working group will update the specification to document - the following behaviour: If the two points with deltas to the `left' - and `right' of the untouched point have the same coordinate, then - the inferred delta for the untouched point should be zero. + * include/freetype/internal/psaux.h (PSAux_ServiceRec): Register the + function here... + * src/psaux/psauxmod.c: And here. - * src/truetype/ttgxvar.c (tt_delta_interpolate): Implement new - behaviour. + * src/cff/cffload.c, src/psaux/cf2intrp.c: Update code. -2017-05-02 Werner Lemberg <wl(a)gnu.org> +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - [autofit] Remove `slight' auto-hint mode again. + [cff] Move struct declarations to `freetype/internal'. - A poll on freetype-devel favoured changes directly applied to - `light'. + NOTE: Does not compile! - * include/freetype/freetype.h (FT_LOAD_TARGET_SLIGHT, - FT_RENDER_MODE_SLIGHT): Removed. + This is so that the CFF functions moved to `psaux' can access the + same structs that they need. - * src/autofit/afcjk.c (af_cjk_hints_init), src/autofit/aflatin.c - (af_latin_hints_init), src/autofit/aflatin2.c - (af_latin2_hints_init): Revert change from 2017-04-22. + * src/cff/cfftypes.h: Moved to... + * include/freetype/internal/cfftypes.h: ...Here. - * src/autofit/afloader.c (af_loader_load_glyph) Remove references to - FT_RENDER_MODE_SLIGHT. - [AF_CONFIG_OPTION_TT_SIZE_METRICS]: Enable TrueType-like metrics - unconditionally. + * src/cff/cffobjs.h: Moved the struct declarations to... + * include/freetype/internal/cffotypes.h: ... this new file. - * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Revert change from - 2017-04-22. + * include/freetype/internal/internal.h (FT_INTERNAL_CFF_TYPES_H, + FT_INTERNAL_CFF_OBJECT_TYPES_H): New macros. - * src/base/ftobjs.c (FT_Load_Glyph): Revert change from 2017-04-22. + * src/cff/cffcmap.h, src/cff/cffdrivr.c, src/cff/cffgload.c, + src/cff/cffgload.h, src/cff/cffload.h, src/cff/cffobjs.c, + src/cff/cffobjs.h, src/cff/cffparse.h, src/psaux/psobjs.h, + include/freetype/internal/psaux.h, + include/freetype/internal/services/svcfftl.h: Update includes. - * src/pshinter/pshalgo.c (ps_hints_apply): Revert change from - 2017-04-22. + * src/cff/rules.mk (CFF_DRV_H): Updated. - * src/smooth/ftsmooth.c (ft_smooth_render): Revert change from - 2017-04-22. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - * docs/CHANGES: Updated. + [psaux, cff] Add new service for inter-module calls. -2017-04-30 Werner Lemberg <wl(a)gnu.org> + NOTE: Does not compile! - [autofit] Fix metrics computation. + This is to allow CFF functions moved to `psaux' to call functions + declared in `src/cff/cffload.h'. - Problem reported by Markus Trippelsdorf <markus(a)trippelsdorf.de> and - Nikolaus Waxweiler <madigens(a)gmail.com>. + * include/freetype/internal/services/svcfftl.h: New file, setting up + a `CFFLoad' service. - * src/base/ftobjs.c (FT_Request_Size): Trigger recomputation of - auto-hinter metrics. Without this change, multiple size changing - calls for a single face fail. + * include/freetype/internal/ftserv.h (FT_DEFINE_SERVICEDESCREC10, + FT_DEFINE_SERVICEDESCREC): New macros. + (FT_SERVICE_CFF_TABLE_LOAD_H): New macro. -2017-04-29 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffdrivr.c, src/cff/cffpic.h: Register the new service. - * src/truetype/ttdriver.c (tt_size_request): Properly check `error'. + * src/cff/cfftypes.h (CFF_FontRec), src/psaux/cf2font.h + (CF2_FontRec): Add service interface. - Reported by Earnestly <zibeon(a)googlemail.com> in + * src/cff/cffobjs.c, src/psaux/cf2font.c, src/psaux/cf2ft.c, + src/psaux/cf2intrp.c, src/psaux/cffdecode.c: Use the new service. - http://lists.nongnu.org/archive/html/freetype/2017-04/msg00031.html +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> -2017-04-27 Werner Lemberg <wl(a)gnu.org> + [psaux, cff] Add callbacks for inter-module calls. - Introduce AF_CONFIG_OPTION_TT_SIZE_METRICS configuration option. + NOTE: Does not compile! - * include/freetype/config/ftoption.h - (AF_CONFIG_OPTION_TT_SIZE_METRICS): New option, commented out by - default. + * include/freetype/internal/psaux.h: Add function pointer + declarations. - * src/autofit/afloader.c (af_loader_load_glyph): Use - AF_CONFIG_OPTION_TT_SIZE_METRICS to guard the corresponding code. + * src/psaux/cffdecode.c (cff_decoder_init): Update to take in + callbacks. + * src/psaux/cffdecode.h: Ditto. -2017-04-26 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffgload.c (cff_compute_max_advance, cff_slot_load): + Update calls to pass in callbacks. + * src/psaux/cf2ft.c, src/psaux/cffdecode.c: Use them. - * include/freetype/freetype.h (FT_Render_Mode): Fix order. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - This retains backward compatibility. + [psaux, cff] Create new `PSAux' service interface entries. - Noted by Alexei. + NOTE: Does not compile! -2017-04-22 Werner Lemberg <wl(a)gnu.org> + * include/freetype/internal/psaux.h: Include + FT_INTERNAL_TRUETYPE_TYPES_H. + (CFF_Builder_FuncsRec, CFF_Decocer_FuncsRec): New function tables. + (CFF_Builder): Updated. + Fix for forward declaration. + (PSAux_ServiceRec): New field `cff_decoder_funcs'. - [truetype] Do linear scaling for FT_LOAD_NO_HINTING (#50470). + * src/psaux/psauxmod.c (cff_builder_funcs, cff_decoder_funcs): New + function tables. + (PSAux_Interface): Updated. - * src/truetype/ttobjs.h (TT_SizeRec): Add field `hinted_metrics' to - hold hinted metrics. - Make `metrics' a pointer so that `tt_glyph_load' can easily switch - between metrics. + * include/freetype/internal/tttypes.h (TT_FaceRec): Add `psaux' + service interface. - * src/truetype/ttdriver.c (tt_size_request): Updated. - (tt_glyph_load): Use top-level metrics if FT_LOAD_NO_HINTING is - used. + * src/cff/cffgload.c, src/cff/cffobjs.c, src/cff/cffparse.c: Update + function calls to use psaux service. - * src/truetype/ttgload.c (TT_Hint_Glyph, TT_Process_Simple_Glyph, - TT_Process_Composite_Component, load_truetype_glyph, - compute_glyph_metrics, TT_Load_Glyph): Updated. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - * src/truetype/ttinterp.c (TT_Load_Context): Updated. + [psaux, cff] Move CFF builder components into `psaux' module. - * src/truetype/ttobjs.c (tt_size_reset): Updated. + NOTE: Does not compile! - * src/truetype/ttsubpix.c (sph_set_tweaks): Updated. + * src/cff/cffgload.c + (cff_builder_{init,done,add_point,add_point1,add_contour,start_point,close_contour}, + cff_check_points): Move to... + * src/psaux/psobjs.c: Here. -2017-04-22 Werner Lemberg <wl(a)gnu.org> + * src/cff/cffgload.h: Move corresponding declarations to + `src/psaux/psobjs.h'. - Add new `slight' auto-hinting mode. + * src/cff/cffgload.h (CFF_Builder): Move struct declaration to... + * include/freetype/internal/psaux.h: Here. - This mode uses fractional advance widths and doesn't scale glyphs - horizontally, only applying vertical scaling and hinting. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - At the same time, the behaviour of the `light' auto-hinter gets - restored for backward compatibility: Both vertical and horizontal - scaling is again based on rounded metrics values (this was changed - in a commit from 2017-03-30 as a side effect). To be more precise, - the behaviour is restored for TrueType fonts only; for other font - formats like Type 1, this is a new feature of the `light' hinting - mode. + [psaux, cff] Move CFF decoder components into `psaux' module. - * include/freetype/freetype.h (FT_LOAD_TARGET_SLIGHT): New macro. - (FT_RENDER_MODE_SLIGHT): New render mode. + NOTE: Does not compile! - * include/freetype/internal/ftobjs.h (FT_Size_InternalRec): Add - `autohint_mode' and `autohint_metrics' fields. + * src/cff/cffgload.c (CFF_Operator, + CFF_COUNT_{CHECK_WIDTH,EXACT,CLEAR_STACK}, cff_argument_counts, + cff_operator_seac, cff_compute_bias, + cff_lookup_glyph_by_stdcharcode, + cff_decoder_{parse_charstrings,init,prepare}): Move to... + * src/psaux/cffdecode.c: This new file. - * src/autofit/afcjk.c (af_cjk_hints_init), src/autofit/aflatin.c - (af_latin_hints_init), src/autofit/aflatin2 (af_latin2_hints_init): - Updated. + * src/cff/cffgload.h: Move corresponding declarations to... + * src/psaux/cffdecode.h: This new file. - * src/autofit/afloader.c (af_loader_embolden_glyph_in_slot): Use - `autohint_metrics'. - (af_loader_load_glyph): s/internal/slot_internal/. - Initialize `autohint_metrics' and `autohint_mode' depending on - current auto-hint mode. - Use `autohint_metrics'. - Updated. + * src/cff/cffgload.h (CFF_MAX_{OPERANDS,SUBRS_CALLS,TRANS_ELEMENTS}, + CFF_Decoder_Zone, CFF_Decoder): Move declarations to... + * include/freetype/internal/psaux.h: Here. - * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Updated. + * src/psaux/cf2ft.h: Update include. - * src/base/ftobjs.c (FT_Load_Glyph): Updated. - (FT_New_Size): Allocate `internal' object. + * src/psaux/psaux.c, src/psaux/rules.mk (PSAUX_DRV_SRC): Update with + the new file. - * src/pshinter/pshalgo.c (ps_hints_apply): Updated. +2017-09-24 Ewald Hew <ewaldhew(a)gmail.com> - * src/smooth/ftsmooth.c (ft_smooth_render): Updated. + [psaux, cff] Move Adobe's engine components into `psaux' module. -2017-04-22 Werner Lemberg <wl(a)gnu.org> + This is the first patch of a sequence to move the Type 2 charstring + processing capability from the `cff' module to the `psaux' module. - Introduce `FT_Size_InternalRec' structure. + NOTE: Does not compile! - We are going to extend this later on. + * src/cff/cf2*: Move these files to... + * src/psaux/cf2*: Here. - * include/freetype/internal/ftobjs.h (FT_Size_InternalRec): New - structure with a single field `module_data'. + * src/cff/Jamfile (_sources), src/cff/rules.mk (CFF_DRV_SRC, + CFF_DRV_H), src/cff/cff.c, src/cff/cffgload.c: Remove file + references. - * src/base/ftobjs.c (FT_New_Size): Allocate `internal' field of - `FT_Size' structure. + * src/psaux/Jamfile (_sources), src/psaux/rules.mk, src/psaux/psaux.c + (PSAUX_DRV_SRC, PSAUX_DRV_H): Add file references. - * src/cff/cffgload.c (cff_builder_init, cff_decoder_prepare): Use - `size->internal->module_data' instead of `size->internal'. +2017-09-24 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/cff/cffobjs.c (cff_size_done): Deallocate `module_data'. - (cff_size_init, cff_size_select, cff_size_request): Use - `size->internal->module_data' instead of `size->internal'. + Tweak per-face LCD filtering controls. - * src/cif/cidobjs.c (cid_size_done, cid_size_init, - cid_size_request): Use `size->internal->module_data' instead of - `size->internal'. + Thing are simpler with a NULL-function pointer. - * src/psaux/psobjs.c (t1_builder_ini): Use - `size->internal->module_data' instead of `size->internal'. + * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): New + pointer to the filter function. + (FT_LibraryRec): Remove unused `lcd_filter'. + (FT_Bitmap_LcdFilterFunc, ft_lcd_filter_fir): Move from here... + * include/freetype/ftlcdfil.h (FT_Bitmap_LcdFilterFunc, + ft_lcd_filter_fir): ... to here. - * src/type1/t1objs.c (T1_Size_Done, T1_Size_Init, T1_Size_Request): - Use `size->internal->module_data' instead of `size->internal'. + * src/base/ftobjs.c (ft_open_face_internal): NULL-initialize the + per-face filter. + (FT_Face_Properties): Set it. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Simplify. -2017-04-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> + * src/base/ftlcdfil.c (ft_lcd_filter_fir, FT_Libary_SetLcdFilter): + Minor. - * src/smooth/ftsmooth.h: Remove unused guards and declaration. +2017-09-24 Jonathan Kew <jfkthame(a)gmail.com> -2017-04-16 Hin-Tak Leung <htl10(a)users.sourceforge.net> + [sfnt] Fix `premultiply_data' (#52092). - Fix tracing messages. + * src/sfnt/pngshim.c (premultiply_data): Don't use vector extension + if we have less than 16 bytes of data. - * src/base/ftobjs.c (FT_Face_GetCharVariantIndex, - FT_Face_GetCharVariantIsDefault, FT_Face_GetVariantsOfChar): Print - correct function name. +2017-09-24 Werner Lemberg <wl(a)gnu.org> -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [otvalid] Fix handling of ValueRecords. - [autofit] Add support for Old Turkic script. + For GPOS pair positioning format 1 the description of ValueRecords + in the OpenType specification (1.8.2, from today) is wrong – the + offset has to be taken from the parent structure; in this case the + `PairSet' table. - * src/autofit/afblue.dat: Add blue zone data for Old Turkic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/otvalid/otvgpos.c (otv_PairSet_validate): Set `extra3'. + (otv_PairPos_validate): Adjust. - * src/autofit/afscript.h: Add Old Turkic standard characters. +2017-09-23 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Old Turkic data. + [otvalid] Handle `GSUB' and `GPOS' v1.1 tables. -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + * src/otvalid/otvgsub.c (otv_GSUB_validate), src/otvalid/otvgpos.c + (otv_GPOS_validate): Implement it. - [autofit] Add support for Gothic script. +2017-09-23 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afblue.dat: Add blue zone data for Gothic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + [otvalid] Update common table handling to OpenType 1.8.2. - * src/autofit/afscript.h: Add Gothic standard characters. + * src/otvalid/otvcommn.c (otv_Device_validate): Handle + VariationIndex subtable. + (otv_Lookup_validate): Handle MarkFilteringSet. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Gothic data. +2017-09-23 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [build] Windows-style DLL versioning. - [autofit] Add support for Cypriot script. + * build/windows/ftver.rc: New VERSIONINFO resource. + * build/windows/vc2010/freetype.vcxproj: Further improvements. - * src/autofit/afblue.dat: Add blue zone data for Cypriot. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. +2017-09-23 Ben Wagner <bungeman(a)google.com> - * src/autofit/afscript.h: Add Cypriot standard characters. + [truetype] Really fix #52082. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Cypriot data. + * src/truetype/ttinterp.c (Ins_MDRP): Correct conditional. -2017-04-08 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org +2017-09-23 Werner Lemberg <wl(a)gnu.org> - [autofit] Add support for Deseret script. + [otvalid] Handle `GDEF' v1.2 and v1.3 tables. - * src/autofit/afblue.dat: Add blue zone data for Deseret. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + No validation of variation stuff yet. - * src/autofit/afscript.h: Add Deseret standard characters. + * src/otvalid/otvgdef.c (otv_MarkGlyphSets_validate): New function. + (otv_GDEF_validate): Implement it. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Deseret data. +2017-09-22 Werner Lemberg <wl(a)gnu.org> -2017-04-07 Werner Lemberg <wl(a)gnu.org> + [otvalid] Handle `BASE' v1.1 table. - [autofit] Fix invalid character range description (#50745). + No validation of variation stuff yet. - Also reported as + * src/otvalid/otvbase.c (otv_BASE_validate): Implement it. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1034 +2017-09-22 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afranges.c (af_glag_nonbase_uniranges): Fix typo in - recent commit. + [otvalid] Macros for 32bit offset support. -2017-04-07 Werner Lemberg <wl(a)gnu.org> + * src/otvalid/otvcommn.h (OTV_OPTIONAL_TABLE32, + OTV_OPTIONAL_OFFSET32, OTV_SIZE_CHECK32): New macros. - [ftfuzzer] Fix clang warnings. +2017-09-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/tools/ftfuzzer/ftfuzzer.cc (LLVMFuzzerTestOneInput): Add - casts. + [build] Simplify Visual C++ 2010 project. -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + * build/windows/vc2010/freetype.vcxproj: Remove fake singlethreaded + configurations and tweak. - [autofit] Add support for Lisu script. +2017-09-21 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afblue.dat: Add blue zone data for Lisu. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + [truetype] Integer overflow (#52082). - * src/autofit/afscript.h: Add Lisu standard characters. + * src/truetype/ttinterp.c (Ins_MDRP): Avoid FT_ABS. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Lisu data. +2017-09-21 Werner Lemberg <wl(a)gnu.org> -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [sfnt] Fix postscript name for default instance of variation fonts. - [autofit] Add support for Osage script. + Problem reported by Behdad. - * src/autofit/afblue.dat: Add blue zone data for Osage. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * src/sfnt/sfdriver.c (sfnt_get_ps_name): Test + `is_default_instance'. - * src/autofit/afscript.h: Add Osage standard characters. +2017-09-21 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Osage data. + [truetype] Fix `mmvar' array pointers, part 2. -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + The previous commit was incomplete. - [autofit] Add support for Glagolitic script. + * src/truetype/ttgxvar.c: Properly initialize sub-array offsets for + `master' also. - * src/autofit/afblue.dat: Add blue zone data for Glagolitic. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. +2017-09-21 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afscript.h: Add Glagolitic standard characters. + [truetype] Fix `mmvar' array pointers. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Glagolitic data. + Without this change, clang's AddressSanitizer reports many runtime + errors due to misaligned addresses. -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Use multiples of pointer + size for sub-array offsets into `mmvar'. - [autofit] Add support for Tai Viet script. +2017-09-20 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afblue.dat: Add blue zone data for Tai Viet. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + [truetype] Integer overflows. - * src/autofit/afscript.h: Add Tai Viet standard characters. + Changes triggered by - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Tai Viet data. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3429 -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + * src/truetype/ttinterp.c (Ins_SHPIX, Ins_DELTAP): Use NEG_LONG. + (Ins_MIAP): Use SUB_LONG. - [autofit] Add support for Tifinagh script. +2017-09-19 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/autofit/afblue.dat: Add blue zone data for Tifinagh. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + [build] Fix DLL builds in Visual C++ project. - * src/autofit/afscript.h: Add Tifinagh standard characters. + * build/windows/vc2010/freetype.vcxproj: Use DynamicLibrary in Debug + and Release configurations. + * include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF) + [_DLL]: Use Visual C++ extensions. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Tifinagh data. +2017-09-19 John Tytgat <John.Tytgat(a)esko.com> -2017-04-06 Sascha Brawer <sascha(a)google.com> - Werner Lemberg <wl(a)gnu.org + [cff] Fix family name logic of pure CFF fontdata (#52056). - [autofit] Add support for N'Ko script. + 1. If `FamilyName' is present in the CFF font, use this for + FT_Face's `family_name'. + 2. Otherwise, use the face name and chop off any subset prefix. + 3. If at this point FT_Face's `family_name' is set, use this + together with the full name to determine the style. + 4. Otherwise, use `CIDFontName' as FT_Face's `family_name'. + 5. If we don't have a valid style, use "Regular". - * src/autofit/afblue.dat: Add blue zone data for N'Ko. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + Previously, FT_Face's `family_name' entry for pure CFF fontdata + nearly always was the fontname itself, instead of the `FamilyName' + entry in the CFF font (assuming there is one). - * src/autofit/afscript.h: Add N'Ko standard characters. + * src/cff/cffobjs.c (cff_face_init) [pure_cff]: Implement it. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add N'Ko data. +2017-09-18 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-04-06 Sascha Brawer <sascha(a)google.com> + [build] Declutter Visual C++ 2010-2017 project. - [autofit] Add support for Adlam script. + * build/windows/vc2010/freetype.vcxproj: Use MaxSpeed (/02) + optimization for Release configuration throughout the project. - * src/autofit/afblue.dat: Add blue zone data for Adlam. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. +2017-09-16 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afscript.h: Add Adlam standard characters. + * Version 2.8.1 released. + ========================= - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Adlam data. -2017-04-06 Sascha Brawer <sascha(a)google.com> + Tag sources with `VER-2-8-1'. - [autofit] Add support for Ol Chiki script. + * docs/VERSION.TXT: Add entry for version 2.8.1. + * docs/CHANGES: Updated. - * src/autofit/afblue.dat: Add blue zone data for Ol Chiki. - * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.8/2.8.1/, s/28/281/. - * src/autofit/afscript.h: Add Ol Chiki standard character. + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. - * src/autofit/afranges.c, src/autofit/afstyles.h: Add Ol Chiki data. + * builds/unix/configure.raw (version_info): Set to 21:0:15. + * CMakeLists.txt (VERSION_PATCH): Set to 1. -2017-04-03 Werner Lemberg <wl(a)gnu.org> +2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - [truetype] Avoid reexecution of `fpgm' and `prep' in case of error. + [sfnt] lowest gcc for vectors (e1d0249e) is changed to 4.7. - Reported as + __builtin_shuffle() was introduced in gcc-4.7. The lowest + gcc to enable vector operation is delayed from 4.6 to 4.7. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=981 + * src/sfnt/pngshim.c (premultiply_data): Fix cpp-macro to + enable the vector operation, to change the lowest gcc version + from 4.6 to 4.7. - * include/freetype/fterrdef.h (FT_Err_DEF_In_Glyf_Bytecode): New - error code. +2017-09-13 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - * src/truetype/ttinterp.c (Ins_FDEF, Ins_IDEF): Prohibit execution - of these two opcodes in `glyf' bytecode. - (TT_RunIns): Don't enforce reexecution of `fpgm' and `prep' bytecode - in case of error since function tables can no longer be modified - (due to the changes in `Ins_FDEF' and `Ins_IDEF'). This change can - enormously speed up handling of broken fonts. + [cache] Fix a possible overflow by signed integer comparison. -2017-04-02 Alexei Podtelezhnikov <apodtele(a)gmail.com> + Improve the code by 5d3ff05615dda6d1325ed612381a17a0df04c975 , + issues are found by Behdad Esfahbod and Werner Lemberg. - [autofit] Disable metrics adjustment for `FT_LOAD_TARGET_LCD'. + * src/cache/ftcbasic.c (FTC_ImageCache_Lookup): Replace + a subtraction to check higher bit by a bit operation, + and cpp-conditionalize for appropriate systems. Add better + documentation to the comment. + (FTC_ImageCache_LookupScaler): Ditto. + (FTC_SBitCache_Lookup): Ditto. + (FTC_SBitCache_LookupScaler): Ditto. - * src/autofit/aflatin.c (af_latin_hints_init): Updated. - * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto. +2017-09-13 Werner Lemberg <wl(a)gnu.org> -2017-04-01 Werner Lemberg <wl(a)gnu.org> + [autofit] Really fix #41334 (#52000). - * src/truetype/ttgload.c: Include FT_CONFIG_CONFIG_H. + * src/autofit/aflatin.c (af_latin_hints_compute_segments): Set + `segment->delta' everywhere. - Otherwise FT_UINT_TO_POINTER might not be defined. +2017-09-12 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - Problem reported by Alexei. + [autofit, sfnt] Fix for `make multi'. -2017-03-31 Alexei Podtelezhnikov <apodtele(a)gmail.com> + * src/autofit/afshaper.c: Include FT_ADVANCE_H, to use + FT_Get_Advance() in it. + * src/sfnt/ttcmap.c: Include FT_SERVICE_POSTSCRIPT_CMAPS_H + to use PS_Unicodes in it, also include `ttpost.h' to use + tt_face_get_ps_name() in it. - [autofit] Disable stem adjustment for `FT_LOAD_TARGET_LCD'. +2017-09-11 Azzuro <azzuro(a)team-mediaportal.com> - * include/freetype/freetype.h (FT_LOAD_TARGET_LCD): Document it. - * src/autofit/afcjk.c (af_cjk_hints_init): Updated. - * src/autofit/aflatin.c (af_latin_hints_init): Ditto. - * src/autofit/aflatin2.c (af_latin2_hints_init): Ditto. + [build] Improve builds with different MS Visual Studio versions. -2017-03-31 Werner Lemberg <wl(a)gnu.org> + * builds/windows/vc2010/freetype.vcxproj: Switch platform toolset + according to the Visual Studio version. - * src/cff/cffload.c (cff_font_load): Improve fix from 2017-01-04. +2017-09-11 Werner Lemberg <wl(a)gnu.org> - Allow CFFs containing a single font to have an empty font name. + * src/sfnt/ttkern.c (tt_face_load_kern): Reject format 2 tables. - Problem reported by 張俊芝 <418092625(a)qq.com> in + Reported by Behdad. - http://lists.nongnu.org/archive/html/freetype-devel/2017-03/msg00074.html +2017-09-09 Werner Lemberg <wl(a)gnu.org> -2017-03-30 Werner Lemberg <wl(a)gnu.org> + [autofit] Improve communication with ftgrid. - * src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also. + * src/autofit/afhints.c (af_glyph_hints_get_segment_offset): + Provide values in font units. - Requested by Dave Arnold. +2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> -2017-03-30 Werner Lemberg <wl(a)gnu.org> + [base] Remove a check for resource ID in the resource fork driver. - [truetype] Fix HVAR and VVAR handling (#50678). + LastResort.dfont has a marginal resource ID 0xFFFF for sfnt + resource. Inside Macintosh: More Macintosh Toolbox, `Resource IDs' + (1-46), tells that some IDs are reserved and should not be used. + FreeType2 just uses resource ID to sort the fragmented resource. + To accept the marginal fonts, the checking is removed. - * src/truetype/ttgxvar.c (tt_hvadvance_adjust): Handle - glyph indices larger than `mapCount' as described in the - specification. + * src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Remove res_id + validity check, fix a trace message format. -2017-03-30 Werner Lemberg <wl(a)gnu.org> +2017-09-08 suzuki toshiya <mpsuzuki(a)hiroshima-u.ac.jp> - [truetype] Allow linear scaling for unhinted rendering (#50470). + [sfnt, truetype] Register the tags for marginal fonts. - * src/truetype/ttdriver.c (tt_size_request): Revert change from - 2011-07-16; the intended metrics fix seems now to be implemented in - a different way, making the patch unnecessary. Note that this - change was usually patched out by all major GNU/Linux distributions - due to heavy side effects. + The first 32bit of standard TrueType variants is 0x00010000, + `OTTO', `ttcf', `true' or `typ1'. 2 marginal dfonts on legacy Mac + OS X, Keyboard.dfont and LastResort.dfont, have the sfnt resources + starting 0xA5 followed by `kbd' or `lst'. Considering the following + data could be parsed as conventional TrueType fonts, the header + checking is updated to allow these tags. It seems that recent Mac + OS X has already switched to normal TTF for these fonts. - * src/truetype/ttgload.c (compute_glyph_metrics, TT_Load_Glyph): - Refer to the metrics of the `TT_Size' object. + See the discussion at + http://u88.n24.queensu.ca/exiftool/forum/index.php?topic=3931.0 -2017-03-29 Werner Lemberg <wl(a)gnu.org> + * include/freetype/tttags.h (TTAG_0xA5kbd, TTAG_0xA5lst): New header + tags for Keyboard.dfont and LastResort.dfont. + * src/sfnt/sfobjs.c (sfnt_open_font): Accept the sfnt resource + starts with TTAG_0xA5kbd or TTAG_0xA5lst. + * src/truetype/ttobjs.c (tt_face_init): Accept the face with the + format tag is TTAG_0xA5kbd or TTAG_0xA5lst. - [truetype] Fix thinko related to PS name of default named instance. +2017-09-05 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttgxvar.c (TT_Get_MM_Var): `strid' and `psid' are - name ID values, not indices into the array of name entries. + Fix multiple calls of `FT_Bitmap_Convert'. -2017-03-27 Werner Lemberg <wl(a)gnu.org> + The documentation of `FT_Bitmap_Convert' says that multiple calls do + proper reallocation of the target FT_Bitmap object. However, this + failed for the sequence - [cid, truetype] Don't use `index' as a variable name. + non-empty bitmap + empty bitmap + non-empty bitmap - At least on FreeBSD there is a global declaration of `index' in file - `/usr/include/strings.h'. + Reason was that `FT_Bitmap_Convert' only reallocated the bitmap + buffer if it became too small; it didn't make the buffer smaller. + For an empty bitmap following a non-empty one, only the buffer + dimension got set to zero, without deallocation. If the next call + was a non-empty buffer again, an assertion in `ft_mem_qrealloc' was + triggered. - * src/cff/cf2intrp.c, src/truetype/ttgload.c: s/index/idx/ where - appropriate. + * src/base/ftbitmap.c (FT_Bitmap_Convert): Always reallocate target + buffer to the correct size. -2017-03-27 Wojciech Mamrak <wmamrak(a)gmail.com> + * docs/CHANGES: Document it. - [sfnt] Minor improvement for handling kern tables. +2017-09-05 Werner Lemberg <wl(a)gnu.org> - * src/sfnt/ttkern.c (tt_face_load_kern): Don't check for - cross-stream kerning tables since we reject format 2 tables later - on anyways. - Modify code for limit test... - (tt_face_get_kerning): ... to avoid a limit test here. + [bdf] Fix size and resolution handling. -2017-03-27 Werner Lemberg <wl(a)gnu.org> + * src/bdf/bdfdrivr.c (BDF_Face_Init): Use `SIZE' values if + `POINT_SIZE', `RESOLUTION_X', or `RESOLUTION_Y' properties are + missing. - [pcf] Fix compiler warnings. + * docs/CHANGES: Document it. - Reported by Alexander Hedges <ahedges(a)student.ethz.ch>. +2017-08-25 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/pcf/pcfdrivr.c (pcf_property_set, pcf_property_get): Tag - `property_name' with `FT_UNUSED' where necessary. + Swap `ALLOC_MULT' arguments (#51833). -2017-03-26 Werner Lemberg <wl(a)gnu.org> + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Updated. + * src/winfonts/winfnt.c (FNT_Load_Glyph): Updated. + * src/raster/ftrend1.c (ft_raster1_render): Updated. - * src/psaux/psobjs.c (t1_builder_close_contour): Add safety guard. +2017-08-23 Werner Lemberg <wl(a)gnu.org> - Reported as + [sfnt] Fix clang compilation (#51788). - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941 + * src/sfnt/pngshim.c (premultiply_data): Use vectors instead of + scalars. + (vector_shuffle): New macro to take care of a different built-in + function name on clang. -2017-03-23 Werner Lemberg <wl(a)gnu.org> +2017-08-22 Werner Lemberg <wl(a)gnu.org> - [psaux] Better protect `flex' handling. + [base] Don't zero out allocated memory twice (#51816). - Reported as + Patch applied from bug report. - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935 + * src/base/ftutil.c (ft_mem_qrealloc): Use low-level allocation to + avoid unnecessary overhead. - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - <callothersubr>: Since there is not a single flex operator but a - series of subroutine calls, malformed fonts can call arbitrary other - operators after the start of a flex, possibly adding points. For - this reason we have to check the available number of points before - inserting a point. +2017-08-22 Werner Lemberg <wl(a)gnu.org> -2017-03-23 Werner Lemberg <wl(a)gnu.org> + [truetype] Integer overflow. - [sfnt] Fix check for default named instance. + Changes triggered by - * src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four - bytes, not two... + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3107 -2017-03-23 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttinterp.c (Ins_MDRP, Ins_MIRP, Ins_ALIGNPTS): Use + NEG_LONG. - Make MM fonts work (again). - - * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore - return value of `ft_face_get_mvar_service'; instead, check whether a - service is actually returned. +2017-08-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-03-20 Werner Lemberg <wl(a)gnu.org> + [sfnt] Avoid synthetic unicode for symbol fonts with PUA. - [truetype] Some variable renamings. + Reported as - Too much local variables holding different structures were called - `metrics'. + https://bugs.chromium.org/p/chromium/issues/detail?id=754574 - * src/truetype/ttdriver.c (tt_size_select): s/metrics/size_metrics/. + * src/sfnt/sfobjs.c (sfnt_load_face): Check for FT_ENCODING_MS_SYMBOL. - * src/truetype/ttgload.c (tt_get_metrics_incr_overrides, - compute_glyph_metrics): s/metrics/incr_metrics/. - (load_sbit_image): s/metrics/sbit_metrics/. +2017-08-16 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttobjs.c (tt_size_run_fpgm): s/metrics/size_metrics/. - (tt_size_init_bytecode): s/metrics/tt_metrics/. - (tt_size_reset): s/metrics/size_metrics/. + * src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings. -2017-03-20 Werner Lemberg <wl(a)gnu.org> +2017-08-15 Behdad Esfahbod <behdad(a)behdad.org> - [sfnt] Don't add instances to non-variation fonts. + [sfnt] Speed up PNG image loading. - * src/sfnt/sfobjs.c (sfnt_init_face): Fix it. + This reduces the overhead of `premultiply_data' by 60%. -2017-03-20 Werner Lemberg <wl(a)gnu.org> + * src/sfnt/pngshim.c (premultiply_data): Provide code which uses + gcc's (and clang's) `vector_byte' attribute to process 4 pixels at a + time. - * src/cff/cffgload.c (cff_builder_init): Add safety guard (#50578). +2017-08-11 Werner Lemberg <wl(a)gnu.org> -2017-03-18 Werner Lemberg <wl(a)gnu.org> + [sfnt, truetype] Improve handling of missing sbits. - Introduce FT_UINT_TO_POINTER macro (#50560). + Requested by Behdad. - We have to make a separate case for Windows 64's LLP64 data model. + Modern bitmap-only SFNTs like `NotoColorEmoji.ttf' don't contain + entries in the bitmap strike(s) for empty glyphs. Instead, they + rely that a space glyph gets created from the font's metrics data. + This commit makes FreeType behave accordingly. - * builds/unix/ftconfig.in, builds/vms/ftconfig.h, - include/freetype/config/ftconfig.h (FT_UINT_TO_POINTER): New macro. + * include/freetype/fterrdef.h (FT_Err_Missing_Bitmap): New error + code. - * src/truetype/ttgload.c (load_truetype_glyph): Use it. + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_image): Change error codes + to make a distinction between a missing bitmap in a composite and a + simple missing bitmap. -2017-03-18 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttgload.c (TT_Load_Glyph): For a missing bitmap (in a + bitmap-only font), synthesize an empty bitmap glyph if metrics are + available. - * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter (#50573). +2017-08-10 Werner Lemberg <wl(a)gnu.org> - The problematic font that exceeds the old limit is Lato-Regular, - version 2.007, containing bytecode generated by a buggy version of - ttfautohint. + [base] Minor API improvement for default variation axis setting. -2017-03-18 Werner Lemberg <wl(a)gnu.org> + * src/base/ftmm.c (FT_Set_MM_Design_Coordinates, + FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, + FT_Set_Var_Blend_Coordinates): Allow coords==NULL if num_coords==0. - [truetype] Another limitation for bytecode loop count maximum. + * docs/CHANGES: Updated. - Reported as +2017-08-08 Werner Lemberg <wl(a)gnu.org> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=900 + [psnames] Really fix issue #49949. - * src/truetype/ttinterp.c (TT_RunIns): Limit `loopcall_counter_max' - by number of glyphs also. + We now use a separate preprocessor macro to handle both definition + and declaration of the glyph name arrays. -2017-03-18 Werner Lemberg <wl(a)gnu.org> + * src/psnames/psmodule.c (DEFINE_PS_TABLE_DATA): New macro. - [ftfuzzer] Minor improvement. + * src/tools/glnames.py (StringTable::dump, + StringTable::dump_sublist): Use `DEFINE_PS_TABLE_DATA'. + (dump_encoding): Ditto. + (main): Use `wb' mode for writing the output file, which works on + Windows also. - * src/tools/ftfuzzer/ftfuzzer.cc: Don't set intermediate axis if - bitmap strikes are active. + * src/psnames/pstables.h: Regenerated. -2017-03-18 Werner Lemberg <wl(a)gnu.org> +2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> - Improve `make multi'. + [smooth] Harmony LCD rendering. - * src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2. + This is a new technology for LCD-optimized rendering. It capitalizes + on the fact that each color channel grid is shifted by a third of a + pixel. Therefore it is logical to render 3 separate monochrome + bitmaps shifting the outline by 1/3 pixel, and then combine them. + Importantly, the resulting output does not require additional LCD + filtering. - * src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH. + * src/smooth/ftsmooth.c (ft_smooth_render_generic) + [!FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Implement new LCD-optimized + rendering. - * src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM. + * include/freetype/ftlcdfil.h, include/freetype/freetype.h, + include/freetype/config/ftoption.h, devel/ftoption.h: Updated + documentation. - * src/sfnt/pngshim.c: Guard file with - TT_CONFIG_OPTION_EMBEDDED_BITMAPS also. +2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/sfnt/ttbdf.c: Avoid empty source file. - * src/sfnt/ttpost.c: Guard file with - TT_CONFIG_OPTION_POSTSCRIPT_NAMES. - * src/sfnt/ttsbit.c: Guard file with - TT_CONFIG_OPTION_EMBEDDED_BITMAPS. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Clean up. - * src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty - source file. +2017-08-08 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/truetype/ttsubpix.c: Guard file with - TT_USE_BYTECODE_INTERPRETER also. + * src/sfnt/ttpost.c (format): Use otspec-compliant versions. - * src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM. +2017-08-05 Werner Lemberg <wl(a)gnu.org> - * src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c, - src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c, - src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c, - src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c, - src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c, - src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort - entries. + [truetype] Integer overflow. -2017-03-17 Werner Lemberg <wl(a)gnu.org> + Reported as - Fixes for conditional compilation. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2868 - * src/autofit/afcjk.c, src/autofit/afindic.c: Include `afcjk.h' - earlier. + * src/truetype/ttinterp.c (Ins_ALIGNRP): Use NEG_LONG. - * src/sfnt/sfobjs.c (sfnt_init_face): Put `memory' variable into - TT_CONFIG_OPTION_GX_VAR_SUPPORT block. - (sfnt_done_face): Protect some code with - TT_CONFIG_OPTION_GX_VAR_SUPPORT. +2017-08-05 Werner Lemberg <wl(a)gnu.org> - * src/sfnt/ttsbit.c (tt_face_load_sbix_image): Remove compiler - warning. + [base, truetype] New function `FT_Get_Var_Axis_Flags'. - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Put `tmp' variable - into TT_USE_BYTECODE_INTERPRETER block. + The reserved `flags' field got a value in OpenType version 1.8.2; + unfortunately, the public `FT_Var_Axis' structure misses the + corresponding element. Since we can't add a new field, we add an + access function. - (tt_loader_init): Put `error' variable into - TT_USE_BYTECODE_INTERPRETER block. + * src/base/ftmm.c (FT_Get_Var_Axis_Flags): New function. -2017-03-17 Werner Lemberg <wl(a)gnu.org> + * include/freetype/ftmm.h (FT_VAR_AXIS_FLAG_HIDDEN): New macro. + Updated. - Fix preprocessor warning. + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Increase allocated memory + of `mmvar' to hold axis flags. + Fill the axis flags array. - * devel/ftoption.h, include/freetype/config/ftoption.h: Test whether - TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined before checking its - value. + * docs/CHANGES: Updated. -2017-03-17 Werner Lemberg <wl(a)gnu.org> +2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> - `make multi' fixes; compiler warnings. + [truetype] Fix metrics of B/W hinting in v40 mode. - * src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H. + Phantom points are now saved outside v40 backwards compatibility + mode. This fixes the jumping glyphs when switching between v35 and + v40 monochrome mode. - * src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include - FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H. + * src/truetype/ttgload.c (TT_Hint_Glyph): Fix inversed bool logic. - * src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include - FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H. - (get_win_string, get_apple_string): Initialize `result'. +2017-08-03 Nikolaus Waxweiler <madigens(a)gmail.com> -2017-03-17 Dave Arnold <darnold(a)adobe.com> + [truetype] Do not set any ClearType flags in v40 monochrome mode. - [cff] Fix potential bugs in default NDV for CFF2. + This fixes weird behavior of instructions that resulted in rendering + differences between v35 and v40 in monochrome mode, e.g., in + `timesbi.ttf'. - * src/cff/cffload.c (cff_blend_build_vector): Explicitly build blend - vector when `lenNDV' is zero; don't rely on zero-init. - Save `lenNDV' as part of cache key even when `lenNDV' is zero. + * src/truetype/ttinterp.c (Ins_GETINFO) + [TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL]: Check + `subpixel_hinting_lean'. -2017-03-17 Dave Arnold <darnold(a)adobe.com> +2017-08-01 Werner Lemberg <wl(a)gnu.org> - [cff] Fix CFF2 stack allocation. + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko. - * src/cff/cffparse.c (cff_parser_init) add 1 for operator. +2017-08-01 Behdad Esfahbod <behdad(a)behdad.org> -2017-03-16 Werner Lemberg <wl(a)gnu.org> + [truetype] Fix loading of named instances. - * src/truetype/ttgxvar.c (tt_done_blend): Free `vvar_table'. + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Preserve file position + while loading the `avar' table. - Reported as +2017-08-01 Werner Lemberg <wl(a)gnu.org> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=883 + [sfnt, truetype] Minor adjustments for OpenType 1.8.2. -2017-03-15 Werner Lemberg <wl(a)gnu.org> + * src/sfnt/sfobjs.c (sfnt_load_face): The units per EM value has now + (tighter) limits. - Remove clang compiler warnings (#50548). + * src/truetype/ttgload.c (load_truetype_glyph): The new OpenType + version explicitly allows all negative values for the number of + contours if we have a composite glyph (this is for better backwards + compatibility I guess), but it still recommends value -1. - * include/freetype/internal/tttypes.h (TT_FaceRec): Make - `var_postscript_prefix_len' unsigned. +2017-07-26 Werner Lemberg <wl(a)gnu.org> - * src/autofit/afwarp.c (af_warper_compute_line_best): Remove - redundant assignment. + [cff] Integer overflow. - * src/cff/cffload.c (cff_subfont_load): Add casts. + Reported as - * src/cff/cffparse.c (cff_parse_blend): Remove redundant assignment. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2738 - * src/sfnt/sfdriver.c (fmix32, murmur_hash_3_128): Add `static' - keyword. - Add casts. - (fixed2float): Add cast. - (sfnt_get_var_ps_name): Make `p' always initialized. - Add casts. + * src/cff/cf2hints.c (cf2_glyphpath_computeOffset, + cf2_glyphpath_curveTo): Use ADD_INT32. - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Add casts. +2017-07-13 Werner Lemberg <wl(a)gnu.org> -2017-03-15 Werner Lemberg <wl(a)gnu.org> + [base] Fix memory leak. - [ftfuzzer] Limit number of tested faces and instances. + Reported as - This is inspired by the discussion in and analysis of + https://bugs.chromium.org/p/chromium/issues/detail?id=738362 - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=859 + * src/base/ftglyph.c (FT_Get_Glyph): Do proper deallocation in case + of error. - * src/tools/ftfuzzer/ftfuzzer.cc (LLVMFuzzerTestOneInput): Use only - up to 20 face indices. - Use only up to 20 instance indices. +2017-07-12 Werner Lemberg <wl(a)gnu.org> -2017-03-15 Werner Lemberg <wl(a)gnu.org> + [base] Integer overflow. - * src/tools/ftfuzzer/ftfuzzer.cc: Improve readability; formatting. + Reported as -2017-03-14 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2573 - [sfnt] Implement PS names for font instances [3/3]. + * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use + FT_PIX_CEIL_LONG and FT_PIX_ROUND_LONG. - Everything is guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT. +2017-07-12 Werner Lemberg <wl(a)gnu.org> - * include/freetype/internal/tttypes.h (TT_FaceRec): New fields - `var_postscript_prefix' and `var_postscript_prefix_len'. + * src/truetype/ttpload.c (tt_face_get_location): Off-by-one typo. - * src/sfnt/sfdriver.c: Include FT_TRUETYPE_IDS_H. - (sfnt_is_alphanumeric): New wrapperfunction for `ft_isalnum'. - (get_win_string, get_apple_string): Remove `const' from return - value. - (MAX_VALUE_DESCRIPTOR_LEN, MAX_PS_NAME_LEN): New macros. - (hexdigits): New array. - (sfnt_get_var_ps_name): New function, implementing Adobe TechNote - 5902 to construct a PS name for a variation font instance. - (sfnt_get_ps_name): Call `sfnt_get_var_ps_name' for font instances. + Also improve tracing message. - * src/sfnt/sfobjs.c (sfnt_done_face): Updated. + Problem reported as - * src/truetype/ttgxvar.c (tt_set_mm_blend): Reset - `face->postscript_name' to trigger recalculation for new instance - parameters. + https://bugs.chromium.org/p/chromium/issues/detail?id=738919 -2017-03-14 Werner Lemberg <wl(a)gnu.org> +2017-07-07 Werner Lemberg <wl(a)gnu.org> - [sfnt] Implement PS names for font instances [2/3]. + [cff] Integer overflow. - * src/sfnt/sfdriver.c (fix2float) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: - New function to find the shortest representation of a 16.16 - fractional number. + Reported as -2017-03-14 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2517 - [sfnt] Implement PS names for font instances [1/3]. + * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32. - Add 128bit MurmurHash 3 function. +2017-07-05 Werner Lemberg <wl(a)gnu.org> - Everything is guarded with TT_CONFIG_OPTION_GX_VAR_SUPPORT. + * src/sfnt/ttcmap.c (tt_cmap_unicode_class_rec): Fix warning. - * src/sfnt/sfdriver.c (ROTL32): New macro. - (fmix32, murmur_hash_3_128): New functions. +2017-07-05 Werner Lemberg <wl(a)gnu.org> -2017-03-13 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Fix warning (#51395). - [truetype] Ignore invalid MVAR tags. +2017-07-04 Werner Lemberg <wl(a)gnu.org> - Reported as + [truetype] Prevent address overflow (#51365). - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=838 + * src/truetype/ttgxvar.c (FT_Stream_SeekSet): Add guard. - * src/truetype/ttgxvar.c (ft_var_load_mvar): Ignore value and emit - warning for invalid tags. - (tt_apply_mvar): Ignore invalid tags. +2017-07-03 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-03-12 Werner Lemberg <wl(a)gnu.org> + * src/base/ftlcdfil.c (ft_lcd_filter_fir): Improve code. - [truetype] Store and use design coordinates also. +2017-07-03 Werner Lemberg <wl(a)gnu.org> - * include/freetype/internal/services/svmm.h (FT_Get_Var_Blend_Func): - Add `normalizedcoords' argument. + [truetype] Integer overflow. - * src/truetype/ttgxvar.h (GX_BlendRec): Add `coords' field to store - the design coordinates of the current instance. - Updated. + Reported as - * src/truetype/ttgxvar.c (TT_Set_MM_Blend): Move functionality to... - (tt_set_mm_blend): ... New function. - Convert data in `normalizedcoords' array to `coords' array on - demand. - (TT_Set_Var_Design): Store argument data in `coords' array. - (TT_Get_Var_Design): Get data from `coords' array. - (tt_get_var_blend): Updated. - (tt_done_blend): Updated. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2455 - * src/cff/cffload.c, src/cff/cffload.h (cff_get_var_blend): Updated. + * src/truetype/ttinterp.c (Ins_SCFS): Use SUB_LONG. - * src/cff/cf2ft.c (cf2_getNormalizedVector): Updated. +2017-07-01 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/cff/cffobjs.c (cff_face_init): Updated. + * src/sfnt/sfobjs.c (sfnt_load_face): Ignore No_Unicode_Glyph_Name. -2017-03-12 Werner Lemberg <wl(a)gnu.org> +2017-06-28 Ben Wagner <bungeman(a)google.com> - src/truetype/ttgxvar.[ch]: s/avar_checked/avar_loaded/. + Avoid Microsoft compiler warnings (#51331). -2017-03-08 Werner Lemberg <wl(a)gnu.org> + While clang's sanitizer recommends a cast to unsigned for safe + negation (to handle -INT_MIN), both MSVC and Visualc emit warning + C4146 if an unsigned value gets negated. - [sfnt] Another fix for buggy variation fonts. + * include/freetype/internal/ftcalc.h (NEG_LONG, NEG_INT32), + src/base/ftcalc.c (FT_MOVE_SIGN): Replace negation with a + subtraction. - Reported as +2017-06-27 Werner Lemberg <wl(a)gnu.org> - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=759 + * src/cff/cffparse.c (do_fixed): Fix typo. - * src/sfnt/sfobjs.c (sfnt_init_face): While setting number of - instances to zero for `CFF' fonts table, ensure that there is no - `CFF2' present also (which gets priority). + Spotted by chris <chris(a)gcjd.org>. -2017-03-07 Werner Lemberg <wl(a)gnu.org> +2017-06-27 Werner Lemberg <wl(a)gnu.org> - [sfnt] Improve handling for buggy variation fonts. + [truetype] Integer overflows. Reported as - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=738 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2384 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2391 - * src/sfnt/sfobjs.c (sfnt_init_face): While setting number of - instances to zero for `CFF' fonts table, ensure that there is no - `glyf' table present also (which gets priority). + * src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round, FT_DivFix): Use + NEG_LONG. -2017-03-06 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttinterp.c (Ins_SxVTL): Use NEG_LONG. - [sfnt, truetype] Always provide default instance. +2017-06-24 Werner Lemberg <wl(a)gnu.org> - As documented in the OpenType specification, an entry for the - default instance may be omitted in the named instance table. In - particular this means that even if there is no named instance table - in the font we actually do have a named instance, namely the default - instance. + [truetype] Integer overflows. - For consistency, we always want the default instance in our list of - named instances. If it is missing, we try to synthesize it. + Reported as - * src/sfnt/sfobjs.c (sfnt_init_face): Check whether the default - instance is in the table of named instances. Otherwise adjust - number of instances. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2364 - * src/truetype/ttgxvar.c: Include FT_TRUETYPE_IDS_H. - (TT_Get_MM_Var): Use `face->root.style_flags' as the number of named - instances. - Sythesize a named instance entry if necessary. - (tt_done_blend): Free `normalized_stylecoords'. + * src/truetype/ttinterp.c (Ins_ISECT): Use NEG_LONG. -2017-03-05 Werner Lemberg <wl(a)gnu.org> +2017-06-22 Werner Lemberg <wl(a)gnu.org> - [sfnt] Remove redundant code. + [cff, truetype] Integer overflows. - * src/sfnt/sfobjs.c (sfnt_init_face): Remove second test for - `num_instances', which will always succeed. + Reported as -2017-03-04 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2323 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2328 - [sfnt] Add `get_name_id' service. + * src/cff/cf2blues.c (cf2_blues_capture): Use ADD_INT32 and + SUB_INT32. - * include/freetype/internal/sfnt.h (TT_Get_Name_ID_Func): New - typedef. - (SFNT_Interface): Add `get_name_id' field. - (FT_DEFINE_SFNT_INTERFACE): Updated. + * src/truetype/ttinterp.c (Ins_SDPVTL): Use SUB_LONG and NEG_LONG. - * src/sfnt/sfdriver.c (search_name_id): Rename to... - (sfnt_get_name_id): ... this. - (sfnt_get_ps_name, sfnt_interface): Updated. +2017-06-21 Alexei Podtelezhnikov <apodtele(a)gmail.com> -2017-03-04 Werner Lemberg <wl(a)gnu.org> + [sfnt] Synthesize a Unicode charmap if one is missing. - [truetype] Make `TT_Set_MM_Blend' set named instance index. + * src/sfnt/ttcmap.h (tt_cmap_unicode_class_rec): Declare it. + * src/sfnt/ttcmap.c (tt_get_glyph_name, tt_cmap_unicode_init, + tt_cmap_unicode_done, tt_cmap_unicode_char_index, + tt_cmap_unicode_char_next, tt_cmap_unicode_class_rec): Implement + synthetic Unicode charmap class. + (tt_get_cmap_info): Make sure the callback is available. - * src/truetype/ttgxvar.h (GX_Blend): New array - `normalized_stylecoords'. + * src/sfnt/sfobjs.c (sfnt_load_face) + [FT_CONFIG_OPTION_POSTSCRIPT_NAMES]: If Unicode charmap is missing, + synthesize one. - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Allocate and fill - `normalized_stylecoords'. - (TT_Set_MM_Blend): Check instance tuple and adjust `face_index' - accordingly. + * include/freetype/config/ftoption.h: Document it. + * devel/ftoption.h: Ditto. -2017-03-02 Werner Lemberg <wl(a)gnu.org> +2017-06-20 Tony Theodore <tonyt(a)logyst.com> - [truetype] Split off designer/normalized conversion routines. + Fix pkg-config in freetype-config for cross-compiling (#51274). - * src/truetype/ttgxvar.c (TT_Set_Var_Design): Split off conversion - code designer->normalized coordinates to... - (ft_var_to_normalized): ... New function. - (TT_Get_Var_Design): Split off conversion code normalized->designer - coordinates to... - (ft_var_to_design): ... New function. + * builds/unix/unix-def.in (PKG_CONFIG): New variable. + (freetype-config): Use it in sed expression. -2017-02-28 Werner Lemberg <wl(a)gnu.org> + * builds/unix/freetype-config.in: s/pkg-config/%PKG_CONFIG%/. - [sfnt] Further generalize `sfnt_get_ps_name'; report invalid data. +2017-06-20 Werner Lemberg <wl(a)gnu.org> - * src/sfnt/sfdriver.c (sfnt_ps_map): New array. - (sfnt_is_postscript): New function. - (char_type_func): New typedef. - (get_win_string, get_apple_string): Add argument to specify - character checking function. - Add argument whether argument checking failures should be reported. - Update callers. - (search_name_id): Fix return value. + [cff, truetype] Integer overflows. -2017-02-23 Werner Lemberg <wl(a)gnu.org> + Reported as - [sfnt] Split off another bit of `sfnt_get_ps_name'. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2300 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2313 - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Split off some - functionality into... - (search_name_id): ... New function. + * src/cff/cf2hints.c (cf2_hintmap_adjustHints): Use ADD_INT32. -2017-02-23 Werner Lemberg <wl(a)gnu.org> + * src/truetype/ttinterp.c (Ins_ABS): Avoid FT_ABS. - [sfnt] Modularize `sfnt_get_ps_name'. +2017-06-17 Alexei Podtelezhnikov <apodtele(a)gmail.com> - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Split off some - functionality into... - (IS_WIN, IS_APPLE): ... New macros. - (get_win_string, get_apple_string): ... New functions. + [base, smooth] LCD filtering cleanups. -2017-02-23 Werner Lemberg <wl(a)gnu.org> + * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy): + Clean up, start filtering from the bottom-left origin. - [truetype] Minor improvement. + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Updated. - * src/truetype/ttgload.c (TT_Process_Simple_Glyph, - load_truetype_glyph): Remove unnecessary tests. +2017-06-16 Werner Lemberg <wl(a)gnu.org> -2017-02-23 Werner Lemberg <wl(a)gnu.org> + [truetype] Integer overflows. - * include/freetype/internal/tttypes.h (TT_Face): s/isCFF2/is_cff2/. + Reported as - For orthogonality with other structure field names. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2270 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2276 - Update all users. + * src/truetype/ttinterp.c (Ins_MDRP, _iup_worker_interpolate): Use + ADD_LONG and SUB_LONG. -2017-02-22 Alexei Podtelezhnikov <apodtele(a)gmail.com> +2017-06-15 Werner Lemberg <wl(a)gnu.org> - * src/smooth/ftgrays.c (gray_hline): Improve code. + [bdf, cff] Integer overflows. -2017-02-20 Dominik Röttsches <drott(a)google.com> + Reported as - Fix some `ttnameid.h' entries (#50313). + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2244 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2261 - * include/freetype/ttnameid.h: - s/TT_MS_LANGID_SPANISH_INTERNATIONAL_SORT/TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT/, - s/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIA/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN/. + * src/bdf/bdfdrivr.c (BDF_Face_Init): Replace calls to FT_ABS with + direct code to avoid value negation. -2017-02-20 Werner Lemberg <wl(a)gnu.org> + * src/cff/cf2blues.c (cf2_blues_capture): Use SUB_INT32 and + ADD_INT32. - [cff] Finish support for `random' operator. - - * src/cff/cfftypes.h (CFF_SubFontRec): Add `random' field. - - * src/cff/cffobjs.c: Updated. - (cff_driver_init): Initialize random seed value. - - * src/cff/cffload.c (cff_random): New function. - (cff_subfont_load): Add `face' argument. - Update all callers. - Initialize random number generator with a proper seed value. - (cff_font_load): Add `face' argument. - Update all callers. - - * src/cff/cffload.h: Updated. - - * src/cff/cf2intrp.c (CF2_FIXME): Removed. - (cf2_interpT2CharString) <cf2_escRANDOM>: Implement opcode. - - * src/cff/cffgload.c (cff_decoder_parse_charstrings): Don't - initialize random seed value. - <cff_op_random>: Use new random seed framework. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Sanitize `initialRandomSeed'. - - * src/cff/cffload.c (cff_load_private_dict): Make - `initial_random_seed' value always positive. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Introduce `random-seed' property (2/2). - - * src/base/ftobjs.c: Include `FT_CFF_DRIVER_H'. - (open_face): Initialize `face->internal->random_seed'. - (FT_Face_Properties): Handle `FT_PARAM_TAG_RANDOM_SEED'. - - * src/cff/cffdrivr.c (cff_property_set): Handle `random-seed' - property. - -2017-02-20 Werner Lemberg <wl(a)gnu.org> - - [cff] Introduce `random-seed' property (1/2). - - We need this for support of the `random' operator. - - * include/freetype/ftcffdrv.h (FT_PARAM_TAG_RANDOM_SEED): New macro. - - * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): New - field `random_seed'. - - * src/cff/cffobjs.h (CFF_DriverRec): New field `random_seed'. - -2017-02-17 Werner Lemberg <wl(a)gnu.org> - - Remove clang warnings. - - * src/autofit/aflatin.c (af_latin_sort_blue): Add missing `static' - keyword. - - * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): - Initialize some variables. - -2017-02-16 Nikolaus Waxweiler <madigens(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - Add face property for stem darkening. - - * include/freetype/ftautoh.h (FT_PARAM_TAG_STEM_DARKENING): New - macro. - - * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): Add - `no_stem_darkening' field. - - * src/autofit/afloader.c (af_loader_load_glyph), - src/autofit/afmodule.c (af_property_set): Updated. - - * src/base/ftobjs.c: Include FT_AUTOHINTER_H. - (ft_open_face_internal): Updated. - (FT_Face_Properties): Handle FT_PARAM_TAG_STEM_DARKENING. - - * src/cff/cf2ft.c (cf2_decoder_parse_charstrings): Updated. - - * src/cff/cffdrivr.c (cff_property_set): Updated. - -2017-02-16 Nikolaus Waxweiler <madigens(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - Add face property for LCD filter weights. - - * include/freetype/ftlcdfil.h (FT_PARAM_TAG_LCD_FILTER_WEIGHTS, - FT_LCD_FILTER_FIVE_TAPS): New macros. - (FT_LcdFiveTapFilter): New typedef. - - * include/freetype/ftobjs.h (FT_Face_InternalRec) - [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Add `lcd_weights' field. - (FT_Bitmap_LcdFilterFunc): Change third argument to weights array. - (ft_lcd_filter_fir): New prototype. - (FT_LibraryRec): Updated. - - * src/base/ftlcdfil.c (_ft_lcd_filter_fir): Renamed to... - (ft_lcd_filter_fir): ... this base function. - Updated. - (_ft_lcd_filter_legacy): Updated. - (FT_Library_SetLcdFilterWeights, FT_Library_SetLcdFilter): Updated. - - * src/base/ftobjs.c (ft_open_face_internal): Updated. - (FT_Face_Properties): Handle FT_PARAM_TAG_LCD_FILTER_WEIGHTS. - - * src/smooth/ftsmooth.c (ft_smooth_render_generic) - [FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Handle LCD weights from - `FT_Face_Internal'. - -2017-02-14 Nikolaus Waxweiler <madigens(a)gmail.com> - Werner Lemberg <wl(a)gnu.org> - - Add new function `FT_Face_Properties'. - - This commit provides the framework, to be filled with something - useful in the next commits. - - * include/freetype/freetype.h (FT_Face_Properties): Declare. - - * src/base/ftobjs.c (FT_Face_Properties): New function. - -2017-02-13 Werner Lemberg <wl(a)gnu.org> - - [autofit] Prevent overlapping blue zones. - - Problem reported as - - https://github.com/google/fonts/issues/632 - - The font in question (Nunito) has values 705 and 713 for the - reference and overshoot values, respectively, of the first blue - zone. Blue zone 2, however, has value 710 for both the reference - and overshoot. At 12ppem, reference and overshoot of blue zone 0 - becomes 8px, while blue zone 2 becomes 9px. - - A peculiarity of this font is that the tops of isolated vertical - stems like `N' have a slight overshoot also. The auto-hinter tries - to find the nearest blue zone using the *original* coordinates. For - vertical stems, this is value 713. For normal horizontal tops like - in character `E', this is value 710. Since value 713 is mapped to - 8px but value 710 to 9px, `N' and similar characters are one pixel - higher than `E', which looks very bad. - - This commit sanitizes blue zones to avoid such a behaviour. - - * src/autofit/aflatin.c (af_latin_sort_blue): New function. - (af_latin_metrics_init_blues): Sort blue values and remove overlaps. - -2017-02-12 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftgrays.c (gray_sweep): Improve code. - -2017-02-06 Werner Lemberg <wl(a)gnu.org> - - [truetype] Implement `VVAR' table support. - - * src/truetype/ttgxvar.h (GX_HVarTable): Renamed to... - (GX_HVVarTable): ...This. - (GX_Blend): Add fields for `VVAR' table handling. - Other minor updates. - - * src/truetype/ttgxvar.c (ft_var_load_hvar): Renamed to... - (ft_var_load_hvvar): ...This. - Handle VVAR loading also (controlled by an additional parameter). - (tt_hadvance_adjust): Renamed to... - (tt_hvadvance_adjust): ...This. - Handle application of advance height also (controlled by an - additional parameter). - (tt_hadvance_adjust, tt_vadvance_adjust): Wrappers for - `tt_hvadvance_adjust'. - - * src/truetype/ttdriver.c (tt_service_metrics_variations): Updated. - -2017-02-05 Werner Lemberg <wl(a)gnu.org> - - [autofit] Use better blue zone characters for lowercase latin. - - The number of lowercase characters for computing the top flat blue - zone value was too small (in most cases only `x' and `z'). If one - of the two characters has a large serif, say, it can happen that - FreeType must select between two different values, having a 50% - chance to use the wrong one. As a result, rendering at larger PPEM - values could yield uneven lowercase glyph heights. - - Problem reported by Christoph Koeberlin <christoph(a)koe.berlin>. - - * src/autofit/afblue.dat (AF_BLUE_STRING_LATIN_SMALL): Replaced - with... - (AF_BLUE_STRING_LATIN_SMALL_TOP, AF_BLUE_STRING_LATIN_SMALL_BOTTOM): - ... New, extended sets. - (AF_BLUE_STRINGSET_LATN): Updated. - - * src/autofit/afblue.c, scr/autofit/afblue.h: Regenerated. - -2017-02-04 Werner Lemberg <wl(a)gnu.org> - - Make `freetype-config' a wrapper of `pkg-config' if possible. - - Based on ideas taken from - - http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/tree/freetype-multilib… - http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/tree/freetype-2.5.3-fr… - - * builds/unix/freetype-config.in: Rewritten. Use `pkg-config' to - set output variables if program is available. - - * docs/CHANGES, docs/freetype-config.1: Updated. - -2017-02-04 Werner Lemberg <wl(a)gnu.org> - - * builds/unix/unix-def.in (freetype-config): Fix permissions. - -2017-02-03 Werner Lemberg <wl(a)gnu.org> - - * src/autofit/afglobal.c (af_face_globals_free): Erase useless code. - -2017-02-03 Werner Lemberg <wl(a)gnu.org> - - * include/freetype/ftgasp.h (FT_GASP_SYMMETRIC_GRIDFIT): Fix value. - - Reported by Behdad. - -2017-02-02 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix MVAR post-action handling. - - Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=509 - - * src/truetype/ttobjs.c (tt_size_reset): Do nothing for CFF2. This - is important to make `tt_size_reset_iterator' (called in - `tt_apply_mvar') always work. - -2017-02-02 Werner Lemberg <wl(a)gnu.org> - - Make compilation with FT_CONFIG_OPTION_PIC work again. - - All code committed here is guarded with `FT_CONFIG_OPTION_PIC'. - - * include/freetype/internal/services/svmetric.h - (FT_DEFINE_SERVICE_METRICSVARIATIONSREC): Remove trailing semicolon. - - * src/autofit/aflatin.c (af_latin_hints_compute_edges, - af_latin_hint_edges): Provide `globals' variable. - - * src/autofit/afloader.c (af_loader_load_glyph): Remove shadowing - variable. - - * src/autofit/afmodule.c (AF_SCRIPT_CLASSES_GET, - AF_STYLE_CLASSES_GET): Redefine. - - * src/autofit/aftypes.h (AF_DEFINE_WRITING_SYSTEM_CLASS): Fix typo. - - * src/cff/cffparse.c (CFF_FIELD_BLEND): Provide it. - - * src/cff/cffpic.h (CffModulePIC): Fix typo. - -2017-01-31 Alexei Podtelezhnikov <apodtele(a)gmail.com> - - * src/smooth/ftgrays.c (gray_render_scanline): Improve code. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [cff] Provide metrics variation service interface (#50196). - - Only now I've got an OTF with an HVAR table for testing... - - The code in `ftmm.c' uses `FT_FACE_LOOKUP_SERVICE' to get the - metrics variations interface. However, this didn't work with - `FT_FACE_FIND_GLOBAL_SERVICE' used in `sfnt_init_face'. - - * src/cff/cffdrivr.c: Include FT_SERVICE_METRICS_VARIATIONS_H. - (cff_hadvance_adjust, cff_metrics_adjust): Wrapper functions for - metric service functions from the `truetype' module. - (cff_service_metrics_variations): New service. - (cff_services): Updated. - - * src/cff/cffpic.h (CFF_SERVICE_METRICS_VAR_GET): New macro. - [FT_CONFIG_OPTION_PIC]: Synchronize code. - - * src/sfnt/sfobjs.c (sfnt_init_face): Replace call to - FT_FACE_FIND_GLOBAL_SERVICE with `ft_module_get_service' to always - load the service from the `truetype' module. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - Add framework to support services with 9 functions. - - * include/freetype/internal/ftserv.h (FT_DEFINE_SERVICEDESCREC9): - New macro. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [base] Fix error handing in MM functions. - - * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): - Implement it. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [truetype] Fix sanity check for `gvar' table (#50184). - - * src/truetype/ttgxvar.c (ft_var_load_gvar): There might be missing - variation data for some glyphs. - -2017-01-31 Werner Lemberg <wl(a)gnu.org> - - [autofit] Avoid uninitialized jumps (#50191). - - * src/autofit/afcjk.c (af_cjk_metrics_check_digits), - src/autofit/aflatin.c (af_latin_metrics_check_digits): Initialize - `advance'. - -2017-01-27 Werner Lemberg <wl(a)gnu.org> - - s/GB2312/PRC/. - - * include/freetype/freetype.h (FT_ENCODING_PRC): New enum value. - (FT_ENCODING_GB2312): Deprecated. - - * include/freetype/ttnameid.h (TT_MS_ID_PRC): New macro. - (TT_MS_ID_GB2312): Deprecated. - - * src/sfnt/sfobjs.c (sfnt_find_encoding): Updated. - - * docs/CHANGES: Updated. - -2017-01-26 Werner Lemberg <wl(a)gnu.org> - - [base] Add `FT_Get_Sfnt_LangTag' function. - - * include/freetype/ftsnames.h (FT_SfntLangTag): New structure. - (FT_Get_Sfnt_LangTag): New declaration. - - * src/base/ftsnames.c (FT_Get_Sfnt_LangTag): New function. - - * docs/CHANGES: Updated. - -2017-01-26 Werner Lemberg <wl(a)gnu.org> - - [sfnt] Support `name' table format 1. - - * include/freetype/internal/tttypes.h (TT_LangTagRec): New - structure. - (TT_NameTableRec): Add fields `numLangTagRecords' and `langTags'. - - * src/sfnt/ttload.c (tt_face_load_name): Add support for language - tags. - Reduce array size of name strings in case of invalid entries. - (tt_face_free_name): Updated. - - * docs/CHANGES: Updated. - -2017-01-25 Werner Lemberg <wl(a)gnu.org> - - [sfnt] s/TT_NameEntry/TT_Name/. - - * include/freetype/internal/tttypes.h (TT_NameEntryRec): Renamed - to... - (TT_NameRec): This. - (TT_NameTableRec): Updated. - - * src/base/ftsnames.c (FT_Get_Sfnt_Name): Updated. - - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Updated. +2017-06-13 Werner Lemberg <wl(a)gnu.org> - * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, - tt_name_entry_ascii_from_other): Renamed to... - (tt_name_ascii_from_utf16, tt_name_entry_ascii_from_other): This, - respectively. - (TT_NameEntry_ConvertFunc): Renamed to... - (TT_Name_ConvertFunc): This. - (tt_face_get_name): Updated. + * src/winfonts/winfnt.c (FNT_Face_Init): Don't set active encoding. - * src/sfnt/ttload.c (tt_face_load_name, tt_face_free_name): - Updated. + FreeType only sets a default active encoding for Unicode. -2017-01-24 Werner Lemberg <wl(a)gnu.org> +2017-06-13 Werner Lemberg <wl(a)gnu.org> - [sfnt] Fix Postscript name service for symbol fonts. + [cff, truetype] Integer overflows. - * src/sfnt/sfdriver.c (sfnt_get_ps_name): Accept PID/EID=3/0 - entries also. + Reported as -2017-01-24 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2216 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2218 - [truetype] For OpenType 1.7: s/preferred/typographic/ (sub)family. + * src/cff/cf2fixed.h (cf2_fixedAbs): Use NEG_INT32. - * include/freetype/ftsnames.h - (FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY, - FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY): New macros. - (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY, - FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Deprecated. + * src/truetype/ttinterp.c (Ins_IP): Use SUB_LONG. - * include/freetype/ttnameid.h (TT_NAME_ID_TYPOGRAPHIC_FAMILY, - TT_NAME_ID_TYPOGRAPHIC_SUBFAMILY): New macros. - (TT_NAME_ID_PREFERRED_FAMILY, TT_NAME_ID_PREFERRED_SUBFAMILY): - Deprecated. +2017-06-11 Werner Lemberg <wl(a)gnu.org> - * src/sfnt/sfobjs.c (sfnt_load_face): Updated. + [cff] Integer overflows. - * docs/CHANGES: Updated. + Reported as -2017-01-23 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2200 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2210 - [base] Add `FT_Set_Default_Properties' (#49187). + * src/cff/cf2hints.c (cf2_hintmap_insertHint): Use SUB_INT32 and + ADD_INT32. - * include/freetype/ftmodapi.h: Add declaration. + * src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO>: Use + ADD_INT32. - * src/base/ftinit.c (ft_set_default_properties): Renamed to... - (FT_Set_Default_Properties): ... this. - (FT_Init_FreeType): Updated. +2017-06-10 Werner Lemberg <wl(a)gnu.org> - * docs/CHANGES: Updated. + [truetype] Fix TT_Set_Var_Design. -2017-01-23 Werner Lemberg <wl(a)gnu.org> + Reported by Nikolaus Waxweiler <madigens(a)gmail.com>. - [truetype] Minor updates for OpenType 1.8.1. + * src/truetype/ttgxvar.c (TT_Set_Var_Design): Correctly handle the + case where we have less input coordinates than axes. - * src/truetype/ttgxvar.h (GX_MVarTable): `axisCount' has been - removed from the specification; it is now reserved. +2017-06-10 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttgxvar.c (ft_var_load_mvar): Updated. - (GX_FVar_Head): Remove `countSizePairs'; the corresponding data - field in the `MVAR' table is now reserved. - (fvar_fields): Updated. + * src/base/ftcalc.c (FT_DivFix): Fix embarrassing typo. -2017-01-23 Werner Lemberg <wl(a)gnu.org> + Bug introduced 2017-05-28. - [truetype] Avoid segfault for invalid variation data. +2017-06-09 Werner Lemberg <wl(a)gnu.org> - * src/truetype/ttgxvar.c (ft_var_load_item_variation_store): Assure - `itemCount' is not zero. + [cff, truetype] Integer overflows. Reported as - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=441 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2144 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2151 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2153 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2173 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2186 -2017-01-20 Werner Lemberg <wl(a)gnu.org> + * src/cff/cf2blues.c (cf2_blues_init): Use SUB_INT32. - * src/truetype/ttinterp.c (TT_RunIns): Adjust loop detector limits. + * src/truetype/ttinterp.c (Round_None, Round_To_Grid, + Round_To_Half_Grid, Round_Down_To_Grid, Round_Up_To_Grid, + Round_To_Double_Grid, Round_Super, Round_Super_45): Use ADD_LONG, + SUB_LONG, NEG_LONG, FT_PIX_ROUND_LONG, FT_PIX_CEIL_LONG, + FT_PAD_ROUND_LONG + (Ins_SxVTL, Ins_MIRP): Use SUB_LONG. + (_iup_worker_shift): Use SUB_LONG and ADD_LONG. -2017-01-17 Werner Lemberg <wl(a)gnu.org> +2017-06-09 Werner Lemberg <wl(a)gnu.org> - * include/freetype/ttnameid.h: Updated to OpenType 1.8.1. + Provide more macros for flooring, ceiling, and rounding. - (TT_APPLE_ID_FULL_UNICODE): New macro. + These versions don't produce run-time errors due to integer + overflow. - (TT_MS_LANGID_BOSNIAN_BOSNIA_HERZ_CYRILLIC, - TT_MS_LANGID_UPPER_SORBIAN_GERMANY, - TT_MS_LANGID_LOWER_SORBIAN_GERMANY, TT_MS_LANGID_IRISH_IRELAND, - TT_MS_LANGID_INUKTITUT_CANADA_LATIN, TT_MS_LANGID_BASHKIR_RUSSIA, - TT_MS_LANGID_LUXEMBOURGISH_LUXEMBOURG, - TT_MS_LANGID_GREENLANDIC_GREENLAND, TT_MS_LANGID_MAPUDUNGUN_CHILE, - TT_MS_LANGID_MOHAWK_MOHAWK, TT_MS_LANGID_BRETON_FRANCE, - TT_MS_LANGID_OCCITAN_FRANCE, TT_MS_LANGID_CORSICAN_FRANCE, - TT_MS_LANGID_ALSATIAN_FRANCE, TT_MS_LANGID_YAKUT_RUSSIA, - TT_MS_LANGID_KICHE_GUATEMALA, TT_MS_LANGID_KINYARWANDA_RWANDA, - TT_MS_LANGID_WOLOF_SENEGAL, TT_MS_LANGID_DARI_AFGHANISTAN): New - macros. + * include/freetype/internal/ftobjs.h: Include FT_INTERNAL_CALC_H. + (FT_PAD_ROUND_LONG, FT_PAD_CEIL_LONG, FT_PIX_ROUND_LONG, + FT_PIX_CEIL_LONG): New macros. + (FT_PAD_ROUND_INT32, FT_PAD_CEIL_INT32, FT_PIX_ROUND_INT32, + FT_PIX_CEIL_INT32): New macros. - (TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC): Fix value. +2017-06-09 Werner Lemberg <wl(a)gnu.org> - (TT_MS_LANGID_GERMAN_LIECHTENSTEIN, TT_MS_LANGID_CATALAN_CATALAN, - TT_MS_LANGID_CHINESE_MACAO, TT_MS_LANGID_SPANISH_SPAIN_MODERN_SORT, - TT_MS_LANGID_KOREAN_KOREA, TT_MS_LANGID_ROMANSH_SWITZERLAND, - TT_MS_LANGID_SLOVENIAN_SLOVENIA, TT_MS_LANGID_BASQUE_BASQUE, - TT_MS_LANGID_SETSWANA_SOUTH_AFRICA, - TT_MS_LANGID_ISIXHOSA_SOUTH_AFRICA, - TT_MS_LANGID_ISIZULU_SOUTH_AFRICA, TT_MS_LANGID_KAZAKH_KAZAKHSTAN, - TT_MS_LANGID_KYRGYZ_KYRGYZSTAN, TT_MS_LANGID_KISWAHILI_KENYA, - TT_MS_LANGID_TATAR_RUSSIA, TT_MS_LANGID_ODIA_INDIA, - TT_MS_LANGID_MONGOLIAN_PRC, TT_MS_LANGID_TIBETAN_PRC, - TT_MS_LANGID_WELSH_UNITED_KINGDOM, TT_MS_LANGID_GALICIAN_GALICIAN, - TT_MS_LANGID_SINHALA_SRI_LANKA, TT_MS_LANGID_TAMAZIGHT_ALGERIA, - TT_MS_LANGID_SESOTHO_SA_LEBOA_SOUTH_AFRICA, TT_MS_LANGID_YI_PRC, - TT_MS_LANGID_UIGHUR_PRC): New aliases. + Remove unused macros. - Remove commented out code. + * include/freetype/internal/ftcalc.h (ADD_INT, SUB_INT, MUL_INT, + NEG_INT): Deleted. - (TT_NAME_ID_LIGHT_BACKGROUND, TT_NAME_ID_DARK_BACKGROUND, - TT_NAME_ID_VARIATIONS_PREFIX): New macros. +2017-06-09 Werner Lemberg <wl(a)gnu.org> - (HAVE_LIMIT_ON_IDENTS): Remove macro (which was useless since many - years), use guarded long macros by default and define short versions - as aliases for the long ones. + */*: Remove `OVERFLOW_' prefix. -2017-01-15 Werner Lemberg <wl(a)gnu.org> + This increases readability. - * src/truetype/ttgxvar.c (tt_apply_var): Handle underline parameters - also. +2017-06-07 Werner Lemberg <wl(a)gnu.org> -2017-01-11 Werner Lemberg <wl(a)gnu.org> + [cff, truetype] Integer overflows. - * src/base/ftobjs.c (ft_open_face_internal): Improve tracing. + Reported as -2017-01-11 Werner Lemberg <wl(a)gnu.org> + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2133 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2137 - [truetype] Actually use metrics variation service. + * src/cff/cf2hints.c (cf2_hint_init): Use OVERFLOW_SUB_INT32. - * src/base/ftmm.c: Include FT_SERVICE_METRICS_VARIATIONS_H. - (ft_face_get_mvar_service): New auxiliary function to look up - metrics variation service. - (FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, - FT_Set_Var_Blend_Coordinates): Call metrics variation service. + * src/truetype/ttinterp.c (PROJECT, DUALPROJ): Use + OVERFLOW_SUB_LONG. - * src/truetype/ttobjs.c (tt_face_init): Use metrics variations for - named instances. +2017-06-06 Werner Lemberg <wl(a)gnu.org> -2017-01-11 Werner Lemberg <wl(a)gnu.org> + [cff] Integer overflows. - [truetype] Provide metrics variation service. + Reported as - * include/freetype/internal/services/svmetric.h - (FT_Metrics_Adjust_Func): Reduce number of necessary parameters. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2109 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2110 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2122 - * src/truetype/ttgxvar.c: Include FT_LIST_H. - (tt_size_reset_iterator): New auxiliary function for... - (tt_apply_var): New function. + * src/cff/cf2blues.c (cf2_blues_init): Use OVERFLOW_SUB_INT32. - * src/truetype/ttgxvar.h: Updated. + * src/cff/cf2hints.c (cf2_hintmap_map): Synchronize if-else + branches. - * src/truetype/ttdriver.c (tt_service_metrics_variations): Add - `tt_apply_mvar'. +2017-06-05 Werner Lemberg <wl(a)gnu.org> - * include/freetype/internal/ftserv.h (FT_ServiceCache): Add metrics - variation service. + [cff] Integer overflow. -2017-01-11 Werner Lemberg <wl(a)gnu.org> + Reported as - [truetype] Parse `MVAR' table. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2089 - * src/truetype/ttgxvar.h (MVAR_TAG_XXX): New macros for MVAR tags. - (GX_Value, GX_MVarTable): New structures. - (GX_Blend): Add it. + * src/cff/cffload.c (cff_blend_doBlend): User OVERFLOW_ADD_INT32. - * src/truetype/ttgxvar.c (GX_VALUE_SIZE, GX_VALUE_CASE, - GX_GASP_CASE): New macros. - (ft_var_get_value_pointer): New auxiliary function to get a pointer - to a value from various SFNT tables already stored in `TT_Face'. - (ft_var_load_mvar): New function. - (TT_Get_MM_Var): Call it. - (tt_done_blend): Updated. +2017-06-04 Werner Lemberg <wl(a)gnu.org> -2017-01-11 Werner Lemberg <wl(a)gnu.org> + [cff, truetype] Integer overflows. - [truetype] More preparations for MVAR support. + Reported as - * src/truetype/ttobjs.c (tt_size_reset): Add argument to make - function only recompute ascender, descender, and height. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2075 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2088 - * src/truetype/ttobjs.h: Updated. + * src/cff/cf2font.c (cf2_font_setup): Use OVERFLOW_MUL_INT32. - * src/truetype/ttdriver.c (tt_size_select, tt_size_request): - Updated. + * src/truetype/ttinterp.c (Ins_ISECT): Use OVERFLOW_MUL_LONG, + OVERFLOW_ADD_LONG, and OVERFLOW_SUB_LONG. + +2017-06-03 Werner Lemberg <wl(a)gnu.org> -2017-01-09 Werner Lemberg <wl(a)gnu.org> + [base, cff, truetype] Integer overflows. - [pcf] Disable long family names by default. + Reported as - * include/freetype/config/ftoption.h - (PCF_CONFIG_OPTION_LONG_FAMILY_NAMES): Comment out. + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2060 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2062 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2063 + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2068 -2017-01-09 Werner Lemberg <wl(a)gnu.org> + * src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics): Use + OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. - [pcf] Make long family names configurable. + * src/cff/cf2blues.c (cf2_blues_capture), src/cff/cf2hints.c + (cf2_hintmap_adjustHints): Use OVERFLOW_SUB_INT32. - The change from 2016-09-29 was too radical (except for people using - the openSuSE GNU/Linux distribution). To ameliorate the situation, - PCF_CONFIG_OPTION_LONG_FAMILY_NAMES gets introduced which controls - the feature; if set, a new PCF property option - `no-long-family-names' can be used to switch this feature off. + * src/truetype/ttgload.c (compute_glyph_metrics): User + OVERFLOW_SUB_LONG. - * include/freetype/config/ftoption.h, devel/ftoption.h - (PCF_CONFIG_OPTION_LONG_FAMILY_NAMES): New option. + * src/truetype/ttinterp.c (Direct_Move, Direct_Move_Orig, + Direct_Move_X, Direct_Move_Y, Direct_Move_Orig_X, + Direct_Move_Orig_Y, Move_Zp2_Point, Ins_MSIRP): Use + OVERFLOW_ADD_LONG and OVERFLOW_SUB_LONG. - * include/freetype/ftpcfdrv.h: New header file (only containing - comments currently, used for building the documentation). +2017-06-03 Werner Lemberg <wl(a)gnu.org> ... 31994 lines suppressed ...

6 years, 11 months

02/02: [EXPLORER] Fix the code that requests the taskbar to recalculate the size, after an icon is removed due to missing owner. Also cleaned up the other case.

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c8ed376053a144652298… commit 2c8ed376053a1446522985695c4b413a4a47df47 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Thu Jan 18 00:21:14 2018 +0100 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Jan 18 02:20:20 2018 +0200 [EXPLORER] Fix the code that requests the taskbar to recalculate the size, after an icon is removed due to missing owner. Also cleaned up the other case. --- base/shell/explorer/trayntfy.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index c6bea2976e..b4e6b6d242 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -391,19 +391,10 @@ private: // Alternatively we could search for them periodically (would waste more resources). TRACE("Destroying icon %d with invalid handle hWnd=%08x\n", notifyItem->uID, notifyItem->hWnd); - HWND parentHWND = GetParent(); - parentHWND = ::GetParent(parentHWND); - - RECT windowRect; - ::GetClientRect(parentHWND, &windowRect); - RemoveButton(notifyItem); - SendMessage(parentHWND, - WM_SIZE, - 0, - MAKELONG(windowRect.right - windowRect.left, - windowRect.bottom - windowRect.top)); + HWND parentHWND = ::GetParent(::GetParent(GetParent())); + ::SendMessage(parentHWND, WM_SIZE, 0, 0); return; } @@ -588,12 +579,7 @@ public: { SYS_PAGER_COPY_DATA * data; NOTIFYICONDATA *iconData; - HWND parentHWND; - RECT windowRect; BOOL ret = FALSE; - parentHWND = GetParent(); - parentHWND = ::GetParent(parentHWND); - ::GetClientRect(parentHWND, &windowRect); int VisibleButtonCount = Toolbar.GetVisibleButtonCount(); @@ -619,7 +605,8 @@ public: if (VisibleButtonCount != Toolbar.GetVisibleButtonCount()) { - SendMessage(parentHWND, WM_SIZE, 0, 0); + HWND parentHWND = ::GetParent(GetParent()); + ::SendMessage(parentHWND, WM_SIZE, 0, 0); } return ret;

6 years, 11 months

01/02: [EXPLORER] Fix some issues with the notification area code, and implement NIS_SHAREDICON while at it.

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74e58d938eade6b2412f8… commit 74e58d938eade6b2412f828289b81776a83af534 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Tue Jan 16 22:11:14 2018 +0100 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Jan 18 02:20:20 2018 +0200 [EXPLORER] Fix some issues with the notification area code, and implement NIS_SHAREDICON while at it. --- base/shell/explorer/trayntfy.cpp | 177 +++++++++++++++++++++++++++++---------- 1 file changed, 131 insertions(+), 46 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 95c40aa723..c6bea2976e 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -77,16 +77,41 @@ public: return -1; } + int FindExistingSharedIcon(HICON handle) + { + int count = GetButtonCount(); + for (int i = 0; i < count; i++) + { + NOTIFYICONDATA * data = GetItemData(i); + if (data->hIcon == handle) + { + TBBUTTON btn; + GetButton(i, &btn); + return btn.iBitmap; + } + } + + return -1; + } + BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; NOTIFYICONDATA * notifyItem; WCHAR text[] = L""; + TRACE("Adding icon %d from hWnd %08x flags%s%s state%s%s", + iconData->uID, iconData->hWnd, + (iconData->uFlags & NIF_ICON) ? " ICON" : "", + (iconData->uFlags & NIF_STATE) ? " STATE" : "", + (iconData->dwState & NIS_HIDDEN) ? " HIDDEN" : "", + (iconData->dwState & NIS_SHAREDICON) ? " SHARED" : ""); + int index = FindItemByIconData(iconData, &notifyItem); if (index >= 0) { - return UpdateButton(iconData); + TRACE("Icon %d from hWnd %08x ALREADY EXISTS!", iconData->uID, iconData->hWnd); + return FALSE; } notifyItem = new NOTIFYICONDATA(); @@ -101,6 +126,11 @@ public: tbBtn.iString = (INT_PTR) text; tbBtn.idCommand = GetButtonCount(); + if (iconData->uFlags & NIF_STATE) + { + notifyItem->dwState = iconData->dwState & iconData->dwStateMask; + } + if (iconData->uFlags & NIF_MESSAGE) { notifyItem->uCallbackMessage = iconData->uCallbackMessage; @@ -108,8 +138,22 @@ public: if (iconData->uFlags & NIF_ICON) { - notifyItem->hIcon = (HICON)CopyImage(iconData->hIcon, IMAGE_ICON, 0, 0, 0); - tbBtn.iBitmap = ImageList_AddIcon(m_ImageList, iconData->hIcon); + notifyItem->hIcon = iconData->hIcon; + BOOL hasSharedIcon = notifyItem->dwState & NIS_SHAREDICON; + if (hasSharedIcon) + { + INT iIcon = FindExistingSharedIcon(notifyItem->hIcon); + if (iIcon < 0) + { + notifyItem->hIcon = NULL; + TRACE("Shared icon requested, but HICON not found!!!"); + } + tbBtn.iBitmap = iIcon; + } + else + { + tbBtn.iBitmap = ImageList_AddIcon(m_ImageList, notifyItem->hIcon); + } } if (iconData->uFlags & NIF_TIP) @@ -118,15 +162,10 @@ public: } m_VisibleButtonCount++; - if (iconData->uFlags & NIF_STATE) + if (notifyItem->dwState & NIS_HIDDEN) { - notifyItem->dwState &= ~iconData->dwStateMask; - notifyItem->dwState |= (iconData->dwState & iconData->dwStateMask); - if (notifyItem->dwState & NIS_HIDDEN) - { - tbBtn.fsState |= TBSTATE_HIDDEN; - m_VisibleButtonCount--; - } + tbBtn.fsState |= TBSTATE_HIDDEN; + m_VisibleButtonCount--; } /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ @@ -142,34 +181,28 @@ public: NOTIFYICONDATA * notifyItem; TBBUTTONINFO tbbi = { 0 }; + TRACE("Updating icon %d from hWnd %08x flags%s%s state%s%s", + iconData->uID, iconData->hWnd, + (iconData->uFlags & NIF_ICON) ? " ICON" : "", + (iconData->uFlags & NIF_STATE) ? " STATE" : "", + (iconData->dwState & NIS_HIDDEN) ? " HIDDEN" : "", + (iconData->dwState & NIS_SHAREDICON) ? " SHARED" : ""); + int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) { + WARN("Icon %d from hWnd %08x DOES NOT EXIST!", iconData->uID, iconData->hWnd); return AddButton(iconData); } + TBBUTTON btn; + GetButton(index, &btn); + int oldIconIndex = btn.iBitmap; + tbbi.cbSize = sizeof(tbbi); tbbi.dwMask = TBIF_BYINDEX | TBIF_COMMAND; tbbi.idCommand = index; - if (iconData->uFlags & NIF_MESSAGE) - { - notifyItem->uCallbackMessage = iconData->uCallbackMessage; - } - - if (iconData->uFlags & NIF_ICON) - { - DestroyIcon(notifyItem->hIcon); - notifyItem->hIcon = (HICON)CopyImage(iconData->hIcon, IMAGE_ICON, 0, 0, 0); - tbbi.dwMask |= TBIF_IMAGE; - tbbi.iImage = ImageList_ReplaceIcon(m_ImageList, index, iconData->hIcon); - } - - if (iconData->uFlags & NIF_TIP) - { - StringCchCopy(notifyItem->szTip, _countof(notifyItem->szTip), iconData->szTip); - } - if (iconData->uFlags & NIF_STATE) { if (iconData->dwStateMask & NIS_HIDDEN && @@ -192,6 +225,41 @@ public: notifyItem->dwState |= (iconData->dwState & iconData->dwStateMask); } + if (iconData->uFlags & NIF_MESSAGE) + { + notifyItem->uCallbackMessage = iconData->uCallbackMessage; + } + + if (iconData->uFlags & NIF_ICON) + { + BOOL hasSharedIcon = notifyItem->dwState & NIS_SHAREDICON; + if (hasSharedIcon) + { + INT iIcon = FindExistingSharedIcon(iconData->hIcon); + if (iIcon >= 0) + { + notifyItem->hIcon = iconData->hIcon; + tbbi.dwMask |= TBIF_IMAGE; + tbbi.iImage = iIcon; + } + else + { + TRACE("Shared icon requested, but HICON not found!!! IGNORING!"); + } + } + else + { + notifyItem->hIcon = iconData->hIcon; + tbbi.dwMask |= TBIF_IMAGE; + tbbi.iImage = ImageList_ReplaceIcon(m_ImageList, oldIconIndex, notifyItem->hIcon); + } + } + + if (iconData->uFlags & NIF_TIP) + { + StringCchCopy(notifyItem->szTip, _countof(notifyItem->szTip), iconData->szTip); + } + /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ SetButtonInfo(index, &tbbi); @@ -203,34 +271,48 @@ public: { NOTIFYICONDATA * notifyItem; + TRACE("Removing icon %d from hWnd %08x", iconData->uID, iconData->hWnd); + int index = FindItemByIconData(iconData, &notifyItem); if (index < 0) + { + TRACE("Icon %d from hWnd %08x ALREADY MISSING!", iconData->uID, iconData->hWnd); + return FALSE; + } if (!(notifyItem->dwState & NIS_HIDDEN)) { m_VisibleButtonCount--; } - DestroyIcon(notifyItem->hIcon); - - delete notifyItem; - - ImageList_Remove(m_ImageList, index); + if (!(notifyItem->dwState & NIS_SHAREDICON)) + { + TBBUTTON btn; + GetButton(index, &btn); + int oldIconIndex = btn.iBitmap; + ImageList_Remove(m_ImageList, oldIconIndex); - int count = GetButtonCount(); + // Update other icons! + int count = GetButtonCount(); + for (int i = 0; i < count; i++) + { + TBBUTTON btn; + GetButton(i, &btn); - /* shift all buttons one index to the left -- starting one index right - from item to delete -- to preserve their correct icon and tip */ - for (int i = index; i < count - 1; i++) - { - notifyItem = GetItemData(i + 1); - SetItemData(i, notifyItem); - UpdateButton(notifyItem); + if (btn.iBitmap > oldIconIndex) + { + TBBUTTONINFO tbbi2 = { 0 }; + tbbi2.cbSize = sizeof(tbbi2); + tbbi2.dwMask = TBIF_BYINDEX | TBIF_IMAGE; + tbbi2.iImage = btn.iBitmap-1; + SetButtonInfo(i, &tbbi2); + } + } } - /* Delete the right-most, now obsolete button */ - DeleteButton(count - 1); + delete notifyItem; + DeleteButton(index); return TRUE; } @@ -269,7 +351,10 @@ public: for (int i = 0; i < count; i++) { NOTIFYICONDATA * data = GetItemData(i); - INT iIcon = ImageList_AddIcon(iml, data->hIcon); + BOOL hasSharedIcon = data->dwState & NIS_SHAREDICON; + INT iIcon = hasSharedIcon ? FindExistingSharedIcon(data->hIcon) : -1; + if (iIcon < 0) + iIcon = ImageList_AddIcon(iml, data->hIcon); TBBUTTONINFO tbbi = { sizeof(tbbi), TBIF_BYINDEX | TBIF_IMAGE, 0, iIcon}; SetButtonInfo(i, &tbbi); } @@ -304,7 +389,7 @@ private: { // We detect and destroy icons with invalid handles only on mouse move over systray, same as MS does. // Alternatively we could search for them periodically (would waste more resources). - TRACE("destroying icon with invalid handle\n"); + TRACE("Destroying icon %d with invalid handle hWnd=%08x\n", notifyItem->uID, notifyItem->hWnd); HWND parentHWND = GetParent(); parentHWND = ::GetParent(parentHWND);

6 years, 11 months

← Newer
1
...
24
25
26
27
28
29
30
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018