Commit graph

2211 commits

Author SHA1 Message Date
Ralf Habacker
b0e77f0da3 most patches are obsolate 2009-12-07 01:07:08 +01:00
Ralf Habacker
492e0ae06a fixed cmake version macro and string handling 2009-12-07 00:49:42 +01:00
Ralf Habacker
0c31f84932 added cmake option for using nonce-tcp protocol as default; set tcp as default protocol to be compatible with earlier dbus releases 2009-12-01 12:01:11 +01:00
Ralf Habacker
c0fa33dc5f fixed crashes accessing not initiated noncefile member struct 2009-12-01 11:43:20 +01:00
Ralf Habacker
7c0fbba5b5 cleanup nonce socket only when really used 2009-12-01 11:18:39 +01:00
Ralf Habacker
73b926275f uses tcp based test connections for now 2009-12-01 11:17:40 +01:00
Ralf Habacker
0992fb826d dbus-daemon needs more exports 2009-12-01 11:16:29 +01:00
Ralf Habacker
4a24e84aa7 readded test files required for windows 2009-12-01 10:53:53 +01:00
Ralf Habacker
c4276d5901 removed unsupported symbols for msvc 2009-12-01 10:51:17 +01:00
Tor Lillqvist
9601b11eeb Drop unused complex function
Drop _dbus_user_at_console() from dbus-sysdeps-util-win.c. It is
called only from dbus-userdb-util.c which isn't compiled on Windows.
2009-12-01 10:28:11 +01:00
Tor Lillqvist
fed50076e6 Set the DBusError
Put the correct error code and a relevant message into the DBusError
in _dbus_unix_user_is_at_console().
2009-12-01 10:28:09 +01:00
Tor Lillqvist
ad8bc4c6b3 Don't fake network errno values on Windows
Don't pretend there exists errno values for some network errors in the
Microsoft C library. Just use the WinSock error values.
2009-12-01 10:28:07 +01:00
Tor Lillqvist
9bb7297ad7 Handle also WinSock errors in _dbus_error_from_errno
Handle those WinSock errors that match the errno values handled. Don't
bother handling those errors that are mapped to DBUS_ERROR_FAILED in
the switch as that is the default return value anyway.
2009-12-01 10:28:05 +01:00
Frank Osterfeld
d9e4725fa9 Windows fixes
Replace dbus_daemon_init() by dbus_publish_session_bus_address(),
publishing the full address. Omit username from mutexes (not necessary
as mutex names are local to session). Don't exit if publishing the
address failed (allow multiple session bus instances per
session). Based on 00ee92ae314 by Tor Lillqvist.

Cherry-picked from commit 23945513e9a4da61d286ebfbce3897aa061ddbfe in
the dbus4win repository by tml@iki.fi. Remove claim of that commit not
being merged from README.dbus4win.
2009-12-01 10:28:00 +01:00
Tor Lillqvist
459c19b9dd Avoid warnings on Windows
Remove unused functions, or put in #if 0 if potentially useful. Make
internal functions used just in one file static. Use -Werror after all
also on Windows. Construct the installation root from the location of
the dbus DLL, not from the location of the program .exe of the
process.
2009-12-01 10:27:54 +01:00
Ralf Habacker
2213a8511a used dbus/dbus-1.def for cmake too 2009-12-01 10:20:55 +01:00
Ralf Habacker
61bbff6733 added missing symbols for bus-test 2009-12-01 10:20:38 +01:00
Ralf Habacker
6738ac8933 updated version 2009-12-01 10:18:46 +01:00
Tor Lillqvist
6ac1cf2ec8 Drop terminating slash in _dbus_get_tmpdir
The callers will append strings starting with a slash anyway.
2009-12-01 09:26:00 +01:00
Tor Lillqvist
475dc2fc73 Use nonce-tcp default session bus on Windows 2009-12-01 09:25:59 +01:00
Tor Lillqvist
4c92983dce Check for dirent.h 2009-12-01 09:20:36 +01:00
Tor Lillqvist
e5cdc669ab DBUS_VERSION is always three numbers
No *-rc* possible. So drop strange crap manipulating it for
BUILD_FILEVERSION. Drop duplicate AC_SUBST.
2009-12-01 09:20:36 +01:00
Tor Lillqvist
52c35a3137 Actually do install the .def file on Windows 2009-12-01 09:20:35 +01:00
Tor Lillqvist
861989a35d Use dbus-1.def on Windows 2009-12-01 09:20:34 +01:00
Tor Lillqvist
b31da00fe3 Drop internal symbols, add missing symbols 2009-12-01 09:20:33 +01:00
Tor Lillqvist
576da7cd31 Add a dbus/dbus-1.def file
From cmake/dbus/dbus-1.def.cmake
2009-12-01 09:20:32 +01:00
Tor Lillqvist
99371721af Don't use DBUS_DIR_SEPARATOR
I didn't cherry-pick the commit from dbus4win that introduced
DBUS_DIR_SEPARATOR, as I think it just uglifies the code with little
gain. (Forward) slashes work fine on Windows.
2009-12-01 09:20:31 +01:00
Tor Lillqvist
eab064cfc4 Don't use -fPIC and -fPIE on Windows
The MinGW compiler recognizes them but emits a warning "-fPIC ignored
for target (all code is position independent)"
2009-12-01 09:20:31 +01:00
Tor Lillqvist
7b29b5dee7 Add file describing the merge of the dbus4win code 2009-12-01 09:20:30 +01:00
Tor Lillqvist
fb915c0f86 Tell where the file comes from and that it might not be reliable 2009-12-01 09:20:29 +01:00
Tor Lillqvist
dfbf2050f6 Rename README.win to README.windbus to match its origin
Also add it to EXTRA_DIST.
2009-12-01 09:20:28 +01:00
Tor Lillqvist
22e434ab67 Look for config files also in the normal Unix-style location (cherry picked from commit 445d1f780fb916f9087c0d95e7594ee5a425d43f) 2009-12-01 09:20:27 +01:00
Tor Lillqvist
db7717869a Use multi-byte string functions on Windows
Don't walk through char arrays that contain strings in the system
codepage char by char looking for '\\'. There are double-byte
characters in East Asian codepages where the second byte is a '\\'.
(cherry picked from commit 61316262da466993abbcba010c6bac90bb0b1d43)
2009-12-01 09:20:27 +01:00
Tor Lillqvist
97e5d4e13d Don't bother with -Werror on Windows for now
We have so many warnings
2009-12-01 09:20:26 +01:00
Frank Osterfeld
4806504180 with msvc, replace va_copy by assigning the va_lists (cherry picked from commit 42d613fc9284afaa9543549be26f32e503a58348) 2009-12-01 09:20:25 +01:00
Frank Osterfeld
0617102b4b Fixes to the nonce code
Cherry-picked from commit f9bc0f4bd036f6ede5d9850fb0f8587178c85f44 in
the dbus4win repository, slightly massaged to apply by tml@iki.fi.
2009-12-01 08:43:45 +01:00
Frank Osterfeld
9d27253f36 Fix IPv6 setup (the default on Vista)
Ensure that the right struct is passed.

Cherry-picked from commit 172d60d100d04e301e51ff475ada02007f1709dc in
the dbus4win repository by tml@iki.fi.
2009-12-01 08:43:43 +01:00
Frank Osterfeld
c8f73b36a5 Add api dox for nonce-tcp
Cherry-picked from commit e7a070db22ed4a84dc04a062255356c9f6c4c9c5 in
the dbus4win repository, trailing whitespace issues corrected by
tml@iki.fi.
2009-12-01 08:43:43 +01:00
Frank Osterfeld
fbd21dd097 Fixes to the nonce code
On Unix, we create a 700 subdir in /tmp only readable by the user, on
Windows we use the user-specific tmpdir and create the noncefile
directly.

Add NonceFile to abstract this behaviour and to delete the noncefile
and possibly tmpdir on shutdown.

Cherry-picked from commit 885f16b90c4f769ae29f432d0ed2a63bb2e4dab8 in
the dbus4win repository. Fixed to apply and correct whitespace issues
by tml@iki.fi.
2009-12-01 08:43:41 +01:00
Frank Osterfeld
5012769a3f Add nonce-tcp section to the specification (draft) (cherry picked from commit 7015b2db6c8744c88da9cb0fab8d5e0fcfc0220b) 2009-12-01 08:43:40 +01:00
Frank Osterfeld
b0091cf47e Improve error handling in nonce code
Replace errno (from assuan code) by DBusError. Errors are not passed
through dbus_accept_with_nonce atm, as the original _dbus_accept() has
no error arg either.

Cherry-picked from commit 8082e92bb3a6304362e730f8b6e324860e1bb26c in
the dbus4win repository, edited to apply and fix whitespace issues by
tml@iki.fi.
2009-12-01 08:43:38 +01:00
Frank Osterfeld
25ceeeb679 Cleanup of nonce code
Remove the write_file function and use the existing
_dbus_string_save_to_file, improve error handling

Cherry picked from commit 0f7b026d01be7e0fd444cdb56e5f9b7a5137a062 in
the dbus4win repository. Edited to apply and fix whitespace issues by
tml@iki.fi.
2009-12-01 08:43:37 +01:00
Frank Osterfeld
5e2a99c12c The current state of the nonce-tcp implementation
Merged and cleaned up patch from my [Frank Osterfeld's] local work
branch.

Cherry-picked from commit e2801eca57b2d9e09afd662ed5ef6fc83be73afc and
edited by tml@iki.fi to make it apply, and fixing whitespace issues.
2009-12-01 08:43:36 +01:00
Nguyễn Thái Ngọc Duy
366ffe4478 bus/Makefile.am: make dbus-daemon and friends bin_PROGRAMS on Windows
On Linux, dbus-daemon and dbus-daemon-launch-helper are treated specially
because they need permission adjustment.

On Windows, all executables are stubs, created by libtool. The real
executables are in .libs. We need to use libtool to install them
properly. So let's make them bin_PROGRAMS on Windows.
(cherry picked from commit 7fb35992d67433ac3ba82e9e2e786e123323456d)
2009-12-01 08:38:06 +01:00
Frank Osterfeld
6900afeb7d -util.c doesn't belong into the lib (cherry picked from commit 6191f6dda62e43765d5f48d677f7a2349e616a63) 2009-12-01 08:38:05 +01:00
Nguyễn Thái Ngọc Duy
a990f2507e Move some functions from dbus-sysdeps-util-win.c to dbus-sysdeps-win.c
These are used by dbus-sysdeps-win.c and it is not linked together
with dbus-sysdeps-util-win.c
(cherry picked from commit 24b612adbf8045b8b00af15f8d44eb38f964641f)
2009-12-01 08:38:04 +01:00
Nguyễn Thái Ngọc Duy
612e1b38f4 use WINDRES instead of RC to compile rc file
This is the way used by GTK+ and other packages. I don't know much about "RC" though.
(cherry picked from commit d5b993ebc1411b15e4563d05fbd92cf8b29cbb4c)
2009-12-01 08:38:03 +01:00
Nguyễn Thái Ngọc Duy
4c02c62621 remove dbus-uuidgen from Windows build (cherry picked from commit 73873e002ac9ba6159388b2c7b4190c30961ec68) 2009-12-01 08:38:02 +01:00
Nguyễn Thái Ngọc Duy
fe365b416c configure.in: do not define DBUS_UNIX unconditionally (cherry picked from commit 5c072b8c4d912dfe34b72c2b7bbcb4ea359c98d7) 2009-12-01 08:38:01 +01:00
Marc Mutz
ae776f576a bus/Makefile.am: conditional compilation for W32, use EXEEXT in install hooks (cherry picked from commit 551a9c446b782167aa8b0a74a41a1b7ffb42c6eb) 2009-12-01 08:36:31 +01:00