[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 161a819..90d14de 100644 (file)
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -26,6 +26,7 @@
 #ifndef DBUS_SYSDEPS_WIN_H
 #define DBUS_SYSDEPS_WIN_H
 
+extern void *_dbus_win_get_dll_hmodule (void);
 #define _WINSOCKAPI_
 
 #include "dbus-hash.h"
@@ -35,31 +36,19 @@
 #include <windows.h>
 #undef interface
 
-#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);
-
-
 #define DBUS_CONSOLE_DIR "/var/run/console/"
 
 
-void _dbus_win_startup_winsock (void);
+void _dbus_win_set_errno (int err);
+const char* _dbus_win_error_from_last_error (void);
+
+dbus_bool_t _dbus_win_startup_winsock (void);
 void _dbus_win_warn_win_error  (const char *message,
-                                int         code);
+                                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);
 
 
@@ -89,43 +78,16 @@ _dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
                                   wchar_t  **wdomain,
                                   DBusError *error);
 
-typedef struct DBusFile DBusFile;
-
-dbus_bool_t _dbus_file_open (DBusFile   *file,
-                             const char *filename,
-                             int         oflag,
-                             int         pmode);
-
-dbus_bool_t _dbus_file_close (DBusFile  *file,
-                              DBusError *error);
-
-
-int _dbus_file_read  (DBusFile   *file,
-                      DBusString *buffer,
-                      int         count);
-
-int _dbus_file_write (DBusFile         *file,
-                      const DBusString *buffer,
-                      int               start,
-                      int               len);
-
 dbus_bool_t _dbus_file_exists (const char *filename);
 
-
-#define FDATA private_data
-struct DBusFile
-  {
-    int FDATA;
-  };
-
-
 dbus_bool_t _dbus_get_config_file_name(DBusString *config_file, 
                                        char *s);
 
+dbus_bool_t _dbus_get_install_root(char *prefix, int len);
 
+void        _dbus_threads_windows_init_global (void);
+void        _dbus_threads_windows_ensure_ctor_linked (void);
 
 #endif
 
 /** @} end of sysdeps-win.h */
-
-