April 2008 - Wine-commits - list.winehq.org

Rob Shearman : widl: Check that expressions resolve so that expressions in generated code will compile .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 6244565df3f69dcaef715cb51e22ae9aeb10a98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6244565df3f69dcaef715cb51… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:30 2008 +0100 widl: Check that expressions resolve so that expressions in generated code will compile. Also check that expressions return the correct type for the attribute. --- tools/widl/parser.y | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 357 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6244565df3f69dcaef715…

1 0

Rob Shearman : widl: Move expression functions to a new file, expr.c.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 80ab2a7c6d6f7ce0187e9c5880e6b121e070bba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ab2a7c6d6f7ce0187e9c588… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:38 2008 +0100 widl: Move expression functions to a new file, expr.c. --- tools/widl/Makefile.in | 1 + tools/widl/client.c | 1 + tools/widl/expr.c | 775 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/expr.h | 40 +++ tools/widl/header.c | 138 +--------- tools/widl/header.h | 1 - tools/widl/parser.y | 535 +-------------------------------- tools/widl/proxy.c | 1 + tools/widl/typegen.c | 86 +------ tools/widl/widltypes.h | 4 + 10 files changed, 836 insertions(+), 746 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80ab2a7c6d6f7ce0187e9…

1 0

Rob Shearman : widl: Pass the actual type into check_remoting_fields and check_field_common instead of the type name .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: b88d82a14b34cd9f378c39274086e9f3645e8075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88d82a14b34cd9f378c39274… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:17 2008 +0100 widl: Pass the actual type into check_remoting_fields and check_field_common instead of the type name. --- tools/widl/parser.y | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a765415..2044544 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2427,15 +2427,23 @@ static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_ return attrs; } -static void check_remoting_fields(type_t *type); +static void check_remoting_fields(const var_t *var, type_t *type); /* checks that properties common to fields and arguments are consistent */ -static void check_field_common(const char *container_type, +static void check_field_common(const type_t *container_type, const char *container_name, const var_t *arg) { type_t *type = arg->type; int is_wire_marshal = 0; int is_context_handle = 0; + const char *container_type_name = NULL; + + if (is_struct(container_type->type)) + container_type_name = "struct"; + else if (is_union(container_type->type)) + container_type_name = "union"; + else if (container_type->type == RPC_FC_FUNCTION) + container_type_name = "function"; if (is_attr(arg->attrs, ATTR_LENGTHIS) && (is_attr(arg->attrs, ATTR_STRING) || is_aliaschain_attr(arg->type, ATTR_STRING))) @@ -2465,16 +2473,15 @@ static void check_field_common(const char *container_type, } if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) - error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot derive from void *\n", arg->name, container_type, container_name); + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot derive from void *\n", arg->name, container_type_name, container_name); else if (type->type == RPC_FC_FUNCTION) - error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot be a function pointer\n", arg->name, container_type, container_name); + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot be a function pointer\n", arg->name, container_type_name, container_name); else if (!is_wire_marshal && (is_struct(type->type) || is_union(type->type))) - check_remoting_fields(type); + check_remoting_fields(arg, type); } -static void check_remoting_fields(type_t *type) +static void check_remoting_fields(const var_t *var, type_t *type) { - const char *container_type = NULL; const var_t *field; const var_list_t *fields = NULL; @@ -2484,10 +2491,7 @@ static void check_remoting_fields(type_t *type) type->checked = TRUE; if (is_struct(type->type)) - { fields = type->fields_or_args; - container_type = "structure"; - } else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION) @@ -2497,11 +2501,10 @@ static void check_remoting_fields(type_t *type) } else fields = type->fields_or_args; - container_type = "union"; } if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - if (field->type) check_field_common(container_type, type->name, field); + if (field->type) check_field_common(type, type->name, field); } /* checks that arguments for a function make sense for marshalling and unmarshalling */ @@ -2545,7 +2548,7 @@ static void check_remoting_args(const func_t *func) } } - check_field_common("function", funcname, arg); + check_field_common(func->def->type, funcname, arg); } }

1 0

Rob Shearman : widl: Don' t free input_name in pop_import as we keep pointers to it in the var_t type now .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: b81904b8eef3c13d1667ccc05224c7e1e1817cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81904b8eef3c13d1667ccc05… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:07 2008 +0100 widl: Don't free input_name in pop_import as we keep pointers to it in the var_t type now. --- tools/widl/parser.l | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 17aff55..4e2a6f4 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -390,7 +390,6 @@ void pop_import(void) free(temp_name); } temp_name = import_stack[ptr].temp_name; - free( input_name ); input_name = import_stack[ptr].input_name; line_number = import_stack[ptr].line_number; import_stack_ptr--;

1 0

Rob Shearman : widl: Remove EXPR_MEMBERPTR and implement it using EXPR_PPTR and EXPR_MEMBER instead .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 95ac84e20bb552498bdb0dbeffea539fbfb583a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ac84e20bb552498bdb0dbef… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:00 2008 +0100 widl: Remove EXPR_MEMBERPTR and implement it using EXPR_PPTR and EXPR_MEMBER instead. --- tools/widl/header.c | 19 +++++++++++++++---- tools/widl/parser.y | 4 ++-- tools/widl/typegen.c | 19 +++++++++++++++---- tools/widl/widltypes.h | 1 - 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ce291da..dea7669 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -539,8 +539,6 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: case EXPR_AND: case EXPR_OR: - case EXPR_MEMBERPTR: - case EXPR_MEMBER: case EXPR_LOGOR: case EXPR_LOGAND: case EXPR_XOR: @@ -562,8 +560,6 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; - case EXPR_MEMBERPTR: fprintf(h, "->"); break; - case EXPR_MEMBER: fprintf(h, "."); break; case EXPR_LOGOR: fprintf(h, " || "); break; case EXPR_LOGAND: fprintf(h, " && "); break; case EXPR_XOR: fprintf(h, " ^ "); break; @@ -578,6 +574,21 @@ void write_expr(FILE *h, const expr_t *e, int brackets) write_expr(h, e->u.ext, 1); if (brackets) fprintf(h, ")"); break; + case EXPR_MEMBER: + if (brackets) fprintf(h, "("); + if (e->ref->type == EXPR_PPTR) + { + write_expr(h, e->ref->ref, 1); + fprintf(h, "->"); + } + else + { + write_expr(h, e->ref, 1); + fprintf(h, "."); + } + write_expr(h, e->u.ext, 1); + if (brackets) fprintf(h, ")"); + break; case EXPR_COND: if (brackets) fprintf(h, "("); write_expr(h, e->ref, 1); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 54f9804..a765415 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -657,8 +657,8 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } - | expr MEMBERPTR expr { $$ = make_expr2(EXPR_MEMBERPTR, $1, $3); } - | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } + | expr MEMBERPTR aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, $1), make_exprs(EXPR_IDENTIFIER, $3)); } + | expr '.' aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, $1, make_exprs(EXPR_IDENTIFIER, $3)); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8c8722e..d725920 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -357,7 +357,6 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_DIV: case EXPR_SHL: case EXPR_SHR: - case EXPR_MEMBERPTR: case EXPR_MEMBER: case EXPR_ARRAY: case EXPR_LOGOR: @@ -3179,8 +3178,6 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: case EXPR_AND: case EXPR_OR: - case EXPR_MEMBERPTR: - case EXPR_MEMBER: case EXPR_LOGOR: case EXPR_LOGAND: case EXPR_XOR: @@ -3202,7 +3199,6 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; - case EXPR_MEMBERPTR: fprintf(h, "->"); break; case EXPR_MEMBER: fprintf(h, "."); break; case EXPR_LOGOR: fprintf(h, " || "); break; case EXPR_LOGAND: fprintf(h, " && "); break; @@ -3218,6 +3214,21 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, write_struct_expr(h, e->u.ext, 1, fields, structvar); if (brackets) fprintf(h, ")"); break; + case EXPR_MEMBER: + if (brackets) fprintf(h, "("); + if (e->ref->type == EXPR_PPTR) + { + write_expr(h, e->ref->ref, 1); + fprintf(h, "->"); + } + else + { + write_expr(h, e->ref, 1); + fprintf(h, "."); + } + write_expr(h, e->u.ext, 1); + if (brackets) fprintf(h, ")"); + break; case EXPR_COND: if (brackets) fprintf(h, "("); write_struct_expr(h, e->ref, 1, fields, structvar); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 35f31d9..37a883a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -161,7 +161,6 @@ enum expr_type EXPR_COND, EXPR_TRUEFALSE, EXPR_ADDRESSOF, - EXPR_MEMBERPTR, EXPR_MEMBER, EXPR_ARRAY, EXPR_MOD,

1 0

Rob Shearman : widl: Add support for comparison, exclusive or, logical not and positive operators in expressions.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: cc3682cf12a207ab322a975f3685b370e6318a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3682cf12a207ab322a975f3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:35:48 2008 +0100 widl: Add support for comparison, exclusive or, logical not and positive operators in expressions. --- tools/widl/header.c | 62 +++++++++++++++++++++++++++++------------ tools/widl/parser.l | 6 ++++ tools/widl/parser.y | 59 +++++++++++++++++++++++++++++++++++++-- tools/widl/typegen.c | 71 ++++++++++++++++++++++++++++++++++++----------- tools/widl/widltypes.h | 11 +++++++ 5 files changed, 171 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc3682cf12a207ab322a9…

1 0

Rob Shearman : widl: Fix operator precedence in expressions.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: b599d2596b5a8ad2d914dbbc33e2e3fe08ad63fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b599d2596b5a8ad2d914dbbc3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:35:27 2008 +0100 widl: Fix operator precedence in expressions. --- tools/widl/parser.y | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 31f631f..709c861 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -292,15 +292,11 @@ static void add_explicit_handle_if_necessary(func_t *func); %right '?' ':' %left '|' %left '&' +%left SHL SHR %left '-' '+' %left '*' '/' '%' -%left SHL SHR +%right '~' CAST PPTR NEG ADDRESSOF tSIZEOF %left '.' MEMBERPTR '[' ']' -%right '~' -%right CAST -%right PPTR -%right NEG -%right ADDRESSOF %%

1 0

Rob Shearman : widl: Require a constant expression for case statements.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 6f9020290b03a5d9d458255922d3198aa234325d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9020290b03a5d9d45825592… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:35:32 2008 +0100 widl: Require a constant expression for case statements. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 709c861..0d80178 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -547,7 +547,7 @@ cases: { $$ = NULL; } | cases case { $$ = append_var( $1, $2 ); } ; -case: tCASE expr ':' field { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, $2 )); +case: tCASE expr_const ':' field { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, $2 )); $$ = $4; if (!$$) $$ = make_var(NULL); $$->attrs = append_attr( $$->attrs, a ); }

1 0

Maarten Lankhorst : explorer/mountmgr.sys: Move device hotplug code over to mount manager.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 9c02e01dcb1ee281fac7d50bdbc5e4fb93af4971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02e01dcb1ee281fac7d50bd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 3 22:58:32 2008 -0800 explorer/mountmgr.sys: Move device hotplug code over to mount manager. --- dlls/mountmgr.sys/Makefile.in | 6 ++++ {programs/explorer => dlls/mountmgr.sys}/device.c | 8 +++--- {programs/explorer => dlls/mountmgr.sys}/diskarb.c | 10 ++++---- {programs/explorer => dlls/mountmgr.sys}/hal.c | 18 +++++++------- dlls/mountmgr.sys/mountmgr.c | 4 +++ dlls/mountmgr.sys/mountmgr.h | 25 ++++++++++++++++++++ programs/explorer/Makefile.in | 5 ---- programs/explorer/desktop.c | 2 - 8 files changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index f73e4d4..fd36a13 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -4,9 +4,15 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mountmgr.sys IMPORTS = advapi32 ntoskrnl.exe kernel32 ntdll +DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADEFS = @HALINCL@ +EXTRALIBS = @DISKARBITRATIONLIB@ -luuid C_SRCS = \ + device.c \ + diskarb.c \ + hal.c \ mountmgr.c @MAKE_DLL_RULES@ diff --git a/programs/explorer/device.c b/dlls/mountmgr.sys/device.c similarity index 96% rename from programs/explorer/device.c rename to dlls/mountmgr.sys/device.c index 922f4d0..0435f35 100644 --- a/programs/explorer/device.c +++ b/dlls/mountmgr.sys/device.c @@ -37,7 +37,7 @@ #include "wine/list.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(explorer); +WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); struct dos_drive { @@ -72,8 +72,8 @@ static void send_notify( int drive, int code ) info.dbcv_reserved = 0; info.dbcv_unitmask = 1 << drive; info.dbcv_flags = DBTF_MEDIA; - SendMessageTimeoutW( HWND_BROADCAST, WM_DEVICECHANGE, code, (LPARAM)&info, - SMTO_ABORTIFHUNG, 0, &result ); + result = BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, + WM_DEVICECHANGE, code, (LPARAM)&info ); } static inline int is_valid_device( struct stat *st ) @@ -213,7 +213,7 @@ found: set_mount_point( drive, mount_point ); - WINE_TRACE( "added device %c: udi %s for %s on %s type %s\n", + TRACE( "added device %c: udi %s for %s on %s type %s\n", 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device), wine_dbgstr_a(mount_point), wine_dbgstr_a(type) ); diff --git a/programs/explorer/diskarb.c b/dlls/mountmgr.sys/diskarb.c similarity index 93% rename from programs/explorer/diskarb.c rename to dlls/mountmgr.sys/diskarb.c index 08a8097..d5f3d61 100644 --- a/programs/explorer/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -33,9 +33,9 @@ #include "winuser.h" #include "wine/debug.h" -#include "explorer_private.h" +#include "mountmgr.h" -WINE_DEFAULT_DEBUG_CHANNEL(explorer); +WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H @@ -72,7 +72,7 @@ static void appeared_callback( DADiskRef disk, void *context ) type = "cdrom"; } - WINE_TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); + TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); add_dos_device( device, device, mount_point, type ); done: @@ -101,7 +101,7 @@ static void disappeared_callback( DADiskRef disk, void *context ) strcpy( device, "/dev/r" ); CFStringGetCString( ref, device + 6, sizeof(device) - 6, kCFStringEncodingASCII ); - WINE_TRACE( "got unmount notification for '%s'\n", device ); + TRACE( "got unmount notification for '%s'\n", device ); remove_dos_device( device ); done: @@ -139,7 +139,7 @@ void initialize_diskarbitration(void) void initialize_diskarbitration(void) { - WINE_TRACE( "Skipping, Disk Arbitration support not compiled in\n" ); + TRACE( "Skipping, Disk Arbitration support not compiled in\n" ); } #endif /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ diff --git a/programs/explorer/hal.c b/dlls/mountmgr.sys/hal.c similarity index 92% rename from programs/explorer/hal.c rename to dlls/mountmgr.sys/hal.c index df31c6b..615edf0 100644 --- a/programs/explorer/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -36,9 +36,9 @@ #include "wine/library.h" #include "wine/exception.h" #include "wine/debug.h" -#include "explorer_private.h" +#include "mountmgr.h" -WINE_DEFAULT_DEBUG_CHANNEL(explorer); +WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef SONAME_LIBHAL @@ -98,7 +98,7 @@ static BOOL load_functions(void) return TRUE; failed: - WINE_WARN( "failed to load HAL support: %s\n", error ); + WARN( "failed to load HAL support: %s\n", error ); return FALSE; } @@ -153,7 +153,7 @@ static void removed_device( LibHalContext *ctx, const char *udi ) { DBusError error; - WINE_TRACE( "removed %s\n", wine_dbgstr_a(udi) ); + TRACE( "removed %s\n", wine_dbgstr_a(udi) ); if (remove_dos_device( udi )) { @@ -167,7 +167,7 @@ static void removed_device( LibHalContext *ctx, const char *udi ) static void property_modified (LibHalContext *ctx, const char *udi, const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) { - WINE_TRACE( "udi %s key %s %s\n", wine_dbgstr_a(udi), wine_dbgstr_a(key), + TRACE( "udi %s key %s %s\n", wine_dbgstr_a(udi), wine_dbgstr_a(key), is_added ? "added" : is_removed ? "removed" : "modified" ); if (!strcmp( key, "volume.mount_point" )) new_device( ctx, udi ); @@ -187,7 +187,7 @@ static DWORD WINAPI hal_thread( void *arg ) p_dbus_error_init( &error ); if (!(dbc = p_dbus_bus_get( DBUS_BUS_SYSTEM, &error ))) { - WINE_WARN( "failed to get system dbus connection: %s\n", error.message ); + WARN( "failed to get system dbus connection: %s\n", error.message ); p_dbus_error_free( &error ); return 1; } @@ -199,7 +199,7 @@ static DWORD WINAPI hal_thread( void *arg ) if (!p_libhal_ctx_init( ctx, &error )) { - WINE_WARN( "HAL context init failed: %s\n", error.message ); + WARN( "HAL context init failed: %s\n", error.message ); p_dbus_error_free( &error ); return 1; } @@ -218,7 +218,7 @@ static DWORD WINAPI hal_thread( void *arg ) } __EXCEPT( assert_fault ) { - WINE_WARN( "dbus assertion failure, disabling HAL support\n" ); + WARN( "dbus assertion failure, disabling HAL support\n" ); return 1; } __ENDTRY; @@ -243,7 +243,7 @@ void initialize_hal(void) void initialize_hal(void) { - WINE_TRACE( "Skipping, HAL support not compiled in\n" ); + TRACE( "Skipping, HAL support not compiled in\n" ); } #endif /* SONAME_LIBHAL */ diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index ee819a5..73e2554 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -38,6 +38,7 @@ #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "mountmgr.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -493,6 +494,9 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) return status; } + initialize_hal(); + initialize_diskarbitration(); + RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h new file mode 100644 index 0000000..1e1ce85 --- /dev/null +++ b/dlls/mountmgr.sys/mountmgr.h @@ -0,0 +1,25 @@ +/* + * Mountmanager private header + * + * Copyright 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +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, const char *type ); +extern BOOL remove_dos_device( const char *udi ); diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 9498a0f..4854eda 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -6,15 +6,10 @@ MODULE = explorer.exe APPMODE = -mwindows IMPORTS = rpcrt4 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = comctl32 -EXTRADEFS = @HALINCL@ -EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \ desktop.c \ - device.c \ - diskarb.c \ explorer.c \ - hal.c \ systray.c @MAKE_PROG_RULES@ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index ddca914..40b2f8e 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -234,8 +234,6 @@ void manage_desktop( char *arg ) SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); SetDeskWallPaper( (LPSTR)-1 ); initialize_display_settings( hwnd ); - initialize_diskarbitration(); - initialize_hal(); initialize_systray(); } else

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 22 Apr '08

22 Apr '08

1 0