Mercurial > hg > xemacs-beta

comparison src/intl-auto-encap-win32.h @ 4903:70089046adef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compile problems in intl-encap* under VS6 -------------------- ChangeLog entries follow: -------------------- lib-src/ChangeLog addition: 2010-01-30 Ben Wing <ben@xemacs.org> * make-mswin-unicode.pl: Make it possible to specify an overridden prototype in cases where either Cygwin or Visual Studio has errors in their headers that can be corrected by falling back to a less qualified type (typically without const). src/ChangeLog addition: 2010-01-30 Ben Wing <ben@xemacs.org> * intl-auto-encap-win32.c: * intl-auto-encap-win32.c (qxeExtractAssociatedIcon): * intl-auto-encap-win32.c (qxeExtractIconEx): * intl-auto-encap-win32.c (qxeCreateMDIWindow): * intl-auto-encap-win32.c (qxeCreateWindowStation): * intl-auto-encap-win32.c (qxeDdeCreateStringHandle): * intl-auto-encap-win32.c (qxeAbortSystemShutdown): * intl-auto-encap-win32.c (qxeRegConnectRegistry): * intl-auto-encap-win32.c (qxeGetICMProfile): * intl-auto-encap-win32.h: Rebuild. * intl-encap-win32.c: * intl-encap-win32.c (qxeUpdateICMRegKey): Delete manual definitions of functions with former errors in Cygwin headers but no longer. Use "override" with some functions where Cygwin or VS6 accidentally omits a const declaration or includes an extra one. Use "no" on SendMessageTimeout, which has an error in the VS6 prototype (you could manually fix this with an ifdef to split the Cygwin vs. VS6 calls, if we ever actually used this function).
author Ben Wing <ben@xemacs.org>
date Sat, 30 Jan 2010 20:34:23 -0600
parents 49de55c09f18
children 7eec2a1f3412
comparison
equal deleted inserted replaced
4902:c902301f8b7d 4903:70089046adef
94 94
95 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 95 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
96 #undef ExtractAssociatedIcon 96 #undef ExtractAssociatedIcon
97 #define ExtractAssociatedIcon error_use_qxeExtractAssociatedIcon_or_ExtractAssociatedIconA_and_ExtractAssociatedIconW 97 #define ExtractAssociatedIcon error_use_qxeExtractAssociatedIcon_or_ExtractAssociatedIconA_and_ExtractAssociatedIconW
98 #endif 98 #endif
99 HICON qxeExtractAssociatedIcon (HINSTANCE arg1, const Extbyte * arg2, PWORD arg3); 99 HICON qxeExtractAssociatedIcon (HINSTANCE arg1, Extbyte * arg2, LPWORD arg3);
100 100
101 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 101 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
102 #undef ExtractIcon 102 #undef ExtractIcon
103 #define ExtractIcon error_use_qxeExtractIcon_or_ExtractIconA_and_ExtractIconW 103 #define ExtractIcon error_use_qxeExtractIcon_or_ExtractIconA_and_ExtractIconW
104 #endif 104 #endif
105 HICON qxeExtractIcon (HINSTANCE arg1, const Extbyte * arg2, UINT arg3); 105 HICON qxeExtractIcon (HINSTANCE arg1, const Extbyte * arg2, UINT arg3);
106 106
107 /* Skipping ExtractIconEx because NT 4.0+ only, error in Cygwin prototype */ 107 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
108 #undef ExtractIconEx
109 #define ExtractIconEx error_use_qxeExtractIconEx_or_ExtractIconExA_and_ExtractIconExW
110 #endif
111 UINT qxeExtractIconEx (const Extbyte * arg1, int arg2, HICON* arg3, HICON* arg4, UINT arg5);
108 112
109 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 113 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
110 #undef FindExecutable 114 #undef FindExecutable
111 #define FindExecutable error_use_qxeFindExecutable_or_FindExecutableA_and_FindExecutableW 115 #define FindExecutable error_use_qxeFindExecutable_or_FindExecutableA_and_FindExecutableW
112 #endif 116 #endif
655 659
656 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 660 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
657 #undef CreateMDIWindow 661 #undef CreateMDIWindow
658 #define CreateMDIWindow error_use_qxeCreateMDIWindow_or_CreateMDIWindowA_and_CreateMDIWindowW 662 #define CreateMDIWindow error_use_qxeCreateMDIWindow_or_CreateMDIWindowA_and_CreateMDIWindowW
659 #endif 663 #endif
660 HWND qxeCreateMDIWindow (const Extbyte * arg1, const Extbyte * arg2, DWORD arg3, int arg4, int arg5, int arg6, int arg7, HWND arg8, HINSTANCE arg9, LPARAM arg10); 664 HWND qxeCreateMDIWindow (Extbyte * arg1, const Extbyte * arg2, DWORD arg3, int arg4, int arg5, int arg6, int arg7, HWND arg8, HINSTANCE arg9, LPARAM arg10);
661 665
662 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 666 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
663 #undef CreateWindowEx 667 #undef CreateWindowEx
664 #define CreateWindowEx error_use_qxeCreateWindowEx_or_CreateWindowExA_and_CreateWindowExW 668 #define CreateWindowEx error_use_qxeCreateWindowEx_or_CreateWindowExA_and_CreateWindowExW
665 #endif 669 #endif
667 671
668 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 672 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
669 #undef CreateWindowStation 673 #undef CreateWindowStation
670 #define CreateWindowStation error_use_qxeCreateWindowStation_or_CreateWindowStationA_and_CreateWindowStationW 674 #define CreateWindowStation error_use_qxeCreateWindowStation_or_CreateWindowStationA_and_CreateWindowStationW
671 #endif 675 #endif
672 HWINSTA qxeCreateWindowStation (const Extbyte * arg1, DWORD arg2, DWORD arg3, LPSECURITY_ATTRIBUTES arg4); 676 HWINSTA qxeCreateWindowStation (Extbyte * arg1, DWORD arg2, DWORD arg3, LPSECURITY_ATTRIBUTES arg4);
673 677
674 #undef DefDlgProc 678 #undef DefDlgProc
675 #define DefDlgProc error_return_value_is_conditionalized_on__MAC__messes_up_parser 679 #define DefDlgProc error_return_value_is_conditionalized_on__MAC__messes_up_parser
676 680
677 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 681 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1119 #undef SendMessageCallback 1123 #undef SendMessageCallback
1120 #define SendMessageCallback error_use_qxeSendMessageCallback_or_SendMessageCallbackA_and_SendMessageCallbackW 1124 #define SendMessageCallback error_use_qxeSendMessageCallback_or_SendMessageCallbackA_and_SendMessageCallbackW
1121 #endif 1125 #endif
1122 BOOL qxeSendMessageCallback (HWND arg1, UINT arg2, WPARAM arg3, LPARAM arg4, SENDASYNCPROC arg5, DWORD arg6); 1126 BOOL qxeSendMessageCallback (HWND arg1, UINT arg2, WPARAM arg3, LPARAM arg4, SENDASYNCPROC arg5, DWORD arg6);
1123 1127
1124 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1125 #undef SendMessageTimeout 1128 #undef SendMessageTimeout
1126 #define SendMessageTimeout error_use_qxeSendMessageTimeout_or_SendMessageTimeoutA_and_SendMessageTimeoutW 1129 #define SendMessageTimeout error_VS6_has_erroneous_seventh_parameter_DWORD_PTR_instead_of_PDWORD_PTR
1127 #endif
1128 LRESULT qxeSendMessageTimeout (HWND arg1, UINT arg2, WPARAM arg3, LPARAM arg4, UINT arg5, UINT arg6, PDWORD_PTR arg7);
1129 1130
1130 /* Skipping SendMessage because split messages and structures */ 1131 /* Skipping SendMessage because split messages and structures */
1131 1132
1132 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 1133 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1133 #undef SendNotifyMessage 1134 #undef SendNotifyMessage
1230 int qxewvsprintf (Extbyte * arg1, const Extbyte * arg2, va_list arglist); 1231 int qxewvsprintf (Extbyte * arg1, const Extbyte * arg2, va_list arglist);
1231 1232
1232 1233
1233 /* Processing file DDEML.H */ 1234 /* Processing file DDEML.H */
1234 1235
1235 /* Skipping DdeCreateStringHandle because error in Cygwin prototype */ 1236 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1237 #undef DdeCreateStringHandle
1238 #define DdeCreateStringHandle error_use_qxeDdeCreateStringHandle_or_DdeCreateStringHandleA_and_DdeCreateStringHandleW
1239 #endif
1240 HSZ qxeDdeCreateStringHandle (DWORD arg1, const Extbyte * arg2, int arg3);
1236 1241
1237 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 1242 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1238 #undef DdeInitialize 1243 #undef DdeInitialize
1239 #define DdeInitialize error_use_qxeDdeInitialize_or_DdeInitializeA_and_DdeInitializeW 1244 #define DdeInitialize error_use_qxeDdeInitialize_or_DdeInitializeA_and_DdeInitializeW
1240 #endif 1245 #endif
1251 1256
1252 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 1257 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1253 #undef AbortSystemShutdown 1258 #undef AbortSystemShutdown
1254 #define AbortSystemShutdown error_use_qxeAbortSystemShutdown_or_AbortSystemShutdownA_and_AbortSystemShutdownW 1259 #define AbortSystemShutdown error_use_qxeAbortSystemShutdown_or_AbortSystemShutdownA_and_AbortSystemShutdownW
1255 #endif 1260 #endif
1256 BOOL qxeAbortSystemShutdown (const Extbyte * arg1); 1261 BOOL qxeAbortSystemShutdown (Extbyte * arg1);
1257 1262
1258 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 1263 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1259 #undef InitiateSystemShutdown 1264 #undef InitiateSystemShutdown
1260 #define InitiateSystemShutdown error_use_qxeInitiateSystemShutdown_or_InitiateSystemShutdownA_and_InitiateSystemShutdownW 1265 #define InitiateSystemShutdown error_use_qxeInitiateSystemShutdown_or_InitiateSystemShutdownA_and_InitiateSystemShutdownW
1261 #endif 1266 #endif
1262 BOOL qxeInitiateSystemShutdown (Extbyte * arg1, Extbyte * arg2, DWORD arg3, BOOL arg4, BOOL arg5); 1267 BOOL qxeInitiateSystemShutdown (Extbyte * arg1, Extbyte * arg2, DWORD arg3, BOOL arg4, BOOL arg5);
1263 1268
1264 /* Skipping RegConnectRegistry because error in Cygwin prototype */ 1269 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1270 #undef RegConnectRegistry
1271 #define RegConnectRegistry error_use_qxeRegConnectRegistry_or_RegConnectRegistryA_and_RegConnectRegistryW
1272 #endif
1273 LONG qxeRegConnectRegistry (const Extbyte * arg1, HKEY arg2, PHKEY arg3);
1265 1274
1266 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 1275 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1267 #undef RegCreateKeyEx 1276 #undef RegCreateKeyEx
1268 #define RegCreateKeyEx error_use_qxeRegCreateKeyEx_or_RegCreateKeyExA_and_RegCreateKeyExW 1277 #define RegCreateKeyEx error_use_qxeRegCreateKeyEx_or_RegCreateKeyExA_and_RegCreateKeyExW
1269 #endif 1278 #endif
1656 #endif 1665 #endif
1657 DWORD qxeGetGlyphOutline (HDC arg1, UINT arg2, UINT arg3, LPGLYPHMETRICS arg4, DWORD arg5, PVOID arg6, const MAT2* arg7); 1666 DWORD qxeGetGlyphOutline (HDC arg1, UINT arg2, UINT arg3, LPGLYPHMETRICS arg4, DWORD arg5, PVOID arg6, const MAT2* arg7);
1658 #endif /* defined (HAVE_MS_WINDOWS) */ 1667 #endif /* defined (HAVE_MS_WINDOWS) */
1659 1668
1660 #if defined (HAVE_MS_WINDOWS) 1669 #if defined (HAVE_MS_WINDOWS)
1661 /* Skipping GetICMProfile because NT 4.0+ only, error in Cygwin prototype */ 1670 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1671 #undef GetICMProfile
1672 #define GetICMProfile error_use_qxeGetICMProfile_or_GetICMProfileA_and_GetICMProfileW
1673 #endif
1674 BOOL qxeGetICMProfile (HDC arg1, LPDWORD arg2, Extbyte * arg3);
1662 #endif /* defined (HAVE_MS_WINDOWS) */ 1675 #endif /* defined (HAVE_MS_WINDOWS) */
1663 1676
1664 #if defined (HAVE_MS_WINDOWS) 1677 #if defined (HAVE_MS_WINDOWS)
1665 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 1678 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
1666 #undef GetKerningPairs 1679 #undef GetKerningPairs