October 2006 - Wine-commits

Mikołaj Zalewski : comctl32: toolbar: Don' t send NM_CUSTOMDRAW for separators.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: e0e2d7482c405fb504d739162c9cac063f88a58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e2d7482c405fb504d739162… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:44:57 2006 +0200 comctl32: toolbar: Don't send NM_CUSTOMDRAW for separators. --- dlls/comctl32/toolbar.c | 55 +++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e0d06ae..b3a3ee7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -826,6 +826,33 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I rc = btnPtr->rect; CopyRect (&rcArrow, &rc); + /* separator - doesn't send NM_CUSTOMDRAW */ + if (btnPtr->fsStyle & BTNS_SEP) { + if (theme) + { + DrawThemeBackground (theme, hdc, + (dwStyle & CCS_VERT) ? TP_SEPARATORVERT : TP_SEPARATOR, 0, + &rc, NULL); + } + else + /* with the FLAT style, iBitmap is the width and has already */ + /* been taken into consideration in calculating the width */ + /* so now we need to draw the vertical separator */ + /* empirical tests show that iBitmap can/will be non-zero */ + /* when drawing the vertical bar... */ + if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { + if (btnPtr->fsStyle & BTNS_DROPDOWN) + TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr, infoPtr); + else + TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); + } + else if (btnPtr->fsStyle != BTNS_SEP) { + FIXME("Draw some kind of separator: fsStyle=%x\n", + btnPtr->fsStyle); + } + return; + } + /* get a pointer to the text */ lpText = TOOLBAR_GetText(infoPtr, btnPtr); @@ -943,33 +970,6 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I rcText.bottom = tbcd.rcText.bottom + rc.top; } - /* separator */ - if (btnPtr->fsStyle & BTNS_SEP) { - if (theme) - { - DrawThemeBackground (theme, hdc, - (dwStyle & CCS_VERT) ? TP_SEPARATORVERT : TP_SEPARATOR, 0, - &tbcd.nmcd.rc, NULL); - } - else - /* with the FLAT style, iBitmap is the width and has already */ - /* been taken into consideration in calculating the width */ - /* so now we need to draw the vertical separator */ - /* empirical tests show that iBitmap can/will be non-zero */ - /* when drawing the vertical bar... */ - if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) - TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr, infoPtr); - else - TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); - } - else if (btnPtr->fsStyle != BTNS_SEP) { - FIXME("Draw some kind of separator: fsStyle=%x\n", - btnPtr->fsStyle); - } - goto FINALNOTIFY; - } - if (!(infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) && (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))) OffsetRect(&rcText, 1, 1); @@ -1058,7 +1058,6 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnText); } -FINALNOTIFY: if (infoPtr->dwItemCustDraw & CDRF_NOTIFYPOSTPAINT) { tbcd.nmcd.dwDrawStage = CDDS_ITEMPOSTPAINT;

1 0

Mikołaj Zalewski : comctl32: toolbar: Remove dwItemCustDraw from TOOLBAR_INFO and store it as a local variable.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 4cf682b8c4c6a229b77011f3a1ae9d882dfec75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf682b8c4c6a229b77011f3a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:47:22 2006 +0200 comctl32: toolbar: Remove dwItemCustDraw from TOOLBAR_INFO and store it as a local variable. --- dlls/comctl32/toolbar.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b3a3ee7..8531ac9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -140,7 +140,6 @@ typedef struct INT nOldHit; INT nHotItem; /* index of the "hot" item */ DWORD dwBaseCustDraw; /* CDRF_ response (w/o TBCDRF_) from PREPAINT */ - DWORD dwItemCustDraw; /* CDRF_ response (w/o TBCDRF_) from ITEMPREP */ DWORD dwItemCDFlag; /* TBCDRF_ flags from last ITEMPREPAINT */ SIZE szPadding; /* padding values around button */ INT iListGap; /* default gap between text and image for toolbar with list style */ @@ -821,6 +820,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I DWORD ntfret; INT offset; INT oldBkMode; + DWORD dwItemCustDraw; HTHEME theme = GetWindowTheme (hwnd); rc = btnPtr->rect; @@ -949,7 +949,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I tbcd.hpenLines = 0; /* Issue Item Prepaint notify */ - infoPtr->dwItemCustDraw = 0; + dwItemCustDraw = 0; infoPtr->dwItemCDFlag = 0; if (infoPtr->dwBaseCustDraw & CDRF_NOTIFYITEMDRAW) { @@ -961,9 +961,9 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I tbcd.nmcd.hdc = hdc; tbcd.nmcd.rc = rc; - infoPtr->dwItemCustDraw = ntfret & 0xffff; + dwItemCustDraw = ntfret & 0xffff; infoPtr->dwItemCDFlag = ntfret & 0xffff0000; - if (infoPtr->dwItemCustDraw & CDRF_SKIPDEFAULT) + if (dwItemCustDraw & CDRF_SKIPDEFAULT) return; /* save the only part of the rect that the user can change */ rcText.right = tbcd.rcText.right + rc.left; @@ -1058,7 +1058,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnText); } - if (infoPtr->dwItemCustDraw & CDRF_NOTIFYPOSTPAINT) + if (dwItemCustDraw & CDRF_NOTIFYPOSTPAINT) { tbcd.nmcd.dwDrawStage = CDDS_ITEMPOSTPAINT; TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW);

1 0

Mikołaj Zalewski : comctl32: toolbar: Passing a string pointer in TB_INSERTBUTTON shouldn' t change the strings table (with test case).
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: c95aa8228acc57f99716ceb3845611c75f084fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95aa8228acc57f99716ceb38… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:48:38 2006 +0200 comctl32: toolbar: Passing a string pointer in TB_INSERTBUTTON shouldn't change the strings table (with test case). --- dlls/comctl32/tests/toolbar.c | 8 ++++++++ dlls/comctl32/toolbar.c | 32 -------------------------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 220d703..a007fa8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -337,6 +337,7 @@ void test_add_string() LPCSTR ret6[] = {"a", "b", "|a|b||", "p", "q", "p", "p", "q", "p", "", "q"}; LPCSTR ret7[] = {"a", "b", "|a|b||", "p", "q", "p", "p", "q", "p", "", "q", "br", "c", "d"}; HWND hToolbar = NULL; + TBBUTTON button; int ret; rebuild_toolbar(&hToolbar); @@ -365,6 +366,13 @@ void test_add_string() ret = SendMessageA(hToolbar, TB_ADDSTRINGA, (WPARAM)GetModuleHandle(NULL), IDS_TBADD7); ok(ret == 11, "TB_ADDSTRINGA - unexpected return %d\n", ret); CHECK_STRING_TABLE(14, ret7); + + ZeroMemory(&button, sizeof(button)); + button.iString = (UINT_PTR)"Test"; + SendMessageA(hToolbar, TB_INSERTBUTTONA, 0, (LPARAM)&button); + CHECK_STRING_TABLE(14, ret7); + SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&button); + CHECK_STRING_TABLE(14, ret7); } START_TEST(toolbar) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8531ac9..c2fd14b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3833,22 +3833,6 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM } else if (nIndex < 0) return FALSE; - /* If the string passed is not an index, assume address of string - and do our own AddString */ - if ((HIWORD(lpTbb->iString) != 0) && (lpTbb->iString != -1)) { - LPSTR ptr; - INT len; - - TRACE("string %s passed instead of index, adding string\n", - debugstr_a((LPSTR)lpTbb->iString)); - len = strlen((LPSTR)lpTbb->iString) + 2; - ptr = Alloc(len); - strcpy(ptr, (LPSTR)lpTbb->iString); - ptr[len - 1] = 0; /* ended by two '\0' */ - lpTbb->iString = TOOLBAR_AddStringA(hwnd, 0, (LPARAM)ptr); - Free(ptr); - } - TRACE("inserting button index=%d\n", nIndex); if (nIndex > infoPtr->nNumButtons) { nIndex = infoPtr->nNumButtons; @@ -3922,22 +3906,6 @@ TOOLBAR_InsertButtonW (HWND hwnd, WPARAM } else if (nIndex < 0) return FALSE; - /* If the string passed is not an index, assume address of string - and do our own AddString */ - if ((HIWORD(lpTbb->iString) != 0) && (lpTbb->iString != -1)) { - LPWSTR ptr; - INT len; - - TRACE("string %s passed instead of index, adding string\n", - debugstr_w((LPWSTR)lpTbb->iString)); - len = strlenW((LPWSTR)lpTbb->iString) + 2; - ptr = Alloc(len*sizeof(WCHAR)); - strcpyW(ptr, (LPWSTR)lpTbb->iString); - ptr[len - 1] = 0; /* ended by two '\0' */ - lpTbb->iString = TOOLBAR_AddStringW(hwnd, 0, (LPARAM)ptr); - Free(ptr); - } - TRACE("inserting button index=%d\n", nIndex); if (nIndex > infoPtr->nNumButtons) { nIndex = infoPtr->nNumButtons;

1 0

Mikołaj Zalewski : comctl32: listview: Don' t call ScrollColumn with an out of bounds index when resizing the last column .
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 056d004b3b83a279791a392ec9d77e30e14f2d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056d004b3b83a279791a392ec… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:43:47 2006 +0200 comctl32: listview: Don't call ScrollColumn with an out of bounds index when resizing the last column. --- dlls/comctl32/listview.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8d4fc6d..7c6c7a3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8582,7 +8582,8 @@ static LRESULT LISTVIEW_HeaderNotificati if (dx != 0) { lpColumnInfo->rcHeader.right += dx; - LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx); + if (lpnmh->iItem + 1 < DPA_GetPtrCount(infoPtr->hdpaColumns)) + LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx); LISTVIEW_UpdateItemSize(infoPtr); if (uView == LVS_REPORT && is_redrawing(infoPtr)) {

1 0

Mikołaj Zalewski : comctl32: header: Invalidate the control after a WM_SETREDRAW with wParam == TRUE.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 3f89a71323edbeb528272e3c49ed615c9fa9fbb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f89a71323edbeb528272e3c4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 11 20:55:31 2006 +0200 comctl32: header: Invalidate the control after a WM_SETREDRAW with wParam == TRUE. --- dlls/comctl32/header.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 63f91d8..820e72e 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1945,6 +1945,18 @@ HEADER_SetFont (HWND hwnd, WPARAM wParam return 0; } +static LRESULT HEADER_SetRedraw(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + /* ignoring the InvalidateRect calls is handled by user32. But some apps expect + * that we invalidate the header and this has to be done manually */ + LRESULT ret; + + ret = DefWindowProcW(hwnd, WM_SETREDRAW, wParam, lParam); + if (wParam) + InvalidateRect(hwnd, NULL, TRUE); + return ret; +} + /* Update the theme handle after a theme change */ static LRESULT HEADER_ThemeChanged(HWND hwnd) { @@ -2081,6 +2093,9 @@ HEADER_WindowProc (HWND hwnd, UINT msg, case WM_SETFONT: return HEADER_SetFont (hwnd, wParam, lParam); + case WM_SETREDRAW: + return HEADER_SetRedraw(hwnd, wParam, lParam); + default: if ((msg >= WM_USER) && (msg < WM_APP)) ERR("unknown msg %04x wp=%04x lp=%08lx\n",

1 0

Ivan Gyurdiev : wined3d: Merge D3DDP_MAXTEXCOORD constants into one constant in WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 532fe7a1cf4c4165877e0305fee14df952f988cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=532fe7a1cf4c4165877e0305f… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:24:43 2006 -0400 wined3d: Merge D3DDP_MAXTEXCOORD constants into one constant in WINED3D namespace. --- dlls/wined3d/drawprim.c | 18 +++++++++--------- include/wine/wined3d_types.h | 9 +++------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ffde5d2..fad7bf8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -368,24 +368,24 @@ static BOOL fixed_get_input( *regnum = 5; else if (usage == D3DDECLUSAGE_COLOR && usage_idx == 1) *regnum = 6; - else if (usage == D3DDECLUSAGE_TEXCOORD && usage_idx < D3DDP_MAXTEXCOORD) + else if (usage == D3DDECLUSAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) *regnum = 7 + usage_idx; else if ((usage == D3DDECLUSAGE_POSITION || usage == D3DDECLUSAGE_POSITIONT) && usage_idx == 1) - *regnum = 7 + D3DDP_MAXTEXCOORD; + *regnum = 7 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_NORMAL && usage_idx == 1) - *regnum = 8 + D3DDP_MAXTEXCOORD; + *regnum = 8 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_TANGENT && usage_idx == 0) - *regnum = 9 + D3DDP_MAXTEXCOORD; + *regnum = 9 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_BINORMAL && usage_idx == 0) - *regnum = 10 + D3DDP_MAXTEXCOORD; + *regnum = 10 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_TESSFACTOR && usage_idx == 0) - *regnum = 11 + D3DDP_MAXTEXCOORD; + *regnum = 11 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_FOG && usage_idx == 0) - *regnum = 12 + D3DDP_MAXTEXCOORD; + *regnum = 12 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_DEPTH && usage_idx == 0) - *regnum = 13 + D3DDP_MAXTEXCOORD; + *regnum = 13 + WINED3DDP_MAXTEXCOORD; else if (usage == D3DDECLUSAGE_SAMPLE && usage_idx == 0) - *regnum = 14 + D3DDP_MAXTEXCOORD; + *regnum = 14 + WINED3DDP_MAXTEXCOORD; if (*regnum < 0) { FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 48120e4..42afc1e 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -25,11 +25,6 @@ #ifndef __WINE_WINED3D_TYPES_H #define __WINE_WINED3D_TYPES_H -/* TODO: remove the dependency on d3d9 or d3d8 */ -#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) -# error You must include d3d.h, d3d8.h or d3d9.h header to use this header -#endif - typedef DWORD WINED3DCOLOR; typedef enum _WINED3DLIGHTTYPE { @@ -986,6 +981,8 @@ typedef struct glDescriptor { int/*GLenum*/ glType; } glDescriptor; +#define WINED3DDP_MAXTEXCOORD 8 + typedef enum _WINED3DDECLMETHOD { WINED3DDECLMETHOD_DEFAULT = 0, WINED3DDECLMETHOD_PARTIALU = 1, @@ -1038,7 +1035,7 @@ typedef struct WineDirect3DVertexStrided WineDirect3DStridedData pSize; WineDirect3DStridedData diffuse; WineDirect3DStridedData specular; - WineDirect3DStridedData texCoords[D3DDP_MAXTEXCOORD]; + WineDirect3DStridedData texCoords[WINED3DDP_MAXTEXCOORD]; WineDirect3DStridedData position2; /* tween data */ WineDirect3DStridedData normal2; /* tween data */ WineDirect3DStridedData tangent;

1 0

Ivan Gyurdiev : wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 2bac4a02da936aaea0d26d70cce69946f0e332a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bac4a02da936aaea0d26d70c… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:23:55 2006 -0400 wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/drawprim.c | 14 +++++++------- dlls/wined3d/utils.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 14 +++++--------- include/wine/wined3d_types.h | 11 +++++++++++ 6 files changed, 37 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bac4a02da936aaea0d26…

1 0

Ivan Gyurdiev : wined3d: Merge D3DCOLOR types into one type in WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 1cd7bcf4c87c3af90cc8ceff505c2f122f380ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd7bcf4c87c3af90cc8ceff5… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:22:59 2006 -0400 wined3d: Merge D3DCOLOR types into one type in WINED3D namespace. --- dlls/wined3d/device.c | 4 ++-- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4b72580..748dbef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6022,7 +6022,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, CONST WINED3DRECT* pRects, - DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { + DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; /* TODO: From MSDN This method fails if you specify the D3DCLEAR_ZBUFFER or D3DCLEAR_STENCIL flags when the @@ -6995,7 +6995,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, D3DCOLOR color) { +static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface; DDBLTFX BltFx; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index b6a2650..60c2334 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; STDMETHOD(Present)(THIS_ CONST RECT * pSourceRect,CONST RECT * pDestRect,HWND hDestWindowOverride,CONST RGNDATA * pDirtyRegion) PURE; - STDMETHOD(Clear)(THIS_ DWORD Count, CONST WINED3DRECT * pRects, DWORD Flags, D3DCOLOR Color,float Z, DWORD Stencil) PURE; + STDMETHOD(Clear)(THIS_ DWORD Count, CONST WINED3DRECT * pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,INT baseVIdx, UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) PURE; STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; @@ -456,7 +456,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; - STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST WINED3DRECT* pRect, D3DCOLOR color) PURE; + STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) PURE; STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; STDMETHOD(UpdateSurface)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPoint) PURE; STDMETHOD(CopyRects)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRectsArray, UINT cRects, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPointsArray); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 9eac171..b930211 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -30,6 +30,8 @@ #if !defined( __WINE_D3D_H ) && !defined # error You must include d3d.h, d3d8.h or d3d9.h header to use this header #endif +typedef DWORD WINED3DCOLOR; + typedef enum _WINED3DLIGHTTYPE { WINED3DLIGHT_POINT = 1, WINED3DLIGHT_SPOT = 2,

1 0

Ivan Gyurdiev : wined3d: Merge D3DRECT types into one type in WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 9628a1b2e29b9918ae8bd72be6ea4414331ecc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9628a1b2e29b9918ae8bd72be… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:22:18 2006 -0400 wined3d: Merge D3DRECT types into one type in WINED3D namespace. --- dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 8 ++++++-- dlls/ddraw/device.c | 3 ++- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/surface.c | 4 ++-- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 7 +++++++ 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 150abde..380a8ff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -671,7 +671,8 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n" , This); - return IWineD3DDevice_Clear(This->WineD3DDevice, Count, pRects, Flags, Color, Z, Stencil); + /* Note: D3DRECT is compatible with WINED3DRECT */ + return IWineD3DDevice_Clear(This->WineD3DDevice, Count, (CONST WINED3DRECT*) pRects, Flags, Color, Z, Stencil); } static HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* lpMatrix) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ff5eada..b450cbb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -361,7 +361,9 @@ static HRESULT WINAPI IDirect3DDevice9 IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *surface = (IDirect3DSurface9Impl *)pSurface; TRACE("(%p) Relay\n" , This); - return IWineD3DDevice_ColorFill(This->WineD3DDevice, surface->wineD3DSurface, (CONST D3DRECT*)pRect, color); + + /* Note: D3DRECT is compatible with WINED3DRECT */ + return IWineD3DDevice_ColorFill(This->WineD3DDevice, surface->wineD3DSurface, (CONST WINED3DRECT*)pRect, color); } static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE* pSharedHandle) { @@ -458,7 +460,9 @@ static HRESULT WINAPI IDirect3DDevice9 static HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n" , This); - return IWineD3DDevice_Clear(This->WineD3DDevice, Count, pRects, Flags, Color, Z, Stencil); + + /* Note: D3DRECT is compatible with WINED3DRECT */ + return IWineD3DDevice_Clear(This->WineD3DDevice, Count, (CONST WINED3DRECT*) pRects, Flags, Color, Z, Stencil); } static HRESULT WINAPI IDirect3DDevice9Impl_SetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* lpMatrix) { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 78ed293..b0eccc9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4031,7 +4031,8 @@ IDirect3DDeviceImpl_7_Clear(IDirect3DDev ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay\n", This, Count, Rects, Flags, (DWORD) Color, Z, Stencil); - return IWineD3DDevice_Clear(This->wineD3DDevice, Count, Rects, Flags, Color, Z, Stencil); + /* Note; D3DRECT is compatible with WINED3DRECT */ + return IWineD3DDevice_Clear(This->wineD3DDevice, Count, (WINED3DRECT*) Rects, Flags, Color, Z, Stencil); } /***************************************************************************** diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6de22f7..4b72580 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6021,7 +6021,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, CONST D3DRECT* pRects, +static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, CONST WINED3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -6034,7 +6034,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl GLint old_stencil_clear_value; GLfloat old_color_clear_value[4]; unsigned int i; - CONST D3DRECT* curRect; + CONST WINED3DRECT* curRect; TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Z (%f), Stencil (%d)\n", This, Count, pRects, Flags, Z, Stencil); @@ -6108,7 +6108,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl checkGLcall("glClear"); /* Step to the next rectangle */ - if (curRect) curRect = curRect + sizeof(D3DRECT); + if (curRect) curRect = curRect + sizeof(WINED3DRECT); } /* Restore the old values (why..?) */ @@ -6995,7 +6995,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST D3DRECT* pRect, D3DCOLOR color) { +static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, D3DCOLOR color) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface; DDBLTFX BltFx; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0377ddd..1242bbc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2237,7 +2237,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp /* Not called from the VTable */ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) { - D3DRECT rect; + WINED3DRECT rect; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; IWineD3DSwapChainImpl *swapchain = NULL; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; @@ -2580,7 +2580,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOv if( ( (IWineD3DSurface *) This != swapchain->frontBuffer) && ( swapchain->backBuffer && (IWineD3DSurface *) This != swapchain->backBuffer[0]) ) { UINT row; - D3DRECT srect; + WINED3DRECT srect; float xrel, yrel; TRACE("Blt from rendertarget to texture\n"); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 01a9d74..b6a2650 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; STDMETHOD(Present)(THIS_ CONST RECT * pSourceRect,CONST RECT * pDestRect,HWND hDestWindowOverride,CONST RGNDATA * pDirtyRegion) PURE; - STDMETHOD(Clear)(THIS_ DWORD Count,CONST D3DRECT * pRects,DWORD Flags,D3DCOLOR Color,float Z,DWORD Stencil) PURE; + STDMETHOD(Clear)(THIS_ DWORD Count, CONST WINED3DRECT * pRects, DWORD Flags, D3DCOLOR Color,float Z, DWORD Stencil) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,INT baseVIdx, UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) PURE; STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; @@ -456,7 +456,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; - STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE; + STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST WINED3DRECT* pRect, D3DCOLOR color) PURE; STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; STDMETHOD(UpdateSurface)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPoint) PURE; STDMETHOD(CopyRects)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRectsArray, UINT cRects, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPointsArray); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index ccd588f..9eac171 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -64,6 +64,13 @@ typedef struct _WINED3DMATRIX { } DUMMYUNIONNAME; } WINED3DMATRIX; +typedef struct _WINED3DRECT { + LONG x1; + LONG y1; + LONG x2; + LONG y2; +} WINED3DRECT; + typedef struct _WINED3DLIGHT { WINED3DLIGHTTYPE Type; WINED3DCOLORVALUE Diffuse;

1 0

Ivan Gyurdiev : wined3d: Merge D3DMATRIX types into one type in WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: ac371631246fbaddd43be503c589d66e5c6056f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac371631246fbaddd43be503c… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:21:39 2006 -0400 wined3d: Merge D3DMATRIX types into one type in WINED3D namespace. --- dlls/d3d8/device.c | 9 ++++++--- dlls/d3d9/device.c | 12 +++++++++--- dlls/ddraw/device.c | 9 ++++++--- dlls/ddraw/executebuffer.c | 8 +++++--- dlls/wined3d/device.c | 20 ++++++++++---------- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d_interface.h | 6 +++--- include/wine/wined3d_types.h | 12 ++++++++++++ 10 files changed, 58 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac371631246fbaddd43be…

1 0