diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index fde181cc52..93398691aa 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -7,6 +7,7 @@ */ #include "ros_lpk.h" +#include LPK_LPEDITCONTROL_LIST LpkEditControl = {EditCreate, EditIchToXY, EditMouseToIch, EditCchInWidth, EditGetLineWidth, EditDrawText, EditHScroll, EditMoveSelection, @@ -132,8 +133,12 @@ LpkGetCharacterPlacement( lpResults->nGlyphs = (UINT)cGlyphs; if (lpResults->lpGlyphs) - wcscpy(lpResults->lpGlyphs, lpGlyphs); - + { + if (lpGlyphs) + wcscpy(lpResults->lpGlyphs, lpGlyphs); + else + DPRINT1("ERROR: BIDI_Reorder returned lpGlyphs as NULL.\n"); + } if (lpResults->lpDx && !(dwFlags & GCP_GLYPHSHAPE)) { int c;