Windows port v2.6.5 6 - #455

Draft

DonatFomenko wants to merge 223 commits into

masterfrom

WindowsPort-v2.6.5-6

Commits on Nov 13, 2013

Initial commit (preliminary investigation)

Frederic Bohe
authored and
bohe-eaton
committed
ecd42d8
Set eol-style to native

Frederic Bohe
authored and
bohe-eaton
committed
c9c402c
Fix executable bits

clepple
authored and
bohe-eaton
committed
b50052f
Move wincompat.[ch] to common

Frederic Bohe
authored and
bohe-eaton
committed
52358e6
Remove hard coded path to libws2_32

Frederic Bohe
authored and
bohe-eaton
committed
ee3fd34
Fix errors appeared when merging from regular 2.4.3 to svn trunk

Frederic Bohe
authored and
bohe-eaton
committed
06a056b
Set again eol property to native

Frederic Bohe
authored and
bohe-eaton
committed
56bae5a
Remove hack from confpath function.

Frederic Bohe
authored and
bohe-eaton
committed
f4bbae1
Remove unneeded debug printf

Frederic Bohe
authored and
bohe-eaton
committed
035bcf1
Better handling of multiple connection on drivers

Frederic Bohe
authored and
bohe-eaton
committed
8bf7767
Rename DATADIR to NUT_DATADIR to avoid conflict with MinGW objidl.h header

aquette
authored and
bohe-eaton
committed
ca609ba
Map syslog to Windows's event log.

Frederic Bohe
authored and
bohe-eaton
committed
5b7d7ad
Remove C++ style comments

Frederic Bohe
authored and
bohe-eaton
committed
315995f
upsd behaves like a service by default now

Frederic Bohe
authored and
bohe-eaton
committed
0572127
Add Uninstall facility to upsd

Frederic Bohe
authored and
bohe-eaton
committed
0f955d1
Factorization of service code

Frederic Bohe
authored and
bohe-eaton
committed
36ac62d
MinGW socklen detection (by Arnaud Quette)

Frederic Bohe
authored and
bohe-eaton
committed
12b4f4b
Make drivers run as service by default

Frederic Bohe
authored and
bohe-eaton
committed
0a70267
Add regex library check and flags

aquette
authored and
bohe-eaton
committed
a6dd8a6
Checking whether or not we should use the 'regex' library...

arjendekorte
authored and
bohe-eaton
committed
526a248
Correct integration of WinSock library (by Arnaud Quette)

Frederic Bohe
authored and
bohe-eaton
committed
43b986d
This 3 lines has been duplicated instead of being removed.

Frederic Bohe
authored and
bohe-eaton
committed
d592a68
Finish removing hard-coded paths to winsock2 library (as in [[SVN:2674]])

clepple
authored and
bohe-eaton
committed
6dcd454
More factorization and fix a bug in drivers services stop

Frederic Bohe
authored and
bohe-eaton
committed
d8ae3f5
We need to register one driver service per ups in upsd.conf.

Frederic Bohe
authored and
bohe-eaton
committed
10f11d3
Better use of NUT framework for previous commit

Frederic Bohe
authored and
bohe-eaton
committed
09bf7cd
Remove useless header

Frederic Bohe
authored and
bohe-eaton
committed
dafcbcd
Change the "full services" approach to a more POSIX one.

Frederic Bohe
authored and
bohe-eaton
committed
d65907b
Add regex library for drivers (by Arnaud Quette)

Frederic Bohe
authored and
bohe-eaton
committed
9d9c732
Reverting useless previous commit: [[SVN:2705]]

Frederic Bohe
authored and
bohe-eaton
committed
06af1b8
Fix upsd clients read

Frederic Bohe
authored and
bohe-eaton
committed
97f9667
upsmon uses a message box instead of wall

Frederic Bohe
authored and
bohe-eaton
committed
0827701
Start upsmon as a single process.

Frederic Bohe
authored and
bohe-eaton
committed
b16539e
More work on serial drivers.

Frederic Bohe
authored and
bohe-eaton
committed
7509599
upscmd is now working

Frederic Bohe
authored and
bohe-eaton
committed
bc95b43
upsrw is now working

Frederic Bohe
authored and
bohe-eaton
committed
27af8dd
Fix timeout calculation

Frederic Bohe
authored and
bohe-eaton
committed
41ba23c
Update halt.c compilation

Frederic Bohe
authored and
bohe-eaton
committed
72b9807
Automatic generation of winevent.h and winevent.dll

Frederic Bohe
authored and
bohe-eaton
committed
25b4f68
Simplify timeout calculation

Frederic Bohe
authored and
bohe-eaton
committed
17eca71
forgot this for automatic winevent.h and winevent.dll generation

Frederic Bohe
authored and
bohe-eaton
committed
1cbacf2
First implementation of termios functions

Frederic Bohe
authored and
bohe-eaton
committed
6a55c6a
Use paths relative to the .exe file's binary for configuration and PID files.

Frederic Bohe
authored and
bohe-eaton
committed
10a1c99
Add usleep() implementation for systems that lack it (patch from Paul Fertser)

Frederic Bohe
authored and
bohe-eaton
committed
acbfbdd
Do not use an external DLL anymore.

Frederic Bohe
authored and
bohe-eaton
committed
c6a6795
Forgot to remove now useless winevent.dll reference

Frederic Bohe
authored and
bohe-eaton
committed
7f9edce
Fix winevent.h generation on clean compile (by Paul Fertser)

Frederic Bohe
authored and
bohe-eaton
committed
5e72ed9
Make datapath relative too

Frederic Bohe
authored and
bohe-eaton
committed
c2de280
Fix latency bug for mge-utalk.

Frederic Bohe
authored and
bohe-eaton
committed
83c5705
code cleanup

Frederic Bohe
authored and
bohe-eaton
committed
df97c4b
Fix client disconnection

Frederic Bohe
authored and
bohe-eaton
committed
8e8bcb9
Merge from the trunk -> porting the IPv6 code to Windows

Frederic Bohe
authored and
clepple
committed
67fddb1
Fix service access to configuration path

Frederic Bohe
authored and
clepple
committed
24c4012
Safer relative path management

Frederic Bohe
authored and
clepple
committed
9e8538e
Prefer to use static variables locally over global variables

arjendekorte
authored and
clepple
committed
e6445e1
Compilation fix (from Arjen de Korte)

Frederic Bohe
authored and
clepple
committed
b7b8d2f
Fix "make install"

Frederic Bohe
authored and
clepple
committed
bdad5ce
upsmon does not fork in WIN32

Frederic Bohe
authored and
clepple
committed
af675f9
Clean-up : put compatibility macros in wincompat.h

Frederic Bohe
authored and
clepple
committed
be33cab
Fix a warning

Frederic Bohe
authored and
clepple
committed
65f33eb
More clean-up of wincompat

Frederic Bohe
authored and
clepple
committed
abba82a
Merge from trunk

Frederic Bohe
authored and
clepple
committed
65c0d49
Add strtok_r implementation and remove last "#define strtok_r"

Frederic Bohe
authored and
clepple
committed
e26253a
Cleaner warning fix in common.c

Frederic Bohe
authored and
clepple
committed
a12d1bc
Disable Hotplug and udev support on Windows (useful when cross-compiling)

Frederic Bohe
authored and
clepple
committed
6be30a6
Fix warning in wincompat.c

Frederic Bohe
authored and
clepple
committed
a25153a
Fix warning in upsmon.h

Frederic Bohe
authored and
clepple
committed
2ab3691
Fix possible race in notify.

Frederic Bohe
authored and
clepple
committed
65bf10c
Fix another race condition in notify.

Frederic Bohe
authored and
clepple
committed
4e8fc4f
Fix warnings in main.c

Frederic Bohe
authored and
clepple
committed
162b862
Porting isbmex driver

Frederic Bohe
authored and
clepple
committed
664d782
Fix warnings in libshut.c.

Frederic Bohe
authored and
clepple
committed
05201f4
Fix warning in mge-xml.c

Frederic Bohe
authored and
clepple
committed
90f3a14
upslog_with_errno does not call exit() nor return, ...

Frederic Bohe
authored and
clepple
committed
493ba7d
Fix compilation on buildbot

Frederic Bohe
authored and
clepple
committed
3f1844e
Fix "make distckeck-light" in Windows environment

Frederic Bohe
authored and
clepple
committed
7084805
Fix "upsdrvctl start" path issue

Frederic Bohe
authored and
clepple
committed
6b6f05b
clean-up printf calls

Frederic Bohe
authored and
clepple
committed
21c167b
Prefer upsdebugx to upslogx for low level output

Frederic Bohe
authored and
clepple
committed
412e5e4
small typo

Frederic Bohe
authored and
clepple
committed
f94fe36
Add date to notification

Frederic Bohe
authored and
clepple
committed
f0b41e8
Extent print_event capabilities

Frederic Bohe
authored and
clepple
committed
5786823
Let nut.exe calls its children through their relatives paths

Frederic Bohe
authored and
clepple
committed
9be9876
Add a Sleep before running upsmon...

Frederic Bohe
authored and
clepple
committed
ba6a030
Correctly manage time-out in libusb

Frederic Bohe
authored and
clepple
committed
a15f3f0
Add some console output when running in non-service mode

Frederic Bohe
authored and
clepple
committed
97f5a73
Fix a crash if configuration files are wrong in non-service mode

Frederic Bohe
authored and
clepple
committed
bd4f8b5
Handle properly the "none" MODE in nut.conf

Frederic Bohe
authored and
clepple
committed
7ed18c1
Windows scripts and support files for NUT Windows installer using WIX

Frederic Bohe
authored and
clepple
committed
6142ecb
small typo

Frederic Bohe
authored and
clepple
committed
edec90a
Remove DLL from the SVN repository.

Frederic Bohe
authored and
clepple
committed
58d73ab
MinGW bin directory and MSYS bin directory are now configurable

Frederic Bohe
authored and
clepple
committed
0b26e1a
Remove regex2.dll dependency.

Frederic Bohe
authored and
clepple
committed
cd63314
Removed binary files (DLL & ibd) and Updated with icons and .bmp images...

Praveen Kumar
authored and
clepple
committed
109d00f
Correctly sized banner for Windows installer

Frederic Bohe
authored and
clepple
committed
5cc3998
commit again a small typo

Frederic Bohe
authored and
clepple
committed
47943fa
Add information on installation

Frederic Bohe
authored and
clepple
committed
6d8b6b6
Merge with trunk

Frederic Bohe
authored and
clepple
committed
08f7acd
NUT is automatically started during system startup

Frederic Bohe
authored and
clepple
committed
e219af1
fix "upsdrvctl shutdown" command

Frederic Bohe
authored and
clepple
committed
408daa2
More generic wrong MODE handling + log same message as Linux version.

Frederic Bohe
authored and
clepple
committed
be0c131
Update NUT version (by Praveen Kumar)

Frederic Bohe
authored and
clepple
committed
6511930
Makes the call to "wall" function non blocking, ...

Frederic Bohe
authored and
clepple
committed
8dcbc1d
Add a call to "upsdrvctl shutdown" if POWERDOWNFLAG is set when service exits.

Frederic Bohe
authored and
clepple
committed
ca40ae3
Using named pipe for a better port of signals.

Frederic Bohe
authored and
clepple
committed
8f7a019
forgot to change wait duration.

Frederic Bohe
authored and
clepple
committed
704ac40
[Installer] Include documentation in HTML format

Frederic Bohe
authored and
clepple
committed
186b80a
Add hints to configure SHUTDOWNCMD and POWERDOWNFLAG

Frederic Bohe
authored and
clepple
committed
eac694e
Add a check box for launching the automatic libUSB drivers installation

Frederic Bohe
authored and
clepple
committed
4f8abbd
Add source files and a note on how to compile the automatic driver installer.

Frederic Bohe
authored and
clepple
committed
9b7c20a
This doesn't make it through the previous merge from trunk

Frederic Bohe
authored and
clepple
committed
e9b33e1
Remove useless empty directories

Frederic Bohe
authored and
clepple
committed
62ad0bf
nut_check_socketlib.m4 has been removed from trunk,

Frederic Bohe
authored and
clepple
committed
6f88e4d
Add files in the project's root (README, INSTALL...)

Frederic Bohe
authored and
clepple
committed
ccb488b
convert end of line to unix style

Frederic Bohe
authored and
clepple
committed
604caa5
merge from trunk [[SVN:2990]] to [[SVN:2997]]

Frederic Bohe
authored and
clepple
committed
5de231d
Converting some files to Unix-style line endings

Frederic Bohe
authored and
clepple
committed
3be1d87
Fix Winsock2 testing and result publication

aquette
authored and
clepple
committed
2e009f7
Correct configuration value for usb_set_configuration

Frederic Bohe
authored and
clepple
committed
9f4d349
Merge from trunk [[SVN:3002]] to [[SVN:3057]]

Frederic Bohe
authored and
clepple
committed
a6a1ab1
Fix timeout being in seconds instead of milliseconds

Frederic Bohe
authored and
clepple
committed
4d95c13
Add WIN32 specific error case for detecting disconnection

Frederic Bohe
authored and
clepple
committed
029d1a5
Change timeout from seconds to milliseconds (from David Bolen)

Frederic Bohe
authored and
clepple
committed
f4a947d
Revert [[SVN:3108]]. Correct errno management should be enough

Frederic Bohe
authored and
clepple
committed
0785ad8
Make sure errno is set to an actual error code (thanks to David Bolen)

Frederic Bohe
authored and
clepple
committed
acfc00c
Make sure serial functions set errno to an actual error code

Frederic Bohe
authored and
clepple
committed
dcd40a0
Add the error message associated with GetLastError to the error string.

Frederic Bohe
authored and
clepple
committed
1a72ce8
Add a notification to unplug and re-plug the device...

Frederic Bohe
authored and
clepple
committed
fd32d6a
Change from libgnurx-0.dll to msys-regex-1.dll for the sake of coherency

Frederic Bohe
authored and
clepple
committed
0dc2036
The stock msys-regex-1.dll is crashing.

Frederic Bohe
authored and
clepple
committed
b4c144e
This seems to be the correct way to set and reset DTR and RTS with Win32 API

Frederic Bohe
authored and
clepple
committed
c9c39fd
Add some more hints on how to compile wdi-simple.exe

Frederic Bohe
authored and
clepple
committed
2940efd
Print an error message when driver's installation has failed.

Frederic Bohe
authored and
clepple
committed
d38e09b
Correct handling of timeout

Frederic Bohe
authored and
clepple
committed
e134eaa
Merge from trunk [[SVN:3060]] to [[SVN:3318]]

Frederic Bohe
authored and
clepple
committed
40688af
Don't leave one liner alone after if.

Frederic Bohe
authored and
clepple
committed
2b86a2b
Fix blazer_ser driver (from Paul Fertser)

Frederic Bohe
authored and
clepple
committed
ebd377f
Fix "make distcheck-light" (by Arnaud Quette)

Frederic Bohe
authored and
clepple
committed
19b5dcf
Remove useless code

Frederic Bohe
authored and
clepple
committed
fdc4851
Fix porting of upssched

Frederic Bohe
authored and
clepple
committed
cecaae7
Fix commands with blank in their path

Frederic Bohe
authored and
clepple
committed
055b526
Cleaner initialization of variables

Frederic Bohe
authored and
clepple
committed
0b665ed
Add filter_path function

Frederic Bohe
authored and
clepple
committed
0c5ab76
Add getpwuid and getpass functions.

Frederic Bohe
authored and
clepple
committed
0d4a0d7
Merge from trunk: [[SVN:3320]] to [[SVN:3435]]

Frederic Bohe
authored and
clepple
committed
999c10a
Cleaner regex addtion por apcsmart driver (by Arnaud Quette)

Frederic Bohe
authored and
clepple
committed
b6c56d6
Better handling of ETIMEDOUT

Frederic Bohe
authored and
clepple
committed
f252fb3
typo in comments

Frederic Bohe
authored and
clepple
committed
24cd5ea
Add comments about EPROTO and EOVERFLOW

Frederic Bohe
authored and
clepple
committed
976509a
Clean up

Frederic Bohe
authored and
clepple
committed
1fc249e
Add #ifdef WIN32 for do_upsconf_args definition

Frederic Bohe
authored and
clepple
committed
7ddc2b8
Fix indentation

Frederic Bohe
authored and
clepple
committed
56d1e01
Small correction to error messages.

Frederic Bohe
authored and
clepple
committed
eafc048
Merge from trunk: [[SVN:3438]] to [[SVN:3508]]

Frederic Bohe
authored and
clepple
committed
66fb320
Special case when sending signal 0

Frederic Bohe
authored and
clepple
committed
98ec457
This is needed for non WIN32 too.

Frederic Bohe
authored and
clepple
committed
e2c4c42
This doesn't make it through past merges.

Frederic Bohe
authored and
clepple
committed
5b31630
Conditional Makefile for WIN32

Frederic Bohe
authored and
clepple
committed
7fd7d66
Fix conditional Makefile for WIN32

Frederic Bohe
authored and
clepple
committed
037377d
Make the message box of notify non-blocking

Frederic Bohe
authored and
clepple
committed
c6717d4
Completely skip termios.h with WIN32

Frederic Bohe
authored and
clepple
committed
f6e673a
Merge from trunk [[SVN:3511]] to [[SVN:3539]]

Frederic Bohe
authored and
clepple
committed
5750e7a
echo a comment

Frederic Bohe
authored and
clepple
committed
99cbdb6
Add nut-scanner files and libupsclient-1.dll to the MSI installer

Frederic Bohe
authored and
clepple
committed
a851d40
libupsclient-1.dll is needed in "bin" too

Frederic Bohe
authored and
clepple
committed
d0060d1
Add libneon-27.dll and libnetsnmp-30.dll in bin directory

Frederic Bohe
authored and
clepple
committed
5dc75eb
Update comments for IPv6 on Windows platforms

Frederic Bohe
authored and
clepple
committed
701d0a2
Make sure upssched.conf is DOS compatible

Frederic Bohe
authored and
clepple
committed
2bcf45b
Add more DLLs in bin directory

Frederic Bohe
authored and
clepple
committed
6cfa65e
Fix journal event truncation.

Frederic Bohe
authored and
clepple
committed
ba5da43
Add an external wall-like application.

Frederic Bohe
authored and
clepple
committed
d84a3fe
Add pipedebug program

Frederic Bohe
authored and
clepple
committed
e3aaeb1
Add general Windows conditional (by Arnaud Quette)

Frederic Bohe
authored and
clepple
committed
e60fdb9
Keep same sockdebug's binary name for all OS.

Frederic Bohe
authored and
clepple
committed
667e76f
Merge from trunk [[SVN:3541]] to [[SVN:3644]] (upgrade to 2.6.4)

Frederic Bohe
authored and
clepple
committed
8d77af8
Porting genericups driver

Frederic Bohe
authored and
clepple
committed
03c1246
Merge from trunk [[SVN:3645]] to [[SVN:3690]]

Frederic Bohe
authored and
clepple
committed
a685770
Update installer script with oldmge-shut instead of newmge-shut

Frederic Bohe
authored and
clepple
committed
bdbdae9
Adding Windows 2000 and older support

Frederic Bohe
authored and
clepple
committed
99b4c5d
Fix w32_setcomm and w32_getcomm for genericups

Frederic Bohe
authored and
clepple
committed
1889102
Disconnect named pipe correctly

Frederic Bohe
authored and
clepple
committed
90dbbc7
Fix UPS shutdown

Frederic Bohe
authored and
clepple
committed
c333196
typo in comments

Frederic Bohe
authored and
clepple
committed
3e5f31a
Get rid of console event and PID management

Frederic Bohe
authored and
clepple
committed
24ce9b8
Merge from trunk [[SVN:3692]] to [[SVN:3713]] (upgrade to 2.6.5)

Frederic Bohe
authored and
clepple
committed
8362af8
Fix Event Viewer regression

Frederic Bohe
authored and
clepple
committed
7c05e83
Fix upssched regression due to CVE-2012-2944

Frederic Bohe
authored and
clepple
committed
1cd81af
Fix communication with named pipe

Frederic Bohe
authored and
clepple
committed
0c881ed
Typo in installer dialog box

Frederic Bohe
authored and
clepple
committed
a4de451
update error logs

Frederic Bohe
authored and
clepple
committed
3ad74f4
Fix invalid memory allocation (fix a crash at exit time in upsmon)

Frederic Bohe
authored and
clepple
committed
7eff2b1
Automated Windows cross compilation

aquette
authored and
clepple
committed
7012439
Fix MingGW-w64 compilation

aquette
authored and
clepple
committed
622ec08
Forgotten build and distribution rules

aquette
authored and
clepple
committed
54cdcfb
Some fixes after rebase

bohe-eaton
authored and
clepple
committed
d9af842
More changes after rebase

bohe-eaton
authored and
clepple
committed
ab80897
Fix upsclient link after rebase

unknown
authored and
clepple
committed
a5aa9b4
Fix compilation on Windows

bohe-eaton
authored and
clepple
committed
03e1162
Remove useless link to intl which break compilation on Linux

bohe-eaton
authored and
clepple
committed
1adb7fe
Update gitignore for Windows

bohe-eaton
authored and
clepple
committed
471179d
Try to get rid of warnings

bohe-eaton
authored and
clepple
committed
946c51c
Fix weird difftime behavior

bohe-eaton
authored and
clepple
committed
46796b5
Fix Linux compilation

bohe-eaton
authored and
clepple
committed
119cf4f
Fix Linux compilation warning

bohe-eaton
authored and
clepple
committed
7efba41
a2x: use --destination-dir
clepple
committed
7ccf807
windows_port: distribute win_shut_compat.h
clepple
committed
eb9bd2e
windows_port: remove conflict markers from blazer_ser.c
clepple
committed
9519d87

Commits on Jan 17, 2014

Add basic Windows wait for launch process.
emilienkia-eaton
committed
03df76f
Fix Windows driver starting model and add comments.
emilienkia-eaton
committed
8a914ae

Commits on Feb 20, 2014

Commits on Feb 28, 2014

Fix Windows Installer file list.
emilienkia-eaton
committed
a874a77
Merge branch 'FixWindowsDistrib' into v2.6.5-5
emilienkia-eaton
committed
c153bf9

Uh oh!

Uh oh!

Commits

Commits on Nov 13, 2013