fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-25 01:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
dbus/dbus-win.patch
Ralf Habacker c8e445c8c1 removed applied patches
2007-05-21 06:24:39 +00:00

613 lines
19 KiB
Diff
Raw Blame History

Index: bus/config-loader-expat.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-loader-expat.c,v
retrieving revision 1.10
diff -u -r1.10 config-loader-expat.c
--- bus/config-loader-expat.c 10 Aug 2004 03:06:59 -0000 1.10
+++ bus/config-loader-expat.c 8 Mar 2007 20:25:42 -0000
@@ -161,6 +161,9 @@
}
}
+#ifdef DBUS_WIN
+DBusString *_dbus_get_working_dir(void);
+#endif
BusConfigParser*
bus_config_load (const DBusString *file,
@@ -171,6 +174,9 @@
XML_Parser expat;
const char *filename;
BusConfigParser *parser;
+#ifdef DBUS_WIN
+ DBusString *dbusdir;
+#endif
ExpatParseContext context;
DBusString dirname;
@@ -209,6 +215,12 @@
goto failed;
}
+#ifdef DBUS_WIN
+ dbusdir = _dbus_get_working_dir();
+ if (dbusdir)
+ parser = bus_config_parser_new (dbusdir, is_toplevel, parent);
+ else
+#endif
parser = bus_config_parser_new (&dirname, is_toplevel, parent);
if (parser == NULL)
{
Index: bus/config-loader-libxml.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-loader-libxml.c,v
retrieving revision 1.8
diff -u -r1.8 config-loader-libxml.c
--- bus/config-loader-libxml.c 10 Aug 2004 03:06:59 -0000 1.8
+++ bus/config-loader-libxml.c 8 Mar 2007 20:25:40 -0000
@@ -134,6 +134,9 @@
}
}
+#ifdef DBUS_WIN
+ DBusString *_dbus_get_working_dir(void);
+#endif
BusConfigParser*
bus_config_load (const DBusString *file,
@@ -147,7 +150,9 @@
DBusString dirname, data;
DBusError tmp_error;
int ret;
-
+#ifdef DBUS_WIN
+ DBusString *dbusdir;
+#endif
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
parser = NULL;
@@ -177,13 +182,19 @@
xmlSetGenericErrorFunc (NULL, xml_shut_up);
}
+#ifdef DBUS_WIN
+ dbusdir = _dbus_get_working_dir();
+ if (dbusdir)
+ parser = bus_config_parser_new (dbusdir, is_toplevel, parent);
+ else
+#endif
if (!_dbus_string_get_dirname (file, &dirname))
{
_DBUS_SET_OOM (error);
goto failed;
}
-
parser = bus_config_parser_new (&dirname, is_toplevel, parent);
+
if (parser == NULL)
{
_DBUS_SET_OOM (error);
Index: bus/dispatch.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/dispatch.c,v
retrieving revision 1.79
diff -u -r1.79 dispatch.c
--- bus/dispatch.c 8 Mar 2007 08:30:17 -0000 1.79
+++ bus/dispatch.c 8 Mar 2007 20:25:42 -0000
@@ -34,7 +34,7 @@
#include "test.h"
#include <dbus/dbus-internals.h>
#include <string.h>
-
+
static dbus_bool_t
send_one_message (DBusConnection *connection,
BusContext *context,
@@ -428,6 +428,11 @@
}
}
+#ifdef DBUS_WIN
+#include <tools/dbus-print-message.h>
+#include <tools/dbus-print-message.c>
+#endif
+
static void
spin_connection_until_authenticated (BusContext *context,
DBusConnection *connection)
@@ -439,6 +444,19 @@
bus_test_run_bus_loop (context, FALSE);
bus_test_run_clients_loop (FALSE);
}
+#ifdef DBUS_WIN
+ if ( dbus_connection_get_dispatch_status(connection) != DBUS_DISPATCH_COMPLETE)
+ {
+ DBusMessage *message;
+ message = dbus_connection_pop_message (connection);
+ printf ("spin_connection_until_authenticated failed,\n");
+ printf ("because of a non dispatched message:\n");
+ print_message(message, FALSE);
+ printf ("\n");
+ _dbus_assert_not_reached ("spin_connection_until_authenticated failed\n ");
+ }
+#endif
+
_dbus_verbose (" ... done spinning to auth connection %p\n", connection);
}
@@ -2699,9 +2717,12 @@
}
else
{
+/* no DBUS_ERROR_NO_MEMORY on windows (no have_fork_errnum)*/
+#ifndef DBUS_WIN_FIXME
warn_unexpected (connection, message, "not this error");
goto out;
+#endif
}
}
else
@@ -2812,7 +2833,7 @@
return retval;
}
#endif
-
+
#define TEST_ECHO_MESSAGE "Test echo message"
#define TEST_RUN_HELLO_FROM_SELF_MESSAGE "Test sending message to self"
@@ -4064,29 +4085,36 @@
_dbus_assert_not_reached ("initial connection setup failed");
}
+#ifdef DBUS_WIN_FIXME
+ _dbus_warn("TODO: dispatch.c create_and_hello test\n");
+#else
check1_try_iterations (context, "create_and_hello",
check_hello_connection);
+#endif
check2_try_iterations (context, foo, "nonexistent_service_no_auto_start",
check_nonexistent_service_no_auto_start);
-#ifdef DBUS_WIN_FIXME
+#ifdef DBUS_WIN_FIXME
_dbus_warn("TODO: dispatch.c segfault_service_no_auto_start test\n");
#else
check2_try_iterations (context, foo, "segfault_service_no_auto_start",
check_segfault_service_no_auto_start);
#endif
+#ifdef DBUS_WIN_FIXME
+ _dbus_warn("TODO: dispatch.c existent_service_no_auto_start\n");
+#else
check2_try_iterations (context, foo, "existent_service_no_auto_start",
check_existent_service_no_auto_start);
check2_try_iterations (context, foo, "nonexistent_service_auto_start",
check_nonexistent_service_auto_start);
-
+#endif
#ifdef DBUS_WIN_FIXME
_dbus_warn("TODO: dispatch.c segfault_service_auto_start test\n");
-#else
+#else
check2_try_iterations (context, foo, "segfault_service_auto_start",
check_segfault_service_auto_start);
#endif
@@ -4106,8 +4134,12 @@
if (!check_existent_service_auto_start (context, foo))
_dbus_assert_not_reached ("existent service auto start failed");
+#ifdef DBUS_WIN_FIXME
+ _dbus_warn("TODO: dispatch.c check_shell_service_success_auto_start test\n");
+#else
if (!check_shell_service_success_auto_start (context, foo))
_dbus_assert_not_reached ("shell success service auto start failed");
+#endif
_dbus_verbose ("Disconnecting foo, bar, and baz\n");
@@ -4158,8 +4190,12 @@
_dbus_assert_not_reached ("initial connection setup failed");
}
+#ifdef DBUS_WIN_FIXME
+ _dbus_warn("TODO: dispatch.c: create_and_hello_sha1 test\n");
+#else
check1_try_iterations (context, "create_and_hello_sha1",
check_hello_connection);
+#endif
kill_client_connection_unchecked (foo);
Index: bus/main.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/main.c,v
retrieving revision 1.36
diff -u -r1.36 main.c
--- bus/main.c 20 Dec 2006 06:18:19 -0000 1.36
+++ bus/main.c 8 Mar 2007 20:25:40 -0000
@@ -254,6 +254,12 @@
dbus_bool_t print_pid;
int force_fork;
+#ifdef _WIN32
+ extern int _dbus_init_working_dir(char *s);
+ if (!_dbus_init_working_dir(argv[0]))
+ return 1;
+#endif
+
if (!_dbus_string_init (&config_file))
return 1;
Index: dbus/dbus-bus.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-bus.c,v
retrieving revision 1.64
diff -u -r1.64 dbus-bus.c
--- dbus/dbus-bus.c 28 Oct 2006 01:41:37 -0000 1.64
+++ dbus/dbus-bus.c 8 Mar 2007 20:25:40 -0000
@@ -350,8 +350,10 @@
{
int i;
+#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
+ // qt example pong says "QMutex::lock: Deadlock detected"
_DBUS_LOCK (bus);
-
+#endif
/* We are expecting to have the connection saved in only one of these
* slots, but someone could in a pathological case set system and session
* bus to the same bus or something. Or set one of them to the starter
@@ -366,7 +368,9 @@
}
}
+#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
_DBUS_UNLOCK (bus);
+#endif
}
static DBusConnection *
Index: dbus/dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.154
diff -u -r1.154 dbus-connection.c
--- dbus/dbus-connection.c 15 Nov 2006 03:07:59 -0000 1.154
+++ dbus/dbus-connection.c 8 Mar 2007 20:25:37 -0000
@@ -4790,14 +4790,6 @@
_dbus_return_val_if_fail (connection != NULL, FALSE);
_dbus_return_val_if_fail (uid != NULL, FALSE);
-#ifdef DBUS_WIN
- /* FIXME this should be done at a lower level, but it's kind of hard,
- * just want to be sure we don't ship with this API returning
- * some weird internal fake uid for 1.0
- */
- return FALSE;
-#endif
-
CONNECTION_LOCK (connection);
if (!_dbus_transport_get_is_authenticated (connection->transport))
@@ -4829,14 +4821,6 @@
_dbus_return_val_if_fail (connection != NULL, FALSE);
_dbus_return_val_if_fail (pid != NULL, FALSE);
-#ifdef DBUS_WIN
- /* FIXME this should be done at a lower level, but it's kind of hard,
- * just want to be sure we don't ship with this API returning
- * some weird internal fake uid for 1.0
- */
- return FALSE;
-#endif
-
CONNECTION_LOCK (connection);
if (!_dbus_transport_get_is_authenticated (connection->transport))
Index: dbus/dbus-connection.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
retrieving revision 1.49
diff -u -r1.49 dbus-connection.h
--- dbus/dbus-connection.h 15 Nov 2006 03:07:59 -0000 1.49
+++ dbus/dbus-connection.h 8 Mar 2007 20:25:40 -0000
@@ -330,6 +330,9 @@
*/
int dbus_watch_get_fd (DBusWatch *watch);
+#if defined (DBUS_COMPILATION)
+int dbus_watch_get_handle (DBusWatch *watch);
+#endif
unsigned int dbus_watch_get_flags (DBusWatch *watch);
void* dbus_watch_get_data (DBusWatch *watch);
void dbus_watch_set_data (DBusWatch *watch,
Index: dbus/dbus-mainloop.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-mainloop.c,v
retrieving revision 1.19
diff -u -r1.19 dbus-mainloop.c
--- dbus/dbus-mainloop.c 20 Oct 2006 03:04:59 -0000 1.19
+++ dbus/dbus-mainloop.c 8 Mar 2007 20:25:40 -0000
@@ -598,7 +598,7 @@
#if MAINLOOP_SPEW
_dbus_verbose (" skipping watch on fd %d as it was out of memory last time\n",
- dbus_watch_get_fd (wcb->watch));
+ dbus_watch_get_handle (wcb->watch));
#endif
}
else if (dbus_watch_get_enabled (wcb->watch))
@@ -609,7 +609,7 @@
flags = dbus_watch_get_flags (wcb->watch);
- fds[n_fds].fd = dbus_watch_get_fd (wcb->watch);
+ fds[n_fds].fd = dbus_watch_get_handle (wcb->watch);
fds[n_fds].revents = 0;
fds[n_fds].events = 0;
if (flags & DBUS_WATCH_READABLE)
@@ -628,7 +628,7 @@
{
#if MAINLOOP_SPEW
_dbus_verbose (" skipping disabled watch on fd %d %s\n",
- dbus_watch_get_fd (wcb->watch),
+ dbus_watch_get_handle (wcb->watch),
watch_flags_to_string (dbus_watch_get_flags (wcb->watch)));
#endif
}
@@ -883,6 +883,8 @@
loop->depth -= 1;
+ _dbus_daemon_release ();
+
_dbus_verbose ("Quit main loop, depth %d -> %d\n",
loop->depth + 1, loop->depth);
}
Index: dbus/dbus-server-socket.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-server-socket.c,v
retrieving revision 1.3
diff -u -r1.3 dbus-server-socket.c
--- dbus/dbus-server-socket.c 1 Oct 2006 15:36:18 -0000 1.3
+++ dbus/dbus-server-socket.c 8 Mar 2007 20:25:40 -0000
@@ -161,7 +161,7 @@
int client_fd;
int listen_fd;
- listen_fd = dbus_watch_get_fd (watch);
+ listen_fd = dbus_watch_get_handle (watch);
client_fd = _dbus_accept (listen_fd);
Index: dbus/dbus-spawn.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-spawn.c,v
retrieving revision 1.25
diff -u -r1.25 dbus-spawn.c
--- dbus/dbus-spawn.c 4 Mar 2007 19:14:03 -0000 1.25
+++ dbus/dbus-spawn.c 8 Mar 2007 20:25:40 -0000
@@ -720,7 +720,7 @@
if (condition & DBUS_WATCH_HANGUP)
revents |= _DBUS_POLLHUP;
- fd = dbus_watch_get_fd (watch);
+ fd = dbus_watch_get_handle (watch);
if (fd == sitter->error_pipe_from_child)
handle_error_pipe (sitter, revents);
Index: dbus/dbus-sysdeps-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
retrieving revision 1.10
diff -u -r1.10 dbus-sysdeps-util.c
--- dbus/dbus-sysdeps-util.c 13 Dec 2006 01:18:07 -0000 1.10
+++ dbus/dbus-sysdeps-util.c 8 Mar 2007 20:25:41 -0000
@@ -82,7 +82,7 @@
double val;
int pos;
-#ifdef DBUS_WIN
+#if defined(DBUS_WIN) || defined(DBUS_WINCE)
check_dirname ("foo\\bar", "foo");
check_dirname ("foo\\\\bar", "foo");
check_dirname ("foo/\\/bar", "foo");
@@ -141,6 +141,7 @@
exit (1);
}
+#ifndef DBUS_WIN_FIXME
_dbus_string_init_const (&str, "0xff");
if (!_dbus_string_parse_double (&str,
0, &val, &pos))
@@ -158,6 +159,8 @@
_dbus_warn ("_dbus_string_parse_double of \"0xff\" returned wrong position %d", pos);
exit (1);
}
+#endif
+
#ifdef DBUS_WIN
check_path_absolute ("c:/", TRUE);
check_path_absolute ("c:/foo", TRUE);
Index: dbus/dbus-sysdeps.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
retrieving revision 1.69
diff -u -r1.69 dbus-sysdeps.h
--- dbus/dbus-sysdeps.h 8 Mar 2007 20:25:15 -0000 1.69
+++ dbus/dbus-sysdeps.h 8 Mar 2007 20:25:41 -0000
@@ -119,6 +119,7 @@
*
*/
+void _dbus_daemon_release (void);
dbus_bool_t _dbus_open_tcp_socket (int *fd,
DBusError *error);
dbus_bool_t _dbus_close_socket (int fd,
Index: dbus/dbus-threads.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-threads.c,v
retrieving revision 1.36
diff -u -r1.36 dbus-threads.c
--- dbus/dbus-threads.c 28 Oct 2006 01:41:37 -0000 1.36
+++ dbus/dbus-threads.c 8 Mar 2007 20:25:41 -0000
@@ -810,7 +810,11 @@
dbus_bool_t
_dbus_threads_init_debug (void)
{
+#if defined(DBUS_WIN)
+ return _dbus_threads_init_platform_specific();
+#else
return dbus_threads_init (&fake_functions);
+#endif
}
#endif /* DBUS_BUILD_TESTS */
Index: dbus/dbus-transport-socket.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-transport-socket.h,v
retrieving revision 1.2
diff -u -r1.2 dbus-transport-socket.h
--- dbus/dbus-transport-socket.h 16 Sep 2006 19:24:08 -0000 1.2
+++ dbus/dbus-transport-socket.h 8 Mar 2007 20:25:42 -0000
@@ -25,6 +25,10 @@
#include <dbus/dbus-transport-protected.h>
+#if defined(DBUS_WIN)
+#include <dbus/dbus-sockets-win.h>
+#endif
+
DBUS_BEGIN_DECLS
DBusTransport* _dbus_transport_new_for_socket (int fd,
Index: dbus/dbus-transport.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-transport.c,v
retrieving revision 1.54
diff -u -r1.54 dbus-transport.c
--- dbus/dbus-transport.c 17 Oct 2006 20:52:13 -0000 1.54
+++ dbus/dbus-transport.c 8 Mar 2007 20:25:42 -0000
@@ -310,9 +310,11 @@
DBusTransport **transport_p,
DBusError *error);
} open_funcs[] = {
- { _dbus_transport_open_socket },
- { _dbus_transport_open_platform_specific },
- { _dbus_transport_open_autolaunch }
+ { _dbus_transport_open_socket }
+#ifndef DBUS_WIN
+ , { _dbus_transport_open_platform_specific }
+#endif
+ , { _dbus_transport_open_autolaunch }
#ifdef DBUS_BUILD_TESTS
, { _dbus_transport_open_debug_pipe }
#endif
@@ -674,7 +676,7 @@
if (transport->disconnected)
return TRUE;
- if (dbus_watch_get_fd (watch) < 0)
+ if (dbus_watch_get_handle (watch) < 0)
{
_dbus_warn_check_failed ("Tried to handle an invalidated watch; this watch should have been removed\n");
return TRUE;
Index: dbus/dbus-watch.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-watch.c,v
retrieving revision 1.22
diff -u -r1.22 dbus-watch.c
--- dbus/dbus-watch.c 21 Oct 2006 21:57:31 -0000 1.22
+++ dbus/dbus-watch.c 8 Mar 2007 20:25:42 -0000
@@ -286,7 +286,7 @@
_dbus_verbose ("Adding a %s watch on fd %d using newly-set add watch function\n",
watch_type,
- dbus_watch_get_fd (link->data));
+ dbus_watch_get_handle (link->data));
}
#endif /* DBUS_ENABLE_VERBOSE_MODE */
@@ -302,7 +302,7 @@
link2);
_dbus_verbose ("Removing watch on fd %d using newly-set remove function because initial add failed\n",
- dbus_watch_get_fd (link2->data));
+ dbus_watch_get_handle (link2->data));
(* remove_function) (link2->data, data);
@@ -359,7 +359,7 @@
if (watch_list->add_watch_function != NULL)
{
_dbus_verbose ("Adding watch on fd %d\n",
- dbus_watch_get_fd (watch));
+ dbus_watch_get_handle (watch));
if (!(* watch_list->add_watch_function) (watch,
watch_list->watch_data))
@@ -390,7 +390,7 @@
if (watch_list->remove_watch_function != NULL)
{
_dbus_verbose ("Removing watch on fd %d\n",
- dbus_watch_get_fd (watch));
+ dbus_watch_get_handle (watch));
(* watch_list->remove_watch_function) (watch,
watch_list->watch_data);
@@ -422,7 +422,7 @@
if (watch_list->watch_toggled_function != NULL)
{
_dbus_verbose ("Toggling watch %p on fd %d to %d\n",
- watch, dbus_watch_get_fd (watch), watch->enabled);
+ watch, dbus_watch_get_handle (watch), watch->enabled);
(* watch_list->watch_toggled_function) (watch,
watch_list->watch_data);
@@ -490,10 +490,32 @@
* @returns the file descriptor to watch.
*/
int
+dbus_watch_get_handle (DBusWatch *watch)
+{
+ return watch->fd;
+}
+
+#if defined(DBUS_WIN)
+// never used by the dbus code
+#include "dbus-sysdeps-win.h"
+int
+dbus_watch_get_fd (DBusWatch *watch)
+{
+ DBusSocket *p;
+ if (watch->fd != -1) {
+ _dbus_handle_to_socket(watch->fd,&p);
+ return p->fd;
+ }
+ else
+ return -1;
+}
+#else
+int
dbus_watch_get_fd (DBusWatch *watch)
{
return watch->fd;
}
+#endif
/**
* Gets flags from DBusWatchFlags indicating
@@ -546,7 +568,7 @@
DBusFreeFunction free_data_function)
{
_dbus_verbose ("Setting watch fd %d data to data = %p function = %p from data = %p function = %p\n",
- dbus_watch_get_fd (watch),
+ dbus_watch_get_handle (watch),
data, free_data_function, watch->data, watch->free_data_function);
if (watch->free_data_function != NULL)
Reference in a new issue View git blame Copy permalink