win32: Fix conditional #define's

diff --git a/bacula/src/win32/libwin32/main.cpp b/bacula/src/win32/libwin32/main.cpp
index bcfea39c6daf592b72c7c8c7deae37cc458d19c7..b2a72621380e861f723cba9446efff487d39b73a 100644 (file)
--- a/bacula/src/win32/libwin32/main.cpp
+++ b/bacula/src/win32/libwin32/main.cpp
@@ -387,7 +387,6 @@ void pause_msg(const char *file, const char *func, int line, const char *msg)
 #define PRODUCT_BUSINESS 0x00000006
 #define PRODUCT_BUSINESS_N 0x00000010
 #define PRODUCT_CLUSTER_SERVER 0x00000012
-#define PRODUCT_CLUSTER_SERVER_V 0x00000040
 #define PRODUCT_DATACENTER_SERVER 0x00000008
 #define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C
 #define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027
@@ -400,20 +399,12 @@ void pause_msg(const char *file, const char *func, int line, const char *msg)
 #define PRODUCT_ENTERPRISE_SERVER_CORE_V 0x00000029
 #define PRODUCT_ENTERPRISE_SERVER_IA64 0x0000000F
 #define PRODUCT_ENTERPRISE_SERVER_V 0x00000026
-#define PRODUCT_ENTERPRISE_EVALUATION 0x00000048
-#define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054
-#define PRODUCT_ENTERPRISE_S 0x0000007D
-#define PRODUCT_ENTERPRISE_S_EVALUATION 0x00000081
-#define PRODUCT_ENTERPRISE_S_N 0x0000007E
-#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082
 #define PRODUCT_HOME_BASIC 0x00000002
 #define PRODUCT_HOME_BASIC_E 0x00000043
 #define PRODUCT_HOME_BASIC_N 0x00000005
 #define PRODUCT_HOME_PREMIUM 0x00000003
 #define PRODUCT_HOME_PREMIUM_E 0x00000044
 #define PRODUCT_HOME_PREMIUM_N 0x0000001A
-#define PRODUCT_HOME_PREMIUM_SERVER 0x00000022
-#define PRODUCT_HOME_SERVER 0x00000013
 #define PRODUCT_HYPERV 0x0000002A
 #define PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT 0x0000001E
 #define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020
@@ -434,21 +425,35 @@ void pause_msg(const char *file, const char *func, int line, const char *msg)
 #define PRODUCT_STARTER_E 0x00000042
 #define PRODUCT_STARTER_N 0x0000002F
 #define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x00000017
-#define PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE 0x0000002E
 #define PRODUCT_STORAGE_EXPRESS_SERVER 0x00000014
-#define PRODUCT_STORAGE_EXPRESS_SERVER_CORE 0x0000002B
 #define PRODUCT_STORAGE_STANDARD_SERVER 0x00000015
-#define PRODUCT_STORAGE_STANDARD_SERVER_CORE 0x0000002C
-#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x00000060
 #define PRODUCT_STORAGE_WORKGROUP_SERVER  0x00000016
-#define PRODUCT_STORAGE_WORKGROUP_SERVER_CORE 0x0000002D
-#define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x0000005F
 #define PRODUCT_UNDEFINED 0x00000000
 #define PRODUCT_ULTIMATE 0x00000001
 #define PRODUCT_ULTIMATE_E 0x00000047
 #define PRODUCT_ULTIMATE_N 0x0000001C
 #define PRODUCT_WEB_SERVER 0x00000011
 #define PRODUCT_WEB_SERVER_CORE 0x0000001D
+
+#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM 0x19
+#define SM_SERVERR2 89
+#define VER_SERVER_NT 0x80000000
+
+#define PRODUCT_CLUSTER_SERVER_V 0x00000040
+#define PRODUCT_ENTERPRISE_EVALUATION 0x00000048
+#define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054
+#define PRODUCT_ENTERPRISE_S 0x0000007D
+#define PRODUCT_ENTERPRISE_S_EVALUATION 0x00000081
+#define PRODUCT_ENTERPRISE_S_N 0x0000007E
+#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082
+#define PRODUCT_HOME_PREMIUM_SERVER 0x00000022
+#define PRODUCT_HOME_SERVER 0x00000013
+#define PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE 0x0000002E
+#define PRODUCT_STORAGE_EXPRESS_SERVER_CORE 0x0000002B
+#define PRODUCT_STORAGE_STANDARD_SERVER_CORE 0x0000002C
+#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x00000060
+#define PRODUCT_STORAGE_WORKGROUP_SERVER_CORE 0x0000002D
+#define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x0000005F
 #define PRODUCT_CORE 0x00000065
 #define PRODUCT_CORE_COUNTRYSPECIFIC 0x00000063
 #define PRODUCT_CORE_N 0x00000062
@@ -472,7 +477,7 @@ void pause_msg(const char *file, const char *func, int line, const char *msg)
 #define PRODUCT_PRO_WORKSTATION_N 0x000000A2
 #define PRODUCT_PROFESSIONAL_WMC 0x00000067
 #define PRODUCT_SB_SOLUTION_SERVER 0x00000032
-#define PRODUCT_SB_SOLUTION_SERVER_EM 0x0000004D
+#define PRODUCT_SB_SOLUTION_SERVER_EM 0x00000036
 #define PRODUCT_SERVER_FOR_SB_SOLUTIONS 0x00000033
 #define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM 0x00000037
 #define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE 0x0000003F
@@ -480,12 +485,17 @@ void pause_msg(const char *file, const char *func, int line, const char *msg)
 #define PRODUCT_STANDARD_SERVER_SOLUTIONS 0x00000034
 #define PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE 0x00000035
 
-#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM 0x19
-#define SM_SERVERR2 89
-#define VER_SERVER_NT 0x80000000
-
 #endif
 
+#define PRODUCT_DATACENTER_A_SERVER_CORE 0x00000091
+#define PRODUCT_IOTUAPCOMMERCIAL 0x00000083
+#define PRODUCT_PRO_WORKSTATION 0x000000A1
+#define PRODUCT_PRO_WORKSTATION_N 0x000000A2
+#define PRODUCT_STANDARD_A_SERVER_CORE 0x00000092
+
+
+
+
 #ifndef PRODUCT_PROFESSIONAL
 #define PRODUCT_PROFESSIONAL 0x00000030
 #endif
@@ -824,9 +834,6 @@ bool GetWindowsVersionString(LPTSTR osbuf, int maxsiz)
             case PRODUCT_DATACENTER_SERVER_CORE:
                bstrncat(osbuf, TEXT("Datacenter Edition (core installation)" ), maxsiz);
                break;
-            case PRODUCT_ENTERPRISE_SERVER:
-               bstrncat(osbuf, TEXT("Enterprise Edition" ), maxsiz);
-               break;
             case PRODUCT_ENTERPRISE_SERVER_CORE:
                bstrncat(osbuf, TEXT("Enterprise Edition (core installation)" ), maxsiz);
                break;