Append .DRV to name only if no extension present.

5138a352 · Dmitry Timoshkov · Alexandre Julliard · 7d64d7d1 · 5138a352
Commit 5138a352 authored Aug 18, 2000 by Dmitry Timoshkov Committed by Alexandre Julliard Aug 18, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

prtdrv.c graphics/win16drv/prtdrv.c +7 -2

No files found.
--- a/graphics/win16drv/prtdrv.c
+++ b/graphics/win16drv/prtdrv.c
@@ -167,10 +167,15 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver)
    }

    {
-        char *drvName = malloc(strlen(pszDriver)+5);
+        char *p, *drvName = HeapAlloc(GetProcessHeap(), 0, strlen(pszDriver) + 5);
        strcpy(drvName, pszDriver);
-        strcat(drvName, ".DRV");
+
+	/* Append .DRV to name if no extension present */
+	if (!(p = strrchr(drvName, '.')) || strchr(p, '/') || strchr(p, '\\'))
+	    strcat(drvName, ".DRV");
+
        hInst = LoadLibrary16(drvName);
+	HeapFree(GetProcessHeap(), 0, drvName);
    }