Mercurial > hg > xemacs-beta
annotate netinstall/mklink2.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 |
rev | line source |
---|---|
448 | 1 #include "win32.h" |
2 #include "shlobj.h" | |
3 | |
4 /* This part of the code must be in C because the C++ interface to COM | |
5 doesn't work. */ | |
6 | |
7 void | |
8 make_link_2 (char *exepath, char *args, char *icon, char *lname) | |
9 { | |
10 IShellLink *sl; | |
11 IPersistFile *pf; | |
12 WCHAR widepath [_MAX_PATH]; | |
13 | |
14 CoCreateInstance (&CLSID_ShellLink, NULL, | |
15 CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID *) & sl); | |
16 sl->lpVtbl->QueryInterface (sl, &IID_IPersistFile, (void **) &pf); | |
17 | |
18 sl->lpVtbl->SetPath (sl, exepath); | |
19 sl->lpVtbl->SetArguments (sl, args); | |
20 sl->lpVtbl->SetIconLocation (sl, icon, 0); | |
21 | |
22 MultiByteToWideChar (CP_ACP, 0, lname, -1, widepath, _MAX_PATH); | |
23 pf->lpVtbl->Save (pf, widepath, TRUE); | |
24 | |
25 pf->lpVtbl->Release (pf); | |
26 sl->lpVtbl->Release (sl); | |
27 } |