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

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACE2.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 1013b54915c3191dfbfa685b54e9280c494dd7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013b54915c3191dfbfa685b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:45 2013 +0200 d3drm: Avoid LPDIRECT3DRMFACE2. --- dlls/d3drm/d3drm.c | 6 ++---- dlls/d3drm/meshbuilder.c | 29 +++++++++-------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 8 ++++---- 4 files changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 425fd36..f3cb6ff 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -932,11 +932,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, ID return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3 *iface, IDirect3DRMFace2 **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a6018d3..81078dc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1757,12 +1757,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFrame(IDirect3DRMMeshBuilde return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2 Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -2003,12 +2000,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_AddNormal(IDirect3DRMMeshBuilder3* return 0; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -2192,12 +2186,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3* iface, - DWORD index, LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3 *iface, + DWORD index, IDirect3DRMFace2 **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%u,%p): stub\n", This, index, Face); + FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); return E_NOTIMPL; } @@ -2242,12 +2234,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteNormals(IDirect3DRMMeshB return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2 Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index ff02438..1619534 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -340,7 +340,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 182013d..218fa47 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2863,7 +2863,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace2 *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2885,19 +2885,19 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; STDMETHOD_(int, GetVertexCount)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetVertexColor)(THIS_ DWORD index) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(GetFace)(THIS_ DWORD index, LPDIRECT3DRMFACE2 *) PURE; + STDMETHOD(GetFace)(THIS_ DWORD index, IDirect3DRMFace2 **face) PURE; STDMETHOD(GetVertex)(THIS_ DWORD index, D3DVECTOR *vector) PURE; STDMETHOD(GetNormal)(THIS_ DWORD index, D3DVECTOR *vector) PURE; STDMETHOD(DeleteVertices)(THIS_ DWORD IndexFirst, DWORD count) PURE; STDMETHOD(DeleteNormals)(THIS_ DWORD IndexFirst, DWORD count) PURE; - STDMETHOD(DeleteFace)(THIS_ LPDIRECT3DRMFACE2) PURE; + STDMETHOD(DeleteFace)(THIS_ IDirect3DRMFace2 *face) PURE; STDMETHOD(Empty)(THIS_ DWORD flags) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags) PURE; STDMETHOD(AddFacesIndexed)(THIS_ DWORD flags, DWORD *pvIndices, DWORD *pIndexFirst, DWORD *pCount) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACE.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 589eea0ca0aebfd9de236a07d6a4b778dd26604c URL: http://source.winehq.org/git/wine.git/?a=commit;h=589eea0ca0aebfd9de236a07d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:44 2013 +0200 d3drm: Avoid LPDIRECT3DRMFACE. --- dlls/d3drm/d3drm.c | 12 ++++-------- dlls/d3drm/meshbuilder.c | 22 +++++++--------------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 12 ++++++------ 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index ff7ea71..425fd36 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -161,11 +161,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDir return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder); } -static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) +static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, IDirect3DRMFace **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -540,11 +538,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, ID return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace) +static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2 *iface, IDirect3DRMFace **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 40e23de..a6018d3 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -605,12 +605,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFrame(IDirect3DRMMeshBuilde return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMFACE pFace) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -849,12 +846,9 @@ static int WINAPI IDirect3DRMMeshBuilder2Impl_AddNormal(IDirect3DRMMeshBuilder2* return 0; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMFACE* ppFace) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, ppFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -924,12 +918,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GenerateNormals2(IDirect3DRMMe return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFace(IDirect3DRMMeshBuilder2* iface, - DWORD index, LPDIRECT3DRMFACE* ppFace) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFace(IDirect3DRMMeshBuilder2 *iface, + DWORD index, IDirect3DRMFace **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%u,%p): stub\n", This, index, ppFace); + FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index f1e5c4e..ff02438 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -61,7 +61,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; @@ -199,7 +199,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 71244a1..182013d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2512,7 +2512,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2534,7 +2534,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; @@ -2683,7 +2683,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2705,7 +2705,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; @@ -2714,7 +2714,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; /*** IDirect3DRMMeshBuilder2 methods ***/ STDMETHOD(GenerateNormals2)(THIS_ D3DVALUE crease, DWORD flags) PURE; - STDMETHOD(GetFace)(THIS_ DWORD index, LPDIRECT3DRMFACE*) PURE; + STDMETHOD(GetFace)(THIS_ DWORD index, IDirect3DRMFace **face) PURE; }; #undef INTERFACE @@ -4481,7 +4481,7 @@ DECLARE_INTERFACE_(IDirect3DRMFaceArray, IDirect3DRMArray) /*** IDirect3DRMArray methods ***/ STDMETHOD_(DWORD, GetSize)(THIS) PURE; /*** IDirect3DRMFaceArray methods ***/ - STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMFACE *) PURE; + STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMFace **element) PURE; }; #undef INTERFACE

1 0

Dmitry Timoshkov : kernel32: Test LdrShutdownProcess behaviour only after NtTerminateProcess(0) call.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: e54c49d940996b03602f47622e41baf8f30d9dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54c49d940996b03602f47622… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 25 16:37:06 2013 +0900 kernel32: Test LdrShutdownProcess behaviour only after NtTerminateProcess(0) call. --- dlls/kernel32/tests/loader.c | 92 ++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 60 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6291d9c..5c05d9b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1119,11 +1119,16 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) trace("dll: %p, DLL_PROCESS_DETACH, %p\n", hinst, param); + if (test_dll_phase == 0 || test_dll_phase == 3) + ok(param != NULL, "dll: param %p\n", param); + else + ok(!param, "dll: param %p\n", param); + if (test_dll_phase == 0) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; - if (test_dll_phase == 3 || test_dll_phase == 4) + if (test_dll_phase == 3) { ret = pRtlDllShutdownInProgress(); ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1184,8 +1189,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); handle = CreateThread(NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); - /* manual call to LdrShutdownProcess doesn't prevent thread creation */ - if (param && test_dll_phase != 4) + if (param) { ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); if (!handle) @@ -1199,18 +1203,10 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } else { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 4) todo_wine - { - ok(handle != 0, "CreateThread error %d\n", GetLastError()); - } - else - { ok(handle != 0, "CreateThread error %d\n", GetLastError()); ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); - } CloseHandle(handle); } @@ -1221,8 +1217,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); - /* manual call to LdrShutdownProcess doesn't prevent thread creation */ - if (param && test_dll_phase != 4) + if (param) { ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); if (!handle) @@ -1236,18 +1231,10 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } else { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 4) todo_wine - { - ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); - } - else - { ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); - } CloseHandle(handle); } @@ -1277,8 +1264,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = FreeLibrary(handle); ok(ret, "FreeLibrary error %d\n", GetLastError()); handle = GetModuleHandle("winver.exe"); - /* manual call to LdrShutdownProcess doesn't prevent module unloading */ - if (param && test_dll_phase != 4) + if (param) ok(handle != 0, "winver.exe should not be unloaded\n"); else todo_wine @@ -1450,6 +1436,9 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + hmod = GetModuleHandle(dll_name); + ok(hmod != 0, "DLL should not be unloaded\n"); + SetLastError(0xdeadbeef); thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); todo_wine @@ -1463,6 +1452,14 @@ todo_wine CloseHandle(thread); } + trace("call LdrShutdownProcess()\n"); + pLdrShutdownProcess(); + + ret = pRtlDllShutdownInProgress(); + ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); + + hmod = GetModuleHandle(dll_name); + ok(hmod != 0, "DLL should not be unloaded\n"); break; case 1: @@ -1471,7 +1468,14 @@ todo_wine ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); trace("call FreeLibrary(%p)\n", hmod); - FreeLibrary(hmod); + SetLastError(0xdeadbeef); + ret = FreeLibrary(hmod); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + hmod = GetModuleHandle(dll_name); + ok(!hmod, "DLL should be unloaded\n"); + + if (test_dll_phase == 2) + ok(0, "FreeLibrary+ExitProcess should never return\n"); ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1484,41 +1488,27 @@ todo_wine CloseHandle(stop_event); break; - case 4: - ret = pRtlDllShutdownInProgress(); - ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); - - trace("call LdrShutdownProcess()\n"); - pLdrShutdownProcess(); - - ret = pRtlDllShutdownInProgress(); - ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); - - break; - default: assert(0); break; } - Sleep(100); - if (test_dll_phase == 0) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; if (expected_code == STILL_ACTIVE) { - ret = WaitForSingleObject(attached_thread[0], 0); + ret = WaitForSingleObject(attached_thread[0], 100); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 0); + ret = WaitForSingleObject(attached_thread[1], 100); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); } else { - ret = WaitForSingleObject(attached_thread[0], 50); + ret = WaitForSingleObject(attached_thread[0], 100); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 50); + ret = WaitForSingleObject(attached_thread[1], 100); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } @@ -1703,24 +1693,6 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - /* phase 4 */ - *child_failures = -1; - sprintf(cmdline, "\"%s\" loader %s %u 4", argv[0], dll_name, target_offset); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); - ret = WaitForSingleObject(pi.hProcess, 30000); - ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); - GetExitCodeProcess(pi.hProcess, &ret); -todo_wine - ok(ret == 0 || broken(ret == 195) /* before win7 */, "expected exit code 0, got %u\n", ret); - if (*child_failures) - { - trace("%d failures in child process\n", *child_failures); - winetest_add_failures(*child_failures); - } - CloseHandle(pi.hThread); - CloseHandle(pi.hProcess); - ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); }

1 0

Ken Thomases : winemac: Improve logging from wglChoosePixelFormatARB() and wglGetPixelFormatAttribivARB().
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: dfa2ba390d44639dfcb3159b0a0c749e0603f689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa2ba390d44639dfcb3159b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 20:18:29 2013 -0500 winemac: Improve logging from wglChoosePixelFormatARB() and wglGetPixelFormatAttribivARB(). --- dlls/winemac.drv/opengl.c | 143 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 095514b..e72281a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -240,6 +240,116 @@ static int nb_formats, nb_displayable_formats; static void *opengl_handle; +static const char* debugstr_attrib(int attrib, int value) +{ + static const struct { + int attrib; + const char *name; + } attrib_names[] = { +#define ATTRIB(a) { a, #a } + ATTRIB(WGL_ACCELERATION_ARB), + ATTRIB(WGL_ACCUM_ALPHA_BITS_ARB), + ATTRIB(WGL_ACCUM_BITS_ARB), + ATTRIB(WGL_ACCUM_BLUE_BITS_ARB), + ATTRIB(WGL_ACCUM_GREEN_BITS_ARB), + ATTRIB(WGL_ACCUM_RED_BITS_ARB), + ATTRIB(WGL_ALPHA_BITS_ARB), + ATTRIB(WGL_ALPHA_SHIFT_ARB), + ATTRIB(WGL_AUX_BUFFERS_ARB), + ATTRIB(WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV), + ATTRIB(WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV), + ATTRIB(WGL_BIND_TO_TEXTURE_RGB_ARB), + ATTRIB(WGL_BIND_TO_TEXTURE_RGBA_ARB), + ATTRIB(WGL_BLUE_BITS_ARB), + ATTRIB(WGL_BLUE_SHIFT_ARB), + ATTRIB(WGL_COLOR_BITS_ARB), + ATTRIB(WGL_DEPTH_BITS_ARB), + ATTRIB(WGL_DOUBLE_BUFFER_ARB), + ATTRIB(WGL_DRAW_TO_BITMAP_ARB), + ATTRIB(WGL_DRAW_TO_PBUFFER_ARB), + ATTRIB(WGL_DRAW_TO_WINDOW_ARB), + ATTRIB(WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB), + ATTRIB(WGL_GREEN_BITS_ARB), + ATTRIB(WGL_GREEN_SHIFT_ARB), + ATTRIB(WGL_NEED_PALETTE_ARB), + ATTRIB(WGL_NEED_SYSTEM_PALETTE_ARB), + ATTRIB(WGL_NUMBER_OVERLAYS_ARB), + ATTRIB(WGL_NUMBER_PIXEL_FORMATS_ARB), + ATTRIB(WGL_NUMBER_UNDERLAYS_ARB), + ATTRIB(WGL_PIXEL_TYPE_ARB), + ATTRIB(WGL_RED_BITS_ARB), + ATTRIB(WGL_RED_SHIFT_ARB), + ATTRIB(WGL_SAMPLE_BUFFERS_ARB), + ATTRIB(WGL_SAMPLES_ARB), + ATTRIB(WGL_SHARE_ACCUM_ARB), + ATTRIB(WGL_SHARE_DEPTH_ARB), + ATTRIB(WGL_SHARE_STENCIL_ARB), + ATTRIB(WGL_STENCIL_BITS_ARB), + ATTRIB(WGL_STEREO_ARB), + ATTRIB(WGL_SUPPORT_GDI_ARB), + ATTRIB(WGL_SUPPORT_OPENGL_ARB), + ATTRIB(WGL_SWAP_LAYER_BUFFERS_ARB), + ATTRIB(WGL_SWAP_METHOD_ARB), + ATTRIB(WGL_TRANSPARENT_ALPHA_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_ARB), + ATTRIB(WGL_TRANSPARENT_BLUE_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_GREEN_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_INDEX_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_RED_VALUE_ARB), +#undef ATTRIB + }; + int i; + const char *attrib_name = NULL; + const char *value_name = NULL; + + for (i = 0; i < sizeof(attrib_names) / sizeof(attrib_names[0]); i++) + { + if (attrib_names[i].attrib == attrib) + { + attrib_name = attrib_names[i].name; + break; + } + } + + if (!attrib_name) + attrib_name = wine_dbg_sprintf("Attrib 0x%04x", attrib); + + switch (attrib) + { + case WGL_ACCELERATION_ARB: + switch (value) + { + case WGL_FULL_ACCELERATION_ARB: value_name = "WGL_FULL_ACCELERATION_ARB"; break; + case WGL_GENERIC_ACCELERATION_ARB: value_name = "WGL_GENERIC_ACCELERATION_ARB"; break; + case WGL_NO_ACCELERATION_ARB: value_name = "WGL_NO_ACCELERATION_ARB"; break; + } + break; + case WGL_PIXEL_TYPE_ARB: + switch (value) + { + case WGL_TYPE_COLORINDEX_ARB: value_name = "WGL_TYPE_COLORINDEX_ARB"; break; + case WGL_TYPE_RGBA_ARB: value_name = "WGL_TYPE_RGBA_ARB"; break; + case WGL_TYPE_RGBA_FLOAT_ARB: value_name = "WGL_TYPE_RGBA_FLOAT_ARB"; break; + case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: value_name = "WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT"; break; + } + break; + case WGL_SWAP_METHOD_ARB: + switch (value) + { + case WGL_SWAP_COPY_ARB: value_name = "WGL_SWAP_COPY_ARB"; break; + case WGL_SWAP_EXCHANGE_ARB: value_name = "WGL_SWAP_EXCHANGE_ARB"; break; + case WGL_SWAP_UNDEFINED_ARB: value_name = "WGL_SWAP_UNDEFINED_ARB"; break; + } + break; + } + + if (!value_name) + value_name = wine_dbg_sprintf("%d / 0x%04x", value, value); + + return wine_dbg_sprintf("%40s: %s", attrib_name, value_name); +} + + static BOOL get_renderer_property(CGLRendererInfoObj renderer_info, GLint renderer_index, CGLRendererProperty property, GLint *value) { @@ -1530,6 +1640,8 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, int attr = iptr[0]; int value = iptr[1]; + TRACE("%s\n", debugstr_attrib(attr, value)); + switch (attr) { case WGL_DRAW_TO_WINDOW_ARB: @@ -1724,11 +1836,36 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, break; default: - WARN("invalid attribute %x\n", iptr[0]); + WARN("invalid attribute %s\n", debugstr_attrib(attr, value)); return GL_FALSE; } } + TRACE("required: w/p/a %s/%s/%s col/r/g/b/a %d%s/%d/%d/%d/%d srgb %d ac %d/%d/%d/%d/%d dp/stn/ax/b/db/str %u/%u/%u/%s/%s/%s samp %u/%u\n", + valid.window ? (pf.window ? "1" : "0") : "?", + valid.pbuffer ? (pf.pbuffer ? "1" : "0") : "?", + valid.accelerated ? (pf.accelerated ? "1" : "0") : "?", + color_bits, + float_color == -1 ? "?" : float_color ? "f" : "", + red_bits, + green_bits, + blue_bits, + alpha_bits, + (int)srgb, + accum_bits, + accum_red_bits, + accum_green_bits, + accum_blue_bits, + accum_alpha_bits, + pf.depth_bits, + pf.stencil_bits, + pf.aux_buffers, + valid.backing_store ? (pf.backing_store ? "1" : "0") : "?", + valid.double_buffer ? (pf.double_buffer ? "1" : "0") : "?", + valid.stereo ? (pf.stereo ? "1" : "0") : "?", + pf.sample_buffers, + pf.samples); + for (i = 0; i < nb_formats && found < nMaxFormats; i++) { const struct color_mode *mode; @@ -1781,6 +1918,7 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, continue; piFormats[found++] = i; + TRACE("match: pixel format %d %s\n", i, debugstr_pf(&pixel_formats[i])); } cant_match: @@ -2021,6 +2159,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i if (nAttributes == 1 && piAttributes[0] == WGL_NUMBER_PIXEL_FORMATS_ARB) { piValues[0] = nb_formats; + TRACE("%s\n", debugstr_attrib(piAttributes[0], piValues[0])); return GL_TRUE; } @@ -2285,7 +2424,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i return GL_FALSE; } - TRACE("piAttributes[%d] (%x) -> %x\n", i, piAttributes[i], piValues[i]); + TRACE("%s\n", debugstr_attrib(piAttributes[i], piValues[i])); } return GL_TRUE;

1 0

Ken Thomases : winemac: If an app opens a window shortly after its systray icon is clicked, activate it.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 1c7a2ba33b8601ee2758a55f97f40d10bbc35a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7a2ba33b8601ee2758a55f9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 16:10:10 2013 -0500 winemac: If an app opens a window shortly after its systray icon is clicked, activate it. The Mac driver doesn't normally steal focus, but a click on the systray icon counts as the user giving permission. --- dlls/winemac.drv/cocoa_window.m | 8 +++++--- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/systray.c | 8 ++++++++ dlls/winemac.drv/window.c | 10 +++++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e89dee5..65d7bc5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -856,7 +856,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) macdrv_release_event(event); } - - (void) makeFocused + - (void) makeFocused:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; NSArray* screens; @@ -889,6 +889,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (front && [front levelWhenActive] > [self levelWhenActive]) [self setLevelWhenActive:[front levelWhenActive]]; } + if (activate) + [NSApp activateIgnoringOtherApps:YES]; [self orderFront:nil]; [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; causing_becomeKeyWindow = TRUE; @@ -1804,12 +1806,12 @@ void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) * orders it front and, if its frame was not within the desktop bounds, * Cocoa will typically move it on-screen. */ -void macdrv_give_cocoa_window_focus(macdrv_window w) +void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) { WineWindow* window = (WineWindow*)w; OnMainThread(^{ - [window makeFocused]; + [window makeFocused:activate]; }); } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index bdbe8d1..aec7a02 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -88,6 +88,7 @@ enum macdrv_window_messages WM_MACDRV_UPDATE_DESKTOP_RECT, WM_MACDRV_RESET_DEVICE_METRICS, WM_MACDRV_DISPLAYCHANGE, + WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, }; struct macdrv_thread_data diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2c0ee9d..39f229d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -353,7 +353,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat CGFloat keyBlue) DECLSPEC_HIDDEN; extern void macdrv_clear_window_color_key(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) DECLSPEC_HIDDEN; -extern void macdrv_give_cocoa_window_focus(macdrv_window w) DECLSPEC_HIDDEN; +extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSPEC_HIDDEN; extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index b45e311..dc0f99b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -325,6 +325,14 @@ void macdrv_status_item_clicked(const macdrv_event *event) { UINT down; + if (!SendMessageW(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && + GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + { + WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); + delete_icon(icon); + return; + } + if (event->status_item_clicked.count == 1) { down = WM_LBUTTONDOWN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 987aa34..3353749 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -42,6 +42,8 @@ static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CFMutableDictionaryRef win_datas; +DWORD activate_on_focus_time; + void CDECL macdrv_SetFocus(HWND hwnd); @@ -855,8 +857,9 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (data->cocoa_window && data->on_screen) { + BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); /* Set Mac focus */ - macdrv_give_cocoa_window_focus(data->cocoa_window); + macdrv_give_cocoa_window_focus(data->cocoa_window, activate); } release_win_data(data); @@ -1226,6 +1229,11 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) } SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); return 0; + case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: + activate_on_focus_time = GetTickCount(); + if (!activate_on_focus_time) activate_on_focus_time = 1; + TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time); + break; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0

Christian Costa : d3dx9_36: Add DIB file support to D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: wine Branch: master Commit: 792e2ee248bcf0cf361a2115255033ac6d837781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792e2ee248bcf0cf361a21152… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 22 23:08:09 2013 +0200 d3dx9_36: Add DIB file support to D3DXLoadSurfaceFromFileInMemory. --- dlls/d3dx9_36/surface.c | 6 ++++++ dlls/d3dx9_36/tests/surface.c | 6 ++---- dlls/d3dx9_36/tests/texture.c | 9 ++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index af7b89e..fd1acc6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1073,6 +1073,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, return hr; } + if (imginfo.ImageFileFormat == D3DXIFF_DIB) + convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) @@ -1135,6 +1138,9 @@ cleanup_bmp: cleanup_err: CoUninitialize(); + if (imginfo.ImageFileFormat == D3DXIFF_DIB) + HeapFree(GetProcessHeap(), 0, (void*)pSrcData); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 759f9e1..b46f33b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -623,10 +623,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromResource */ - todo_wine { - hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDD_BITMAPDATA_1x1), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 5f51db1..782864c 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -728,11 +728,10 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) } /* D3DXCreateTextureFromResource */ - todo_wine { - hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); - ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); - } + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture);

1 0

Jacek Caban : winegecko.php: Added 2.21-beta1 release.
by Alexandre Julliard April 25, 2013

April 25, 2013

Module: tools Branch: master Commit: a6611c31119e427cf892c3c7defad77e945d6d97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a6611c31119e427cf892c3c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 11:58:59 2013 +0200 winegecko.php: Added 2.21-beta1 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 8f4186e..34f0f36 100644 --- a/winegecko.php +++ b/winegecko.php @@ -72,7 +72,9 @@ $aFileSizes = array( '1.8-x86'=>17774592, '1.8-x86_64'=>18238976, '1.9-x86'=>19060224, - '1.9-x86_64'=>19622400 + '1.9-x86_64'=>19622400, + '2.21-beta1-x86'=>20875264, + '2.21-beta1-x86_64'=>21648896 ); // Exact size of the file:

1 0

Stefan Dösinger : d3d9/tests: Nvidia cannot handle 2x1 YUY2/UYVY surfaces.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: a4babd2ed3206cb9e6ca05b98d2253aa3cf9c06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4babd2ed3206cb9e6ca05b98… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:55 2013 +0200 d3d9/tests: Nvidia cannot handle 2x1 YUY2/UYVY surfaces. --- dlls/d3d9/tests/visual.c | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 772c299..82f364b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10253,8 +10253,11 @@ static void yuv_color_test(IDirect3DDevice9 *device) { continue; } - /* A pixel is effectively 16 bit large, but two pixels are stored together, so the minimum size is 2x1 */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 1, format, D3DPOOL_DEFAULT, &surface, NULL); + /* A pixel is effectively 16 bit large, but two pixels are stored together, so the minimum size is 2x1 + * However, Nvidia Windows drivers have problems with 2x1 YUY2/UYVY surfaces, so use a 4x1 surface and + * fill the second block with dummy data. If the surface has a size of 2x1, those drivers ignore the + * second luminance value, resulting in an incorrect color in the right pixel. */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 1, format, D3DPOOL_DEFAULT, &surface, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = %08x\n", hr); for(i = 0; i < (sizeof(test_data)/sizeof(test_data[0])); i++) { @@ -10269,7 +10272,8 @@ static void yuv_color_test(IDirect3DDevice9 *device) { memset(&lr, 0, sizeof(lr)); hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr = %08x\n", hr); - *((DWORD *) lr.pBits) = test_data[i].in; + ((DWORD *) lr.pBits)[0] = test_data[i].in; + ((DWORD *) lr.pBits)[1] = 0x00800080; hr = IDirect3DSurface9_UnlockRect(surface); ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect failed, hr = %08x\n", hr); @@ -10283,24 +10287,13 @@ static void yuv_color_test(IDirect3DDevice9 *device) { * want to add tests for the filtered pixels as well. * * Unfortunately different implementations(Windows-NV and Mac-ATI tested) interpret some colors vastly - * differently, so we need a max diff of 16 + * differently, so we need a max diff of 18 */ - color = getPixelColor(device, 40, 240); - - /* Newer versions of the Nvidia Windows driver mix up the U and V channels, breaking all the tests - * where U != V. Skip the entire test if this bug in this case - */ - if (broken(test_data[i].in == 0xff000000 && color == 0x00008800 && format == D3DFMT_UYVY)) - { - skip("Nvidia channel confusion bug detected, skipping YUV tests\n"); - IDirect3DSurface9_Release(surface); - goto out; - } - + color = getPixelColor(device, 1, 240); ok(color_match(color, ref_color_left, 18), "Input 0x%08x: Got color 0x%08x for pixel 1/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_left, fmt_string); - color = getPixelColor(device, 600, 240); + color = getPixelColor(device, 318, 240); ok(color_match(color, ref_color_right, 18), "Input 0x%08x: Got color 0x%08x for pixel 2/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_right, fmt_string); @@ -10310,7 +10303,6 @@ static void yuv_color_test(IDirect3DDevice9 *device) { IDirect3DSurface9_Release(surface); } -out: IDirect3DSurface9_Release(target); IDirect3D9_Release(d3d); }

1 0

Jacek Caban : jscript: Use single string instance for strings representing NULL BSTR instead of a flag .
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 2ac35ac44161dad1fce63006452bbe35be74af91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac35ac44161dad1fce630064… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 24 11:32:33 2013 +0200 jscript: Use single string instance for strings representing NULL BSTR instead of a flag. --- dlls/jscript/jsstr.c | 27 ++++++++++++++++++++++----- dlls/jscript/jsstr.h | 7 ++++--- dlls/jscript/jsutils.c | 16 +++++++++------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index 0d0eb0f..add0195 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -277,7 +277,7 @@ const WCHAR *jsstr_rope_flatten(jsstr_rope_t *str) return jsstr_as_heap(&str->str)->buf = buf; } -static jsstr_t *empty_str, *nan_str, *undefined_str; +static jsstr_t *empty_str, *nan_str, *undefined_str, *null_bstr_str; jsstr_t *jsstr_nan(void) { @@ -294,6 +294,16 @@ jsstr_t *jsstr_undefined(void) return jsstr_addref(undefined_str); } +jsstr_t *jsstr_null_bstr(void) +{ + return jsstr_addref(null_bstr_str); +} + +BOOL is_null_bstr(jsstr_t *str) +{ + return str == null_bstr_str; +} + BOOL init_strings(void) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -305,12 +315,19 @@ BOOL init_strings(void) return FALSE; if(!(undefined_str = jsstr_alloc(undefinedW))) return FALSE; - return TRUE; + if(!jsstr_alloc_buf(0, &null_bstr_str)) + return FALSE; + return TRUE; } void free_strings(void) { - jsstr_release(empty_str); - jsstr_release(nan_str); - jsstr_release(undefined_str); + if(empty_str) + jsstr_release(empty_str); + if(nan_str) + jsstr_release(nan_str); + if(undefined_str) + jsstr_release(undefined_str); + if(null_bstr_str) + jsstr_release(null_bstr_str); } diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 727b2d0..2ad03f1 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -17,7 +17,7 @@ */ /* - * This is a common header for all string representations. The exact layout of the string + * jsstr_t is a common header for all string representations. The exact layout of the string * representation may be: * * - inline string - string bytes directly follow string headers. @@ -42,8 +42,6 @@ struct _jsstr_t { #define JSSTR_MAX_LENGTH (1 << (32-JSSTR_LENGTH_SHIFT)) #define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1) -#define JSSTR_FLAG_NULLBSTR 4 - #define JSSTR_FLAG_LBIT 1 #define JSSTR_FLAG_FLAT 2 #define JSSTR_FLAG_TAG_MASK 3 @@ -187,6 +185,9 @@ jsstr_t *jsstr_nan(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_empty(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_undefined(void) DECLSPEC_HIDDEN; +jsstr_t *jsstr_null_bstr(void) DECLSPEC_HIDDEN; +BOOL is_null_bstr(jsstr_t*) DECLSPEC_HIDDEN; + BOOL init_strings(void) DECLSPEC_HIDDEN; void free_strings(void) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 60ca474..87bad26 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -294,11 +294,13 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_BSTR: { jsstr_t *str; - str = jsstr_alloc_len(V_BSTR(var), SysStringLen(V_BSTR(var))); - if(!str) - return E_OUTOFMEMORY; - if(!V_BSTR(var)) - str->length_flags |= JSSTR_FLAG_NULLBSTR; + if(V_BSTR(var)) { + str = jsstr_alloc_len(V_BSTR(var), SysStringLen(V_BSTR(var))); + if(!str) + return E_OUTOFMEMORY; + }else { + str = jsstr_null_bstr(); + } *r = jsval_string(str); return S_OK; @@ -351,7 +353,7 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) jsstr_t *str = get_string(val); V_VT(retv) = VT_BSTR; - if(str->length_flags & JSSTR_FLAG_NULLBSTR) { + if(is_null_bstr(str)) { V_BSTR(retv) = NULL; }else { V_BSTR(retv) = SysAllocStringLen(NULL, jsstr_length(str)); @@ -913,7 +915,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY if(FAILED(hres)) break; - if(str->length_flags & JSSTR_FLAG_NULLBSTR) { + if(is_null_bstr(str)) { V_BSTR(dst) = NULL; break; }

1 0

Dmitry Timoshkov : kernel32: Add a test to show that CreateThread is supposed to fail after the NtTerminateProcess call .
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: cd55afec8ac5c76e1c5fb3eedb139fea5431752c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd55afec8ac5c76e1c5fb3eed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 24 20:39:07 2013 +0900 kernel32: Add a test to show that CreateThread is supposed to fail after the NtTerminateProcess call. --- dlls/kernel32/tests/loader.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 38c059c..6291d9c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1042,7 +1042,6 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore; static DWORD attached_thread_count; -static LONG noop_thread_started; static int test_dll_phase; static DWORD WINAPI mutex_thread_proc(void *param) @@ -1085,14 +1084,19 @@ static DWORD WINAPI semaphore_thread_proc(void *param) static DWORD WINAPI noop_thread_proc(void *param) { - InterlockedIncrement(&noop_thread_started); + if (param) + { + LONG *noop_thread_started = param; + InterlockedIncrement(noop_thread_started); + } trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); - return 196; + return 195; } static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { + static LONG noop_thread_started; DWORD ret; switch (reason) @@ -1136,7 +1140,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); } - ok(attached_thread_count == 2, "attached thread count should be 2\n"); + ok(attached_thread_count >= 2, "attached thread count should be >= 2\n"); for (i = 0; i < attached_thread_count; i++) { @@ -1179,7 +1183,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) */ noop_thread_started = 0; SetLastError(0xdeadbeef); - handle = CreateThread(NULL, 0, noop_thread_proc, NULL, 0, &ret); + handle = CreateThread(NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { @@ -1187,7 +1191,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); else + { + ret = WaitForSingleObject(handle, 1000); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); CloseHandle(handle); + } } else { @@ -1212,7 +1220,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); - handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, NULL, 0, &ret); + handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { @@ -1220,7 +1228,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); else + { + ret = WaitForSingleObject(handle, 1000); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); CloseHandle(handle); + } } else { @@ -1438,6 +1450,19 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + SetLastError(0xdeadbeef); + thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); +todo_wine + ok(!thread || broken(thread != 0) /* before win7 */, "CreateThread should fail\n"); + if (!thread) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + { + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); + CloseHandle(thread); + } + break; case 1:

1 0