Changeset 21627 for trunk/src

Timestamp:

Apr 19, 2011, 1:17:40 AM (14 years ago)

Author:

dmik

Message:

winspool: Implemented GetPrinter* Unicode API.

File:

• trunk/src/winspool/winspool.cpp (modified) (4 diffs)

trunk/src/winspool/winspool.cpp

@@ -2486 +2486 @@
               LPDWORD pcbNeeded)
 {
-  dprintf(("WINSPOOL: GetPrinterW not implemented\n"));
-  return (FALSE);
+        return WINSPOOL_GetPrinter(hPrinter, Level, pPrinter, cbBuf, pcbNeeded,
+                                   TRUE);
 }
 
@@ -2555 +2555 @@
               LPDWORD pcbNeeded)
 {
-  dprintf(("WINSPOOL: GetPrinterDriverW not implemented\n"));
-  return (FALSE);
+    return WINSPOOL_GetPrinterDriver(hPrinter, pEnvironment, Level, pDriverInfo,
+                    cbBuf, pcbNeeded, TRUE);
 }
 
@@ -2614 +2614 @@
     }
     return TRUE;
-
 }
 
@@ -2645 +2644 @@
               LPDWORD pcbNeeded)
 {
-  dprintf(("WINSPOOL: GetPrinterDriverDirectoryW not implemented\n"));
-  return (FALSE);
+    DWORD needed;
+
+        TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), pEnvironment, Level,
+          pDriverDirectory, cbBuf, pcbNeeded);
+        if(pName != NULL) {
+                FIXME("pName = `%s' - unsupported\n", debugstr_w(pName));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+        }
+        if(pEnvironment != NULL) {
+                FIXME("pEnvironment = `%s' - unsupported\n", debugstr_w(pEnvironment));
+        SetLastError(ERROR_INVALID_ENVIRONMENT);
+        return FALSE;
+        }
+        if(Level != 1)  /* win95 ignores this so we just carry on */
+                WARN("Level = %ld - assuming 1\n", Level);
+
+    /* FIXME should read from registry */
+    needed = GetSystemDirectoryW((LPWSTR)pDriverDirectory, cbBuf);
+    needed++;
+    if(pcbNeeded)
+        *pcbNeeded = needed;
+    if(needed > cbBuf) {
+        SetLastError(ERROR_INSUFFICIENT_BUFFER);
+    return FALSE;
+    }
+    return TRUE;
 }