2012-12-10 07:11:21 +00:00
|
|
|
Emacs ICON icons/emacs.ico
|
|
|
|
|
32649 CURSOR icons/hand.cur
|
Support x64 build on MS-Windows with MSVC.
src/w32term.h (SCROLL_BAR_PACK, SCROLL_BAR_UNPACK): Define for x64.
(SET_SCROLL_BAR_W32_WINDOW): Cast ID to intptr_t, for
compatibility with x64.
src/w32term.c (w32_draw_underwave): Don't use GCC extensions for
defining an XRectangle structure.
src/w32proc.c (RVA_TO_PTR, w32_executable_type): Fix pointer
arithmetics for compatibility with x64.
src/w32menu.c (add_menu_item): Use UINT_PTR instead of UINT, for
compatibility with x64.
src/w32heap.h: Adjust prototypes and declarations.
src/w32heap.c (RVA_TO_PTR, allocate_heap, sbrk, init_heap)
(round_heap): Use DWORD_PTR, ptrdiff_t and size_t instead of
DWORD, long, and unsigned long, for compatibility with x64.
(allocate_heap) [_WIN64]: Reserve 32GB of memory.
(sbrk): Argument is now of type ptrdiff_t.
src/w32fns.c (HMONITOR): Condition declaration on _WIN32_WINNT being
less than 0x0500.
(w32_msg_pump): Use WPARAM type for 'result'.
src/w32.c (init_environment, get_emacs_configuration): Support AMD64
architecture.
(init_ntproc): Cast arguments of _open_osfhandle to intptr_t, for
compatibility with x64.
src/vm-limit.c (lim_data): Now size_t.
(check_memory_limits): Adjust prototypes of real_morecore and
__morecore to receive argument of type ptrdiff_t. Use size_t for
five_percent and data_size.
src/unexw32.c: Use DWORD_PTR instead of DWORD for file-scope
variables, for compatibility with x64.
(rva_to_section, offset_to_section, relocate_offset)
(OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET)
(PTR_TO_RVA, RVA_TO_PTR, OFFSET_TO_PTR, get_section_info)
(copy_executable_and_dump_data): Use DWORD_PTR instead of DWORD
for compatibility with x64.
src/sysdep.c (STDERR_FILENO): Define if not already defined.
src/ralloc.c (real_morecore): Argument type is now ptrdiff_t.
(__morecore): Argument type is now ptrdiff_t.
(ROUNDUP, MEM_ROUNDUP): Use size_t instead of 'unsigned long'.
(relinquish): Use ptrdiff_t type for 'excess'.
(r_alloc_sbrk): Argument type is now ptrdiff_t.
src/makefile.w32-in (HEAPSIZE): Get value from EMACS_HEAPSIZE.
(bootstrap-temacs-CMD, bootstrap-temacs-SH): Use $(EMACS_PURESIZE)
instead of a literal number.
src/gmalloc.c [WINDOWSNT]: Include w32heap.h.
(min): Define only if not already defined.
src/frame.c (x_report_frame_params): Use EMACS_UINT for the return
value of FRAME_X_WINDOW, to fit a 64-bit pointer on 64-bit Windows
hosts.
src/image.c (x_bitmap_pixmap): Return ptrdiff_t, not int, since
'bitmaps' is a pointer.
src/dispextern.h (x_bitmap_pixmap): Adjust prototype.
src/alloc.c (gdb_make_enums_visible): Now conditional on __GNUC__.
nt/makefile.w32-in ($(TRES)): Use $(EMACS_MANIFEST).
nt/inc/sys/socket.h: Don't map Winsock error codes to standard ones
that are already defined.
nt/inc/ms-w32.h (EMACS_INT, EMACS_UINT, EMACS_INT_MAX, PRIuMAX)
(pI, _INTPTR) [_MSC_VER]: Fix definitions for MSVC.
[_MSC_VER]: Add pragmas to suppress some MSVC warnings.
nt/preprep.c (pfnCheckSumMappedFile, rva_to_section)
(offset_to_section, relocate_offset, OFFSET_TO_RVA)
(RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET, PTR_TO_RVA)
(OFFSET_TO_PTR, ROUND_UP, ROUND_DOWN)
(copy_executable_and_move_sections, ADJUST_IMPORT_RVA, main): Use
DWORD_PTR instead of DWORD for compatibility with x64.
nt/nmake.defs: Support AMD64.
(EMACS_HEAPSIZE, EMACS_PURESIZE, EMACS_MANIFEST): New macros.
nt/gmake.defs: (EMACS_HEAPSIZE, EMACS_PURESIZE, EMACS_MANIFEST):
New macros.
nt/addsection.c (pfnCheckSumMappedFile, rva_to_section)
(offset_to_section, relocate_offset, OFFSET_TO_RVA)
(RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET, PTR_TO_RVA)
(OFFSET_TO_PTR, ROUND_UP, ROUND_DOWN)
(copy_executable_and_add_section, main): Use DWORD_PTR instead of
DWORD, for compatibility with x64.
nt/emacs-x64.manifest: New file.
nt/emacs-x86.manifest: Renamed from emacs.manifest.
lib-src/ntlib.c (gettimeofday): Copy from src/w32.c. lib/gettime.
needs this function.
2012-09-30 21:36:42 +00:00
|
|
|
#ifdef WIN64
|
|
|
|
|
1 24 "emacs-x64.manifest"
|
|
|
|
|
#else
|
|
|
|
|
1 24 "emacs-x86.manifest"
|
|
|
|
|
#endif
|
1998-05-30 23:37:53 +00:00
|
|
|
|
2002-02-18 00:03:38 +00:00
|
|
|
#ifndef VS_VERSION_INFO
|
|
|
|
|
#define VS_VERSION_INFO 1
|
|
|
|
|
#endif
|
|
|
|
|
|
1998-05-30 23:37:53 +00:00
|
|
|
VS_VERSION_INFO VERSIONINFO
|
2012-11-02 00:48:12 +00:00
|
|
|
FILEVERSION 24,3,50,0
|
|
|
|
|
PRODUCTVERSION 24,3,50,0
|
1998-05-30 23:37:53 +00:00
|
|
|
FILEFLAGSMASK 0x3FL
|
|
|
|
|
#ifdef EMACSDEBUG
|
|
|
|
|
FILEFLAGS 0x1L
|
|
|
|
|
#else
|
|
|
|
|
FILEFLAGS 0x0L
|
|
|
|
|
#endif
|
|
|
|
|
FILEOS 0x40004L
|
|
|
|
|
FILETYPE 0x1L
|
|
|
|
|
FILESUBTYPE 0x0L
|
|
|
|
|
BEGIN
|
|
|
|
|
BLOCK "StringFileInfo"
|
|
|
|
|
BEGIN
|
|
|
|
|
BLOCK "040904B0"
|
|
|
|
|
BEGIN
|
|
|
|
|
VALUE "CompanyName", "Free Software Foundation\0"
|
2009-01-26 01:51:18 +00:00
|
|
|
VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
|
2012-11-02 00:48:12 +00:00
|
|
|
VALUE "FileVersion", "24, 3, 50, 0\0"
|
1998-05-30 23:37:53 +00:00
|
|
|
VALUE "InternalName", "Emacs\0"
|
2013-01-03 01:35:49 +00:00
|
|
|
VALUE "LegalCopyright", "Copyright (C) 2001-2013\0"
|
1998-05-30 23:37:53 +00:00
|
|
|
VALUE "OriginalFilename", "emacs.exe"
|
2009-01-26 01:51:18 +00:00
|
|
|
VALUE "ProductName", "Emacs\0"
|
2012-11-02 00:48:12 +00:00
|
|
|
VALUE "ProductVersion", "24, 3, 50, 0\0"
|
1998-05-30 23:37:53 +00:00
|
|
|
VALUE "OLESelfRegister", "\0"
|
|
|
|
|
END
|
|
|
|
|
END
|
|
|
|
|
BLOCK "VarFileInfo"
|
|
|
|
|
BEGIN
|
|
|
|
|
VALUE "Translation", 0x409, 1200
|
|
|
|
|
END
|
|
|
|
|
END
|
|
|
|
|
|