chore: up

waitingsong · Jun 27, 2024 · 6e47ada · 6e47ada
1 parent e012244
commit 6e47ada
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/packages/win32-api/src/util/winspool/EnumPrintersW.ts b/packages/win32-api/src/util/winspool/EnumPrintersW.ts
@@ -1,16 +1,16 @@
 import assert from 'node:assert'
 
 import ffi from 'koffi'
-import { } from 'win32-def/struct'
-
-import { load, LibWinspool } from '##/lib/winspool/index.js'
-
 import {
-  type EnumPrintersOptions,
   type EnumPrinters_Level,
   type EnumPrinters_Level_X_Type,
+  PRINTER_INFO_X_Factory,
   getPRINTER_INFO_X_Ptr,
-} from './winspool.types.js'
+} from 'win32-def/struct'
+
+import { load, LibWinspool } from '##/lib/winspool/index.js'
+
+import { type EnumPrintersOptions } from './winspool.types.js'
 
 
 const fnName: keyof LibWinspool = 'EnumPrintersW'
@@ -42,6 +42,8 @@ export async function EnumPrintersW<Level extends EnumPrinters_Level>(
   const pcbNeeded = Buffer.alloc(4)
   const pcReturned = Buffer.alloc(4)
 
+  PRINTER_INFO_X_Factory(level)
+
   const ret = await lib.EnumPrintersW_Async(
     options.Flags,
     name,
@@ -57,7 +59,7 @@ export async function EnumPrintersW<Level extends EnumPrinters_Level>(
   // const pcb = pcbNeeded.readUInt32LE()
 
   const ptr = getPRINTER_INFO_X_Ptr(level)
-  const key = ptr.split('_')[0] // 'PRINTER_INFO_1' | 'PRINTER_INFO_2'
+  const key = ptr.split(' ')[0] // 'PRINTER_INFO_1' | 'PRINTER_INFO_2'
   const decodeType = `${key}[${count}]`
 
   const infoArr = ffi.decode(buf, decodeType) as EnumPrinters_Level_X_Type<Level>[]

diff --git a/packages/win32-api/src/util/winspool/winspool.types.ts b/packages/win32-api/src/util/winspool/winspool.types.ts
@@ -1,12 +1,6 @@
 import type { EnumPrinters_Level } from 'win32-def/types'
 
 
-export {
-  type EnumPrinters_Level_X_Type,
-  getPRINTER_INFO_X_Ptr,
-} from 'win32-def/struct'
-export type { EnumPrinters_Level }
-
 export interface EnumPrintersOptions<Level extends EnumPrinters_Level> {
   Level: Level
   /**

diff --git a/packages/win32-api/test/util/winspool/200.EnumPrintersW.test.ts b/packages/win32-api/test/util/winspool/200.EnumPrintersW.test.ts
@@ -6,7 +6,7 @@ import { PrinterEnumFlags } from 'win32-def/consts'
 import { EnumPrintersW } from '##/index.util.js'
 
 
-describe.only(fileShortPath(import.meta.url), () => {
+describe(fileShortPath(import.meta.url), () => {
   describe('EnumPrintersW()', () => {
     it('PRINTER_ENUM_LOCAL Level=1', async () => {
       const Level = 1