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

[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
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
2627 2627
2628 #endif /* defined (HAVE_MS_WINDOWS) */ 2628 #endif /* defined (HAVE_MS_WINDOWS) */
2629 2629
2630 #if defined (HAVE_MS_WINDOWS) 2630 #if defined (HAVE_MS_WINDOWS)
2631 2631
2632 BOOL
2633 qxeImmSetCompositionString (HIMC arg1, DWORD dwIndex, LPCVOID lpComp, DWORD arg4, LPCVOID lpRead, DWORD arg6)
2634 {
2635 if (XEUNICODE_P)
2636 return ImmSetCompositionStringW (arg1, dwIndex, lpComp, arg4, lpRead, arg6);
2637 else
2638 return ImmSetCompositionStringA (arg1, dwIndex, lpComp, arg4, lpRead, arg6);
2639 }
2640
2641 #endif /* defined (HAVE_MS_WINDOWS) */
2642
2643 #if defined (HAVE_MS_WINDOWS)
2644
2645 DWORD 2632 DWORD
2646 qxeImmGetCandidateListCount (HIMC arg1, LPDWORD lpdwListCount) 2633 qxeImmGetCandidateListCount (HIMC arg1, LPDWORD lpdwListCount)
2647 { 2634 {
2648 if (XEUNICODE_P) 2635 if (XEUNICODE_P)
2649 return ImmGetCandidateListCountW (arg1, lpdwListCount); 2636 return ImmGetCandidateListCountW (arg1, lpdwListCount);
3143 return FindResourceExW (hModule, (LPCWSTR) lpType, (LPCWSTR) lpName, wLanguage); 3130 return FindResourceExW (hModule, (LPCWSTR) lpType, (LPCWSTR) lpName, wLanguage);
3144 else 3131 else
3145 return FindResourceExA (hModule, (LPCSTR) lpType, (LPCSTR) lpName, wLanguage); 3132 return FindResourceExA (hModule, (LPCSTR) lpType, (LPCSTR) lpName, wLanguage);
3146 } 3133 }
3147 3134
3148 BOOL
3149 qxeEnumResourceTypes (HMODULE hModule, ENUMRESTYPEPROC lpEnumFunc, LONG lParam)
3150 {
3151 if (XEUNICODE_P)
3152 return EnumResourceTypesW (hModule, lpEnumFunc, lParam);
3153 else
3154 return EnumResourceTypesA (hModule, lpEnumFunc, lParam);
3155 }
3156
3157 BOOL
3158 qxeEnumResourceNames (HMODULE hModule, const Extbyte * lpType, ENUMRESNAMEPROC lpEnumFunc, LONG lParam)
3159 {
3160 if (XEUNICODE_P)
3161 return EnumResourceNamesW (hModule, (LPCWSTR) lpType, lpEnumFunc, lParam);
3162 else
3163 return EnumResourceNamesA (hModule, (LPCSTR) lpType, lpEnumFunc, lParam);
3164 }
3165
3166 BOOL
3167 qxeEnumResourceLanguages (HMODULE hModule, const Extbyte * lpType, const Extbyte * lpName, ENUMRESLANGPROC lpEnumFunc, LONG lParam)
3168 {
3169 if (XEUNICODE_P)
3170 return EnumResourceLanguagesW (hModule, (LPCWSTR) lpType, (LPCWSTR) lpName, lpEnumFunc, lParam);
3171 else
3172 return EnumResourceLanguagesA (hModule, (LPCSTR) lpType, (LPCSTR) lpName, lpEnumFunc, lParam);
3173 }
3174
3175 HANDLE 3135 HANDLE
3176 qxeBeginUpdateResource (const Extbyte * pFileName, BOOL bDeleteExistingResources) 3136 qxeBeginUpdateResource (const Extbyte * pFileName, BOOL bDeleteExistingResources)
3177 { 3137 {
3178 if (XEUNICODE_P) 3138 if (XEUNICODE_P)
3179 return BeginUpdateResourceW ((LPCWSTR) pFileName, bDeleteExistingResources); 3139 return BeginUpdateResourceW ((LPCWSTR) pFileName, bDeleteExistingResources);