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

Rob Shearman : widl: Store function and function pointer types completely within type_t type.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 6a0c5a4fe9beb9de0c4689ee3cb08c48d0c3ac12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0c5a4fe9beb9de0c4689ee3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:55:53 2008 +0100 widl: Store function and function pointer types completely within type_t type. --- tools/widl/header.c | 14 ++++---- tools/widl/parser.y | 71 ++++++++++++++++++++++++++++++---------------- tools/widl/typegen.c | 62 ++++++++++++++++++++-------------------- tools/widl/widltypes.h | 10 ++++-- tools/widl/write_msft.c | 12 ++++---- 5 files changed, 97 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a0c5a4fe9beb9de0c468…

1 0

Rob Shearman : widl: Support parsing calling conventions for function identifiers.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: d97f3205bac5dd26bb0cf6eceb68925484430398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97f3205bac5dd26bb0cf6ece… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:13 2008 +0100 widl: Support parsing calling conventions for function identifiers. Support automatically setting the calling convention to STDMETHODCALLTYPE if it is part of an object interface. Write out the calling convention in write_type_v. --- tools/widl/header.c | 27 ++++++++++++++------------- tools/widl/parser.y | 43 +++++++++++++++++++++++++++++++++++-------- tools/widl/widltypes.h | 2 ++ 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 08964cb..d2f7ae4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -298,13 +298,24 @@ void write_type_v(FILE *h, type_t *t, int is_field, int declonly, { if (!h) return; - write_type_left(h, t, declonly); + if (t->type == RPC_FC_FUNCTION) { + const char *callconv = get_attrp(t->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; + write_type_left(h, t->ref, declonly); + fprintf(h, " (%s *", callconv); + } else + write_type_left(h, t, declonly); if (fmt) { if (needs_space_after(t)) fprintf(h, " "); vfprintf(h, fmt, args); } - write_type_right(h, t, is_field); + if (t->type == RPC_FC_FUNCTION) { + fprintf(h, ")("); + write_args(h, t->fields_or_args, NULL, 0, FALSE); + fprintf(h, ")"); + } else + write_type_right(h, t, is_field); } void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *fmt, ...) @@ -690,17 +701,7 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } - if (arg->type->type == RPC_FC_FUNCTION) - { - write_type_decl_left(h, arg->type->ref); - fprintf(h, " (STDMETHODCALLTYPE *"); - write_name(h,arg); - fprintf(h, ")("); - write_args(h, arg->type->fields_or_args, NULL, 0, FALSE); - fprintf(h, ")"); - } - else - write_type_decl(h, arg->type, "%s", arg->name); + write_type_decl(h, arg->type, "%s", arg->name); count++; } if (do_indent) indentation--; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5e54daa..685322a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -64,6 +64,7 @@ #endif unsigned char pointer_default = RPC_FC_UP; +static int is_object_interface = FALSE; typedef struct list typelist_t; struct typenode { @@ -265,7 +266,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <func_list> int_statements dispint_meths %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version -%type <str> libraryhdr +%type <str> libraryhdr callconv %type <uuid> uuid_string %type <num> import_start @@ -518,8 +519,8 @@ uuid_string: $$ = parse_uuid($1); } ; -callconv: - | tSTDCALL +callconv: tCDECL { $$ = $<str>1; } + | tSTDCALL { $$ = $<str>1; } ; cases: { $$ = NULL; } @@ -653,11 +654,11 @@ s_field: m_attributes type pident array { $$ = $3->var; ; funcdef: - m_attributes type callconv pident { var_t *v = $4->var; - var_list_t *args = $4->args; + m_attributes type pident { var_t *v = $3->var; + var_list_t *args = $3->args; v->attrs = $1; - set_type(v, $2, $4, NULL, FALSE); - free($4); + set_type(v, $2, $3, NULL, FALSE); + free($3); $$ = make_func(v, args); if (is_attr(v->attrs, ATTR_IN)) { error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); @@ -757,6 +758,7 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; + is_object_interface = TRUE; $$ = $2; if ($$->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); @@ -806,6 +808,7 @@ interfacehdr: attributes interface { $$.interface = $2; $$.old_pointer_default = pointer_default; if (is_attr($1, ATTR_POINTERDEFAULT)) pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); + is_object_interface = is_object($1); if ($2->defined) error_loc("multiple definition error\n"); $2->attrs = $1; $2->defined = TRUE; @@ -863,10 +866,19 @@ moduledef: modulehdr '{' int_statements '}' pident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } | tCONST pident { $$ = $2; /* FIXME */ } + | callconv pident { $$ = $2; + if ($$->callconv) parser_warning("multiple calling conventions %s, %s for function %s\n", $$->callconv, $1, $$->var->name); + $$->callconv = $1; + } | direct_ident ; -func_ident: direct_ident '(' m_args ')' { $$ = $1; $1->args = $3; $1->is_func = TRUE; } +func_ident: direct_ident '(' m_args ')' + { $$ = $1; + $1->args = $3; + $1->is_func = TRUE; + } + ; direct_ident: ident { $$ = make_pident($1); } | '(' pident ')' { $$ = $2; } @@ -1363,6 +1375,13 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (func_ptr_level == 1) func_ptr_level = 0; v->type = make_type(RPC_FC_FUNCTION, v->type); v->type->fields_or_args = pident->args; + if (pident->callconv) + v->type->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); + else if (is_object_interface) { + static char *stdmethodcalltype; + if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); + v->type->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); + } for (; func_ptr_level > 0; func_ptr_level--) v->type = make_type(ptr_type, v->type); } @@ -1542,6 +1561,7 @@ static pident_t *make_pident(var_t *var) p->ptr_level = 0; p->func_ptr_level = 0; p->args = NULL; + p->callconv = NULL; return p; } @@ -1720,6 +1740,13 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a cur->fields_or_args = pident->args; for (; func_ptr_level > 0; func_ptr_level--) cur = make_type(pointer_default, cur); + if (pident->callconv) + cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); + else if (is_object_interface) { + static char *stdmethodcalltype; + if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); + cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); + } } cur = alias(cur, name->name); cur->attrs = attrs; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d8f4c69..259049e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -70,6 +70,7 @@ enum attr_type ATTR_AUTO_HANDLE, ATTR_BINDABLE, ATTR_CALLAS, + ATTR_CALLCONV, /* calling convention pseudo-attribute */ ATTR_CASE, ATTR_CONTEXTHANDLE, ATTR_CONTROL, @@ -250,6 +251,7 @@ struct _pident_t { /* levels of indirection for function pointers */ int func_ptr_level; var_list_t *args; + char *callconv; /* parser-internal */ struct list entry;

1 0

Alexandre Julliard : winex11: Move handling of WM_STATE changes to a separate function, and call it directly from wait_from_withdrawn_state.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: f89aa1282907bb5d1192fbdaa53becbb6a109150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89aa1282907bb5d1192fbdaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 15:55:25 2008 +0200 winex11: Move handling of WM_STATE changes to a separate function, and call it directly from wait_from_withdrawn_state. --- dlls/winex11.drv/event.c | 56 ++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cd6eaf6..1bcec8c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -687,28 +687,19 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) /*********************************************************************** - * EVENT_PropertyNotify + * handle_wm_state_notify + * + * Handle a PropertyNotify for WM_STATE. */ -static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event ) { - XPropertyEvent *event = &xev->xproperty; - struct x11drv_win_data *data; - - if (!hwnd) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - switch(event->state) { case PropertyDelete: - if (event->atom == x11drv_atom(WM_STATE)) - { - data->wm_state = WithdrawnState; - TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); - } + data->wm_state = WithdrawnState; + TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); break; - case PropertyNewValue: - if (event->atom == x11drv_atom(WM_STATE)) { int new_state = get_window_wm_state( event->display, data ); if (new_state != -1 && new_state != data->wm_state) @@ -722,6 +713,21 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) } +/*********************************************************************** + * EVENT_PropertyNotify + */ +static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +{ + XPropertyEvent *event = &xev->xproperty; + struct x11drv_win_data *data; + + if (!hwnd) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event ); +} + + /* event filter to wait for a WM_STATE change notification on a window */ static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg ) { @@ -744,7 +750,25 @@ void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, B while (data->whole_window && ((data->wm_state == WithdrawnState) == !set)) { - if (!process_events( display, is_wm_state_notify, data->whole_window )) + XEvent event; + int count = 0; + + wine_tsx11_lock(); + while (XCheckIfEvent( display, &event, is_wm_state_notify, (char *)data->whole_window )) + { + count++; + if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ + if (event.type == DestroyNotify) call_event_handler( display, &event ); + else + { + wine_tsx11_unlock(); + handle_wm_state_notify( data, &event.xproperty ); + wine_tsx11_lock(); + } + } + wine_tsx11_unlock(); + + if (!count) { struct pollfd pfd; int timeout = end - GetTickCount();

1 0

Alexandre Julliard : winex11: Rely on PropertyNotify events instead of Map/ UnmapNotify to detect iconification.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: a442d3b46db31fbaa8ee7aad64373bcb951bda7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a442d3b46db31fbaa8ee7aad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 15:58:59 2008 +0200 winex11: Rely on PropertyNotify events instead of Map/UnmapNotify to detect iconification. --- dlls/winex11.drv/event.c | 55 ++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/winpos.c | 62 --------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 50 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1bcec8c..c57d497 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -104,7 +104,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* VisibilityNotify */ /* CreateNotify */ { DestroyNotify, X11DRV_DestroyNotify }, - { UnmapNotify, X11DRV_UnmapNotify }, + /* UnmapNotify */ { MapNotify, X11DRV_MapNotify }, /* MapRequest */ /* ReparentNotify */ @@ -123,7 +123,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MappingNotify, X11DRV_MappingNotify }, }; -static int nb_event_handlers = 19; /* change this if you add handlers above */ +static int nb_event_handlers = 18; /* change this if you add handlers above */ /* return the name of an X event */ @@ -691,7 +691,8 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) * * Handle a PropertyNotify for WM_STATE. */ -static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event ) +static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, + BOOL update_window ) { switch(event->state) { @@ -710,6 +711,50 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent } break; } + + if (!update_window || !data->managed || !data->mapped) return; + + if (data->iconic && data->wm_state == NormalState) /* restore window */ + { + int x, y; + unsigned int width, height, border, depth; + Window root, top; + WINDOWPLACEMENT wp; + RECT rect; + + /* FIXME: hack */ + wine_tsx11_lock(); + XGetGeometry( event->display, data->whole_window, &root, &x, &y, &width, &height, + &border, &depth ); + XTranslateCoordinates( event->display, data->whole_window, root, 0, 0, &x, &y, &top ); + wine_tsx11_unlock(); + rect.left = x; + rect.top = y; + rect.right = x + width; + rect.bottom = y + height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + X11DRV_X_to_window_rect( data, &rect ); + + wp.length = sizeof(wp); + GetWindowPlacement( data->hwnd, &wp ); + wp.flags = 0; + wp.showCmd = SW_RESTORE; + wp.rcNormalPosition = rect; + + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); + data->iconic = FALSE; + data->lock_changes++; + SetWindowPlacement( data->hwnd, &wp ); + data->lock_changes--; + } + else if (!data->iconic && data->wm_state == IconicState) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + data->iconic = TRUE; + data->lock_changes++; + ShowWindow( data->hwnd, SW_MINIMIZE ); + data->lock_changes--; + } } @@ -724,7 +769,7 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event ); + if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event, TRUE ); } @@ -762,7 +807,7 @@ void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, B else { wine_tsx11_unlock(); - handle_wm_state_notify( data, &event.xproperty ); + handle_wm_state_notify( data, &event.xproperty, FALSE ); wine_tsx11_lock(); } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 13ec6f1..e60d42a 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -437,7 +437,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped) return; @@ -446,71 +445,10 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ - return; } - if (!data->iconic) return; - - state = get_window_wm_state( event->xmap.display, data ); - if (state == NormalState) - { - int x, y; - unsigned int width, height, border, depth; - Window root, top; - WINDOWPLACEMENT wp; - RECT rect; - - /* FIXME: hack */ - wine_tsx11_lock(); - XGetGeometry( event->xmap.display, data->whole_window, &root, &x, &y, &width, &height, - &border, &depth ); - XTranslateCoordinates( event->xmap.display, data->whole_window, root, 0, 0, &x, &y, &top ); - wine_tsx11_unlock(); - rect.left = x; - rect.top = y; - rect.right = x + width; - rect.bottom = y + height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - X11DRV_X_to_window_rect( data, &rect ); - - wp.length = sizeof(wp); - GetWindowPlacement( hwnd, &wp ); - wp.flags = 0; - wp.showCmd = SW_RESTORE; - wp.rcNormalPosition = rect; - - TRACE( "restoring win %p/%lx\n", hwnd, data->whole_window ); - data->iconic = FALSE; - data->lock_changes++; - SetWindowPlacement( hwnd, &wp ); - data->lock_changes--; - } - else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); } -/********************************************************************** - * X11DRV_UnmapNotify - */ -void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) -{ - struct x11drv_win_data *data; - int state; - - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->managed || !data->mapped || data->iconic) return; - - state = get_window_wm_state( event->xunmap.display, data ); - if (state == IconicState) - { - TRACE( "minimizing win %p/%lx\n", hwnd, data->whole_window ); - data->iconic = TRUE; - data->lock_changes++; - ShowWindow( hwnd, SW_MINIMIZE ); - data->lock_changes--; - } - else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); -} - struct desktop_resize_data { RECT old_screen_rect; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 52670e8..fbf9ebc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -630,7 +630,6 @@ extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_Expose( HWND hwnd, XEvent *event ); extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); extern void X11DRV_MapNotify( HWND hwnd, XEvent *event ); -extern void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );

1 0

Alexandre Julliard : winex11: Replace the lock_changes flag by a check on the event currently being processed .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 86675edfeeb12deae0bbdd610e4ddb4d5188f76c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86675edfeeb12deae0bbdd610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 16:43:49 2008 +0200 winex11: Replace the lock_changes flag by a check on the event currently being processed. --- dlls/winex11.drv/event.c | 4 ---- dlls/winex11.drv/winpos.c | 20 ++++++++++++++++---- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c57d497..8fd9b20 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -743,17 +743,13 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = FALSE; - data->lock_changes++; SetWindowPlacement( data->hwnd, &wp ); - data->lock_changes--; } else if (!data->iconic && data->wm_state == IconicState) { TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - data->lock_changes++; ShowWindow( data->hwnd, SW_MINIMIZE ); - data->lock_changes--; } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e60d42a..e858acf 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -300,10 +300,12 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *rectWindow, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - Display *display = thread_display(); + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + Display *display = thread_data->display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); RECT old_window_rect, old_whole_rect, old_client_rect; + int event_type; if (!data) { @@ -379,7 +381,19 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, X11DRV_sync_client_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); - if (!data->whole_window || data->lock_changes) return; /* nothing more to do */ + if (!data->whole_window) return; + + /* check if we are currently processing an event relevant to this window */ + event_type = 0; + if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) + event_type = thread_data->current_event->type; + + if (event_type == ConfigureNotify || event_type == PropertyNotify) + { + TRACE( "not changing window %p/%lx while processing event %u\n", + hwnd, data->whole_window, event_type ); + return; + } if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) { @@ -578,9 +592,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); - data->lock_changes++; SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); - data->lock_changes--; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbf9ebc..ab5ff76 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -678,7 +678,6 @@ struct x11drv_win_data BOOL iconic : 1; /* is window in iconic state? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ - unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; };

1 0

Alexander Morozov : setupapi: Create device interface keys in registry as in Windows XP.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 6a5c1ca25bd77fde9e825e31dca4d4cc0d1fea8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5c1ca25bd77fde9e825e31d… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:25:01 2008 +0300 setupapi: Create device interface keys in registry as in Windows XP. --- dlls/setupapi/devinst.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e9c8124..ebfeee0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2631,21 +2631,44 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( struct InterfaceInfo *ifaceInfo = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); + PWSTR interfKeyName = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ifaceInfo->symbolicLink) + 1) * sizeof(WCHAR)); + HKEY interfKey; + WCHAR *ptr; - if (instancePath) + lstrcpyW(interfKeyName, ifaceInfo->symbolicLink); + if (lstrlenW(ifaceInfo->symbolicLink) > 3) { - LONG l; - - l = RegCreateKeyExW(parent, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) + interfKeyName[0] = '#'; + interfKeyName[1] = '#'; + interfKeyName[3] = '#'; + } + ptr = strchrW(interfKeyName, '\\'); + if (ptr) + *ptr = 0; + l = RegCreateKeyExW(parent, interfKeyName, 0, NULL, 0, + samDesired, NULL, &interfKey, NULL); + if (!l) + { + if (instancePath) { - SetLastError(l); - key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); + RegCloseKey(interfKey); } + else + SetLastError(l); + HeapFree(GetProcessHeap(), 0, interfKeyName); HeapFree(GetProcessHeap(), 0, instancePath); RegCloseKey(parent); }

1 0

Alexander Morozov : setupapi: Create DeviceInstance value in registry, delete todo_wine from test.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 997bea9b896fa748d6ec185c5462f11e0326904d URL: http://source.winehq.org/git/wine.git/?a=commit;h=997bea9b896fa748d6ec185c5… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:25:10 2008 +0300 setupapi: Create DeviceInstance value in registry, delete todo_wine from test. --- dlls/setupapi/devinst.c | 31 +++++++++++++++++++++---------- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ebfeee0..75cb38b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2650,20 +2650,31 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( samDesired, NULL, &interfKey, NULL); if (!l) { - if (instancePath) - { - LONG l; + struct DeviceInfo *devInfo = + (struct DeviceInfo *)ifaceInfo->device->Reserved; - l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) + l = RegSetValueExW(interfKey, DeviceInstance, 0, REG_SZ, + (BYTE *)devInfo->instanceId, + (lstrlenW(devInfo->instanceId) + 1) * sizeof(WCHAR)); + if (!l) + { + if (instancePath) { - SetLastError(l); - key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); } + else + SetLastError(l); RegCloseKey(interfKey); } else diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index af98eb2..7f63afc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -816,7 +816,6 @@ static void testRegisterAndGetDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiEnumDeviceInterfaces(set, NULL, &guid, 0, &interfaceData); - todo_wine ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &dwSize, NULL); @@ -836,7 +835,6 @@ static void testRegisterAndGetDetail(void) ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, dwSize, &dwSize, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); - todo_wine ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail);

1 0

Alexander Morozov : setupapi: Creating SymbolicLink value in registry as in Windows XP.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: b622101ef252071f6797368f0b4c0911ade2bd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b622101ef252071f6797368f0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:24:50 2008 +0300 setupapi: Creating SymbolicLink value in registry as in Windows XP. --- dlls/setupapi/devinst.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 60da5e8..e9c8124 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -244,7 +244,7 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, /* omit length of format specifiers, but include NULL terminator: */ len = lstrlenW(fmt) - 4 + 1; len += lstrlenW(instanceId) + lstrlenW(guidStr); - if (ReferenceString) + if (ReferenceString && *ReferenceString) { /* space for a hash between string and reference string: */ len += lstrlenW(ReferenceString) + 1; @@ -258,10 +258,10 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, /* replace '\\' with '#' after the "\\\\?\\" beginning */ for (ptr = strchrW(ret + 4, '\\'); ptr; ptr = strchrW(ptr + 1, '\\')) *ptr = '#'; - if (ReferenceString) + if (ReferenceString && *ReferenceString) { - ret[printed - 1] = '\\'; - lstrcpyW(ret + printed, ReferenceString); + ret[printed] = '\\'; + lstrcpyW(ret + printed + 1, ReferenceString); } } return ret;

1 0

Alexander Morozov : setupapi: Added a test for registering device interface and getting device path.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: c4fb0f236eadadf0910e59e8bfd87b610774c09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fb0f236eadadf0910e59e8b… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Mar 28 20:38:46 2008 +0300 setupapi: Added a test for registering device interface and getting device path. --- dlls/setupapi/tests/devinst.c | 68 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2704d31..af98eb2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DAT static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); static void init_function_pointers(void) { @@ -70,6 +71,7 @@ static void init_function_pointers(void) pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); pSetupDiCreateDevRegKeyW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDevRegKeyW"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); + pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -779,6 +781,71 @@ static void testDevRegKey(void) devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } +static void testRegisterAndGetDetail(void) +{ + HDEVINFO set; + BOOL ret; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; + SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), { 0 } }; + DWORD dwSize = 0; + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, 0, + DICD_GENERATE_ID, &devInfo); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, &interfaceData); + ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); + ok(ret, "SetupDiRegisterDeviceInfo failed: %08x\n", GetLastError()); + + pSetupDiDestroyDeviceInfoList(set); + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiEnumDeviceInterfaces(set, NULL, &guid, 0, &interfaceData); + todo_wine + ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &dwSize, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + static const char path[] = + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; + + detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (detail) + { + detail->cbSize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, + detail, dwSize, &dwSize, NULL); + ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); + todo_wine + ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", + detail->DevicePath); + HeapFree(GetProcessHeap(), 0, detail); + } + } + + pSetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { init_function_pointers(); @@ -799,4 +866,5 @@ START_TEST(devinst) testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); testDevRegKey(); + testRegisterAndGetDetail(); }

1 0

Nikolay Sivov : gdi32: PlgBlt implementation.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: caafb52559235dae5903b36e9c1f5a9e1f5ab69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=caafb52559235dae5903b36e9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Mar 27 01:59:34 2008 +0300 gdi32: PlgBlt implementation. --- dlls/gdi32/bitblt.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4a814b7..e91ae53 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -20,6 +20,11 @@ #include <stdarg.h> +#include <math.h> +#ifdef HAVE_FLOAT_H +#include <float.h> +#endif + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -522,9 +527,75 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig * */ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, - HDC hdcSrc, INT nXDest, INT nYDest, INT nWidth, + HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { - FIXME("PlgBlt, stub\n"); - return 1; + int oldgMode; + /* parallelogram coords */ + POINT plg[3]; + /* rect coords */ + POINT rect[3]; + XFORM xf; + XFORM SrcXf; + XFORM oldDestXf; + FLOAT det; + + /* save actual mode, set GM_ADVANCED */ + oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); + if (oldgMode == 0) + return FALSE; + + memcpy(plg,lpPoint,sizeof(POINT)*3); + rect[0].x = nXSrc; + rect[0].y = nYSrc; + rect[1].x = nXSrc + nWidth; + rect[1].y = nYSrc; + rect[2].x = nXSrc; + rect[2].y = nYSrc + nHeight; + /* calc XFORM matrix to transform hdcDest -> hdcSrc (parallelogram to rectangle) */ + /* determinant */ + det = (FLOAT)(rect[1].x*(rect[2].y - rect[0].y) - rect[2].x*(rect[1].y - rect[0].y) - rect[0].x*(rect[2].y - rect[1].y)); + + if (fabs(det) < 1e-5) + { + SetGraphicsMode(hdcDest,oldgMode); + return FALSE; + } + + TRACE("hdcSrc=%p %d,%d,%dx%d -> hdcDest=%p %d,%d,%d,%d,%d,%d\n", + hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hdcDest, plg[0].x, plg[0].y, plg[1].x, plg[1].y, plg[2].x, plg[2].y); + + /* X components */ + xf.eM11 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eM21 = (rect[1].x*(plg[2].x - plg[0].x) - rect[2].x*(plg[1].x - plg[0].x) - rect[0].x*(plg[2].x - plg[1].x)) / det; + xf.eDx = (rect[0].x*(rect[1].y*plg[2].x - rect[2].y*plg[1].x) - + rect[1].x*(rect[0].y*plg[2].x - rect[2].y*plg[0].x) + + rect[2].x*(rect[0].y*plg[1].x - rect[1].y*plg[0].x) + ) / det; + + /* Y components */ + xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; + xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - + rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + + rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) + ) / det; + + GetWorldTransform(hdcSrc,&SrcXf); + CombineTransform(&xf,&xf,&SrcXf); + + /* save actual dest transform */ + GetWorldTransform(hdcDest,&oldDestXf); + + SetWorldTransform(hdcDest,&xf); + /* now destination and source DCs use same coords */ + MaskBlt(hdcDest,nXSrc,nYSrc,nWidth,nHeight, + hdcSrc, nXSrc,nYSrc, + hbmMask,xMask,yMask, + SRCCOPY); + /* restore dest DC */ + SetWorldTransform(hdcDest,&oldDestXf); + SetGraphicsMode(hdcDest,oldgMode); + + return TRUE; }

1 0