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

winspool.drv: Outlook 2003 relies on the buffer size returned by EnumPrintersA being big enough to hold the buffer returned by EnumPrintersW.

This commit is contained in:
Huw Davies 2006-12-04 14:32:36 +00:00 committed by Alexandre Julliard
parent 9c58bce158
commit 9108eede84
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4039,13 +4039,14 @@ BOOL WINAPI EnumPrintersA(DWORD dwType, LPSTR lpszName,
DWORD cbBuf, LPDWORD lpdwNeeded,
LPDWORD lpdwReturned)
{
BOOL ret;
BOOL ret, unicode = FALSE;
UNICODE_STRING lpszNameW;
PWSTR pwstrNameW;
pwstrNameW = asciitounicode(&lpszNameW,lpszName);
if(!cbBuf) unicode = TRUE; /* return a buffer that's big enough for the unicode version */
ret = WINSPOOL_EnumPrinters(dwType, pwstrNameW, dwLevel, lpbPrinters, cbBuf,
lpdwNeeded, lpdwReturned, FALSE);
lpdwNeeded, lpdwReturned, unicode);
RtlFreeUnicodeString(&lpszNameW);
return ret;
}

24
dlls/winspool.drv/tests/info.c
View File

@ -1638,6 +1638,28 @@ static void test_DocumentProperties(void)
ok(ret, "ClosePrinter error %d\n", GetLastError());
}
static void test_EnumPrinters(void)
{
DWORD neededA, neededW, num;
DWORD ret;
SetLastError(0xdeadbeef);
ret = EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededA, &num);
ok(ret == 0, "ret %d\n", ret);
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError());
ok(num == 0, "num %d\n", num);
SetLastError(0xdeadbeef);
EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededW, &num);
ok(ret == 0, "ret %d\n", ret);
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError());
ok(num == 0, "num %d\n", num);
/* Outlook2003 relies on the buffer size returned by EnumPrintersA being big enough
to hold the buffer returned by EnumPrintersW */
ok(neededA == neededW, "neededA %d neededW %d\n", neededA, neededW);
}
START_TEST(info)
{
LPSTR default_printer;
@ -1664,4 +1686,6 @@ START_TEST(info)
test_OpenPrinter();
test_GetPrinterDriver();
test_SetDefaultPrinter();
test_EnumPrinters();
}