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

Jörg Höhle : winealsa: Avoid deadlock in AudioClient_Stop.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 8db18a893b3769d482f22bd2e2b545b82a31574f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db18a893b3769d482f22bd2e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jun 16 00:37:59 2011 +0200 winealsa: Avoid deadlock in AudioClient_Stop. --- dlls/winealsa.drv/mmdevdrv.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index abb2d39..236ae40 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1472,13 +1472,15 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) EnterCriticalSection(&This->lock); - if(This->dataflow == eRender && This->held_frames) - alsa_write_data(This); - else if(This->dataflow == eCapture) - alsa_read_data(This); + if(This->started){ + if(This->dataflow == eRender && This->held_frames) + alsa_write_data(This); + else if(This->dataflow == eCapture) + alsa_read_data(This); - if(This->event) - SetEvent(This->event); + if(This->event) + SetEvent(This->event); + } LeaveCriticalSection(&This->lock); } @@ -1567,6 +1569,8 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) { ACImpl *This = impl_from_IAudioClient(iface); int err; + HANDLE event; + BOOL wait; TRACE("(%p)\n", This); @@ -1582,7 +1586,11 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) return S_FALSE; } - DeleteTimerQueueTimer(g_timer_q, This->timer, INVALID_HANDLE_VALUE); + event = CreateEventW(NULL, TRUE, FALSE, NULL); + wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event); + if(wait) + WARN("DeleteTimerQueueTimer error %u\n", GetLastError()); + wait = wait && GetLastError() == ERROR_IO_PENDING; if((err = snd_pcm_drop(This->pcm_handle)) < 0){ LeaveCriticalSection(&This->lock); @@ -1600,6 +1608,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) LeaveCriticalSection(&This->lock); + if(event && wait) + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + return S_OK; }

1 0

André Hentschel : ws2_32: Handle null pointer for linger values.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: dc16a01fdffc7f2b5c56deb15ecf5ad28c8d8c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc16a01fdffc7f2b5c56deb15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 23:00:03 2011 +0200 ws2_32: Handle null pointer for linger values. --- dlls/ws2_32/socket.c | 12 ++++++++++-- dlls/ws2_32/tests/sock.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0c51985..43134af 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4026,6 +4026,11 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * setsockopt follow below that.*/ case WS_SO_DONTLINGER: + if (!optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } linger.l_onoff = *((const int*)optval) ? 0: 1; linger.l_linger = 0; level = SOL_SOCKET; @@ -4035,10 +4040,13 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; case WS_SO_LINGER: + if (!optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } linger.l_onoff = ((LINGER*)optval)->l_onoff; linger.l_linger = ((LINGER*)optval)->l_linger; - /* FIXME: what is documented behavior if SO_LINGER optval - is null?? */ level = SOL_SOCKET; optname = SO_LINGER; optval = (char*)&linger; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 29c97e2..24799cf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1139,6 +1139,23 @@ static void test_set_getsockopt(void) lingval.l_onoff, lingval.l_linger, linger_testvals[i].l_onoff, linger_testvals[i].l_linger); } + + size = sizeof(lingval); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, NULL, size); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, NULL, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + + size = sizeof(BOOL); + err = setsockopt(s, SOL_SOCKET, SO_DONTLINGER, NULL, size); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = setsockopt(s, SOL_SOCKET, SO_DONTLINGER, NULL, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size);

1 0

Alexandre Julliard : winex11: Don' t enable XInput for devices reporting absolute coordinates.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: b3946a0a59860ff3b96d78df7421a6e78e6b4ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3946a0a59860ff3b96d78df7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 13:23:19 2011 +0200 winex11: Don't enable XInput for devices reporting absolute coordinates. --- dlls/winex11.drv/mouse.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0ff701f..4a73acd 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -258,7 +258,7 @@ static void enable_xinput2(void) XIDeviceInfo *devices; XIEventMask mask; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int i, count; + int i, j, count; if (!xinput2_available) return; @@ -281,6 +281,20 @@ static void enable_xinput2(void) for (i = 0; i < count; ++i) { if (devices[i].use != XIMasterPointer) continue; + for (j = 0; j < devices[i].num_classes; j++) + { + XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; + + if (devices[i].classes[j]->type != XIValuatorClass) continue; + if (class->number != 0 && class->number != 1) continue; + if (class->mode == XIModeAbsolute) + { + TRACE( "Device %u (%s) class %u num %u %f,%f res %u is absolute, not enabling XInput2\n", + devices[i].deviceid, debugstr_a(devices[i].name), + j, class->number, class->min, class->max, class->resolution ); + goto done; + } + } TRACE( "Using %u (%s) as core pointer\n", devices[i].deviceid, debugstr_a(devices[i].name) ); xinput2_core_pointer = devices[i].deviceid; @@ -304,6 +318,7 @@ static void enable_xinput2(void) } } +done: pXIFreeDeviceInfo( devices ); wine_tsx11_unlock(); #endif

1 0

Alexandre Julliard : server: Allow setting a zero-size clip rectangle.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 6b0d9ff1cd6876f8181c95063b775d1cfe3a1d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0d9ff1cd6876f8181c95063… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:50:23 2011 +0200 server: Allow setting a zero-size clip rectangle. --- dlls/user32/cursoricon.c | 6 +++++- dlls/user32/tests/monitor.c | 8 ++++++++ dlls/winex11.drv/mouse.c | 2 +- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/queue.c | 20 +++++++++++++++----- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 014a4b9..4c7658d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1722,17 +1722,21 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); + if (rect && (rect->left > rect->right || rect->top > rect->bottom)) return FALSE; + SERVER_START_REQ( set_cursor ) { - req->flags = SET_CURSOR_CLIP; req->clip_msg = WM_WINE_CLIPCURSOR; if (rect) { + req->flags = SET_CURSOR_CLIP; req->clip.left = rect->left; req->clip.top = rect->top; req->clip.right = rect->right; req->clip.bottom = rect->bottom; } + else req->flags = SET_CURSOR_NOCLIP; + if ((ret = !wine_server_call( req ))) { new_rect.left = reply->new_clip.left; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index daa3035..e31019f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -267,6 +267,14 @@ static void test_ChangeDisplaySettingsEx(void) ok(ClipCursor(&r1), "ClipCursor() failed\n"); ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &r1), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + SetRect(&r1, 10, 10, 10, 10); + ok(ClipCursor(&r1), "ClipCursor() failed\n"); + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &r1), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + SetRect(&r1, 10, 10, 10, 9); + ok(!ClipCursor(&r1), "ClipCursor() succeeded\n"); + /* Windows bug: further clipping fails once an empty rect is set, so we have to reset it */ + ClipCursor(NULL); SetRect(&r1, virt.left - 10, virt.top - 10, virt.right + 20, virt.bottom + 20); ok(ClipCursor(&r1), "ClipCursor() failed\n"); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4a73acd..7f62658 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -417,7 +417,7 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) if (msg_hwnd) XUnmapWindow( data->display, clip_window ); XMoveResizeWindow( data->display, clip_window, clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, - clip->right - clip->left, clip->bottom - clip->top ); + max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); /* if the rectangle is shrinking we may get a pointer warp */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5cb2467..ee438b4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4849,6 +4849,7 @@ struct set_cursor_reply #define SET_CURSOR_COUNT 0x02 #define SET_CURSOR_POS 0x04 #define SET_CURSOR_CLIP 0x08 +#define SET_CURSOR_NOCLIP 0x10 @@ -5634,6 +5635,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 424 +#define SERVER_PROTOCOL_VERSION 425 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 767be04..123f16a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3351,6 +3351,7 @@ enum coords_relative #define SET_CURSOR_COUNT 0x02 #define SET_CURSOR_POS 0x04 #define SET_CURSOR_CLIP 0x08 +#define SET_CURSOR_NOCLIP 0x10 /* Retrieve the suspended context of a thread */ diff --git a/server/queue.c b/server/queue.c index ce773a1..6dee8f5 100644 --- a/server/queue.c +++ b/server/queue.c @@ -359,12 +359,22 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) /* set the cursor clip rectangle */ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) { - rectangle_t top_rect, new_rect; + rectangle_t top_rect; int x, y; get_top_window_rectangle( desktop, &top_rect ); - if (!rect || !intersect_rect( &new_rect, &top_rect, rect )) new_rect = top_rect; - desktop->cursor.clip = new_rect; + if (rect) + { + rectangle_t new_rect = *rect; + if (new_rect.left < top_rect.left) new_rect.left = top_rect.left; + if (new_rect.right > top_rect.right) new_rect.right = top_rect.right; + if (new_rect.top < top_rect.top) new_rect.top = top_rect.top; + if (new_rect.bottom > top_rect.bottom) new_rect.bottom = top_rect.bottom; + if (new_rect.left > new_rect.right || new_rect.top > new_rect.bottom) new_rect = top_rect; + desktop->cursor.clip = new_rect; + } + else desktop->cursor.clip = top_rect; + if (desktop->cursor.clip_msg) post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); @@ -2861,7 +2871,7 @@ DECL_HANDLER(set_cursor) { set_cursor_pos( input->desktop, req->x, req->y ); } - if (req->flags & SET_CURSOR_CLIP) + if (req->flags & (SET_CURSOR_CLIP | SET_CURSOR_NOCLIP)) { struct desktop *desktop = input->desktop; @@ -2869,7 +2879,7 @@ DECL_HANDLER(set_cursor) if (req->clip_msg && get_top_window_owner(desktop) == current->process) desktop->cursor.clip_msg = req->clip_msg; - set_clip_rectangle( desktop, &req->clip ); + set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip ); } reply->new_x = input->desktop->cursor.x;

1 0

Alexandre Julliard : user32: Don't truncate bitmap ids in InsertMenu.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 33ba7c07fb71b8c3b29ae150d94b3ef74cfa723d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ba7c07fb71b8c3b29ae150d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 16:07:00 2011 +0200 user32: Don't truncate bitmap ids in InsertMenu. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/menu.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 24cd4e0..b0c7f78 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3816,7 +3816,7 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, pmii->dwTypeData = (LPWSTR)str; } else if( flags & MFT_BITMAP){ pmii->fMask |= MIIM_BITMAP | MIIM_STRING; - pmii->hbmpItem = ULongToHandle(LOWORD(str)); + pmii->hbmpItem = (HBITMAP)str; } if( flags & MF_OWNERDRAW){ pmii->fMask |= MIIM_DATA; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 26fe6fb..5c133f9 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -404,6 +404,7 @@ static void test_menu_ownerdraw(void) int i,j,k; BOOL ret; HMENU hmenu; + MENUITEMINFO mii; LONG leftcol; HWND hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, @@ -463,6 +464,18 @@ static void test_menu_ownerdraw(void) "Height is incorrect. Got %d expected %d\n", MOD_rc[0].bottom - MOD_rc[0].top, MOD_SIZE); + /* test owner-drawn callback bitmap */ + ModifyMenu( hmenu, 1, MF_BYPOSITION | MFT_BITMAP, 1, (LPCSTR)HBMMENU_CALLBACK ); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_BITMAP | MIIM_FTYPE | MIIM_ID; + if (GetMenuItemInfoA( hmenu, 1, TRUE, &mii )) + { + ok( mii.fType == MFT_BITMAP, "wrong type %x\n", mii.fType ); + ok( mii.wID == 1, "wrong id %x\n", mii.wID ); + ok( mii.hbmpItem == HBMMENU_CALLBACK, "wrong data %p\n", mii.hbmpItem ); + } + TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + /* test width/height of an ownerdraw menu bar as well */ ret = DestroyMenu(hmenu); ok(ret, "DestroyMenu failed with error %d\n", GetLastError());

1 0

Alexandre Julliard : user32: Always pass 0 as item id for WM_MEASUREITEM in menus.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: efaa068cd1280e411cc6ff5ecc8ae30d36ad4559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaa068cd1280e411cc6ff5ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 16:12:53 2011 +0200 user32: Always pass 0 as item id for WM_MEASUREITEM in menus. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/menu.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b0c7f78..3ec682f 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -822,7 +822,7 @@ static void MENU_GetBitmapItemSize( MENUITEM *lpitem, SIZE *size, measItem.itemWidth = lpitem->rect.right - lpitem->rect.left; measItem.itemHeight = lpitem->rect.bottom - lpitem->rect.top; measItem.itemData = lpitem->dwItemData; - SendMessageW( hwndOwner, WM_MEASUREITEM, lpitem->wID, (LPARAM)&measItem); + SendMessageW( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&measItem); size->cx = measItem.itemWidth; size->cy = measItem.itemHeight; return; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 5c133f9..e29039a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -169,6 +169,8 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, if( winetest_debug) trace("WM_MEASUREITEM received data %lx size %dx%d\n", pmis->itemData, pmis->itemWidth, pmis->itemHeight); + ok( !wparam, "wrong wparam %lx\n", wparam ); + ok( pmis->CtlType == ODT_MENU, "wrong type %x\n", pmis->CtlType ); MOD_odheight = pmis->itemHeight; pmis->itemWidth = MODsizes[pmis->itemData].cx; pmis->itemHeight = MODsizes[pmis->itemData].cy; @@ -197,6 +199,8 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, pdis->rcItem.right,pdis->rcItem.bottom ); SelectObject( pdis->hDC, oldpen); } + ok( !wparam, "wrong wparam %lx\n", wparam ); + ok( pdis->CtlType == ODT_MENU, "wrong type %x\n", pdis->CtlType ); /* calculate widths of some menu texts */ if( ! MOD_txtsizes[0].size.cx) for(i = 0; MOD_txtsizes[i].text; i++) {

1 0

Ričardas Barkauskas : ddraw: Add iface count for IDirectSurfaceImpl.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 4b8fd522f66d2554563f906663653f3ce6c1553c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8fd522f66d2554563f90666… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sun Jun 19 13:18:22 2011 +0300 ddraw: Add iface count for IDirectSurfaceImpl. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 83 ++++++++++++++++++++++++++++--------------- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9cfbd0e..7b00deb 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -161,7 +161,7 @@ struct IDirectDrawSurfaceImpl const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; - LONG ref; + LONG ref, iface_count; IUnknown *ifaceToRelease; int version; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4370ff7..ca9f333 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -215,6 +215,22 @@ static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFII return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); } +static void ddraw_surface_add_iface(IDirectDrawSurfaceImpl *This) +{ + ULONG iface_count = InterlockedIncrement(&This->iface_count); + TRACE("%p increasing iface count to %u.\n", This, iface_count); + + if (iface_count == 1) + { + EnterCriticalSection(&ddraw_cs); + if (This->wined3d_surface) + wined3d_surface_incref(This->wined3d_surface); + if (This->wined3d_texture) + wined3d_texture_incref(This->wined3d_texture); + LeaveCriticalSection(&ddraw_cs); + } +} + /***************************************************************************** * IDirectDrawSurface7::AddRef * @@ -227,21 +243,16 @@ static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFII static ULONG WINAPI ddraw_surface7_AddRef(IDirectDrawSurface7 *iface) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG refcount = InterlockedIncrement(&This->ref); - TRACE("%p increasing refcount to %u.\n", This, refCount); + TRACE("iface %p increasing refcount to %u.\n", iface, refcount); - if (refCount == 1) + if (refcount == 1) { - EnterCriticalSection(&ddraw_cs); - if (This->wined3d_surface) - wined3d_surface_incref(This->wined3d_surface); - if (This->wined3d_texture) - wined3d_texture_incref(This->wined3d_texture); - LeaveCriticalSection(&ddraw_cs); + ddraw_surface_add_iface(This); } - return refCount; + return refcount; } static ULONG WINAPI ddraw_surface4_AddRef(IDirectDrawSurface4 *iface) @@ -317,8 +328,8 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) { TRACE("surface %p.\n", This); - /* Check the refcount and give a warning */ - if(This->ref > 1) + /* Check the iface count and give a warning */ + if(This->iface_count > 1) { /* This can happen when a complex surface is destroyed, * because the 2nd surface was addref()ed when the app @@ -423,6 +434,31 @@ static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) IUnknown_Release(ifaceToRelease); } +static void ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) +{ + ULONG iface_count = InterlockedDecrement(&This->iface_count); + TRACE("%p decreasing iface count to %u.\n", This, iface_count); + + if (iface_count == 0) + { + /* Complex attached surfaces are destroyed implicitly when the root is released */ + EnterCriticalSection(&ddraw_cs); + if(!This->is_complex_root) + { + WARN("(%p) Attempt to destroy a surface that is not a complex root\n", This); + LeaveCriticalSection(&ddraw_cs); + return; + } + if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ + wined3d_texture_decref(This->wined3d_texture); + else + ddraw_surface_cleanup(This); + LeaveCriticalSection(&ddraw_cs); + } + + return; +} + /***************************************************************************** * IDirectDrawSurface7::Release * @@ -455,28 +491,16 @@ static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG refcount = InterlockedDecrement(&This->ref); - TRACE("%p decreasing refcount to %u.\n", This, ref); + TRACE("iface %p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) + if (refcount == 0) { - /* Complex attached surfaces are destroyed implicitly when the root is released */ - EnterCriticalSection(&ddraw_cs); - if(!This->is_complex_root) - { - WARN("(%p) Attempt to destroy a surface that is not a complex root\n", This); - LeaveCriticalSection(&ddraw_cs); - return ref; - } - if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ - wined3d_texture_decref(This->wined3d_texture); - else - ddraw_surface_cleanup(This); - LeaveCriticalSection(&ddraw_cs); + ddraw_surface_release_iface(This); } - return ref; + return refcount; } static ULONG WINAPI ddraw_surface4_Release(IDirectDrawSurface4 *iface) @@ -5005,6 +5029,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; surface->IDirect3DTexture_vtbl = &d3d_texture1_vtbl; surface->ref = 1; + surface->iface_count = 1; surface->version = version; surface->ddraw = ddraw;

1 0

Henri Verbeet : wined3d: Only bother checking block alignment for compressed surfaces in wined3d_device_update_surface ().
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 430bac5fadc2fa6a02827f69ff04d2feef24a047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430bac5fadc2fa6a02827f69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:10 2011 +0200 wined3d: Only bother checking block alignment for compressed surfaces in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 03f57ff..8a2058c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4810,8 +4810,9 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, } /* NPOT block sizes would be silly. */ - if ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) - && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h)) + if ((src_format->flags & WINED3DFMT_FLAG_COMPRESSED) + && ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) + && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h))) { WARN("Update rect not block-aligned.\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Validate STATE_BASEVERTEXINDEX in validate_state_table().
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 265e62378fc7e57710b7d5bc6184ef906803590a URL: http://source.winehq.org/git/wine.git/?a=commit;h=265e62378fc7e57710b7d5bc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:11 2011 +0200 wined3d: Validate STATE_BASEVERTEXINDEX in validate_state_table(). --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 568ae87..75c2da6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5726,6 +5726,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_SCISSORRECT, STATE_FRONTFACE, STATE_POINTSPRITECOORDORIGIN, + STATE_BASEVERTEXINDEX, }; unsigned int i, current;

1 0

Henri Verbeet : wined3d: Fix the STATE_BASEVERTEXINDEX state entry.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 233b8e1cf89a284de142f0407a2ef79490d5ef49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233b8e1cf89a284de142f0407… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:12 2011 +0200 wined3d: Fix the STATE_BASEVERTEXINDEX state entry. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 75c2da6..77dd1dd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5062,7 +5062,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_SAMPLER(17), /* Vertex sampler 1 */ { STATE_SAMPLER(17), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }, WINED3D_GL_EXT_NONE }, - { STATE_BASEVERTEXINDEX, { 0, NULL, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, + { STATE_BASEVERTEXINDEX, { STATE_BASEVERTEXINDEX, state_nop, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, { STATE_BASEVERTEXINDEX, { STATE_VDECL, NULL, }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0