Mercurial > hg > xemacs-beta
annotate lib-src/winclient.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 422b4b4fb2a6 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 853 | 1 /* DDE client for XEmacs. |
| 2 Copyright (C) 2002 Alastair J. Houghton | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* -- Includes -------------------------------------------------------------- */ | |
| 24 | |
| 25 #ifdef HAVE_CONFIG_H | |
| 26 # include <config.h> | |
| 27 #endif | |
| 2993 | 28 #include <windows.h> |
| 29 #include <ddeml.h> | |
| 853 | 30 #include <stdlib.h> |
| 31 #include <stdio.h> | |
| 32 #include <ctype.h> | |
| 33 #include <errno.h> | |
| 34 | |
| 5030 | 35 #ifdef __CYGWIN__ |
| 36 #include <stdlib.h> | |
| 37 #include <unistd.h> | |
| 38 #endif | |
| 39 | |
| 853 | 40 static void error (const char* s1, const char* s2); |
| 41 static void fatal (const char *s1, const char *s2); | |
| 42 static void * xmalloc (size_t size); | |
| 43 static char * getNextArg (const char **ptr, unsigned *len); | |
| 44 | |
| 45 /* -- Post-Include Defines -------------------------------------------------- */ | |
| 46 | |
| 47 /* Timeouts & delays */ | |
| 5030 | 48 #define CONNECT_RETRIES 20 |
| 853 | 49 #define CONNECT_DELAY 500 /* ms */ |
| 50 #define TRANSACTION_TIMEOUT 5000 /* ms */ | |
| 51 #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ | |
| 52 | |
| 53 /* DDE Strings */ | |
| 54 #define SERVICE_NAME "XEmacs" | |
| 55 #define TOPIC_NAME "System" | |
| 56 #define COMMAND_FORMAT "[open(\"%s%s\")]" | |
| 57 | |
| 58 /* XEmacs program name */ | |
| 5030 | 59 #define GENERIC_PROGRAM EMACS_PROGNAME ".exe" |
| 60 #define VERSIONED_PROGRAM EMACS_PROGNAME "-" EMACS_VERSION ".exe" | |
| 853 | 61 |
| 62 /* -- Constants ------------------------------------------------------------- */ | |
| 63 | |
| 64 /* -- Global Variables ------------------------------------------------------ */ | |
| 65 | |
| 66 HINSTANCE hInstance; | |
| 67 DWORD idInst = 0; | |
| 68 | |
| 69 /* -- Function Declarations ------------------------------------------------- */ | |
| 70 | |
| 71 HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, | |
| 72 HSZ hsz1, HSZ hsz2, HDDEDATA hdata, | |
| 73 DWORD dwData1, DWORD dwData2); | |
| 74 | |
| 75 int WINAPI WinMain (HINSTANCE hInst, | |
| 76 HINSTANCE hPrev, | |
| 77 LPSTR lpCmdLine, | |
| 78 int nCmdShow); | |
| 79 | |
| 80 static HCONV openConversation (void); | |
| 81 static void closeConversation (HCONV hConv); | |
| 82 static int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2); | |
| 83 static int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine); | |
| 84 | |
| 85 /* -- Function Definitions -------------------------------------------------- */ | |
| 86 | |
| 87 /* | |
| 88 * Name : ddeCallback | |
| 89 * Function: Gets called by DDEML. | |
| 90 * | |
| 91 */ | |
| 92 | |
| 93 HDDEDATA CALLBACK | |
| 94 ddeCallback (UINT uType, UINT uFmt, HCONV hconv, | |
| 95 HSZ hsz1, HSZ hsz2, HDDEDATA hdata, | |
| 96 DWORD dwData1, DWORD dwData2) | |
| 97 { | |
| 98 return (HDDEDATA) NULL; | |
| 99 } | |
| 100 | |
| 101 /* | |
| 102 * Name : WinMain | |
| 103 * Function: The program's entry point function. | |
| 104 * | |
| 105 */ | |
| 106 | |
| 107 int WINAPI | |
| 108 WinMain (HINSTANCE hInst, | |
| 109 HINSTANCE hPrev, | |
| 110 LPSTR lpCmdLine, | |
| 111 int nCmdShow) | |
| 112 { | |
| 113 HCONV hConv; | |
| 114 int ret = 0; | |
| 115 UINT uiRet; | |
| 5030 | 116 |
| 853 | 117 /* Initialise the DDEML library */ |
| 118 uiRet = DdeInitialize (&idInst, | |
| 119 (PFNCALLBACK) ddeCallback, | |
| 120 APPCMD_CLIENTONLY | |
| 121 |CBF_FAIL_ALLSVRXACTIONS, | |
| 122 0); | |
| 123 | |
| 124 if (uiRet != DMLERR_NO_ERROR) | |
| 125 { | |
| 126 MessageBox (NULL, "Could not initialise DDE management library.", | |
| 127 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 128 | |
| 129 return 1; | |
| 130 } | |
| 131 | |
| 132 /* Open a conversation */ | |
| 133 hConv = openConversation (); | |
| 134 | |
| 135 if (hConv) | |
| 136 { | |
| 137 /* OK. Next, we need to parse the command line. */ | |
| 138 ret = parseCommandLine (hConv, lpCmdLine); | |
| 139 | |
| 140 /* Close the conversation */ | |
| 141 closeConversation (hConv); | |
| 142 } | |
| 5030 | 143 |
| 853 | 144 DdeUninitialize (idInst); |
| 145 | |
| 146 return ret; | |
| 147 } | |
| 148 | |
| 149 /* | |
| 150 * Name : openConversation | |
| 151 * Function: Start a conversation. | |
| 152 * | |
| 153 */ | |
| 154 | |
| 155 static HCONV | |
| 156 openConversation (void) | |
| 157 { | |
| 158 HSZ hszService = NULL, hszTopic = NULL; | |
| 159 HCONV hConv = NULL; | |
| 160 | |
| 161 /* Get the application (service) name */ | |
| 162 hszService = DdeCreateStringHandle (idInst, | |
| 163 SERVICE_NAME, | |
| 164 CP_WINANSI); | |
| 165 | |
| 166 if (!hszService) | |
| 167 { | |
| 168 MessageBox (NULL, "Could not create string handle for service.", | |
| 169 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 170 | |
| 171 goto error; | |
| 172 } | |
| 5030 | 173 |
| 853 | 174 /* Get the topic name */ |
| 175 hszTopic = DdeCreateStringHandle (idInst, | |
| 176 TOPIC_NAME, | |
| 177 CP_WINANSI); | |
| 178 | |
| 179 if (!hszTopic) | |
| 180 { | |
| 181 MessageBox (NULL, "Could not create string handle for topic.", | |
| 182 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 183 | |
| 184 goto error; | |
| 185 } | |
| 186 | |
| 187 /* Try to connect */ | |
| 188 hConv = DdeConnect (idInst, hszService, hszTopic, NULL); | |
| 189 | |
| 190 if (!hConv) | |
| 191 { | |
| 192 STARTUPINFO sti; | |
| 193 PROCESS_INFORMATION pi; | |
| 194 int n; | |
| 5030 | 195 |
| 853 | 196 /* Try to start the program */ |
| 197 ZeroMemory (&sti, sizeof (sti)); | |
| 198 sti.cb = sizeof (sti); | |
| 5030 | 199 if (!CreateProcess (NULL, GENERIC_PROGRAM, NULL, NULL, FALSE, 0, |
| 200 NULL, NULL, &sti, &pi) && | |
| 201 !CreateProcess (NULL, VERSIONED_PROGRAM, NULL, NULL, FALSE, 0, | |
| 853 | 202 NULL, NULL, &sti, &pi)) |
| 203 { | |
| 204 MessageBox (NULL, "Could not start process.", | |
| 205 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 206 | |
| 207 goto error; | |
| 208 } | |
| 209 | |
| 210 /* Wait for the process to enter an idle state */ | |
| 211 WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT); | |
| 212 | |
| 213 /* Close the handles */ | |
| 214 CloseHandle (pi.hThread); | |
| 215 CloseHandle (pi.hProcess); | |
| 5030 | 216 |
| 853 | 217 /* Try to connect */ |
|
4464
61aff09a7589
Increase DDE connection retries because waiting for XEmacs to start
Vin Shelton <acs@xemacs.org>
parents:
2993
diff
changeset
|
218 for (n = 0; n < CONNECT_RETRIES; n++) |
| 853 | 219 { |
| 220 Sleep (CONNECT_DELAY); | |
| 5030 | 221 |
| 853 | 222 hConv = DdeConnect (idInst, hszService, hszTopic, NULL); |
| 223 | |
| 224 if (hConv) | |
| 225 break; | |
| 226 } | |
| 227 | |
| 228 if (!hConv) | |
| 229 { | |
| 230 /* Still couldn't connect. */ | |
| 231 MessageBox (NULL, "Could not connect to DDE server.", | |
| 232 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 233 | |
| 234 goto error; | |
| 235 } | |
| 236 } | |
| 237 | |
| 238 /* Release the string handles */ | |
| 239 DdeFreeStringHandle (idInst, hszService); | |
| 240 DdeFreeStringHandle (idInst, hszTopic); | |
| 241 | |
| 242 return hConv; | |
| 5030 | 243 |
| 853 | 244 error: |
| 245 if (hConv) | |
| 246 DdeDisconnect (hConv); | |
| 247 if (hszService) | |
| 248 DdeFreeStringHandle (idInst, hszService); | |
| 249 if (hszTopic) | |
| 250 DdeFreeStringHandle (idInst, hszTopic); | |
| 251 | |
| 252 return NULL; | |
| 253 } | |
| 254 | |
| 255 /* | |
| 256 * Name : closeConversation | |
| 257 * Function: Close a conversation. | |
| 258 * | |
| 259 */ | |
| 260 | |
| 261 static void | |
| 262 closeConversation (HCONV hConv) | |
| 263 { | |
| 264 /* Shut down */ | |
| 265 DdeDisconnect (hConv); | |
| 266 } | |
| 267 | |
| 268 /* | |
| 269 * Name : doFile | |
| 270 * Function: Process a file. | |
| 271 * | |
| 272 */ | |
| 273 | |
| 274 int | |
| 275 doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2) | |
| 276 { | |
| 277 char *buf = NULL; | |
| 278 unsigned len; | |
| 5030 | 279 |
| 853 | 280 /* Calculate the buffer length */ |
| 281 len = strlen (lpszFileName1) + strlen (lpszFileName2) | |
| 282 + strlen (COMMAND_FORMAT); | |
| 5030 | 283 |
| 853 | 284 /* Allocate a buffer */ |
| 285 buf = (char *) xmalloc (len); | |
| 286 | |
| 287 if (!buf) | |
| 288 { | |
| 289 MessageBox (NULL, "Not enough memory.", | |
| 290 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 291 | |
| 292 return 1; | |
| 293 } | |
| 294 | |
| 295 /* Build the command */ | |
| 296 len = wsprintf (buf, COMMAND_FORMAT, lpszFileName1, lpszFileName2); | |
| 5030 | 297 len++; |
| 853 | 298 |
| 299 /* OK. We're connected. Send the message. */ | |
| 300 DdeClientTransaction (buf, len, hConv, NULL, | |
| 301 0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL); | |
| 302 | |
| 303 free (buf); | |
| 5030 | 304 |
| 853 | 305 return 0; |
| 306 } | |
| 307 | |
| 308 /* | |
| 309 * Name : getNextArg | |
| 310 * Function: Retrieve the next command line argument. | |
| 311 * | |
| 312 */ | |
| 313 | |
| 314 static char * | |
| 315 getNextArg (const char **ptr, unsigned *len) | |
| 316 { | |
| 317 int in_quotes = 0, quit = 0, all_in_quotes = 0; | |
| 318 const char *p = *ptr, *start; | |
| 319 char *buf = NULL; | |
| 320 unsigned length = 0; | |
| 321 | |
| 322 /* Skip whitespace */ | |
| 323 while (*p && isspace (*p)) | |
| 324 p++; | |
| 325 | |
| 326 /* If this is the end, return NULL */ | |
| 327 if (!*p) | |
| 328 return NULL; | |
| 5030 | 329 |
| 853 | 330 /* Remember where we are */ |
| 331 start = p; | |
| 5030 | 332 |
| 853 | 333 /* Find the next whitespace character outside quotes */ |
| 334 if (*p == '"') | |
| 335 all_in_quotes = 1; | |
| 5030 | 336 |
| 853 | 337 while (*p && !quit) |
| 338 { | |
| 339 switch (*p) | |
| 340 { | |
| 341 case '"': | |
| 342 in_quotes = 1 - in_quotes; | |
| 343 p++; | |
| 344 break; | |
| 345 | |
| 346 case '\\': | |
| 347 if (!in_quotes) | |
| 348 all_in_quotes = 0; | |
| 5030 | 349 |
| 853 | 350 p++; |
| 351 | |
| 352 if (!*p) | |
| 353 break; | |
| 354 | |
| 355 p++; | |
| 356 break; | |
| 357 | |
| 358 default: | |
| 359 if (isspace (*p) && !in_quotes) | |
| 360 quit = 1; | |
| 361 else if (!in_quotes) | |
| 362 all_in_quotes = 0; | |
| 363 | |
| 364 if (!quit) | |
| 365 p++; | |
| 366 } | |
| 367 } | |
| 368 | |
| 369 /* Work out the length */ | |
| 370 length = p - start; | |
| 371 | |
| 372 /* Strip quotes if the argument is completely quoted */ | |
| 373 if (all_in_quotes) | |
| 374 { | |
| 375 start++; | |
| 376 length -= 2; | |
| 377 } | |
| 5030 | 378 |
| 853 | 379 /* Copy */ |
| 380 buf = (char *) xmalloc (length + 1); | |
| 381 | |
| 382 if (!buf) | |
| 383 return NULL; | |
| 5030 | 384 |
| 853 | 385 strncpy (buf, start, length); |
| 386 buf[length] = '\0'; | |
| 387 | |
| 388 /* Return the pointer and length */ | |
| 389 *ptr = p; | |
| 390 *len = length; | |
| 391 | |
| 392 return buf; | |
| 393 } | |
| 394 | |
| 395 /* | |
| 396 * Name : parseCommandLine | |
| 397 * Function: Process the command line. This program accepts a list of strings | |
| 398 * : (which may contain wildcards) representing filenames. | |
| 399 * | |
| 400 */ | |
| 401 | |
| 402 int | |
| 403 parseCommandLine (HCONV hConv, LPSTR lpszCommandLine) | |
| 404 { | |
| 405 char *fullpath, *filepart; | |
| 406 char *arg; | |
| 407 unsigned len, pathlen; | |
| 408 int ret = 0; | |
| 409 HANDLE hFindFile = NULL; | |
| 410 WIN32_FIND_DATA wfd; | |
| 411 | |
| 412 /* Retrieve arguments */ | |
| 413 while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL) | |
| 414 { | |
| 5030 | 415 fullpath = NULL; |
| 416 #ifdef __CYGWIN__ | |
| 417 /* If the filename is not an absolute path, | |
| 418 add the current directory to the pathname */ | |
| 419 if (*arg != '/') | |
| 420 { | |
| 421 len = pathconf(".", _PC_PATH_MAX); | |
| 422 fullpath = (char *) xmalloc (len+1); | |
| 423 if (!fullpath) | |
| 424 { | |
| 425 MessageBox (NULL, "Not enough memory.", "winclient", | |
| 426 MB_ICONEXCLAMATION | MB_OK); | |
| 427 ret = 1; | |
| 428 break; | |
| 429 } | |
| 430 if (!getcwd(fullpath, (size_t)len)) | |
| 431 { | |
| 432 MessageBox (NULL, "Could not retrieve current directory.", | |
| 433 "winclient", MB_ICONEXCLAMATION | MB_OK); | |
| 434 ret = 1; | |
| 435 break; | |
| 436 } | |
| 437 /* Append trailing slash */ | |
| 438 strcat(fullpath, "/"); | |
| 439 ret = doFile (hConv, fullpath, arg); | |
| 440 } | |
| 441 else | |
| 442 { | |
| 443 /* The arg has already been expanded, so pass it as it is */ | |
| 444 ret = doFile (hConv, "", arg); | |
| 445 } | |
| 446 #else | |
| 853 | 447 /* First find the canonical path name */ |
| 448 fullpath = filepart = NULL; | |
| 449 pathlen = GetFullPathName (arg, 0, fullpath, &filepart); | |
| 450 | |
| 451 fullpath = (char *) xmalloc (pathlen); | |
| 452 | |
| 453 if (!fullpath) | |
| 454 { | |
| 455 MessageBox (NULL, "Not enough memory.", "winclient", | |
| 456 MB_ICONEXCLAMATION | MB_OK); | |
| 457 ret = 1; | |
| 458 break; | |
| 459 } | |
| 460 | |
| 461 GetFullPathName (arg, pathlen, fullpath, &filepart); | |
| 462 | |
| 463 /* Find the first matching file */ | |
| 464 hFindFile = FindFirstFile (arg, &wfd); | |
| 465 | |
| 466 if (hFindFile == INVALID_HANDLE_VALUE) | |
| 467 ret = doFile (hConv, fullpath, ""); | |
| 468 else | |
| 469 { | |
| 470 /* Chop off the file part from the full path name */ | |
| 471 if (filepart) | |
| 472 *filepart = '\0'; | |
| 473 | |
| 474 /* For each matching file */ | |
| 475 do | |
| 476 { | |
| 477 /* Process it */ | |
| 478 ret = doFile (hConv, fullpath, wfd.cFileName); | |
| 479 | |
| 480 if (ret) | |
| 481 break; | |
| 482 } | |
| 483 while (FindNextFile (hFindFile, &wfd)); | |
| 484 | |
| 485 FindClose (hFindFile); | |
| 486 } | |
| 5030 | 487 #endif |
| 853 | 488 /* Release the path name buffers */ |
| 5030 | 489 if (fullpath) |
| 490 free (fullpath); | |
| 853 | 491 free (arg); |
| 492 | |
| 493 if (ret) | |
| 494 break; | |
| 495 } | |
| 496 | |
| 497 return ret; | |
| 498 } | |
| 499 | |
| 500 static void | |
| 501 fatal (const char *s1, const char *s2) | |
| 502 { | |
| 503 error (s1, s2); | |
| 504 exit (1); | |
| 505 } | |
| 506 | |
| 507 /* Print error message. `s1' is printf control string, `s2' is arg for it. */ | |
| 508 static void | |
| 509 error (const char* s1, const char* s2) | |
| 510 { | |
| 511 fprintf (stderr, "winclient: "); | |
| 512 fprintf (stderr, s1, s2); | |
| 513 fprintf (stderr, "\n"); | |
| 514 } | |
| 515 | |
| 516 /* Like malloc but get fatal error if memory is exhausted. */ | |
| 517 | |
| 518 static void * | |
| 519 xmalloc (size_t size) | |
| 520 { | |
| 521 void *result = malloc (size); | |
| 522 if (result == NULL) | |
| 523 fatal ("virtual memory exhausted", (char *) 0); | |
| 524 return result; | |
| 525 } |