inc: Partially update fbfrog-based bindings with missing #defines

backporting some of the changes from commit 558254a,
but not all, because the 1.02 compiler doesn't allow redundant Consts yet.
Thus only the ones reported on the forum (lstrcpy/lstrcat) and some others
that seem useful.

Conflicts:
	changelog.txt
	inc/win/ntddndis.bi
	inc/win/pciprop.bi

Author: dkl

changelog.txt

@@ -13,7 +13,7 @@ Version 1.02.1
 - 1.02.0 regression: OpenGL binding: glGetString() and some others use ZString Ptr instead of GLubyte Ptr again
 - 1.02.0 regression: Windows API binding: REFIID and some other REF* types were missing; wsprintf/wvsprintf declarations were missing; ole2.bi couldn't be included directly/alone anymore.
 - bindings: Various previously untranslated (or wrongly translated) #defines in SDL2, X11, crt/pthread, Windows API
-- Windows API binding: DirectX headers missed some declarations and some didn't compile, win/commdlg.bi couldn't be #included behind windows.bi without WIN_INCLUDEALL because of missing #includes; re-added the undocumented ENUMWINDOWSPROC type; shlwapi.bi #includes shlobj.bi again (for backwards compatibility).
+- Windows API binding: DirectX headers missed some declarations and some didn't compile, win/commdlg.bi couldn't be #included behind windows.bi without WIN_INCLUDEALL because of missing #includes; re-added the undocumented ENUMWINDOWSPROC type; shlwapi.bi #includes shlobj.bi again (for backwards compatibility), some #defines were missing (e.g. lstrcpy/lstrcat).
 - crt/string.bi, crt/mem.bi: Added CONSTs to function declarations
 - #767: Illegal byref result assignments will now cause a proper error message, not just a warning
 - Using the -asm att|intel option for non-x86[_64] targets now triggers an error

inc/win/shlwapi.bi

@@ -163,7 +163,9 @@ declare function SHLoadIndirectString(byval pszSource as LPCWSTR, byval pszOutBu
 	#define StrIntlEqNI StrIntlEqNIW
 	#define StrFormatByteSize StrFormatByteSizeW
 	#define StrFormatKBSize StrFormatKBSizeW
+	#define StrNCat StrNCatW
 	#define StrTrim StrTrimW
+	#define StrCatBuff StrCatBuffW
 	#define ChrCmpI ChrCmpIW
 	#define wvnsprintf wvnsprintfW
 	#define wnsprintf wnsprintfW
@@ -202,7 +204,9 @@ declare function SHLoadIndirectString(byval pszSource as LPCWSTR, byval pszOutBu
 	#define StrIntlEqNI StrIntlEqNIA
 	#define StrFormatByteSize StrFormatByteSizeA
 	#define StrFormatKBSize StrFormatKBSizeA
+	#define StrNCat StrNCatA
 	#define StrTrim StrTrimA
+	#define StrCatBuff StrCatBuffA
 	#define ChrCmpI ChrCmpIA
 	#define wvnsprintf wvnsprintfA
 	#define wnsprintf wnsprintfA
@@ -242,23 +246,30 @@ declare function IntlStrEqWorkerW(byval fCaseSens as WINBOOL, byval lpString1 as
 #define PathIsHTMLFileW(pszPath) PathIsContentTypeW(pszPath, SZ_CONTENTTYPE_HTMLW)
 #define STIF_DEFAULT __MSABI_LONG(&h00000000)
 #define STIF_SUPPORT_HEX __MSABI_LONG(&h00000001)
+#define StrCatA lstrcatA
 #define StrCmpA lstrcmpA
 #define StrCmpIA lstrcmpiA
+#define StrCpyA lstrcpyA
 #define StrCpyNA lstrcpynA
 #define StrToLong StrToInt
 #define StrNCmp StrCmpN
 #define StrNCmpI StrCmpNI
 #define StrNCpy StrCpyN
+#define StrCatN StrNCat
 
 #ifdef UNICODE
 	#define StrCatBuff StrCatBuffW
+	#define StrCat StrCatW
 	#define StrCmp StrCmpW
 	#define StrCmpI StrCmpIW
+	#define StrCpy StrCpyW
 	#define StrCpyN StrCpyNW
 #else
 	#define StrCatBuff StrCatBuffA
+	#define StrCat lstrcatA
 	#define StrCmp lstrcmpA
 	#define StrCmpI lstrcmpiA
+	#define StrCpy lstrcpyA
 	#define StrCpyN lstrcpynA
 #endif
 
@@ -1096,9 +1107,11 @@ declare function AssocQueryKeyW(byval flags as ASSOCF, byval key as ASSOCKEY, by
 #endif
 
 #ifdef UNICODE
+	#define SHOpenRegStream SHOpenRegStreamW
 	#define SHOpenRegStream2 SHOpenRegStream2W
 	#define SHCreateStreamOnFile SHCreateStreamOnFileW
 #else
+	#define SHOpenRegStream SHOpenRegStreamA
 	#define SHOpenRegStream2 SHOpenRegStream2A
 	#define SHCreateStreamOnFile SHCreateStreamOnFileA
 #endif
@@ -1107,6 +1120,7 @@ declare function SHOpenRegStreamA(byval hkey as HKEY, byval pszSubkey as LPCSTR,
 declare function SHOpenRegStreamW(byval hkey as HKEY, byval pszSubkey as LPCWSTR, byval pszValue as LPCWSTR, byval grfMode as DWORD) as IStream ptr
 declare function SHOpenRegStream2A(byval hkey as HKEY, byval pszSubkey as LPCSTR, byval pszValue as LPCSTR, byval grfMode as DWORD) as IStream ptr
 declare function SHOpenRegStream2W(byval hkey as HKEY, byval pszSubkey as LPCWSTR, byval pszValue as LPCWSTR, byval grfMode as DWORD) as IStream ptr
+#undef SHOpenRegStream
 #define SHOpenRegStream SHOpenRegStream2
 declare function SHCreateStreamOnFileA(byval pszFile as LPCSTR, byval grfMode as DWORD, byval ppstm as IStream ptr ptr) as HRESULT
 declare function SHCreateStreamOnFileW(byval pszFile as LPCWSTR, byval grfMode as DWORD, byval ppstm as IStream ptr ptr) as HRESULT

inc/win/winbase.bi

@@ -857,13 +857,15 @@ declare function GetModuleHandleExW(byval dwFlags as DWORD, byval lpModuleName a
 	#define GetModuleFileName GetModuleFileNameW
 	#define GetModuleHandle GetModuleHandleW
 	#define LoadLibraryEx LoadLibraryExW
+	#define EnumResourceLanguages EnumResourceLanguagesW
 #else
 	#define PGET_MODULE_HANDLE_EX PGET_MODULE_HANDLE_EXA
 	#define GetModuleHandleEx GetModuleHandleExA
 	#define LoadString LoadStringA
 	#define GetModuleFileName GetModuleFileNameA
 	#define GetModuleHandle GetModuleHandleA
 	#define LoadLibraryEx LoadLibraryExA
+	#define EnumResourceLanguages EnumResourceLanguagesA
 #endif
 
 #if _WIN32_WINNT = &h0602
@@ -2355,20 +2357,25 @@ type POFSTRUCT as _OFSTRUCT ptr
 	end function
 
 	#define InterlockedCompareExchangePointer(Destination, ExChange, Comperand) cast(PVOID, cast(LONG_PTR, InterlockedCompareExchange(cptr(LONG ptr, (Destination)), cast(LONG, cast(LONG_PTR, (ExChange))), cast(LONG, cast(LONG_PTR, (Comperand))))))
-	#define InterlockedDecrementAcquire InterlockedDecrement
-	#define InterlockedDecrementRelease InterlockedDecrement
 #endif
 
 #define InterlockedIncrementAcquire InterlockedIncrement
 #define InterlockedIncrementRelease InterlockedIncrement
 
 #ifdef __FB_64BIT__
 	#define InterlockedDecrement _InterlockedDecrement
-	#define InterlockedDecrementAcquire InterlockedDecrement
-	#define InterlockedDecrementRelease InterlockedDecrement
+#endif
+
+#define InterlockedDecrementAcquire InterlockedDecrement
+#define InterlockedDecrementRelease InterlockedDecrement
+
+#ifdef __FB_64BIT__
 	#define InterlockedExchange _InterlockedExchange
 	#define InterlockedExchangeAdd _InterlockedExchangeAdd
 	#define InterlockedCompareExchange _InterlockedCompareExchange
+#else
+	#define InterlockedIncrementAcquire InterlockedIncrement
+	#define InterlockedIncrementRelease InterlockedIncrement
 #endif
 
 #define InterlockedCompareExchangeAcquire InterlockedCompareExchange
@@ -2753,6 +2760,8 @@ declare function BackupWrite(byval hFile as HANDLE, byval lpBuffer as LPBYTE, by
 	#define lstrcmp lstrcmpW
 	#define lstrcmpi lstrcmpiW
 	#define lstrcpyn lstrcpynW
+	#define lstrcpy lstrcpyW
+	#define lstrcat lstrcatW
 	#define lstrlen lstrlenW
 #else
 	#define CreateMailslot CreateMailslotA
@@ -2763,6 +2772,8 @@ declare function BackupWrite(byval hFile as HANDLE, byval lpBuffer as LPBYTE, by
 	#define lstrcmp lstrcmpA
 	#define lstrcmpi lstrcmpiA
 	#define lstrcpyn lstrcpynA
+	#define lstrcpy lstrcpyA
+	#define lstrcat lstrcatA
 	#define lstrlen lstrlenA
 #endif
 
@@ -4538,6 +4549,7 @@ declare function SetXStateFeaturesMask(byval Context as PCONTEXT, byval FeatureM
 
 #define MICROSOFT_WINDOWS_WINBASE_INTERLOCKED_CPLUSPLUS_H_INCLUDED
 #define MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS ((_WIN32_WINNT >= &h0502) orelse (defined(_WINBASE_) = 0))
+#undef MICROSOFT_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS
 const MICROSOFT_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS = 0
 
 end extern