Mercurial > hg > xemacs-beta
changeset 827:28426972f654
[xemacs-hg @ 2002-05-06 14:14:33 by jhar]
Misc win32 native build and doc fixes
| author | jhar |
|---|---|
| date | Mon, 06 May 2002 14:16:31 +0000 |
| parents | 6728e641994e |
| children | 4ead1e0842f0 |
| files | nt/ChangeLog nt/README nt/config.inc.samp nt/xemacs-vc50.dsp nt/xemacs-vc50.dsw nt/xemacs.mak src/ChangeLog src/console-msw.h src/event-msw.c src/frame-msw.c src/intl-auto-encap-win32.c src/intl-auto-encap-win32.h src/intl-encap-win32.c src/ntproc.c src/s/windowsnt.h |
| diffstat | 14 files changed, 114 insertions(+), 1487 deletions(-) [+] |
line wrap: on
line diff
--- a/nt/ChangeLog Sun May 05 11:33:57 2002 +0000 +++ b/nt/ChangeLog Mon May 06 14:16:31 2002 +0000 @@ -1,3 +1,24 @@ +2002-05-06 Jonathan Harris <jonathan@xemacs.org> + + * README: + Remove references to obsolete MSVC5 and NT 3.51 configurations. + + * config.inc.samp (HAVE_TIFF): Update PNG version to 1.0.9. + + * xemacs.mak (HAVE_MENUBARS): New + * xemacs.mak (HAVE_SCROLLBARS): New + * xemacs.mak (MSW_DEFINES): + * xemacs.mak (MSW_LIBS): + * xemacs.mak (TEMACS_MSW_OBJS): + * xemacs.mak (TEMACS_OBJS): + Make HAVE_MENUBARS and HAVE_SCROLLBARS optional. + + * xemacs.mak (LIB_SRC_TOOLS): + Generate correctly-named debug program databases for lib-src helpers. + + * xemacs-vc50.dsp: Removed. + * xemacs-vc50.dsw: Removed. + 2002-05-05 Ben Wing <ben@xemacs.org> * xemacs.mak (CFLAGS_NO_LIB): New.
--- a/nt/README Sun May 05 11:33:57 2002 +0000 +++ b/nt/README Mon May 06 14:16:31 2002 +0000 @@ -7,9 +7,9 @@ This is a port of XEmacs to Windows 95/98/NT/2000. If you are looking for a port of GNU Emacs, see http://www.cs.washington.edu/homes/voelker/ntemacs.html. -NT 3.51 or later is required for building on Windows NT. Note that the +NT 4.0 or later is required for building on Windows NT. Note that the developers typically use NT 4.0 and Windows 2000, and there may possibly be -problems under Windows 95/98 and NT 3.51. If so, please report them to +problems under Windows 95/98. If so, please report them to xemacs-nt@xemacs.org; we are committed to maintaining compatibility with all systems listed. @@ -20,7 +20,7 @@ Note that Visual C++ assumes that the environment variables INCLUDE and LIB are set to specify the location of the includes and libraries. - Your PATH environment variable also needs to include the DevStudio + Your PATH environment variable also needs to include the Visual Studio vc\bin and sharedide\bin directories. Visual C++ V5.0 and later install a batch file called vcvars32.bat in @@ -86,11 +86,11 @@ for more than 15 days. XEmacs also runs (barely) under the free XWin server that comes as part of the Cygwin XFree86 package, available at - ftp://sources.redhat.com/pub/cygwin/xfree/ + ftp://sources.redhat.com/pub/cygwin/xfree/ or numerous mirrors, such as - ftp://ftp.freesoftware.com/pub/sourceware/cygwin/xfree/ + ftp://ftp.freesoftware.com/pub/sourceware/cygwin/xfree/ There are numerous other X servers available in the same package or at the same location, but unfortunately most of them behave even worse @@ -113,16 +113,16 @@ * Optional libraries ==================== -1. You really want the XPM library. Grab the latest version of the - xpm sources (xpm-3.4k.tar.gz at time of writing) from - ftp://ftp.xemacs.org/pub/xemacs/aux/ and unpack them somewhere. - Copy nt\xpm.mak from the xemacs sources to the lib subdirectory of the - xpm sources, cd to that directory and build xpm with 'nmake -f xpm.mak'. +1. You really want the XPM library. Grab the latest version of the xpm + sources (xpm-3.4k.tar.gz as of 2002-04-27) from + ftp://ftp.xemacs.org/pub/xemacs/aux/ and unpack them somewhere. Copy + nt\xpm.mak from the xemacs sources to the lib subdirectory of the xpm + sources, cd to that directory and build xpm with 'nmake -f xpm.mak'. -2. You probably also want PNG image support. Grab the latest versions of zlib - and libpng (zlib-1.1.4 and libpng-1.0.9 at time of writing) from - ftp://ftp.xemacs.org/pub/xemacs/aux/, unpack them somewhere and read - the respective READMEs for details on how to build them. The following +2. You probably also want PNG image support. Grab the latest versions of + zlib and libpng (zlib-1.1.4 and libpng-1.0.9 as of 2002-04-27) from + ftp://ftp.xemacs.org/pub/xemacs/aux/, unpack them somewhere and read the + respective READMEs for details on how to build them. The following build procedure works for zlib-1.1.4 and libpng-1.0.9: cd to the zlib directory and type 'nmake -f msdos\makefile.w32'. @@ -131,16 +131,16 @@ and type 'nmake -f scripts\makefile.vcwin32'. 3. If you want TIFF support, grap the latest version of libtiff (tiff-v3.4 - at time of writing) from ftp://ftp.xemacs.org/pub/xemacs/aux/ and unpack + as of 2002-04-27) from ftp://ftp.xemacs.org/pub/xemacs/aux/ and unpack it somewhere. Copy nt\tiff.mak from the xemacs sources to the contrib\winnt subdirectory of the tiff sources, cd to that directory and build libtiff with 'nmake -f tiff.mak'. Note: tiff.mak has only been verified to work under WinNT, not Win95 or 98. However, the latest - distribution of libtiff includes a contrib\win95\makefile.w95; that might - work. + distribution of libtiff includes a contrib\win95\makefile.w95; that + might work. -4. If you want JPEG support grab the latest version of jpegsrc (jpeg-6b at - time of writing) from ftp://ftp.xemacs.org/pub/xemacs/aux/ and read the +4. If you want JPEG support grab the latest version of jpegsrc (jpeg-6b as + of 2002-04-27) from ftp://ftp.xemacs.org/pub/xemacs/aux/ and read the README for details on how to build it. 5. If you want X-Face support, grab the compface distribution from @@ -220,7 +220,7 @@ INSTALL_DIR="x:\your\installation\directory" (By default, XEmacs will be installed in directories under the directory - "c:\Program Files\XEmacs\XEmacs-21.2".) + "c:\Program Files\XEmacs\XEmacs-21.5".) 3. If you want to build xemacs on the command line, use `nmake install -f xemacs.mak', or just `nmake -f xemacs.mak' if you want @@ -230,23 +230,22 @@ If you chose to install XEmacs, the file that you should run to start XEmacs will be installed (by default) as - "c:\Program Files\XEmacs\XEmacs-21.2\i586-pc-win32\xemacs.exe". + "c:\Program Files\XEmacs\XEmacs-21.5\i586-pc-win32\xemacs.exe". - To run from the build directory, run the file "nt\xemacs.exe" off of the + To run from the build directory, run the file "src\xemacs.exe" off of the root of the build directory. You may want to create a shortcut to the file from your Desktop or Start Menu. 4. To build using MS Developer Studio, you can use the workspace file - `nt/xemacs.dsw'. This was prepared for Visual C++ 6.0. If you are using - Visual C++ 5.0, you can use the workspace file `nt/xemacs-vc50.dsw'. If - you have a different version and neither file works, just open up - `nt/xemacs.mak' from within MS Developer Studio and it will offer to wrap - this Makefile in a workspace file, from which you can build. Assuming - you want to run from the build directory (which you will want to do if - you are planning on doing any development work on XEmacs), use the - following settings in Project/Settings...: + `nt/xemacs.dsw'. This was prepared for Visual C++ 6.0. If you have a + different version and neither file works, just open up `nt/xemacs.mak' + from within MS Developer Studio and it will offer to wrap this Makefile + in a workspace file, from which you can build. Assuming you want to run + from the build directory (which you will want to do if you are planning + on doing any development work on XEmacs), use the following settings in + Project/Settings...: Under the General tab:
--- a/nt/config.inc.samp Sun May 05 11:33:57 2002 +0000 +++ b/nt/config.inc.samp Mon May 06 14:16:31 2002 +0000 @@ -39,7 +39,7 @@ # Set this to enable PNG support (virtually mandatory), and specify # the directories containing png and zlib. HAVE_PNG=1 -PNG_DIR=c:\src\libpng-1.0.5 +PNG_DIR=c:\src\libpng-1.0.9 ZLIB_DIR=c:\src\zlib # Set this to enable TIFF support, and specify the directory containing tiff.
--- a/nt/xemacs-vc50.dsp Sun May 05 11:33:57 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1392 +0,0 @@ -# Microsoft Developer Studio Project File - Name="xemacs" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=xemacs - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "xemacs.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "xemacs.mak" CFG="xemacs - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "xemacs - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "xemacs - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "xemacs - Win32 Release" - -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f xemacs.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "xemacs.exe" -# PROP BASE Bsc_Name "xemacs.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\src" -# PROP Intermediate_Dir "obj" -# PROP Cmd_Line "NMAKE /f xemacs.mak" -# PROP Rebuild_Opt "/a" -# PROP Target_File "xemacs.exe" -# PROP Bsc_Name "xemacs.bsc" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "xemacs - Win32 Debug" - -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f xemacs.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "xemacs.exe" -# PROP BASE Bsc_Name "xemacs.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\src" -# PROP Intermediate_Dir "obj" -# PROP Cmd_Line "NMAKE /f xemacs.mak" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\src\xemacs.exe" -# PROP Bsc_Name "..\src\temacs.bsc" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "xemacs - Win32 Release" -# Name "xemacs - Win32 Debug" - -!IF "$(CFG)" == "xemacs - Win32 Release" - -!ELSEIF "$(CFG)" == "xemacs - Win32 Debug" - -!ENDIF - -# Begin Source File - -SOURCE=..\src\abbrev.c -# End Source File -# Begin Source File - -SOURCE=..\src\alloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\alloca.c -# End Source File -# Begin Source File - -SOURCE=..\src\backtrace.h -# End Source File -# Begin Source File - -SOURCE="..\src\balloon-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\balloon_help.c -# End Source File -# Begin Source File - -SOURCE=..\src\balloon_help.h -# End Source File -# Begin Source File - -SOURCE=..\src\bitmaps.h -# End Source File -# Begin Source File - -SOURCE=..\src\blocktype.c -# End Source File -# Begin Source File - -SOURCE=..\src\blocktype.h -# End Source File -# Begin Source File - -SOURCE="..\src\broken-sun.h" -# End Source File -# Begin Source File - -SOURCE=..\src\buffer.c -# End Source File -# Begin Source File - -SOURCE=..\src\buffer.h -# End Source File -# Begin Source File - -SOURCE=..\src\bufslots.h -# End Source File -# Begin Source File - -SOURCE=..\src\bytecode.c -# End Source File -# Begin Source File - -SOURCE=..\src\bytecode.h -# End Source File -# Begin Source File - -SOURCE=..\src\callint.c -# End Source File -# Begin Source File - -SOURCE=..\src\callproc.c -# End Source File -# Begin Source File - -SOURCE=..\src\casefiddle.c -# End Source File -# Begin Source File - -SOURCE=..\src\casetab.c -# End Source File -# Begin Source File - -SOURCE=..\src\chartab.c -# End Source File -# Begin Source File - -SOURCE=..\src\chartab.h -# End Source File -# Begin Source File - -SOURCE=..\src\cm.c -# End Source File -# Begin Source File - -SOURCE=..\src\cm.h -# End Source File -# Begin Source File - -SOURCE=..\src\cmdloop.c -# End Source File -# Begin Source File - -SOURCE=..\src\cmds.c -# End Source File -# Begin Source File - -SOURCE=..\src\commands.h -# End Source File -# Begin Source File - -SOURCE=..\src\config.h -# End Source File -# Begin Source File - -SOURCE=..\src\conslots.h -# End Source File -# Begin Source File - -SOURCE="..\src\console-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\console-msw.h" -# End Source File -# Begin Source File - -SOURCE="..\src\console-stream.c" -# End Source File -# Begin Source File - -SOURCE="..\src\console-stream.h" -# End Source File -# Begin Source File - -SOURCE="..\src\console-tty.c" -# End Source File -# Begin Source File - -SOURCE="..\src\console-tty.h" -# End Source File -# Begin Source File - -SOURCE="..\src\console-x.c" -# End Source File -# Begin Source File - -SOURCE="..\src\console-x.h" -# End Source File -# Begin Source File - -SOURCE=..\src\console.c -# End Source File -# Begin Source File - -SOURCE=..\src\console.h -# End Source File -# Begin Source File - -SOURCE=..\src\data.c -# End Source File -# Begin Source File - -SOURCE=..\src\database.c -# End Source File -# Begin Source File - -SOURCE=..\src\database.h -# End Source File -# Begin Source File - -SOURCE=..\src\debug.c -# End Source File -# Begin Source File - -SOURCE=..\src\debug.h -# End Source File -# Begin Source File - -SOURCE="..\src\device-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\device-tty.c" -# End Source File -# Begin Source File - -SOURCE="..\src\device-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\device.c -# End Source File -# Begin Source File - -SOURCE=..\src\device.h -# End Source File -# Begin Source File - -SOURCE=..\src\dgif_lib.c -# End Source File -# Begin Source File - -SOURCE="..\src\dialog-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\dialog-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\dialog.c -# End Source File -# Begin Source File - -SOURCE="..\src\dired-msw.c" -# End Source File -# Begin Source File - -SOURCE=..\src\dired.c -# End Source File -# Begin Source File - -SOURCE=..\src\doc.c -# End Source File -# Begin Source File - -SOURCE=..\src\doprnt.c -# End Source File -# Begin Source File - -SOURCE=..\src\dragdrop.c -# End Source File -# Begin Source File - -SOURCE=..\src\dragdrop.h -# End Source File -# Begin Source File - -SOURCE=..\src\dynarr.c -# End Source File -# Begin Source File - -SOURCE=..\src\ecrt0.c -# End Source File -# Begin Source File - -SOURCE=..\src\editfns.c -# End Source File -# Begin Source File - -SOURCE=..\src\eldap.c -# End Source File -# Begin Source File - -SOURCE=..\src\eldap.h -# End Source File -# Begin Source File - -SOURCE=..\src\elhash.c -# End Source File -# Begin Source File - -SOURCE=..\src\elhash.h -# End Source File -# Begin Source File - -SOURCE=..\src\Emacs.ad.h -# End Source File -# Begin Source File - -SOURCE=..\src\emacs.c -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsFrame.c -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsFrame.h -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsFrameP.h -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsManager.c -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsManager.h -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsManagerP.h -# End Source File -# Begin Source File - -SOURCE="..\src\EmacsShell-sub.c" -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsShell.c -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsShell.h -# End Source File -# Begin Source File - -SOURCE=..\src\EmacsShellP.h -# End Source File -# Begin Source File - -SOURCE=..\src\emodules.c -# End Source File -# Begin Source File - -SOURCE=..\src\emodules.h -# End Source File -# Begin Source File - -SOURCE=..\src\esd.c -# End Source File -# Begin Source File - -SOURCE=..\src\eval.c -# End Source File -# Begin Source File - -SOURCE="..\src\event-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\event-stream.c" -# End Source File -# Begin Source File - -SOURCE="..\src\event-tty.c" -# End Source File -# Begin Source File - -SOURCE="..\src\event-unixoid.c" -# End Source File -# Begin Source File - -SOURCE="..\src\event-Xt.c" -# End Source File -# Begin Source File - -SOURCE="..\src\events-mod.h" -# End Source File -# Begin Source File - -SOURCE=..\src\events.c -# End Source File -# Begin Source File - -SOURCE=..\src\events.h -# End Source File -# Begin Source File - -SOURCE=..\src\extents.c -# End Source File -# Begin Source File - -SOURCE=..\src\extents.h -# End Source File -# Begin Source File - -SOURCE="..\src\ExternalClient-Xlib.c" -# End Source File -# Begin Source File - -SOURCE=..\src\ExternalClient.c -# End Source File -# Begin Source File - -SOURCE=..\src\ExternalClient.h -# End Source File -# Begin Source File - -SOURCE=..\src\ExternalClientP.h -# End Source File -# Begin Source File - -SOURCE=..\src\ExternalShell.c -# End Source File -# Begin Source File - -SOURCE=..\src\ExternalShell.h -# End Source File -# Begin Source File - -SOURCE=..\src\ExternalShellP.h -# End Source File -# Begin Source File - -SOURCE="..\src\extw-Xlib.c" -# End Source File -# Begin Source File - -SOURCE="..\src\extw-Xlib.h" -# End Source File -# Begin Source File - -SOURCE="..\src\extw-Xt.c" -# End Source File -# Begin Source File - -SOURCE="..\src\extw-Xt.h" -# End Source File -# Begin Source File - -SOURCE=..\src\faces.c -# End Source File -# Begin Source File - -SOURCE=..\src\faces.h -# End Source File -# Begin Source File - -SOURCE="..\src\file-coding.c" -# End Source File -# Begin Source File - -SOURCE="..\src\file-coding.h" -# End Source File -# Begin Source File - -SOURCE=..\src\fileio.c -# End Source File -# Begin Source File - -SOURCE=..\src\filelock.c -# End Source File -# Begin Source File - -SOURCE=..\src\filemode.c -# End Source File -# Begin Source File - -SOURCE=..\src\floatfns.c -# End Source File -# Begin Source File - -SOURCE=..\src\fns.c -# End Source File -# Begin Source File - -SOURCE="..\src\font-lock.c" -# End Source File -# Begin Source File - -SOURCE="..\src\frame-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\frame-tty.c" -# End Source File -# Begin Source File - -SOURCE="..\src\frame-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\frame.c -# End Source File -# Begin Source File - -SOURCE=..\src\frame.h -# End Source File -# Begin Source File - -SOURCE=..\src\frameslots.h -# End Source File -# Begin Source File - -SOURCE="..\src\free-hook.c" -# End Source File -# Begin Source File - -SOURCE=..\src\general.c -# End Source File -# Begin Source File - -SOURCE=..\src\getloadavg.c -# End Source File -# Begin Source File - -SOURCE=..\src\getpagesize.h -# End Source File -# Begin Source File - -SOURCE=..\src\gif_io.c -# End Source File -# Begin Source File - -SOURCE=..\src\gifrlib.h -# End Source File -# Begin Source File - -SOURCE="..\src\glyphs-eimage.c" -# End Source File -# Begin Source File - -SOURCE="..\src\glyphs-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\glyphs-msw.h" -# End Source File -# Begin Source File - -SOURCE="..\src\glyphs-widget.c" -# End Source File -# Begin Source File - -SOURCE="..\src\glyphs-x.c" -# End Source File -# Begin Source File - -SOURCE="..\src\glyphs-x.h" -# End Source File -# Begin Source File - -SOURCE=..\src\glyphs.c -# End Source File -# Begin Source File - -SOURCE=..\src\glyphs.h -# End Source File -# Begin Source File - -SOURCE=..\src\gmalloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\gpmevent.c -# End Source File -# Begin Source File - -SOURCE=..\src\gpmevent.h -# End Source File -# Begin Source File - -SOURCE="..\src\gui-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\gui-x.c" -# End Source File -# Begin Source File - -SOURCE="..\src\gui-x.h" -# End Source File -# Begin Source File - -SOURCE=..\src\gui.c -# End Source File -# Begin Source File - -SOURCE=..\src\gui.h -# End Source File -# Begin Source File - -SOURCE=..\src\gutter.c -# End Source File -# Begin Source File - -SOURCE=..\src\gutter.h -# End Source File -# Begin Source File - -SOURCE=..\src\hash.c -# End Source File -# Begin Source File - -SOURCE=..\src\hash.h -# End Source File -# Begin Source File - -SOURCE=..\src\hftctl.c -# End Source File -# Begin Source File - -SOURCE=..\src\hpplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\imgproc.c -# End Source File -# Begin Source File - -SOURCE=..\src\imgproc.h -# End Source File -# Begin Source File - -SOURCE=..\src\indent.c -# End Source File -# Begin Source File - -SOURCE=..\src\inline.c -# End Source File -# Begin Source File - -SOURCE="..\src\input-method-motif.c" -# End Source File -# Begin Source File - -SOURCE="..\src\input-method-xfs.c" -# End Source File -# Begin Source File - -SOURCE="..\src\input-method-xlib.c" -# End Source File -# Begin Source File - -SOURCE=..\src\insdel.c -# End Source File -# Begin Source File - -SOURCE=..\src\insdel.h -# End Source File -# Begin Source File - -SOURCE=..\src\intl.c -# End Source File -# Begin Source File - -SOURCE="..\src\iso-wide.h" -# End Source File -# Begin Source File - -SOURCE=..\src\keymap.c -# End Source File -# Begin Source File - -SOURCE=..\src\keymap.h -# End Source File -# Begin Source File - -SOURCE=..\src\lastfile.c -# End Source File -# Begin Source File - -SOURCE=..\src\libsst.c -# End Source File -# Begin Source File - -SOURCE=..\src\libsst.h -# End Source File -# Begin Source File - -SOURCE=..\src\libst.h -# End Source File -# Begin Source File - -SOURCE="..\src\line-number.c" -# End Source File -# Begin Source File - -SOURCE="..\src\line-number.h" -# End Source File -# Begin Source File - -SOURCE=..\src\linuxplay.c -# End Source File -# Begin Source File - -SOURCE="..\src\lisp-disunion.h" -# End Source File -# Begin Source File - -SOURCE="..\src\lisp-union.h" -# End Source File -# Begin Source File - -SOURCE=..\src\lisp.h -# End Source File -# Begin Source File - -SOURCE=..\src\lread.c -# End Source File -# Begin Source File - -SOURCE=..\src\lrecord.h -# End Source File -# Begin Source File - -SOURCE=..\src\lstream.c -# End Source File -# Begin Source File - -SOURCE=..\src\lstream.h -# End Source File -# Begin Source File - -SOURCE=..\src\macros.c -# End Source File -# Begin Source File - -SOURCE=..\src\macros.h -# End Source File -# Begin Source File - -SOURCE=..\src\malloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\marker.c -# End Source File -# Begin Source File - -SOURCE=..\src\md5.c -# End Source File -# Begin Source File - -SOURCE="..\src\mem-limits.h" -# End Source File -# Begin Source File - -SOURCE="..\src\menubar-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\menubar-msw.h" -# End Source File -# Begin Source File - -SOURCE="..\src\menubar-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\menubar.c -# End Source File -# Begin Source File - -SOURCE=..\src\menubar.h -# End Source File -# Begin Source File - -SOURCE=..\src\minibuf.c -# End Source File -# Begin Source File - -SOURCE=..\src\miscplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\miscplay.h -# End Source File -# Begin Source File - -SOURCE="..\src\mule-canna.c" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-ccl.c" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-ccl.h" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-charset.c" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-charset.h" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-mcpath.c" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-mcpath.h" -# End Source File -# Begin Source File - -SOURCE="..\src\mule-wnnfns.c" -# End Source File -# Begin Source File - -SOURCE=..\src\mule.c -# End Source File -# Begin Source File - -SOURCE=..\src\nas.c -# End Source File -# Begin Source File - -SOURCE=..\src\ndir.h -# End Source File -# Begin Source File - -SOURCE=..\src\nt.c -# End Source File -# Begin Source File - -SOURCE=..\src\nt.h -# End Source File -# Begin Source File - -SOURCE=..\src\ntheap.c -# End Source File -# Begin Source File - -SOURCE=..\src\ntheap.h -# End Source File -# Begin Source File - -SOURCE=..\src\ntplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\ntproc.c -# End Source File -# Begin Source File - -SOURCE="..\src\objects-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\objects-msw.h" -# End Source File -# Begin Source File - -SOURCE="..\src\objects-tty.c" -# End Source File -# Begin Source File - -SOURCE="..\src\objects-tty.h" -# End Source File -# Begin Source File - -SOURCE="..\src\objects-x.c" -# End Source File -# Begin Source File - -SOURCE="..\src\objects-x.h" -# End Source File -# Begin Source File - -SOURCE=..\src\objects.c -# End Source File -# Begin Source File - -SOURCE=..\src\objects.h -# End Source File -# Begin Source File - -SOURCE="..\src\offix-cursors.h" -# End Source File -# Begin Source File - -SOURCE="..\src\offix-types.h" -# End Source File -# Begin Source File - -SOURCE=..\src\offix.c -# End Source File -# Begin Source File - -SOURCE=..\src\offix.h -# End Source File -# Begin Source File - -SOURCE=..\src\opaque.c -# End Source File -# Begin Source File - -SOURCE=..\src\opaque.h -# End Source File -# Begin Source File - -SOURCE=..\src\paths.h -# End Source File -# Begin Source File - -SOURCE="..\src\pre-crt0.c" -# End Source File -# Begin Source File - -SOURCE=..\src\print.c -# End Source File -# Begin Source File - -SOURCE="..\src\process-nt.c" -# End Source File -# Begin Source File - -SOURCE="..\src\process-unix.c" -# End Source File -# Begin Source File - -SOURCE=..\src\process.c -# End Source File -# Begin Source File - -SOURCE=..\src\process.h -# End Source File -# Begin Source File - -SOURCE=..\src\procimpl.h -# End Source File -# Begin Source File - -SOURCE=..\src\profile.c -# End Source File -# Begin Source File - -SOURCE=..\src\ralloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\rangetab.c -# End Source File -# Begin Source File - -SOURCE=..\src\rangetab.h -# End Source File -# Begin Source File - -SOURCE=..\src\realpath.c -# End Source File -# Begin Source File - -SOURCE="..\src\redisplay-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\redisplay-output.c" -# End Source File -# Begin Source File - -SOURCE="..\src\redisplay-tty.c" -# End Source File -# Begin Source File - -SOURCE="..\src\redisplay-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\redisplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\redisplay.h -# End Source File -# Begin Source File - -SOURCE=..\src\regex.c -# End Source File -# Begin Source File - -SOURCE=..\src\regex.h -# End Source File -# Begin Source File - -SOURCE="..\src\scrollbar-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\scrollbar-msw.h" -# End Source File -# Begin Source File - -SOURCE="..\src\scrollbar-x.c" -# End Source File -# Begin Source File - -SOURCE="..\src\scrollbar-x.h" -# End Source File -# Begin Source File - -SOURCE=..\src\scrollbar.c -# End Source File -# Begin Source File - -SOURCE=..\src\scrollbar.h -# End Source File -# Begin Source File - -SOURCE=..\src\search.c -# End Source File -# Begin Source File - -SOURCE="..\src\select-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\select-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\select.c -# End Source File -# Begin Source File - -SOURCE=..\src\select.h -# End Source File -# Begin Source File - -SOURCE=..\src\sgiplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\sheap.c -# End Source File -# Begin Source File - -SOURCE=..\src\signal.c -# End Source File -# Begin Source File - -SOURCE=..\src\sound.c -# End Source File -# Begin Source File - -SOURCE=..\src\specifier.c -# End Source File -# Begin Source File - -SOURCE=..\src\specifier.h -# End Source File -# Begin Source File - -SOURCE=..\src\strcat.c -# End Source File -# Begin Source File - -SOURCE=..\src\strcmp.c -# End Source File -# Begin Source File - -SOURCE=..\src\strcpy.c -# End Source File -# Begin Source File - -SOURCE=..\src\strftime.c -# End Source File -# Begin Source File - -SOURCE="..\src\sunOS-fix.c" -# End Source File -# Begin Source File - -SOURCE=..\src\sunplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\sunpro.c -# End Source File -# Begin Source File - -SOURCE=..\src\symbols.c -# End Source File -# Begin Source File - -SOURCE=..\src\symeval.h -# End Source File -# Begin Source File - -SOURCE=..\src\symsinit.h -# End Source File -# Begin Source File - -SOURCE=..\src\syntax.c -# End Source File -# Begin Source File - -SOURCE=..\src\syntax.h -# End Source File -# Begin Source File - -SOURCE=..\src\sysdep.c -# End Source File -# Begin Source File - -SOURCE=..\src\sysdep.h -# End Source File -# Begin Source File - -SOURCE=..\src\sysdir.h -# End Source File -# Begin Source File - -SOURCE=..\src\sysdll.c -# End Source File -# Begin Source File - -SOURCE=..\src\sysdll.h -# End Source File -# Begin Source File - -SOURCE=..\src\sysfile.h -# End Source File -# Begin Source File - -SOURCE=..\src\sysfloat.h -# End Source File -# Begin Source File - -SOURCE=..\src\sysproc.h -# End Source File -# Begin Source File - -SOURCE=..\src\syspwd.h -# End Source File -# Begin Source File - -SOURCE=..\src\syssignal.h -# End Source File -# Begin Source File - -SOURCE=..\src\systime.h -# End Source File -# Begin Source File - -SOURCE=..\src\systty.h -# End Source File -# Begin Source File - -SOURCE=..\src\syswait.h -# End Source File -# Begin Source File - -SOURCE=..\src\termcap.c -# End Source File -# Begin Source File - -SOURCE=..\src\terminfo.c -# End Source File -# Begin Source File - -SOURCE="..\src\toolbar-msw.c" -# End Source File -# Begin Source File - -SOURCE="..\src\toolbar-x.c" -# End Source File -# Begin Source File - -SOURCE=..\src\toolbar.c -# End Source File -# Begin Source File - -SOURCE=..\src\toolbar.h -# End Source File -# Begin Source File - -SOURCE=..\src\tooltalk.c -# End Source File -# Begin Source File - -SOURCE=..\src\tooltalk.h -# End Source File -# Begin Source File - -SOURCE=..\src\tparam.c -# End Source File -# Begin Source File - -SOURCE=..\src\undo.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexaix.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexalpha.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexapollo.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexconvex.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexcw.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexec.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexelf.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexelfsgi.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexencap.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexenix.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexfreebsd.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexfx2800.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexhp9k3.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexhp9k800.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexmips.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexnext.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexnt.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexsni.c -# End Source File -# Begin Source File - -SOURCE="..\src\unexsol2-6.c" -# End Source File -# Begin Source File - -SOURCE=..\src\unexsol2.c -# End Source File -# Begin Source File - -SOURCE=..\src\unexsunos4.c -# End Source File -# Begin Source File - -SOURCE=..\src\universe.h -# End Source File -# Begin Source File - -SOURCE="..\src\vm-limit.c" -# End Source File -# Begin Source File - -SOURCE=..\src\widget.c -# End Source File -# Begin Source File - -SOURCE=..\src\window.c -# End Source File -# Begin Source File - -SOURCE=..\src\window.h -# End Source File -# Begin Source File - -SOURCE=..\src\winslots.h -# End Source File -# Begin Source File - -SOURCE=.\xemacs.mak -# End Source File -# Begin Source File - -SOURCE=..\src\xgccache.c -# End Source File -# Begin Source File - -SOURCE=..\src\xgccache.h -# End Source File -# Begin Source File - -SOURCE=..\src\xintrinsic.h -# End Source File -# Begin Source File - -SOURCE=..\src\xintrinsicp.h -# End Source File -# Begin Source File - -SOURCE=..\src\xmmanagerp.h -# End Source File -# Begin Source File - -SOURCE=..\src\xmprimitivep.h -# End Source File -# Begin Source File - -SOURCE=..\src\xmu.c -# End Source File -# Begin Source File - -SOURCE=..\src\xmu.h -# End Source File -# End Target -# End Project
--- a/nt/xemacs-vc50.dsw Sun May 05 11:33:57 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "xemacs"=".\xemacs-vc50.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### -
--- a/nt/xemacs.mak Sun May 05 11:33:57 2002 +0000 +++ b/nt/xemacs.mak Mon May 06 14:16:31 2002 +0000 @@ -152,6 +152,12 @@ !if !defined(HAVE_GTK) HAVE_GTK=0 !endif +!if !defined(HAVE_MENUBARS) +HAVE_MENUBARS=1 +!endif +!if !defined(HAVE_SCROLLBARS) +HAVE_SCROLLBARS=1 +!endif !if !defined(HAVE_TOOLBARS) HAVE_TOOLBARS=$(HAVE_XPM) !endif @@ -369,7 +375,6 @@ CFLAGS_NO_LIB=-nologo -W3 $(DEBUGFLAGS) $(OPTFLAGS) CFLAGS=$(CFLAGS_NO_LIB) $(C_LIBFLAG) - !if $(HAVE_X_WINDOWS) X_DEFINES=-DHAVE_X_WINDOWS X_INCLUDES=-I$(X11_DIR)\include @@ -377,9 +382,10 @@ !endif !if $(HAVE_MS_WINDOWS) -MSW_DEFINES=-DHAVE_MS_WINDOWS -DHAVE_SCROLLBARS -DHAVE_MENUBARS +MSW_DEFINES=-DHAVE_MS_WINDOWS MSW_INCLUDES= -MSW_LIBS= +MSW_LIBS=comctl32.lib + !if $(HAVE_MSW_C_DIRED) MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED MSW_C_DIRED_OBJ=$(OUTDIR)\dired-msw.obj @@ -418,6 +424,14 @@ MSW_INCLUDES=$(MSW_INCLUDES) -I"$(ZLIB_DIR)" MSW_LIBS=$(MSW_LIBS) "$(ZLIB_DIR)\zlib.lib" !endif +!if $(HAVE_MENUBARS) +MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MENUBARS +MSW_MENUBAR_OBJ=$(OUTDIR)\menubar.obj $(OUTDIR)\menubar-msw.obj +!endif +!if $(HAVE_SCROLLBARS) +MSW_DEFINES=$(MSW_DEFINES) -DHAVE_SCROLLBARS +MSW_SCROLLBAR_OBJ=$(OUTDIR)\scrollbar.obj $(OUTDIR)\scrollbar-msw.obj +!endif !if $(HAVE_TOOLBARS) MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TOOLBARS MSW_TOOLBAR_OBJ=$(OUTDIR)\toolbar.obj $(OUTDIR)\toolbar-msw.obj @@ -425,9 +439,6 @@ !if $(HAVE_WIDGETS) MSW_DEFINES=$(MSW_DEFINES) -DHAVE_WIDGETS !endif -!if $(HAVE_TOOLBARS) || $(HAVE_WIDGETS) -MSW_LIBS=$(MSW_LIBS) comctl32.lib -!endif !if $(HAVE_DIALOGS) MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj @@ -545,24 +556,18 @@ # Inferred rule {$(LIB_SRC)}.c{$(LIB_SRC)}.exe : cd $(LIB_SRC) - $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** -link -incremental:no setargv.obj + $(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ -Fd$* $** -link -incremental:no setargv.obj user32.lib wsock32.lib cd $(NT) # Individual dependencies ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS) -$(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) - cd $(LIB_SRC) - $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no - cd $(NT) - -$(LIB_SRC)/winclient.exe: $(LIB_SRC)/winclient.c - cd $(LIB_SRC) - $(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** user32.lib -link -incremental:no - cd $(NT) +$(LIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) $(LIB_SRC)/minitar.exe : $(NT)/minitar.c - $(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) -Fe$@ $** "$(ZLIB_DIR)\zlib.lib" -link -incremental:no + cd $(LIB_SRC) + $(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) -Fe$@ -Fd$* $** -link -incremental:no "$(ZLIB_DIR)\zlib.lib" + cd $(NT) LIB_SRC_TOOLS = \ $(LIB_SRC)/etags.exe \ @@ -731,12 +736,12 @@ $(OUTDIR)\frame-msw.obj \ $(OUTDIR)\glyphs-msw.obj \ $(OUTDIR)\gui-msw.obj \ - $(OUTDIR)\menubar-msw.obj \ $(OUTDIR)\objects-msw.obj \ $(OUTDIR)\redisplay-msw.obj \ - $(OUTDIR)\scrollbar-msw.obj \ $(OUTDIR)\select-msw.obj \ $(MSW_C_DIRED_OBJ) \ + $(MSW_MENUBAR_OBJ) \ + $(MSW_SCROLLBAR_OBJ) \ $(MSW_TOOLBAR_OBJ) \ $(MSW_DIALOG_OBJ) \ $(MSW_GIF_OBJ) @@ -840,7 +845,6 @@ $(OUTDIR)\lread.obj \ $(OUTDIR)\lstream.obj \ $(OUTDIR)\macros.obj \ - $(OUTDIR)\menubar.obj \ $(OUTDIR)\marker.obj \ $(OUTDIR)\md5.obj \ $(OUTDIR)\minibuf.obj \ @@ -857,7 +861,6 @@ $(OUTDIR)\redisplay-output.obj \ $(OUTDIR)\redisplay.obj \ $(OUTDIR)\regex.obj \ - $(OUTDIR)\scrollbar.obj \ $(OUTDIR)\search.obj \ $(OUTDIR)\select.obj \ $(OUTDIR)\signal.obj \
--- a/src/ChangeLog Sun May 05 11:33:57 2002 +0000 +++ b/src/ChangeLog Mon May 06 14:16:31 2002 +0000 @@ -1,3 +1,25 @@ +2002-05-06 Jonathan Harris <jonathan@xemacs.org> + + * console-msw.h: + * event-msw.c (mswindows_wnd_proc): + Condition references to menu accelerator functions on HAVE_MENUBARS. + + * frame-msw.c (mswindows_init_frame_3): + Remove obsolete runemacs hack which called ShowWindow() twice. + + * intl-auto-encap-win32.c: + * intl-auto-encap-win32.h: + * intl-encap-win32.c: + Use handwritten version of GetEnvironmentStrings() in + intl-encap-win32.c. + + * ntproc.c: Removed. + + * s/windowsnt.h: + Disable .data section renaming hack when using portable dumping. + Force _WIN32_WINNT = 0x0400 since intl-auto-encap-win32.[ch] + requires this. + 2002-05-05 Ben Wing <ben@xemacs.org> * Makefile.in.in (batch_test_emacs):
--- a/src/console-msw.h Sun May 05 11:33:57 2002 +0000 +++ b/src/console-msw.h Mon May 06 14:16:31 2002 +0000 @@ -367,9 +367,11 @@ Lisp_Object mswindows_enumerate_fonts (HDC hdc); +#ifdef HAVE_MENUBARS int mswindows_char_is_accelerator (struct frame *f, Emchar ch); Lisp_Object mswindows_translate_menu_or_dialog_item (Lisp_Object item, Emchar *accel); +#endif #ifdef HAVE_TOOLBARS Lisp_Object mswindows_get_toolbar_button_text (struct frame *f,
--- a/src/event-msw.c Sun May 05 11:33:57 2002 +0000 +++ b/src/event-msw.c Mon May 06 14:16:31 2002 +0000 @@ -2364,9 +2364,11 @@ keymap_sticky[extendedp ? VK_RMENU : VK_LMENU] |= 0x80; } +#ifdef HAVE_MENUBARS if (!NILP (Vmenu_accelerator_enabled) && !(mods & XEMACS_MOD_SHIFT) && message_ == WM_SYSKEYDOWN) potential_accelerator = 1; +#endif /* Remove shift modifier from an ascii character */ mods &= ~XEMACS_MOD_SHIFT; @@ -2449,12 +2451,15 @@ mods_with_quit |= FAKE_MOD_QUIT_CRITICAL; mswindows_quit_chars_count++; } +#ifdef HAVE_MENUBARS else if (potential_accelerator && !got_accelerator && mswindows_char_is_accelerator (frame, ch)) { got_accelerator = 1; break; } +#endif /* HAVE_MENUBARS */ + lastev = mswindows_enqueue_keypress_event (hwnd, make_char (ch), mods_with_quit);
--- a/src/frame-msw.c Sun May 05 11:33:57 2002 +0000 +++ b/src/frame-msw.c Mon May 06 14:16:31 2002 +0000 @@ -258,12 +258,7 @@ static void mswindows_init_frame_3 (struct frame *f) { - /* Don't do this earlier or we get a WM_PAINT before the frame is ready. - * The SW_x parameter in the first call that an app makes to ShowWindow is - * ignored, and the parameter specified in the caller's STARTUPINFO is - * substituted instead. That parameter is SW_HIDE if we were started by - * runemacs, so call this twice. #### runemacs is evil */ - ShowWindow (FRAME_MSWINDOWS_HANDLE (f), SW_SHOWNORMAL); + /* Don't do this earlier or we get a WM_PAINT before the frame is ready */ ShowWindow (FRAME_MSWINDOWS_HANDLE (f), SW_SHOWNORMAL); SetForegroundWindow (FRAME_MSWINDOWS_HANDLE (f)); DragAcceptFiles (FRAME_MSWINDOWS_HANDLE (f), TRUE);
--- a/src/intl-auto-encap-win32.c Sun May 05 11:33:57 2002 +0000 +++ b/src/intl-auto-encap-win32.c Mon May 06 14:16:31 2002 +0000 @@ -2587,6 +2587,8 @@ return GetLongPathNameA ((LPCSTR) lpszShortPath, (LPSTR) lpszLongPath, cchBuffer); } +/* Skipping GetEnvironmentStrings because misnamed ANSI version of the function */ + BOOL qxeFreeEnvironmentStrings (Extbyte * arg1) {
--- a/src/intl-auto-encap-win32.h Sun May 05 11:33:57 2002 +0000 +++ b/src/intl-auto-encap-win32.h Mon May 06 14:16:31 2002 +0000 @@ -1835,6 +1835,8 @@ #endif DWORD qxeGetLongPathName (const Extbyte * lpszShortPath, Extbyte * lpszLongPath, DWORD cchBuffer); +/* Skipping GetEnvironmentStrings because misnamed ANSI version of the function */ + #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED #undef FreeEnvironmentStrings #define FreeEnvironmentStrings error use qxeFreeEnvironmentStrings or FreeEnvironmentStringsA/FreeEnvironmentStringsW
--- a/src/intl-encap-win32.c Sun May 05 11:33:57 2002 +0000 +++ b/src/intl-encap-win32.c Mon May 06 14:16:31 2002 +0000 @@ -217,7 +217,7 @@ yes GetBinaryType yes GetShortPathName yes GetLongPathName -yes GetEnvironmentStrings +skip GetEnvironmentStrings misnamed ANSI version of the function yes FreeEnvironmentStrings yes FormatMessage yes CreateMailslot
--- a/src/s/windowsnt.h Sun May 05 11:33:57 2002 +0000 +++ b/src/s/windowsnt.h Mon May 06 14:16:31 2002 +0000 @@ -211,7 +211,7 @@ #define MAIL_USE_LOCKING /* See unexnt.c */ -#if (_MSC_VER >= 1100) +#if (_MSC_VER >= 1100) && !defined(PDUMP) #define DUMP_SEPARATE_SECTION #endif #ifdef DUMP_SEPARATE_SECTION @@ -219,17 +219,14 @@ #pragma bss_seg("xdata") #endif -#ifdef HAVE_SCROLLBARS -/* Ensure the NT 4 mouse definitions in winuser.h are available */ +#ifdef emacs +/* intl-auto-encap-win32.[ch] assumes _WIN32_WINNT>=0x0400 + We don't want this set when building command-line helpers in lib-src */ # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0400 # endif #endif -/* Force the various NT 4 structures and constants to be included; we're - careful not to call (or even link with) functions not in NT 3.51 when - running on 3.51, but when running on NT 4 or Win9x, we use the later - functions, and need their headers. */ /* The VC++ (5.0, at least) headers treat WINVER non-existent as 0x0400 */ #if defined (WINVER) && WINVER < 0x0400 # undef WINVER