Tor Lillqvist
ef86bcedc8
dbus/dbus-transport.c: fix {our,auth}_identity mismatch (cherry picked from commit e15f1cde3b5893357f640e360f64c0a1ae37f93b)
2009-11-30 12:21:26 +01:00
Ralf Habacker
85efbce5d6
completed notes
2009-11-30 12:14:24 +01:00
Tor Lillqvist
b5c8483f44
tools/dbus-launch-win.c: TODO++ (cherry picked from commit 0f5dbec6407975d6a93fbb2cbcd58ab192961cf8)
2009-11-30 12:04:59 +01:00
Tor Lillqvist
2ca591df21
dbus/dbus-connection.c: use dbus_message_type_to_string instead of printing the naked message type (cherry picked from commit 33d858e83e3cb1f55ed257ffef930b8f49c3ffc7)
2009-11-30 12:04:58 +01:00
Ole André Vadla Ravnås
29e8f9917a
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)
2009-11-30 12:04:58 +01:00
Ole André Vadla Ravnås
91f5972fa1
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)
2009-11-30 12:00:20 +01:00
Ole André Vadla Ravnås
f2b62600dc
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)
2009-11-30 12:00:19 +01:00
Ole André Vadla Ravnås
93e213f332
Add missing stdio.h include needed for _vsnprintf(). (cherry picked from commit dddd412402657fa5ac6de225e8d5a00fb290589c)
2009-11-30 12:00:18 +01:00
Ole André Vadla Ravnås
b3da5a03a9
Only define _WIN32_WINNT if not already defined. (cherry picked from commit 98bb071819ab9f886317627b6688876f40ed694e)
2009-11-30 12:00:18 +01:00
Tor Lillqvist
14aca8b73b
tools/dbus-launch-win.c: strrchr -> _mbsrchr (cherry picked from commit b8b9fc300242ff25071df4166173baae7d2b4f0f)
2009-11-30 12:00:17 +01:00
Ole André Vadla Ravnås
2d0c9d37de
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)
2009-11-30 12:00:16 +01:00
Tor Lillqvist
5d0f9cc833
dbus/dbus-sysdeps-util-win.c: DBUS_WIN is always defined here (cherry picked from commit 1046f3b0eb57ef746aaff3a8da87020bb1b19a44)
2009-11-30 12:00:15 +01:00
Tor Lillqvist
73749944e3
tools/dbus-launch-win.c: fix typo (cherry picked from commit 81a7a0e9309e5929857fdf44b8b51a4f8df097e6)
2009-11-30 12:00:14 +01:00
Frank Osterfeld
fa2a53309d
fix warning, use Sleep, not _sleep on windows (cherry picked from commit ea36c743ad60a2dd5c6286571d1a475903519809)
2009-11-30 12:00:14 +01:00
Frank Osterfeld
e31af7aa81
define DBUS_BUILD_TESTS only if the option is enabled (cherry picked from commit 46c3a4e653c17c1daaabf164663856f373330f29)
2009-11-30 11:39:24 +01:00
Frank Osterfeld
9f36b6760c
fix TEST_SOCKET_DIR on windows, do not override value from top-level in test/ (cherry picked from commit fde144333281348cda2d533331946996d7a09bff)
2009-11-30 11:39:23 +01:00
Frank Osterfeld
c263a6dfff
disable launch-helper on windows for now until it builds (cherry picked from commit 48da3a0450172f711c25a459ce70c2521d22ee27)
2009-11-30 11:39:22 +01:00
Frank Osterfeld
c89d506700
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)
2009-11-30 11:39:21 +01:00
Frank Osterfeld
a4e65790ea
Use correct sources to build test-shell-service, fixes a hang in bus-test (cherry picked from commit 0afe04db5152b57582863bef83a55d78020a79c6)
2009-11-30 11:39:21 +01:00
Ralf Habacker
ed1c2fdd82
removed obsolate files
2009-11-30 11:28:37 +01:00
Frank Osterfeld
dbde622530
cleanup: these files are already generated elsewhere (cherry picked from commit 21f66df24affd4a4d2fb3324fb51899c811530da)
2009-11-30 11:26:13 +01:00
Frank Osterfeld
3baa9550f0
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)
2009-11-30 11:09:27 +01:00
Frank Osterfeld
b0efb6d156
fix test and binary names (cherry picked from commit 18bcf5f2d474456c57cd94da234005a23e2589a7)
2009-11-30 11:09:26 +01:00
Frank Osterfeld
aae3becbf3
rename second test-names to test-names2 to avoid confusion (cherry picked from commit c83a2d79bb215b19b02987c9a45ed1bf07e5eeaf)
2009-11-30 11:09:26 +01:00
Frank Osterfeld
7ce953f038
build dbus-daemon-launch-helper-test and friends set all TEST vars needed for the .in files (cherry picked from commit fcd9ba392927b0433e5e037d393230774edae303)
2009-11-30 11:09:25 +01:00
Frank Osterfeld
6e8fcdf889
do not add d suffix on non-windows (cherry picked from commit 27980491d3cac6166c30c4adc2c71d80c3e4e13a)
2009-11-30 11:09:24 +01:00
Frank Osterfeld
a7330a9673
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)
2009-11-30 11:09:23 +01:00
Sebastian Sauer
115891d376
use CMAKE_BUILD_TYPE to differ between debug and release. (cherry picked from commit 212268933438f3340e5c95905a2845d30cab1dd7)
2009-11-30 11:09:22 +01:00
Frank Osterfeld
8f15f6713b
use correct test data dir (cherry picked from commit ef471a74068b198ed10fe2a377520aa6a68b8370)
2009-11-30 11:09:21 +01:00
Frank Osterfeld
7a4b9293f3
don't leak string list in error case (cherry picked from commit e4f39254976544781f1060c2051b10f32628408e)
2009-11-30 11:09:20 +01:00
Frank Osterfeld
2feb3e2e65
add check for abstract sockets (cherry picked from commit 5b657984f4bc5544a8df560adcd224ed243972f1)
2009-11-30 10:54:32 +01:00
Frank Osterfeld
7fac18bd15
be more verbose when locking the mutex fails (cherry picked from commit 4a14a050c4be026c7b9d67fd1f47c8479edebfc4)
2009-11-30 10:50:22 +01:00
Frank Osterfeld
09078aa134
do not call functions with side-effects inside assert (cherry picked from commit 0d0f443564403fedffd0450bed377230511ba0d7)
2009-11-30 10:50:21 +01:00
Frank Osterfeld
ff92d15f94
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)
2009-11-30 10:50:20 +01:00
Frank Osterfeld
45f8e734af
set -DDBUS_BUILD_TESTS remove -g, it's already set via CMAKE_BUILD_TYPE (cherry picked from commit 0dc4c572cf94edf81e0a2460d0aa82ca32eb24d7)
2009-11-30 10:50:19 +01:00
Frank Osterfeld
eb96d81eca
build fixes for tests on unix (cherry picked from commit 99f567e97f807a1270d01f97223941acd279dbf8)
2009-11-30 10:50:18 +01:00
Christian Ehrlicher
4668480458
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)
2009-11-30 10:32:04 +01:00
Christian Ehrlicher
a83b7cb80c
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)
2009-11-30 10:32:04 +01:00
Christian Ehrlicher
722a90c9cb
all changes for dbus-1.2 API (cherry picked from commit 6734a3210a0705e3ab01ee123fac275799877353)
2009-11-30 10:23:54 +01:00
Christian Ehrlicher
e73985bb14
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)
2009-11-30 10:17:50 +01:00
Peter Kümmel
7c62f972f3
no fake lock under Windows (cherry picked from commit 62cb039e40811a5881ee8dcc37c97103a848f74d)
2009-11-30 10:17:50 +01:00
Christian Ehrlicher
54ebd0acd8
use dbus_watch_get_socket in dbus_watch_get_unix_fd on windows (cherry picked from commit c15206da8e56e32c7de98824d8d2c38a7d92c707)
2009-11-30 10:17:49 +01:00
Christian Ehrlicher
b40c43b8e2
remove an assert for windows only - don't know why this was added... (cherry picked from commit a248de6b733f4a3a78f6646174d899ba2058395e)
2009-11-29 19:35:34 +01:00
Ralf Habacker
2f19833cbf
hide console when autostarting dbus-daemon (cherry picked from commit 27fad960837b54b6e47f408e6d1eecea1bee563f)
2009-11-29 19:35:34 +01:00
Marc Mutz
ed3df419fe
dbus/dbus-sysdeps-win.c: fix linking with mingw32
...
* freeaddrinfo/getaddrinfo need _WIN32_WINNT to be 0x050_1_
(cherry picked from commit fa1f38452fafb841b7e2b36c7ca8918f9bde408f)
2009-11-29 19:32:47 +01:00
Christian Ehrlicher
443f7a036a
Include <stdlib.h> for envion on Windows (cherry picked from commit 5874d104f52a0ef4d956ab56376776d3e385072f)
2009-11-29 19:30:39 +01:00
Christian Ehrlicher
84401ec697
msvc 8 compile++ and removed some stupid casts (cherry picked from commit 8c635b4a3944bcabc479718946e2a033d4c01489)
2009-11-29 19:20:49 +01:00
Christian Ehrlicher
452ff68a2d
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
2009-11-29 19:06:22 +01:00
Will Thompson
8770f444fd
Merge branch 'monitor-ay-output'
2009-11-05 11:17:13 +00:00
Will Thompson
80f6ebfef5
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.
2009-11-04 09:27:53 +00:00
