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

Alexandre Julliard : server: Fix desktop window coordinates mapping in expose_window.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: b2ea5723528e0e8a9336e0f4a5fd9e8a7fad0edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ea5723528e0e8a9336e0f4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 12:22:53 2008 +0100 server: Fix desktop window coordinates mapping in expose_window. --- server/window.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/server/window.c b/server/window.c index 2633cd2..e0c202e 100644 --- a/server/window.c +++ b/server/window.c @@ -1364,7 +1364,6 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ struct region *old_vis_rgn ) { struct region *new_vis_rgn, *exposed_rgn; - int offset_x, offset_y; if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return NULL; @@ -1383,16 +1382,8 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ } } - offset_x = old_window_rect->left - win->client_rect.left; - offset_y = old_window_rect->top - win->client_rect.top; if (win->parent) { - if (!is_desktop_window(win->parent)) - { - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - } - /* make it relative to the old window pos for subtracting */ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); @@ -1403,7 +1394,8 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ { if (!is_region_empty( new_vis_rgn )) { - offset_region( new_vis_rgn, offset_x, offset_y ); + /* make it relative to parent */ + offset_region( new_vis_rgn, old_window_rect->left, old_window_rect->top ); redraw_window( win->parent, new_vis_rgn, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); } }

1 0

Alexandre Julliard : winex11: Fix mouse coordinates mapping on desktop window.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: d9f8f704abbb17d705d30c7c944a3a9081fbce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f8f704abbb17d705d30c7c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 12:20:16 2008 +0100 winex11: Fix mouse coordinates mapping on desktop window. --- dlls/winex11.drv/mouse.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 736c5d9..8301386 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -172,11 +172,6 @@ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned { struct x11drv_thread_data *data = x11drv_thread_data(); - if (window == root_window) - { - x += virtual_screen_rect.left; - y += virtual_screen_rect.top; - } get_coords( hwnd, window, x, y, pt ); /* update the cursor */

1 0

Alexandre Julliard : winex11: Avoid useless updates of the desktop window Z-order.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: f40b0458580f55a56db384521ae63b66c80df0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40b0458580f55a56db384521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 12:19:43 2008 +0100 winex11: Avoid useless updates of the desktop window Z-order. --- dlls/winex11.drv/winpos.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 42fffd8..eed9eeb 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -68,7 +68,7 @@ void X11DRV_Expose( HWND hwnd, XEvent *xev ) XExposeEvent *event = &xev->xexpose; RECT rect; struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN; + int flags = RDW_INVALIDATE | RDW_ERASE; TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); @@ -89,22 +89,24 @@ void X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.right = rect.left + event->width; rect.bottom = rect.top + event->height; - if (event->window == root_window) - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - - SERVER_START_REQ( update_window_zorder ) + if (event->window != root_window) { - req->window = hwnd; - req->rect.left = rect.left; - req->rect.top = rect.top; - req->rect.right = rect.right; - req->rect.bottom = rect.bottom; - wine_server_call( req ); + SERVER_START_REQ( update_window_zorder ) + { + req->window = hwnd; + req->rect.left = rect.left; + req->rect.top = rect.top; + req->rect.right = rect.right; + req->rect.bottom = rect.bottom; + wine_server_call( req ); + } + SERVER_END_REQ; + + /* make position relative to client area instead of parent */ + OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); + flags |= RDW_ALLCHILDREN; } - SERVER_END_REQ; - /* make position relative to client area instead of parent */ - OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); RedrawWindow( hwnd, &rect, 0, flags ); }

1 0

Alexandre Julliard : winex11: Fix typo that was causing superfluous updates of the visible rect.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 9454e3ff7c7f1bd1caaa2ae80007397be185eea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9454e3ff7c7f1bd1caaa2ae80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 11:32:15 2008 +0100 winex11: Fix typo that was causing superfluous updates of the visible rect. --- dlls/winex11.drv/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index f215f41..42fffd8 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -326,7 +326,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, data->whole_rect = *rectWindow; data->client_rect = *rectClient; X11DRV_window_to_X_rect( data, &data->whole_rect ); - if (memcmp( &visible_rect, &data->whole_rect, sizeof(RECT) )) + if (memcmp( visible_rect, &data->whole_rect, sizeof(RECT) )) { TRACE( "%p: need to update visible rect %s -> %s\n", hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(&data->whole_rect) );

1 0

Reece Dunn : user32: Improve the HiliteMenuItem tests so they reflect actual behaviour on Windows .
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 2cab7ff2c7a11563436e014e2affc73987039bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cab7ff2c7a11563436e014e2… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Mar 17 21:18:32 2008 +0000 user32: Improve the HiliteMenuItem tests so they reflect actual behaviour on Windows. --- dlls/user32/tests/menu.c | 103 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 94 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 5f900d0..2f7677c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1864,6 +1864,23 @@ static void test_menu_flags( void ) static void test_menu_hilitemenuitem( void ) { HMENU hMenu, hPopupMenu; + WNDCLASSA wclass; + HWND hWnd; + + wclass.lpszClassName = "HiliteMenuTestClass"; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = WndProc; + wclass.hInstance = GetModuleHandleA( NULL ); + wclass.hIcon = LoadIconA( 0, (LPSTR)IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, (LPSTR)IDC_ARROW); + wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + assert (RegisterClassA( &wclass )); + assert (hWnd = CreateWindowA( wclass.lpszClassName, "HiliteMenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, wclass.hInstance, NULL) ); hMenu = CreateMenu(); hPopupMenu = CreatePopupMenu(); @@ -1874,40 +1891,108 @@ static void test_menu_hilitemenuitem( void ) AppendMenu(hPopupMenu, MF_STRING, 102, "Item 2"); AppendMenu(hPopupMenu, MF_STRING, 103, "Item 3"); + SetMenu(hWnd, hMenu); + + /* test invalid arguments */ + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), "HiliteMenuItem: Item 2 is hilited\n"); SetLastError(0xdeadbeef); - ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE), - "HiliteMenuItem: call should have failed.\n"); todo_wine { + ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION), + "HiliteMenuItem: call should have failed.\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %d\n", GetLastError()); } + SetLastError(0xdeadbeef); + ok(!HiliteMenuItem(hWnd, NULL, 1, MF_HILITE | MF_BYPOSITION), + "HiliteMenuItem: call should have failed.\n"); + todo_wine + { + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, + "HiliteMenuItem: expected error ERROR_INVALID_MENU_HANDLE, got: %d\n", GetLastError()); + } + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), "HiliteMenuItem: Item 2 is hilited\n"); - HiliteMenuItem(NULL, hPopupMenu, 0, MF_HILITE); - HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE); - HiliteMenuItem(NULL, hPopupMenu, 2, MF_HILITE); - HiliteMenuItem(NULL, hPopupMenu, 1, MF_UNHILITE); + /* either MF_HILITE or MF_UNHILITE *and* MF_BYCOMMAND or MF_BYPOSITION need to be set */ + SetLastError(0xdeadbeef); + ok(HiliteMenuItem(hWnd, hPopupMenu, 1, MF_BYPOSITION), + "HiliteMenuItem: call should have succeeded.\n"); + ok(GetLastError() == 0xdeadbeef, + "HiliteMenuItem: expected error 0xdeadbeef, got: %d\n", GetLastError()); + + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), + "HiliteMenuItem: Item 2 is hilited\n"); + + SetLastError(0xdeadbeef); todo_wine { - ok(GetMenuState(hPopupMenu, 0, MF_BYPOSITION) & MF_HILITE, - "HiliteMenuItem: Item 1 is not hilited\n"); + ok(HiliteMenuItem(hWnd, hPopupMenu, 1, MF_HILITE), + "HiliteMenuItem: call should have succeeded.\n"); } + ok(GetLastError() == 0xdeadbeef, + "HiliteMenuItem: expected error 0xdeadbeef, got: %d\n", GetLastError()); + + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), + "HiliteMenuItem: Item 2 is hilited\n"); + + /* hilite a menu item (by position) */ + + SetLastError(0xdeadbeef); + ok(HiliteMenuItem(hWnd, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION), + "HiliteMenuItem: call should not have failed.\n"); + ok(GetLastError() == 0xdeadbeef, + "HiliteMenuItem: expected error 0xdeadbeef, got: %d\n", GetLastError()); + + todo_wine + { + ok(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE, + "HiliteMenuItem: Item 2 is not hilited\n"); + } + + /* unhilite a menu item (by position) */ + + SetLastError(0xdeadbeef); + ok(HiliteMenuItem(hWnd, hPopupMenu, 1, MF_UNHILITE | MF_BYPOSITION), + "HiliteMenuItem: call should not have failed.\n"); + ok(GetLastError() == 0xdeadbeef, + "HiliteMenuItem: expected error 0xdeadbeef, got: %d\n", GetLastError()); + ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), "HiliteMenuItem: Item 2 is hilited\n"); + + /* hilite a menu item (by command) */ + + SetLastError(0xdeadbeef); + ok(HiliteMenuItem(hWnd, hPopupMenu, 103, MF_HILITE | MF_BYCOMMAND), + "HiliteMenuItem: call should not have failed.\n"); + ok(GetLastError() == 0xdeadbeef, + "HiliteMenuItem: expected error 0xdeadbeef, got: %d\n", GetLastError()); + todo_wine { ok(GetMenuState(hPopupMenu, 2, MF_BYPOSITION) & MF_HILITE, "HiliteMenuItem: Item 3 is not hilited\n"); } - DestroyMenu(hMenu); + /* unhilite a menu item (by command) */ + + SetLastError(0xdeadbeef); + ok(HiliteMenuItem(hWnd, hPopupMenu, 103, MF_UNHILITE | MF_BYCOMMAND), + "HiliteMenuItem: call should not have failed.\n"); + ok(GetLastError() == 0xdeadbeef, + "HiliteMenuItem: expected error 0xdeadbeef, got: %d\n", GetLastError()); + + ok(!(GetMenuState(hPopupMenu, 2, MF_BYPOSITION) & MF_HILITE), + "HiliteMenuItem: Item 3 is hilited\n"); + + DestroyWindow(hWnd); } static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type,

1 0

Alexandre Julliard : winex11: Fix bug report address.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 075df1b609d283c5d0b83a3e1b9bd48e53cb5b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075df1b609d283c5d0b83a3e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 11:29:47 2008 +0100 winex11: Fix bug report address. --- dlls/winex11.drv/wintab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 9645cda..99cb6f4 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -577,7 +577,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) if (! is_tablet_cursor(target->name, device_type)) { - WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report to http://forums.winehq.org\n", + WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", loop, devices[loop].name, device_type ? device_type : ""); XFree(device_type); cursor_target --;

1 0

Austin English : kernel32: Spelling fixes.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: d5de9977dfc7c710c56744e801852a8c97ebec96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5de9977dfc7c710c56744e80… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 17 15:51:39 2008 -0500 kernel32: Spelling fixes. --- dlls/kernel32/cpu.c | 2 +- dlls/kernel32/debugger.c | 2 +- dlls/kernel32/global16.c | 2 +- dlls/kernel32/kernel_main.c | 6 +++--- dlls/kernel32/pthread.c | 2 +- dlls/kernel32/registry16.c | 2 +- dlls/kernel32/sync.c | 4 ++-- dlls/kernel32/tests/alloc.c | 4 ++-- dlls/kernel32/tests/comm.c | 4 ++-- dlls/kernel32/tests/format_msg.c | 2 +- dlls/kernel32/tests/locale.c | 2 +- dlls/kernel32/tests/path.c | 8 ++++---- dlls/kernel32/tests/thread.c | 4 ++-- dlls/kernel32/thread.c | 2 +- dlls/kernel32/time.c | 16 ++++++++-------- 15 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5de9977dfc7c710c5674…

1 0

Maarten Lankhorst : wine.inf: Change default windows version to XP.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: f629dc4eb6006fbdc3f658d13186b9c7e08b189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f629dc4eb6006fbdc3f658d13… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 17 17:05:11 2008 -0700 wine.inf: Change default windows version to XP. --- tools/wine.inf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index cf4b7a0..97a7735 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2659,9 +2659,9 @@ HKLM,"%Services%\MountMgr","Type",0x10001,1 HKLM,"%Services%\VxD\MSTCP",,,"" [VersionInfo] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.0" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 4" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2195" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400

1 0

Andrew Riedi : user32: Move the bitmap header check as far up as possible.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 927875390de7e5338762eac97879aba178b1bbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=927875390de7e5338762eac97… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Mon Mar 17 00:56:29 2008 -0700 user32: Move the bitmap header check as far up as possible. Based on a patchset by Henri Verbeet. --- dlls/user32/cursoricon.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index aa1bdf5..df6a408 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -701,12 +701,6 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, hotspot = *pt; bmi = (BITMAPINFO *)(pt + 1); } - size = bitmap_info_size( bmi, DIB_RGB_COLORS ); - - if (!width) width = bmi->bmiHeader.biWidth; - if (!height) height = bmi->bmiHeader.biHeight/2; - DoStretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); /* Check bitmap header */ @@ -718,6 +712,13 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, return 0; } + size = bitmap_info_size( bmi, DIB_RGB_COLORS ); + + if (!width) width = bmi->bmiHeader.biWidth; + if (!height) height = bmi->bmiHeader.biHeight/2; + DoStretch = (bmi->bmiHeader.biHeight/2 != height) || + (bmi->bmiHeader.biWidth != width); + if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) {

1 0

Roderick Colenbrander : wined3d: Add correct autogenmipmap support.
by Alexandre Julliard 18 Mar '08

18 Mar '08

Module: wine Branch: master Commit: 0e9d02ded40810272f8cf8dfc429f8d07e9e6fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9d02ded40810272f8cf8dfc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 17 20:11:32 2008 +0100 wined3d: Add correct autogenmipmap support. --- dlls/wined3d/directx.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b90177..5cbb082 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2223,13 +2223,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_INVALIDCALL; } - if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { - if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { - TRACE_(d3d_caps)("[FAILED] - No mipmap generation support\n"); - return WINED3DERR_NOTAVAILABLE; - } - } - if(RType == WINED3DRTYPE_CUBETEXTURE) { /* Cubetexture allows: * - D3DUSAGE_AUTOGENMIPMAP @@ -2246,6 +2239,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(!Usage) return WINED3D_OK; + if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) { + /* Check for automatic mipmap generation support */ + if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { + UsageCaps |= WINED3DUSAGE_AUTOGENMIPMAP; + } else { + /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUOTGEN instead of D3D_OK */ + TRACE_(d3d_caps)("[FAILED] - No autogenmipmap support, but continuing\n"); + } + } + if(Usage & WINED3DUSAGE_RENDERTARGET) { if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { UsageCaps |= WINED3DUSAGE_RENDERTARGET; @@ -2328,6 +2331,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(!Usage) return WINED3D_OK; + if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) { + /* Check for automatic mipmap generation support */ + if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { + UsageCaps |= WINED3DUSAGE_AUTOGENMIPMAP; + } else { + /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUOTGEN instead of D3D_OK */ + TRACE_(d3d_caps)("[FAILED] - No autogenmipmap support, but continuing\n"); + } + } + if(Usage & WINED3DUSAGE_RENDERTARGET) { if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { UsageCaps |= WINED3DUSAGE_RENDERTARGET; @@ -2631,10 +2644,17 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt break; } - - - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; + /* When the UsageCaps exactly matches Usage return WINED3D_OK except for the situation in which + * WINED3DUSAGE_AUTOGENMIPMAP isn't around, then WINED3DOK_NOAUTOGEN is returned if all the other + * usage flags match. */ + if(UsageCaps == Usage) { + return WINED3D_OK; + } else if((UsageCaps == (Usage & ~WINED3DUSAGE_AUTOGENMIPMAP)) && (Usage & WINED3DUSAGE_AUTOGENMIPMAP)){ + return WINED3DOK_NOAUTOGEN; + } else { + TRACE_(d3d_caps)("[FAILED] - Usage=%#08x requested but only %#08x is available\n", Usage, UsageCaps); + return WINED3DERR_NOTAVAILABLE; + } } static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,

1 0