May 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : user: Use winproc callbacks instead of message map/ unmap in SendMessage16.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 58a03a103d0de6e2d8fa87fb8952f69fd239a20c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58a03a103d0de6e2d8fa87f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 20 16:32:45 2006 +0200 user: Use winproc callbacks instead of message map/unmap in SendMessage16. --- dlls/user/msg16.c | 46 +++++++++++++++++++++++----------------------- dlls/user/winproc.c | 4 ++-- dlls/user/winproc.h | 2 ++ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c index e61fef3..e8b9d4c 100644 --- a/dlls/user/msg16.c +++ b/dlls/user/msg16.c @@ -30,14 +30,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(msg); DWORD USER16_AlertableWait = 0; +static LRESULT cwp_hook_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + CWPSTRUCT cwp; + + cwp.hwnd = hwnd; + cwp.message = msg; + cwp.wParam = wp; + cwp.lParam = lp; + *result = 0; + return HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp, FALSE ); +} + +static LRESULT send_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + *result = SendMessageA( hwnd, msg, wp, lp ); + return *result; +} + + /*********************************************************************** * SendMessage (USER.111) */ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) { LRESULT result; - UINT msg32; - WPARAM wparam32; HWND hwnd = WIN_Handle32( hwnd16 ); if (hwnd != HWND_BROADCAST && WIN_IsCurrentThread(hwnd)) @@ -47,22 +66,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwn /* first the WH_CALLWNDPROC hook */ if (HOOK_IsHooked( WH_CALLWNDPROC )) - { - LPARAM lparam32 = lparam; - - if (WINPROC_MapMsg16To32A( hwnd, msg, wparam, &msg32, &wparam32, &lparam32 ) != -1) - { - CWPSTRUCT cwp; - - cwp.hwnd = hwnd; - cwp.message = msg32; - cwp.wParam = wparam32; - cwp.lParam = lparam32; - HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp, FALSE ); - WINPROC_UnmapMsg16To32A( hwnd, msg32, wparam32, lparam32, 0 ); - /* FIXME: should reflect changes back into the message we send */ - } - } + WINPROC_CallProc16To32A( cwp_hook_callback, hwnd16, msg, wparam, lparam, &result, NULL ); if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; @@ -72,11 +76,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwn } else /* map to 32-bit unicode for inter-thread/process message */ { - if (WINPROC_MapMsg16To32W( hwnd, msg, wparam, &msg32, &wparam32, &lparam ) == -1) - return 0; - result = WINPROC_UnmapMsg16To32W( hwnd, msg32, wparam32, lparam, - SendMessageW( hwnd, msg32, wparam32, lparam ), - NULL ); + WINPROC_CallProc16To32A( send_message_callback, hwnd16, msg, wparam, lparam, &result, NULL ); } return result; } diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index c278451..37f9c79 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -2902,8 +2902,8 @@ static LRESULT WINPROC_CallProcWtoA( win /********************************************************************** * WINPROC_CallProc16To32A */ -static LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, - WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) +LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, + WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) { LRESULT ret; UINT msg32; diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index e80c295..4db36d5 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -57,6 +57,8 @@ extern BOOL WINPROC_IsUnicode( WNDPROC p extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); +extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, + WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, WPARAM *pwparam32,

1 0

Alexandre Julliard : user: Use a winproc callback instead of a message map/ unmap in SendMessageTimeoutA.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 396ff0007c01937c4718fd9c65b5279c9117592e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=396ff0007c01937c4718fd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 19:47:40 2006 +0200 user: Use a winproc callback instead of a message map/unmap in SendMessageTimeoutA. --- dlls/user/message.c | 19 ++++++++++++------- dlls/user/winproc.c | 10 +++++----- dlls/user/winproc.h | 8 +++----- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 1b86200..be50bfc 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -2383,6 +2383,16 @@ LRESULT WINAPI SendMessageTimeoutW( HWND return ret; } +static LRESULT send_inter_thread_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + struct send_message_info *info = arg; + info->hwnd = hwnd; + info->msg = msg; + info->wparam = wp; + info->lparam = lp; + return send_inter_thread_message( info, result ); +} /*********************************************************************** * SendMessageTimeoutA (USER32.@) @@ -2429,13 +2439,8 @@ LRESULT WINAPI SendMessageTimeoutA( HWND /* inter-process message: need to map to Unicode */ info.type = MSG_OTHER_PROCESS; if (is_unicode_message( info.msg )) - { - if (WINPROC_MapMsg32ATo32W( info.hwnd, info.msg, &info.wparam, &info.lparam ) == -1) - return 0; - ret = send_inter_thread_message( &info, &result ); - result = WINPROC_UnmapMsg32ATo32W( info.hwnd, info.msg, info.wparam, - info.lparam, result, NULL ); - } + ret = WINPROC_CallProcAtoW( send_inter_thread_callback, info.hwnd, info.msg, + info.wparam, info.lparam, &result, &info ); else ret = send_inter_thread_message( &info, &result ); } SPY_ExitMessage( SPY_RESULT_OK, hwnd, msg, result, wparam, lparam ); diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index db8b5ae..c278451 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -688,7 +688,7 @@ inline static BOOL WINPROC_TestLBForStr( * the first four bytes are the handle of the icon * when the WM_SETTEXT message has been used to set the icon */ -INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plparam ) +static INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plparam ) { switch(msg) { @@ -859,8 +859,8 @@ INT WINPROC_MapMsg32ATo32W( HWND hwnd, U * * Unmap a message that was mapped from Ansi to Unicode. */ -LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT result, WNDPROC dispatch ) +static LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + LRESULT result, WNDPROC dispatch ) { switch(msg) { @@ -2642,8 +2642,8 @@ void WINPROC_UnmapMsg32WTo16( HWND hwnd, * * Call a window procedure, translating args from Ansi to Unicode. */ -static LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT *result, void *arg ) +LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, WPARAM wParam, + LPARAM lParam, LRESULT *result, void *arg ) { LRESULT ret; int unmap; diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index 02d96cf..e80c295 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -55,8 +55,9 @@ extern WNDPROC WINPROC_GetProc( WNDPROC extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ); extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val ); -extern INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, - LPARAM *plparam ); +extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); + extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, WPARAM *pwparam32, LPARAM *plparam ); @@ -69,9 +70,6 @@ extern INT WINPROC_MapMsg32ATo16( HWND h extern INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32, UINT16 *pmsg16, WPARAM16 *pwparam16, LPARAM *plparam ); -extern LRESULT WINPROC_UnmapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT result, - WNDPROC dispatch ); extern LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT result ); extern LRESULT WINPROC_UnmapMsg16To32W( HWND hwnd, UINT msg, WPARAM wParam,

1 0

Alexandre Julliard : user: Store the destination thread id in the send_message_info structure.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 521ea482aa38d2c03eaa181e8956066d5c0e483e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=521ea482aa38d2c03eaa181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 19:44:49 2006 +0200 user: Store the destination thread id in the send_message_info structure. --- dlls/user/message.c | 98 +++++++++++++++++++++++++-------------------------- 1 files changed, 48 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=521ea482aa38d2c03ea…

1 0

Mikołaj Zalewski : comctl32: header: Make sure no message is sent between PrepareCallbackItems/ FreeCallbackItems.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 4b25b346ee4127ca39df1c17b0ce91827708a340 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b25b346ee4127ca39df1c1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 18 21:22:55 2006 +0200 comctl32: header: Make sure no message is sent between PrepareCallbackItems/FreeCallbackItems. --- dlls/comctl32/header.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 9e37759..fcd2839 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -247,7 +247,6 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT if (r.right - r.left == 0) return phdi->rect.right; - HEADER_PrepareCallbackItems(hwnd, iItem, HDI_TEXT|HDI_IMAGE); if (theme != NULL) { int state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); @@ -319,6 +318,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT cw, tw, iw, bw; BITMAP bmp; + HEADER_PrepareCallbackItems(hwnd, iItem, HDI_TEXT|HDI_IMAGE); cw = tw = iw = bw = 0; rw = r.right - r.left; rh = r.bottom - r.top; @@ -434,9 +434,9 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); } + HEADER_FreeCallbackItems(phdi); }/*Ownerdrawn*/ - HEADER_FreeCallbackItems(phdi); return phdi->rect.right; }

1 0

Mikołaj Zalewski : comctl32: header: Don' t erase the background in HEADER_Refresh.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: c932852bd40490bbcab896231a6c3306fbf6a53c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c932852bd40490bbcab8962… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 18 21:15:09 2006 +0200 comctl32: header: Don't erase the background in HEADER_Refresh. --- dlls/comctl32/header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index e488d44..9e37759 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -459,7 +459,7 @@ HEADER_Refresh (HWND hwnd, HDC hdc) hOldFont = SelectObject (hdc, hFont); /* draw Background */ - if (theme == NULL) { + if (infoPtr->uNumItem == 0 && theme == NULL) { hbrBk = GetSysColorBrush(COLOR_3DFACE); FillRect(hdc, &rect, hbrBk); } @@ -478,9 +478,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) } else { if (GetWindowLongW (hwnd, GWL_STYLE) & HDS_BUTTONS) - DrawEdge (hdc, &rect, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT); + DrawEdge (hdc, &rect, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT|BF_MIDDLE); else - DrawEdge (hdc, &rect, EDGE_ETCHED, BF_BOTTOM); + DrawEdge (hdc, &rect, EDGE_ETCHED, BF_BOTTOM|BF_MIDDLE); } }

1 0

Mikołaj Zalewski : comctl32: header: The border size is 4 not 3.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: c054c1fe0e8ccbc55a9db24441a58a26cbb11ede URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c054c1fe0e8ccbc55a9db24… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 18 21:09:20 2006 +0200 comctl32: header: The border size is 4 not 3. --- dlls/comctl32/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index d363e34..e488d44 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -92,7 +92,7 @@ typedef struct } HEADER_INFO; -#define VERT_BORDER 3 +#define VERT_BORDER 4 #define DIVIDER_WIDTH 10 #define MAX_HEADER_TEXT_LEN 260 #define HDN_UNICODE_OFFSET 20

1 0

Stefan Dösinger : wined3d: Sort of oversized surface support.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: cfcdb6515b5059aa1f4253a2e51a55fa67c78dfe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfcdb6515b5059aa1f4253a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 19 00:13:29 2006 +0200 wined3d: Sort of oversized surface support. --- dlls/wined3d/device.c | 19 +++---------------- dlls/wined3d/surface.c | 34 +++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cdedac0..c74b125 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -644,19 +644,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat } } - /** Check against the maximum texture sizes supported by the video card **/ - if (pow2Width > GL_LIMITS(texture_size) || pow2Height > GL_LIMITS(texture_size)) { - /* one of three options - 1: Do the same as we do with nonpow 2 and scale the texture, (any texture ops would require the texture to be scaled which is potentially slow) - 2: Set the texture to the maxium size (bad idea) - 3: WARN and return WINED3DERR_NOTAVAILABLE; - */ - WARN("(%p) Application requested a surface w %d, h %d, but the graphics card only supports %d\n", This, Width, Height, GL_LIMITS(texture_size)); - return WINED3DERR_NOTAVAILABLE; - } - - - /** DXTn mipmaps use the same number of 'levels' down to eg. 8x1, but since * it is based around 4x4 pixel blocks it requires padding, so allocate enough * space! @@ -850,12 +837,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat { /* use the callback to create the texture surface */ hr = D3DCB_CreateSurface(This->parent, tmpW, tmpH, Format, Usage, Pool, i, &object->surfaces[i],NULL); - if (hr!= WINED3D_OK) { + if (hr!= WINED3D_OK || ( (IWineD3DSurfaceImpl *) object->surfaces[i])->Flags & SFLAG_OVERSIZE) { int j; FIXME("Failed to create surface %p\n", object); /* clean up */ - for (j = 0 ; j < i ; j++) { - IWineD3DSurface_Release(object->surfaces[j]); + for (j = 0 ; j <= i ; j++) { + if(object->surfaces[j]) IWineD3DSurface_Release(object->surfaces[j]); } /* heap free object */ HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7016f5d..a267ad2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1161,6 +1161,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT return WINED3D_OK; } + if(!This->Flags & SFLAG_OVERSIZE) { + ERR("Loading an oversized texture not supported yet, will follow soon\n"); + return WINED3D_OK; /* Return OK for now, easier for merging the code */ + } + This->Flags &= ~SFLAG_DIRTY; /* Resources are placed in system RAM and do not need to be recreated when a device is lost. @@ -1916,7 +1921,34 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetCo } HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { - /* Nothing to do for now */ + /** Check against the maximum texture sizes supported by the video card **/ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + + TRACE("%p\n", This); + if ((This->pow2Width > GL_LIMITS(texture_size) || This->pow2Height > GL_LIMITS(texture_size)) && !(This->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { + /* one of three options + 1: Do the same as we do with nonpow 2 and scale the texture, (any texture ops would require the texture to be scaled which is potentially slow) + 2: Set the texture to the maxium size (bad idea) + 3: WARN and return WINED3DERR_NOTAVAILABLE; + 4: Create the surface, but allow it to be used only for DirectDraw Blts. Some apps(e.g. Swat 3) create textures with a Height of 16 and a Width > 3000 and blt 16x16 letter areas from them to the render target. + */ + WARN("(%p) Creating an oversized surface\n", This); + This->Flags |= SFLAG_OVERSIZE; + + /* This will be initialized on the first blt */ + This->glRect.left = 0; + This->glRect.top = 0; + This->glRect.right = 0; + This->glRect.bottom = 0; + } else { + /* No oversize, gl rect is the full texture size */ + This->Flags &= ~SFLAG_OVERSIZE; + This->glRect.left = 0; + This->glRect.top = 0; + This->glRect.right = This->pow2Width; + This->glRect.bottom = This->pow2Height; + } + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebb2d86..0addae6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -845,6 +845,9 @@ struct IWineD3DSurfaceImpl UINT pow2Height; UINT pow2Size; + /* Oversized texture */ + RECT glRect; + #if 0 /* precalculated x and y scalings for texture coords */ float pow2scalingFactorX; /* = (Width / pow2Width ) */

1 0

Stefan Dösinger : wined3d: Add more device caps.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 672fa653345c87fa19611deaae1becfff25c6296 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=672fa653345c87fa19611de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 18 23:25:19 2006 +0200 wined3d: Add more device caps. --- dlls/wined3d/directx.c | 63 +++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b2db4d7..60b9b28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1471,7 +1471,8 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap *pCaps->CursorCaps = 0; - *pCaps->DevCaps = WINED3DDEVCAPS_EXECUTESYSTEMMEMORY | + *pCaps->DevCaps = WINED3DDEVCAPS_FLOATTLVERTEX | + WINED3DDEVCAPS_EXECUTESYSTEMMEMORY | WINED3DDEVCAPS_TLVERTEXSYSTEMMEMORY| WINED3DDEVCAPS_TLVERTEXVIDEOMEMORY | WINED3DDEVCAPS_DRAWPRIMTLVERTEX | @@ -1480,8 +1481,10 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap WINED3DDEVCAPS_PUREDEVICE | WINED3DDEVCAPS_HWRASTERIZATION | WINED3DDEVCAPS_TEXTUREVIDEOMEMORY | - WINED3DDEVCAPS_TEXTURESYSTEMMEMORY; - + WINED3DDEVCAPS_TEXTURESYSTEMMEMORY | + WINED3DDEVCAPS_CANRENDERAFTERFLIP | + WINED3DDEVCAPS_DRAWPRIMITIVES2 | + WINED3DDEVCAPS_DRAWPRIMITIVES2EX; *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW | D3DPMISCCAPS_CULLCW | @@ -1497,7 +1500,11 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap WINED3DPRASTERCAPS_ZFOG | WINED3DPRASTERCAPS_FOGVERTEX | WINED3DPRASTERCAPS_FOGTABLE | - WINED3DPRASTERCAPS_FOGRANGE; + WINED3DPRASTERCAPS_FOGRANGE | + WINED3DPRASTERCAPS_FOGRANGE | + WINED3DPRASTERCAPS_STIPPLE | + WINED3DPRASTERCAPS_SUBPIXEL | + WINED3DPRASTERCAPS_ZTEST; if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) { *pCaps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | @@ -1525,24 +1532,23 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap *pCaps->AlphaCmpCaps = 0xFFFFFFFF; /*FIXME: Tidy up later */ *pCaps->ShadeCaps = WINED3DPSHADECAPS_SPECULARGOURAUDRGB | - WINED3DPSHADECAPS_COLORGOURAUDRGB; + WINED3DPSHADECAPS_COLORGOURAUDRGB | + WINED3DPSHADECAPS_ALPHAFLATBLEND | + WINED3DPSHADECAPS_ALPHAGOURAUDBLEND | + WINED3DPSHADECAPS_COLORFLATRGB | + WINED3DPSHADECAPS_FOGFLAT | + WINED3DPSHADECAPS_FOGGOURAUD | + WINED3DPSHADECAPS_SPECULARFLATRGB; *pCaps->TextureCaps = WINED3DPTEXTURECAPS_ALPHA | WINED3DPTEXTURECAPS_ALPHAPALETTE | + WINED3DPTEXTURECAPS_BORDER | WINED3DPTEXTURECAPS_VOLUMEMAP | WINED3DPTEXTURECAPS_MIPMAP | WINED3DPTEXTURECAPS_PROJECTED | WINED3DPTEXTURECAPS_PERSPECTIVE | - WINED3DPTEXTURECAPS_VOLUMEMAP_POW2 ; - /* TODO: add support for NON-POW2 if avaialble - - */ - if (This->dxVersion >= 8) { - *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; - - } else { /* NONPOW2 isn't accessible by d3d8 yet */ - *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; - } + WINED3DPTEXTURECAPS_VOLUMEMAP_POW2 | + WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; if (GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | @@ -1551,12 +1557,18 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap } - *pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MIPFLINEAR | - WINED3DPTFILTERCAPS_MIPFPOINT; + *pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | + WINED3DPTFILTERCAPS_MAGFPOINT | + WINED3DPTFILTERCAPS_MINFLINEAR | + WINED3DPTFILTERCAPS_MINFPOINT | + WINED3DPTFILTERCAPS_MIPFLINEAR | + WINED3DPTFILTERCAPS_MIPFPOINT | + WINED3DPTFILTERCAPS_LINEAR | + WINED3DPTFILTERCAPS_LINEARMIPLINEAR | + WINED3DPTFILTERCAPS_LINEARMIPNEAREST | + WINED3DPTFILTERCAPS_MIPLINEAR | + WINED3DPTFILTERCAPS_MIPNEAREST | + WINED3DPTFILTERCAPS_NEAREST; *pCaps->CubeTextureFilterCaps = 0; *pCaps->VolumeTextureFilterCaps = 0; @@ -1671,7 +1683,8 @@ #endif *pCaps->VertexProcessingCaps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS | WINED3DVTXPCAPS_MATERIALSOURCE7 | WINED3DVTXPCAPS_POSITIONALLIGHTS | - WINED3DVTXPCAPS_LOCALVIEWER | + WINED3DVTXPCAPS_LOCALVIEWER | + WINED3DVTXPCAPS_VERTEXFOG | WINED3DVTXPCAPS_TEXGEN; /* FIXME: Add D3DVTXPCAPS_TWEENING */ @@ -1749,12 +1762,6 @@ #if 0 /*FIXME: Simultaneous render targe #endif *pCaps->NumSimultaneousRTs = max_buffers; *pCaps->StretchRectFilterCaps = 0; - /* TODO: add - WINED3DPTFILTERCAPS_MINFPOINT - WINED3DPTFILTERCAPS_MAGFPOINT - WINED3DPTFILTERCAPS_MINFLINEAR - WINED3DPTFILTERCAPS_MAGFLINEAR - */ *pCaps->VS20Caps.Caps = 0; *pCaps->PS20Caps.Caps = 0; *pCaps->VertexTextureFilterCaps = 0;

1 0

Stefan Dösinger : wined3d: Allow SYSTEMMEM textures and surfaces.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: ebcbda72c417d5a03995293c5ab46a5e6e200f59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebcbda72c417d5a03995293… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 18 22:59:33 2006 +0200 wined3d: Allow SYSTEMMEM textures and surfaces. --- dlls/wined3d/device.c | 12 +++++------- dlls/wined3d/directx.c | 8 ++++++-- dlls/wined3d/surface.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 776fca6..cdedac0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5231,11 +5231,9 @@ #endif } if(pTexture != NULL) { - /* SetTexture isn't allowed on textures in WINED3DPOOL_SCRATCH; The same is - * the case for WINED3DPOOL_SYSTEMMEM textures unless WINED3DDEVCAPS_TEXTURESYSTEMMORY is set. - * We don't check the caps as GetDeviceCaps is inefficient and we don't set the cap anyway. - */ - if(((IWineD3DTextureImpl*)pTexture)->resource.pool == WINED3DPOOL_SCRATCH || ((IWineD3DTextureImpl*)pTexture)->resource.pool == WINED3DPOOL_SYSTEMMEM) { + /* SetTexture isn't allowed on textures in WINED3DPOOL_SCRATCH; + */ + if(((IWineD3DTextureImpl*)pTexture)->resource.pool == WINED3DPOOL_SCRATCH) { WARN("(%p) Attempt to set scratch texture rejected\n", pTexture); return WINED3DERR_INVALIDCALL; } @@ -6435,8 +6433,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_ColorF DWORD *data; TRACE("(%p) Colour fill Surface: %p rect: %p color: %ld\n", This, pSurface, pRect, color); - if (surface->resource.pool != WINED3DPOOL_DEFAULT) { - FIXME("call to colorfill with non WINED3DPOOL_DEFAULT surface\n"); + if (surface->resource.pool != WINED3DPOOL_DEFAULT && surface->resource.pool != WINED3DPOOL_SYSTEMMEM) { + FIXME("call to colorfill with non WINED3DPOOL_DEFAULT or WINED3DPOOL_SYSTEMMEM surface\n"); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 788fbf0..b2db4d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1471,12 +1471,16 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap *pCaps->CursorCaps = 0; - *pCaps->DevCaps = WINED3DDEVCAPS_DRAWPRIMTLVERTEX | + *pCaps->DevCaps = WINED3DDEVCAPS_EXECUTESYSTEMMEMORY | + WINED3DDEVCAPS_TLVERTEXSYSTEMMEMORY| + WINED3DDEVCAPS_TLVERTEXVIDEOMEMORY | + WINED3DDEVCAPS_DRAWPRIMTLVERTEX | WINED3DDEVCAPS_HWTRANSFORMANDLIGHT | WINED3DDEVCAPS_EXECUTEVIDEOMEMORY | WINED3DDEVCAPS_PUREDEVICE | WINED3DDEVCAPS_HWRASTERIZATION | - WINED3DDEVCAPS_TEXTUREVIDEOMEMORY; + WINED3DDEVCAPS_TEXTUREVIDEOMEMORY | + WINED3DDEVCAPS_TEXTURESYSTEMMEMORY; *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW | diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5b7198c..7016f5d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1170,9 +1170,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT * In general never store scratch or system mem textures in the video ram. However it is allowed * for system memory textures when WINED3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now. */ - if (This->resource.pool == WINED3DPOOL_SCRATCH || This->resource.pool == WINED3DPOOL_SYSTEMMEM) + if (This->resource.pool == WINED3DPOOL_SCRATCH) { - FIXME("(%p) Operation not supported for scratch or SYSTEMMEM textures\n",This); + FIXME("(%p) Operation not supported for scratch textures\n",This); return WINED3DERR_INVALIDCALL; }

1 0

Stefan Dösinger : wined3d: Implement IWineD3DDevice:: SetDisplayMode.
by Alexandre Julliard May 20, 2006

May 20, 2006

Module: wine Branch: refs/heads/master Commit: 566cdcf55c35eba9ceb07420922d60123dcdb711 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=566cdcf55c35eba9ceb0742… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu May 18 22:42:22 2006 +0200 wined3d: Implement IWineD3DDevice::SetDisplayMode. --- dlls/wined3d/device.c | 87 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/directx.c | 8 ++++ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a612f99..776fca6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1316,7 +1316,10 @@ #endif *(pPresentationParameters->BackBufferWidth), *(pPresentationParameters->BackBufferHeight), SWP_SHOWWINDOW | SWP_FRAMECHANGED); - + /* For GetDisplayMode */ + This->ddraw_width = devmode.dmPelsWidth; + This->ddraw_height = devmode.dmPelsHeight; + This->ddraw_format = *(pPresentationParameters->BackBufferFormat); } @@ -1866,8 +1869,60 @@ HRESULT WINAPI IWineD3DDeviceImpl_EnumDi } HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { - FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); - return WINED3DERR_INVALIDCALL; + DEVMODEW devmode; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + LONG ret; + + TRACE("(%p)->(%d,%p) Mode=%dx%dx@%d, %s\n", This, iSwapChain, pMode, pMode->Width, pMode->Height, pMode->RefreshRate, debug_d3dformat(pMode->Format)); + + /* Resize the screen even without a window: + * The app could have unset it with SetCooperativeLevel, but not called + * RestoreDisplayMode first. Then the release will call RestoreDisplayMode, + * but we don't have any hwnd + */ + + devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmBitsPerPel = D3DFmtGetBpp(This, pMode->Format) * 8; + if(devmode.dmBitsPerPel == 24) devmode.dmBitsPerPel = 32; + devmode.dmPelsWidth = pMode->Width; + devmode.dmPelsHeight = pMode->Height; + + devmode.dmDisplayFrequency = pMode->RefreshRate; + if (pMode->RefreshRate != 0) { + devmode.dmFields |= DM_DISPLAYFREQUENCY; + } + + /* Only change the mode if necessary */ + if( (This->ddraw_width == pMode->Width) && + (This->ddraw_height == pMode->Height) && + (This->ddraw_format == pMode->Format) && + (pMode->RefreshRate == 0) ) { + return D3D_OK; + } + + ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) { + if(devmode.dmDisplayFrequency != 0) { + WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate\n"); + devmode.dmFields &= ~DM_DISPLAYFREQUENCY; + devmode.dmDisplayFrequency = 0; + ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL) != DISP_CHANGE_SUCCESSFUL; + } + if(ret != DISP_CHANGE_SUCCESSFUL) { + return DDERR_INVALIDMODE; + } + } + + /* Store the new values */ + This->ddraw_width = pMode->Width; + This->ddraw_height = pMode->Height; + This->ddraw_format = pMode->Format; + + /* Only do this with a window of course */ + if(This->ddraw_window) + MoveWindow(This->ddraw_window, 0, 0, pMode->Width, pMode->Height, TRUE); + + return WINED3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_EnumZBufferFormats(IWineD3DDevice *iface, D3DCB_ENUMPIXELFORMATS Callback, void *Context) { @@ -5265,13 +5320,29 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetDis IWineD3DSwapChain *swapChain; HRESULT hr; - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); - if (hr == WINED3D_OK) { - hr = IWineD3DSwapChain_GetDisplayMode(swapChain, pMode); - IWineD3DSwapChain_Release(swapChain); + if(iSwapChain > 0) { + hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, (IWineD3DSwapChain **)&swapChain); + if (hr == WINED3D_OK) { + hr = IWineD3DSwapChain_GetDisplayMode(swapChain, pMode); + IWineD3DSwapChain_Release(swapChain); + } else { + FIXME("(%p) Error getting display mode\n", This); + } } else { - FIXME("(%p) Error getting display mode\n", This); + /* Don't read the real display mode, + but return the stored mode instead. X11 can't change the color + depth, and some apps are pretty angry if they SetDisplayMode from + 24 to 16 bpp and find out that GetDisplayMode still returns 24 bpp + + Also don't relay to the swapchain because with ddraw it's possible + that there isn't a swapchain at all */ + pMode->Width = This->ddraw_width; + pMode->Height = This->ddraw_height; + pMode->Format = This->ddraw_format; + pMode->RefreshRate = 0; + hr = WINED3D_OK; } + return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b1813a..788fbf0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1772,6 +1772,7 @@ HRESULT WINAPI IWineD3DImpl_CreateDevi IWineD3DDeviceImpl *object = NULL; IWineD3DImpl *This = (IWineD3DImpl *)iface; + HDC hDC; /* Validate the adapter number */ if (Adapter >= IWineD3D_GetAdapterCount(iface)) { @@ -1831,6 +1832,13 @@ HRESULT WINAPI IWineD3DImpl_CreateDevi /* set the state of the device to valid */ object->state = WINED3D_OK; + /* Get the initial screen setup for ddraw */ + object->ddraw_width = GetSystemMetrics(SM_CXSCREEN); + object->ddraw_height = GetSystemMetrics(SM_CYSCREEN); + hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + object->ddraw_format = pixelformat_for_depth(GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES)); + DeleteDC(hDC); + return WINED3D_OK; create_device_error: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6754877..ebb2d86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -567,6 +567,8 @@ #define NEEDS_DI /* DirectDraw stuff */ HWND ddraw_window; IWineD3DSurface *ddraw_primary; + DWORD ddraw_width, ddraw_height; + WINED3DFORMAT ddraw_format; } IWineD3DDeviceImpl;

1 0