fix some build warnings.

Guenther

diff --git a/AddJob.c b/AddJob.c
index dbcaaa194c7dec719dcae5a5e3eb539d6bf5db9d..ab809d0e93c3dbc466bce979f2894e92a9aec183 100644 (file)
--- a/AddJob.c
+++ b/AddJob.c
@@ -53,7 +53,7 @@ int main (int argc, char* argv[])
                }
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PJOB_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for JOB_INFO_1 buffer!\n");
                exit (-1);
@@ -91,7 +91,7 @@ int main (int argc, char* argv[])
                }
        }
 
-       if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer2 = (PJOB_INFO_2)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for JOB_INFO_2 buffer!\n");
                exit (-1);

diff --git a/AddPrinter.c b/AddPrinter.c
index 2df4b65deef8bc15602056164bf38faad6532b9f..a87eee67896af048deb8a6b5b1991897ad7e8a42 100644 (file)
--- a/AddPrinter.c
+++ b/AddPrinter.c
@@ -24,13 +24,13 @@ int main (int argc, char* argv[])
 
        memset(&buffer, 0 , sizeof(buffer));
 
-       buffer.pServerName      = strdup (argv[1]);
-       buffer.pPrinterName = strdup (argv[2]);
-       buffer.pShareName       = strdup (argv[3]);
-       buffer.pPortName        = strdup (argv[4]);
-       buffer.pDriverName      = strdup ("Apple LaserWriter II NTX v51.8");
-       buffer.pPrintProcessor  = strdup ("winprint");
-       buffer.pDatatype        = strdup ("RAW");
+       buffer.pServerName      = _strdup (argv[1]);
+       buffer.pPrinterName     = _strdup (argv[2]);
+       buffer.pShareName       = _strdup (argv[3]);
+       buffer.pPortName        = _strdup (argv[4]);
+       buffer.pDriverName      = _strdup ("Apple LaserWriter II NTX v51.8");
+       buffer.pPrintProcessor  = _strdup ("winprint");
+       buffer.pDatatype        = _strdup ("RAW");
        buffer.Attributes       = PRINTER_ATTRIBUTE_SHARED;
        buffer.pSecurityDescriptor = NULL;
 

diff --git a/AddPrinterDriver.c b/AddPrinterDriver.c
index 787a62692402b54f31664be753a185a91bd5e61a..35cf6d2c9376e3e46f61bf63121ea804cdf432f5 100644 (file)
--- a/AddPrinterDriver.c
+++ b/AddPrinterDriver.c
@@ -25,15 +25,15 @@ int main (int argc, char* argv[])
        /* we'll use the Apple LaserWriter II NTX v51.8 driver
           for simplcity */
        buffer3.cVersion                = 2;
-       buffer3.pEnvironment    = strdup("Windows NT x86");
-       buffer3.pName                   = strdup("Apple LaserWriter II NTX v51.8");
-       buffer3.pDriverPath             = strdup("pscript.dll");
-       buffer3.pDataFile               = strdup("lwntx518.ppd");
-       buffer3.pConfigFile             = strdup("pscriptui.dll");
-       buffer3.pDependentFiles = pDependentFiles;
-       buffer3.pHelpFile               = strdup("pscript.hlp");
+       buffer3.pEnvironment            = _strdup("Windows NT x86");
+       buffer3.pName                   = _strdup("Apple LaserWriter II NTX v51.8");
+       buffer3.pDriverPath             = _strdup("pscript.dll");
+       buffer3.pDataFile               = _strdup("lwntx518.ppd");
+       buffer3.pConfigFile             = _strdup("pscriptui.dll");
+       buffer3.pDependentFiles         = (LPSTR)pDependentFiles;
+       buffer3.pHelpFile               = _strdup("pscript.hlp");
        buffer3.pMonitorName    = NULL;
-       buffer3.pDefaultDataType = strdup("RAW");
+       buffer3.pDefaultDataType        = _strdup("RAW");
 
        printf ("Attempting to add Driver Info Level 3 :\n");
        print_driver_info_3 (&buffer3);
@@ -57,4 +57,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/AddPrinterDriverEx.c b/AddPrinterDriverEx.c
index fc375bed16abd9b11880890baaa1c3bd947f222d..f823e7a85b954ac9e66abe5fa5e0e26d2aba1ae1 100644 (file)
--- a/AddPrinterDriverEx.c
+++ b/AddPrinterDriverEx.c
@@ -14,7 +14,6 @@ int main (int argc, char* argv[])
 {
        DRIVER_INFO_6   buffer;
        BYTE                    pDependentFiles[] = { "PSCRIPT.HLP\0PSCRPTUI.DLL\0PSCRIPT.DLL\0LWNTX518.PPD\0\0" };
-       LPVOID                  lpMsgBuf;
 
        if (argc < 2)
        {
@@ -27,14 +26,14 @@ int main (int argc, char* argv[])
        memset( &buffer, 0, sizeof(DRIVER_INFO_6) );
 
        buffer.cVersion                 = 0;
-       buffer.pEnvironment             = strdup("Windows NT x86");
-       buffer.pName                    = strdup("Apple LaserWriter II NTX v51.8");
-       buffer.pDriverPath              = strdup("pscript.dll");
-       buffer.pDataFile                = strdup("lwntx518.ppd");
-       buffer.pConfigFile              = strdup("pscriptui.dll");
-       buffer.pDependentFiles  = pDependentFiles;
-       buffer.pHelpFile                = strdup("pscript.hlp");
-       buffer.pDefaultDataType = strdup("RAW");
+       buffer.pEnvironment             = _strdup("Windows NT x86");
+       buffer.pName                    = _strdup("Apple LaserWriter II NTX v51.8");
+       buffer.pDriverPath              = _strdup("pscript.dll");
+       buffer.pDataFile                = _strdup("lwntx518.ppd");
+       buffer.pConfigFile              = _strdup("pscriptui.dll");
+       buffer.pDependentFiles          = (LPSTR)pDependentFiles;
+       buffer.pHelpFile                = _strdup("pscript.hlp");
+       buffer.pDefaultDataType         = _strdup("RAW");
 
        printf ("Attempting to add Driver Info Level 6 :\n");
        print_driver_info_6 (&buffer);
@@ -54,4 +53,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/AddPrinterEx.c b/AddPrinterEx.c
index 2df4b65deef8bc15602056164bf38faad6532b9f..a87eee67896af048deb8a6b5b1991897ad7e8a42 100644 (file)
--- a/AddPrinterEx.c
+++ b/AddPrinterEx.c
@@ -24,13 +24,13 @@ int main (int argc, char* argv[])
 
        memset(&buffer, 0 , sizeof(buffer));
 
-       buffer.pServerName      = strdup (argv[1]);
-       buffer.pPrinterName = strdup (argv[2]);
-       buffer.pShareName       = strdup (argv[3]);
-       buffer.pPortName        = strdup (argv[4]);
-       buffer.pDriverName      = strdup ("Apple LaserWriter II NTX v51.8");
-       buffer.pPrintProcessor  = strdup ("winprint");
-       buffer.pDatatype        = strdup ("RAW");
+       buffer.pServerName      = _strdup (argv[1]);
+       buffer.pPrinterName     = _strdup (argv[2]);
+       buffer.pShareName       = _strdup (argv[3]);
+       buffer.pPortName        = _strdup (argv[4]);
+       buffer.pDriverName      = _strdup ("Apple LaserWriter II NTX v51.8");
+       buffer.pPrintProcessor  = _strdup ("winprint");
+       buffer.pDatatype        = _strdup ("RAW");
        buffer.Attributes       = PRINTER_ATTRIBUTE_SHARED;
        buffer.pSecurityDescriptor = NULL;
 

diff --git a/DeletePrinterDriverEx.c b/DeletePrinterDriverEx.c
index 73fbcc4eff7f05c150916ab1ac30e64b2492aaf0..7a9cc0ce8347e5ff796b8292d1c2e9570c514d3b 100644 (file)
--- a/DeletePrinterDriverEx.c
+++ b/DeletePrinterDriverEx.c
@@ -13,8 +13,6 @@
    since that is the one used by the NT Add Printer Wizard */
 int main (int argc, char* argv[])
 {
-       LPVOID                  lpMsgBuf;
-
        if (argc < 3)
        {
                fprintf (stderr, "useage: %s <servername> <arch> <driver name> <version>\n", argv[0]);
@@ -29,4 +27,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/DeletePrinterKey.c b/DeletePrinterKey.c
index 2a30482bb85746e7d7ec17a32057c276cfa44064..b9dc20253daa7b36efd7aa5fbdc45075accba66e 100644 (file)
--- a/DeletePrinterKey.c
+++ b/DeletePrinterKey.c
@@ -12,9 +12,7 @@ int main (int argc, char* argv[])
 {
 
        HANDLE                  printer;
-       DWORD                   returned=0,
-                                       status;
-       LPTSTR                  buffer = NULL;
+       DWORD                   status;
 
 
        if (argc < 2)

diff --git a/DocPrinter.c b/DocPrinter.c
index ccab24d73209c829ae6664f6153e50e60fa758ea..b6000e66e053a4b70ed809ecee2a4310bd6fb109 100644 (file)
--- a/DocPrinter.c
+++ b/DocPrinter.c
@@ -15,7 +15,6 @@ int main (int argc, char* argv[])
 
        HANDLE  printer;
        DOC_INFO_1      buffer;
-       LPVOID  lpMsgBuf;
 
 
        if (argc < 2)
@@ -34,8 +33,8 @@ int main (int argc, char* argv[])
                printf ("Printer [%s] opened successfully.\n\n", argv[1]);
        }
 
-       buffer.pDocName         = strdup("Testing StartDocPrinter");
-       buffer.pDatatype        = strdup("RAW");
+       buffer.pDocName         = _strdup("Testing StartDocPrinter");
+       buffer.pDatatype        = _strdup("RAW");
        buffer.pOutputFile      = NULL;
 
        printf ("Attempting to call StartDocPrinter() using DOC_INFO_1 :\n");
@@ -70,4 +69,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/EnumForms.c b/EnumForms.c
index 104b439137ce58932e65e276e779b2f5da2c2904..234e99379f6ff5c0b4454c3d6683ae67641548de 100644 (file)
--- a/EnumForms.c
+++ b/EnumForms.c
@@ -39,7 +39,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PFORM_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for FORM_INFO_1 buffer!\n");
                exit (-1);
@@ -73,4 +73,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/EnumJobs.c b/EnumJobs.c
index cc3629b25879e9661a5d9acb758d9fcf145c58bf..5a6287d85c5f200bc253969ce8cd801cdb54df63 100644 (file)
--- a/EnumJobs.c
+++ b/EnumJobs.c
@@ -53,7 +53,7 @@ int main (int argc, char* argv[])
                }
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PJOB_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for JOB_INFO_1 buffer!\n");
                exit (-1);
@@ -91,7 +91,7 @@ int main (int argc, char* argv[])
                }
        }
 
-       if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer2 = (PJOB_INFO_2)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for JOB_INFO_2 buffer!\n");
                exit (-1);

diff --git a/EnumMonitors.c b/EnumMonitors.c
index e254cb60072be9ef04d1180c3e7b17879fca03b1..b7ec98dabccddd50846dc6c894fad2fe849a28ee 100644 (file)
--- a/EnumMonitors.c
+++ b/EnumMonitors.c
@@ -30,7 +30,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PMONITOR_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for MONITOR_INFO_1 buffer!\n");
                exit (-1);
@@ -58,7 +58,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer2 = (PMONITOR_INFO_2)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for MONITOR_INFO_2 buffer!\n");
                exit (-1);
@@ -80,4 +80,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/EnumPorts.c b/EnumPorts.c
index 4ee8ffcc9a68d78d81eb4b0bd894d19efd80ed60..365af6a0559ccc385fc334e02288d96b89dda6d0 100644 (file)
--- a/EnumPorts.c
+++ b/EnumPorts.c
@@ -29,7 +29,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PPORT_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for PORT_INFO_1 buffer!\n");
                exit (-1);
@@ -58,7 +58,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer2 = (PPORT_INFO_2)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for PORT_INFO_2 buffer!\n");
                exit (-1);
@@ -85,4 +85,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/EnumPrintProcessorDatatypes.c b/EnumPrintProcessorDatatypes.c
index 0116b0def4fbcdb4f10fecbdb71f43b5d733bfdd..a2efeee73992cb1cfb462f4c53e8b1030b4c95f9 100644 (file)
--- a/EnumPrintProcessorDatatypes.c
+++ b/EnumPrintProcessorDatatypes.c
@@ -36,7 +36,7 @@ int main (int argc, char* argv[])
        }
        else
        {
-               if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer1 = (PDATATYPES_INFO_1)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);

diff --git a/EnumPrintProcessors.c b/EnumPrintProcessors.c
index d3eba7e2818f69461238ed5d738cfcbde3119efe..c78bdab1573e9c309e0517b75a12d140c8d52fef 100644 (file)
--- a/EnumPrintProcessors.c
+++ b/EnumPrintProcessors.c
@@ -37,7 +37,7 @@ int main (int argc, char* argv[])
                        continue;
                }
 
-               if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer1 = (PPRINTPROCESSOR_INFO_1)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);

diff --git a/EnumPrinterDrivers.c b/EnumPrinterDrivers.c
index 3063f018ffb4570ee95de0ae66ee3a49b7cc3fe1..f31057eb809981649d136492ae37f0f61c12a65d 100644 (file)
--- a/EnumPrinterDrivers.c
+++ b/EnumPrinterDrivers.c
@@ -42,7 +42,7 @@ int main (int argc, char* argv[])
                }
                else
                {
-                       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+                       if ((buffer1 = (PDRIVER_INFO_1)malloc(needed)) == NULL)
                        {
                                fprintf (stderr, "Unable to malloc memory for buffer!\n");
                                exit (-1);
@@ -74,7 +74,7 @@ int main (int argc, char* argv[])
                }
                else
                {
-                       if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+                       if ((buffer2 = (PDRIVER_INFO_2)malloc(needed)) == NULL)
                        {
                                fprintf (stderr, "Unable to malloc memory for buffer!\n");
                                exit (-1);
@@ -111,7 +111,7 @@ int main (int argc, char* argv[])
                }
                else
                {
-                       if ((buffer3 = (LPBYTE)malloc(needed)) == NULL)
+                       if ((buffer3 = (PDRIVER_INFO_3)malloc(needed)) == NULL)
                        {
                                fprintf (stderr, "Unable to malloc memory for buffer!\n");
                                exit (-1);

diff --git a/EnumPrinters.c b/EnumPrinters.c
index 06f87e967715f486b1ec628d7a756ae5e135b27b..8b586083079843673be24c86fcdcce06153ef542 100644 (file)
--- a/EnumPrinters.c
+++ b/EnumPrinters.c
@@ -13,7 +13,6 @@ void TestEnumPrinters (LPTSTR servername, DWORD flags)
        DWORD   needed, returned, i;
        PPRINTER_INFO_1 buffer1 = NULL;
        PPRINTER_INFO_2 buffer2 = NULL;
-       PPRINTER_INFO_4 buffer4 = NULL;
        PPRINTER_INFO_5 buffer5 = NULL;
 
        /* INFO LEVEL 1 */
@@ -28,7 +27,7 @@ void TestEnumPrinters (LPTSTR servername, DWORD flags)
        }
        else
        {
-               if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer1 = (PPRINTER_INFO_1)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        return;
@@ -64,7 +63,7 @@ void TestEnumPrinters (LPTSTR servername, DWORD flags)
        }
        else
        {
-               if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer2 = (PPRINTER_INFO_2)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        return;
@@ -96,7 +95,7 @@ void TestEnumPrinters (LPTSTR servername, DWORD flags)
        }
        else
        {
-               if ((buffer5 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer5 = (PPRINTER_INFO_5)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        return;

diff --git a/GetForm.c b/GetForm.c
index f6dd44d227d5881e0749a73c0b21afc58fe01ec5..30928d50f4aa28a982018037977c35d0a5a6c998 100644 (file)
--- a/GetForm.c
+++ b/GetForm.c
@@ -40,7 +40,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PFORM_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for FORM_INFO_1 buffer!\n");
                exit (-1);
@@ -71,4 +71,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/GetJob.c b/GetJob.c
index e2ed99416bb3cbc1af55e2f4eefa8ae7cdf1668a..b30aa62ccdbb01fe3ebe7c9e72422b353180a811 100644 (file)
--- a/GetJob.c
+++ b/GetJob.c
@@ -56,7 +56,7 @@ int main (int argc, char* argv[])
                }
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PJOB_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for JOB_INFO_1 buffer!\n");
                exit (-1);
@@ -94,7 +94,7 @@ int main (int argc, char* argv[])
                }
        }
 
-       if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer2 = (PJOB_INFO_2)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for JOB_INFO_2 buffer!\n");
                exit (-1);

diff --git a/GetPrintProcessorDirectory.c b/GetPrintProcessorDirectory.c
index 9b7e7de5c758a02274fec4873de1e4bd4922c885..0b6986ab50be27cda0b9722fd3b0e20557e604d3 100644 (file)
--- a/GetPrintProcessorDirectory.c
+++ b/GetPrintProcessorDirectory.c
@@ -36,7 +36,7 @@ int main (int argc, char* argv[])
                        continue;
                }
 
-               if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer1 = (LPTSTR)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);

diff --git a/GetPrinter.c b/GetPrinter.c
index c9c2f56a25f99f63b84cf559f388c57238f2491a..c839349419685482b12463a85059aa53ab10ac5e 100644 (file)
--- a/GetPrinter.c
+++ b/GetPrinter.c
@@ -46,7 +46,7 @@ int main (int argc, char* argv[])
        }
        else
        {
-               if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer1 = (PPRINTER_INFO_1)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);
@@ -75,7 +75,7 @@ int main (int argc, char* argv[])
        }
        else
        {
-               if ((buffer2 = (LPBYTE)malloc(needed*2)) == NULL)
+               if ((buffer2 = (PPRINTER_INFO_2)malloc(needed*2)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);
@@ -117,7 +117,7 @@ int main (int argc, char* argv[])
        }
        else
        {
-               if ((buffer5 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer5 = (PPRINTER_INFO_5)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);
@@ -145,7 +145,7 @@ int main (int argc, char* argv[])
        }
        else
        {
-               if ((buffer7 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer7 = (PPRINTER_INFO_7)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);

diff --git a/GetPrinterDriver.c b/GetPrinterDriver.c
index c5ca6a9a052baaccd93d06b32ec1c6e468c67ae7..f208c3a390d9c44721c045a191a7e8ae0ab47157 100644 (file)
--- a/GetPrinterDriver.c
+++ b/GetPrinterDriver.c
@@ -23,8 +23,6 @@ int main (int argc, char* argv[])
        PDRIVER_INFO_1  buffer1 = NULL;
        PDRIVER_INFO_2  buffer2 = NULL;
        PDRIVER_INFO_3  buffer3 = NULL;
-       PDRIVER_INFO_4  buffer4 = NULL;
-       PDRIVER_INFO_5  buffer5 = NULL;
        PDRIVER_INFO_6  buffer6 = NULL;
 
        /* printf ("argc = %d\n", argc);*/
@@ -60,7 +58,7 @@ int main (int argc, char* argv[])
 
                }
 
-               if ((buffer1 = (LPBYTE)malloc(needed*1024)) == NULL)
+               if ((buffer1 = (PDRIVER_INFO_1)malloc(needed*1024)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for DRIVER_INFO_1 buffer!\n");
                        exit (-1);
@@ -87,7 +85,7 @@ int main (int argc, char* argv[])
                        continue;
                }
 
-               if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer2 = (PDRIVER_INFO_2)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for DRIVER_INFO_2 buffer!\n");
                        exit (-1);
@@ -114,7 +112,7 @@ int main (int argc, char* argv[])
                        continue;
                }
 
-               if ((buffer3 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer3 = (PDRIVER_INFO_3)malloc(needed)) == NULL)
                {
                fprintf (stderr, "Unable to malloc memory for DRIVER_INFO_3 buffer!\n");
                        exit (-1);
@@ -141,7 +139,7 @@ int main (int argc, char* argv[])
                        continue;
                }
 
-               if ((buffer6 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer6 = (PDRIVER_INFO_6)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for DRIVER_INFO_6 buffer!\n");
                        exit (-1);
@@ -174,4 +172,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/GetPrinterDriverDirectory.c b/GetPrinterDriverDirectory.c
index b411c78eaf3f74d53a119ed2eb33cf2e6cdd8656..0bd4723e52e8f27de2e246ab0d252259dd56d89c 100644 (file)
--- a/GetPrinterDriverDirectory.c
+++ b/GetPrinterDriverDirectory.c
@@ -35,7 +35,7 @@ int main (int argc, char* argv[])
                        exit (-1);
                }
 
-               if ((buffer = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer = (LPTSTR)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for directory path!\n");
                        exit (-1);
@@ -53,4 +53,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/PagePrinter.c b/PagePrinter.c
index b844726c3ca770d5e9a74a3fbf46787c3634f8fd..d306b31b45e549e5a74d0580ba44649c4c8534c6 100644 (file)
--- a/PagePrinter.c
+++ b/PagePrinter.c
@@ -50,8 +50,8 @@ int main (int argc, char* argv[])
        }
 
        /* set the printer defaults */
-       print_defaults.pDatatype                = strdup ("RAW");
-       print_defaults.DesiredAccess    = NULL;
+       print_defaults.pDatatype                = _strdup ("RAW");
+       print_defaults.DesiredAccess            = 0;
        print_defaults.pDevMode                 = NULL;
        if (ResetPrinter(printer, &print_defaults))
                printf ("ResetPrinter call succeeded\n");
@@ -60,8 +60,8 @@ int main (int argc, char* argv[])
        printf ("\n");
 
        /* StartDocPrinter */
-       buffer1.pDocName        = strdup("Testing Printer");
-       buffer1.pDatatype       = strdup("RAW");
+       buffer1.pDocName        = _strdup("Testing Printer");
+       buffer1.pDatatype       = _strdup("RAW");
        buffer1.pOutputFile     = NULL;
 
        printf ("Attempting to call StartDocPrinter() using DOC_INFO_1 :\n");
@@ -128,4 +128,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/PrinterChangeNotification.c b/PrinterChangeNotification.c
index 7d184df52e9a81c2ec30a6d23eb70b80808629e7..b3de826e211e082cbc15d093e14c6c4adfccd35a 100644 (file)
--- a/PrinterChangeNotification.c
+++ b/PrinterChangeNotification.c
@@ -29,7 +29,7 @@ int main (int argc, char* argv[])
        DWORD option = PRINTER_CHANGE_PRINTER_DRIVER;
        BOOL use_notify_options = TRUE;
        DWORD   condition;
-       DWORD flags = PRINTER_NOTIFY_OPTIONS_REFRESH;
+/*     DWORD flags = PRINTER_NOTIFY_OPTIONS_REFRESH; */
 
 
 
@@ -59,7 +59,7 @@ int main (int argc, char* argv[])
        watch.pTypes = &data;
        data.Type = PRINTER_NOTIFY_TYPE;
        data.Count = 1;
-       data.pFields = &option;
+       data.pFields = (PWORD)&option;
 
        if (use_notify_options) {
                pWatch = &watch;
@@ -150,4 +150,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/ResetPrinter.c b/ResetPrinter.c
index dad1b2bf21730a5a4543abb15f7d5ef9cee4f511..5ee43e1ba4763a5d3c0ed0f94d918db5f30314de 100644 (file)
--- a/ResetPrinter.c
+++ b/ResetPrinter.c
@@ -16,7 +16,7 @@ int main (int argc, char* argv[])
        DWORD needed, returned;
 
        memset(&defaults, 0x0, sizeof(PRINTER_DEFAULTS));
-       defaults.pDatatype = strdup("RAW");
+       defaults.pDatatype = _strdup("RAW");
 
        if (argc < 2)
        {
@@ -45,7 +45,7 @@ int main (int argc, char* argv[])
                goto done;
        }
 
-       if ((buffer2 = (LPBYTE)malloc(needed*2)) == NULL)
+       if ((buffer2 = (PPRINTER_INFO_2)malloc(needed*2)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for buffer!\n");
                exit (-1);
@@ -72,4 +72,4 @@ done:
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/SetForm.c b/SetForm.c
index b4e84e640c89f466a75fc8c1a96dfb3f1b63886d..c1dae03f73e76483a5a842b1226687a40cf6e77e 100644 (file)
--- a/SetForm.c
+++ b/SetForm.c
@@ -41,7 +41,7 @@ int main (int argc, char* argv[])
                exit (-1);
        }
 
-       if ((buffer1 = (LPBYTE)malloc(needed)) == NULL)
+       if ((buffer1 = (PFORM_INFO_1)malloc(needed)) == NULL)
        {
                fprintf (stderr, "Unable to malloc memory for FORM_INFO_1 buffer!\n");
                exit (-1);
@@ -91,4 +91,4 @@ int main (int argc, char* argv[])
 
        return 0;
 
-}
\ No newline at end of file
+}

diff --git a/SetJob.c b/SetJob.c
index cd49e4aefc5eb80f9fdb0e14a00c684ebd0b2dcb..6b82b2a9a56fc2e74bced060b03152376028ba4e 100644 (file)
--- a/SetJob.c
+++ b/SetJob.c
@@ -13,7 +13,9 @@ int main (int argc, char* argv[])
 
        HANDLE                  printer;
        DWORD                   dwJobId = 0;
+#if 0
        DOCINFO                 docinfo;
+#endif
        LPVOID                  lpMsgBuf;
 
 
@@ -35,9 +37,9 @@ int main (int argc, char* argv[])
        }
 
 #if 0
-       docinfo.lpszDocName = strdup (argv[2]);
+       docinfo.lpszDocName = _strdup (argv[2]);
        docinfo.lpszOutput  = NULL;
-       docinfo.lpszDatatype = strdup ("RAW");
+       docinfo.lpszDatatype = _strdup ("RAW");
        docinfo.fwType = 0;
        docinfo.cbSize = sizeof (docinfo);
 

diff --git a/SetPrinter.c b/SetPrinter.c
index 2646ba9d3bf9bdfc5e63d9fa3e2b12e940e19056..63c2b3687f17d9891e607f42a3f0d859e8579fa0 100644 (file)
--- a/SetPrinter.c
+++ b/SetPrinter.c
@@ -44,7 +44,7 @@ int main (int argc, char* argv[])
        }
        else
        {
-               if ((buffer2 = (LPBYTE)malloc(needed)) == NULL)
+               if ((buffer2 = (PPRINTER_INFO_2)malloc(needed)) == NULL)
                {
                        fprintf (stderr, "Unable to malloc memory for buffer!\n");
                        exit (-1);
@@ -61,7 +61,7 @@ int main (int argc, char* argv[])
        }
 
        /* set the new drivername */
-       buffer2->pDriverName = strdup (argv[2]);
+       buffer2->pDriverName = _strdup (argv[2]);
        if (SetPrinter(printer, 2, (LPBYTE)buffer2, 0))
        {
                printf ("Printer driver successfully changed to [%s]\n", argv[2]);

diff --git a/printlib.c b/printlib.c
index dbc910a877c860f2e15b32c2ab6f8a86e68bcf34..a2b56b9354d2bdf7fdf9013855f90d6dc888a2ad 100644 (file)
--- a/printlib.c
+++ b/printlib.c
@@ -2,8 +2,6 @@
 #include <stdio.h>
 #include "printlib.h"
 
-#define DetectNull(p) (p?p:"NULL")
-
 void print_devmode (DEVMODE *pDevModeIn)
 {
        if (pDevModeIn == NULL)
@@ -13,7 +11,7 @@ void print_devmode (DEVMODE *pDevModeIn)
        }
 
        printf( "\tDEVMODE:----------\n" );
-       printf( "\tDeviceName:      [%s]\n", DetectNull( pDevModeIn->dmDeviceName ) );
+       printf( "\tDeviceName:      [%s]\n", pDevModeIn->dmDeviceName );
        printf( "\tSpecVersion:     %d\n",   pDevModeIn->dmSpecVersion );
        printf( "\tDriverVersion:   %d\n",   pDevModeIn->dmDriverVersion );
        printf( "\tSize:            %d\n",   pDevModeIn->dmSize );
@@ -112,7 +110,7 @@ void print_acl (const char* str, ACL *acl)
 
 void print_sid (const char* str, SID *sid)
 {
-       DWORD   i;
+       DWORD   i = 0;
 
        printf ("%s\n", str);
        printf ("0x%x\n", sid);