[daemon-fix] fixed querying about name information

[platform/upstream/dbus.git] / dbus / dbus-sysdeps-win.h

diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
index 2bfb2a3..90d14de 100644 (file)
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-sysdeps.c Wrappers around system/libc features (internal to D-BUS implementation)
  * 
  * Copyright (C) 2002, 2003  Red Hat, Inc.
@@ -19,13 +19,14 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #ifndef DBUS_SYSDEPS_WIN_H
 #define DBUS_SYSDEPS_WIN_H
 
+extern void *_dbus_win_get_dll_hmodule (void);
 #define _WINSOCKAPI_
 
 #include "dbus-hash.h"
@@ -33,59 +34,23 @@
 #include <ctype.h>
 #include <malloc.h>
 #include <windows.h>
-
-#include <aclapi.h>
-#include <lm.h>
-#include <io.h>
-#include <share.h>
-#include <direct.h>
-
-#define mkdir(path, mode) _mkdir (path)
-
-#ifndef DBUS_WINCE
-#ifndef S_ISREG
-#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
-#endif
-#endif
-
-/* Declarations missing in mingw's headers */
-extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR  StringSid, PSID *Sid);
-extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
-
+#undef interface
 
 #define DBUS_CONSOLE_DIR "/var/run/console/"
 
-typedef struct
-  {
-    int fd;               /* File descriptor, SOCKET or file HANDLE */
-    int port_file_fd;     /* File descriptor for file containing
-                           * port number for "pseudo-unix" sockets
-                           */
-    DBusString port_file; /* File name for said file */
-    dbus_bool_t close_on_exec;
-    dbus_bool_t non_blocking;
-    int is_used; 
-  }
-DBusSocket;
-
-extern DBusSocket *win_fds;
-extern int win32_n_fds;
 
+void _dbus_win_set_errno (int err);
+const char* _dbus_win_error_from_last_error (void);
 
-void _dbus_win_startup_winsock (void);
+dbus_bool_t _dbus_win_startup_winsock (void);
 void _dbus_win_warn_win_error  (const char *message,
-                                int         code);
-extern const char* _dbus_lm_strerror  (int error_number);
+                                unsigned long code);
+                                
+char * _dbus_win_error_string (int error_number);
+void _dbus_win_free_error_string (char *string);
 
+extern const char* _dbus_lm_strerror  (int error_number);
 
-dbus_bool_t
-fill_win_user_info_from_uid (dbus_uid_t    uid,
-                             DBusUserInfo *info,
-                             DBusError    *error);
-dbus_bool_t
-fill_win_user_info_from_name (wchar_t      *wname,
-                              DBusUserInfo *info,
-                              DBusError    *error);
 
 dbus_bool_t _dbus_win_account_to_sid (const wchar_t *waccount,
                                       void         **ppsid,
@@ -107,68 +72,22 @@ char       *_dbus_win_utf16_to_utf8 (const wchar_t *str,
 
 void        _dbus_win_set_error_from_win_error (DBusError *error, int code);
 
-dbus_uid_t  _dbus_win_sid_to_uid_t (void        *psid);
-dbus_bool_t _dbus_uid_t_to_win_sid (dbus_uid_t   uid,
-                                    void       **ppsid);
-dbus_bool_t
-_dbus_account_to_win_sid (const wchar_t  *waccount,
-                          void          **ppsid,
-                          DBusError      *error);
 dbus_bool_t
 _dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
                                   wchar_t  **wname,
                                   wchar_t  **wdomain,
                                   DBusError *error);
 
-typedef struct DBusFile DBusFile;
-
-dbus_bool_t _dbus_open_file (DBusFile   *file,
-                             const char *filename,
-                             int         oflag,
-                             int         pmode);
-
-dbus_bool_t _dbus_close_file (DBusFile  *file,
-                              DBusError *error);
-
-
-int _dbus_read_file  (DBusFile   *file,
-                      DBusString *buffer,
-                      int         count);
+dbus_bool_t _dbus_file_exists (const char *filename);
 
-int _dbus_write_file (DBusFile         *file,
-                      const DBusString *buffer,
-                      int               start,
-                      int               len);
+dbus_bool_t _dbus_get_config_file_name(DBusString *config_file, 
+                                       char *s);
 
-#define FDATA private_data
-struct DBusFile
-  {
-    int FDATA;
-  };
+dbus_bool_t _dbus_get_install_root(char *prefix, int len);
 
-
-void _dbus_handle_to_socket (int          handle,
-                             DBusSocket **socket);
-int  _dbus_socket_to_handle (DBusSocket  *socket);
-
-dbus_bool_t
-fill_user_info (DBusUserInfo       *info,
-                dbus_uid_t          uid,
-                const DBusString   *username,
-                DBusError          *error);
-
-// replace with a windows version
-dbus_bool_t _dbus_open_unix_socket (int              *fd,
-                                    DBusError        *error);
-int _dbus_connect_unix_socket (const char     *path,
-                               dbus_bool_t     abstract,
-                               DBusError      *error);
-int _dbus_listen_unix_socket  (const char     *path,
-                               dbus_bool_t     abstract,
-                               DBusError      *error);
+void        _dbus_threads_windows_init_global (void);
+void        _dbus_threads_windows_ensure_ctor_linked (void);
 
 #endif
 
 /** @} end of sysdeps-win.h */
-
-