Merge remote-tracking branch 'origin/Ghidra_11.3'

Ghidra/Features/Base/data/parserprofiles/VisualStudio12_32.prf

@@ -80,7 +80,6 @@ isa_availability.h
 mbdata.h
 msdos.h
 mtdll.h
-nlsdownlevel.h
 nlsint.h
 nmmintrin.h
 oscalls.h
@@ -137,6 +136,9 @@ mmdeviceapi.h
 mprapi.h
 msctfmonitorapi.h
 ndfapi.h
+winsock2.h
+ws2tcpip.h
+iphlpapi.h
 netioapi.h
 npapi.h
 nspapi.h
@@ -171,7 +173,6 @@ wpapi.h
 wpcapi.h
 wscapi.h
 wsdapi.h
-wspiapi.h
 rpcproxy.h
 
 -D_M_IX86=300

Ghidra/Features/Base/data/parserprofiles/VisualStudio12_64.prf

@@ -80,7 +80,6 @@ isa_availability.h
 mbdata.h
 msdos.h
 mtdll.h
-nlsdownlevel.h
 nlsint.h
 nmmintrin.h
 oscalls.h
@@ -137,6 +136,9 @@ mmdeviceapi.h
 mprapi.h
 msctfmonitorapi.h
 ndfapi.h
+winsock2.h
+ws2tcpip.h
+iphlpapi.h
 netioapi.h
 npapi.h
 nspapi.h
@@ -171,12 +173,11 @@ wpapi.h
 wpcapi.h
 wscapi.h
 wsdapi.h
-wspiapi.h
 rpcproxy.h
 
--D_M_IX86=300
 -D_MSC_VER=1200
 -D_INTEGRAL_MAX_BITS=64
+-DNTDDI_VERSION=0x09000000
 -DWINVER=0x0900
 -D_AMD64_
 -D_M_AMD64
@@ -204,10 +205,12 @@ rpcproxy.h
 -v0
 -D__inner_checkReturn=""
 
-/data/HeaderFiles/VC/VS12/include
 /data/HeaderFiles/VC/VS12/src
+/data/HeaderFiles/VC/VS12/include
 /data/HeaderFiles/VC/SDK/v7.1A/Include
 
-
+x86:LE:64:default
+
+windows
 
 

Ghidra/Features/Base/data/parserprofiles/VisualStudio22_64.prf

@@ -115,8 +115,6 @@ xenroll.h
 af_irda.h
 in6addr.h
 mstcpip.h
-ws2def.h
-winsock.h
 winsock2.h
 nsemail.h
 nspapi.h

Ghidra/Features/Base/data/parserprofiles/generic_clib_32.prf

@@ -2,7 +2,7 @@ sys/types.h
 types.h
 stddef.h
 stddef.h
-openssl/opensslconf-x86_64.h
+openssl/opensslconf.h
 openssl/bn.h
 openssl/ssl.h
 openssl/asn1_mac.h
@@ -107,7 +107,6 @@ stdint.h
 stdio.h
 stdlib.h
 string.h
-tgmath.h
 time.h
 wchar.h
 wctype.h
@@ -220,6 +219,7 @@ arpa/telnet.h
 arpa/tftp.h
 
 -D_X86_
+-D__i386__
 -D__STDC__
 -D_GNU_SOURCE
 -D__WORDSIZE=32
@@ -236,6 +236,7 @@ arpa/tftp.h
 /data/HeaderFiles/linux/include
 /data/HeaderFiles/linux/include/sys
 /data/HeaderFiles/linux/gcc/include
+/data/HeaderFiles/linux/include/openssl
 /data/HeaderFiles/linux/x86_64-redhat-linux5E/include
 /data/HeaderFiles/linux/x86_64-redhat-linux5E/include/sys
 

Ghidra/Features/Base/data/parserprofiles/generic_clib_64.prf

@@ -2,7 +2,7 @@ sys/types.h
 types.h
 stddef.h
 stddef.h
-openssl/opensslconf-x86_64.h
+openssl/opensslconf.h
 openssl/bn.h
 openssl/ssl.h
 openssl/asn1_mac.h
@@ -107,7 +107,6 @@ stdint.h
 stdio.h
 stdlib.h
 string.h
-tgmath.h
 time.h
 wchar.h
 wctype.h
@@ -220,6 +219,7 @@ arpa/telnet.h
 arpa/tftp.h
 
 -D_X86_
+-D__x86_64__
 -D__STDC__
 -D_GNU_SOURCE
 -D__WORDSIZE=64
@@ -236,6 +236,7 @@ arpa/tftp.h
 /data/HeaderFiles/linux/include
 /data/HeaderFiles/linux/include/sys
 /data/HeaderFiles/linux/gcc/include
+/data/HeaderFiles/linux/include/openssl
 /data/HeaderFiles/linux/x86_64-redhat-linux5E/include
 /data/HeaderFiles/linux/x86_64-redhat-linux5E/include/sys