Re: [Mingw-w64-public] Defining additional Constants

2018-01-22 Thread Jacek Caban 
Hi Tom,

On 01/22/2018 07:15 PM, Tom Ritter wrote:
>  mingw-w64-headers/include/error.h|  1 +
>  mingw-w64-headers/include/winerror.h |  1 +
>  mingw-w64-headers/include/winnt.h| 29 -
>  mingw-w64-tools/widl/include/winnt.h |  1 +

The version in widl/ subdirectory is a copy of Wine version and is in
the tree only because it's needed to build widl. Please don't change it
manually.

>  4 files changed, 31 insertions(+), 1 deletion(-)
>  mode change 100644 => 100755 mingw-w64-headers/include/error.h
>  mode change 100644 => 100755 mingw-w64-headers/include/winnt.h
>  mode change 100644 => 100755 mingw-w64-tools/widl/include/winnt.h


Please be careful about mode changes.


Other than that the patch looks good. I fixed it up and pushed it.


Thanks,

Jacek


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

[Mingw-w64-public] Defining additional Constants

2018-01-22 Thread Tom Ritter 
Firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1431809

This syncs the PRODUCT_ENTERPRISE_XXX defines between widl and
headers, and declares ERROR_INVALID_TOKEN in headers

-tom
From d258bc0274c8b1b63ed8ea4d31e6ab8a8b621833 Mon Sep 17 00:00:00 2001
From: Tom Ritter 
Date: Mon, 22 Jan 2018 11:38:42 -0600
Subject: [PATCH] Sync PRODUCT_ENTERPRISE_XXX defines between widl and headers,
 and declare ERROR_INVALID_TOKEN in headers

---
 mingw-w64-headers/include/error.h|  1 +
 mingw-w64-headers/include/winnt.h| 29 -
 mingw-w64-tools/widl/include/winnt.h |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 mingw-w64-headers/include/error.h
 mode change 100644 => 100755 mingw-w64-headers/include/winnt.h
 mode change 100644 => 100755 mingw-w64-tools/widl/include/winnt.h

diff --git a/mingw-w64-headers/include/error.h 
b/mingw-w64-headers/include/error.h
old mode 100644
new mode 100755
index cac097a6..4b63d017
--- a/mingw-w64-headers/include/error.h
+++ b/mingw-w64-headers/include/error.h
@@ -157,6 +157,7 @@
 #define ERROR_BAD_DYNALINK 213
 #define ERROR_TOO_MANY_MODULES 214
 #define ERROR_NESTING_NOT_ALLOWED 215
+#define ERROR_INVALID_TOKEN 315
 #define ERROR_USER_DEFINED_BASE 0xF000
 #define ERROR_I24_WRITE_PROTECT 0
 #define ERROR_I24_BAD_UNIT 1
diff --git a/mingw-w64-headers/include/winnt.h 
b/mingw-w64-headers/include/winnt.h
old mode 100644
new mode 100755
index 2762e209..c298d532
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -767,6 +767,7 @@ inline ENUMTYPE  ^= (ENUMTYPE , ENUMTYPE b) { 
return (ENUMTYPE &)(((i
 #define PRODUCT_SERVER_FOR_SMALLBUSINESS_V0x23
 #define PRODUCT_STANDARD_SERVER_V 0x24
 #define PRODUCT_DATACENTER_SERVER_V   0x25
+#define PRODUCT_SERVER_V  0x25
 #define PRODUCT_ENTERPRISE_SERVER_V   0x26
 #define PRODUCT_DATACENTER_SERVER_CORE_V  0x27
 #define PRODUCT_STANDARD_SERVER_CORE_V0x28
@@ -787,6 +788,7 @@ inline ENUMTYPE  ^= (ENUMTYPE , ENUMTYPE b) { 
return (ENUMTYPE &)(((i
 #define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM0x37
 #define PRODUCT_SOLUTION_EMBEDDEDSERVER   0x38
 #define PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE  0x39
+#define PRODUCT_PROFESSIONAL_EMBEDDED 0x3A
 #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x3B
 #define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL 0x3C
 #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC  0x3D
@@ -815,16 +817,41 @@ inline ENUMTYPE  ^= (ENUMTYPE , ENUMTYPE b) { 
return (ENUMTYPE &)(((i
 #define PRODUCT_EMBEDDED_INDUSTRY_E   0x5B
 #define PRODUCT_EMBEDDED_INDUSTRY_A_E 0x5C
 #define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x5F
-#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x60
+#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER  0x60
 #define PRODUCT_CORE_ARM  0x61
 #define PRODUCT_CORE_N0x62
 #define PRODUCT_CORE_COUNTRYSPECIFIC  0x63
 #define PRODUCT_CORE_SINGLELANGUAGE   0x64
+#define PRODUCT_CORE_LANGUAGESPECIFIC 0x64
 #define PRODUCT_CORE  0x65
 #define PRODUCT_PROFESSIONAL_WMC  0x67
 #define PRODUCT_MOBILE_CORE   0x68
+#define PRODUCT_EMBEDDED_INDUSTRY_EVAL0x69
+#define PRODUCT_EMBEDDED_INDUSTRY_E_EVAL  0x6A
+#define PRODUCT_EMBEDDED_EVAL 0x6B
+#define PRODUCT_EMBEDDED_E_EVAL   0x6C
+#define PRODUCT_NANO_SERVER   0x6D
+#define PRODUCT_CLOUD_STORAGE_SERVER  0x6E
+#define PRODUCT_CORE_CONNECTED0x6F
+#define PRODUCT_PROFESSIONAL_STUDENT  0x70
+#define PRODUCT_CORE_CONNECTED_N  0x71
+#define PRODUCT_PROFESSIONAL_STUDENT_N0x72
+#define PRODUCT_CORE_CONNECTED_SINGLELANGUAGE 0x73
+#define PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC0x74
+#define PRODUCT_CONNECTED_CAR 0x75
+#define PRODUCT_INDUSTRY_HANDHELD 0x76
+#define PRODUCT_PPI_PRO   0x77
+#define PRODUCT_ARM64_SERVER  0x78
 #define PRODUCT_EDUCATION 0x79
 #define PRODUCT_EDUCATION_N   0x7a
+#define PRODUCT_IOTUAP0x7B
+#define PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER  0x7C
+#define PRODUCT_ENTERPRISE_S  0x7D
+#define PRODUCT_ENTERPRISE_S_N0x7E
+#define PRODUCT_PROFESSIONAL_S0x7F
+#define PRODUCT_PROFESSIONAL_S_N  0x80
+#define PRODUCT_ENTERPRISE_S_EVALUATION   0x81
+#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x82
 #define PRODUCT_MOBILE_ENTERPRISE 0x85
 
 #define PRODUCT_UNLICENSED0xabcdabcd
diff --git a/mingw-w64-tools/widl/include/winnt.h

Re: [Mingw-w64-public] Defining additional Constants

2018-01-22 Thread Tom Ritter 
Afraid I was too eager, the newly attached one correctly defines
ERROR_INVALID_TOKEN in all the places.

-tom

On 22 January 2018 at 11:58, Tom Ritter  wrote:
> Firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1431809
>
> This syncs the PRODUCT_ENTERPRISE_XXX defines between widl and
> headers, and declares ERROR_INVALID_TOKEN in headers
>
> -tom
From cd59d718b9d9a05516b8423010ea4e6f6ced2788 Mon Sep 17 00:00:00 2001
From: Tom Ritter 
Date: Mon, 22 Jan 2018 11:38:42 -0600
Subject: [PATCH] Sync PRODUCT_ENTERPRISE_XXX defines between widl and headers,
 and declare ERROR_INVALID_TOKEN in headers

---
 mingw-w64-headers/include/error.h|  1 +
 mingw-w64-headers/include/winerror.h |  1 +
 mingw-w64-headers/include/winnt.h| 29 -
 mingw-w64-tools/widl/include/winnt.h |  1 +
 4 files changed, 31 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 mingw-w64-headers/include/error.h
 mode change 100644 => 100755 mingw-w64-headers/include/winnt.h
 mode change 100644 => 100755 mingw-w64-tools/widl/include/winnt.h

diff --git a/mingw-w64-headers/include/error.h 
b/mingw-w64-headers/include/error.h
old mode 100644
new mode 100755
index cac097a6..4b63d017
--- a/mingw-w64-headers/include/error.h
+++ b/mingw-w64-headers/include/error.h
@@ -157,6 +157,7 @@
 #define ERROR_BAD_DYNALINK 213
 #define ERROR_TOO_MANY_MODULES 214
 #define ERROR_NESTING_NOT_ALLOWED 215
+#define ERROR_INVALID_TOKEN 315
 #define ERROR_USER_DEFINED_BASE 0xF000
 #define ERROR_I24_WRITE_PROTECT 0
 #define ERROR_I24_BAD_UNIT 1
diff --git a/mingw-w64-headers/include/winerror.h 
b/mingw-w64-headers/include/winerror.h
index 3f0214db..e117b046 100644
--- a/mingw-w64-headers/include/winerror.h
+++ b/mingw-w64-headers/include/winerror.h
@@ -241,6 +241,7 @@
 #define ERROR_INVALID_OPLOCK_PROTOCOL __MSABI_LONG(301)
 #define ERROR_DISK_TOO_FRAGMENTED __MSABI_LONG(302)
 #define ERROR_DELETE_PENDING __MSABI_LONG(303)
+#define ERROR_INVALID_TOKEN __MSABI_LONG(315)
 #define ERROR_MR_MID_NOT_FOUND __MSABI_LONG(317)
 #define ERROR_SCOPE_NOT_FOUND __MSABI_LONG(318)
 #define ERROR_INVALID_ADDRESS __MSABI_LONG(487)
diff --git a/mingw-w64-headers/include/winnt.h 
b/mingw-w64-headers/include/winnt.h
old mode 100644
new mode 100755
index 2762e209..c298d532
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -767,6 +767,7 @@ inline ENUMTYPE  ^= (ENUMTYPE , ENUMTYPE b) { 
return (ENUMTYPE &)(((i
 #define PRODUCT_SERVER_FOR_SMALLBUSINESS_V0x23
 #define PRODUCT_STANDARD_SERVER_V 0x24
 #define PRODUCT_DATACENTER_SERVER_V   0x25
+#define PRODUCT_SERVER_V  0x25
 #define PRODUCT_ENTERPRISE_SERVER_V   0x26
 #define PRODUCT_DATACENTER_SERVER_CORE_V  0x27
 #define PRODUCT_STANDARD_SERVER_CORE_V0x28
@@ -787,6 +788,7 @@ inline ENUMTYPE  ^= (ENUMTYPE , ENUMTYPE b) { 
return (ENUMTYPE &)(((i
 #define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM0x37
 #define PRODUCT_SOLUTION_EMBEDDEDSERVER   0x38
 #define PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE  0x39
+#define PRODUCT_PROFESSIONAL_EMBEDDED 0x3A
 #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x3B
 #define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL 0x3C
 #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC  0x3D
@@ -815,16 +817,41 @@ inline ENUMTYPE  ^= (ENUMTYPE , ENUMTYPE b) { 
return (ENUMTYPE &)(((i
 #define PRODUCT_EMBEDDED_INDUSTRY_E   0x5B
 #define PRODUCT_EMBEDDED_INDUSTRY_A_E 0x5C
 #define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x5F
-#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x60
+#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER  0x60
 #define PRODUCT_CORE_ARM  0x61
 #define PRODUCT_CORE_N0x62
 #define PRODUCT_CORE_COUNTRYSPECIFIC  0x63
 #define PRODUCT_CORE_SINGLELANGUAGE   0x64
+#define PRODUCT_CORE_LANGUAGESPECIFIC 0x64
 #define PRODUCT_CORE  0x65
 #define PRODUCT_PROFESSIONAL_WMC  0x67
 #define PRODUCT_MOBILE_CORE   0x68
+#define PRODUCT_EMBEDDED_INDUSTRY_EVAL0x69
+#define PRODUCT_EMBEDDED_INDUSTRY_E_EVAL  0x6A
+#define PRODUCT_EMBEDDED_EVAL 0x6B
+#define PRODUCT_EMBEDDED_E_EVAL   0x6C
+#define PRODUCT_NANO_SERVER   0x6D
+#define PRODUCT_CLOUD_STORAGE_SERVER  0x6E
+#define PRODUCT_CORE_CONNECTED0x6F
+#define PRODUCT_PROFESSIONAL_STUDENT  0x70
+#define PRODUCT_CORE_CONNECTED_N  0x71
+#define PRODUCT_PROFESSIONAL_STUDENT_N0x72
+#define PRODUCT_CORE_CONNECTED_SINGLELANGUAGE 0x73
+#define PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC0x74
+#define PRODUCT_CONNECTED_CAR 0x75
+#define PRODUCT_INDUSTRY_HANDHELD 0x76
+#define PRODUCT_PPI_PRO