Mercurial > hg > xemacs-beta

diff src/intl-encap-win32.c @ 2500:3d8143fc88e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-01-24 23:33:30 by ben] get working with VC7 config.inc.samp: Declare OPTIONAL_LIBRARY_DIR as root of library directories. Redo all graphics library defaults to mirror the versions and directories in the current binary aux distribution on xemacs web site. Enable TIFF and COMPFACE by default since you can now compile with them and binary libs are provided. xemacs.mak: Put our own directories first in case of conflict (e.g. config.h in compface). xemacs.mak: Use MSVCRT to avoid link problems. s/windowsnt.h: bytecode.c, print.c: Add casts to avoid warning. compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and friends here, like for GCC. Need different definitions for VC7 and VC6. s/windowsnt.h: Remove stuff moved to compiler.h. Disable warning 4646 ("function declared with __declspec(noreturn) has non-void return type") on VC7 since lots of Lisp primitives trigger this and there is no easy way to kludge around the warning. glyphs-eimage.c: Some really nasty hacks to allow TIFF and JPEG to both be compiled. #### The better solution is to move the TIFF and JPEG code to different files. glyphs-msw.c: Define __STDC__ to avoid problems with compface.h. intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, syswindows.h: Those wankers at Microsoft cannot leave well enough alone. Various functions change parameter types semi-randomly between VC6 and VC7, so we need to include our own versions that can handle both kinds with appropriate casting. EmacsFrame.c, EmacsShell-sub.c, EmacsShell.c, alloc.c, alloca.c, buffer.c, bytecode.c, charset.h, chartab.c, cm.c, console-stream.c, console.c, data.c, debug.h, device-msw.c, device-tty.c, device-x.c, doprnt.c, dumper.c, dynarr.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, free-hook.c, gccache-gtk.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, glyphs.c, gtk-glue.c, gutter.c, input-method-xlib.c, insdel.c, intl-win32.c, keymap.c, lisp.h, lread.c, lstream.c, macros.c, malloc.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, mule-coding.c, native-gtk-toolbar.c, number.c, objects-msw.c, objects.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, regex.c, scrollbar-gtk.c, scrollbar-x.c, search.c, select-x.c, signal.c, specifier.c, specifier.h, strftime.c, sunplay.c, symbols.c, sysdep.c, sysproc.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, ui-gtk.c, unexnt.c, unicode.c, win32.c, window.c, xgccache.c, s/windowsnt.h: abort() -> ABORT(). Eliminate preprocessor games with abort() since it creates huge problems in VC7, solvable only by including massive amounts of files in every compile (and not worth it).
author ben
date Mon, 24 Jan 2005 23:34:34 +0000
parents ecf1ebac70d8
children 6765f2581182
line wrap: on
line diff
--- a/src/intl-encap-win32.c	Mon Jan 24 22:51:18 2005 +0000
+++ b/src/intl-encap-win32.c	Mon Jan 24 23:34:34 2005 +0000
@@ -146,9 +146,9 @@
 yes OutputDebugString
 yes FindResource
 yes FindResourceEx
-yes EnumResourceTypes
-yes EnumResourceNames
-yes EnumResourceLanguages
+skip EnumResourceTypes different prototypes in VC6 and VC7
+skip EnumResourceNames different prototypes in VC6 and VC7
+skip EnumResourceLanguages different prototypes in VC6 and VC7
 yes BeginUpdateResource
 yes UpdateResource
 yes EndUpdateResource
@@ -797,7 +797,7 @@
 yes ImmGetDescription
 yes ImmGetIMEFileName
 yes ImmGetCompositionString
-yes ImmSetCompositionString
+skip ImmSetCompositionString different prototypes in VC6 and VC7
 yes ImmGetCandidateListCount
 yes ImmGetCandidateList
 yes ImmGetGuideLine
@@ -1249,6 +1249,69 @@
 
 #endif /* not CYGWIN */
 
+/********************************************************************************/
+/* would be encapsulatable but for header changes in different versions of VC++ */
+/********************************************************************************/
+
+#if MSC_VERSION >= 1300
+
+BOOL
+qxeEnumResourceTypes (HMODULE hModule, ENUMRESTYPEPROCW lpEnumFunc, LONG lParam)
+{
+  if (XEUNICODE_P)
+    return EnumResourceTypesW (hModule, lpEnumFunc, lParam);
+  else
+    return EnumResourceTypesA (hModule, (ENUMRESTYPEPROCA) lpEnumFunc, lParam);
+}
+
+BOOL
+qxeEnumResourceNames (HMODULE hModule, const Extbyte * lpType, ENUMRESNAMEPROCW lpEnumFunc, LONG lParam)
+{
+  if (XEUNICODE_P)
+    return EnumResourceNamesW (hModule, (LPCWSTR) lpType, lpEnumFunc, lParam);
+  else
+    return EnumResourceNamesA (hModule, (LPCSTR) lpType, (ENUMRESNAMEPROCA) lpEnumFunc, lParam);
+}
+
+BOOL
+qxeEnumResourceLanguages (HMODULE hModule, const Extbyte * lpType, const Extbyte * lpName, ENUMRESLANGPROCW lpEnumFunc, LONG lParam)
+{
+  if (XEUNICODE_P)
+    return EnumResourceLanguagesW (hModule, (LPCWSTR) lpType, (LPCWSTR) lpName, lpEnumFunc, lParam);
+  else
+    return EnumResourceLanguagesA (hModule, (LPCSTR) lpType, (LPCSTR) lpName, (ENUMRESLANGPROCA) lpEnumFunc, lParam);
+}
+
+#else
+
+BOOL
+qxeEnumResourceTypes (HMODULE hModule, ENUMRESTYPEPROC lpEnumFunc, LONG lParam)
+{
+  if (XEUNICODE_P)
+    return EnumResourceTypesW (hModule, lpEnumFunc, lParam);
+  else
+    return EnumResourceTypesA (hModule, lpEnumFunc, lParam);
+}
+
+BOOL
+qxeEnumResourceNames (HMODULE hModule, const Extbyte * lpType, ENUMRESNAMEPROC lpEnumFunc, LONG lParam)
+{
+  if (XEUNICODE_P)
+    return EnumResourceNamesW (hModule, (LPCWSTR) lpType, lpEnumFunc, lParam);
+  else
+    return EnumResourceNamesA (hModule, (LPCSTR) lpType, lpEnumFunc, lParam);
+}
+
+BOOL
+qxeEnumResourceLanguages (HMODULE hModule, const Extbyte * lpType, const Extbyte * lpName, ENUMRESLANGPROC lpEnumFunc, LONG lParam)
+{
+  if (XEUNICODE_P)
+    return EnumResourceLanguagesW (hModule, (LPCWSTR) lpType, (LPCWSTR) lpName, lpEnumFunc, lParam);
+  else
+    return EnumResourceLanguagesA (hModule, (LPCSTR) lpType, (LPCSTR) lpName, lpEnumFunc, lParam);
+}
+
+#endif /* MSC_VERSION >= 1300 */
 
 /************************************************************************/
 /*                                files                                 */
@@ -2047,7 +2110,31 @@
       return retval;
     }
 }
- 
+
+#if MSC_VERSION >= 1300
+
+BOOL
+qxeImmSetCompositionString (HIMC arg1, DWORD dwIndex, LPVOID lpComp, DWORD arg4, LPVOID lpRead, DWORD arg6)
+{
+  if (XEUNICODE_P)
+    return ImmSetCompositionStringW (arg1, dwIndex, lpComp, arg4, lpRead, arg6);
+  else
+    return ImmSetCompositionStringA (arg1, dwIndex, lpComp, arg4, lpRead, arg6);
+}
+
+#else
+
+BOOL
+qxeImmSetCompositionString (HIMC arg1, DWORD dwIndex, LPCVOID lpComp, DWORD arg4, LPCVOID lpRead, DWORD arg6)
+{
+  if (XEUNICODE_P)
+    return ImmSetCompositionStringW (arg1, dwIndex, lpComp, arg4, lpRead, arg6);
+  else
+    return ImmSetCompositionStringA (arg1, dwIndex, lpComp, arg4, lpRead, arg6);
+}
+
+#endif /* MSC_VERSION >= 1300 */
+
 int
 qxeGetObject (HGDIOBJ hgdiobj, int cbBuffer, LPVOID lpvObject)
 {