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

Alexandre Julliard : gdi32: Use the default color table when mapping colors in bitmaps that don' t have one.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 9968f3083ae7baf37503f590155708aacfbbd390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9968f3083ae7baf37503f5901… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:34:22 2012 +0200 gdi32: Use the default color table when mapping colors in bitmaps that don't have one. --- dlls/gdi32/dibdrv/dibdrv.h | 5 ++ dlls/gdi32/dibdrv/objects.c | 13 +++-- dlls/gdi32/dibdrv/primitives.c | 118 +++++++++++++++++++++++++--------------- 3 files changed, 87 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9968f3083ae7baf37503f…

1 0

Alexandre Julliard : gdi32: Don' t store the default color table in dib_info objects.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 664442ab847075c2009d29db1b00564fa15517c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664442ab847075c2009d29db1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:56:38 2012 +0200 gdi32: Don't store the default color table in dib_info objects. --- dlls/gdi32/dibdrv/bitblt.c | 20 ++++++++++---------- dlls/gdi32/dibdrv/dc.c | 24 +++++++++--------------- dlls/gdi32/dibdrv/dibdrv.h | 9 ++------- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 6 +++--- 5 files changed, 25 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=664442ab847075c2009d2…

1 0

Aric Stewart : wineqtdecoder: Recreate audio extraction session when we run out of frames.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 5e4cb217d61f7460a4dcc353d3f8030414ac8d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4cb217d61f7460a4dcc353d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 22 11:17:09 2012 -0500 wineqtdecoder: Recreate audio extraction session when we run out of frames. --- dlls/wineqtdecoder/qtsplitter.c | 77 +++++++++++++++++++++++++++++++++------ 1 files changed, 66 insertions(+), 11 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index b21f198..9b94d7a 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -479,25 +479,43 @@ kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, return err; } -static DWORD WINAPI QTSplitter_thread(LPVOID data) +static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) { QTSplitter *This = (QTSplitter *)data; - HRESULT hr = S_OK; - TimeValue next_time; - CVPixelBufferRef pixelBuffer = NULL; - OSStatus err; - TimeRecord tr; if (This->pAudio_Pin) { /* according to QA1469 a movie has to be fully loaded before we - can reliably start the Extraction session */ + can reliably start the Extraction session. - while(GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) - MoviesTask(This->pQTMovie,1000); + If loaded earlier then we only get an extraction session for + the part of the movie that is loaded at that time. - QT_Create_Extract_Session(This); + We are trying to load as much of the movie as we can before we + start extracting. However we can recreate the extraction session + again when we run out of loaded extraction frames. But we want + to try to minimize that. + */ + + while(GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) + { + EnterCriticalSection(&This->csReceive); + MoviesTask(This->pQTMovie, 100); + LeaveCriticalSection(&This->csReceive); + Sleep(0); + } } + return 0; +} + +static DWORD WINAPI QTSplitter_thread(LPVOID data) +{ + QTSplitter *This = (QTSplitter *)data; + HRESULT hr = S_OK; + TimeValue next_time; + CVPixelBufferRef pixelBuffer = NULL; + OSStatus err; + TimeRecord tr; WaitForSingleObject(This->runEvent, -1); @@ -507,7 +525,12 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); GetMovieTime(This->pQTMovie, &tr); + + if (This->pAudio_Pin) + QT_Create_Extract_Session(This); + LeaveCriticalSection(&This->csReceive); + do { LONGLONG tStart=0, tStop=0; @@ -585,6 +608,32 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) aData.mBuffers[0].mData = ptr; err = MovieAudioExtractionFillBuffer(This->aSession, &frames, &aData, &flags); + if (frames == 0) + { + TimeRecord etr; + + /* Ran out of frames, Restart the extraction session */ + TRACE("Restarting extraction session\n"); + MovieAudioExtractionEnd(This->aSession); + This->aSession = NULL; + QT_Create_Extract_Session(This); + + etr = tr; + etr.value = SInt64ToWide(This->movie_time); + MovieAudioExtractionSetProperty(This->aSession, + kQTPropertyClass_MovieAudioExtraction_Movie, + kQTMovieAudioExtractionMoviePropertyID_CurrentTime, + sizeof(TimeRecord), &etr ); + + frames = pvi->nSamplesPerSec * duration; + aData.mNumberBuffers = 1; + aData.mBuffers[0].mNumberChannels = pvi->nChannels; + aData.mBuffers[0].mDataByteSize = data_size; + aData.mBuffers[0].mData = ptr; + + MovieAudioExtractionFillBuffer(This->aSession, &frames, &aData, &flags); + } + TRACE("Got %i frames\n",(int)frames); IMediaSample_SetActualDataLength(sample, frames * pvi->nBlockAlign); @@ -992,10 +1041,16 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); + thread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); + if (thread) + { + TRACE("Created loading thread 0x%08x\n", tid); + CloseHandle(thread); + } thread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); if (thread) { - TRACE("Created thread 0x%08x\n", tid); + TRACE("Created processing thread 0x%08x\n", tid); CloseHandle(thread); } else

1 0

Eric Pouech : winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones).
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: e9eab7bbfc1457ec6bf90a92977aa9484bf6c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eab7bbfc1457ec6bf90a929… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 22 21:52:03 2012 +0200 winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones). --- programs/winedbg/gdbproxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 08210e0..58b2202 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1531,6 +1531,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) if (gdbctx->trace & GDBPXY_TRC_COMMAND) fprintf(stderr, "Read register %x => %08x%08x\n", reg, (unsigned)(cpu_register(pctx, reg) >> 32), (unsigned)cpu_register(pctx, reg)); + packet_reply_open(gdbctx); packet_reply_register_hex_to(gdbctx, reg); packet_reply_close(gdbctx); return packet_done;

1 0

Christian Costa : d3drm: Set vertices data of the created mesh.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 63f39c9196f57b76bd0aa050990011500a979a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f39c9196f57b76bd0aa0509… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:07 2012 +0200 d3drm: Set vertices data of the created mesh. --- dlls/d3drm/meshbuilder.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 9b5e2cc..4d4da0f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1856,10 +1856,28 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, 0, face_data, &group); + HeapFree(GetProcessHeap(), 0, face_data); + if (SUCCEEDED(hr)) + { + D3DRMVERTEX* vertices; + + vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); + if (vertices) + { + for (i = 0; i < This->nb_vertices; i++) + { + vertices[i].position = This->pVertices[i]; + } + hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); + HeapFree(GetProcessHeap(), 0, vertices); + } + else + { + hr = E_OUTOFMEMORY; + } + } if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); - - HeapFree(GetProcessHeap(), 0, face_data); } return hr;

1 0

Christian Costa : d3drm: Fix method name Material to CreateMaterial.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: bbbe6d3e71fbded910d7e6476cb7ecc4f539dfde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbe6d3e71fbded910d7e6476… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:16 2012 +0200 d3drm: Fix method name Material to CreateMaterial. --- dlls/d3drm/d3drm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 31edd46..292be71 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -221,7 +221,7 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateLightRGB(IDirect3DRM* iface, D3DRMLI return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRMImpl_Material(IDirect3DRM* iface, D3DVALUE m, LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRMImpl_CreateMaterial(IDirect3DRM* iface, D3DVALUE m, LPDIRECT3DRMMATERIAL * ppMaterial) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); @@ -446,7 +446,7 @@ static const struct IDirect3DRMVtbl Direct3DRM_Vtbl = IDirect3DRMImpl_CreateTexture, IDirect3DRMImpl_CreateLight, IDirect3DRMImpl_CreateLightRGB, - IDirect3DRMImpl_Material, + IDirect3DRMImpl_CreateMaterial, IDirect3DRMImpl_CreateDevice, IDirect3DRMImpl_CreateDeviceFromSurface, IDirect3DRMImpl_CreateDeviceFromD3D, @@ -593,8 +593,8 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateLightRGB(IDirect3DRM2* iface, D3DRM return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRM2Impl_Material(IDirect3DRM2* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVALUE m, + LPDIRECT3DRMMATERIAL * ppMaterial) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -871,7 +871,7 @@ static const struct IDirect3DRM2Vtbl Direct3DRM2_Vtbl = IDirect3DRM2Impl_CreateTexture, IDirect3DRM2Impl_CreateLight, IDirect3DRM2Impl_CreateLightRGB, - IDirect3DRM2Impl_Material, + IDirect3DRM2Impl_CreateMaterial, IDirect3DRM2Impl_CreateDevice, IDirect3DRM2Impl_CreateDeviceFromSurface, IDirect3DRM2Impl_CreateDeviceFromD3D, @@ -1036,8 +1036,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateLightRGB(IDirect3DRM3* iface, D3DRM return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_Material(IDirect3DRM3* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL2* Material) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVALUE m, + LPDIRECT3DRMMATERIAL2* Material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); @@ -1646,7 +1646,7 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl = IDirect3DRM3Impl_CreateTexture, IDirect3DRM3Impl_CreateLight, IDirect3DRM3Impl_CreateLightRGB, - IDirect3DRM3Impl_Material, + IDirect3DRM3Impl_CreateMaterial, IDirect3DRM3Impl_CreateDevice, IDirect3DRM3Impl_CreateDeviceFromSurface, IDirect3DRM3Impl_CreateDeviceFromD3D,

1 0

Christian Costa : d3drm: Implement IDirect3DRMMaterial2 interface.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 5b11bd8bacdc548114510ce995f40409f338502c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b11bd8bacdc548114510ce99… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:24 2012 +0200 d3drm: Implement IDirect3DRMMaterial2 interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/material.c | 320 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 321 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b11bd8bacdc548114510…

1 0

Christian Costa : d3drm: Implement IDirect3DRMXImpl_CreateMaterial.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: a442fcc9c62ec07d9bcb408483454016061dd129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a442fcc9c62ec07d9bcb40848… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:32 2012 +0200 d3drm: Implement IDirect3DRMXImpl_CreateMaterial. --- dlls/d3drm/d3drm.c | 28 +++++++++++++++++----------- dlls/d3drm/d3drm_private.h | 1 + 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 292be71..be7ba7f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -221,13 +221,13 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateLightRGB(IDirect3DRM* iface, D3DRMLI return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRMImpl_CreateMaterial(IDirect3DRM* iface, D3DVALUE m, LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRMImpl_CreateMaterial(IDirect3DRM* iface, D3DVALUE power, LPDIRECT3DRMMATERIAL * material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%f,%p): stub\n", iface, This, m, ppMaterial); + TRACE("(%p/%p)->(%f,%p)\n", iface, This, power, material); - return E_NOTIMPL; + return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } static HRESULT WINAPI IDirect3DRMImpl_CreateDevice(IDirect3DRM* iface, DWORD width, DWORD height, LPDIRECT3DRMDEVICE * ppDevice) @@ -593,14 +593,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateLightRGB(IDirect3DRM2* iface, D3DRM return IDirect3DRM3_CreateLightRGB(&This->IDirect3DRM3_iface, type, red, green, blue, Light); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL * ppMaterial) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVALUE power, + LPDIRECT3DRMMATERIAL * material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%f,%p): stub\n", iface, This, m, ppMaterial); + TRACE("(%p/%p)->(%f,%p)\n", iface, This, power, material); - return E_NOTIMPL; + return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2* iface, DWORD width, DWORD height, @@ -1036,14 +1036,20 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateLightRGB(IDirect3DRM3* iface, D3DRM return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVALUE m, - LPDIRECT3DRMMATERIAL2* Material) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVALUE power, + LPDIRECT3DRMMATERIAL2* material) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); + HRESULT ret; - FIXME("(%p/%p)->(%f,%p): stub\n", iface, This, m, Material); + TRACE("(%p/%p)->(%f,%p)\n", iface, This, power, material); - return E_NOTIMPL; + ret = Direct3DRMMaterial_create(material); + + if (SUCCEEDED(ret)) + IDirect3DRMMaterial2_SetPower(*material, power); + + return ret; } static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3* iface, DWORD width, DWORD height, diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index aabb878..ae56124 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -30,6 +30,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** r HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) DECLSPEC_HIDDEN;

1 0

Christian Costa : d3drm: Material object is taken into account when a mesh references it.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 8f86a0bbddcb3b06a4b521df8f0c527501d34176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f86a0bbddcb3b06a4b521df8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 22:05:40 2012 +0200 d3drm: Material object is taken into account when a mesh references it. --- dlls/d3drm/d3drm.c | 12 +----------- dlls/d3drm/tests/d3drm.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index be7ba7f..923a05c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1406,17 +1406,7 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI } else if (IsEqualGUID(guid, &TID_D3DRMMaterial)) { - TRACE("Found TID_D3DRMMaterial\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial2)) - requested = TRUE; - - if (requested) - { - FIXME("Processing material not supported yet\n"); - } + TRACE("Found TID_D3DRMMaterial => Will be taken into account when a mesh will reference it\n"); } else if (IsEqualGUID(guid, &TID_D3DRMFrameTransformMatrix)) { diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 4f7eed6..c0869be 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -165,6 +165,13 @@ static char data_d3drm_load[] = "{\n" " {Object1}\n" " {Object2}\n" +"}\n" +"Material\n" +"{\n" +" 0.1, 0.2, 0.3, 0.4;;\n" +" 0.5;\n" +" 0.6, 0.7, 0.8;;\n" +" 0.9, 1.0, 1.1;;\n" "}\n"; static void test_MeshBuilder(void) @@ -858,7 +865,8 @@ static const GUID* refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder, - &IID_IDirect3DRMFrame + &IID_IDirect3DRMFrame, + &IID_IDirect3DRMMaterial /* Not taken into account and not notified */ }; static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) @@ -874,14 +882,14 @@ static void test_d3drm_load(void) HRESULT hr; LPDIRECT3DRM pD3DRM; D3DRMLOADMEMORY info; - const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame }; + const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial }; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; info.dSize = strlen(data_d3drm_load); - hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 2, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); + hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 3, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);

1 0

Henri Verbeet : ddraw/tests: Add a helper function to setup execute buffers .
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 89d561e6f8b4d27d00ad09d835feb9554db27df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d561e6f8b4d27d00ad09d83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:30 2012 +0200 ddraw/tests: Add a helper function to setup execute buffers. --- dlls/ddraw/tests/ddraw1.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b5c50c5..158f92d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -186,6 +186,20 @@ static void emit_end(void **ptr) *ptr = inst + 1; } +static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len) +{ + D3DEXECUTEDATA exec_data; + HRESULT hr; + + memset(&exec_data, 0, sizeof(exec_data)); + exec_data.dwSize = sizeof(exec_data); + exec_data.dwVertexCount = vertex_count; + exec_data.dwInstructionOffset = offset; + exec_data.dwInstructionLength = len; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); +} + static HRESULT CALLBACK enum_z_fmt(GUID *guid, char *description, char *name, D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx) { @@ -997,7 +1011,6 @@ static void test_zenable(void) D3DEXECUTEBUFFERDESC exec_desc; IDirect3DMaterial *background; IDirect3DViewport *viewport; - D3DEXECUTEDATA exec_data; IDirect3DDevice *device; IDirectDrawSurface *rt; IDirectDraw *ddraw; @@ -1050,18 +1063,11 @@ static void test_zenable(void) hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); - memset(&exec_data, 0, sizeof(exec_data)); - exec_data.dwSize = sizeof(exec_data); - exec_data.dwVertexCount = 4; - exec_data.dwInstructionOffset = sizeof(tquad); - exec_data.dwInstructionLength = inst_length; - hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); - ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); - hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); hr = IDirect3DDevice_EndScene(device); @@ -1197,7 +1203,6 @@ static void test_ck_rgba(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { UINT draw1_len, draw2_len; - D3DEXECUTEDATA exec_data; void *ptr; hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); @@ -1227,18 +1232,11 @@ static void test_ck_rgba(void) hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to fill texture, hr %#x.\n", hr); - memset(&exec_data, 0, sizeof(exec_data)); - exec_data.dwSize = sizeof(exec_data); - exec_data.dwVertexCount = 8; - exec_data.dwInstructionOffset = sizeof(tquad); - exec_data.dwInstructionLength = draw1_len; - hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); - ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); - hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 8, sizeof(tquad), draw1_len); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); hr = IDirect3DDevice_EndScene(device); @@ -1256,13 +1254,9 @@ static void test_ck_rgba(void) hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to fill texture, hr %#x.\n", hr); - exec_data.dwInstructionOffset = sizeof(tquad) + draw1_len; - exec_data.dwInstructionLength = draw2_len; - hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); - ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); - hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 8, sizeof(tquad) + draw1_len, draw2_len); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); hr = IDirect3DDevice_EndScene(device);

1 0