Make GetPrinterDriverDirectoryA pass all tests.

8780853a · Stefan Leichter · Alexandre Julliard · 88b11064 · 8780853a
Commit 8780853a authored Jan 15, 2003 by Stefan Leichter Committed by Alexandre Julliard Jan 15, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

info.c dlls/winspool/info.c +4 -3

No files found.
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -2505,11 +2505,12 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
    ret = GetPrinterDriverDirectoryW( nameW.Buffer, environmentW.Buffer, Level,
 				      (LPBYTE)driverDirectoryW, len, &pcbNeededW );
    if (ret) {
-        ret = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1, 
+        DWORD needed;
+        needed = 1 + WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1, 
                                   pDriverDirectory, cbBuf, NULL, NULL);
        if(pcbNeeded)
-            *pcbNeeded = WideCharToMultiByte( CP_ACP, 0, driverDirectoryW, -1,
-                                              NULL, 0, NULL, NULL);
+            *pcbNeeded = needed;
+        ret = (needed <= cbBuf) ? TRUE : FALSE;
    } else 
        if(pcbNeeded) *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR);