Mercurial > emacs
annotate nt/preprep.c @ 31380:2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
not necessary. If verbose in state `needs-patch', do the same as
under `up-to-date'. When NOT verbose and `needs-patch', check out
latest version instead of `merge-news'.
(vc-next-action-dired): Don't mess with default-directory here; it
breaks other parts of dired. It is the job of the
backend-specific functions to adjust it temporarily if they need
it.
(vc-next-action): Remove a special CVS case.
(vc-clear-headers): New optional arg FILE.
(vc-checkin, vc-checkout): Set properties vc-state and
vc-checkout-time properly.
(vc-finish-steal): Call steal-lock, not steal, which doesn't
exist.
(vc-print-log): Use new backend function `show-log-entry'.
(vc-cancel-version): Do the checks in a different order. Added a
FIXME concerning RCS-only code.
(vc-responsible-backend): New optional arg `register'.
(vc-default-could-register): New function.
(vc-dired-buffers-for-dir, vc-dired-resynch-file): New functions.
(vc-resynch-buffer): Call vc-dired-resynch-file.
(vc-start-entry, vc-finish-logentry, vc-revert-buffer): Use
vc-resynch-buffer instead of vc-resynch-window.
(vc-next-action-dired): Don't redisplay here, that gets done as a
result of the individual file operations.
(vc-retrieve-snapshot): Corrected prompt order.
(vc-version-diff): Use `require' to check for existence of
diff-mode.
(vc-do-command): Doc fix.
(vc-finish-logentry): When checking in from vc-dired, choose the
right backend for logentry check.
(vc-dired-mode-map): Inherit from dired-mode-map.
(vc-dired-mode): Local value of dired-move-to-filename-regexp
simplified.
(vc-dired-state-info): Removed, updated caller.
(vc-default-dired-state-info): Use parentheses instead of hyphens.
(vc-dired-hook): Use vc-BACKEND-dir-state, if available.
(vc-dired-listing-switches): New variable.
(vc-directory): Use it, instead of dired-listing-switches.
(vc-revert-buffer): Hide the frame for dedicated windows
(vc-update-changelog): Split into generic part and default
implementation. Doc string adapted.
(vc-default-update-changelog): New function. Call the `rcs2log'
script in exec-directory, to fix a long-standing nuisance.
(vc-next-action-on-file): Doc fix.
(vc-maybe-resolve-conflicts): Don't just toggle smerge-mode.
(vc-print-log): Eval `file' before constructing the continuation.
(vc-next-action-on-file): Corrected several messages.
(vc-merge): Add prefix arg `merge-news'; handle it.
(vc-finish-logentry): Thinko in the "same comment"
detection.
(vc-parent-buffer, vc-parent-buffer-name): Protect them
against kill-all-local-variables.
(vc-log-edit): Don't save vc-parent-buffer any more.
(vc-last-comment-match): Initialize to an empty string.
(vc-post-command-functions): New hook.
(vc-do-command): Run it.
(vc-next-action-on-file): Remove unnecessary pop-to-buffer.
(vc-finish-logentry): Only add the comment to the ring if it's
different from the last comment entered.
(vc-new-comment-index): New function.
(vc-previous-comment): Use it. Make the minibuffer message
slightly less terse.
(vc-comment-search-reverse): Make it work forward as well. Don't
set vc-comment-ring-index if no match is found. Use
vc-new-comment-index.
(vc-comment-search-forward): Use vc-comment-search-reverse.
(vc-dired-mode-map): Don't inherit from dired-mode-map since
define-derived-mode will do it for us. Bind `v' to a keymap that
inherits from vc-prefix-map so that we can bind `vt' without
binding C-x v t.
(vc-retrieve-snapshot): Parenthesis typo.
(vc-create-snapshot, vc-default-create-snapshot): Swap DIR
and NAME.
(vc-retrieve-snapshot): Split into two parts.
(vc-default-retrieve-snapshot): New function.
(vc-do-command): Remove unused commands.
(vc-version-diff): Make sure default-directory ends with a slash.
Move the window commands into a vc-exec-after.
(vc-print-log): Move more of the code into the `vc-exec-after'.
(vc-exec-after): Fix disassembly of previous sentinel.
(vc-print-log): Search current revision from beginning of buffer.
(vc-revert-buffer): Clear echo area after the diff is finished.
(vc-prefix-map): Removed definition of "t" for terse display in vc
dired.
(vc-dired-mode-map): Inherit from dired-mode-map. Added
definition of "vt" for terse display.
(vc-dired-mode): Fix dired-move-to-filename-regexp.
(vc-exec-after): Avoid caddr.
(vc-exec-after): New function.
(vc-do-command): Use it to add a termination message for async
procs.
(vc-checkout): Try to handle a missing-backend situation.
(vc-version-diff): Use vc-exec-after to fix the behavior for diffs
of a directory with a backend using async diffs.
(vc-print-log): Use vc-exec-after and use log-view-goto-rev if
present.
(vc-next-action-on-file): Use vc-revert-buffer to revert
when there are no changes.
(vc-prefix-map): Move the autoload to vc-hooks.el and move
the `fset' outside of the defvar so that it works even if
vc-prefix-map was already defined.
(vc-setup-buffer): New function, split out of vc-do-command.
(vc-do-command): Allow BUFFER to be t to mean `just use the
current buffer without any fuss'.
(vc-version-diff): Change the `diff' backend operation to just put
the diff in the current buffer without erasing it. Always use
(vc-workfile-unchanged-p): If checkout-time comparison is
not possible, use vc-BACKEND-workfile-unchanged-p.
(vc-default-workfile-unchanged-p): New function. Delegates to a
full vc-BACKEND-diff.
(vc-editable-p): Renamed from vc-writable-p.
(with-vc-file, vc-merge): Use vc-editable-p.
(vc-do-command): Remove unused var vc-file and fix the
doubly-defined `status' var. Add a user message when starting an
async command.
(vc-restore-buffer-context, vc-resynch-buffer, vc-start-entry)
(vc-finish-steal, vc-checkin, vc-finish-logentry, vc-rename-file):
Use with-current-buffer.
(vc-buffer-sync): Use unless.
(vc-next-action-on-file): If the file is 'edited by read-only,
make it read-write instead of trying to commit.
(vc-version-diff, vc-update-change-log): Use `setq
default-directory' rather than `cd'.
(vc-log-edit): Don't forget to set default-directory in the
buffer.
(vc-checkout): Don't do anything special for ange-ftp
files since ange-ftp already has vc-registered return nil.
(vc-do-command): Use file-relative-name.
(vc-responsible-backend): Use vc-backend if possible.
(vc-create-snapshot): Improve the `interactive' spec. Add support
for branches and dispatch to backend-specific `create-snapshot'.
(vc-default-create-snapshot): New function, containing the bulk of
the old vc-create-snapshot.
(vc-retrieve-snapshot): Improve the interactive spec.
(vc-do-command): Get rid of the `last' argument.
(vc-header-alist): Remove, replaced by vc-X-header.
(vc-insert-headers): Use vc-X-header instead of vc-header-alist.
(vc-dired-hook): Use expand-file-name instead of concat.
(vc-directory): Use file-name-as-directory.
(vc-snapshot-precondition, vc-create-snapshot)
(vc-retrieve-snapshot): Allow the command to operate on any
directory.
Update Copyright and add a crude list of backend funs.
(vc-writable-p): New function.
(with-vc-file): Use vc-writable-p.
(vc-next-action-on-file): Update call to vc-steal-lock and
cleanup.
(vc-register): Avoid vc-name.
(vc-locking-user): Remove.
(vc-steal-lock): Make the `owner' arg non-optional.
(vc-merge): Use vc-writable-p instead of vc-locking-user and
vc-checkout-model.
(vc-default-dired-state-info): Use vc-state instead of
vc-locking-user and return special strings for special states.
(vc-dired-hook): Use vc-up-to-date-p instead of vc-locking-user
and get rid of one of the special CVS cases.
(vc-cancel-version): prettify error message with \\[...].
(vc-rename-master): New function.
(vc-rename-file): Use vc-BACKEND-rename-file (which might in turn
use vc-rename-master) instead of vc-BACKEND-record-rename. Make
the CVS special case generic.
(vc-default-record-rename): Remove.
(vc-file-tree-walk-internal): Only call FUNC for files that are
under control of some VC backend and replace `concat' with
expand-file-name.
(vc-file-tree-walk): Update docstring.
(vc-version-diff, vc-snapshot-precondition, vc-create-snapshot)
(vc-retrieve-snapshot): Update call to vc-file-tree-walk.
(vc-version-diff): Expand file name read from the
minibuffer. Handle the case when a previous version number can't
be guessed. Give suitable messages when there were no differences
found.
(vc-clear-headers): Call backend-specific implementation, if one
exists.
(vc-cancel-version): Made error checks generic. When done, clear
headers generically, too.
(vc-locking-user): Moved from vc-hooks.el.
(vc-version-diff): Left out a vc- in call to
vc-call-backend.
(vc-default-dired-state-info, vc-default-record-rename)
(vc-default-merge-news): Update for the new backend argument.
(vc-merge): Use vc-find-backend-function.
(vc-register): Put a FIXME note for a newly found bug.
Call vc-call-backend without the leading vc-.
(vc-responsible-backend, vc-finish-logentry, vc-annotate)
(vc-check-headers): Call vc-call-backend without the leading vc-.
(vc-annotate-time-span): Replace confusing use of `cond' with
`or'.
(vc-annotate-display): Replace confusing use of `cond' with `or'.
Call vc-call-backend without the leading vc-.
(vc-process-filter): New function.
(vc-do-command): Setup `vc-process-filter' for the async process.
(vc-maybe-resolve-conflicts): New function to reduce
code-duplication. Additionally, it puts the buffer in
`smerge-mode' if applicable.
(vc-next-action-on-file): Use `vc-maybe-resolve-conflicts' after
calling `merge-news'.
(vc-merge): Use `vc-maybe-resolve-conflicts' after calling
`merge'.
(vc-log-edit): New function. Replacement for `vc-log-mode' by
interfacing to log-edit.el.
(vc-start-entry): Call `vc-log-edit' instead of `vc-log-mode' if
log-edit is available.
(vc-resolve-conflicts): Delegate to `smerge-ediff' if available.
(vc-register): Remove `vc-buffer-backend' setup.
(vc-log-mode-map): New name for vc-log-entry-mode and merge the
defvar and the initialization.
(vc-log-mode): Minor docstring fix and use vc-log-mode-map.
(vc-file-clear-masterprops): Removed.
(vc-checkin, vc-revert-buffer): Removed calls to the above.
(vc-version-diff): Use buffer-size without argument.
(vc-register): Heed vc-initial-comment.
(vc-workfile-unchanged-p): Remove unused argument
`want-differences-if-changed' and simplify.
(vc-next-action-on-file) [needs-merge]: Resynch the buffer.
(vc-revert-buffer): Use `unchanged-p' rather than vc-diff's status
output (which is invalid for async vc-diff) to decide whether to
do the revert silently or not.
(with-vc-file, vc-next-action, vc-version-diff)
(vc-dired-mark-locked): Replaced usage of vc-locking-user with
vc-state or vc-up-to-date-p.
(vc-merge): Use vc-backend-defines to check whether merging is
possible. Set state to 'edited after successful merge.
(vc-recompute-state, vc-next-action-on-file): Update to
new `vc-state' semantics.
(vc-finish-steal): Set 'vc-state to 'edited rather than setting
'vc-locking-user to the current user.
(vc-merge): Inline vc-backend-merge. Comment out code that I
don't understand and hence can't adapt to the new `vc-state' and
`vc-locking-user' semantics.
(vc-backend-merge): Remove.
(vc-do-command): kill-all-local-variables, to reset any
major-mode in which the buffer might have been put earlier. Use
`remove' and `when'. Allow `okstatus' to be `async' and use
`start-process' in this case.
(vc-version-diff): Handle the case where the diff looks empty
because of the use of an async process.
(vc-next-action-on-file): Removed optional parameter
`simple'. Recompute state unconditionally.
(vc-default-toggle-read-only): Removed.
(vc-backend-dispatch, vc-annotate-mode-syntax-table):
Remove.
(vc-prefix-map): Move from vc-hooks.el and make autoloaded.
(vc-release-greater-or-equal-p): Move to vc-rcs.el.
(vc-file-clear-masterprops): Braindead "fix". It was a nop and
still is. So maybe it should be removed.
(vc-head-version, vc-find-binary): Remove.
(vc-recompute-state): Move from vc-hooks.el.
(vc-next-action-on-file): Add a `simple' argument to allow
avoiding the `recompute' step (use for vc-cvs-simple-toggle).
(vc-default-toggle-read-only, vc-default-record-rename): New
functions.
(vc-next-action, vc-dired-hook): Use vc-state instead of
vc-cvs-status.
(vc-dired-mode-map): Properly defvar it.
(vc-print-log): Call log-view-mode if available.
(small-temporary-file-directory): defvar instead of use boundp.
(vc-merge-news): Moved to vc-cvs.el.
(vc-default-merge-news): New function.
(function' quotes.
(vc-annotate-mode-map, vc-annotate-mode-syntax-table): Initialize
directly in the defvar.
(vc-do-command): Bind inhibit-read-only so as to properly handle
the case where the destination buffer has been made read-only.
(vc-diff): Delegate to vc-version-diff in all cases.
(vc-version-diff): Setup the *vc-diff* buffer as was done in
vc-diff.
(vc-annotate-mode-variables): Removed (code moved partly to
defvars and partly to vc-annotate-add-menu).
(vc-annotate-mode): Turned into a derived-mode.
(vc-annotate-add-menu): Moved in code in
vc-annotate-mode-variables.
(vc-update-change-log): Use make-temp-file if available.
(vc-next-action-on-file): Added handling of state
`unlocked-changes'.
(vc-checkout-carefully): Is now practically obsolete, unless the
above is too slow to be enabled unconditionally.
(vc-update-change-log): Fixed typo.
(vc-responsible-backend): New function.
(vc-register): Largely rewritten.
(vc-admin): Removed (implementation moved into vc-register).
(vc-checkin): Redocumented.
(vc-finish-logentry): If no backend defined yet (because we are in
the process of registering), use the responsible backend.
Updated callers of `vc-checkout-required' to use
`vc-checkout-model'.
(vc-backend-release, vc-backend-release-p): Functions
moved into vc-rcs.el
(vc-backend-revert): Function moved into `vc-revert';
`vc-next-action' must be updated to accomodate this change.
(vc-backend-steal): Function moved into `vc-finish-steal'.
(vc-backend-logentry-check): Function moved into
`vc-finish-logentry'.
(vc-backend-printlog): Function moved into `vc-print-log'.
(vc-backend-uncheck): Function moved into `vc-cancel-version'.
(vc-backend-assign-name): Function moved into
`vc-create-snapshot'.
(vc-workfile-unchanged-p,vc-diff,vc-version-diff): Updated
to use the vc-BACKEND-diff functions instead; `vc-diff' is now
working.
Typo fixed. This checkin is made with our new VC code
base for the very first time. A simple `(vc-checkin
(buffer-file-name))' was used to perform it.
(vc-checkin): Merged with `vc-backend-checkin' and updated
to match the split into various backends.
(vc-backend-checkin): Removed. Merged with `vc-checkin'.
(vc-retrieve-snapshot): Bug fix.
(vc-next-action-on-file): Bug found and fixed.
(vc-checkout, vc-version-other-window, vc-retrieve-snapshot)
(vc-cancel-version): Handle of vc-BACKEND-checkout updated.
(vc-next-action-on-file): Rewritten for the new state model.
(vc-backend-merge-news): Renamed to `vc-merge-news'. (Specific parts
still need to be split, and implemented for RCS).
(vc-admin): Updated to handle selection of appropriate
backend. Current implementation is crufty and need re-thinking.
(vc-annotate-get-backend, vc-annotate-display-default)
(vc-annotate-add-menu, vc-annotate, vc-annotate-display): Annotate
functionality updated quite a lot to support multiple backends.
Variables `vc-annotate-mode', `vc-annotate-buffers',
`vc-annotate-backend' added.
Renamed
`vc-uses-locking' to `vc-checkout-required'. Renamed the `locked'
state to `reserved'.
(vc-update-change-log): Use small-temporary-file-directory,
if defined. (Merged from main line, slightly adapted.)
Split the annotate feature into a BACKEND specific part
and moved it from the vc-cvs.el file to this one.
(vc-resynch-window): Added TODO comment: check for
interaction with view mode according to recent RCS change.
(vc-backend-merge-news): Merged "CMUP" patch from mainline.
Converted the remaining function comments to
documentation strings.
(vc-backend-release, vc-release-greater-or-equal)
(vc-backend-release-p, vc-trunk-p, vc-branch-p, vc-branch-part)
(vc-minor-part, vc-previous-version): Functions that operate and
compare revision numbers got proper documentation. Comments added
about their possible removal.
(vc-latest-on-branch-p): Function removed and replaced in
the vc-backend.el files.
(vc-backend-diff): Function removed and placed in the
backend files.
(vc-backend-checkout): Function removed and replaced in
the vc-backend.el files.
(vc-backend-admin): Removed and replaced in the
vc-backend.el files.
(Martin): Removed all the annotate functionality since it
is CVS backend specific.
[Merged from mainline.]
(vc-dired-mode): Make the dired-move-to-filename-regexp
regexp match the date, to avoid treating date as file size.
Add YYYY S option to WESTERN/
Require `compile' when compiling.
(vc-logentry-check-hook): New option.
(vc-steal-lock): Use compose-mail.
(vc-dired-mode-map): Defvar when compiling.
(vc-add-triple, vc-record-rename, vc-lookup-triple): Moved to
vc-sccs.el and renamed. Callers changed.
(vc-backend-checkout, vc-backend-logentry-check)
(vc-backend-merge-news): Doc fix.
(vc-default-logentry-check): New function.
(vc-backend-checkin, vc-backend-revert, vc-backend-steal)
(vc-backend-uncheck, vc-backend-print-log, vc-backend-assign-name)
(vc-backend-merge): Doc fix. Use backend functions.
(vc-check-headers): Use backend functions.
(vc-backend-release): Call vc-system-release.
(vc-rcs-release, vc-cvs-release, vc-sccs-release): Moved to
backend files.
(vc-backend-release): Dispatch to backend functions.
(vc-backend-release-p): Don't mention CVS, RCS. [The SCCS case
probably needs attention.]
(vc-dired-mode, vc-dired-reformat-line, vc-dired-purge):
Doc fix.
(vc-fetch-cvs-status): Moved to vc-cvs.el and renamed.
(vc-default-dired-state-info): New function.
(vc-dired-state-info): Dispatch to backends.
(vc-dired-hook): Doc fix. Simplify, pending removal of CVS specifics.
(vc-file-clear-masterprops, vc-latest-on-branch-p)
(vc-version-other-window, vc-backend-assign-name): Removed
references to vc-latest-version; sometimes changed into
vc-workfile-version.
(with-vc-file, vc-next-action-on-file, vc-merge)
(vc-backend-checkout): Changed calls to `vc-checkout-model' to
`vc-uses-locking'.
(vc-fetch-cvs-status): Use renamed vc-cvs-parse-status.
Some doc fixes for autoloaded and interactive functions.
Fix compilation warnings from ediff stuff.
(vc-rcs-release, vc-cvs-release, vc-sccs-release): Custom fix.
This is 1.244 from the emacs sources
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 04 Sep 2000 19:46:19 +0000 |
parents | cdc16c6e33be |
children | 23a1cea22d13 |
rev | line source |
---|---|
24363 | 1 /* Pro-process emacs.exe for profiling by MSVC. |
2 Copyright (C) 1999 Free Software Foundation, Inc. | |
3 | |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 2, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; 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 Andrew Innes <andrewi@harlequin.co.uk> 16-Jan-1999 | |
22 based on code from addsection.c | |
23 */ | |
24 | |
25 #include <stdlib.h> | |
26 #include <stdio.h> | |
27 #include <fcntl.h> | |
28 #include <time.h> | |
31347
cdc16c6e33be
(_ANONYMOUS_UNION) [__GNUC__]: New define.
Andrew Innes <andrewi@gnu.org>
parents:
31088
diff
changeset
|
29 #ifdef __GNUC__ |
cdc16c6e33be
(_ANONYMOUS_UNION) [__GNUC__]: New define.
Andrew Innes <andrewi@gnu.org>
parents:
31088
diff
changeset
|
30 #define _ANONYMOUS_UNION |
cdc16c6e33be
(_ANONYMOUS_UNION) [__GNUC__]: New define.
Andrew Innes <andrewi@gnu.org>
parents:
31088
diff
changeset
|
31 #define _ANONYMOUS_STRUCT |
cdc16c6e33be
(_ANONYMOUS_UNION) [__GNUC__]: New define.
Andrew Innes <andrewi@gnu.org>
parents:
31088
diff
changeset
|
32 #endif |
24363 | 33 #include <windows.h> |
34 | |
35 /* Include relevant definitions from IMAGEHLP.H, which can be found | |
36 in \\win32sdk\mstools\samples\image\include\imagehlp.h. */ | |
37 | |
38 PIMAGE_NT_HEADERS | |
39 (__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, | |
40 DWORD FileLength, | |
41 LPDWORD HeaderSum, | |
42 LPDWORD CheckSum); | |
43 | |
44 #undef min | |
45 #undef max | |
46 #define min(x, y) (((x) < (y)) ? (x) : (y)) | |
47 #define max(x, y) (((x) > (y)) ? (x) : (y)) | |
48 | |
49 | |
50 /* File handling. */ | |
51 | |
52 typedef struct file_data { | |
53 char *name; | |
54 unsigned long size; | |
55 HANDLE file; | |
56 HANDLE file_mapping; | |
57 unsigned char *file_base; | |
58 } file_data; | |
59 | |
60 int | |
61 open_input_file (file_data *p_file, char *filename) | |
62 { | |
63 HANDLE file; | |
64 HANDLE file_mapping; | |
65 void *file_base; | |
66 unsigned long size, upper_size; | |
67 | |
68 file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, | |
69 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); | |
70 if (file == INVALID_HANDLE_VALUE) | |
71 return FALSE; | |
72 | |
73 size = GetFileSize (file, &upper_size); | |
74 file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY, | |
75 0, size, NULL); | |
76 if (!file_mapping) | |
77 return FALSE; | |
78 | |
79 file_base = MapViewOfFile (file_mapping, FILE_MAP_READ, 0, 0, size); | |
80 if (file_base == 0) | |
81 return FALSE; | |
82 | |
83 p_file->name = filename; | |
84 p_file->size = size; | |
85 p_file->file = file; | |
86 p_file->file_mapping = file_mapping; | |
87 p_file->file_base = file_base; | |
88 | |
89 return TRUE; | |
90 } | |
91 | |
92 int | |
93 open_output_file (file_data *p_file, char *filename, unsigned long size) | |
94 { | |
95 HANDLE file; | |
96 HANDLE file_mapping; | |
97 void *file_base; | |
98 | |
99 file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, | |
100 CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); | |
101 if (file == INVALID_HANDLE_VALUE) | |
102 return FALSE; | |
103 | |
104 file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, | |
105 0, size, NULL); | |
106 if (!file_mapping) | |
107 return FALSE; | |
108 | |
109 file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size); | |
110 if (file_base == 0) | |
111 return FALSE; | |
112 | |
113 p_file->name = filename; | |
114 p_file->size = size; | |
115 p_file->file = file; | |
116 p_file->file_mapping = file_mapping; | |
117 p_file->file_base = file_base; | |
118 | |
119 return TRUE; | |
120 } | |
121 | |
122 int | |
123 open_inout_file (file_data *p_file, char *filename) | |
124 { | |
125 HANDLE file; | |
126 HANDLE file_mapping; | |
127 void *file_base; | |
128 unsigned long size, upper_size; | |
129 | |
130 file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, | |
131 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); | |
132 if (file == INVALID_HANDLE_VALUE) | |
133 return FALSE; | |
134 | |
135 size = GetFileSize (file, &upper_size); | |
136 file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, | |
137 0, size, NULL); | |
138 if (!file_mapping) | |
139 return FALSE; | |
140 | |
141 file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size); | |
142 if (file_base == 0) | |
143 return FALSE; | |
144 | |
145 p_file->name = filename; | |
146 p_file->size = size; | |
147 p_file->file = file; | |
148 p_file->file_mapping = file_mapping; | |
149 p_file->file_base = file_base; | |
150 | |
151 return TRUE; | |
152 } | |
153 | |
154 /* Close the system structures associated with the given file. */ | |
155 void | |
156 close_file_data (file_data *p_file) | |
157 { | |
158 UnmapViewOfFile (p_file->file_base); | |
159 CloseHandle (p_file->file_mapping); | |
160 /* For the case of output files, set final size. */ | |
161 SetFilePointer (p_file->file, p_file->size, NULL, FILE_BEGIN); | |
162 SetEndOfFile (p_file->file); | |
163 CloseHandle (p_file->file); | |
164 } | |
165 | |
166 | |
167 /* Routines to manipulate NT executable file sections. */ | |
168 | |
169 unsigned long | |
170 get_unrounded_section_size (PIMAGE_SECTION_HEADER p_section) | |
171 { | |
172 /* The true section size, before rounding, for an initialized data or | |
173 code section. (Supposedly some linkers swap the meaning of these | |
174 two values.) */ | |
175 return min (p_section->SizeOfRawData, | |
176 p_section->Misc.VirtualSize); | |
177 } | |
178 | |
179 /* Return pointer to section header for named section. */ | |
180 IMAGE_SECTION_HEADER * | |
181 find_section (char * name, IMAGE_NT_HEADERS * nt_header) | |
182 { | |
183 PIMAGE_SECTION_HEADER section; | |
184 int i; | |
185 | |
186 section = IMAGE_FIRST_SECTION (nt_header); | |
187 | |
188 for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) | |
189 { | |
190 if (strcmp (section->Name, name) == 0) | |
191 return section; | |
192 section++; | |
193 } | |
194 return NULL; | |
195 } | |
196 | |
197 /* Return pointer to section header for section containing the given | |
198 relative virtual address. */ | |
199 IMAGE_SECTION_HEADER * | |
200 rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header) | |
201 { | |
202 PIMAGE_SECTION_HEADER section; | |
203 int i; | |
204 | |
205 section = IMAGE_FIRST_SECTION (nt_header); | |
206 | |
207 for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) | |
208 { | |
209 /* Some linkers (eg. the NT SDK linker I believe) swapped the | |
210 meaning of these two values - or rather, they ignored | |
211 VirtualSize entirely and always set it to zero. This affects | |
212 some very old exes (eg. gzip dated Dec 1993). Since | |
213 w32_executable_type relies on this function to work reliably, | |
214 we need to cope with this. */ | |
215 DWORD real_size = max (section->SizeOfRawData, | |
216 section->Misc.VirtualSize); | |
217 if (rva >= section->VirtualAddress | |
218 && rva < section->VirtualAddress + real_size) | |
219 return section; | |
220 section++; | |
221 } | |
222 return NULL; | |
223 } | |
224 | |
225 /* Return pointer to section header for section containing the given | |
226 offset in its raw data area. */ | |
227 IMAGE_SECTION_HEADER * | |
228 offset_to_section (DWORD offset, IMAGE_NT_HEADERS * nt_header) | |
229 { | |
230 PIMAGE_SECTION_HEADER section; | |
231 int i; | |
232 | |
233 section = IMAGE_FIRST_SECTION (nt_header); | |
234 | |
235 for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) | |
236 { | |
237 if (offset >= section->PointerToRawData | |
238 && offset < section->PointerToRawData + section->SizeOfRawData) | |
239 return section; | |
240 section++; | |
241 } | |
242 return NULL; | |
243 } | |
244 | |
245 /* Return offset to an object in dst, given offset in src. We assume | |
246 there is at least one section in both src and dst images, and that | |
247 the some sections may have been added to dst (after sections in src). */ | |
248 static DWORD | |
249 relocate_offset (DWORD offset, | |
250 IMAGE_NT_HEADERS * src_nt_header, | |
251 IMAGE_NT_HEADERS * dst_nt_header) | |
252 { | |
253 PIMAGE_SECTION_HEADER src_section = IMAGE_FIRST_SECTION (src_nt_header); | |
254 PIMAGE_SECTION_HEADER dst_section = IMAGE_FIRST_SECTION (dst_nt_header); | |
255 int i = 0; | |
256 | |
257 while (offset >= src_section->PointerToRawData) | |
258 { | |
259 if (offset < src_section->PointerToRawData + src_section->SizeOfRawData) | |
260 break; | |
261 i++; | |
262 if (i == src_nt_header->FileHeader.NumberOfSections) | |
263 { | |
264 /* Handle offsets after the last section. */ | |
265 dst_section = IMAGE_FIRST_SECTION (dst_nt_header); | |
266 dst_section += dst_nt_header->FileHeader.NumberOfSections - 1; | |
267 while (dst_section->PointerToRawData == 0) | |
268 dst_section--; | |
269 while (src_section->PointerToRawData == 0) | |
270 src_section--; | |
271 return offset | |
272 + (dst_section->PointerToRawData + dst_section->SizeOfRawData) | |
273 - (src_section->PointerToRawData + src_section->SizeOfRawData); | |
274 } | |
275 src_section++; | |
276 dst_section++; | |
277 } | |
278 return offset + | |
279 (dst_section->PointerToRawData - src_section->PointerToRawData); | |
280 } | |
281 | |
282 #define OFFSET_TO_RVA(offset, section) \ | |
283 (section->VirtualAddress + ((DWORD)(offset) - section->PointerToRawData)) | |
284 | |
285 #define RVA_TO_OFFSET(rva, section) \ | |
286 (section->PointerToRawData + ((DWORD)(rva) - section->VirtualAddress)) | |
287 | |
288 #define RVA_TO_SECTION_OFFSET(rva, section) \ | |
289 ((DWORD)(rva) - section->VirtualAddress) | |
290 | |
291 #define RVA_TO_PTR(var,section,filedata) \ | |
292 ((void *)(RVA_TO_OFFSET(var,section) + (filedata)->file_base)) | |
293 | |
294 /* Convert address in executing image to RVA. */ | |
295 #define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL)) | |
296 | |
297 #define PTR_TO_OFFSET(ptr, pfile_data) \ | |
31088
24c78d0ab986
(PTR_TO_OFFSET): Cast ptr to unsigned char *.
Andrew Innes <andrewi@gnu.org>
parents:
24805
diff
changeset
|
298 ((unsigned char *)(ptr) - (pfile_data)->file_base) |
24363 | 299 |
300 #define OFFSET_TO_PTR(offset, pfile_data) \ | |
301 ((pfile_data)->file_base + (DWORD)(offset)) | |
302 | |
303 #define ROUND_UP(p, align) (((DWORD)(p) + (align)-1) & ~((align)-1)) | |
304 #define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1)) | |
305 | |
306 | |
307 /* The MSVC prep program generates a ._xe file from .exe, where relevant | |
308 function calls etc have been patched to go through thunks (generated | |
309 by prep) that record timing/call information. Because the thunks | |
310 need to make references to functions imported from profile.dll, the | |
311 import table must be expanded; the end result is that all the | |
312 sections following .rdata are relocated to higher RVAs (add a final | |
313 code section is added holding all the thunks). The .reloc section is | |
314 also expanded, so that the thunks themselves are relocatable. | |
315 | |
316 It is this relocation which kills emacs._xe, because the dumped heap | |
317 pointers aren't relocated, because there is no relocation data for | |
318 either the relevant global/static variables or the heap section | |
319 itself, both of which contain pointers into the heap. [Note that | |
320 static variables which aren't initialized during linking may become | |
321 initialized with heap pointers, or even pointers to other static | |
322 variables, because of dumping.] | |
323 | |
324 We could potentially generate the relocation data ourselves by making | |
325 two versions of temacs, one with an extra dummmy section before | |
326 EMHEAP to offset it, and then compare the dumped executables from | |
327 both. That is a lot of work though, and it doesn't solve the problem | |
328 of dumped pointers to static variables, which also can be relocated. | |
329 | |
330 A better solution is to pre-process emacs.exe so that the .rdata and | |
331 .reloc sections are moved to the end of the section table, and thus | |
332 prep won't relocate anything else. (Of course, we leave "dead" | |
333 copies of these two sections in place, so that the virtual address of | |
334 everything else is unaffected.) Relocating the .reloc data is | |
335 trivial - we just update the IMAGE_BASE_RELOCATION address in the | |
336 header (the data itself doesn't change). Relocating the import table | |
337 is more complicated though, because the calls to imported functions | |
338 must be patched up. That requires us to selectively apply the base | |
339 relocations when we encounter references to imported functions (or | |
340 variables) in other sections, but at least the base relocations are | |
341 easy to parse. */ | |
342 | |
343 static void | |
344 copy_executable_and_move_sections (file_data *p_infile, | |
345 file_data *p_outfile) | |
346 { | |
347 unsigned char *dst; | |
348 PIMAGE_DOS_HEADER dos_header; | |
349 PIMAGE_NT_HEADERS nt_header; | |
350 PIMAGE_NT_HEADERS dst_nt_header; | |
351 PIMAGE_SECTION_HEADER section; | |
352 PIMAGE_SECTION_HEADER dst_section; | |
353 PIMAGE_SECTION_HEADER import_section; | |
354 PIMAGE_SECTION_HEADER reloc_section; | |
355 PIMAGE_DATA_DIRECTORY import_dir; | |
356 PIMAGE_DATA_DIRECTORY reloc_dir; | |
357 DWORD import_delta_rva; | |
358 DWORD reloc_delta_rva; | |
359 DWORD offset; | |
360 int i; | |
361 | |
362 #define COPY_CHUNK(message, src, size) \ | |
363 do { \ | |
364 unsigned char *s = (void *)(src); \ | |
365 unsigned long count = (size); \ | |
366 printf ("%s\n", (message)); \ | |
367 printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base); \ | |
368 printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \ | |
369 printf ("\t0x%08x Size in bytes.\n", count); \ | |
370 memcpy (dst, s, count); \ | |
371 dst += count; \ | |
372 } while (0) | |
373 | |
374 #define DST_TO_OFFSET() PTR_TO_OFFSET (dst, p_outfile) | |
375 #define ROUND_UP_DST_AND_ZERO(align) \ | |
376 do { \ | |
377 unsigned char *newdst = p_outfile->file_base \ | |
378 + ROUND_UP (DST_TO_OFFSET (), (align)); \ | |
379 /* Zero the alignment slop; it may actually initialize real data. */ \ | |
380 memset (dst, 0, newdst - dst); \ | |
381 dst = newdst; \ | |
382 } while (0) | |
383 | |
384 /* Copy the source image sequentially, ie. section by section after | |
385 copying the headers and section table, to simplify the process of | |
386 relocating the .rdata and .reloc section table entries (which might | |
387 force the raw section data to be relocated). | |
388 | |
389 Note that dst is updated implicitly by each COPY_CHUNK. */ | |
390 | |
391 dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; | |
392 nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + | |
393 dos_header->e_lfanew); | |
394 section = IMAGE_FIRST_SECTION (nt_header); | |
395 | |
396 import_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]; | |
397 import_section = rva_to_section (import_dir->VirtualAddress, nt_header); | |
398 | |
399 reloc_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; | |
400 reloc_section = rva_to_section (reloc_dir->VirtualAddress, nt_header); | |
401 if (!reloc_section) | |
402 { | |
403 printf ("No relocation data, cannot prepare for profile prepping.\n"); | |
404 exit (1); | |
405 } | |
406 | |
407 dst = (unsigned char *) p_outfile->file_base; | |
408 | |
409 COPY_CHUNK ("Copying DOS header...", dos_header, | |
410 (DWORD) nt_header - (DWORD) dos_header); | |
411 dst_nt_header = (PIMAGE_NT_HEADERS) dst; | |
412 COPY_CHUNK ("Copying NT header...", nt_header, | |
413 (DWORD) section - (DWORD) nt_header); | |
414 dst_section = (PIMAGE_SECTION_HEADER) dst; | |
415 COPY_CHUNK ("Copying section table...", section, | |
416 nt_header->FileHeader.NumberOfSections * sizeof (*section)); | |
417 | |
418 /* Leave room for extra section table entries; filled in below. */ | |
419 dst += 2 * sizeof (*section); | |
420 | |
421 /* Align the first section's raw data area, and set the header size | |
422 field accordingly. */ | |
423 ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); | |
424 dst_nt_header->OptionalHeader.SizeOfHeaders = DST_TO_OFFSET (); | |
425 | |
426 for (i = 0; i < nt_header->FileHeader.NumberOfSections; | |
427 i++, section++, dst_section++) | |
428 { | |
429 char msg[100]; | |
430 sprintf (msg, "Copying raw data for %s...", section->Name); | |
431 | |
432 /* "Blank out" the two sections being relocated. */ | |
433 if (section == import_section || section == reloc_section) | |
434 { | |
435 dst_section->Name[0] = 'X'; | |
436 dst_section->Misc.VirtualSize = | |
437 ROUND_UP (dst_section->Misc.VirtualSize, | |
438 dst_nt_header->OptionalHeader.SectionAlignment); | |
439 dst_section->PointerToRawData = 0; | |
440 dst_section->SizeOfRawData = 0; | |
441 dst_section->Characteristics &= ~IMAGE_SCN_CNT_INITIALIZED_DATA; | |
442 dst_section->Characteristics |= IMAGE_SCN_CNT_UNINITIALIZED_DATA; | |
443 dst_section->Characteristics &= ~IMAGE_SCN_MEM_WRITE; | |
444 continue; | |
445 } | |
446 | |
447 /* Update the file-relative offset for this section's raw data (if | |
448 it has any) in case things have been relocated; we will update | |
449 the other offsets below once we know where everything is. */ | |
450 if (dst_section->PointerToRawData) | |
451 dst_section->PointerToRawData = DST_TO_OFFSET (); | |
452 | |
453 /* Copy the original raw data. */ | |
454 COPY_CHUNK | |
455 (msg, OFFSET_TO_PTR (section->PointerToRawData, p_infile), | |
456 section->SizeOfRawData); | |
457 | |
458 /* Round up the raw data size to the new alignment. */ | |
459 dst_section->SizeOfRawData = | |
460 ROUND_UP (dst_section->SizeOfRawData, | |
461 dst_nt_header->OptionalHeader.FileAlignment); | |
462 | |
463 /* Align the next section's raw data area. */ | |
464 ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); | |
465 } | |
466 | |
467 /* Add the extra section entries, copying the raw data we skipped | |
468 earlier. We'll patch up the data itself below. */ | |
469 if (import_section != NULL) | |
470 { | |
471 dst_nt_header->FileHeader.NumberOfSections++; | |
472 dst_nt_header->OptionalHeader.SizeOfImage += | |
473 ROUND_UP (import_section->Misc.VirtualSize, | |
474 dst_nt_header->OptionalHeader.SectionAlignment); | |
475 *dst_section = *import_section; | |
476 dst_section->VirtualAddress = | |
477 dst_section[-1].VirtualAddress | |
478 + ROUND_UP (dst_section[-1].Misc.VirtualSize, | |
479 dst_nt_header->OptionalHeader.SectionAlignment); | |
480 dst_section->PointerToRawData = DST_TO_OFFSET (); | |
481 /* Remember delta applied to import section. */ | |
482 import_delta_rva = dst_section->VirtualAddress - import_section->VirtualAddress; | |
483 COPY_CHUNK | |
484 ("Relocating import directory", | |
485 OFFSET_TO_PTR (import_section->PointerToRawData, p_infile), | |
486 import_section->SizeOfRawData); | |
487 ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); | |
488 dst_section++; | |
489 } | |
490 if (reloc_section != NULL) | |
491 { | |
492 dst_nt_header->FileHeader.NumberOfSections++; | |
493 dst_nt_header->OptionalHeader.SizeOfImage += | |
494 ROUND_UP (reloc_section->Misc.VirtualSize, | |
495 dst_nt_header->OptionalHeader.SectionAlignment); | |
496 *dst_section = *reloc_section; | |
497 dst_section->VirtualAddress = | |
498 dst_section[-1].VirtualAddress | |
499 + ROUND_UP (dst_section[-1].Misc.VirtualSize, | |
500 dst_nt_header->OptionalHeader.SectionAlignment); | |
501 dst_section->PointerToRawData = DST_TO_OFFSET (); | |
502 /* Remember delta applied to reloc section. */ | |
503 reloc_delta_rva = dst_section->VirtualAddress - reloc_section->VirtualAddress; | |
504 COPY_CHUNK | |
505 ("Relocating base relocations directory", | |
506 OFFSET_TO_PTR (reloc_section->PointerToRawData, p_infile), | |
507 reloc_section->SizeOfRawData); | |
508 ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); | |
509 reloc_dir = &dst_nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; | |
510 reloc_dir->VirtualAddress += reloc_delta_rva; | |
511 dst_section++; | |
512 } | |
513 | |
514 /* Copy remainder of source image. */ | |
515 section--; | |
516 offset = ROUND_UP (section->PointerToRawData + section->SizeOfRawData, | |
517 nt_header->OptionalHeader.FileAlignment); | |
518 COPY_CHUNK | |
519 ("Copying remainder of executable...", | |
520 OFFSET_TO_PTR (offset, p_infile), | |
521 p_infile->size - offset); | |
522 | |
523 /* Final size for new image. */ | |
524 p_outfile->size = DST_TO_OFFSET (); | |
525 | |
526 /* Now patch up remaining file-relative offsets. */ | |
527 printf ("Patching up raw data offsets...\n"); | |
528 | |
529 section = IMAGE_FIRST_SECTION (nt_header); | |
530 dst_section = IMAGE_FIRST_SECTION (dst_nt_header); | |
531 | |
532 #define ADJUST_OFFSET(var) \ | |
533 do { \ | |
534 if ((var) != 0) \ | |
535 (var) = relocate_offset ((var), nt_header, dst_nt_header); \ | |
536 } while (0) | |
537 | |
538 #define ADJUST_IMPORT_RVA(var) \ | |
539 do { \ | |
540 if ((var) != 0) \ | |
541 *((DWORD *)&(var)) += import_delta_rva; \ | |
542 } while (0) | |
543 | |
544 dst_nt_header->OptionalHeader.SizeOfInitializedData = 0; | |
545 dst_nt_header->OptionalHeader.SizeOfUninitializedData = 0; | |
546 for (i = 0; i < dst_nt_header->FileHeader.NumberOfSections; i++) | |
547 { | |
548 /* Recompute data sizes for completeness. */ | |
549 if (dst_section[i].Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA) | |
550 dst_nt_header->OptionalHeader.SizeOfInitializedData += | |
551 ROUND_UP (dst_section[i].Misc.VirtualSize, dst_nt_header->OptionalHeader.FileAlignment); | |
552 else if (dst_section[i].Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) | |
553 dst_nt_header->OptionalHeader.SizeOfUninitializedData += | |
554 ROUND_UP (dst_section[i].Misc.VirtualSize, dst_nt_header->OptionalHeader.FileAlignment); | |
555 | |
556 ADJUST_OFFSET (dst_section[i].PointerToLinenumbers); | |
557 } | |
558 | |
559 ADJUST_OFFSET (dst_nt_header->FileHeader.PointerToSymbolTable); | |
560 | |
561 /* Update offsets in debug directory entries. Note that the debug | |
562 directory may be in the same section as the import table, so its | |
563 RVA may need to be adjusted too. */ | |
564 { | |
565 PIMAGE_DATA_DIRECTORY debug_dir = | |
566 &dst_nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG]; | |
567 PIMAGE_DEBUG_DIRECTORY debug_entry; | |
568 | |
569 /* Update debug_dir if part of import_section. */ | |
570 if (rva_to_section (debug_dir->VirtualAddress, nt_header) == import_section) | |
571 debug_dir->VirtualAddress += import_delta_rva; | |
572 | |
573 section = rva_to_section (debug_dir->VirtualAddress, dst_nt_header); | |
574 if (section) | |
575 { | |
576 int size; | |
577 | |
578 debug_entry = RVA_TO_PTR (debug_dir->VirtualAddress, section, p_outfile); | |
579 size = debug_dir->Size / sizeof (IMAGE_DEBUG_DIRECTORY); | |
580 | |
581 for (i = 0; i < size; i++, debug_entry++) | |
582 { | |
583 /* The debug data itself is normally not part of any | |
584 section, but stored after all the raw section data. So | |
585 let relocate_offset do the work. */ | |
586 ADJUST_OFFSET (debug_entry->PointerToRawData); | |
587 ADJUST_IMPORT_RVA (debug_entry->AddressOfRawData); | |
588 } | |
589 } | |
590 } | |
591 | |
592 /* Update RVAs in import directory entries. */ | |
593 { | |
594 PIMAGE_IMPORT_DESCRIPTOR imports; | |
595 PIMAGE_THUNK_DATA import_thunks; | |
596 | |
597 import_dir = &dst_nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]; | |
598 import_dir->VirtualAddress += import_delta_rva; | |
599 | |
600 section = rva_to_section (import_dir->VirtualAddress, dst_nt_header); | |
601 imports = RVA_TO_PTR (import_dir->VirtualAddress, section, p_outfile); | |
602 | |
603 for ( ; imports->Name != 0; imports++) | |
604 { | |
605 ADJUST_IMPORT_RVA (imports->OriginalFirstThunk); | |
606 ADJUST_IMPORT_RVA (imports->FirstThunk); | |
607 ADJUST_IMPORT_RVA (imports->Name); | |
608 | |
609 for (import_thunks = RVA_TO_PTR (imports->OriginalFirstThunk, section, p_outfile); | |
610 import_thunks->u1.Function != 0; | |
611 import_thunks++) | |
612 if ((import_thunks->u1.Ordinal >> 31) == 0) | |
613 ADJUST_IMPORT_RVA (import_thunks->u1.Ordinal); | |
614 | |
615 for (import_thunks = RVA_TO_PTR (imports->FirstThunk, section, p_outfile); | |
616 import_thunks->u1.Function != 0; | |
617 import_thunks++) | |
618 if ((import_thunks->u1.Ordinal >> 31) == 0) | |
619 ADJUST_IMPORT_RVA (import_thunks->u1.Ordinal); | |
620 } | |
621 | |
622 import_dir = &dst_nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IAT]; | |
623 import_dir->VirtualAddress += import_delta_rva; | |
624 } | |
625 | |
626 /* Fix up references to the import section. */ | |
627 printf ("Applying fixups to import references...\n"); | |
628 | |
629 { | |
630 IMAGE_BASE_RELOCATION *relocs, *block, *start_block, *end_block; | |
631 DWORD import_start = import_section->VirtualAddress + dst_nt_header->OptionalHeader.ImageBase; | |
632 DWORD import_end = import_start + import_section->Misc.VirtualSize; | |
633 DWORD len_import_relocs; | |
634 DWORD len_remaining_relocs; | |
635 int seen_high = 0; | |
636 WORD * high_word; | |
637 void * holder; | |
638 | |
639 reloc_dir = &dst_nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; | |
640 reloc_section = rva_to_section (reloc_dir->VirtualAddress, dst_nt_header); | |
641 relocs = RVA_TO_PTR (reloc_dir->VirtualAddress, reloc_section, p_outfile); | |
642 | |
643 /* Move the base relocations for the import section, if there are | |
644 any; the profiler needs to be able to patch RVAs in the import | |
645 section itself. */ | |
646 for (block = relocs, start_block = 0; | |
647 (DWORD) block - (DWORD) relocs < reloc_dir->Size; | |
648 block = (void *)((DWORD) block + block->SizeOfBlock)) | |
649 { | |
650 if (block->VirtualAddress >= import_section->VirtualAddress + import_section->Misc.VirtualSize) | |
651 { | |
652 end_block = block; | |
653 break; | |
654 } | |
655 if (block->VirtualAddress >= import_section->VirtualAddress) | |
656 { | |
657 if (start_block == 0) | |
658 start_block = block; | |
659 block->VirtualAddress += import_delta_rva; | |
660 } | |
661 } | |
662 if (start_block) | |
663 { | |
664 len_import_relocs = (DWORD) end_block - (DWORD) start_block; | |
665 len_remaining_relocs = (DWORD) relocs + reloc_dir->Size - (DWORD) end_block; | |
666 holder = malloc (len_import_relocs); | |
667 if (holder == 0) | |
668 abort (); | |
669 memcpy (holder, start_block, len_import_relocs); | |
670 memcpy (start_block, end_block, len_remaining_relocs); | |
671 memcpy ((char *) start_block + len_remaining_relocs, holder, len_import_relocs); | |
672 free (holder); | |
673 } | |
674 | |
675 /* Walk up the list of base relocations, checking for references | |
676 to the old import section location, and patching them to | |
677 reference the new location. */ | |
678 for (block = relocs; | |
679 (DWORD) block - (DWORD) relocs < reloc_dir->Size; | |
680 block = (void *)((DWORD) block + block->SizeOfBlock)) | |
681 { | |
682 DWORD page_rva = block->VirtualAddress; | |
683 DWORD page_offset; | |
684 union { | |
685 WORD word; | |
686 DWORD dword; | |
687 } * ploc; | |
688 WORD *fixup; | |
689 | |
690 section = rva_to_section (page_rva, dst_nt_header); | |
691 /* Don't apply fixups to the blanked sections. */ | |
692 if (section->Name[0] == 'X') | |
693 continue; | |
694 | |
695 for (fixup = (WORD *) &block[1]; | |
696 (DWORD) fixup - (DWORD) block < block->SizeOfBlock; | |
697 fixup++) | |
698 { | |
699 page_offset = (*fixup) & 0xfff; | |
700 ploc = RVA_TO_PTR (page_rva + page_offset, section, p_outfile); | |
701 | |
702 /* Unless our assumption is wrong, all low word fixups | |
703 should immediately follow a high fixup. */ | |
704 if (seen_high && ((*fixup) >> 12) != IMAGE_REL_BASED_LOW) | |
705 abort (); | |
706 | |
707 switch ((*fixup) >> 12) | |
708 { | |
709 case IMAGE_REL_BASED_ABSOLUTE: | |
710 break; | |
711 case IMAGE_REL_BASED_HIGH: | |
712 /* We must assume that high and low fixups occur in | |
713 pairs, specifically a low fixup immediately follows a | |
714 high fixup (normally separated by two bytes). We | |
715 have to process the two fixups together, to find out | |
716 the full pointer value and decide whether to apply | |
717 the fixup. */ | |
718 seen_high = 1; | |
719 high_word = &ploc->word; | |
720 break; | |
721 case IMAGE_REL_BASED_LOW: | |
722 offset = (*high_word << 16) + ploc->word; | |
723 if (offset >= import_start && offset < import_end) | |
724 { | |
725 (*high_word) += import_delta_rva >> 16; | |
726 ploc->dword += import_delta_rva & 0xffff; | |
727 } | |
728 seen_high = 0; | |
729 break; | |
730 case IMAGE_REL_BASED_HIGHLOW: | |
731 /* Docs imply two words in big-endian order, so perhaps | |
732 this is only used on big-endian platforms, in which | |
733 case the obvious code will work. */ | |
734 if (ploc->dword >= import_start && ploc->dword < import_end) | |
735 ploc->dword += import_delta_rva; | |
736 break; | |
737 case IMAGE_REL_BASED_HIGHADJ: | |
738 /* Docs don't say, but I guess this is the equivalent | |
739 for little-endian platforms. */ | |
740 if (ploc->dword >= import_start && ploc->dword < import_end) | |
741 ploc->dword += import_delta_rva; | |
742 break; | |
743 case IMAGE_REL_BASED_MIPS_JMPADDR: | |
744 /* Don't know how to handle this; MIPS support has been | |
745 dropped from NT4 anyway. */ | |
746 abort (); | |
747 break; | |
24805 | 748 #ifdef IMAGE_REL_BASED_SECTION |
24363 | 749 case IMAGE_REL_BASED_SECTION: |
750 case IMAGE_REL_BASED_REL32: | |
751 /* Docs don't say what these values mean. */ | |
24666
239ee0e7b828
(copy_executable_and_move_sections): Ifdef out a
Andrew Innes <andrewi@gnu.org>
parents:
24363
diff
changeset
|
752 #endif |
239ee0e7b828
(copy_executable_and_move_sections): Ifdef out a
Andrew Innes <andrewi@gnu.org>
parents:
24363
diff
changeset
|
753 default: |
24363 | 754 abort (); |
755 } | |
756 } | |
757 } | |
758 } | |
759 } | |
760 | |
761 | |
762 int | |
763 main (int argc, char **argv) | |
764 { | |
765 PIMAGE_DOS_HEADER dos_header; | |
766 PIMAGE_NT_HEADERS nt_header; | |
767 file_data in_file, out_file; | |
768 char out_filename[MAX_PATH], in_filename[MAX_PATH]; | |
769 char *ptr; | |
770 | |
771 strcpy (in_filename, argv[1]); | |
772 strcpy (out_filename, argv[2]); | |
773 | |
774 printf ("Preparing %s for profile prepping\n", out_filename); | |
775 | |
776 /* Open the original (dumped) executable file for reference. */ | |
777 if (!open_input_file (&in_file, in_filename)) | |
778 { | |
779 printf ("Failed to open %s (%d)...bailing.\n", | |
780 in_filename, GetLastError ()); | |
781 exit (1); | |
782 } | |
783 | |
784 /* Create a new image that can be prepped; we don't expect the size to | |
785 change because we are only adding two new section table entries, | |
786 which should fit in the alignment slop. */ | |
787 if (!open_output_file (&out_file, out_filename, in_file.size)) | |
788 { | |
789 printf ("Failed to open %s (%d)...bailing.\n", | |
790 out_filename, GetLastError ()); | |
791 exit (1); | |
792 } | |
793 | |
794 copy_executable_and_move_sections (&in_file, &out_file); | |
795 | |
796 /* Patch up header fields; profiler is picky about this. */ | |
797 { | |
798 HANDLE hImagehelp = LoadLibrary ("imagehlp.dll"); | |
799 DWORD headersum; | |
800 DWORD checksum; | |
801 | |
802 dos_header = (PIMAGE_DOS_HEADER) out_file.file_base; | |
803 nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); | |
804 | |
805 nt_header->OptionalHeader.CheckSum = 0; | |
806 // nt_header->FileHeader.TimeDateStamp = time (NULL); | |
807 // dos_header->e_cp = size / 512; | |
808 // nt_header->OptionalHeader.SizeOfImage = size; | |
809 | |
810 pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile"); | |
811 if (pfnCheckSumMappedFile) | |
812 { | |
813 // nt_header->FileHeader.TimeDateStamp = time (NULL); | |
814 pfnCheckSumMappedFile (out_file.file_base, | |
815 out_file.size, | |
816 &headersum, | |
817 &checksum); | |
818 nt_header->OptionalHeader.CheckSum = checksum; | |
819 } | |
820 FreeLibrary (hImagehelp); | |
821 } | |
822 | |
823 close_file_data (&out_file); | |
824 close_file_data (&in_file); | |
825 | |
826 return 0; | |
827 } | |
828 | |
829 /* eof */ |