August 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFOHEADER in GetDIBits.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: a2c99c7353c521524a0cd582cecd1ccc09ec3b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c99c7353c521524a0cd582c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 14:37:32 2011 +0200 gdi32: Create a sanitized BITMAPINFOHEADER in GetDIBits. --- dlls/gdi32/dib.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5f3dd93..eebe3dd 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -918,24 +918,24 @@ INT WINAPI GetDIBits( DC * dc; BITMAPOBJ * bmp; int i; - int bitmap_type; LONG width; LONG height; - WORD planes, bpp; - DWORD compr, size; + WORD bpp; char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; unsigned int colors = 0; const struct gdi_dc_funcs *funcs; - if (!info) return 0; - - bitmap_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size); - if (bitmap_type == -1) + /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our + own copy and transfer the colour info back at the end */ + if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) { ERR("Invalid bitmap format\n"); return 0; } + dst_info->bmiHeader.biClrUsed = 0; + dst_info->bmiHeader.biClrImportant = 0; + if (!(dc = get_dc_ptr( hdc ))) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -951,27 +951,15 @@ INT WINAPI GetDIBits( funcs = bmp->funcs; if (bmp->dib) funcs = dc->dibdrv.dev.funcs; + width = dst_info->bmiHeader.biWidth; + height = dst_info->bmiHeader.biHeight; + bpp = dst_info->bmiHeader.biBitCount; if (bpp == 0) /* query bitmap info only */ { lines = fill_query_info( info, bmp ); goto done; } - /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our - own copy and transfer the colour info back at the end */ - - dst_info->bmiHeader.biSize = sizeof(dst_info->bmiHeader); - dst_info->bmiHeader.biWidth = width; - dst_info->bmiHeader.biHeight = height; - dst_info->bmiHeader.biPlanes = planes; - dst_info->bmiHeader.biBitCount = bpp; - dst_info->bmiHeader.biCompression = compr; - dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); - dst_info->bmiHeader.biXPelsPerMeter = 0; - dst_info->bmiHeader.biYPelsPerMeter = 0; - dst_info->bmiHeader.biClrUsed = 0; - dst_info->bmiHeader.biClrImportant = 0; - switch (bpp) { case 1:

1 0

Alexandre Julliard : comdlg32/tests: Fix a couple of test failures on NT4.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 117efddd7974aa14fba2c3f3c40d5298ea1b88a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117efddd7974aa14fba2c3f3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 08:51:48 2011 +0200 comdlg32/tests: Fix a couple of test failures on NT4. --- dlls/comdlg32/tests/filedlg.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 2a91dc5..8539d3d 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -226,7 +226,8 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); - ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected FVM_DETAILS\n", + ok(folder_settings.ViewMode == FVM_DETAILS || broken(folder_settings.ViewMode == FVM_LIST), /* nt4 */ + "view mode is %d, expected FVM_DETAILS\n", folder_settings.ViewMode); cleanup: @@ -1032,7 +1033,7 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, { HWND parent = GetParent( dlg); if( msg == WM_NOTIFY) { - SetTimer( dlg, 0, 100, 0); + SetTimer( dlg, 0, 1000, 0); PostMessage( parent, WM_COMMAND, IDOK, 0); } if( msg == WM_TIMER) {

1 0

André Hentschel : oleaut32/tests: Skip tests if typelib can't be registered.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: e1ae573de5158ac1c867c03a905920bfa3b34ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ae573de5158ac1c867c03a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 3 19:48:01 2011 +0200 oleaut32/tests: Skip tests if typelib can't be registered. --- dlls/oleaut32/tests/tmarshal.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2897c1f..c2b36a5 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -995,13 +995,10 @@ static void test_typelibmarshal(void) ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); - if (hr == S_OK) - { - hr = IKindaEnumWidget_Next(pKEW, &pWidget); - ok_ole_success(hr, IKindaEnumWidget_Next); + hr = IKindaEnumWidget_Next(pKEW, &pWidget); + ok_ole_success(hr, IKindaEnumWidget_Next); - IKindaEnumWidget_Release(pKEW); - } + IKindaEnumWidget_Release(pKEW); hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch); ok_ole_success(hr, IWidget_QueryInterface); @@ -1547,7 +1544,12 @@ START_TEST(tmarshal) CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = register_current_module_typelib(); - ok_ole_success(hr, register_current_module_typelib); + if (FAILED(hr)) + { + CoUninitialize(); + win_skip("Registration of the test typelib failed, skipping tests\n"); + return; + } test_typelibmarshal(); test_DispCallFunc();

1 0

Maarten Lankhorst : ntdll: Use FUTEX_PRIVATE_FLAG for critical section futexes when available.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 57493fdd8c76e9ec3f621be8aaf4e04d9d0ade9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57493fdd8c76e9ec3f621be8a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 3 20:27:43 2011 +0200 ntdll: Use FUTEX_PRIVATE_FLAG for critical section futexes when available. --- dlls/ntdll/critsection.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 2f1abcf..fb69b31 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -61,14 +61,17 @@ static inline void small_pause(void) #ifdef __linux__ +static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ +static int wake_op = 129; /*FUTEX_WAKE|FUTEX_PRIVATE_FLAG*/ + static inline int futex_wait( int *addr, int val, struct timespec *timeout ) { - return syscall( SYS_futex, addr, 0/*FUTEX_WAIT*/, val, timeout, 0, 0 ); + return syscall( SYS_futex, addr, wait_op, val, timeout, 0, 0 ); } static inline int futex_wake( int *addr, int val ) { - return syscall( SYS_futex, addr, 1/*FUTEX_WAKE*/, val, NULL, 0, 0 ); + return syscall( SYS_futex, addr, wake_op, val, NULL, 0, 0 ); } static inline int use_futexes(void) @@ -78,6 +81,12 @@ static inline int use_futexes(void) if (supported == -1) { futex_wait( &supported, 10, NULL ); + if (errno == ENOSYS) + { + wait_op = 0; /*FUTEX_WAIT*/ + wake_op = 1; /*FUTEX_WAKE*/ + futex_wait( &supported, 10, NULL ); + } supported = (errno != ENOSYS); } return supported;

1 0

Henri Verbeet : wined3d: Remove the unused blit_op parameter to arbfp_blit_surface().
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: e74d1358ac0034ee5c09f6ab7e1d03f3511d266c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74d1358ac0034ee5c09f6ab7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 21:34:44 2011 +0200 wined3d: Remove the unused blit_op parameter to arbfp_blit_surface(). --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/surface.c | 5 +---- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 077007a..d4a850b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7208,8 +7208,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win } } -HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in, enum wined3d_blit_op blit_op, DWORD Filter) +HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { struct wined3d_context *context; RECT dst_rect = *dst_rect_in; @@ -7229,7 +7230,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface ENTER_GL(); /* Draw a textured quad */ - draw_textured_quad(src_surface, src_rect, &dst_rect, Filter); + draw_textured_quad(src_surface, src_rect, &dst_rect, filter); LEAVE_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1c0425a..9336a00 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5500,10 +5500,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) - { - return arbfp_blit_surface(device, src_surface, src_rect, dst_surface, dst_rect, - WINED3D_BLIT_OP_COLOR_BLIT, Filter); - } + return arbfp_blit_surface(device, Filter, src_surface, src_rect, dst_surface, dst_rect); if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c53d22..1702046 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1218,9 +1218,9 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g DECLSPEC_HIDDEN; /* Temporary blit_shader helper functions */ -HRESULT arbfp_blit_surface(struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect_in, - enum wined3d_blit_op blit_op, DWORD Filter) DECLSPEC_HIDDEN; +HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect) DECLSPEC_HIDDEN; struct wined3d_context *context_acquire(struct wined3d_device *device, struct wined3d_surface *target) DECLSPEC_HIDDEN; void context_alloc_event_query(struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Remove src_rect and dst_rect NULL checks from surface_cpu_blt().
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: b166cb29f865d20a8a42f32773d0573dc66071c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b166cb29f865d20a8a42f3277… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 21:34:45 2011 +0200 wined3d: Remove src_rect and dst_rect NULL checks from surface_cpu_blt(). --- dlls/wined3d/surface.c | 192 +++++++++++++++++++++--------------------------- 1 files changed, 84 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b166cb29f865d20a8a42f…

1 0

Henri Verbeet : wined3d: Move rectangle validation from surface_cpu_blt() to wined3d_surface_blt().
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 7e3ecd683c701ceb7275bc41574750ec2ca7a198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3ecd683c701ceb7275bc415… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 21:34:46 2011 +0200 wined3d: Move rectangle validation from surface_cpu_blt() to wined3d_surface_blt(). This fixes some tests because these were getting skipped for the BltOverride() path. --- dlls/d3d9/device.c | 2 + dlls/d3d9/tests/visual.c | 40 +++++++++++++------------- dlls/wined3d/surface.c | 70 +++++++++++++++++---------------------------- 3 files changed, 49 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3ecd683c701ceb7275b…

1 0

Henri Verbeet : ddraw: Remove rectangle validation from ddraw_surface7_Blt( ).
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 92e616f355ded5f3634625dba245e9b437e3ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e616f355ded5f3634625dba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 21:34:47 2011 +0200 ddraw: Remove rectangle validation from ddraw_surface7_Blt(). This is already done by wined3d_surface_blt(). --- dlls/ddraw/surface.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7aec492..b51c360 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1211,30 +1211,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR return DDERR_INVALIDPARAMS; } - /* Sizes can change, therefore hold the lock when testing the rectangles */ EnterCriticalSection(&ddraw_cs); - if(DestRect) - { - if(DestRect->top >= DestRect->bottom || DestRect->left >= DestRect->right || - DestRect->right > This->surface_desc.dwWidth || - DestRect->bottom > This->surface_desc.dwHeight) - { - WARN("Destination rectangle is invalid, returning DDERR_INVALIDRECT\n"); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDRECT; - } - } - if(Src && SrcRect) - { - if(SrcRect->top >= SrcRect->bottom || SrcRect->left >=SrcRect->right || - SrcRect->right > Src->surface_desc.dwWidth || - SrcRect->bottom > Src->surface_desc.dwHeight) - { - WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDRECT; - } - } if(Flags & DDBLT_KEYSRC && (!Src || !(Src->surface_desc.dwFlags & DDSD_CKSRCBLT))) { WARN("DDBLT_KEYDEST blit without color key in surface, returning DDERR_INVALIDPARAMS\n");

1 0

Henri Verbeet : wined3d: Move some flags handling from surface_cpu_blt() to wined3d_surface_blt().
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 662de19ad3225bb459134560ee471317e9eecefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=662de19ad3225bb459134560e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 21:34:48 2011 +0200 wined3d: Move some flags handling from surface_cpu_blt() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 49 ++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 676536e..6dfb72b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1340,6 +1340,31 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC memset(&src_rect, 0, sizeof(src_rect)); } + if (!fx || !(fx->dwDDFX)) + flags &= ~WINEDDBLT_DDFX; + + if (flags & WINEDDBLT_WAIT) + flags &= ~WINEDDBLT_WAIT; + + if (flags & WINEDDBLT_ASYNC) + { + static unsigned int once; + + if (!once++) + FIXME("Can't handle WINEDDBLT_ASYNC flag.\n"); + flags &= ~WINEDDBLT_ASYNC; + } + + /* WINEDDBLT_DONOTWAIT appeared in DX7. */ + if (flags & WINEDDBLT_DONOTWAIT) + { + static unsigned int once; + + if (!once++) + FIXME("Can't handle WINEDDBLT_DONOTWAIT flag.\n"); + flags &= ~WINEDDBLT_DONOTWAIT; + } + if (!device->d3d_initialized) { WARN("D3D not initialized, using fallback.\n"); @@ -6594,8 +6619,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * wined3d_surface_map(dst_surface, &dlock, NULL, 0); } - if (!fx || !(fx->dwDDFX)) flags &= ~WINEDDBLT_DDFX; - if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_FOURCC) { if (!dst_rect || src_surface == dst_surface) @@ -6617,28 +6640,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * else dbuf = (BYTE*)dlock.pBits+(xdst.top*dlock.Pitch)+(xdst.left*bpp); - if (flags & WINEDDBLT_WAIT) - { - flags &= ~WINEDDBLT_WAIT; - } - if (flags & WINEDDBLT_ASYNC) - { - static BOOL displayed = FALSE; - if (!displayed) - FIXME("Can't handle WINEDDBLT_ASYNC flag right now.\n"); - displayed = TRUE; - flags &= ~WINEDDBLT_ASYNC; - } - if (flags & WINEDDBLT_DONOTWAIT) - { - /* WINEDDBLT_DONOTWAIT appeared in DX7 */ - static BOOL displayed = FALSE; - if (!displayed) - FIXME("Can't handle WINEDDBLT_DONOTWAIT flag right now.\n"); - displayed = TRUE; - flags &= ~WINEDDBLT_DONOTWAIT; - } - /* First, all the 'source-less' blits */ if (flags & WINEDDBLT_COLORFILL) {

1 0

Florian Köberle : comctl32/tests: Test that headers do not free their image list.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 9a616111da3fab64eb678b119acb92fddc91624e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a616111da3fab64eb678b119… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Wed Aug 3 23:24:08 2011 +0200 comctl32/tests: Test that headers do not free their image list. --- dlls/comctl32/tests/header.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 0670743..4b8f0ed 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -955,6 +955,7 @@ static void test_hdm_imageMessages(HWND hParent) { HIMAGELIST hImageList = ImageList_Create (4, 4, 0, 1, 0); HIMAGELIST hIml; + BOOL wasValid; HWND hChild; flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -977,6 +978,10 @@ static void test_hdm_imageMessages(HWND hParent) ok_sequence(sequences, HEADER_SEQ_INDEX, imageMessages_seq, "imageMessages sequence testing", FALSE); DestroyWindow(hChild); + + wasValid = ImageList_Destroy(hImageList); +todo_wine + ok(wasValid, "Header must not free image list at destruction!\n"); } static void test_hdm_filterMessages(HWND hParent)

1 0