Clean up some infverif warnings and errors in print samples (#814)

Co-authored-by: Jason Knichel <[email protected]>

8 files changed, 18 insertions, 15 deletions

diff --git a/print/OEM Printer Customization Plug-in Samples/C++/PTPCPlPr/install/ptpcplpr.inf b/print/OEM Printer Customization Plug-in Samples/C++/PTPCPlPr/install/ptpcplpr.inf
index c778b454..29d1a2b1 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/PTPCPlPr/install/ptpcplpr.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/PTPCPlPr/install/ptpcplpr.inf
@@ -11,6 +11,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=09/09/2005,1.0.0.2
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
@@ -29,9 +30,6 @@ DriverVer=09/09/2005,1.0.0.2
 ; that they appear in the INF file.
 ;
 
-[Microsoft]
-"UniDrv PT/PC Plugin Provider"	= PTPCPLPR
-
 [Microsoft.NTx86]
 "UniDrv PT/PC Plugin Provider"	= PTPCPLPR
 
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/bitmap.inf b/print/OEM Printer Customization Plug-in Samples/C++/bitmap.inf
index e189a41d..95792aa5 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/bitmap.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/bitmap.inf
@@ -12,6 +12,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=6/07/2001,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
@@ -30,9 +31,6 @@ DriverVer=6/07/2001,1.0.0.1
 ; that they appear in the INF file.
 ;
 
-[Microsoft]
-"Bitmap Driver"      = BITMAP
-
 [Microsoft.NTx86]
 "Bitmap Driver"      = BITMAP
 
@@ -106,7 +104,7 @@ bitmap.dll    = 100,bitmap\ia64
 bitmap.dll    = 100,bitmap\arm64
 
 [SourceDisksFiles]
-BITMAP.GPD       = 100
+BITMAP.GPD    = 100
 BITMAP.INI    = 100
 
 ;
@@ -122,3 +120,5 @@ DefaultDestDir=66000
 ;
 [Strings]
 MS="Microsoft WDK Sample"
+OEMSample="Sample Disk"
+
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/gdl/res/gdlsmpl.inf b/print/OEM Printer Customization Plug-in Samples/C++/gdl/res/gdlsmpl.inf
index c57b08b1..f96e8d53 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/gdl/res/gdlsmpl.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/gdl/res/gdlsmpl.inf
@@ -13,6 +13,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=01/01/2006,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/oemdll.inf b/print/OEM Printer Customization Plug-in Samples/C++/oemdll.inf
index 0acf810b..46e88c07 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/oemdll.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/oemdll.inf
@@ -13,6 +13,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=6/07/2001,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
@@ -21,7 +22,7 @@ DriverVer=6/07/2001,1.0.0.1
 ; that we will display in the Dialog box
 ;
 [Manufacturer]
-"Microsoft"=Microsoft, NTamd64, NTia64, NTarm64
+"Microsoft"=Microsoft, NTx86, NTamd64, NTia64, NTarm64
 
 ;
 ; Model sections. 
@@ -31,7 +32,7 @@ DriverVer=6/07/2001,1.0.0.1
 ; that they appear in the INF file.
 ;
 
-[Microsoft]
+[Microsoft.NTx86]
 "PostScript WaterMark Sample"          = INSTALL_WATERMARK.PS
 "Unidrv WaterMark Sample"              = INSTALL_WATERMARK.UNI
 "OEM PostScript Customization Sample"  = INSTALL_OEMPS
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/oemprean.inf b/print/OEM Printer Customization Plug-in Samples/C++/oemprean.inf
index f3c014e5..e91115ba 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/oemprean.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/oemprean.inf
@@ -12,6 +12,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=6/07/2001,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
@@ -30,9 +31,6 @@ DriverVer=6/07/2001,1.0.0.1
 ; that they appear in the INF file.
 ;
 
-[Microsoft]
-"OEM Pre-Analysis sample"      = OEM_PREAN
-
 [Microsoft.NTx86]
 "OEM Pre-Analysis sample"      = OEM_PREAN
 
@@ -105,7 +103,7 @@ oemprean.dll    = 100,oemprean\ia64
 oemprean.dll    = 100,oemprean\arm64
 
 [SourceDisksFiles]
-OEMPREAN.GPD       = 100
+OEMPREAN.GPD    = 100
 OEMPREAN.INI    = 100
 
 ;
@@ -121,3 +119,5 @@ DefaultDestDir=66000
 ;
 [Strings]
 MS="Microsoft WDK Sample"
+OEMSample="Sample Disk"
+
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/uisamples.inf b/print/OEM Printer Customization Plug-in Samples/C++/uisamples.inf
index 280386e1..ca31ff3e 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/uisamples.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/uisamples.inf
@@ -13,6 +13,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=6/07/2001,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
@@ -21,7 +22,7 @@ DriverVer=6/07/2001,1.0.0.1
 ; that we will display in the Dialog box
 ;
 [Manufacturer]
-"Microsoft"=Microsoft, NTamd64, NTia64, NTarm64
+"Microsoft"=Microsoft, NTx86, NTamd64, NTia64, NTarm64
 
 ;
 ; Model sections. 
@@ -31,7 +32,7 @@ DriverVer=6/07/2001,1.0.0.1
 ; that they appear in the INF file.
 ;
 
-[Microsoft]
+[Microsoft.NTx86]
 "OEM Custom UI Plugin"  = SYNCSET.UNI
 "OEM Custom Help"       = CUSTHELP.UNI
 
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/uniuirep/res/uniuirep.inf b/print/OEM Printer Customization Plug-in Samples/C++/uniuirep/res/uniuirep.inf
index df4505b6..d696a9d8 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/uniuirep/res/uniuirep.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/uniuirep/res/uniuirep.inf
@@ -13,6 +13,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=06/07/2001,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.
diff --git a/print/OEM Printer Customization Plug-in Samples/C++/winxp.inf b/print/OEM Printer Customization Plug-in Samples/C++/winxp.inf
index 9ca95169..1692dbd5 100644
--- a/print/OEM Printer Customization Plug-in Samples/C++/winxp.inf
+++ b/print/OEM Printer Customization Plug-in Samples/C++/winxp.inf
@@ -12,6 +12,7 @@ LayoutFile=ntprint.inf
 ClassGUID={4D36E979-E325-11CE-BFC1-08002BE10318}
 Class=Printer
 DriverVer=6/07/2001,1.0.0.1
+PnpLockdown=1
 
 ;
 ; Manufacturer section.