August 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Moving a window should only expose the immediate parent.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: 5bd497f3caa9c681b6d50c48f4a84b0b9d7eecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd497f3caa9c681b6d50c48f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 15:21:19 2007 +0200 server: Moving a window should only expose the immediate parent. --- dlls/user32/tests/win.c | 18 ++++++------------ server/window.c | 31 +++++++++++-------------------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34aadb1..f3a2ac3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4231,12 +4231,9 @@ static void test_GetUpdateRect(void) ShowWindow(hchild, SW_HIDE); SetRect(&rc2, 0, 0, 0, 0); GetUpdateRect(hgrandparent, &rc1, FALSE); - todo_wine - { - ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", - rc1.left, rc1.top, rc1.right, rc1.bottom, - rc2.left, rc2.top, rc2.right, rc2.bottom); - } + ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, + rc2.left, rc2.top, rc2.right, rc2.bottom); SetRect(&rc2, 10, 10, 40, 40); GetUpdateRect(hparent, &rc1, FALSE); @@ -4277,12 +4274,9 @@ static void test_GetUpdateRect(void) ShowWindow(hchild, SW_HIDE); SetRect(&rc2, 0, 0, 0, 0); GetUpdateRect(hgrandparent, &rc1, FALSE); - todo_wine - { - ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", - rc1.left, rc1.top, rc1.right, rc1.bottom, - rc2.left, rc2.top, rc2.right, rc2.bottom); - } + ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, + rc2.left, rc2.top, rc2.right, rc2.bottom); SetRect(&rc2, 10, 10, 40, 40); GetUpdateRect(hparent, &rc1, FALSE); diff --git a/server/window.c b/server/window.c index c930992..8971dc6 100644 --- a/server/window.c +++ b/server/window.c @@ -1293,28 +1293,19 @@ static unsigned int get_window_update_flags( struct window *win, struct window * } -/* expose a region of a window, looking for the top most parent that needs to be exposed */ +/* expose a region of a window on its parent */ /* the region is in window coordinates */ -static void expose_window( struct window *win, struct window *top, struct region *region ) +static void expose_window( struct window *win, struct region *region ) { - struct window *parent, *ptr; - int offset_x, offset_y; - - /* find the top most parent that doesn't clip either siblings or children */ - for (parent = ptr = win; ptr != top; ptr = ptr->parent) - { - if (!(ptr->style & WS_CLIPCHILDREN)) parent = ptr; - if (!(ptr->style & WS_CLIPSIBLINGS)) parent = ptr->parent; - } - if (parent == win && parent != top && win->parent) - parent = win->parent; /* always go up at least one level if possible */ + struct window *parent = win; + int offset_x = win->window_rect.left - win->client_rect.left; + int offset_y = win->window_rect.top - win->client_rect.top; - offset_x = win->window_rect.left - win->client_rect.left; - offset_y = win->window_rect.top - win->client_rect.top; - for (ptr = win; ptr != parent && !is_desktop_window(ptr); ptr = ptr->parent) + if (win->parent && !is_desktop_window(win->parent)) { - offset_x += ptr->client_rect.left; - offset_y += ptr->client_rect.top; + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + parent = win->parent; } offset_region( region, offset_x, offset_y ); redraw_window( parent, region, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); @@ -1370,7 +1361,7 @@ static void set_window_pos( struct window *win, struct window *previous, offset_region( old_vis_rgn, old_window_rect.left - window_rect->left, old_window_rect.top - window_rect->top ); if (xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) - expose_window( win, top, new_vis_rgn ); + expose_window( win, new_vis_rgn ); } free_region( old_vis_rgn ); @@ -1455,7 +1446,7 @@ static void set_window_region( struct window *win, struct region *region, int re { /* expose anything revealed by the change */ if (xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) - expose_window( win, top, new_vis_rgn ); + expose_window( win, new_vis_rgn ); free_region( new_vis_rgn ); }

1 0

Alexandre Julliard : server: Store a separate flag for windows that need to be erased in WM_PAINT.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: df13cee288de4b57614253db9bcd7700bbfa99cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=df13cee288de4b57614253db9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 16:41:08 2007 +0200 server: Store a separate flag for windows that need to be erased in WM_PAINT. This avoids the need to invalidate the window after WM_ERASEBKGND. --- dlls/user32/painting.c | 25 ++++++++++++++----------- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/window.c | 31 +++++++++++++++++++++++-------- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 22dd6c2..9ba4a7a 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -243,7 +243,7 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) static BOOL send_erase( HWND hwnd, UINT flags, HRGN client_rgn, RECT *clip_rect, HDC *hdc_ret ) { - BOOL need_erase = FALSE; + BOOL need_erase = (flags & UPDATE_DELAYED_ERASE) != 0; HDC hdc = 0; RECT dummy; @@ -263,12 +263,7 @@ static BOOL send_erase( HWND hwnd, UINT flags, HRGN client_rgn, if (type != NULLREGION) need_erase = !SendMessageW( hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0 ); } - if (!hdc_ret) - { - if (need_erase && hwnd != GetDesktopWindow()) /* FIXME: mark it as needing erase again */ - RedrawWindow( hwnd, clip_rect, 0, RDW_INVALIDATE | RDW_ERASE | RDW_NOCHILDREN ); - USER_Driver->pReleaseDC( hwnd, hdc, TRUE ); - } + if (!hdc_ret) USER_Driver->pReleaseDC( hwnd, hdc, TRUE ); } if (hdc_ret) *hdc_ret = hdc; @@ -287,6 +282,7 @@ void erase_now( HWND hwnd, UINT rdw_flags ) { HWND child = 0; HRGN hrgn; + BOOL need_erase = FALSE; /* loop while we find a child to repaint */ for (;;) @@ -295,12 +291,13 @@ void erase_now( HWND hwnd, UINT rdw_flags ) if (rdw_flags & RDW_NOCHILDREN) flags |= UPDATE_NOCHILDREN; else if (rdw_flags & RDW_ALLCHILDREN) flags |= UPDATE_ALLCHILDREN; + if (need_erase) flags |= UPDATE_DELAYED_ERASE; if (!(hrgn = send_ncpaint( hwnd, &child, &flags ))) break; - send_erase( child, flags, hrgn, NULL, NULL ); + need_erase = send_erase( child, flags, hrgn, NULL, NULL ); if (!flags) break; /* nothing more to do */ - if (rdw_flags & RDW_NOCHILDREN) break; + if ((rdw_flags & RDW_NOCHILDREN) && !need_erase) break; } } @@ -736,7 +733,11 @@ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) POINT offset; retval = CombineRgn( hrgn, update_rgn, 0, RGN_COPY ); - send_erase( hwnd, flags, update_rgn, NULL, NULL ); + if (send_erase( hwnd, flags, update_rgn, NULL, NULL )) + { + flags = UPDATE_DELAYED_ERASE; + get_update_flags( hwnd, NULL, &flags ); + } /* map region to client coordinates */ offset.x = offset.y = 0; ScreenToClient( hwnd, &offset ); @@ -753,6 +754,7 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase ) { UINT flags = UPDATE_NOCHILDREN; HRGN update_rgn; + BOOL need_erase; if (erase) flags |= UPDATE_NONCLIENT | UPDATE_ERASE; @@ -768,10 +770,11 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase ) ReleaseDC( hwnd, hdc ); } } - send_erase( hwnd, flags, update_rgn, NULL, NULL ); + need_erase = send_erase( hwnd, flags, update_rgn, NULL, NULL ); /* check if we still have an update region */ flags = UPDATE_PAINT | UPDATE_NOCHILDREN; + if (need_erase) flags |= UPDATE_DELAYED_ERASE; return (get_update_flags( hwnd, NULL, &flags ) && (flags & UPDATE_PAINT)); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e0f7f8b..71d0709 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3073,6 +3073,7 @@ struct get_update_region_reply #define UPDATE_ALLCHILDREN 0x10 #define UPDATE_NOCHILDREN 0x20 #define UPDATE_NOREGION 0x40 +#define UPDATE_DELAYED_ERASE 0x80 @@ -4730,6 +4731,6 @@ union generic_reply struct make_process_system_reply make_process_system_reply; }; -#define SERVER_PROTOCOL_VERSION 309 +#define SERVER_PROTOCOL_VERSION 310 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 6e13cb2..aaf6c2e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2256,6 +2256,7 @@ enum message_type #define UPDATE_ALLCHILDREN 0x10 /* force repaint of all children */ #define UPDATE_NOCHILDREN 0x20 /* don't try to repaint any children */ #define UPDATE_NOREGION 0x40 /* don't return a region, only the flags */ +#define UPDATE_DELAYED_ERASE 0x80 /* still needs erase after BeginPaint */ /* Update the z order of a window so that a given rectangle is fully visible */ diff --git a/server/window.c b/server/window.c index 8971dc6..14d6468 100644 --- a/server/window.c +++ b/server/window.c @@ -88,9 +88,10 @@ struct window char extra_bytes[1]; /* extra bytes storage */ }; -#define PAINT_INTERNAL 0x01 /* internal WM_PAINT pending */ -#define PAINT_ERASE 0x02 /* needs WM_ERASEBKGND */ -#define PAINT_NONCLIENT 0x04 /* needs WM_NCPAINT */ +#define PAINT_INTERNAL 0x01 /* internal WM_PAINT pending */ +#define PAINT_ERASE 0x02 /* needs WM_ERASEBKGND */ +#define PAINT_NONCLIENT 0x04 /* needs WM_NCPAINT */ +#define PAINT_DELAYED_ERASE 0x08 /* still needs erase after WM_ERASEBKGND */ /* growable array of user handles */ struct user_handle_array @@ -978,7 +979,7 @@ static void set_update_region( struct window *win, struct region *region ) inc_window_paint_count( win, -1 ); free_region( win->update_region ); } - win->paint_flags &= ~(PAINT_ERASE | PAINT_NONCLIENT); + win->paint_flags &= ~(PAINT_ERASE | PAINT_DELAYED_ERASE | PAINT_NONCLIENT); win->update_region = NULL; if (region) free_region( region ); } @@ -1122,7 +1123,7 @@ static void redraw_window( struct window *win, struct region *region, int frame, set_update_region( win, tmp ); } if (flags & RDW_NOFRAME) validate_non_client( win ); - if (flags & RDW_NOERASE) win->paint_flags &= ~PAINT_ERASE; + if (flags & RDW_NOERASE) win->paint_flags &= ~(PAINT_ERASE | PAINT_DELAYED_ERASE); } } @@ -1178,11 +1179,19 @@ static unsigned int get_update_flags( struct window *win, unsigned int flags ) } if (flags & UPDATE_PAINT) { - if (win->update_region) ret |= UPDATE_PAINT; + if (win->update_region) + { + if (win->paint_flags & PAINT_DELAYED_ERASE) ret |= UPDATE_DELAYED_ERASE; + ret |= UPDATE_PAINT; + } } if (flags & UPDATE_INTERNALPAINT) { - if (win->paint_flags & PAINT_INTERNAL) ret |= UPDATE_INTERNALPAINT; + if (win->paint_flags & PAINT_INTERNAL) + { + ret |= UPDATE_INTERNALPAINT; + if (win->paint_flags & PAINT_DELAYED_ERASE) ret |= UPDATE_DELAYED_ERASE; + } } return ret; } @@ -1943,6 +1952,12 @@ DECL_HANDLER(get_update_region) } } + if (flags & UPDATE_DELAYED_ERASE) /* this means that the previous call didn't erase */ + { + if (from_child) from_child->paint_flags |= PAINT_DELAYED_ERASE; + else win->paint_flags |= PAINT_DELAYED_ERASE; + } + reply->flags = get_window_update_flags( win, from_child, flags, &win ); reply->child = win->handle; @@ -1975,7 +1990,7 @@ DECL_HANDLER(get_update_region) if (reply->flags & UPDATE_NONCLIENT) validate_non_client( win ); if (reply->flags & UPDATE_ERASE) { - win->paint_flags &= ~PAINT_ERASE; + win->paint_flags &= ~(PAINT_ERASE | PAINT_DELAYED_ERASE); /* desktop window only gets erased, not repainted */ if (is_desktop_window(win)) validate_whole_window( win ); }

1 0

Alexandre Julliard : secur32: Set the close on exec flag on the ntlm_auth pipes.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: 4cda5ca96c0c6c51099db8d1da72eb7d1ba0169c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cda5ca96c0c6c51099db8d1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 18:27:59 2007 +0200 secur32: Set the close on exec flag on the ntlm_auth pipes. --- dlls/secur32/dispatcher.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 08b1b74..226de79 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -117,8 +117,10 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, helper->session_key = NULL; helper->neg_flags = 0; helper->pipe_in = pipe_in[0]; + fcntl( pipe_in[0], F_SETFD, 1 ); close(pipe_in[1]); helper->pipe_out = pipe_out[1]; + fcntl( pipe_out[1], F_SETFD, 1 ); close(pipe_out[0]); }

1 0

Alexandre Julliard : winex11: Child windows don' t get activated even when requested, so don't make them managed either.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: effdfa7da44f829a1a08929760081e02541897d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=effdfa7da44f829a1a0892976… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 12:37:14 2007 +0200 winex11: Child windows don't get activated even when requested, so don't make them managed either. --- dlls/winex11.drv/window.c | 5 ++++- dlls/winex11.drv/winpos.c | 4 +--- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f7a0909..24f89f8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -66,7 +66,7 @@ static const char visual_id_prop[] = "__wine_x11_visual_id"; * * Check if a given window should be managed */ -BOOL is_window_managed( HWND hwnd, const RECT *window_rect ) +BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ) { DWORD style, ex_style; @@ -76,6 +76,9 @@ BOOL is_window_managed( HWND hwnd, const RECT *window_rect ) /* child windows are not managed */ style = GetWindowLongW( hwnd, GWL_STYLE ); if ((style & (WS_CHILD|WS_POPUP)) == WS_CHILD) return FALSE; + /* activated windows are managed */ + if (!(swp_flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW))) return TRUE; + if (hwnd == GetActiveWindow()) return TRUE; /* windows with caption are managed */ if ((style & WS_CAPTION) == WS_CAPTION) return TRUE; /* tool windows are not managed */ diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 5499ef0..085396c 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -252,9 +252,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, root_window == DefaultRootWindow( display ) && data->whole_window != root_window) { - if (!(swp_flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) || - is_window_managed( hwnd, rectWindow ) || - hwnd == GetActiveWindow()) + if (is_window_managed( hwnd, swp_flags, rectWindow )) { TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); make_managed = TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8594e20..1583411 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -684,7 +684,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ); extern int X11DRV_check_error(void); -extern BOOL is_window_managed( HWND hwnd, const RECT *window_rect ); +extern BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ); extern void X11DRV_set_iconic_state( HWND hwnd ); extern void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ); extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect );

1 0

Maarten Lankhorst : dsound: Handle secondary hardware buffers more correctly.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: 7ce277d0186bf6577b6f09c76ccc595b62b3ef2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce277d0186bf6577b6f09c76… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 26 17:34:45 2007 +0200 dsound: Handle secondary hardware buffers more correctly. Only try hardware if asked for it, then return an error instead of falling back to software. --- dlls/dsound/buffer.c | 91 ++++++++++++++++++-------------------------------- 1 files changed, 33 insertions(+), 58 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 4194403..1a99927 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -725,7 +725,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock( if (!p2) x2 = 0; - if (x1 || x2) + if (!This->hwbuf && (x1 || x2)) { RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) @@ -1021,8 +1021,16 @@ HRESULT IDirectSoundBufferImpl_Create( if (wfex->wBitsPerSample==16) capf |= DSCAPS_SECONDARY16BIT; else capf |= DSCAPS_SECONDARY8BIT; - use_hw = (device->drvcaps.dwFlags & capf) == capf; - TRACE("use_hw = 0x%08x, capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", use_hw, capf, device->drvcaps.dwFlags); + use_hw = !!(dsbd->dwFlags & DSBCAPS_LOCHARDWARE); + TRACE("use_hw = %d, capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", use_hw, capf, device->drvcaps.dwFlags); + if (use_hw && (device->drvcaps.dwFlags & capf) != capf) + { + WARN("Format not supported for hardware buffer\n"); + HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb); + *pdsb = NULL; + return DSERR_BADFORMAT; + } /* FIXME: check hardware sample rate mixing capabilities */ /* FIXME: check app hints for software/hardware buffer (STATIC, LOCHARDWARE, etc) */ @@ -1050,10 +1058,6 @@ HRESULT IDirectSoundBufferImpl_Create( *pdsb = NULL; return DSERR_OUTOFMEMORY; } - dsb->buffer->ref = 1; - list_init(&dsb->buffer->buffers); - list_add_head(&dsb->buffer->buffers, &dsb->entry); - FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); } /* Allocate the hardware buffer */ @@ -1061,29 +1065,24 @@ HRESULT IDirectSoundBufferImpl_Create( err = IDsDriver_CreateSoundBuffer(device->driver,wfex,dsbd->dwFlags,0, &(dsb->buflen),&(dsb->buffer->memory), (LPVOID*)&(dsb->hwbuf)); - /* fall back to software buffer on failure */ - if (err != DS_OK) { - TRACE("IDsDriver_CreateSoundBuffer failed, falling back to software buffer\n"); - use_hw = 0; - if (device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) { - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (dsb->buffer->memory == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; - return DSERR_OUTOFMEMORY; - } - dsb->buffer->ref = 1; - list_init(&dsb->buffer->buffers); - list_add_head(&dsb->buffer->buffers, &dsb->entry); - FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); - } - err = DS_OK; + if (FAILED(err)) + { + WARN("Failed to create hardware secondary buffer: %08x\n", err); + if (device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) + HeapFree(GetProcessHeap(),0,dsb->buffer->memory); + HeapFree(GetProcessHeap(),0,dsb->buffer); + HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb); + *pdsb = NULL; + return DSERR_GENERIC; } } + dsb->buffer->ref = 1; + list_init(&dsb->buffer->buffers); + list_add_head(&dsb->buffer->buffers, &dsb->entry); + FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + /* It's not necessary to initialize values to zero since */ /* we allocated this structure with HEAP_ZERO_MEMORY... */ dsb->buf_mixpos = dsb->sec_mixpos = 0; @@ -1201,40 +1200,16 @@ HRESULT IDirectSoundBufferImpl_Duplicate( hres = IDsDriver_DuplicateSoundBuffer(device->driver, pdsb->hwbuf, (LPVOID *)&dsb->hwbuf); - if (hres != DS_OK) { - TRACE("IDsDriver_DuplicateSoundBuffer failed, falling back to " - "software buffer\n"); - dsb->hwbuf = NULL; - /* allocate buffer */ - if (device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) { - dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); - if (dsb->buffer == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb); - *ppdsb = NULL; - return DSERR_OUTOFMEMORY; - } - - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (dsb->buffer->memory == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb); - *ppdsb = NULL; - return DSERR_OUTOFMEMORY; - } - dsb->buffer->ref = 1; - list_init(&dsb->buffer->buffers); - list_add_head(&dsb->buffer->buffers, &dsb->entry); - /* FIXME: copy buffer ? */ - } + if (FAILED(hres)) { + WARN("IDsDriver_DuplicateSoundBuffer failed (%08x)\n", hres); + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return hres; } - } else { - dsb->hwbuf = NULL; - dsb->buffer->ref++; - list_add_head(&dsb->buffer->buffers, &dsb->entry); } + dsb->buffer->ref++; + list_add_head(&dsb->buffer->buffers, &dsb->entry); dsb->ref = 0; dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0;

1 0

Maarten Lankhorst : dsound: Make sure waveOutClose is only called when using mmsystem.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: 3838a770c15a82e0996f09d533c83a83ba2537cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3838a770c15a82e0996f09d53… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 26 17:20:21 2007 +0200 dsound: Make sure waveOutClose is only called when using mmsystem. --- dlls/dsound/primary.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 2470675..44b453a 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -81,15 +81,16 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) (LPVOID*)&(device->hwbuf)); if (err != DS_OK) { - WARN("IDsDriver_CreateSoundBuffer failed, falling back to waveout\n"); + WARN("IDsDriver_CreateSoundBuffer failed (%08x), falling back to waveout\n", err); /* Wine-only: close wine directsound driver, then reopen without WAVE_DIRECTSOUND */ - device->drvdesc.dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT; IDsDriver_Close(device->driver); - waveOutClose(device->hwo); + if (device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMOPEN) + waveOutClose(device->hwo); IDsDriver_Release(device->driver); device->driver = NULL; device->buffer = NULL; device->hwo = 0; + device->drvdesc.dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT; err = mmErr(waveOutOpen(&(device->hwo), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD)device, CALLBACK_FUNCTION)); if (err != DS_OK) { @@ -207,8 +208,11 @@ static void DSOUND_PrimaryClose(DirectSoundDevice *device) /* clear the queue */ device->pwqueue = 0; } else { - if (IDsDriverBuffer_Release(device->hwbuf) == 0) + ULONG ref = IDsDriverBuffer_Release(device->hwbuf); + if (!ref) device->hwbuf = 0; + else + ERR("Still %d references on primary buffer, refcount leak?\n", ref); } }

1 0

Aric Stewart : imm32: If composition string is reduced to 0 characters hide composition window.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: ede59b0c05f268c10bea4f5ff03cd980c1d2f5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede59b0c05f268c10bea4f5ff… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 27 18:08:38 2007 +0900 imm32: If composition string is reduced to 0 characters hide composition window. --- dlls/imm32/imm.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 26d0b51..ac5c6eb 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -74,7 +74,7 @@ static UINT WM_MSIME_DOCUMENTFEED; */ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -static void UpdateDataInDefaultIMEWindow(HWND hwnd); +static void UpdateDataInDefaultIMEWindow(HWND hwnd, BOOL showable); static void ImmInternalPostIMEMessage(UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); @@ -1672,7 +1672,7 @@ BOOL WINAPI ImmSetCompositionStringW( } } - UpdateDataInDefaultIMEWindow(hwndDefault); + UpdateDataInDefaultIMEWindow(hwndDefault,FALSE); ImmInternalPostIMEMessage(WM_IME_COMPOSITION, wParam, flags); @@ -2033,9 +2033,24 @@ static void PaintDefaultIMEWnd(HWND hwnd) EndPaint(hwnd,&ps); } -static void UpdateDataInDefaultIMEWindow(HWND hwnd) +static void UpdateDataInDefaultIMEWindow(HWND hwnd, BOOL showable) { + LPCOMPOSITIONSTRING compstr; + + if (root_context->IMC.hCompStr) + compstr = ImmLockIMCC(root_context->IMC.hCompStr); + else + compstr = NULL; + + if (compstr == NULL || compstr->dwCompStrLen == 0) + ShowWindow(hwndDefault,SW_HIDE); + else if (showable) + ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); + RedrawWindow(hwnd,NULL,NULL,RDW_ERASENOW|RDW_INVALIDATE); + + if (compstr != NULL) + ImmUnlockIMCC(root_context->IMC.hCompStr); } /* @@ -2075,7 +2090,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, if (lParam & GCS_RESULTSTR) IMM_PostResult(root_context); else - UpdateDataInDefaultIMEWindow(hwnd); + UpdateDataInDefaultIMEWindow(hwnd,TRUE); break; case WM_IME_STARTCOMPOSITION: TRACE("IME message %s, 0x%x, 0x%x\n",

1 0

James Hawkins : cabinet: Don't extract a file if DoExtract is FALSE.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: a72e1820100825a7027cf07ecbeb6431723e00b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72e1820100825a7027cf07ec… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Aug 26 20:15:41 2007 -0500 cabinet: Don't extract a file if DoExtract is FALSE. --- dlls/advpack/files.c | 30 ++++++++---------------------- dlls/cabinet/cabinet.h | 2 +- dlls/cabinet/cabinet_main.c | 16 +++++++++------- dlls/cabinet/tests/extract.c | 19 +++++++++---------- 4 files changed, 27 insertions(+), 40 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index d0f948c..7dc816f 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -523,7 +523,7 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT struct FILELIST{ LPSTR FileName; struct FILELIST *next; - BOOL Extracted; + BOOL DoExtract; }; typedef struct { @@ -621,14 +621,12 @@ static BOOL file_in_list(LPCSTR szFile, LPCSTR szFileList) return FALSE; } -/* removes nodes from the linked list that aren't specified in szFileList - * returns the number of files that are in both the linked list and szFileList - */ + +/* returns the number of files that are in both the linked list and szFileList */ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileList) { DWORD dwNumFound = 0; struct FILELIST *pNode; - struct FILELIST *prev = NULL; session->Operation |= EXTRACT_FILLFILELIST; if (pExtract(session, szCabName)) @@ -640,24 +638,12 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis pNode = session->FileList; while (pNode) { - if (file_in_list(pNode->FileName, szFileList)) - { - prev = pNode; - pNode = pNode->next; - dwNumFound++; - } - else if (prev) - { - prev->next = pNode->next; - free_file_node(pNode); - pNode = prev->next; - } + if (!file_in_list(pNode->FileName, szFileList)) + pNode->DoExtract = FALSE; else - { - session->FileList = pNode->next; - free_file_node(pNode); - pNode = session->FileList; - } + dwNumFound++; + + pNode = pNode->next; } session->Operation &= ~EXTRACT_FILLFILELIST; diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 3b72ff8..f566124 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -638,7 +638,7 @@ static const cab_UWORD Zipmask[17] = { struct FILELIST{ LPSTR FileName; struct FILELIST *next; - BOOL Extracted; + BOOL DoExtract; }; typedef struct { diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 50ef06e..9e2c18a 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -157,7 +157,7 @@ static long fdi_seek(INT_PTR hf, long dist, int seektype) static void fill_file_node(struct FILELIST *pNode, LPCSTR szFilename) { pNode->next = NULL; - pNode->Extracted = FALSE; + pNode->DoExtract = FALSE; pNode->FileName = HeapAlloc(GetProcessHeap(), 0, strlen(szFilename) + 1); lstrcpyA(pNode->FileName, szFilename); @@ -188,7 +188,7 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf { case fdintCOPY_FILE: { - struct FILELIST *fileList, *node; + struct FILELIST *fileList, *node = NULL; SESSION *pDestination = pfdin->pv; LPSTR szFullPath, szDirectory; HANDLE hFile = 0; @@ -215,7 +215,7 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf sizeof(struct FILELIST)); fill_file_node(fileList, pfdin->psz1); - fileList->Extracted = TRUE; + fileList->DoExtract = TRUE; fileList->next = pDestination->FileList; pDestination->FileList = fileList; lstrcpyA(pDestination->CurrentFile, szFullPath); @@ -225,8 +225,10 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf if ((pDestination->Operation & EXTRACT_EXTRACTFILES) || file_in_list(pDestination->FilterList, pfdin->psz1, NULL)) { - /* skip this file if it is not in the file list */ - if (!file_in_list(pDestination->FileList, pfdin->psz1, &node)) + /* find the file node */ + file_in_list(pDestination->FileList, pfdin->psz1, &node); + + if (node && !node->DoExtract) return 0; /* create the destination directory if it doesn't exist */ @@ -238,8 +240,8 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf if (hFile == INVALID_HANDLE_VALUE) hFile = 0; - else - node->Extracted = FALSE; + else if (node) + node->DoExtract = FALSE; } HeapFree(GetProcessHeap(), 0, szFullPath); diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 8cadfe2..5ce5ba8 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -39,7 +39,7 @@ struct FILELIST{ LPSTR FileName; struct FILELIST *next; - BOOL Extracted; + BOOL DoExtract; }; typedef struct { @@ -314,7 +314,7 @@ static void create_cab_file(void) ok(res, "Failed to destroy the cabinet\n"); } -static BOOL check_list(struct FILELIST **node, const char *filename, BOOL extracted) +static BOOL check_list(struct FILELIST **node, const char *filename, BOOL do_extract) { if (!*node) return FALSE; @@ -322,7 +322,7 @@ static BOOL check_list(struct FILELIST **node, const char *filename, BOOL extrac if (lstrcmpA((*node)->FileName, filename)) return FALSE; - if ((*node)->Extracted != extracted) + if ((*node)->DoExtract != do_extract) return FALSE; *node = (*node)->next; @@ -445,7 +445,9 @@ static void test_Extract(void) ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); ok(check_list(&node, "testdir\\d.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); @@ -472,13 +474,10 @@ static void test_Extract(void) "Expected dest\\testdir\\d.txt, got %s\n", session.CurrentFile); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); - todo_wine - { - ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); - ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); - ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); - ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); - } + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); ok(check_list(&node, "testdir\\d.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n");

1 0

Alexander Nicolaysen Sørnes : comdlg32: FindText: Fix text length in Norwegian template.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: 8d29abb08da9211d26ba027b658b3c5b801918b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d29abb08da9211d26ba027b6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 26 19:19:46 2007 +0200 comdlg32: FindText: Fix text length in Norwegian template. --- dlls/comdlg32/cdlg_No.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index 39b4d3e..ce8013c 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. S�rnes + * Copyright 2005-2007 Alexander N. S�rnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -189,10 +189,10 @@ FONT 8, "MS Shell Dlg" LTEXT "Fi&nn:", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill &mellom store/sm� bokstaver", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", grp1, 107, 26, 68, 28 - CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + CHECKBOX "Skill &mellom store og sm� bokstaver", chx2, 4, 42, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 137, 23, 40, 36 + CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 141, 31, 30, 12 + CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 141, 44, 30, 12 DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP @@ -210,7 +210,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Erstatt med:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn kun &hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill mellom store og sm� bokstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Skill mellom store og sm� bokstaver", chx2, 5, 62, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "E&rsatt", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP

1 0

Tijl Coosemans : libwine: Use GDT entry for %fs segment on FreeBSD.
by Alexandre Julliard Aug. 27, 2007

Aug. 27, 2007

Module: wine Branch: master Commit: f1fcf80a6954da448f09c2a2e3d9bcf6f422481b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1fcf80a6954da448f09c2a2e… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Sat Aug 25 17:46:32 2007 +0200 libwine: Use GDT entry for %fs segment on FreeBSD. --- libs/wine/ldt.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index ceb8db4..e05a962 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -112,9 +112,7 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) #include <machine/segments.h> - -extern int i386_get_ldt(int, union descriptor *, int); -extern int i386_set_ldt(int, union descriptor *, int); +#include <machine/sysarch.h> #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ #ifdef __APPLE__ @@ -417,6 +415,8 @@ unsigned short wine_ldt_alloc_fs(void) if (errno != ENOSYS) perror( "set_thread_area" ); } else global_fs_sel = (ldt_info.entry_number << 3) | 3; +#elif defined(__FreeBSD__) + global_fs_sel = GSEL( GUFS_SEL, SEL_UPL ); #endif } if (global_fs_sel > 0) return global_fs_sel; @@ -443,6 +443,8 @@ void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) ldt_info.entry_number = sel >> 3; fill_modify_ldt_struct( &ldt_info, entry ); if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" ); +#elif defined(__FreeBSD__) + i386_set_fsbase( wine_ldt_get_base( entry )); #endif } else /* LDT selector */

1 0