mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

createDC can accept a null init data. We need to handle this or crash.

This commit is contained in:
dougt%meer.net 2005-06-22 05:18:46 +00:00
Родитель c135a26410
Коммит 89ec1db032
1 изменённых файлов: 33 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

63
build/wince/shunt/win32A.cpp
Просмотреть файл

@ -534,39 +534,42 @@ MOZCE_SHUNT_API HDC mozce_CreateDCA(LPCSTR inDriver, LPCSTR inDevice, LPCSTR inO
LPTSTR wDriver = a2w_malloc(inDriver, -1, NULL);
LPTSTR wDevice = a2w_malloc(inDevice, -1, NULL);
LPTSTR wOutput = a2w_malloc(inOutput, -1, NULL);
DEVMODE wInitData;
if (inInitData)
{
memset(&wInitData, 0, sizeof(wInitData));
DEVMODE wInitData;
memset(&wInitData, 0, sizeof(wInitData));
wInitData.dmSpecVersion = inInitData->dmSpecVersion;
wInitData.dmDriverVersion = inInitData->dmDriverVersion;
wInitData.dmSize = inInitData->dmSize;
wInitData.dmDriverExtra = inInitData->dmDriverExtra;
wInitData.dmFields = inInitData->dmFields;
wInitData.dmOrientation = inInitData->dmOrientation;
wInitData.dmPaperSize = inInitData->dmPaperSize;
wInitData.dmPaperLength = inInitData->dmPaperLength;
wInitData.dmPaperWidth = inInitData->dmPaperWidth;
wInitData.dmScale = inInitData->dmScale;
wInitData.dmCopies = inInitData->dmCopies;
wInitData.dmDefaultSource = inInitData->dmDefaultSource;
wInitData.dmPrintQuality = inInitData->dmPrintQuality;
wInitData.dmColor = inInitData->dmColor;
wInitData.dmDuplex = inInitData->dmDuplex;
wInitData.dmYResolution = inInitData->dmYResolution;
wInitData.dmTTOption = inInitData->dmTTOption;
wInitData.dmCollate = inInitData->dmCollate;
wInitData.dmLogPixels = inInitData->dmLogPixels;
wInitData.dmBitsPerPel = inInitData->dmBitsPerPel;
wInitData.dmPelsWidth = inInitData->dmPelsWidth;
wInitData.dmPelsHeight = inInitData->dmPelsHeight;
wInitData.dmDisplayFlags = inInitData->dmDisplayFlags;
wInitData.dmDisplayFrequency = inInitData->dmDisplayFrequency;
wInitData.dmSpecVersion = inInitData->dmSpecVersion;
wInitData.dmDriverVersion = inInitData->dmDriverVersion;
wInitData.dmSize = inInitData->dmSize;
wInitData.dmDriverExtra = inInitData->dmDriverExtra;
wInitData.dmFields = inInitData->dmFields;
wInitData.dmOrientation = inInitData->dmOrientation;
wInitData.dmPaperSize = inInitData->dmPaperSize;
wInitData.dmPaperLength = inInitData->dmPaperLength;
wInitData.dmPaperWidth = inInitData->dmPaperWidth;
wInitData.dmScale = inInitData->dmScale;
wInitData.dmCopies = inInitData->dmCopies;
wInitData.dmDefaultSource = inInitData->dmDefaultSource;
wInitData.dmPrintQuality = inInitData->dmPrintQuality;
wInitData.dmColor = inInitData->dmColor;
wInitData.dmDuplex = inInitData->dmDuplex;
wInitData.dmYResolution = inInitData->dmYResolution;
wInitData.dmTTOption = inInitData->dmTTOption;
wInitData.dmCollate = inInitData->dmCollate;
wInitData.dmLogPixels = inInitData->dmLogPixels;
wInitData.dmBitsPerPel = inInitData->dmBitsPerPel;
wInitData.dmPelsWidth = inInitData->dmPelsWidth;
wInitData.dmPelsHeight = inInitData->dmPelsHeight;
wInitData.dmDisplayFlags = inInitData->dmDisplayFlags;
wInitData.dmDisplayFrequency = inInitData->dmDisplayFrequency;
a2w_buffer((LPCSTR)inInitData->dmDeviceName, -1, wInitData.dmDeviceName, charcount(wInitData.dmDeviceName));
a2w_buffer((LPCSTR)inInitData->dmFormName, -1, wInitData.dmFormName, charcount(wInitData.dmFormName));
}
a2w_buffer((LPCSTR)inInitData->dmDeviceName, -1, wInitData.dmDeviceName, charcount(wInitData.dmDeviceName));
a2w_buffer((LPCSTR)inInitData->dmFormName, -1, wInitData.dmFormName, charcount(wInitData.dmFormName));
retval = CreateDC(wDriver, wDevice, wOutput, &wInitData);
retval = CreateDC(wDriver, wDevice, wOutput, inInitData ? &wInitData : NULL);
if(NULL != wDriver)
{