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

Hans Leidekker : fusion: Handle DWORD-sized blob indices when loading the public key.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 7c06862c52683dc230dd0f372eaf8fb6a5d3284a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c06862c52683dc230dd0f372… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 13:05:14 2012 +0200 fusion: Handle DWORD-sized blob indices when loading the public key. --- dlls/fusion/assembly.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 46c4db4..b655df1 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -825,23 +825,22 @@ PEKIND assembly_get_architecture(ASSEMBLY *assembly) return peI386; /* x86 assembly */ } -static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) +static BYTE *assembly_get_blob(ASSEMBLY *assembly, DWORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); } HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { - ASSEMBLYTABLE *asmtbl; ULONG i, size; LONG offset; - BYTE *hashdata; + BYTE *hashdata, *pubkey, *ptr; HCRYPTPROV crypt; HCRYPTHASH hash; - BYTE *pubkey; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; + DWORD idx; *token = NULL; @@ -849,11 +848,17 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) if (offset == -1) return E_FAIL; - asmtbl = assembly_data_offset(assembly, offset); - if (!asmtbl) + ptr = assembly_data_offset(assembly, offset); + if (!ptr) return E_FAIL; - pubkey = assembly_get_blob(assembly, asmtbl->PublicKey, &size); + ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey); + if (assembly->blobsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + pubkey = assembly_get_blob(assembly, idx, &size); if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))

1 0

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

May 23, 2012

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

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

May 23, 2012

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

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

May 23, 2012

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

Józef Kucia : d3dx9: Fix the expected_length computation for non-square DDS files.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: d313e4f9d3288bc9ee958a258bd4fd730af8cc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d313e4f9d3288bc9ee958a258… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:56 2012 +0200 d3dx9: Fix the expected_length computation for non-square DDS files. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 28975b9..6b0786c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -366,7 +366,7 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG calculate_dds_surface_size(info, width, height, &pitch, &size); expected_length += size; width = max(1, width / 2); - height = max(1, width / 2); + height = max(1, height / 2); } expected_length *= faces;

1 0

Henri Verbeet : ddraw/tests: Add a test for the initial color keying state.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: baa5ceecb0351de55ecf083340fa83985cbf0e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa5ceecb0351de55ecf08334… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:32 2012 +0200 ddraw/tests: Add a test for the initial color keying state. --- dlls/ddraw/tests/ddraw1.c | 180 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 122 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 118 +++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 107 +++++++++++++++++++++++++++ 4 files changed, 527 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baa5ceecb0351de55ecf0…

1 0

Christian Costa : d3drm: Implement IDirect3DRMMaterial2 interface.
by Alexandre Julliard May 23, 2012

May 23, 2012

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

Henri Verbeet : ddraw/tests: Properly cleanup on failed device creation in a couple of places.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: fa90a256d7f8ae2cdf5dd53acf1ae7668626241f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa90a256d7f8ae2cdf5dd53ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:31 2012 +0200 ddraw/tests: Properly cleanup on failed device creation in a couple of places. --- dlls/ddraw/tests/ddraw1.c | 4 ++++ dlls/ddraw/tests/ddraw2.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 158f92d..a3f548c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1158,6 +1158,7 @@ static void test_ck_rgba(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } @@ -1390,6 +1391,7 @@ static void test_surface_qi(void) if (!(ddraw = create_ddraw())) { skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); return; } /* Try to create a D3D device to see if the ddraw implementation supports @@ -1398,6 +1400,7 @@ static void test_surface_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } @@ -1483,6 +1486,7 @@ static void test_device_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 45a5cfd..02d0d6b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1373,6 +1373,7 @@ static void test_ck_rgba(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; } @@ -1586,6 +1587,7 @@ static void test_surface_qi(void) if (!(ddraw = create_ddraw())) { skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); return; } /* Try to create a D3D device to see if the ddraw implementation supports @@ -1594,6 +1596,7 @@ static void test_surface_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; } @@ -1678,6 +1681,7 @@ static void test_device_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; }

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DSurface8Impl.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: ec466ff3b7ee94fa4e09134e2b6cdf3c775098d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec466ff3b7ee94fa4e09134e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:33 2012 +0200 d3d8: Get rid of IDirect3DSurface8Impl. --- dlls/d3d8/d3d8_private.h | 18 ++---- dlls/d3d8/device.c | 37 +++++------ dlls/d3d8/surface.c | 163 ++++++++++++++++++++++++---------------------- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 12 ++-- 5 files changed, 114 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec466ff3b7ee94fa4e091…

1 0

Józef Kucia : d3dx9: Add support for luminance pixel formats.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: ada51526503db123dec4207d8a4750c0d3d06ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada51526503db123dec4207d8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:58 2012 +0200 d3dx9: Add support for luminance pixel formats. --- dlls/d3dx9_36/tests/surface.c | 12 ++++-------- dlls/d3dx9_36/util.c | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 15336da..2f1f2a8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -465,10 +465,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFile */ if(testbitmap_ok) { - todo_wine { - hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -506,10 +504,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ - todo_wine { - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index ad8a6ea..d936fb9 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -63,6 +63,8 @@ static const PixelFormatDesc formats[] = {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_L8, {0, 8, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_L16, {0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL },

1 0