From c2b65c3feaafca79558fc2bc9fc0f1dbb6e3891a Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Wed, 29 Jul 2020 13:06:07 -0500
Subject: [PATCH] [WinSpool] Fix Header Order.

Found an issue with the header.
---
 sdk/include/psdk/winspool.h | 118 ++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/sdk/include/psdk/winspool.h b/sdk/include/psdk/winspool.h
index 0116d18f978..fa03a2acfbb 100644
--- a/sdk/include/psdk/winspool.h
+++ b/sdk/include/psdk/winspool.h
@@ -533,6 +533,66 @@ extern "C" {
   __MINGW_TYPEDEF_AW(PDRIVER_INFO_6)
   __MINGW_TYPEDEF_AW(LPDRIVER_INFO_6)
 
+typedef struct _DRIVER_INFO_8W {
+  DWORD     cVersion;
+  LPWSTR    pName;
+  LPWSTR    pEnvironment;
+  LPWSTR    pDriverPath;
+  LPWSTR    pDataFile;
+  LPWSTR    pConfigFile;
+  LPWSTR    pHelpFile;
+  LPWSTR    pDependentFiles;
+  LPWSTR    pMonitorName;
+  LPWSTR    pDefaultDataType;
+  LPWSTR    pszzPreviousNames;
+  FILETIME  ftDriverDate;
+  DWORDLONG dwlDriverVersion;
+  LPWSTR    pszMfgName;
+  LPWSTR    pszOEMUrl;
+  LPWSTR    pszHardwareID;
+  LPWSTR    pszProvider;
+  LPWSTR    pszPrintProcessor;
+  LPWSTR    pszVendorSetup;
+  LPWSTR    pszzColorProfiles;
+  LPWSTR    pszInfPath;
+  DWORD     dwPrinterDriverAttributes;
+  LPWSTR    pszzCoreDriverDependencies;
+  FILETIME  ftMinInboxDriverVerDate;
+  DWORDLONG dwlMinInboxDriverVerVersion;
+} DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W;
+
+typedef struct _DRIVER_INFO_8A {
+  DWORD     cVersion;
+  LPSTR     pName;
+  LPSTR     pEnvironment;
+  LPSTR     pDriverPath;
+  LPSTR     pDataFile;
+  LPSTR     pConfigFile;
+  LPSTR     pHelpFile;
+  LPSTR     pDependentFiles;
+  LPSTR     pMonitorName;
+  LPSTR     pDefaultDataType;
+  LPSTR     pszzPreviousNames;
+  FILETIME  ftDriverDate;
+  DWORDLONG dwlDriverVersion;
+  LPSTR     pszMfgName;
+  LPSTR     pszOEMUrl;
+  LPSTR     pszHardwareID;
+  LPSTR     pszProvider;
+  LPSTR     pszPrintProcessor;
+  LPSTR     pszVendorSetup;
+  LPSTR     pszzColorProfiles;
+  LPSTR     pszInfPath;
+  DWORD     dwPrinterDriverAttributes;
+  LPSTR     pszzCoreDriverDependencies;
+  FILETIME  ftMinInboxDriverVerDate;
+  DWORDLONG dwlMinInboxDriverVerVersion;
+} DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A;
+
+__MINGW_TYPEDEF_AW(DRIVER_INFO_8)
+__MINGW_TYPEDEF_AW(PDRIVER_INFO_8)
+__MINGW_TYPEDEF_AW(LPDRIVER_INFO_8)
+
 #define DRIVER_KERNELMODE 0x00000001
 #define DRIVER_USERMODE 0x00000002
 
@@ -1420,61 +1480,6 @@ HRESULT DocumentEventW(
   PVOID pvOut
 );
 
-typedef struct _DRIVER_INFO_8W {
-  DWORD     cVersion;
-  LPWSTR    pName;
-  LPWSTR    pEnvironment;
-  LPWSTR    pDriverPath;
-  LPWSTR    pDataFile;
-  LPWSTR    pConfigFile;
-  LPWSTR    pHelpFile;
-  LPWSTR    pDependentFiles;
-  LPWSTR    pMonitorName;
-  LPWSTR    pDefaultDataType;
-  LPWSTR    pszzPreviousNames;
-  FILETIME  ftDriverDate;
-  DWORDLONG dwlDriverVersion;
-  LPWSTR    pszMfgName;
-  LPWSTR    pszOEMUrl;
-  LPWSTR    pszHardwareID;
-  LPWSTR    pszProvider;
-  LPWSTR    pszPrintProcessor;
-  LPWSTR    pszVendorSetup;
-  LPWSTR    pszzColorProfiles;
-  LPWSTR    pszInfPath;
-  DWORD     dwPrinterDriverAttributes;
-  LPWSTR    pszzCoreDriverDependencies;
-  FILETIME  ftMinInboxDriverVerDate;
-  DWORDLONG dwlMinInboxDriverVerVersion;
-} DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W;
-
-typedef struct _DRIVER_INFO_8A {
-  DWORD     cVersion;
-  LPSTR    pName;
-  LPSTR    pEnvironment;
-  LPSTR    pDriverPath;
-  LPSTR    pDataFile;
-  LPSTR    pConfigFile;
-  LPSTR    pHelpFile;
-  LPSTR    pDependentFiles;
-  LPSTR    pMonitorName;
-  LPSTR    pDefaultDataType;
-  LPSTR    pszzPreviousNames;
-  FILETIME  ftDriverDate;
-  DWORDLONG dwlDriverVersion;
-  LPSTR    pszMfgName;
-  LPSTR    pszOEMUrl;
-  LPSTR    pszHardwareID;
-  LPSTR    pszProvider;
-  LPSTR    pszPrintProcessor;
-  LPSTR    pszVendorSetup;
-  LPSTR    pszzColorProfiles;
-  LPSTR    pszInfPath;
-  DWORD     dwPrinterDriverAttributes;
-  LPSTR    pszzCoreDriverDependencies;
-  FILETIME  ftMinInboxDriverVerDate;
-  DWORDLONG dwlMinInboxDriverVerVersion;
-} DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A;
 
 typedef struct _FORM_INFO_2A {
   DWORD   Flags;
@@ -1502,9 +1507,6 @@ typedef struct _FORM_INFO_2W {
   LANGID  wLangId;
 } FORM_INFO_2W, *PFORM_INFO_2W;
 
-__MINGW_TYPEDEF_AW(DRIVER_INFO_8)
-__MINGW_TYPEDEF_AW(PDRIVER_INFO_8)
-__MINGW_TYPEDEF_AW(LPDRIVER_INFO_8)
 __MINGW_TYPEDEF_AW(FORM_INFO_2)
 __MINGW_TYPEDEF_AW(PFORM_INFO_2)
 
-- 
2.17.1