Author: cwittich Date: Mon Aug 15 17:04:05 2016 New Revision: 72230 URL: http://svn.reactos.org/svn/reactos?rev=72230&view=rev Log: [GDI32] sync GetICMProfileA to wine
Modified: trunk/reactos/win32ss/gdi/gdi32/objects/icm.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/icm.c?rev=72230&r1=72229&r2=72230&view=diff ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/icm.c [iso-8859-1] Mon Aug 15 17:04:05 2016 @@ -144,11 +144,18 @@ DWORD buflen = MAX_PATH; BOOL ret = FALSE; - if (!hdc || !pBufSize || !pszFilename) return FALSE; + if (!hdc || !pBufSize) return FALSE; if (GetICMProfileW(hdc, &buflen, filenameW)) { ULONG len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + + if (!pszFilename) + { + *pBufSize = len; + return FALSE; + } + if (*pBufSize >= len) { WideCharToMultiByte(CP_ACP, 0, filenameW, -1, pszFilename, *pBufSize, NULL, NULL);