Mercurial > hg > xemacs-beta
view netinstall/autoload.c @ 4745:0c54de4c4b9d
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
have a symbol in this macro.
(setup_ccl_program): Ensure we're not allocating unreachable
memory in this function; all symbols must have been resolved in a
given CCL program before this function is called.
(find_ccl_program): New function, return a CCL program with all
its symbols resolved if it is valid (possibly allocating memory),
Qnil otherwise.
(get_ccl_program): New function, exported to other files; call
find_ccl_program, and error if it gives nil.
(Fccl_program_p): Call find_ccl_program from this function instead
of implementing the bulk of it here.
(Fccl_execute): Call get_ccl_program instead of implementing the
bulk of it here.
(Fccl_execute_on_string): Ditto.
* mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration,
it hasn't been used in years.
(get_ccl_program): Declare this function.
* mule-coding.c (ccl_putprop): Use get_ccl_program on any
specified encode or decode CCL program property.
(fixed_width_putprop): Ditto.
* mule-charset.c (Fmake_charset): Use get_ccl_program on any
specified ccl-program.
(Fset_charset_ccl_program): Ditto.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 15 Nov 2009 16:53:14 +0000 |
parents | 3078fd1074e8 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ #include "win32.h" typedef struct { char *name; HINSTANCE handle; } DllInfo; #define DLL(n) static DllInfo n ## _info __asm__ (#n "_info") = { #n, 0} #define Auto(dll, func, size) \ __asm__ ("\t.data"); \ __asm__ ("\t.global\t_" #func "@" #size); \ __asm__ ("_" #func "@" #size ":"); \ __asm__ ("\tcall\tautoload_common"); \ __asm__ ("\t.long\t" #dll "_info"); \ __asm__ ("\t.ascii\t\"" #func "\\0\"") DLL (wininet); Auto (wininet, InternetAttemptConnect, 4); Auto (wininet, InternetCloseHandle, 4); Auto (wininet, InternetGetLastResponseInfoA, 12); Auto (wininet, InternetOpenA, 20); Auto (wininet, InternetOpenUrlA, 24); Auto (wininet, InternetReadFile, 16); Auto (wininet, InternetSetOptionA, 16); Auto (wininet, InternetQueryOptionA, 16); Auto (wininet, HttpQueryInfoA, 20); Auto (wininet, HttpSendRequestA, 20); typedef struct { DllInfo *dll; char name[100]; } AutoEntry; static void autoload_common () __asm__ ("autoload_common"); static void autoload_common (int x) { int fp, rel; unsigned char *proc; HINSTANCE h; AutoEntry *a; a = *(AutoEntry **)(&x - 1); if (a->dll->handle == 0) { h = LoadLibrary (a->dll->name); a->dll->handle = h; } fp = (int) GetProcAddress (a->dll->handle, a->name); proc = ((unsigned char *)a) - 5; rel = fp - (int)(a); /* now it's a relative call */ *proc++ = 0xe9; /* jump near 32-bit relative */ *proc++ = rel; *proc++ = rel>>8; *proc++ = rel>>16; *proc++ = rel>>24; *(int *)(&x-1) = (int)proc-5; }