April 2013 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLDocument2::put_designMode tests.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: e35c8d922996b17c97e2ca2a2af5872f55007d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35c8d922996b17c97e2ca2a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:58:28 2013 +0200 mshtml: Added IHTMLDocument2::put_designMode tests. --- dlls/mshtml/tests/htmldoc.c | 93 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index de003f1..f1fa06e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -157,6 +157,7 @@ DEFINE_EXPECT(OnFrameWindowActivate); DEFINE_EXPECT(OnChanged_READYSTATE); DEFINE_EXPECT(OnChanged_1005); DEFINE_EXPECT(OnChanged_1012); +DEFINE_EXPECT(OnChanged_1014); DEFINE_EXPECT(GetDisplayName); DEFINE_EXPECT(BindToStorage); DEFINE_EXPECT(IsSystemMoniker); @@ -945,6 +946,9 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 1012: CHECK_EXPECT2(OnChanged_1012); return S_OK; + case 1014: + CHECK_EXPECT2(OnChanged_1014); + return S_OK; case 1030: case 3000022: case 3000023: @@ -5311,6 +5315,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) #define DWL_EXPECT_HISTUPDATE 0x0080 #define DWL_FROM_HISTORY 0x0100 #define DWL_REFRESH 0x0200 +#define DWL_EX_GETHOSTINFO 0x0400 static void test_download(DWORD flags) { @@ -5333,7 +5338,7 @@ static void test_download(DWORD flags) } if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) + if(flags & DWL_EX_GETHOSTINFO) SET_EXPECT(GetHostInfo); SET_EXPECT(SetStatusText); if(!(flags & DWL_EMPTY)) @@ -5419,7 +5424,7 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) { + if(flags & DWL_EX_GETHOSTINFO) { if(nav_url) todo_wine CHECK_CALLED(GetHostInfo); else @@ -5697,7 +5702,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre if(is_js) ignore_external_qi = TRUE; - test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING) | dwl_flags); + test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING|DWL_EX_GETHOSTINFO) | dwl_flags); if(is_js) ignore_external_qi = FALSE; @@ -5749,7 +5754,7 @@ static void test_load_history(IHTMLDocument2 *doc) load_state = LD_LOADING; test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); - test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY); + test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY|DWL_EX_GETHOSTINFO); IPersistHistory_Release(per_hist); IStream_Release(history_stream); @@ -5777,7 +5782,7 @@ static void test_refresh(IHTMLDocument2 *doc) IOleCommandTarget_Release(cmdtrg); - test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH); + test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH|DWL_EX_GETHOSTINFO); } static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) @@ -7498,7 +7503,7 @@ static void test_edit_uiactivate(IOleObject *oleobj) IOleDocumentView_Release(docview); } -static void test_editing_mode(BOOL do_load) +static void test_editing_mode(BOOL do_load, BOOL use_design_mode) { IHTMLDocument2 *doc; IUnknown *unk; @@ -7506,7 +7511,7 @@ static void test_editing_mode(BOOL do_load) DWORD conn; HRESULT hres; - trace("Testing HTMLDocument (edit%s)...\n", do_load ? " load" : ""); + trace("Testing HTMLDocument (edit%s%s)...\n", do_load ? " load" : "", use_design_mode ? " using designMode" : ""); init_test(do_load ? LD_DOLOAD : LD_NO); call_UIActivate = CallUIActivate_AfterShow; @@ -7531,13 +7536,74 @@ static void test_editing_mode(BOOL do_load) if(do_load) test_Persist(doc, &Moniker); stream_read = protocol_read = 0; - test_exec_editmode(unk, do_load); - test_UIDeactivate(); - call_UIActivate = CallUIActivate_None; + + if(!use_design_mode) { + test_exec_editmode(unk, do_load); + test_UIDeactivate(); + call_UIActivate = CallUIActivate_None; + }else { + BSTR on; + + SET_EXPECT(Exec_SETTITLE); + test_download(DWL_VERBDONE|DWL_CSS|DWL_TRYCSS); + CLEAR_CALLED(Exec_SETTITLE); + + editmode = TRUE; + load_state = LD_DOLOAD; + readystate_set_loading = TRUE; + + SET_EXPECT(OnChanged_1005); + SET_EXPECT(ActiveElementChanged); + SET_EXPECT(GetClassID); + SET_EXPECT(SetStatusText); + SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(GetHostInfo); + SET_EXPECT(GetDisplayName); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(Invoke_OnReadyStateChange_Loading); + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(Exec_ShellDocView_84); + SET_EXPECT(BindToStorage); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(HideUI); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceFrame_SetBorderSpace); + SET_EXPECT(OnChanged_1014); + + on = a2bstr("On"); + hres = IHTMLDocument2_put_designMode(doc, on); + SysFreeString(on); + ok(hres == S_OK, "put_designMode failed: %08x\n", hres); + + todo_wine CHECK_CALLED(OnChanged_1005); + todo_wine CHECK_CALLED(ActiveElementChanged); + CHECK_CALLED(GetClassID); + CHECK_CALLED(SetStatusText); + CHECK_CALLED(Exec_ShellDocView_37); + CHECK_CALLED(GetHostInfo); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(OnChanged_READYSTATE); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CLEAR_CALLED(IsSystemMoniker); /* IE7 */ + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); + CHECK_CALLED(BindToStorage); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(HideUI); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); + CHECK_CALLED(OnChanged_1014); + + test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); + } + IOleObject_Release(oleobj); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); - test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); + test_download(DWL_VERBDONE | DWL_EX_GETHOSTINFO | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI); @@ -7856,8 +7922,9 @@ START_TEST(htmldoc) test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); - test_editing_mode(FALSE); - test_editing_mode(TRUE); + test_editing_mode(FALSE, FALSE); + test_editing_mode(TRUE, FALSE); + test_editing_mode(TRUE, TRUE); test_HTMLDocument_http(FALSE); test_HTMLDocument_http(TRUE); test_UIActivate(FALSE, FALSE, FALSE);

1 0

Henri Verbeet : winex11: Don' t ignore hShareContext in X11DRV_wglCreateContextAttribsARB().
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 5206e512e26619487017f8a7536d3e6baaf23342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5206e512e26619487017f8a75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:30 2013 +0200 winex11: Don't ignore hShareContext in X11DRV_wglCreateContextAttribsARB(). --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6dd07fa..c617245 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1982,7 +1982,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg } X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); - ret->ctx = create_glxcontext(gdi_display, ret, NULL); + ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); XSync(gdi_display, False); if ((err = X11DRV_check_error()) || !ret->ctx) {

1 0

Henri Verbeet : wined3d: Disable occlusion query support if the implementation has 0 counter bits.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 6fe9e0f033ae072fe5fd6e2b6a09ad9a0bb21783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe9e0f033ae072fe5fd6e2b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:31 2013 +0200 wined3d: Disable occlusion query support if the implementation has 0 counter bits. --- dlls/wined3d/directx.c | 9 +++++++++ dlls/wined3d/wined3d_gl.h | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68016e0..392c7eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,6 +2809,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) * we never render to sRGB surfaces). */ gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; } + if (gl_info->supported[ARB_OCCLUSION_QUERY]) + { + GLint counter_bits; + + GL_EXTCALL(glGetQueryivARB(GL_SAMPLES_PASSED_ARB, GL_QUERY_COUNTER_BITS_ARB, &counter_bits)); + TRACE("Occlusion query counter has %d bits.\n", counter_bits); + if (!counter_bits) + gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f68fdc7..9c4af05 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -251,8 +251,10 @@ enum wined3d_gl_extension USE_GL_FUNC(glDeleteQueriesARB) \ USE_GL_FUNC(glEndQueryARB) \ USE_GL_FUNC(glGenQueriesARB) \ + USE_GL_FUNC(glGetQueryivARB) \ USE_GL_FUNC(glGetQueryObjectivARB) \ USE_GL_FUNC(glGetQueryObjectuivARB) \ + USE_GL_FUNC(glIsQueryARB) \ /* GL_ARB_point_parameters */ \ USE_GL_FUNC(glPointParameterfARB) \ USE_GL_FUNC(glPointParameterfvARB) \

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: ec1c18b65cb5ee721f28f3dbae6b2df7820759fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1c18b65cb5ee721f28f3dba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:32 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER. --- dlls/d3drm/d3drm.c | 8 +++----- dlls/d3drm/meshbuilder.c | 8 +++----- dlls/d3drm/tests/d3drm.c | 10 +++++----- include/d3drm.h | 2 +- include/d3drmobj.h | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4402cec..eba40c8 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -154,13 +154,11 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM *iface, IDirect3DRM return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDirect3DRMMeshBuilder **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c0e2f86..4678593 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -590,12 +590,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMESHBUILDER pMeshBuilder) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2 *iface, + IDirect3DRMMeshBuilder *mesh_builder) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pMeshBuilder); + FIXME("iface %p, mesh_builder %p stub!\n", iface, mesh_builder); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7c52738..1317777 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -226,7 +226,7 @@ static void test_MeshBuilder(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *pMeshBuilder; IDirect3DRMMesh *mesh; D3DRMLOADMEMORY info; int val; @@ -675,7 +675,7 @@ static void test_Frame(void) IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameTmp; LPDIRECT3DRMFRAMEARRAY pArray; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; IDirect3DRMVisual *visual_tmp; LPDIRECT3DRMVISUALARRAY pVisualArray; @@ -907,9 +907,9 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); /* Create Visual */ - hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); - visual1 = (IDirect3DRMVisual *)pMeshBuilder; + visual1 = (IDirect3DRMVisual *)mesh_builder; /* Add Visual to first parent */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); @@ -935,7 +935,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 3); - IDirect3DRMMeshBuilder_Release(pMeshBuilder); + IDirect3DRMMeshBuilder_Release(mesh_builder); /* [Add/Delete]Light with NULL pointer */ hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); diff --git a/include/d3drm.h b/include/d3drm.h index f57a854..1f62756 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -60,7 +60,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 70fb2e9..5179002 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2510,7 +2510,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, @@ -2681,7 +2681,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER2.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 5c442f8dc84da57af02ee9954ee3495c35df8f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c442f8dc84da57af02ee9954… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:33 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER2. --- dlls/d3drm/d3drm.c | 9 +++------ include/d3drm.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index eba40c8..3e9e777 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -533,14 +533,11 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2 *iface, IDirect3D return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface, - LPDIRECT3DRMMESHBUILDER2 * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, IDirect3DRMMeshBuilder2 **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/include/d3drm.h b/include/d3drm.h index 1f62756..d4d21eb 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -198,7 +198,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER2 *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER3.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 68c4f61dc5d9a6abb8471ed748821e40323ecb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c4f61dc5d9a6abb8471ed74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:34 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER3. --- dlls/d3drm/d3drm.c | 9 +++------ dlls/d3drm/meshbuilder.c | 9 +++------ dlls/d3drm/tests/d3drm.c | 2 +- include/d3drm.h | 2 +- include/d3drmobj.h | 2 +- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3e9e777..ff7ea71 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -929,14 +929,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3 *iface, IDirect3D return Direct3DRMMesh_create(mesh); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface, - LPDIRECT3DRMMESHBUILDER3* ppMeshBuilder) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, IDirect3DRMMeshBuilder3 **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4678593..40e23de 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1750,13 +1750,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMMESHBUILDER3 MeshBuilder, - DWORD flags) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface, + IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p,%u): stub\n", This, MeshBuilder, flags); + FIXME("iface %p, mesh_builder %p, flags %#x stub!\n", iface, mesh_builder, flags); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1317777..be85098 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -528,7 +528,7 @@ static void test_MeshBuilder3(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRM3 *d3drm3; - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + IDirect3DRMMeshBuilder3 *pMeshBuilder3; D3DRMLOADMEMORY info; int val; DWORD val1; diff --git a/include/d3drm.h b/include/d3drm.h index d4d21eb..f1e5c4e 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3 *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5179002..71244a1 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2861,7 +2861,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS_ D3DVALUE crease, DWORD flags) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3, DWORD flags) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,

1 0

Jacek Caban : wrc: Allow '/' and '\' in identifiers.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 0da8be91ef67284de63b90001d62adf7776d27bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da8be91ef67284de63b90001… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 14:13:58 2013 +0200 wrc: Allow '/' and '\' in identifiers. --- tools/wrc/parser.l | 10 +--------- tools/wrc/parser.y | 5 ++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index cf16ccc..8c50a8a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -404,14 +404,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } - /* - * The next two rules scan identifiers and filenames. - * This is achieved by using the priority ruling - * of the scanner where a '.' is valid in a filename - * and *only* in a filename. In this case, the second - * rule will be reduced because it is longer. - */ -[A-Za-z_0-9.]+ { +[A-Za-z_0-9./\\]+ { struct keyword *tok = iskeyword(yytext); if(tok) @@ -430,7 +423,6 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) return tIDENT; } } -[A-Za-z_0-9./\\]+ parser_lval.str = make_string(yytext); return tFILENAME; /* * Wide string scanning diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 4cc37ac..ad5fb98 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -268,7 +268,7 @@ static int rsrcid_to_token(int lookahead); %token tNL %token <num> tNUMBER tLNUMBER -%token <str> tSTRING tIDENT tFILENAME +%token <str> tSTRING tIDENT %token <raw> tRAWDATA %token tACCELERATORS tBITMAP tCURSOR tDIALOG tDIALOGEX tMENU tMENUEX tMESSAGETABLE %token tRCDATA tVERSIONINFO tSTRINGTABLE tFONT tFONTDIR tICON tHTML @@ -647,8 +647,7 @@ resource_definition ; -filename: tFILENAME { $$ = make_filename($1); } - | tIDENT { $$ = make_filename($1); } +filename: tIDENT { $$ = make_filename($1); } | tSTRING { $$ = make_filename($1); } ;

1 0

Erich Hoover : advapi32: Fix group ownership test on Vista.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 0ae8f2daa43355a077920cc648e6e2e57b2d072d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae8f2daa43355a077920cc64… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Apr 19 17:21:02 2013 -0600 advapi32: Fix group ownership test on Vista. --- dlls/advapi32/tests/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7dd0501..86a4237 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3198,7 +3198,8 @@ static void test_GetNamedSecurityInfoA(void) bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); - ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */, + ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */ + || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, "MACHINE\\Software group SID != Local System SID.\n"); LocalFree(pSD); }

1 0

Michael Stefaniuc : dsound/tests: Mark some capture status as broken.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 624bbd980fef01ba4c56f882a999a58eded8e8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624bbd980fef01ba4c56f882a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 23 00:01:40 2013 +0200 dsound/tests: Mark some capture status as broken. --- dlls/dsound/tests/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2afd522..af4f691 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -402,7 +402,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); - ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING), + ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING) || broken(status==DSCBSTATUS_CAPTURING), "GetStatus: bad status: %x\n",status); if (record) {

1 0

Erich Hoover : server: Report a default DACL for registry keys.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 04cd764d7688c59f88c19b25d5c6baea75a15ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cd764d7688c59f88c19b25d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Apr 19 17:25:43 2013 -0600 server: Report a default DACL for registry keys. --- dlls/advapi32/tests/security.c | 42 +++++++++++++++++++++++++++++++++++++++- server/registry.c | 35 ++++++++++++++++++++++++-------- server/security.h | 1 + server/token.c | 8 +++++++ 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 86a4237..e10c1ed 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3007,7 +3007,9 @@ static void test_GetNamedSecurityInfoA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; - PSID admin_sid = (PSID) admin_ptr, system_sid = (PSID) system_ptr, user_sid; + char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; + PSID system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; char software_key[] = "MACHINE\\Software"; @@ -3015,6 +3017,7 @@ static void test_GetNamedSecurityInfoA(void) SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; CHAR windows_dir[MAX_PATH]; + int users_ace_id = -1, i; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; BOOL bret = TRUE, isNT4; @@ -3022,8 +3025,10 @@ static void test_GetNamedSecurityInfoA(void) DWORD error, revision; BOOL owner_defaulted; BOOL group_defaulted; + BOOL dacl_defaulted; HANDLE token, hTemp; PSID owner, group; + BOOL dacl_present; PACL pDacl; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) @@ -3202,6 +3207,41 @@ static void test_GetNamedSecurityInfoA(void) || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, "MACHINE\\Software group SID != Local System SID.\n"); LocalFree(pSD); + + /* Test querying the DACL of a built-in registry key */ + sid_size = sizeof(users_ptr); + pCreateWellKnownSid(WinBuiltinUsersSid, NULL, users_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, users_sid); + if (bret) users_ace_id = i; + } + ok(users_ace_id != -1, "Bultin Users ACE not found.\n"); + if (users_ace_id != -1) + { + bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Users ACE.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), + "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + + LocalFree(pSD); } static void test_ConvertStringSecurityDescriptor(void) diff --git a/server/registry.c b/server/registry.c index efc2005..eb182f2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -345,16 +345,33 @@ static struct security_descriptor *key_get_sd( struct object *obj ) if (!key_default_sd) { - size_t sid_len = security_sid_len( security_builtin_admins_sid ); - - key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * sid_len ); - key_default_sd->control = 0; - key_default_sd->owner_len = sid_len; - key_default_sd->group_len = sid_len; + size_t users_sid_len = security_sid_len( security_builtin_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + size_t dacl_len = sizeof(ACL) + offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + ACCESS_ALLOWED_ACE *aaa; + ACL *dacl; + + key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * admins_sid_len + dacl_len ); + key_default_sd->control = SE_DACL_PRESENT; + key_default_sd->owner_len = admins_sid_len; + key_default_sd->group_len = admins_sid_len; key_default_sd->sacl_len = 0; - key_default_sd->dacl_len = 0; - memcpy( key_default_sd + 1, security_builtin_admins_sid, sid_len ); - memcpy( (char *)(key_default_sd + 1) + sid_len, security_builtin_admins_sid, sid_len ); + key_default_sd->dacl_len = dacl_len; + memcpy( key_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(key_default_sd + 1) + admins_sid_len, security_builtin_admins_sid, admins_sid_len ); + + dacl = (ACL *)((char *)(key_default_sd + 1) + 2 * admins_sid_len); + dacl->AclRevision = ACL_REVISION; + dacl->Sbz1 = 0; + dacl->AclSize = dacl_len; + dacl->AceCount = 1; + dacl->Sbz2 = 0; + aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + aaa->Mask = GENERIC_READ; + memcpy( &aaa->SidStart, security_builtin_users_sid, users_sid_len ); } return key_default_sd; } diff --git a/server/security.h b/server/security.h index 9856f96..ab5f027 100644 --- a/server/security.h +++ b/server/security.h @@ -42,6 +42,7 @@ extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; +extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; diff --git a/server/token.c b/server/token.c index 7d6086d..6d8961a 100644 --- a/server/token.c +++ b/server/token.c @@ -84,6 +84,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[2]; } builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[2]; +} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +99,7 @@ static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_si const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; +const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0