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

Make sure DrvGetPrinterData returns the correct data if cbData <= 1

Browse Source
This commit is contained in:
Huw D M Davies 1999-01-26 10:07:39 +00:00 committed by Alexandre Julliard
parent a4c8445ba3
commit d92c95d522
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/printdrv.c
View File

@ -138,14 +138,14 @@ INT32 WINAPI AbortDoc32(HDC32 hdc)
* Helper for DrvGetPrinterData * Helper for DrvGetPrinterData
*/ */
static DWORD DrvGetPrinterDataInternal(LPSTR RegStr_Printer, static DWORD DrvGetPrinterDataInternal(LPSTR RegStr_Printer,
LPBYTE lpPrinterData, int cbData) LPBYTE lpPrinterData, int cbData, int what)
{ {
DWORD res = -1; DWORD res = -1;
HKEY hkey; HKEY hkey;
DWORD dwType, cbQueryData; DWORD dwType, cbQueryData;
if (!(RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey))) { if (!(RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey))) {
if (cbData > 1) { /* "Default DevMode" */ if (what == INT_PD_DEFAULT_DEVMODE) { /* "Default DevMode" */
if (!(RegQueryValueEx32A(hkey, DefaultDevMode, 0, &dwType, 0, &cbQueryData))) { if (!(RegQueryValueEx32A(hkey, DefaultDevMode, 0, &dwType, 0, &cbQueryData))) {
if (!lpPrinterData) if (!lpPrinterData)
res = cbQueryData; res = cbQueryData;
@ -200,7 +200,8 @@ DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) && if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) &&
(!strcmp(lpProfile, DefaultDevMode)))) { (!strcmp(lpProfile, DefaultDevMode)))) {
size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, cbData); size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, cbData,
INT_PD_DEFAULT_DEVMODE);
if (size+1) { if (size+1) {
*lpNeeded = size; *lpNeeded = size;
if ((lpPrinterData) && (*lpNeeded > cbData)) if ((lpPrinterData) && (*lpNeeded > cbData))
@ -217,7 +218,8 @@ DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
res = ERROR_MORE_DATA; res = ERROR_MORE_DATA;
goto failed; goto failed;
} }
size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, 1); size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, cbData,
INT_PD_DEFAULT_MODEL);
if ((size+1) && (lpType)) if ((size+1) && (lpType))
*lpType = REG_SZ; *lpType = REG_SZ;
else else