ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

printing: Don't limit the printer name length to CCHDEVICENAME characters.

This commit is contained in:
Huw Davies 2006-06-15 11:36:00 +01:00 committed by Alexandre Julliard
parent 36bf71c174
commit 7afe18ec27
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wineps.drv/init.c
View File

@ -302,7 +302,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi
{ {
PSDRV_PDEVICE *physDev; PSDRV_PDEVICE *physDev;
PRINTERINFO *pi; PRINTERINFO *pi;
char deviceA[CCHDEVICENAME]; char *deviceA;
/* If no device name was specified, retrieve the device name /* If no device name was specified, retrieve the device name
* from the DEVMODE structure from the DC's physDev. * from the DEVMODE structure from the DC's physDev.
@ -310,12 +310,20 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi
if ( !device && *pdev ) if ( !device && *pdev )
{ {
physDev = *pdev; physDev = *pdev;
deviceA = HeapAlloc(GetProcessHeap(), 0, CCHDEVICENAME);
lstrcpynA(deviceA, (LPCSTR)physDev->Devmode->dmPublic.dmDeviceName, CCHDEVICENAME); lstrcpynA(deviceA, (LPCSTR)physDev->Devmode->dmPublic.dmDeviceName, CCHDEVICENAME);
} }
else else
WideCharToMultiByte(CP_ACP, 0, device, -1, deviceA, sizeof(deviceA), NULL, NULL); {
DWORD len = WideCharToMultiByte(CP_ACP, 0, device, -1, NULL, 0, NULL, NULL);
deviceA = HeapAlloc(GetProcessHeap(), 0, len);
WideCharToMultiByte(CP_ACP, 0, device, -1, deviceA, len, NULL, NULL);
}
pi = PSDRV_FindPrinterInfo(deviceA); pi = PSDRV_FindPrinterInfo(deviceA);
HeapFree(GetProcessHeap(), 0, deviceA);
deviceA = NULL;
TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device), TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device),
debugstr_w(output), initData); debugstr_w(output), initData);

21
dlls/winspool.drv/info.c
View File

@ -2032,13 +2032,6 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
SetLastError(ERROR_INVALID_LEVEL); SetLastError(ERROR_INVALID_LEVEL);
return 0; return 0;
} }
if (strlenW(pi->pPrinterName) >= CCHDEVICENAME) {
ERR("Printername %s must not exceed length of DEVMODE.dmDeviceName !\n",
debugstr_w(pi->pPrinterName)
);
SetLastError(ERROR_INVALID_LEVEL);
return 0;
}
if(!pPrinter) { if(!pPrinter) {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return 0; return 0;
@ -2109,19 +2102,19 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
dmW = pi->pDevMode; dmW = pi->pDevMode;
else else
{ {
dmW = HeapAlloc(GetProcessHeap(), 0, size); dmW = HeapAlloc(GetProcessHeap(), 0, size);
ZeroMemory(dmW,size); ZeroMemory(dmW,size);
dmW->dmSize = size; dmW->dmSize = size;
if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER))
{ {
WARN("DocumentPropertiesW on printer '%s' failed!\n", debugstr_w(pi->pPrinterName)); WARN("DocumentPropertiesW on printer '%s' failed!\n", debugstr_w(pi->pPrinterName));
HeapFree(GetProcessHeap(),0,dmW); HeapFree(GetProcessHeap(),0,dmW);
dmW=NULL; dmW=NULL;
} }
else else
{ {
/* set devmode to printer name */ /* set devmode to printer name */
strcpyW(dmW->dmDeviceName,pi->pPrinterName); lstrcpynW(dmW->dmDeviceName, pi->pPrinterName, CCHDEVICENAME);
} }
} }