win32: Reimplementation of VIMDLL #4287

k-takata · 2019-04-21T17:01:18Z

The VIMDLL support was removed at 8.1.1066.
I reimplemented it on MSVC and MinGW.
The differences from the old implementation are:

Supports MSVC and MinGW. (Don't support Borland C++.)
Supports gvim.exe and vim.exe.
If you build with nmake -f Make_mvc.mak VIMDLL=yes, vim{32,64}.dll
will be built and also stub gvim.exe and vim.exe will be built.
The shared codes between GUI and CUI are all built into the DLL.
So the total size of the distribution files can be reduced.
Supports vim -g and the :gui commands.
If the commands are executed with the -f option, vim.exe will open a GUI
window directly. Otherwise, vim.exe will execute gvim.exe. :gui will
use :mksession to inherit the session to gvim.exe.

Related: #4171 (comment)

Currently only supports MSVC. If you build with `nmake -f Make_mvc.mak VIMDLL=yes`, vim{32,64}.dll will be built and also small gvim.exe and vim.exe will be built. The shared codes between GUI and CUI are all built into the DLL. So the total size of the distribution files can be reduced. TODO: * Update "make clean". * Fix terminal behavior on vim.exe. * Fix shell behavior on vim.exe. * Check all `FEAT_GUI_MSWIN` definitions. * Check all `ALWAYS_USE_GUI` definitions. * Support MinGW.

* Fix version string. * Enable VTP on console version. * Fix color of 'tgc'. * Fix backspace in terminal mode on console version.

TODO: Still red and blue are swapped when t_Co=256 and 'notgc' on vim.exe.

This was removed by v8.1.1109.

Update for 8.1.1131.

This reverts commit c7430f3.

This reverts commit dedd34d.

When using the terminal on vim.exe with `:set t_Co=16` (default), the colors are shown incorrectly. Red and blue are swapped. To reproduce: 1. Download `color16.bat` from [here](https://gist.github.com/k-takata/2d4f562bacf8bae6691973a540970117#file-color16-bat). 2. Execute `vim --clean`. 3. Type `:terminal`. 4. Execute `color16.bat` on the terminal. Color indices between the ANSI escape sequence and the Windows console (in 16-color mode) are different, so they should be adjusted. It seems that a condition was wrong. This fixes it.

Drop "-DFEAT_GUI_MSWIN" option from CFLAGS when creating os_w32exec.obj. Stop using both /D and /U options at the same time.

k-takata · 2019-04-23T15:12:25Z

@brammool
https://groups.google.com/d/msg/vim_dev/9JS4qp5cFLA/Tkc3OcGuCAAJ

Supports vim -g and the :gui commands.
If the commands are executed with the -f option, vim.exe will open a GUI
window directly. Otherwise, vim.exe will execute gvim.exe. :gui will
use :mksession to inherit the session to gvim.exe.

Does this really work? Any variable values would be lost.

:gui with :mksession works almost fine. It inherits global status. But It is not perfect as you pointed out.
(On the other hand, :gui -f works perfect, because vim.exe itself opens the window in the same process.)
If there are any unsaved files, :gui automatically falls back to :gui -f.

brammool · 2019-04-23T17:15:50Z

@brammool > > * Supports `vim -g` and the `:gui` commands. > > If the commands are executed with the `-f` option, vim.exe will open a GUI > > window directly. Otherwise, vim.exe will execute gvim.exe. `:gui` will > > use `:mksession` to inherit the session to gvim.exe. > > Does this really work? Any variable values would be lost. `:gui` with `:mksession` works almost fine. It inherits global status. But It is not perfect as you pointed out. (On the other hand, `:gui -f` works perfect, because vim.exe itself opens the window in the same process.) If there are any unsaved files, `:gui` automatically falls back to `:gui -f`.

I rather not implement this, unless it works perfectly. Otherwise we will keep getting bug reports around this. Ideally this works the same way as it does on Unix. But I suppose bringing back the command prompt won't be possible, since Windows doesn't have a way to detach, other than starting a GUI program.

…

-- Apologies for taking up the bandwidth with the apology. Anything else I can apologise for ...... er no can't think of anything, sorry about that. Andy Hunt (Member of British Olympic Apology Squad) /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

k-takata · 2019-04-24T01:03:30Z

But I suppose bringing back the command prompt won't be possible, since Windows doesn't have a way to detach, other than starting a GUI program.

Yes, unix shell can use Ctrl-Z and bg to move the process to the background, but Windows doesn't support it. Opening a GUI from vim.exe and stay in foreground is useless. So, :gui -f is not useful.
And :gui -b doesn't work perfectly as it uses :mksession. So it might be better to disable :gui.

I think that vim -g is still useful. It works perfectly.

Add the EXPERIMENTAL_GUI_CMD definition instead.

k-takata · 2019-04-24T10:46:38Z

I disabled the :gui command in the latest commit.

brammool · 2019-04-24T19:36:45Z

Thanks. So now we mainly save space and the installer will get a lot smaller.
If someone sees a drawback, please let us know.
Otherwise I'll include it soon.

Move the common part of the resources from the exes to the dll. * icon files (except the main icon) * bmp files * print status dialog Adjust the handling of HINSTANCE for that. Move SaveInst() from gui_w32.c to os_mswin.c and change s_hinst to g_hinst. Call SaveInst() from DllMain(). Update the dependencies of the resource files in the makefiles. Embed the manifest to the resource also for vim.exe so that the print dialog will be shown in XP style. Notes: It might be better to separate the resource file for gvim.exe and vim.exe, because currently "OriginalFilename" in the version resource is set to "VIM.EXE". The print dialogs are different between gvim.exe and vim.exe. Is it intentional?

Separate the resource file for gvim.exe and vim.exe.

Make the definition of RCFLAGS similar to Make_cyg_ming.mak.

Set the gui.starting flag before checking sever options. Check the subsystem of the current executable file for that.

Don't drop the gui.starting flag.

k-takata · 2019-04-26T11:23:39Z

I had a report that "gvim --serverlist" didn't work, so I fixed it.
I also revised the makefiles, update nsis script for VIMDLL.

I think this is ready to be included. If there are still some problems, they can be fixed one by one.

Problem: Code for viminfo support is spread out. Solution: Move to code to viminfo.c. (Yegappan Lakshmanan, closes vim/vim#4686) vim/vim@defa067 N/A patches for version.c: vim-patch:8.1.1230: a lot of code is shared between vim.exe and gvim.exe Problem: A lot of code is shared between vim.exe and gvim.exe. Solution: Optionally put the shared code in vim.dll. (Ken Takata, closes vim/vim#4287) vim/vim@afde13b vim-patch:8.2.2247: VMS: various smaller problems Problem: VMS: various smaller problems. Solution: Fix VMS building and other problems. (Zoltan Arpadffy) vim/vim@467676d

k-takata added 30 commits April 4, 2019 07:57

Fix VIMDLL

1157003

* Fix version string. * Enable VTP on console version. * Fix color of 'tgc'. * Fix backspace in terminal mode on console version.

Work around for terminal color on vim.exe

dedd34d

TODO: Still red and blue are swapped when t_Co=256 and 'notgc' on vim.exe.

Fix :shell

696fc27

Update feature.h

db2bed9

Fix title, etc.

0c8c6c6

Fix :winpos

43cb35a

Fix printer

9f583a4

Merge branch 'master' into vimdll

5f56271

Add the src/os_w32dll.c entry back

4127f0a

This was removed by v8.1.1109.

Fix :!command on vim.exe

7a27b0a

Fix startup messages

01763d7

Use different work folder for VIMDLL

3188a59

Update make clean

e2e042b

Update .gitignore

51c4553

Add comments about VIMDLL

e4fa975

Fix typos

e545502

Merge branch 'master' into vimdll

fd88d43

Fix getwinpos() on vim.exe

708dea7

Update for 8.1.1131.

Revise #ifdef

94da808

Work around for the terminal color on 256-color mode

c7430f3

Fix warning

aedb75f

Revert "Work around for the terminal color on 256-color mode"

f9c2a44

This reverts commit c7430f3.

Revert "Work around for terminal color on vim.exe"

83bb445

This reverts commit dedd34d.

Adjust ALWAYS_USE_GUI condition

42bd4ed

Fix MzScheme

0d99fab

Fix help message

715b92d

Fix typos and old comments

3e5ac8a

Adjust #ifdef

86aac68

k-takata added 12 commits April 22, 2019 19:40

Simplify mingw makefile

d376dc8

Fix indents

f981e38

Remove unused code

f3b535e

Fix error handling of :gui

0d46dc5

Restore 'bg' when :gui failed

0429b61

Change 'bg' in a simpler way

22b2703

Use wsprintfW()

5d9f6f7

Use _snwprintf() for readability

481448a

Fix wrong usage of _snwprintf()

79f91eb

Suppress D9025 warning

ea14f6e

Drop "-DFEAT_GUI_MSWIN" option from CFLAGS when creating os_w32exec.obj. Stop using both /D and /U options at the same time.

Execute "gvimd.exe" on debug build

10fac32

Adjust error message of :gui

74c8797

k-takata mentioned this pull request Apr 24, 2019

Windowsでvim -gしたらgvimを起動する vim-jp/issues#602

Closed

Disable the :gui command

dab4683

Add the EXPERIMENTAL_GUI_CMD definition instead.

k-takata added 7 commits April 25, 2019 18:02

Fix "OriginalFilename" in the version resource

9d18c11

Separate the resource file for gvim.exe and vim.exe.

Add if directives for readability

a88d8f3

Revise Make_mvc.mak

2f58a8f

Make the definition of RCFLAGS similar to Make_cyg_ming.mak.

Fix that "gvim --serverlist" didn't work

cbbee9b

Set the gui.starting flag before checking sever options. Check the subsystem of the current executable file for that.

Fix that 'gvim -v' hangs

edc354d

Don't drop the gui.starting flag.

Update nsis script to support VIMDLL

ef922a8

brammool closed this in afde13b Apr 28, 2019

k-takata deleted the vimdll branch April 29, 2019 00:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

win32: Reimplementation of VIMDLL #4287

win32: Reimplementation of VIMDLL #4287

Uh oh!

k-takata commented Apr 21, 2019

Uh oh!

k-takata commented Apr 23, 2019 •

edited

Loading

Uh oh!

brammool commented Apr 23, 2019 via email

Uh oh!

k-takata commented Apr 24, 2019

Uh oh!

k-takata commented Apr 24, 2019

Uh oh!

brammool commented Apr 24, 2019

Uh oh!

k-takata commented Apr 26, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

win32: Reimplementation of VIMDLL #4287

win32: Reimplementation of VIMDLL #4287

Uh oh!

Conversation

k-takata commented Apr 21, 2019

Uh oh!

k-takata commented Apr 23, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brammool commented Apr 23, 2019 via email

Uh oh!

k-takata commented Apr 24, 2019

Uh oh!

k-takata commented Apr 24, 2019

Uh oh!

brammool commented Apr 24, 2019

Uh oh!

k-takata commented Apr 26, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

k-takata commented Apr 23, 2019 •

edited

Loading