May 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : ole32/ole2: Fix simple parameter handling for DoDragDrop().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 5426320d82201a16fa0a9fe1d30ff8279368575b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5426320d82201a16fa0a9fe1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 1 21:37:46 2010 +0400 ole32/ole2: Fix simple parameter handling for DoDragDrop(). --- dlls/ole32/ole2.c | 7 +- dlls/ole32/tests/dragdrop.c | 213 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 216 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 45f2220..e21f0ac 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -490,13 +490,14 @@ HRESULT WINAPI DoDragDrop ( HWND hwndTrackWindow; MSG msg; - TRACE("(DataObject %p, DropSource %p)\n", pDataObject, pDropSource); + TRACE("(%p, %p, %d, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); + + if (!pDataObject || !pDropSource || !pdwEffect) + return E_INVALIDARG; /* * Setup the drag n drop tracking window. */ - if (!IsValidInterface((LPUNKNOWN)pDropSource)) - return E_INVALIDARG; trackerInfo.dataObject = pDataObject; trackerInfo.dropSource = pDropSource; diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ce08bc3..ce60978 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -105,6 +105,170 @@ static const IDropTargetVtbl DropTarget_VTbl = static IDropTarget DropTarget = { &DropTarget_VTbl }; +/** stub IDropSource **/ +static HRESULT WINAPI DropSource_QueryInterface(IDropSource *iface, REFIID riid, void **ppObj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDropSource)) + { + *ppObj = iface; + IDropSource_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DropSource_AddRef(IDropSource *iface) +{ + return 2; +} + +static ULONG WINAPI DropSource_Release(IDropSource *iface) +{ + return 1; +} + +static HRESULT WINAPI DropSource_QueryContinueDrag( + IDropSource *iface, + BOOL fEscapePressed, + DWORD grfKeyState) +{ + /* always drop */ + return DRAGDROP_S_DROP; +} + +static HRESULT WINAPI DropSource_GiveFeedback( + IDropSource *iface, + DWORD dwEffect) +{ + return DRAGDROP_S_USEDEFAULTCURSORS; +} + +static const IDropSourceVtbl dropsource_vtbl = { + DropSource_QueryInterface, + DropSource_AddRef, + DropSource_Release, + DropSource_QueryContinueDrag, + DropSource_GiveFeedback +}; + +static IDropSource DropSource = { &dropsource_vtbl }; + +/** IDataObject stub **/ +static HRESULT WINAPI DataObject_QueryInterface( + IDataObject *iface, + REFIID riid, + void **pObj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataObject)) + { + *pObj = iface; + IDataObject_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DataObject_AddRef(IDataObject *iface) +{ + return 2; +} + +static ULONG WINAPI DataObject_Release(IDataObject *iface) +{ + return 1; +} + +static HRESULT WINAPI DataObject_GetData( + IDataObject *iface, + FORMATETC *pformatetcIn, + STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetDataHere( + IDataObject *iface, + FORMATETC *pformatetc, + STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_QueryGetData( + IDataObject *iface, + FORMATETC *pformatetc) +{ + return S_OK; +} + +static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( + IDataObject *iface, + FORMATETC *pformatectIn, + FORMATETC *pformatetcOut) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_SetData( + IDataObject *iface, + FORMATETC *pformatetc, + STGMEDIUM *pmedium, + BOOL fRelease) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumFormatEtc( + IDataObject *iface, + DWORD dwDirection, + IEnumFORMATETC **ppenumFormatEtc) +{ + return S_OK; +} + +static HRESULT WINAPI DataObject_DAdvise( + IDataObject *iface, + FORMATETC *pformatetc, + DWORD advf, + IAdviseSink *pAdvSink, + DWORD *pdwConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DUnadvise( + IDataObject *iface, + DWORD dwConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumDAdvise( + IDataObject *iface, + IEnumSTATDATA **ppenumAdvise) +{ + return E_NOTIMPL; +} + +static const IDataObjectVtbl dataobject_vtbl = { + DataObject_QueryInterface, + DataObject_AddRef, + DataObject_Release, + DataObject_GetData, + DataObject_GetDataHere, + DataObject_QueryGetData, + DataObject_GetCanonicalFormatEtc, + DataObject_SetData, + DataObject_EnumFormatEtc, + DataObject_DAdvise, + DataObject_DUnadvise, + DataObject_EnumDAdvise +}; + +static IDataObject DataObject = { &dataobject_vtbl }; + static ATOM register_dummy_class(void) { WNDCLASS wc = @@ -129,7 +293,7 @@ static void test_Register_Revoke(void) HRESULT hr; HWND hwnd; - hwnd = CreateWindow(MAKEINTATOM(register_dummy_class()), "Test", 0, + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); @@ -173,7 +337,54 @@ static void test_Register_Revoke(void) DestroyWindow(hwnd); } +static void test_DoDragDrop(void) +{ + DWORD effect; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + ok(IsWindow(hwnd), "failed to create window\n"); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* incomplete arguments set */ + hr = DoDragDrop(NULL, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, &DropSource, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, NULL, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, &DropSource, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, &DropSource, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, NULL, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + OleUninitialize(); + + DestroyWindow(hwnd); +} + START_TEST(dragdrop) { + register_dummy_class(); + test_Register_Revoke(); + test_DoDragDrop(); }

1 0

Nikolay Sivov : ole32/tests: Additional test for RevokeDragDrop with destroyed window.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 071d16d62444f5695f511a46023e03394f7bdd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071d16d62444f5695f511a460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 03:01:36 2010 +0400 ole32/tests: Additional test for RevokeDragDrop with destroyed window. --- dlls/ole32/tests/dragdrop.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ce60978..e098354 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -335,6 +335,23 @@ static void test_Register_Revoke(void) ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); DestroyWindow(hwnd); + + /* try to revoke with already destroyed window */ + OleInitialize(NULL); + + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == S_OK, "got 0x%08x\n", hr); + + DestroyWindow(hwnd); + + hr = RevokeDragDrop(hwnd); + ok(hr == DRAGDROP_E_INVALIDHWND, "got 0x%08x\n", hr); + + OleUninitialize(); } static void test_DoDragDrop(void)

1 0

Nikolay Sivov : ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 9c44ed8a6bc713d89f88ab20130b807db20639a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c44ed8a6bc713d89f88ab201… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 12:49:37 2010 +0400 ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid. --- dlls/ole32/ole2.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e21f0ac..b20be1d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2081,13 +2081,21 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) /* * If there is, notify it that we just dragged-in */ - if (trackerInfo->curDragTarget!=0) + if (trackerInfo->curDragTarget) { - IDropTarget_DragEnter(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + hr = IDropTarget_DragEnter(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + + /* failed DragEnter() means invalid target */ + if (hr != S_OK) + { + trackerInfo->curDragTargetHWND = 0; + trackerInfo->curTargetHWND = 0; + trackerInfo->curDragTarget = 0; + } } } else

1 0

Nikolay Sivov : ole32/ole2: If no effect action selected use ::DragLeave() instead of ::Drop().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f3ab3d971a793f7fa16d7ae3853a878d3c5546b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ab3d971a793f7fa16d7ae38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 12:56:47 2010 +0400 ole32/ole2: If no effect action selected use ::DragLeave() instead of ::Drop(). --- dlls/ole32/ole2.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b20be1d..2e4da53 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2196,7 +2196,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * If we end-up over a target, drop the object in the target or * inform the target that the operation was cancelled. */ - if (trackerInfo->curDragTarget!=0) + if (trackerInfo->curDragTarget) { switch (trackerInfo->returnValue) { @@ -2205,14 +2205,16 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * the drop target that we just dropped the object in it. */ case DRAGDROP_S_DROP: - { - IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - break; - } + if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) + IDropTarget_Drop(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + else + IDropTarget_DragLeave(trackerInfo->curDragTarget); + break; + /* * If the source told us that we should cancel, fool the drop * target by telling it that the mouse left it's window.

1 0

Austin English : msvcrt/tests: fix a couple typos.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: b581fc5b0b7c8239fda3649ef49dbdc7624ef041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b581fc5b0b7c8239fda3649ef… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 2 05:40:23 2010 -0500 msvcrt/tests: fix a couple typos. --- dlls/msvcrt/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 4c4b7a9..a6847b4 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -77,7 +77,7 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "German"); todo_wine ok(!strcmp(ret, "German_Germany.1252"), "ret = %s\n", ret); - /* This test shows that _country_synonims table is incorrect */ + /* This test shows that _country_synonyms table is incorrect */ /* It translates "America" to "US" */ ret = setlocale(LC_ALL, "America"); ok(ret == NULL, "ret = %s\n", ret); @@ -108,7 +108,7 @@ static void test_crtGetStringTypeW(void) } if(!pmemcpy_s) { - win_skip("To old version of msvcrt.dll\n"); + win_skip("Too old version of msvcrt.dll\n"); return; }

1 0

Rico Schüller : ddraw: Change return to break in PixelFormat_WineD3DtoDD().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: cef28bb3a2c2f0b3bd921f42a60eb92a67ab19f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef28bb3a2c2f0b3bd921f42a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun May 2 19:35:25 2010 +0200 ddraw: Change return to break in PixelFormat_WineD3DtoDD(). --- dlls/ddraw/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 7641f51..ed8b480 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -182,7 +182,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u3.dwGBitMask = 0x00F0; DDPixelFormat->u4.dwBBitMask = 0x000F; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; - return; + break; /* How are Z buffer bit depth and Stencil buffer bit depth related? */ @@ -236,8 +236,8 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; - break; + case WINED3DFMT_S1_UINT_D15_UNORM: DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0;

1 0

Henri Verbeet : d3d9/tests: Fix test_cube_wrap() for different texture filtering schemes.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 2661e9abf70d2ffbc46a4d791754226246b0e30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2661e9abf70d2ffbc46a4d791… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:27 2010 +0200 d3d9/tests: Fix test_cube_wrap() for different texture filtering schemes. --- dlls/d3d9/tests/visual.c | 58 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4e5e838..ca93be5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1143,7 +1143,14 @@ static void fog_test(IDirect3DDevice9 *device) /* This test verifies the behaviour of cube maps wrt. texture wrapping. * D3D cube map wrapping always behaves like GL_CLAMP_TO_EDGE, - * regardless of the actual addressing mode set. */ + * regardless of the actual addressing mode set. The way this test works is + * that we sample in one of the corners of the cubemap with filtering enabled, + * and check the interpolated color. There are essentially two reasonable + * things an implementation can do: Either pick one of the faces and + * interpolate the edge texel with itself (i.e., clamp within the face), or + * interpolate between the edge texels of the three involved faces. It should + * never involve the border color or the other side (texcoord wrapping) of a + * face in the interpolation. */ static void test_cube_wrap(IDirect3DDevice9 *device) { static const float quad[][6] = { @@ -1173,6 +1180,7 @@ static void test_cube_wrap(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DCubeTexture9 *texture = NULL; IDirect3DSurface9 *surface = NULL; + IDirect3DSurface9 *face_surface; D3DLOCKED_RECT locked_rect; HRESULT hr; UINT x; @@ -1187,6 +1195,37 @@ static void test_cube_wrap(IDirect3DDevice9 *device) D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, NULL); ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_CreateCubeTexture(device, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "CreateCubeTexture failed (0x%08x)\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + + for (y = 0; y < 128; ++y) + { + DWORD *ptr = (DWORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); + for (x = 0; x < 64; ++x) + { + *ptr++ = 0xff0000dd; + } + for (x = 64; x < 128; ++x) + { + *ptr++ = 0xffff0000; + } + } + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + hr= IDirect3DCubeTexture9_GetCubeMapSurface(texture, 0, 0, &face_surface); + ok(SUCCEEDED(hr), "GetCubeMapSurface failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, face_surface, NULL); + ok(SUCCEEDED(hr), "UpdateSurface failed (0x%08x)\n", hr); + + IDirect3DSurface9_Release(face_surface); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); @@ -1206,15 +1245,9 @@ static void test_cube_wrap(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_CreateCubeTexture(device, 128, 1, 0, D3DFMT_A8R8G8B8, - D3DPOOL_DEFAULT, &texture, NULL); - ok(SUCCEEDED(hr), "CreateCubeTexture failed (0x%08x)\n", hr); - /* Create cube faces */ - for (face = 0; face < 6; ++face) + for (face = 1; face < 6; ++face) { - IDirect3DSurface9 *face_surface = NULL; - hr= IDirect3DCubeTexture9_GetCubeMapSurface(texture, face, 0, &face_surface); ok(SUCCEEDED(hr), "GetCubeMapSurface failed (0x%08x)\n", hr); @@ -1255,14 +1288,9 @@ static void test_cube_wrap(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); - /* Due to the nature of this test, we sample essentially at the edge - * between two faces. Because of this it's undefined from which face - * the driver will sample. Fortunately that's not important for this - * test, since all we care about is that it doesn't sample from the - * other side of the surface or from the border. */ color = getPixelColor(device, 320, 240); - ok(color == 0x00ff0000 || color == 0x000000ff, - "Got color 0x%08x for addressing mode %s, expected 0x00ff0000 or 0x000000ff.\n", + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 11), + "Got color 0x%08x for addressing mode %s, expected 0x000000ff.\n", color, address_modes[x].name); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Henri Verbeet : wined3d: Make sure all fields of the fragment pipe caps are always initialized.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: d5b68e7640adb890d9913dac46d0a9d6011f5ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b68e7640adb890d9913dac4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:28 2010 +0200 wined3d: Make sure all fields of the fragment pipe caps are always initialized. --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/ati_fragment_shader.c | 3 +-- dlls/wined3d/device.c | 1 - dlls/wined3d/directx.c | 2 -- dlls/wined3d/nvidia_texture_shader.c | 17 +++++++++-------- dlls/wined3d/state.c | 1 + 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f0db9cf..5529f92 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5332,6 +5332,7 @@ static void arbfp_free(IWineD3DDevice *iface) { static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { + caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | WINED3DTEXOPCAPS_SELECTARG2 | @@ -5362,8 +5363,6 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxTextureBlendStages = 8; caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); - - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 51b3ad7..62be40d 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1062,6 +1062,7 @@ static void atifs_enable(IWineD3DDevice *iface, BOOL enable) { static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { + caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | WINED3DTEXOPCAPS_SELECTARG2 | @@ -1104,8 +1105,6 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen */ caps->MaxTextureBlendStages = 8; caps->MaxSimultaneousTextures = 6; - - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; } static HRESULT atifs_alloc(IWineD3DDevice *iface) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 20c509d..463ccbf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7092,7 +7092,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; device->vs_clipping = shader_caps.VSClipping; - memset(&ffp_caps, 0, sizeof(ffp_caps)); fragment_pipeline = adapter->fragment_pipe; device->frag_pipe = fragment_pipeline; fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index baabda8..a0f1c7c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4544,8 +4544,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, memset(&shader_caps, 0, sizeof(shader_caps)); adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - - memset(&fragment_caps, 0, sizeof(fragment_caps)); adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 48ce864..3587db9 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -629,6 +629,15 @@ static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) { + pCaps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; + + /* The caps below can be supported but aren't handled yet in utils.c + * 'd3dta_to_combiner_input', disable them until support is fixed */ +#if 0 + if (gl_info->supported[NV_REGISTER_COMBINERS2]) + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; +#endif + pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | WINED3DTEXOPCAPS_ADDSIGNED | WINED3DTEXOPCAPS_ADDSIGNED2X | @@ -672,14 +681,6 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct pCaps->MaxTextureBlendStages = min(MAX_TEXTURES, gl_info->limits.general_combiners); pCaps->MaxSimultaneousTextures = gl_info->limits.textures; - - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; - - /* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ -#if 0 - if (gl_info->supported[NV_REGISTER_COMBINERS2]) - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; -#endif } static HRESULT nvrc_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index eb6025d..28de4ea 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5538,6 +5538,7 @@ static void ffp_enable(IWineD3DDevice *iface, BOOL enable) { } static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) { + pCaps->PrimitiveMiscCaps = 0; pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | WINED3DTEXOPCAPS_ADDSIGNED | WINED3DTEXOPCAPS_ADDSIGNED2X |

1 0

Henri Verbeet : wined3d: Remove some unused fields from the shader backend caps.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: c9e7561b349697edd644966509ba881a29b8fbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e7561b349697edd64496650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:29 2010 +0200 wined3d: Remove some unused fields from the shader backend caps. --- dlls/wined3d/directx.c | 7 ------- dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a0f1c7c..08dcafd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4574,13 +4574,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages; pCaps->MaxSimultaneousTextures = fragment_caps.MaxSimultaneousTextures; - pCaps->VS20Caps = shader_caps.VS20Caps; - pCaps->MaxVShaderInstructionsExecuted = shader_caps.MaxVShaderInstructionsExecuted; - pCaps->MaxVertexShader30InstructionSlots= shader_caps.MaxVertexShader30InstructionSlots; - pCaps->PS20Caps = shader_caps.PS20Caps; - pCaps->MaxPShaderInstructionsExecuted = shader_caps.MaxPShaderInstructionsExecuted; - pCaps->MaxPixelShader30InstructionSlots = shader_caps.MaxPixelShader30InstructionSlots; - /* The following caps are shader specific, but they are things we cannot detect, or which * are the same among all shader models. So to avoid code duplication set the shader version * specific, but otherwise constant caps here diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c316a4b..8fb4dfb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -645,14 +645,6 @@ struct shader_caps { float PixelShader1xMaxValue; DWORD MaxPixelShaderConst; - WINED3DVSHADERCAPS2_0 VS20Caps; - WINED3DPSHADERCAPS2_0 PS20Caps; - - DWORD MaxVShaderInstructionsExecuted; - DWORD MaxPShaderInstructionsExecuted; - DWORD MaxVertexShader30InstructionSlots; - DWORD MaxPixelShader30InstructionSlots; - BOOL VSClipping; };

1 0

Henri Verbeet : wined3d: Make sure all fields of the shader backend caps are always initialized.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 0122cee51f1ab01601abf2b2b4e15d6f54fdaffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0122cee51f1ab01601abf2b2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:30 2010 +0200 wined3d: Make sure all fields of the shader backend caps are always initialized. --- dlls/wined3d/arb_program_shader.c | 16 +++++++++++----- dlls/wined3d/device.c | 1 - dlls/wined3d/directx.c | 1 - dlls/wined3d/shader.c | 3 +++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5529f92..3852847 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4667,11 +4667,6 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh DWORD vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); DWORD ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); - /* We don't have an ARB fixed function pipeline yet, so let the none backend set its caps, - * then overwrite the shader specific ones - */ - none_shader_backend.shader_get_caps(gl_info, pCaps); - if (gl_info->supported[ARB_VERTEX_PROGRAM]) { if (gl_info->supported[NV_VERTEX_PROGRAM3]) @@ -4692,6 +4687,11 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh } pCaps->MaxVertexShaderConst = vs_consts; } + else + { + pCaps->VertexShaderVersion = 0; + pCaps->MaxVertexShaderConst = 0; + } if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { @@ -4714,6 +4714,12 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh pCaps->PixelShader1xMaxValue = 8.0f; pCaps->MaxPixelShaderConst = ps_consts; } + else + { + pCaps->PixelShaderVersion = 0; + pCaps->PixelShader1xMaxValue = 0.0f; + pCaps->MaxPixelShaderConst = 0; + } pCaps->VSClipping = use_nv_clip(gl_info); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 463ccbf..0c7b4a1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7086,7 +7086,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; - memset(&shader_caps, 0, sizeof(shader_caps)); device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 08dcafd..b884a01 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4542,7 +4542,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPTFILTERCAPS_MAGFLINEAR; pCaps->VertexTextureFilterCaps = 0; - memset(&shader_caps, 0, sizeof(shader_caps)); adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b015178..28228e1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1418,8 +1418,11 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s { /* Set the shader caps to 0 for the none shader backend */ caps->VertexShaderVersion = 0; + caps->MaxVertexShaderConst = 0; caps->PixelShaderVersion = 0; caps->PixelShader1xMaxValue = 0.0f; + caps->MaxPixelShaderConst = 0; + caps->VSClipping = FALSE; } static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup)

1 0