Module: wine Branch: master Commit: c5e7657d0c1d29f224fea37eab1af0571ed20365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e7657d0c1d29f224fea37eab...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Oct 21 15:01:52 2008 +0200
mountmgr: Include some system headers in mountmgr.h.
---
dlls/mountmgr.sys/device.c | 3 +-- dlls/mountmgr.sys/diskarb.c | 7 +------ dlls/mountmgr.sys/hal.c | 6 +----- dlls/mountmgr.sys/mountmgr.c | 14 ++------------ dlls/mountmgr.sys/mountmgr.h | 19 +++++++++++++++++-- 5 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 0260b5f..c351409 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -27,8 +27,7 @@ #include <stdio.h> #include <sys/time.h>
-#include "windef.h" -#include "winbase.h" +#include "mountmgr.h" #include "winreg.h" #include "winuser.h" #include "dbt.h" diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 4f18d52..90ced5e 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -27,13 +27,8 @@ #include <stdio.h> #include <sys/time.h>
-#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" - -#include "wine/debug.h" #include "mountmgr.h" +#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index c1d6e70..0f21e99 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -27,16 +27,12 @@ #include <stdio.h> #include <sys/time.h>
-#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" +#include "mountmgr.h" #include "excpt.h"
#include "wine/library.h" #include "wine/exception.h" #include "wine/debug.h" -#include "mountmgr.h"
WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 569f131..fee1def 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -24,22 +24,12 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT
-#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "winioctl.h" +#include "mountmgr.h" #include "winreg.h" -#include "ntddstor.h" -#include "ntddcdrm.h" -#include "ddk/wdm.h" -#include "ddk/mountmgr.h" #include "wine/library.h" -#include "wine/unicode.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/debug.h" -#include "mountmgr.h"
WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 2d34624..22eaeec 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -18,8 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ntddstor.h" +#include "ntddcdrm.h" +#include "ddk/wdm.h" +#include "ddk/mountmgr.h" + extern void initialize_hal(void); extern void initialize_diskarbitration(void); -extern BOOL add_dos_device( const char *udi, const char *device, - const char *mount_point, DWORD type ); +extern BOOL add_dos_device( const char *udi, const char *device, const char *mount_point, DWORD type ); extern BOOL remove_dos_device( const char *udi );