platform/upstream/dbus.git
14 years agoCleanup of nonce code
Frank Osterfeld [Wed, 21 Oct 2009 17:04:01 +0000 (20:04 +0300)]
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.

14 years agoThe current state of the nonce-tcp implementation
Frank Osterfeld [Wed, 21 Oct 2009 16:52:49 +0000 (19:52 +0300)]
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.

14 years agobus/Makefile.am: make dbus-daemon and friends bin_PROGRAMS on Windows
Nguyễn Thái Ngọc Duy [Thu, 11 Jun 2009 11:06:19 +0000 (21:06 +1000)]
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)

14 years ago-util.c doesn't belong into the lib (cherry picked from commit 6191f6dda62e43765d5f48...
Frank Osterfeld [Thu, 11 Jun 2009 08:53:24 +0000 (10:53 +0200)]
-util.c doesn't belong into the lib (cherry picked from commit 6191f6dda62e43765d5f48d677f7a2349e616a63)

14 years agoMove some functions from dbus-sysdeps-util-win.c to dbus-sysdeps-win.c
Nguyễn Thái Ngọc Duy [Tue, 9 Jun 2009 11:48:53 +0000 (21:48 +1000)]
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)

14 years agouse WINDRES instead of RC to compile rc file
Nguyễn Thái Ngọc Duy [Tue, 9 Jun 2009 11:46:11 +0000 (21:46 +1000)]
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)

14 years agoremove dbus-uuidgen from Windows build (cherry picked from commit 73873e002ac9ba61593...
Nguyễn Thái Ngọc Duy [Tue, 9 Jun 2009 11:52:05 +0000 (21:52 +1000)]
remove dbus-uuidgen from Windows build (cherry picked from commit 73873e002ac9ba6159388b2c7b4190c30961ec68)

14 years agoconfigure.in: do not define DBUS_UNIX unconditionally (cherry picked from commit...
Nguyễn Thái Ngọc Duy [Tue, 9 Jun 2009 11:45:10 +0000 (21:45 +1000)]
configure.in: do not define DBUS_UNIX unconditionally (cherry picked from commit 5c072b8c4d912dfe34b72c2b7bbcb4ea359c98d7)

14 years agobus/Makefile.am: conditional compilation for W32, use EXEEXT in install hooks (cherry...
Marc Mutz [Tue, 21 Apr 2009 14:24:51 +0000 (16:24 +0200)]
bus/Makefile.am: conditional compilation for W32, use EXEEXT in install hooks (cherry picked from commit 551a9c446b782167aa8b0a74a41a1b7ffb42c6eb)

14 years agotools/Makefile.am: conditional compilation for W32 (cherry picked from commit 8b2f758...
Marc Mutz [Tue, 21 Apr 2009 14:22:11 +0000 (16:22 +0200)]
tools/Makefile.am: conditional compilation for W32 (cherry picked from commit 8b2f7581ef46b6e9bd29b8399657c039cb49f030)

14 years agoMakefile.am's: reorder libraries so static libs come first (fixes linking on W32...
Marc Mutz [Tue, 21 Apr 2009 10:33:50 +0000 (12:33 +0200)]
Makefile.am's: reorder libraries so static libs come first (fixes linking on W32) (cherry picked from commit f88bd88d6b4b318f9401fae595343c8b1bacf654)

14 years agoconfigure.in: don't look for X11 on W32 (cherry picked from commit 73730866ec198ac4c2...
Marc Mutz [Fri, 17 Apr 2009 18:02:36 +0000 (20:02 +0200)]
configure.in: don't look for X11 on W32 (cherry picked from commit 73730866ec198ac4c24dc69c9f62b4a3a2f05bf1)

14 years agoconfigure.in: add W32 extra libs (cherry picked from commit 909f2b23596247aaef4c59458...
Marc Mutz [Mon, 20 Apr 2009 12:08:23 +0000 (14:08 +0200)]
configure.in: add W32 extra libs (cherry picked from commit 909f2b23596247aaef4c5945853eebf607f7d329)

14 years agoWIN32: add versioninfo, and export symbols
Marc Mutz [Fri, 17 Apr 2009 12:07:25 +0000 (14:07 +0200)]
WIN32: add versioninfo, and export symbols

* dbus/versioninfo.rc.in: (new file) copied and modified from libgpg-error
 * configure.in: enable libtool's W32 support, extract version information
    for use in versioninfo.rc.in, define DBUS_WIN, define DBUS_UNIX only on
    unix (adapted from libgpg-error)
 * dbus/Makefile.am: switch sources depending on platform,
    compile versioninfo.rc, add dbus-1.def (not used since buildsystem creates
    its own .def file apparently)
(cherry picked from commit cfa717ddb7b9258a862d87cd5b3bdbe582ce106c)

14 years agofixed DBUS_VA_COPY for msvc
Ralf Habacker [Mon, 30 Nov 2009 15:01:19 +0000 (16:01 +0100)]
fixed DBUS_VA_COPY for msvc

14 years agouse dbus provided wait function
Ralf Habacker [Mon, 30 Nov 2009 14:59:40 +0000 (15:59 +0100)]
use dbus provided wait function

14 years agokeep in sync with source
Ralf Habacker [Mon, 30 Nov 2009 13:08:30 +0000 (14:08 +0100)]
keep in sync with source

14 years ago_dbus_get_install_root assumes that dbus-daemon is in a bin/ subdirectory. That's...
Frank Osterfeld [Wed, 29 Apr 2009 16:03:32 +0000 (18:03 +0200)]
_dbus_get_install_root assumes that dbus-daemon is in a bin/ subdirectory. That's not a common directory structure on windows, so weaken the assumption: $somepath/bin/dbus-daemon.exe -> $somepath $somepath/dbus-daemon.exe, where somepath doesn't end in /bin/: -> $somepath i.e., use dbus-daemon.exe's directory as root if that directory is not a "bin" directory (cherry picked from commit 2d2055b2fa7f92c144e9a182a9a091ebe5215d7d)

14 years agodefine _DEBUG for debug builds (cherry picked from commit 3e261c022623306d4dba0cb11fa...
Frank Osterfeld [Thu, 30 Apr 2009 09:02:07 +0000 (10:02 +0100)]
define _DEBUG for debug builds (cherry picked from commit 3e261c022623306d4dba0cb11fa342abff61aee9)

14 years agodo not run test binaries as unit tests if they aren't unit tests (cherry picked from...
Frank Osterfeld [Thu, 30 Apr 2009 08:16:42 +0000 (10:16 +0200)]
do not run test binaries as unit tests if they aren't unit tests (cherry picked from commit 5281f5b113bd97152d1c9eac050432bda3274748)

14 years agodbus/dbus-sysdeps-win.c: _dbus_windows_user_is_process_owner belongs to -util-win...
Tor Lillqvist [Wed, 22 Apr 2009 14:49:00 +0000 (16:49 +0200)]
dbus/dbus-sysdeps-win.c: _dbus_windows_user_is_process_owner belongs to -util-win.c (cherry picked from commit 952caf475334b7c38084d4a992abef3f4e0d4cfb)

14 years agodbus/dbus-sysdeps-util-win.c: use GetFileAttributes instead of CreateFile in _dbus_fi...
Tor Lillqvist [Wed, 22 Apr 2009 14:35:43 +0000 (16:35 +0200)]
dbus/dbus-sysdeps-util-win.c: use GetFileAttributes instead of CreateFile in _dbus_file_exists (cherry picked from commit 3ba582b91361785c3eb0121e8b9e85d046eea75f)

14 years agodbus/dbus-sysdeps-win.c: tighter "scoping" for alternate _dbus_poll implementations...
Tor Lillqvist [Wed, 22 Apr 2009 13:28:58 +0000 (15:28 +0200)]
dbus/dbus-sysdeps-win.c: tighter "scoping" for alternate _dbus_poll implementations (cherry picked from commit 6828a25073c16fb5af55c4aaf16a08eb90e4676d)

14 years agokeep def file in sync with source
Ralf Habacker [Mon, 30 Nov 2009 12:30:12 +0000 (13:30 +0100)]
keep def file in sync with source

14 years agoremoved duplicated implementation
Ralf Habacker [Mon, 30 Nov 2009 12:24:42 +0000 (13:24 +0100)]
removed duplicated implementation

14 years agodbus/dbus-sysdeps-util-win.c: remove unused str*_s definitions (cherry picked from...
Tor Lillqvist [Wed, 22 Apr 2009 14:16:53 +0000 (16:16 +0200)]
dbus/dbus-sysdeps-util-win.c: remove unused str*_s definitions (cherry picked from commit 373214317c33031547f3788cffed8a832142fc43)

14 years agodbus/dbus-sysdeps-*win.c: remove #undef open, which has no effect (cherry picked...
Tor Lillqvist [Wed, 22 Apr 2009 11:54:10 +0000 (13:54 +0200)]
dbus/dbus-sysdeps-*win.c: remove #undef open, which has no effect (cherry picked from commit 737e3782cd16424a6f1b941b64867178bb5634be)

14 years agodbus/dbus-sysdeps-win.h: move declarations into .c (used nowhere else) (cherry picked...
Tor Lillqvist [Wed, 22 Apr 2009 11:37:38 +0000 (13:37 +0200)]
dbus/dbus-sysdeps-win.h: move declarations into .c (used nowhere else) (cherry picked from commit 0ea30b511e5b099c43bfdf2cbff0f3935917e057)

14 years agodbus/dbus-sysdeps-win.c: add _dbus_win_error_string, and use after MoveFileEx instead...
Tor Lillqvist [Wed, 22 Apr 2009 11:35:11 +0000 (13:35 +0200)]
dbus/dbus-sysdeps-win.c: add _dbus_win_error_string, and use after MoveFileEx instead of _dbus_error_from_errno (cherry picked from commit 1d0b2dacf52faffbeba09af2b309683ccc71547a)

14 years agodbus/dbus-sysdeps-win.c: use MoveFileEx, not unlink+rename, in _dbus_string_save_to_f...
Tor Lillqvist [Wed, 22 Apr 2009 11:32:29 +0000 (13:32 +0200)]
dbus/dbus-sysdeps-win.c: use MoveFileEx, not unlink+rename, in _dbus_string_save_to_file (cherry picked from commit c31bb3c262db1e6e42ec1bc9a6e8063c625a7cb2)

14 years agodbus/dbus-sysdeps-win.c: use GetTempPath, not getenv, in _dbus_get_tmpdir (cherry...
Tor Lillqvist [Wed, 22 Apr 2009 11:27:44 +0000 (13:27 +0200)]
dbus/dbus-sysdeps-win.c: use GetTempPath, not getenv, in _dbus_get_tmpdir (cherry picked from commit c2366c5410149e896cb56c3d17bb995308e18292)

14 years agodbus/dbus-sysdeps-win.c: _dbus_getpid() returns dbus_pid_t (cherry picked from commit...
Tor Lillqvist [Wed, 22 Apr 2009 10:26:04 +0000 (12:26 +0200)]
dbus/dbus-sysdeps-win.c: _dbus_getpid() returns dbus_pid_t (cherry picked from commit 40a01bf6d2c6d216093d309ca4c48602a585960b)

14 years agodbus/dbus-sysdeps-win.c: set an error when _close fails in _dbus_pipe_close (cherry...
Tor Lillqvist [Wed, 22 Apr 2009 10:24:40 +0000 (12:24 +0200)]
dbus/dbus-sysdeps-win.c: set an error when _close fails in _dbus_pipe_close (cherry picked from commit 6671b4a20da468bad6842815a1161a98251b66fc)

14 years agodbus/dbus-sysdeps-win.c: Use CryptoApi to get random numbers (cherry picked from...
Tor Lillqvist [Wed, 22 Apr 2009 10:22:33 +0000 (12:22 +0200)]
dbus/dbus-sysdeps-win.c: Use CryptoApi to get random numbers (cherry picked from commit 5f7ae46398818200b3fdcdfe80b78bee31a3e89b)

14 years agodbus/dbus-sysdeps-*win.c: remove DBusFile abstraction (cherry picked from commit...
Tor Lillqvist [Wed, 22 Apr 2009 10:17:35 +0000 (12:17 +0200)]
dbus/dbus-sysdeps-*win.c: remove DBusFile abstraction (cherry picked from commit 2895660b0e683d71dd51911819c0f31aff8517c3)

14 years agodbus/dbus-sysdeps-win.c: #define socklen_t -> typedef (cherry picked from commit...
Tor Lillqvist [Wed, 22 Apr 2009 09:54:24 +0000 (11:54 +0200)]
dbus/dbus-sysdeps-win.c: #define socklen_t -> typedef (cherry picked from commit eb104f4573fcbcbf3a87d673a023b5db4a249867)

14 years agodbus/dbus-sysdeps-win.h: add _dbus_win_get_dll-module (cherry picked from commit...
Tor Lillqvist [Wed, 22 Apr 2009 08:48:59 +0000 (10:48 +0200)]
dbus/dbus-sysdeps-win.h: add _dbus_win_get_dll-module (cherry picked from commit da5e8e14029cb64a65fe482e232be1d786a8ee19)

14 years agodbus/dbus-spawn-win.c: implement missing _dbus_babysitter_get_child_exit_status ...
Tor Lillqvist [Wed, 22 Apr 2009 08:11:27 +0000 (10:11 +0200)]
dbus/dbus-spawn-win.c: implement missing _dbus_babysitter_get_child_exit_status (cherry picked from commit 7a9863b9847380dbb8400f895934d7f282ebdbf2)

14 years agodbus/dbus-internals.c: "#define inline" is only needed on MSVC, not mingw (cherry...
Tor Lillqvist [Wed, 22 Apr 2009 08:08:41 +0000 (10:08 +0200)]
dbus/dbus-internals.c: "#define inline" is only needed on MSVC, not mingw (cherry picked from commit 314e91e3ee2566477918a51dbddd9eb141b33a23)

14 years ago_dbus_verbose_real: (optionally) use OutputDebugString() (cherry picked from commit...
Ralf Habacker [Tue, 6 Jan 2009 13:01:20 +0000 (13:01 +0000)]
_dbus_verbose_real: (optionally) use OutputDebugString() (cherry picked from commit fd6d354c47b4b8dc24ce32e31171568a8704e7d1)

14 years agoadded DBUS_USE_OUTPUT_DEBUG_STRING option
Ralf Habacker [Mon, 30 Nov 2009 12:10:38 +0000 (13:10 +0100)]
added DBUS_USE_OUTPUT_DEBUG_STRING option

14 years agodbus/dbus-internals.h: 2x const char foo[] -> const char foo * (cherry picked from...
Tor Lillqvist [Wed, 22 Apr 2009 08:07:47 +0000 (10:07 +0200)]
dbus/dbus-internals.h: 2x const char foo[] -> const char foo * (cherry picked from commit 62eaf8c91160abdeab6a46bb7bff737e13a390cf)

14 years agodbus/dbus-transport.c: _dbus_credentials_get_windows_sid might return NULL (cherry...
Tor Lillqvist [Wed, 22 Apr 2009 07:42:01 +0000 (09:42 +0200)]
dbus/dbus-transport.c: _dbus_credentials_get_windows_sid might return NULL (cherry picked from commit 8d8d5fa1babc8f51f1d1bb95b8116850978c60d9)

14 years agodbus/dbus-transport.c: fix {our,auth}_identity mismatch (cherry picked from commit...
Tor Lillqvist [Wed, 22 Apr 2009 07:40:35 +0000 (09:40 +0200)]
dbus/dbus-transport.c: fix {our,auth}_identity mismatch (cherry picked from commit e15f1cde3b5893357f640e360f64c0a1ae37f93b)

14 years agocompleted notes
Ralf Habacker [Mon, 30 Nov 2009 11:14:24 +0000 (12:14 +0100)]
completed notes

14 years agotools/dbus-launch-win.c: TODO++ (cherry picked from commit 0f5dbec6407975d6a93fbb2cbc...
Tor Lillqvist [Wed, 22 Apr 2009 07:30:23 +0000 (09:30 +0200)]
tools/dbus-launch-win.c: TODO++ (cherry picked from commit 0f5dbec6407975d6a93fbb2cbcd58ab192961cf8)

14 years agodbus/dbus-connection.c: use dbus_message_type_to_string instead of printing the naked...
Tor Lillqvist [Wed, 22 Apr 2009 07:20:04 +0000 (09:20 +0200)]
dbus/dbus-connection.c: use dbus_message_type_to_string instead of printing the naked message type (cherry picked from commit 33d858e83e3cb1f55ed257ffef930b8f49c3ffc7)

14 years agoFix broken Windows implementation of _dbus_printf_string_upper_bound().
Ole André Vadla Ravnås [Sun, 29 Mar 2009 00:44:44 +0000 (01:44 +0100)]
Fix broken Windows implementation of _dbus_printf_string_upper_bound().

Pass the correct buffer size when trying again, and keep trying with
larger buffer sizes, doubling the size each time.
(cherry picked from commit 95832a94607eea609de994467b7d64e36af72e6b)

14 years agoUse CreateDirectory() instead of complicating things.
Ole André Vadla Ravnås [Sun, 29 Mar 2009 00:20:02 +0000 (01:20 +0100)]
Use CreateDirectory() instead of complicating things.

This is Windows sysdeps after all, and _dbus_mkdir() wasn't used anywhere else.
(cherry picked from commit 0bbe3787ce1e9e992f2bcbbdfcab1dcdb0b41f24)

14 years agoRemove a misleading comment.
Ole André Vadla Ravnås [Sun, 29 Mar 2009 00:06:54 +0000 (01:06 +0100)]
Remove a misleading comment.

errno.h is present and needed on Windows. (It's not present on Windows CE though.)
(cherry picked from commit cef676c0c7ea8ad352e1ecf1c3643edb1abd7ad6)

14 years agoAdd missing stdio.h include needed for _vsnprintf(). (cherry picked from commit dddd4...
Ole André Vadla Ravnås [Sat, 28 Mar 2009 23:49:34 +0000 (00:49 +0100)]
Add missing stdio.h include needed for _vsnprintf(). (cherry picked from commit dddd412402657fa5ac6de225e8d5a00fb290589c)

14 years agoOnly define _WIN32_WINNT if not already defined. (cherry picked from commit 98bb07181...
Ole André Vadla Ravnås [Sat, 28 Mar 2009 23:47:42 +0000 (00:47 +0100)]
Only define _WIN32_WINNT if not already defined. (cherry picked from commit 98bb071819ab9f886317627b6688876f40ed694e)

14 years agotools/dbus-launch-win.c: strrchr -> _mbsrchr (cherry picked from commit b8b9fc300242f...
Tor Lillqvist [Wed, 22 Apr 2009 07:29:45 +0000 (09:29 +0200)]
tools/dbus-launch-win.c: strrchr -> _mbsrchr (cherry picked from commit b8b9fc300242ff25071df4166173baae7d2b4f0f)

14 years agoFix DBusMessage compiler warnings by adding some missing casts.
Ole André Vadla Ravnås [Sat, 28 Mar 2009 23:39:29 +0000 (00:39 +0100)]
Fix DBusMessage compiler warnings by adding some missing casts.

Basically the case where the address of a const pointer is passed as a non-const void pointer.
(cherry picked from commit dab3ec2abe7fbeea4dab873c8575a45b3b18882d)

14 years agodbus/dbus-sysdeps-util-win.c: DBUS_WIN is always defined here (cherry picked from...
Tor Lillqvist [Wed, 22 Apr 2009 07:53:11 +0000 (09:53 +0200)]
dbus/dbus-sysdeps-util-win.c: DBUS_WIN is always defined here (cherry picked from commit 1046f3b0eb57ef746aaff3a8da87020bb1b19a44)

14 years agotools/dbus-launch-win.c: fix typo (cherry picked from commit 81a7a0e9309e5929857fdf44...
Tor Lillqvist [Wed, 22 Apr 2009 07:31:26 +0000 (09:31 +0200)]
tools/dbus-launch-win.c: fix typo (cherry picked from commit 81a7a0e9309e5929857fdf44b8b51a4f8df097e6)

14 years agofix warning, use Sleep, not _sleep on windows (cherry picked from commit ea36c743ad60...
Frank Osterfeld [Sun, 3 May 2009 18:52:48 +0000 (19:52 +0100)]
fix warning, use Sleep, not _sleep on windows (cherry picked from commit ea36c743ad60a2dd5c6286571d1a475903519809)

14 years agodefine DBUS_BUILD_TESTS only if the option is enabled (cherry picked from commit...
Frank Osterfeld [Wed, 29 Apr 2009 11:22:44 +0000 (13:22 +0200)]
define DBUS_BUILD_TESTS only if the option is enabled (cherry picked from commit 46c3a4e653c17c1daaabf164663856f373330f29)

14 years agofix TEST_SOCKET_DIR on windows, do not override value from top-level in test/ (cherry...
Frank Osterfeld [Tue, 28 Apr 2009 17:12:09 +0000 (18:12 +0100)]
fix TEST_SOCKET_DIR on windows, do not override value from top-level in test/ (cherry picked from commit fde144333281348cda2d533331946996d7a09bff)

14 years agodisable launch-helper on windows for now until it builds (cherry picked from commit...
Frank Osterfeld [Tue, 28 Apr 2009 14:45:03 +0000 (15:45 +0100)]
disable launch-helper on windows for now until it builds (cherry picked from commit 48da3a0450172f711c25a459ce70c2521d22ee27)

14 years agobus-test-launch-helper is a unit test, test-service and test-shell-service are not...
Frank Osterfeld [Tue, 28 Apr 2009 14:14:13 +0000 (16:14 +0200)]
bus-test-launch-helper is a unit test, test-service and test-shell-service are not. Rename test-shell to shell-test to match autotools (cherry picked from commit b106387b73d6a300a013a15f6507244e82f007ed)

14 years agoUse correct sources to build test-shell-service, fixes a hang in bus-test (cherry...
Frank Osterfeld [Tue, 28 Apr 2009 13:46:19 +0000 (15:46 +0200)]
Use correct sources to build test-shell-service, fixes a hang in bus-test (cherry picked from commit 0afe04db5152b57582863bef83a55d78020a79c6)

14 years agoremoved obsolate files
Ralf Habacker [Mon, 30 Nov 2009 10:28:37 +0000 (11:28 +0100)]
removed obsolate files

14 years agocleanup: these files are already generated elsewhere (cherry picked from commit 21f66...
Frank Osterfeld [Tue, 28 Apr 2009 08:19:47 +0000 (10:19 +0200)]
cleanup: these files are already generated elsewhere (cherry picked from commit 21f66df24affd4a4d2fb3324fb51899c811530da)

14 years agorename test-spawn to spawn-test, to match autotools. test-sleep-forever is not a...
Frank Osterfeld [Tue, 28 Apr 2009 09:26:05 +0000 (11:26 +0200)]
rename test-spawn to spawn-test, to match autotools. test-sleep-forever is not a stand-alone test but called from other tests (cherry picked from commit 41bf95167cfc17b564594eab0a1901e46eaab5fe)

14 years agofix test and binary names (cherry picked from commit 18bcf5f2d474456c57cd94da234005a2...
Frank Osterfeld [Tue, 28 Apr 2009 09:08:31 +0000 (11:08 +0200)]
fix test and binary names (cherry picked from commit 18bcf5f2d474456c57cd94da234005a23e2589a7)

14 years agorename second test-names to test-names2 to avoid confusion (cherry picked from commit...
Frank Osterfeld [Tue, 28 Apr 2009 09:02:29 +0000 (11:02 +0200)]
rename second test-names to test-names2 to avoid confusion (cherry picked from commit c83a2d79bb215b19b02987c9a45ed1bf07e5eeaf)

14 years agobuild dbus-daemon-launch-helper-test and friends set all TEST vars needed for the...
Frank Osterfeld [Mon, 27 Apr 2009 19:21:02 +0000 (21:21 +0200)]
build dbus-daemon-launch-helper-test and friends set all TEST vars needed for the .in files (cherry picked from commit fcd9ba392927b0433e5e037d393230774edae303)

14 years agodo not add d suffix on non-windows (cherry picked from commit 27980491d3cac6166c30c4a...
Frank Osterfeld [Mon, 27 Apr 2009 18:52:52 +0000 (20:52 +0200)]
do not add d suffix on non-windows (cherry picked from commit 27980491d3cac6166c30c4adc2c71d80c3e4e13a)

14 years agogenerate all config files from the .in files. Set some of the required variables...
Frank Osterfeld [Mon, 27 Apr 2009 15:58:45 +0000 (17:58 +0200)]
generate all config files from the .in files. Set some of the required variables replaced in the .in files by configure_file (cherry picked from commit 4980ffa1093877af182e032a13f6162df57be09f)

14 years agouse CMAKE_BUILD_TYPE to differ between debug and release. (cherry picked from commit...
Sebastian Sauer [Mon, 27 Apr 2009 15:06:37 +0000 (17:06 +0200)]
use CMAKE_BUILD_TYPE to differ between debug and release. (cherry picked from commit 212268933438f3340e5c95905a2845d30cab1dd7)

14 years agouse correct test data dir (cherry picked from commit ef471a74068b198ed10fe2a377520aa6...
Frank Osterfeld [Mon, 27 Apr 2009 14:12:50 +0000 (16:12 +0200)]
use correct test data dir (cherry picked from commit ef471a74068b198ed10fe2a377520aa6a68b8370)

14 years agodon't leak string list in error case (cherry picked from commit e4f39254976544781f106...
Frank Osterfeld [Wed, 22 Apr 2009 14:26:06 +0000 (15:26 +0100)]
don't leak string list in error case (cherry picked from commit e4f39254976544781f1060c2051b10f32628408e)

14 years agoadd check for abstract sockets (cherry picked from commit 5b657984f4bc5544a8df560adcd...
Frank Osterfeld [Wed, 22 Apr 2009 09:49:58 +0000 (11:49 +0200)]
add check for abstract sockets (cherry picked from commit 5b657984f4bc5544a8df560adcd224ed243972f1)

14 years agobe more verbose when locking the mutex fails (cherry picked from commit 4a14a050c4be0...
Frank Osterfeld [Wed, 22 Apr 2009 11:49:45 +0000 (12:49 +0100)]
be more verbose when locking the mutex fails (cherry picked from commit 4a14a050c4be026c7b9d67fd1f47c8479edebfc4)

14 years agodo not call functions with side-effects inside assert (cherry picked from commit...
Frank Osterfeld [Tue, 21 Apr 2009 15:21:06 +0000 (16:21 +0100)]
do not call functions with side-effects inside assert (cherry picked from commit 0d0f443564403fedffd0450bed377230511ba0d7)

14 years agofix configure check and VA_COPY usage
Frank Osterfeld [Tue, 28 Apr 2009 15:10:46 +0000 (17:10 +0200)]
fix configure check and VA_COPY usage

* fix configure check: set DBUS_VA_COPY_FUNC correctly, and DBUS_VA_COPY_AS_ARRAY if no usable one was found
* add DBUS_VA_COPY_AS_ARRAY
* define DBUS_VA_COPY indirectly, cmakedefine plus variable does not work for me on windows, and is the wrong thing to do according to Allen. The undef seems unnecessary now, the address parsing test passes on windows, using mingw
(cherry picked from commit e6680d78d943be4ee2d85e9d82cd8aa1350db882)

14 years agoset -DDBUS_BUILD_TESTS remove -g, it's already set via CMAKE_BUILD_TYPE (cherry picke...
Frank Osterfeld [Thu, 23 Apr 2009 10:16:49 +0000 (12:16 +0200)]
set -DDBUS_BUILD_TESTS remove -g, it's already set via CMAKE_BUILD_TYPE (cherry picked from commit 0dc4c572cf94edf81e0a2460d0aa82ca32eb24d7)

14 years agobuild fixes for tests on unix (cherry picked from commit 99f567e97f807a1270d01f972239...
Frank Osterfeld [Thu, 23 Apr 2009 10:15:33 +0000 (12:15 +0200)]
build fixes for tests on unix (cherry picked from commit 99f567e97f807a1270d01f97223941acd279dbf8)

14 years agomerge changes done to the cmake-buildsystem from the sf.net windbus-svn trunk. tested...
Christian Ehrlicher [Fri, 24 Apr 2009 09:36:50 +0000 (11:36 +0200)]
merge changes done to the cmake-buildsystem from the sf.net windbus-svn trunk. tested and works fine with at least msvc2008. (cherry picked from commit 45c168fd61e3f6447e014df4bb6417efbe725ccd)

14 years agofix deadlock when dbus-daemon could not start up
Christian Ehrlicher [Mon, 27 Apr 2009 11:41:48 +0000 (13:41 +0200)]
fix deadlock when dbus-daemon could not start up

windbus:r811: apply patch by Thorvald Natvig to fix endless loop when _dbus_get_autolaunch_shm got called and the dbus-daemon failed to start up.
* if launching for some reason fails, set an error message
* _dbus_get_autolaunch_shm will abort getting the shared memory after 20 attempts (2 seconds)
* _dbus_get_autolaunch_address checks if the return state of WaitForInputIdle before calling _dbus_get_autolaunch_shm.

windbus:r812: remove WaitForInputIdle as it doesn't work in non-console mode
(cherry picked from commit 363fd736556219bad77c4b217e051b7983dc34e9)

14 years agoall changes for dbus-1.2 API (cherry picked from commit 6734a3210a0705e3ab01ee123fac2...
Christian Ehrlicher [Mon, 30 Nov 2009 09:23:54 +0000 (10:23 +0100)]
all changes for dbus-1.2 API (cherry picked from commit 6734a3210a0705e3ab01ee123fac275799877353)

14 years agopatch from Thorvald Natvig to fix a copy+paste error that could result in a dangling...
Christian Ehrlicher [Fri, 24 Apr 2009 14:15:36 +0000 (16:15 +0200)]
patch from Thorvald Natvig to fix a copy+paste error that could result in a dangling handle at windows.

based on windbus:r773
 (cherry picked from commit 97d0f058527c62ce3a2203b1632e742b10d5b7a9)

14 years agono fake lock under Windows (cherry picked from commit 62cb039e40811a5881ee8dcc37c9710...
Peter Kümmel [Tue, 21 Nov 2006 19:51:13 +0000 (19:51 +0000)]
no fake lock under Windows (cherry picked from commit 62cb039e40811a5881ee8dcc37c97103a848f74d)

14 years agouse dbus_watch_get_socket in dbus_watch_get_unix_fd on windows (cherry picked from...
Christian Ehrlicher [Tue, 28 Apr 2009 14:29:49 +0000 (16:29 +0200)]
use dbus_watch_get_socket in dbus_watch_get_unix_fd on windows (cherry picked from commit c15206da8e56e32c7de98824d8d2c38a7d92c707)

14 years agoremove an assert for windows only - don't know why this was added... (cherry picked...
Christian Ehrlicher [Fri, 17 Apr 2009 12:37:41 +0000 (14:37 +0200)]
remove an assert for windows only - don't know why this was added... (cherry picked from commit a248de6b733f4a3a78f6646174d899ba2058395e)

14 years agohide console when autostarting dbus-daemon (cherry picked from commit 27fad960837b54b...
Ralf Habacker [Mon, 24 Dec 2007 08:42:31 +0000 (08:42 +0000)]
hide console when autostarting dbus-daemon (cherry picked from commit 27fad960837b54b6e47f408e6d1eecea1bee563f)

14 years agodbus/dbus-sysdeps-win.c: fix linking with mingw32
Marc Mutz [Mon, 20 Apr 2009 13:07:06 +0000 (15:07 +0200)]
dbus/dbus-sysdeps-win.c: fix linking with mingw32

* freeaddrinfo/getaddrinfo need _WIN32_WINNT to be 0x050_1_
(cherry picked from commit fa1f38452fafb841b7e2b36c7ca8918f9bde408f)

14 years agoInclude <stdlib.h> for envion on Windows (cherry picked from commit 5874d104f52a0ef4d...
Christian Ehrlicher [Mon, 27 Apr 2009 12:34:45 +0000 (14:34 +0200)]
Include <stdlib.h> for envion on Windows (cherry picked from commit 5874d104f52a0ef4d956ab56376776d3e385072f)

14 years agomsvc 8 compile++ and removed some stupid casts (cherry picked from commit 8c635b4a394...
Christian Ehrlicher [Wed, 1 Aug 2007 11:17:46 +0000 (11:17 +0000)]
msvc 8 compile++ and removed some stupid casts (cherry picked from commit 8c635b4a3944bcabc479718946e2a033d4c01489)

14 years agomingw compile++ , w2k-support++
Christian Ehrlicher [Fri, 9 May 2008 16:17:13 +0000 (16:17 +0000)]
mingw compile++ , w2k-support++

dbus/dbus-sysdeps-win.c: Don't unconditionally #include <wspiapi.h>

 * cmake/ConfigureChecks.cmake, cmake/config.h.cmake, configure.in:
   check for wspiapi.h presence which isn't available (and unneeded) in mingw32
 * dbus/dbus-sysdeps-win.c: use HAVE_WSPIAPI_H

15 years agoMerge branch 'monitor-ay-output'
Will Thompson [Thu, 5 Nov 2009 11:17:13 +0000 (11:17 +0000)]
Merge branch 'monitor-ay-output'

15 years agoPrint all-printable-ASCII byte arrays as strings
Will Thompson [Wed, 28 Oct 2009 19:40:38 +0000 (19:40 +0000)]
Print all-printable-ASCII byte arrays as strings

In practice, ay seems to be used mostly for binary data (in which case,
hex output is fine) or for Unix file paths (because they may be
non-UTF-8) and similar human-readable strings. So let's print the latter
similarly to strings.

15 years agoPrint byte arrays as nicely-formatted hex.
Will Thompson [Wed, 9 Sep 2009 19:58:53 +0000 (20:58 +0100)]
Print byte arrays as nicely-formatted hex.

15 years agoAdd an accessor for the loader's corruption reason
Will Thompson [Sat, 8 Aug 2009 13:29:12 +0000 (14:29 +0100)]
Add an accessor for the loader's corruption reason

15 years agoInclude reason when reporting corrupt messages
Will Thompson [Sat, 8 Aug 2009 12:57:11 +0000 (13:57 +0100)]
Include reason when reporting corrupt messages

It would have been much easier to diagnose fd.o#19723 if the error
message had said more than just "Message is corrupted".

15 years agoForbid zero serial numbers
Will Thompson [Sat, 8 Aug 2009 13:03:46 +0000 (14:03 +0100)]
Forbid zero serial numbers

15 years agoMake array-printing code easier to follow
Will Thompson [Wed, 9 Sep 2009 19:35:13 +0000 (20:35 +0100)]
Make array-printing code easier to follow

Previously dbus_message_iter_get_arg_type() was called twice: once in
the loop condition to update 'current_type', and once to check if the
loop will run again. This patch moves updating current_type to the end
of the loop body.

15 years agoCorrect timeout handling
James Westby [Thu, 1 Oct 2009 14:09:54 +0000 (15:09 +0100)]
Correct timeout handling

The timeout handling code subtracts the elapsed time from the timeout
each time a message is received, which drastically reduces the timeout
in circumstances such as service activation.

Correct so that the timeout is never modified, and the elapsed time
instead subtracted where necessary.

Signed-off-by: James Westby <jw+debian@jameswestby.net>
Signed-off-by: Scott James Remnant <scott@ubuntu.com>
15 years agoFix compilation on non-Linux: the F_DUPFD_CLOEXEC check was reversed
Benjamin Reed [Wed, 22 Jul 2009 12:47:51 +0000 (08:47 -0400)]
Fix compilation on non-Linux: the F_DUPFD_CLOEXEC check was reversed

Signed-off-by: Thiago Macieira <thiago@kde.org>