wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Alexandre Julliard : winecfg: Replace the old DXGrab option by the new fullscreen grab option.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 687641c8f25ccbe8a6b8d0c904a7864dbf28ddb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687641c8f25ccbe8a6b8d0c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 14:49:07 2011 +0200 winecfg: Replace the old DXGrab option by the new fullscreen grab option. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 4 ++-- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sr.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Uk.rc | 2 +- programs/winecfg/Zh.rc | 4 ++-- programs/winecfg/resource.h | 2 +- programs/winecfg/x11drvdlg.c | 17 +++++++++-------- 27 files changed, 37 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=687641c8f25ccbe8a6b8d…

1 0

Alexandre Julliard : winex11: Add an option to automatically clip the pointer in desktop and multi-monitor modes .
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: ae52a8c2cb0cbca1496e86956a59e5d7160ca5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae52a8c2cb0cbca1496e86956… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 13:07:34 2011 +0200 winex11: Add an option to automatically clip the pointer in desktop and multi-monitor modes. --- dlls/winex11.drv/mouse.c | 7 +++++-- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a4b846b..3e1a78f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -518,8 +518,11 @@ BOOL clip_fullscreen_window( HWND hwnd ) if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; if (GetTickCount() - x11drv_thread_data()->clip_reset < 1000) return FALSE; SetRect( &rect, 0, 0, screen_width, screen_height ); - if (!EqualRect( &rect, &virtual_screen_rect )) return FALSE; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (!grab_fullscreen) + { + if (!EqualRect( &rect, &virtual_screen_rect )) return FALSE; + if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + } TRACE( "win %p clipping fullscreen\n", hwnd ); return grab_clipping_window( &rect, TRUE ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b7011da..fc6902b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -601,6 +601,7 @@ extern int use_primary_selection; extern int use_system_cursors; extern int show_systray; extern int grab_pointer; +extern int grab_fullscreen; extern int usexcomposite; extern int managed_mode; extern int decorated_mode; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index cb6d793..8e0a784 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -84,6 +84,7 @@ int use_primary_selection = 0; int use_system_cursors = 1; int show_systray = 1; int grab_pointer = 1; +int grab_fullscreen = 0; int managed_mode = 1; int decorated_mode = 1; int private_color_map = 0; @@ -426,6 +427,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "GrabPointer", buffer, sizeof(buffer) )) grab_pointer = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) )) + grab_fullscreen = IS_OPTION_TRUE( buffer[0] ); + screen_depth = 0; if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) screen_depth = atoi(buffer);

1 0

Alexandre Julliard : winex11: Automatically clip the pointer when the foreground window is full-screen.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: a59c7cc8596b658d3c0854a737528cf60947ac1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59c7cc8596b658d3c0854a73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 12:30:03 2011 +0200 winex11: Automatically clip the pointer when the foreground window is full-screen. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/event.c | 6 +++- dlls/winex11.drv/mouse.c | 74 +++++++++++++++++++++++++++++++++---------- dlls/winex11.drv/x11drv.h | 2 + 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b78306d..b45f786 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -200,6 +200,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam DefaultScreen(display), mask, &changes ); wine_tsx11_unlock(); } + if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); return TRUE; } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 52d4b81..d2ab40a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -714,7 +714,11 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) XSetICFocus( xic ); wine_tsx11_unlock(); } - if (use_take_focus) return; /* ignore FocusIn if we are using take focus */ + if (use_take_focus) + { + if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); + return; + } if (!can_activate_window(hwnd)) { diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 06805a7..a4b846b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -373,7 +373,7 @@ static HWND create_clipping_msg_window(void) * * Start a pointer grab on the clip window. */ -static BOOL grab_clipping_window( const RECT *clip ) +static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) { struct x11drv_thread_data *data = x11drv_thread_data(); Window clip_window; @@ -390,7 +390,8 @@ static BOOL grab_clipping_window( const RECT *clip ) } /* don't clip to 1x1 rectangle if we don't have XInput */ - if (data->xi2_state != xi_enabled && clip->right - clip->left == 1 && clip->bottom - clip->top == 1) + if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; + if (only_with_xinput && data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); if (msg_hwnd) DestroyWindow( msg_hwnd ); @@ -480,6 +481,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ { data->clip_hwnd = 0; + data->clip_reset = GetTickCount(); disable_xinput2(); DestroyWindow( hwnd ); } @@ -490,12 +492,39 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) GetClipCursor( &clip ); if (clip.left > virtual_screen_rect.left || clip.right < virtual_screen_rect.right || clip.top > virtual_screen_rect.top || clip.bottom < virtual_screen_rect.bottom) - return grab_clipping_window( &clip ); + return grab_clipping_window( &clip, FALSE ); } return 0; } /*********************************************************************** + * clip_fullscreen_window + * + * Turn on clipping if the active window is fullscreen. + */ +BOOL clip_fullscreen_window( HWND hwnd ) +{ + struct x11drv_win_data *data; + RECT rect; + DWORD style; + + if (hwnd == GetDesktopWindow()) return FALSE; + if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_VISIBLE)) return FALSE; + if ((style & (WS_POPUP | WS_CHILD)) == WS_CHILD) return FALSE; + /* maximized windows don't count as full screen */ + if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; + if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; + if (GetTickCount() - x11drv_thread_data()->clip_reset < 1000) return FALSE; + SetRect( &rect, 0, 0, screen_width, screen_height ); + if (!EqualRect( &rect, &virtual_screen_rect )) return FALSE; + if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + TRACE( "win %p clipping fullscreen\n", hwnd ); + return grab_clipping_window( &rect, TRUE ); +} + +/*********************************************************************** * send_mouse_input * * Update the various window states on a mouse event. @@ -540,7 +569,12 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU last_cursor_change = GetTickCount(); } - if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); + if (hwnd != GetDesktopWindow()) + { + hwnd = GetAncestor( hwnd, GA_ROOT ); + if ((input->u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN)) && hwnd == GetForegroundWindow()) + clip_fullscreen_window( hwnd ); + } /* update the wine server Z-order */ @@ -1221,25 +1255,31 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */ - /* we are clipping if the clip rectangle is smaller than the screen */ - if (grab_pointer && (clip->left > virtual_screen_rect.left || - clip->right < virtual_screen_rect.right || - clip->top > virtual_screen_rect.top || - clip->bottom < virtual_screen_rect.bottom)) + if (grab_pointer) { - DWORD tid, pid; HWND foreground = GetForegroundWindow(); - /* forward request to the foreground window if it's in a different thread */ - tid = GetWindowThreadProcessId( foreground, &pid ); - if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + /* we are clipping if the clip rectangle is smaller than the screen */ + if (clip->left > virtual_screen_rect.left || clip->right < virtual_screen_rect.right || + clip->top > virtual_screen_rect.top || clip->bottom < virtual_screen_rect.bottom) { - TRACE( "forwarding clip request to %p\n", foreground ); - if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + DWORD tid, pid; + + /* forward request to the foreground window if it's in a different thread */ + tid = GetWindowThreadProcessId( foreground, &pid ); + if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + { + TRACE( "forwarding clip request to %p\n", foreground ); + if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + } + else if (grab_clipping_window( clip, FALSE )) return TRUE; + } + else /* if currently clipping, check if we should switch to fullscreen clipping */ + { + struct x11drv_thread_data *data = x11drv_thread_data(); + if (data && data->clip_hwnd && clip_fullscreen_window( foreground )) return TRUE; } - else if (grab_clipping_window( clip )) return TRUE; } - ungrab_clipping_window(); return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e756b2..b7011da 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -552,6 +552,7 @@ struct x11drv_thread_data Window selection_wnd; /* window used for selection interactions */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ + DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */ enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ }; @@ -844,6 +845,7 @@ extern void sync_window_cursor( Window window ); extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ); extern void ungrab_clipping_window(void); extern void reset_clipping_window(void); +extern BOOL clip_fullscreen_window( HWND hwnd ); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags );

1 0

Alexandre Julliard : winex11: Export a couple of helper functions for window rectangles.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: a07b8411fcfe4261da3941a7cb7dcfc3c5736c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07b8411fcfe4261da3941a7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 12:09:12 2011 +0200 winex11: Export a couple of helper functions for window rectangles. --- dlls/winex11.drv/window.c | 24 ++---------------------- dlls/winex11.drv/x11drv.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 32a3f4c..9e67612 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -225,24 +225,6 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec /*********************************************************************** - * is_window_rect_mapped - * - * Check if the X whole window should be mapped based on its rectangle - */ -static BOOL is_window_rect_mapped( const RECT *rect ) -{ - /* don't map if rect is off-screen */ - if (rect->left >= virtual_screen_rect.right || - rect->top >= virtual_screen_rect.bottom || - rect->right <= virtual_screen_rect.left || - rect->bottom <= virtual_screen_rect.top) - return FALSE; - - return TRUE; -} - - -/*********************************************************************** * is_window_resizable * * Check if window should be made resizable by the window manager @@ -251,8 +233,7 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); + return is_window_rect_fullscreen( &data->whole_rect ); } @@ -1271,8 +1252,7 @@ void update_net_wm_states( Display *display, struct x11drv_win_data *data ) if (data->whole_window == root_window) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) + if (is_window_rect_fullscreen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a924e06..8e756b2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -819,6 +819,18 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) rect->right = width - tmp; } +static inline BOOL is_window_rect_mapped( const RECT *rect ) +{ + return (rect->left < virtual_screen_rect.right && rect->top < virtual_screen_rect.bottom && + rect->right > virtual_screen_rect.left && rect->bottom > virtual_screen_rect.top); +} + +static inline BOOL is_window_rect_fullscreen( const RECT *rect ) +{ + return (rect->left <= 0 && rect->right >= screen_width && + rect->top <= 0 && rect->bottom >= screen_height); +} + /* X context to associate a hwnd to an X window */ extern XContext winContext;

1 0

Alexandre Julliard : winex11: Reset the clipping when the desktop window loses focus.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: a28722f5313c283ee89ad150e80bcca18720f1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28722f5313c283ee89ad150e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 12:07:37 2011 +0200 winex11: Reset the clipping when the desktop window loses focus. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/event.c | 22 ++++++++++------------ dlls/winex11.drv/mouse.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fe4a040..b78306d 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -143,7 +143,7 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | - PointerMotionMask | ButtonPressMask | ButtonReleaseMask; + PointerMotionMask | ButtonPressMask | ButtonReleaseMask | FocusChangeMask; win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow ); if (visual != DefaultVisual( display, DefaultScreen(display) )) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 3af56f8..52d4b81 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -706,6 +706,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); if (event->detail == NotifyPointer) return; + if (hwnd == GetDesktopWindow()) return; if ((xic = X11DRV_get_ic( hwnd ))) { @@ -740,20 +741,13 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) int revert; XIC xic; - if (!hwnd) + TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + + if (event->detail == NotifyPointer) { - if (event->detail == NotifyPointer && event->window == x11drv_thread_data()->clip_window) - { - TRACE( "clip window lost focus\n" ); - ungrab_clipping_window(); - ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ - } + if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window(); return; } - - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); - - if (event->detail == NotifyPointer) return; if (ximInComposeMode) return; x11drv_thread_data()->last_focus = hwnd; @@ -763,8 +757,12 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) XUnsetICFocus( xic ); wine_tsx11_unlock(); } + if (root_window != DefaultRootWindow(event->display)) + { + if (hwnd == GetDesktopWindow()) reset_clipping_window(); + return; + } if (hwnd != GetForegroundWindow()) return; - if (root_window != DefaultRootWindow(event->display)) return; SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); /* don't reset the foreground window, if the window which is diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fdc92ab..06805a7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -449,6 +449,17 @@ void ungrab_clipping_window(void) } /*********************************************************************** + * reset_clipping_window + * + * Forcibly reset the window clipping on external events. + */ +void reset_clipping_window(void) +{ + ungrab_clipping_window(); + ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ +} + +/*********************************************************************** * clip_cursor_notify * * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7113a02..a924e06 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -831,6 +831,7 @@ extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( Window window ); extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ); extern void ungrab_clipping_window(void); +extern void reset_clipping_window(void); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags );

1 0

Austin English : dsound: Return success in IDirectSoundBufferImpl_AcquireResources.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 6a3255bbbde0bdec3407ea89ef640b66dc45773c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3255bbbde0bdec3407ea89e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 9 17:59:02 2011 -0500 dsound: Return success in IDirectSoundBufferImpl_AcquireResources. --- dlls/dsound/buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0e9096a..f797baf 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -791,13 +791,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources( IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; DWORD u; - FIXME("(%p,%08u,%u,%p): stub\n",This,dwFlags,dwEffectsCount,pdwResultCodes); + FIXME("(%p,%08u,%u,%p): stub, faking success\n",This,dwFlags,dwEffectsCount,pdwResultCodes); if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; + return DS_OK; } static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(

1 0

Dylan Smith : d3dx9: Implement D3DXMESHOPT_COMPACT for ID3DXMesh:: OptimizeInplace.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 61ba38635b7deb316fb569d6becebf605bcbd98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ba38635b7deb316fb569d6b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 9 06:30:51 2011 -0400 d3dx9: Implement D3DXMESHOPT_COMPACT for ID3DXMesh::OptimizeInplace. --- dlls/d3dx9_36/mesh.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cfb19bc..eca9332 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -653,13 +653,159 @@ static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONS } static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, - DWORD *face_remap, LPD3DXBUFFER *vertex_remap) + DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + void *indices = NULL; + HRESULT hr; + ID3DXBuffer *vertex_remap = NULL; + DWORD *dword_indices = NULL; + DWORD new_num_vertices = 0; + DWORD new_vertex_buffer_size = 0; + IDirect3DVertexBuffer9 *vertex_buffer = NULL; + DWORD i; - FIXME("(%p)->(%u,%p,%p,%p,%p): stub\n", This, flags, adjacency_in, adjacency_out, face_remap, vertex_remap); + TRACE("(%p)->(%x,%p,%p,%p,%p)\n", This, flags, adjacency_in, adjacency_out, face_remap_out, vertex_remap_out); - return E_NOTIMPL; + if (!flags) + return D3DERR_INVALIDCALL; + if (!adjacency_in && (flags & (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER))) + return D3DERR_INVALIDCALL; + if ((flags & (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) == (D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) + return D3DERR_INVALIDCALL; + + if (flags & (D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_VERTEXCACHE | D3DXMESHOPT_STRIPREORDER)) + { + if (flags & D3DXMESHOPT_ATTRSORT) + FIXME("D3DXMESHOPT_ATTRSORT not implemented.\n"); + if (flags & D3DXMESHOPT_VERTEXCACHE) + FIXME("D3DXMESHOPT_VERTEXCACHE not implemented.\n"); + if (flags & D3DXMESHOPT_STRIPREORDER) + FIXME("D3DXMESHOPT_STRIPREORDER not implemented.\n"); + return E_NOTIMPL; + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, 0, (void**)&indices); + if (FAILED(hr)) goto cleanup; + + dword_indices = HeapAlloc(GetProcessHeap(), 0, This->numfaces * 3 * sizeof(DWORD)); + if (!dword_indices) return E_OUTOFMEMORY; + if (This->options & D3DXMESH_32BIT) { + memcpy(dword_indices, indices, This->numfaces * 3 * sizeof(DWORD)); + } else { + WORD *word_indices = indices; + for (i = 0; i < This->numfaces * 3; i++) + dword_indices[i] = *word_indices++; + } + + if ((flags & (D3DXMESHOPT_COMPACT | D3DXMESHOPT_IGNOREVERTS)) == D3DXMESHOPT_COMPACT) + { + /* Remove unused vertices. */ + DWORD *vertex_remap_ptr; + + new_vertex_buffer_size = This->numvertices; + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + if (FAILED(hr)) goto cleanup; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + + for (i = 0; i < This->numfaces * 3; i++) + vertex_remap_ptr[dword_indices[i]] = 1; + + /* create old->new vertex mapping */ + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i]) + vertex_remap_ptr[i] = new_num_vertices++; + else + vertex_remap_ptr[i] = -1; + } + /* convert indices */ + for (i = 0; i < This->numfaces * 3; i++) + dword_indices[i] = vertex_remap_ptr[dword_indices[i]]; + + /* create new->old vertex mapping */ + new_num_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i] != -1) + vertex_remap_ptr[new_num_vertices++] = i; + } + for (i = new_num_vertices; i < This->numvertices; i++) + vertex_remap_ptr[i] = -1; + } + + if (vertex_remap) + { + /* reorder the vertices using vertex_remap */ + D3DVERTEXBUFFER_DESC vertex_desc; + DWORD *vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + DWORD vertex_size = iface->lpVtbl->GetNumBytesPerVertex(iface); + BYTE *orig_vertices; + BYTE *new_vertices; + + hr = IDirect3DVertexBuffer9_GetDesc(This->vertex_buffer, &vertex_desc); + if (FAILED(hr)) goto cleanup; + + new_vertex_buffer_size *= vertex_size; + hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_vertex_buffer_size, + vertex_desc.Usage, This->fvf, vertex_desc.Pool, &vertex_buffer, NULL); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, (void**)&orig_vertices, D3DLOCK_READONLY); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, D3DLOCK_DISCARD); + if (FAILED(hr)) { + IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); + goto cleanup; + } + + for (i = 0; i < new_num_vertices; i++) + memcpy(new_vertices + i * vertex_size, orig_vertices + vertex_remap_ptr[i] * vertex_size, vertex_size); + + IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); + IDirect3DVertexBuffer9_Unlock(vertex_buffer); + } else if (vertex_remap_out) { + DWORD *vertex_remap_ptr; + + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + if (FAILED(hr)) goto cleanup; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); + for (i = 0; i < This->numvertices; i++) + *vertex_remap_ptr++ = i; + } + + if (This->options & D3DXMESH_32BIT) { + memcpy(indices, dword_indices, This->numfaces * 3 * sizeof(DWORD)); + } else { + WORD *word_indices = indices; + for (i = 0; i < This->numfaces * 3; i++) + *word_indices++ = dword_indices[i]; + } + + if (adjacency_out) { + memcpy(adjacency_out, adjacency_in, This->numfaces * 3 * sizeof(*adjacency_out)); + } + if (face_remap_out) { + for (i = 0; i < This->numfaces; i++) + face_remap_out[i] = i; + } + if (vertex_remap_out) + *vertex_remap_out = vertex_remap; + vertex_remap = NULL; + + if (vertex_buffer) { + IDirect3DVertexBuffer9_Release(This->vertex_buffer); + This->vertex_buffer = vertex_buffer; + vertex_buffer = NULL; + This->numvertices = new_num_vertices; + } + + hr = D3D_OK; +cleanup: + HeapFree(GetProcessHeap(), 0, dword_indices); + if (vertex_remap) ID3DXBuffer_Release(vertex_remap); + if (vertex_buffer) IDirect3DVertexBuffer9_Release(vertex_buffer); + if (indices) iface->lpVtbl->UnlockIndexBuffer(iface); + return hr; } static HRESULT WINAPI ID3DXMeshImpl_SetAttributeTable(ID3DXMesh *iface, CONST D3DXATTRIBUTERANGE *attrib_table, DWORD attrib_table_size)

1 0

Dylan Smith : d3dx9: Implement ID3DXMesh:: CloneMesh without vertex buffer conversion.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: e62a4276ed381525f58e531b3a6f73c52f37d1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62a4276ed381525f58e531b3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 9 06:30:34 2011 -0400 d3dx9: Implement ID3DXMesh::CloneMesh without vertex buffer conversion. --- dlls/d3dx9_36/mesh.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 96 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 4dffa62..cfb19bc 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -25,6 +25,7 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #define NONAMELESSUNION #include "windef.h" #include "wingdi.h" @@ -232,20 +233,110 @@ static HRESULT WINAPI ID3DXMeshImpl_GetDevice(ID3DXMesh *iface, LPDIRECT3DDEVICE static HRESULT WINAPI ID3DXMeshImpl_CloneMeshFVF(ID3DXMesh *iface, DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH *clone_mesh) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; - FIXME("(%p)->(%u,%u,%p,%p): stub\n", This, options, fvf, device, clone_mesh); + TRACE("(%p)->(%x,%x,%p,%p)\n", This, options, fvf, device, clone_mesh); - return E_NOTIMPL; + hr = D3DXDeclaratorFromFVF(fvf, declaration); + if (FAILED(hr)) return hr; + + return iface->lpVtbl->CloneMesh(iface, options, declaration, device, clone_mesh); } static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(ID3DXMesh *iface, DWORD options, CONST D3DVERTEXELEMENT9 *declaration, LPDIRECT3DDEVICE9 device, - LPD3DXMESH *clone_mesh) + LPD3DXMESH *clone_mesh_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + ID3DXMeshImpl *cloned_this; + ID3DXMesh *clone_mesh; + D3DVERTEXELEMENT9 orig_declaration[MAX_FVF_DECL_SIZE] = { D3DDECL_END() }; + void *data_in, *data_out; + DWORD vertex_size; + HRESULT hr; + int i; - FIXME("(%p)->(%u,%p,%p,%p): stub\n", This, options, declaration, device, clone_mesh); + TRACE("(%p)->(%x,%p,%p,%p)\n", This, options, declaration, device, clone_mesh_out); - return E_NOTIMPL; + if (!clone_mesh_out) + return D3DERR_INVALIDCALL; + + hr = iface->lpVtbl->GetDeclaration(iface, orig_declaration); + if (FAILED(hr)) return hr; + + for (i = 0; orig_declaration[i].Stream != 0xff; i++) { + if (memcmp(&orig_declaration[i], &declaration[i], sizeof(*declaration))) + { + FIXME("Vertex buffer conversion not implemented.\n"); + return E_NOTIMPL; + } + } + + hr = D3DXCreateMesh(This->numfaces, This->numvertices, options & ~D3DXMESH_VB_SHARE, + declaration, device, &clone_mesh); + if (FAILED(hr)) return hr; + + cloned_this = impl_from_ID3DXMesh(clone_mesh); + vertex_size = clone_mesh->lpVtbl->GetNumBytesPerVertex(clone_mesh); + + if (options & D3DXMESH_VB_SHARE) { + IDirect3DVertexBuffer9_AddRef(This->vertex_buffer); + /* FIXME: refactor to avoid creating a new vertex buffer */ + IDirect3DVertexBuffer9_Release(cloned_this->vertex_buffer); + cloned_this->vertex_buffer = This->vertex_buffer; + } else { + hr = iface->lpVtbl->LockVertexBuffer(iface, D3DLOCK_READONLY, &data_in); + if (FAILED(hr)) goto error; + hr = clone_mesh->lpVtbl->LockVertexBuffer(clone_mesh, D3DLOCK_DISCARD, &data_out); + if (FAILED(hr)) { + iface->lpVtbl->UnlockVertexBuffer(iface); + goto error; + } + memcpy(data_out, data_in, This->numvertices * vertex_size); + clone_mesh->lpVtbl->UnlockVertexBuffer(clone_mesh); + iface->lpVtbl->UnlockVertexBuffer(iface); + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, &data_in); + if (FAILED(hr)) goto error; + hr = clone_mesh->lpVtbl->LockIndexBuffer(clone_mesh, D3DLOCK_DISCARD, &data_out); + if (FAILED(hr)) { + iface->lpVtbl->UnlockIndexBuffer(iface); + goto error; + } + if ((options ^ This->options) & D3DXMESH_32BIT) { + if (options & D3DXMESH_32BIT) { + for (i = 0; i < This->numfaces * 3; i++) + ((DWORD*)data_out)[i] = ((WORD*)data_in)[i]; + } else { + for (i = 0; i < This->numfaces * 3; i++) + ((WORD*)data_out)[i] = ((DWORD*)data_in)[i]; + } + } else { + memcpy(data_out, data_in, This->numfaces * 3 * (options & D3DXMESH_32BIT ? 4 : 2)); + } + clone_mesh->lpVtbl->UnlockIndexBuffer(clone_mesh); + iface->lpVtbl->UnlockIndexBuffer(iface); + + memcpy(cloned_this->attrib_buffer, This->attrib_buffer, This->numfaces * sizeof(*This->attrib_buffer)); + + if (This->attrib_table_size) + { + cloned_this->attrib_table_size = This->attrib_table_size; + cloned_this->attrib_table = HeapAlloc(GetProcessHeap(), 0, This->attrib_table_size * sizeof(*This->attrib_table)); + if (!cloned_this->attrib_table) { + hr = E_OUTOFMEMORY; + goto error; + } + memcpy(cloned_this->attrib_table, This->attrib_table, This->attrib_table_size * sizeof(*This->attrib_table)); + } + + *clone_mesh_out = clone_mesh; + + return D3D_OK; +error: + IUnknown_Release(clone_mesh); + return hr; } static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(ID3DXMesh *iface, LPDIRECT3DVERTEXBUFFER9 *vertex_buffer)

1 0

Jacek Caban : wininet: Added support for persistent HTTP connections.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 8a1df203ae347946936d2677154939b1fa9dde3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1df203ae347946936d26771… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 10 09:26:43 2011 +0000 wininet: Added support for persistent HTTP connections. --- dlls/urlmon/tests/protocol.c | 2 +- dlls/urlmon/tests/url.c | 26 +- dlls/wininet/http.c | 680 ++++++++++++++++++++++++++---------------- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 43 ++- dlls/wininet/netconnection.c | 168 +++++------ dlls/wininet/tests/http.c | 32 +-- 7 files changed, 546 insertions(+), 407 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a1df203ae347946936d2…

1 0

André Hentschel : kernel32: Forward registry functions to advapi32.
by Alexandre Julliard 10 May '11

10 May '11

Module: wine Branch: master Commit: 28c8e228f52bc6a6bebe94e90b573a315d48a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c8e228f52bc6a6bebe94e90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 9 22:29:41 2011 +0200 kernel32: Forward registry functions to advapi32. --- dlls/kernel32/kernel32.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2ac24b4..01939c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -914,6 +914,48 @@ @ stdcall ReadFileEx(long ptr long ptr ptr) @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) +@ stdcall RegCloseKey(long) advapi32.RegCloseKey +@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA +@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW +@ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA +@ stdcall RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW +@ stdcall RegDeleteTreeA(long str) advapi32.RegDeleteTreeA +@ stdcall RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW +@ stdcall RegDeleteValueA(long str) advapi32.RegDeleteValueA +@ stdcall RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +# stub RegDisablePredefinedCacheEx +@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA +@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW +@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA +@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW +@ stdcall RegFlushKey(long) advapi32.RegFlushKey +@ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity +@ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +# stub RegKrnGetGlobalState +# stub RegKrnInitialize +@ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA +@ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW +@ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA +@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW +@ stdcall RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue +@ stdcall RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser +@ stdcall RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA +@ stdcall RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW +@ stdcall RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot +@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA +@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW +@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA +@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW +@ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA +@ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW +# stub RegSaveKeyExA +# stub RegSaveKeyExW +@ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity +@ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA +@ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW +@ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA +@ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME @ stub RegisterConsoleOS2

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011