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

Matteo Bruni : wined3d: Force stream info update on vertex shader change.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: d8c5e417c214be468c0b4bfc74cd56d370985939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c5e417c214be468c0b4bfc7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 17 15:52:13 2015 +0100 wined3d: Force stream info update on vertex shader change. --- dlls/wined3d/context.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index af29e69..9cc68ab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3048,7 +3048,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * updating a resource location. */ context_update_tex_unit_map(context, state); context_preload_textures(context, state); - if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) + /* TODO: Right now the dependency on the vertex shader is necessary + * since context_stream_info_from_declaration depends on the reg_maps of + * the current VS but maybe it's possible to relax the coupling in some + * situations at least. */ + if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC) + || isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) { context_update_stream_info(context, state); }

1 0

Matteo Bruni : wined3d: Depend on the vertex shader state instead of the vertex declaration state where appropriate.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 38e4cb29e77edae34fba3bce3d25f2cd2f87ead3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e4cb29e77edae34fba3bce3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 17 15:52:14 2015 +0100 wined3d: Depend on the vertex shader state instead of the vertex declaration state where appropriate. --- dlls/wined3d/glsl_shader.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38e4cb29e77edae34fba3…

1 0

Stefan Dösinger : ddraw: Handle DDBLT_ROP in ddraw.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: df829de88d2f703e40885fe66b46feb50e04531f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df829de88d2f703e40885fe66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 17 23:54:14 2015 +0100 ddraw: Handle DDBLT_ROP in ddraw. --- dlls/ddraw/surface.c | 30 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 21 --------------------- 3 files changed, 62 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index dd9a018..b8c9872 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1518,6 +1518,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR struct ddraw_surface *dst_surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_surface = unsafe_impl_from_IDirectDrawSurface7(SrcSurface); HRESULT hr = DD_OK; + DDBLTFX rop_fx; TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(DestRect), SrcSurface, wine_dbgstr_rect(SrcRect), Flags, DDBltFx); @@ -1583,6 +1584,35 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR WARN("DDBLT_ROP used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } + + Flags &= ~DDBLT_ROP; + switch (DDBltFx->dwROP) + { + case SRCCOPY: + break; + + case WHITENESS: + case BLACKNESS: + rop_fx = *DDBltFx; + + if (DDBltFx->dwROP == WHITENESS) + rop_fx.u5.dwFillColor = 0xffffffff; + else + rop_fx.u5.dwFillColor = 0; + + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + Flags |= DDBLT_DEPTHFILL; + else + Flags |= DDBLT_COLORFILL; + + DDBltFx = &rop_fx; + break; + + default: + wined3d_mutex_unlock(); + WARN("Unsupported ROP %#x used, returning DDERR_NORASTEROPHW.\n", DDBltFx->dwROP); + return DDERR_NORASTEROPHW; + } } if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT))) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6b9216b..66f8cff 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8672,6 +8672,31 @@ static void test_color_fill(void) } }, }; + static const struct + { + DWORD rop; + const char *name; + HRESULT hr; + } + rops[] = + { + {SRCCOPY, "SRCCOPY", DD_OK}, + {SRCPAINT, "SRCPAINT", DDERR_NORASTEROPHW}, + {SRCAND, "SRCAND", DDERR_NORASTEROPHW}, + {SRCINVERT, "SRCINVERT", DDERR_NORASTEROPHW}, + {SRCERASE, "SRCERASE", DDERR_NORASTEROPHW}, + {NOTSRCCOPY, "NOTSRCCOPY", DDERR_NORASTEROPHW}, + {NOTSRCERASE, "NOTSRCERASE", DDERR_NORASTEROPHW}, + {MERGECOPY, "MERGECOPY", DDERR_NORASTEROPHW}, + {MERGEPAINT, "MERGEPAINT", DDERR_NORASTEROPHW}, + {PATCOPY, "PATCOPY", DDERR_NORASTEROPHW}, + {PATPAINT, "PATPAINT", DDERR_NORASTEROPHW}, + {PATINVERT, "PATINVERT", DDERR_NORASTEROPHW}, + {DSTINVERT, "DSTINVERT", DDERR_NORASTEROPHW}, + {BLACKNESS, "BLACKNESS", DD_OK}, + {WHITENESS, "WHITENESS", DD_OK}, + {0xaa0029, "0xaa0029", DDERR_NORASTEROPHW} /* noop */ + }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -8926,6 +8951,13 @@ static void test_color_fill(void) hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_ROP | DDBLT_WAIT, &fx); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < sizeof(rops) / sizeof(*rops); i++) + { + fx.dwROP = rops[i].rop; + hr = IDirectDrawSurface7_Blt(surface, NULL, surface2, NULL, DDBLT_ROP | DDBLT_WAIT, &fx); + ok(hr == rops[i].hr, "Got unexpected hr %#x for rop %s.\n", hr, rops[i].name); + } + IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c045591..78e7030 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4733,27 +4733,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { FIXME("DDBLT_DEPTHFILL needs to be implemented!\n"); } - if (flags & WINEDDBLT_ROP) - { - /* Catch some degenerate cases here. */ - switch (fx->dwROP) - { - case BLACKNESS: - hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, 0); - break; - case 0xaa0029: /* No-op */ - break; - case WHITENESS: - hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, ~0U); - break; - case SRCCOPY: /* Well, we do that below? */ - break; - default: - FIXME("Unsupported raster op: %08x Pattern: %p\n", fx->dwROP, fx->u5.lpDDSPattern); - goto error; - } - flags &= ~WINEDDBLT_ROP; - } if (flags & WINEDDBLT_DDROPS) { FIXME("\tDdraw Raster Ops: %08x Pattern: %p\n", fx->dwDDROP, fx->u5.lpDDSPattern);

1 0

Stefan Dösinger : d3d9/tests: Extend the colorfill test.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 462346ac839cd6744cec0add66eb8b69759bbd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462346ac839cd6744cec0add6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 17 23:54:16 2015 +0100 d3d9/tests: Extend the colorfill test. --- dlls/d3d9/tests/visual.c | 172 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 155 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=462346ac839cd6744cec0…

1 0

Ken Thomases : winemenubuilder: Fix compiling on OS X.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 0815dc223e3ee22f58e59527c80761b2359f2b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0815dc223e3ee22f58e59527c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 18 09:50:41 2015 -0500 winemenubuilder: Fix compiling on OS X. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4a5639b..bc1540b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1168,7 +1168,7 @@ static inline int size_to_slot(int size) #define CLASSIC_SLOT 3 -static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *pIconDirEntry, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) {

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRM:: QueryInterface returning incorrect HRESULT on unsupported interfaces.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: c3c9cd1e1f49cc11f34eef718518286ab1d2185c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c9cd1e1f49cc11f34eef718… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Mar 18 18:40:38 2015 +0530 d3drm: Fix IDirect3DRM::QueryInterface returning incorrect HRESULT on unsupported interfaces. --- dlls/d3drm/d3drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 92ac272..725093f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -95,8 +95,8 @@ static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, voi else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for invalid interfaces in IDirect3DRM::QueryInterface.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 6c0f864c0fd078227efcb73f2a172c9cbdff5bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0f864c0fd078227efcb73f2… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Mar 18 18:40:39 2015 +0530 d3drm/tests: Add tests for invalid interfaces in IDirect3DRM::QueryInterface. --- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/d3drm.c | 72 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index dc6e8d1..4b39989 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3drm.dll -IMPORTS = dxguid ddraw user32 uuid +IMPORTS = dxguid uuid d3drm ddraw user32 C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f9925ae..1c269ef 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1788,10 +1788,74 @@ static void test_d3drm_qi(void) { static const struct qi_test tests[] = { - { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, - { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, - { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, - { &IID_IUnknown, &IID_IDirect3DRM, S_OK, FALSE }, + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, + { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMObject, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMObject2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMViewport, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMViewport2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFrame, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFrame2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFrame3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMVisual, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMesh, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMeshBuilder, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFace, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFace2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMLight, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMTexture, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMTexture2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMTexture3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMWrap, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMaterial, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMMaterial2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimation, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimation2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimationSet, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimationSet2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMObjectArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMDeviceArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMViewportArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFrameArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMVisualArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMLightArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMPickedArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMFaceArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMAnimationArray, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMUserVisual, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMShadow, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMShadow2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMInterpolator, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMPicked2Array, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DRMClippedVisual, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawClipper, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface4, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDrawSurface, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3D, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw7, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw4, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw3, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw2, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirectDraw, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IDirect3DLight, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, + { &IID_IUnknown, &IID_IDirect3DRM, S_OK, FALSE }, }; HRESULT hr; IDirect3DRM *d3drm;

1 0

Aaryaman Vasishta : d3drm/tests: Remove dynamic loading in d3drm.c.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 57281caa23463fe9c2e3a292762dda463b7de92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57281caa23463fe9c2e3a2927… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Mar 18 18:40:40 2015 +0530 d3drm/tests: Remove dynamic loading in d3drm.c. --- dlls/d3drm/tests/d3drm.c | 60 +++++++++++------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1c269ef..515aace 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -26,10 +26,6 @@ #include "wine/test.h" -static HMODULE d3drm_handle = 0; - -static HRESULT (WINAPI * pDirect3DRMCreate)(IDirect3DRM **d3drm); - #define CHECK_REFCOUNT(obj,rc) \ { \ int rc_new = rc; \ @@ -37,29 +33,6 @@ static HRESULT (WINAPI * pDirect3DRMCreate)(IDirect3DRM **d3drm); ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ } -#define D3DRM_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ - if(!p ## func) { \ - trace("GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(d3drm_handle); \ - return FALSE; \ - } - -static BOOL InitFunctionPtrs(void) -{ - d3drm_handle = LoadLibraryA("d3drm.dll"); - - if(!d3drm_handle) - { - skip("Could not load d3drm.dll\n"); - return FALSE; - } - - D3DRM_GET_PROC(Direct3DRMCreate) - - return TRUE; -} - static int get_refcount(IUnknown *object) { IUnknown_AddRef( object ); @@ -242,7 +215,7 @@ static void test_MeshBuilder(void) D3DCOLOR color; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); @@ -538,7 +511,7 @@ static void test_MeshBuilder3(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) @@ -644,7 +617,7 @@ static void test_Mesh(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateMesh(d3drm, &mesh); @@ -685,7 +658,7 @@ static void test_Face(void) CHAR cname[64] = {0}; int icount; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateFace(d3drm, &face1); @@ -925,7 +898,7 @@ static void test_Frame(void) DWORD count; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC); @@ -1257,7 +1230,7 @@ static void test_Viewport(void) window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); GetClientRect(window, &rc); - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = DirectDrawCreateClipper(0, &pClipper, NULL); @@ -1308,7 +1281,7 @@ static void test_Light(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light); @@ -1363,7 +1336,7 @@ static void test_Material2(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) @@ -1447,7 +1420,7 @@ static void test_Texture(void) DWORD size; CHAR cname[64] = {0}; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); initimg.buffer1 = &pixel; @@ -1488,7 +1461,7 @@ static void test_Device(void) window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); GetClientRect(window, &rc); - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = DirectDrawCreateClipper(0, &pClipper, NULL); @@ -1551,7 +1524,7 @@ static void test_frame_transform(void) IDirect3DRMFrame *frame; D3DRMMATRIX4D matrix; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); @@ -1589,7 +1562,7 @@ static void test_d3drm_load(void) D3DRMLOADMEMORY info; const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial }; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; @@ -1665,7 +1638,7 @@ static void test_frame_mesh_materials(void) IDirect3DRMTexture *texture; int i; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr); info.lpMemory = data_frame_mesh_materials; @@ -1860,7 +1833,7 @@ static void test_d3drm_qi(void) HRESULT hr; IDirect3DRM *d3drm; - hr = pDirect3DRMCreate(&d3drm); + hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); @@ -1870,9 +1843,6 @@ static void test_d3drm_qi(void) START_TEST(d3drm) { - if (!InitFunctionPtrs()) - return; - test_MeshBuilder(); test_MeshBuilder3(); test_Mesh(); @@ -1887,6 +1857,4 @@ START_TEST(d3drm) test_d3drm_load(); test_frame_mesh_materials(); test_d3drm_qi(); - - FreeLibrary(d3drm_handle); }

1 0

Aaryaman Vasishta : d3drm/tests: Remove dynamic loading in vector.c.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: b436b4b2b900733b4b933a149260cd28973b0482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b436b4b2b900733b4b933a149… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Mar 18 18:40:41 2015 +0530 d3drm/tests: Remove dynamic loading in vector.c. --- dlls/d3drm/tests/vector.c | 126 +++++++++++----------------------------------- 1 file changed, 29 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b436b4b2b900733b4b933…

1 0

Andrew Eikum : shell32: Allow updating knownfolder definitions.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 7c9151c1e630b3f6fdec00a41ba67c9546b5119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9151c1e630b3f6fdec00a41… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 17 10:03:13 2015 -0500 shell32: Allow updating knownfolder definitions. --- dlls/shell32/shellpath.c | 3 --- dlls/shell32/tests/shellpath.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 84e663b..56ead5f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3931,9 +3931,6 @@ static HRESULT WINAPI foldermanager_RegisterFolder( if(SUCCEEDED(hr)) { - if(dwDisp == REG_OPENED_EXISTING_KEY) - hr = E_FAIL; - if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3b18760..7b04238 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2458,6 +2458,26 @@ static void test_knownFolders(void) hr = IKnownFolder_Release(folder); ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + + /* update the folder */ + CoTaskMemFree(kfDefinition.pszName); + kfDefinition.pszName = CoTaskMemAlloc(sizeof(sExample2)); + lstrcpyW(kfDefinition.pszName, sExample2); + hr = IKnownFolderManager_RegisterFolder(mgr, &newFolderId, &kfDefinition); + ok(hr == S_OK, "failed to re-register known folder: 0x%08x\n", hr); + + hr = IKnownFolderManager_GetFolder(mgr, &newFolderId, &folder); + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + + hr = IKnownFolder_GetFolderDefinition(folder, &kfSubDefinition); + ok(hr == S_OK, "failed to get folder definition: 0x%08x\n", hr); + ok(!memcmp(kfDefinition.pszName, kfSubDefinition.pszName, sizeof(sExample2)), + "Got wrong updated name: %s\n", wine_dbgstr_w(kfSubDefinition.pszName)); + + FreeKnownFolderDefinitionFields(&kfSubDefinition); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId);

1 0