wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Chris Robinson : wined3d: Check for NULL vertex declarations.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: fd823fc2d20a4c79a9c4874bee50a250fb264994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd823fc2d20a4c79a9c4874be… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Apr 7 03:08:16 2008 -0700 wined3d: Check for NULL vertex declarations. --- dlls/d3d9/tests/device.c | 12 ++++++++++-- dlls/wined3d/device.c | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 80eb240..020b17a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1505,7 +1505,7 @@ static void test_draw_indexed(void) hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); ok(SUCCEEDED(hr), "SetVertexDeclaration failed (0x%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_DEFAULT, &vertex_buffer, NULL); @@ -1538,11 +1538,19 @@ static void test_draw_indexed(void) ok(hr == D3DERR_INVALIDCALL, "DrawIndexedPrimitive returned 0x%08x, expected D3DERR_INVALIDCALL (0x%08x)\n", hr, D3DERR_INVALIDCALL); - /* Valid index buffer. Should succeed */ + /* Valid index buffer, NULL vertex declaration. Should fail */ hr = IDirect3DDevice9_SetIndices(device, index_buffer); ok(SUCCEEDED(hr), "SetIndices failed (0x%08x)\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0 /* BaseVertexIndex */, 0 /* MinIndex */, 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); + ok(hr == D3DERR_INVALIDCALL, "DrawIndexedPrimitive returned 0x%08x, expected D3DERR_INVALIDCALL (0x%08x)\n", + hr, D3DERR_INVALIDCALL); + + /* Valid index buffer and vertex declaration. Should succeed */ + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0 /* BaseVertexIndex */, 0 /* MinIndex */, + 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed (0x%08x)\n", hr); hr = IDirect3DDevice9_EndScene(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 034b04d..53d669e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5165,6 +5165,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, WI debug_d3dprimitivetype(PrimitiveType), StartVertex, PrimitiveCount); + if(!This->stateBlock->vertexDecl) { + WARN("(%p) : Called without a valid vertex declaration set\n", This); + return WINED3DERR_INVALIDCALL; + } + /* The index buffer is not needed here, but restore it, otherwise it is hell to keep track of */ if(This->stateBlock->streamIsUP) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); @@ -5202,6 +5207,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * return WINED3DERR_INVALIDCALL; } + if(!This->stateBlock->vertexDecl) { + WARN("(%p) : Called without a valid vertex declaration set\n", This); + return WINED3DERR_INVALIDCALL; + } + if(This->stateBlock->streamIsUP) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); This->stateBlock->streamIsUP = FALSE; @@ -5240,6 +5250,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, debug_d3dprimitivetype(PrimitiveType), PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride); + if(!This->stateBlock->vertexDecl) { + WARN("(%p) : Called without a valid vertex declaration set\n", This); + return WINED3DERR_INVALIDCALL; + } + /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ vb = This->stateBlock->streamSource[0]; This->stateBlock->streamSource[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; @@ -5280,6 +5295,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * MinVertexIndex, NumVertices, PrimitiveCount, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); + if(!This->stateBlock->vertexDecl) { + WARN("(%p) : Called without a valid vertex declaration set\n", This); + return WINED3DERR_INVALIDCALL; + } + if (IndexDataFormat == WINED3DFMT_INDEX16) { idxStride = 2; } else {

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetClipRectI.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: d9a4299bfc0d5fbc1f1cb6126f1546b49ad9118a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a4299bfc0d5fbc1f1cb6126… Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 8 14:44:41 2008 -0700 gdiplus: Add a stub for GdipSetClipRectI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 12 ++++++++++++ include/gdiplusenums.h | 11 +++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3b3ec41..e0e6336 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -510,7 +510,7 @@ @ stub GdipSetClipHrgn @ stub GdipSetClipPath @ stub GdipSetClipRect -@ stub GdipSetClipRectI +@ stdcall GdipSetClipRectI(ptr long long long long long) @ stub GdipSetClipRegion @ stdcall GdipSetCompositingMode(ptr long) @ stdcall GdipSetCompositingQuality(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 74c755b..92b0f76 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2088,3 +2088,15 @@ GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } + +GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y, + INT width, INT height, + CombineMode combineMode) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index c579ebe..b0d9884 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -270,6 +270,16 @@ enum ImageCodecFlags ImageCodecFlagsUser = 262144 }; +enum CombineMode +{ + CombineModeReplace, + CombineModeIntersect, + CombineModeUnion, + CombineModeXor, + CombineModeExclude, + CombineModeComplement +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -299,6 +309,7 @@ typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; typedef enum ImageCodecFlags ImageCodecFlags; +typedef enum CombineMode CombineMode; #endif /* end of c typedefs */

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 05faae7b5a867b58dd931a913cae1260edbb48aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=05faae7b5a867b58dd931a913… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 8 16:22:43 2008 -0500 Spelling fixes. --- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/tests/string.c | 4 ++-- dlls/msvcrt/undname.c | 4 ++-- dlls/mswsock/mswsock.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/msxml3/pi.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 2 +- dlls/netapi32/ds.c | 2 +- dlls/netapi32/nbnamecache.h | 2 +- dlls/netapi32/nbt.c | 2 +- dlls/netapi32/wksta.c | 2 +- dlls/ntdll/directory.c | 2 +- dlls/ntdll/path.c | 2 +- dlls/ntdll/reg.c | 4 ++-- dlls/ntdll/relay.c | 2 +- dlls/ntdll/serial.c | 2 +- dlls/ntdll/tests/atom.c | 2 +- dlls/ntdll/tests/env.c | 2 +- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/tests/rtl.c | 4 ++-- dlls/ntdll/tests/rtlstr.c | 2 +- dlls/ntdll/tests/string.c | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05faae7b5a867b58dd931…

1 0

Maarten Lankhorst : quartz: Make the directsound renderer handle the Play-> Pause->Play position without dropping data.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: f2dccab7e3a836eabcc27c3c25ef935e05fd5eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2dccab7e3a836eabcc27c3c2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 8 16:48:00 2008 -0700 quartz: Make the directsound renderer handle the Play->Pause->Play position without dropping data. --- dlls/quartz/dsoundrender.c | 51 ++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 290e02e..529f836 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -71,6 +71,7 @@ typedef struct DSoundRenderImpl DWORD last_play_pos; DWORD play_loops; + REFERENCE_TIME play_time; MediaSeekingImpl mediaSeeking; @@ -103,31 +104,20 @@ static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPo EnterCriticalSection(&This->csFilter); { DWORD state; + DWORD write_pos; hr = IDirectSoundBuffer_GetStatus(This->dsbuffer, &state); if (SUCCEEDED(hr) && !(state & DSBSTATUS_PLAYING) && This->state == State_Running) { - LPBYTE buf; - DWORD size; TRACE("Not playing, kickstarting the engine\n"); - This->write_pos = 0; - IDirectSoundBuffer_SetCurrentPosition(This->dsbuffer, 0); - - hr = IDirectSoundBuffer_Lock(This->dsbuffer, 0, 0, (void**)&buf, &size, NULL, NULL, DSBLOCK_ENTIREBUFFER); - if (hr != DS_OK) - ERR("Unable to lock sound buffer! (%x)\n", hr); - else - memset(buf, 0, size); - hr = IDirectSoundBuffer_Unlock(This->dsbuffer, buf, size, NULL, 0); hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); if (FAILED(hr)) ERR("Can't play sound buffer (%x)\n", hr); - hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &This->last_play_pos, &This->write_pos); - *pPlayPos = This->last_play_pos; } - else if (SUCCEEDED(hr)) - hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, pPlayPos, NULL); + + if (SUCCEEDED(hr)) + hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, pPlayPos, &write_pos); if (hr == S_OK) { DWORD play_pos = *pPlayPos; @@ -136,10 +126,13 @@ static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPo This->play_loops++; This->last_play_pos = play_pos; - /* If we're really falling behind, kick the play time back */ + /* If we really fell behind, start at the next possible position + * Also happens when just starting playback for the first time, + * or when flushing + */ if ((This->play_loops*This->buf_size)+play_pos >= (This->write_loops*This->buf_size)+This->write_pos) - This->play_loops--; + This->write_pos = write_pos; if (pRefTime) { @@ -172,7 +165,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d DWORD size2; DWORD play_pos,buf_free; - while (size && This->state == State_Running && !This->pInputPin->flushing) { + do { hr = DSoundRender_GetPos(This, &play_pos, NULL); if (hr != DS_OK) @@ -216,7 +209,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d This->write_pos -= This->buf_size; This->write_loops++; } - } + } while (size && This->state == State_Running); return hr; } @@ -778,6 +771,8 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) IMediaEventSink* pEventSink; HRESULT hr; + EnterCriticalSection(This->pin.pCritSec); + TRACE("(%p/%p)->()\n", This, iface); InputPin_EndOfStream(iface); @@ -797,6 +792,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); IMediaEventSink_Release(pEventSink); } + LeaveCriticalSection(This->pin.pCritSec); return hr; } @@ -806,13 +802,28 @@ static HRESULT WINAPI DSoundRender_InputPin_BeginFlush(IPin * iface) InputPin *This = (InputPin *)iface; DSoundRenderImpl *pFilter = (DSoundRenderImpl *)This->pin.pinInfo.pFilter; HRESULT hr; + LPBYTE buffer; + DWORD size; TRACE("\n"); - hr = InputPin_BeginFlush(iface); EnterCriticalSection(This->pin.pCritSec); + hr = InputPin_BeginFlush(iface); + if (pFilter->dsbuffer) + { IDirectSoundBuffer_Stop(pFilter->dsbuffer); + + /* Force a reset */ + IDirectSoundBuffer_SetCurrentPosition(pFilter->dsbuffer, 0); + pFilter->write_pos = pFilter->last_play_pos = 0; + ++pFilter->play_loops; + pFilter->write_loops = pFilter->play_loops; + + IDirectSoundBuffer_Lock(pFilter->dsbuffer, 0, 0, (LPVOID *)&buffer, &size, NULL, NULL, DSBLOCK_ENTIREBUFFER); + memset(buffer, 0, size); + IDirectSoundBuffer_Unlock(pFilter->dsbuffer, buffer, size, NULL, 0); + } LeaveCriticalSection(This->pin.pCritSec); return hr;

1 0

Maarten Lankhorst : quartz: Generate a seek table for the mpeg splitter.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 24cac935f05ef37405dc11b9d034efd4f7bde8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24cac935f05ef37405dc11b9d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 8 12:28:09 2008 -0700 quartz: Generate a seek table for the mpeg splitter. Speeds up seeking mp3's on large files. --- dlls/quartz/mpegsplit.c | 61 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index a9632c3..5991795 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -52,6 +52,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define MPEG_AUDIO_HEADER 1 #define MPEG_NO_HEADER 0 +#define SEEK_INTERVAL (ULONGLONG)(30 * 10000000) /* Add an entry every 30 seconds */ + +struct seek_entry { + ULONGLONG bytepos; + ULONGLONG timepos; +}; + typedef struct MPEGSplitterImpl { ParserImpl Parser; @@ -63,6 +70,8 @@ typedef struct MPEGSplitterImpl DWORD header_bytes; DWORD remaining_bytes; BOOL seek; + ULONG seek_entries; + struct seek_entry *seektable; } MPEGSplitterImpl; static int MPEGSplitter_head_check(const BYTE *header) @@ -649,11 +658,16 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) This->header_bytes = pos; This->skipbytes = 0; + This->seektable[0].bytepos = pos; + This->seektable[0].timepos = 0; + switch(streamtype) { case MPEG_AUDIO_HEADER: { LONGLONG duration = 0; + DWORD last_entry = 0; + DWORD ticks = GetTickCount(); hr = MPEGSplitter_init_audio(This, header, &piOutput, &amt); @@ -703,6 +717,25 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) break; } pos += length; + + if (This->seektable && (duration / SEEK_INTERVAL) > last_entry) + { + if (last_entry + 1 > duration / SEEK_INTERVAL) + { + ERR("Somehow skipped %d interval lengths instead of 1\n", (DWORD)(duration/SEEK_INTERVAL) - (last_entry + 1)); + } + ++last_entry; + + TRACE("Entry: %u\n", last_entry); + if (last_entry >= This->seek_entries) + { + This->seek_entries += 64; + This->seektable = CoTaskMemRealloc(This->seektable, (This->seek_entries)*sizeof(struct seek_entry)); + } + This->seektable[last_entry].bytepos = pos; + This->seektable[last_entry].timepos = duration; + } + TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(pos >> 32), (DWORD)pos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); } hr = S_OK; @@ -751,11 +784,6 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) HRESULT hr = S_OK; BYTE header[4]; - /* Position, in bytes */ - bytepos = This->header_bytes; - - /* Position, in media time, current and new */ - timepos = 0; newpos = This->Parser.mediaSeeking.llCurrent; if (newpos > This->duration) @@ -770,23 +798,28 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) return S_OK; } + /* Position, cached */ + bytepos = This->seektable[newpos / SEEK_INTERVAL].bytepos; + timepos = This->seektable[newpos / SEEK_INTERVAL].timepos; + hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); - while (bytepos < This->EndOfFile && SUCCEEDED(hr)) + while (timepos < newpos && bytepos + 3 < This->EndOfFile) { LONGLONG length = 0; hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); - while (parse_header(header, &length, &timepos)) + if (hr != S_OK) + break; + + while (parse_header(header, &length, &timepos) && bytepos + 3 < This->EndOfFile) { /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); hr = IAsyncReader_SyncRead(pPin->pReader, ++bytepos, 1, header + 3); - if (FAILED(hr)) + if (hr != S_OK) break; } bytepos += length; TRACE("Pos: %x%08x/%x%08x\n", (DWORD)(bytepos >> 32), (DWORD)bytepos, (DWORD)(This->EndOfFile>>32), (DWORD)This->EndOfFile); - if (timepos >= newpos) - break; } if (SUCCEEDED(hr)) @@ -836,6 +869,14 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); + This->seektable = CoTaskMemAlloc(sizeof(struct seek_entry) * 64); + if (!This->seektable) + { + CoTaskMemFree(This); + return E_OUTOFMEMORY; + } + This->seek_entries = 64; + hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) {

1 0

Maarten Lankhorst : quartz: Remove while { } while construct.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 55f3ba9dc0df257e3488968b15545418b08148b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f3ba9dc0df257e3488968b1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 8 12:24:33 2008 -0700 quartz: Remove while { } while construct. Thanks to Andrew Talbot for spotting this. --- dlls/quartz/control.c | 2 +- dlls/quartz/pin.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index af6de28..f6851bb 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -85,7 +85,7 @@ static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, S } IPin_Release( pin ); } - } while (hr == S_OK); + } if (foundend && allnotimpl) hr = E_NOTIMPL; else diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 7d54a51..96c4b82 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -120,7 +120,8 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi } IPin_Release( pin ); } - } while (hr == S_OK); + } + if (!foundend) hr = hr_return; else if (fnEnd) {

1 0

Alexandre Julliard : tools: Remove the obsolete bug_report. pl and genpatch scripts.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 619b9671d1fc7c8264bdcb3fe2c74a9fcb6d6ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619b9671d1fc7c8264bdcb3fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 11:55:58 2008 +0200 tools: Remove the obsolete bug_report.pl and genpatch scripts. --- tools/bug_report.pl | 597 --------------------------------------------------- tools/genpatch | 140 ------------ 2 files changed, 0 insertions(+), 737 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=619b9671d1fc7c8264bdc…

1 0

Alexandre Julliard : programs: Remove obsolete winelauncher script.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: d270a9603261d7d3693b375e3e6f7809501d821a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d270a9603261d7d3693b375e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 11:55:48 2008 +0200 programs: Remove obsolete winelauncher script. --- .gitignore | 1 - programs/Makefile.in | 5 +- programs/winelauncher.in | 498 ---------------------------------------------- 3 files changed, 1 insertions(+), 503 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d270a9603261d7d3693b3…

1 0

Stefan Dösinger : d3d9: Some Windows drivers set undefined attributes to 0.0.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 3e5899b38dee014756e55d9bb7c35257bae7611e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5899b38dee014756e55d9bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 14:36:53 2008 +0200 d3d9: Some Windows drivers set undefined attributes to 0.0. --- dlls/d3d9/tests/visual.c | 15 +++++++++------ dlls/wined3d/state.c | 8 ++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 969f79b..e8866c0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6078,11 +6078,13 @@ void test_vshader_input(IDirect3DDevice9 *device) ok(color == 0x00FFFF80 || color == 0x00FFFF7f || color == 0x00FFFF81, "Input test: Quad 1(2crd) returned color 0x%08x, expected 0x00FFFF80\n", color); - /* The last value of the read but undefined stream is used */ + /* The last value of the read but undefined stream is used, it is 0x00. The defined input is vec4(1, 0, 0, 0) */ color = getPixelColor(device, 480, 360); - ok(color == 0x00FFFF00, "Input test: Quad 2(1crd) returned color 0x%08x, expected 0x00FFFF00\n", color); + ok(color == 0x00FFFF00 || color ==0x00FF0000, + "Input test: Quad 2(1crd) returned color 0x%08x, expected 0x00FFFF00\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x00FF0080 || color == 0x00FF007f || color == 0x00FF0081, + /* Same as above, accept both the last used value and 0.0 for the undefined streams */ + ok(color == 0x00FF0080 || color == 0x00FF007f || color == 0x00FF0081 || color == 0x00FF0000, "Input test: Quad 3(2crd-wrongidx) returned color 0x%08x, expected 0x00FF0080\n", color); color = getPixelColor(device, 480, 160); @@ -6149,7 +6151,8 @@ void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); color = getPixelColor(device, 480, 350); - /* vs_1_1 may fail, accept the clear color + /* vs_1_1 may fail, accept the clear color. Some drivers also set the undefined streams to 0, accept that + * as well. * * NOTE: This test fails on the reference rasterizer. In the refrast, the 4 vertices have different colors, * i.e., the whole old stream is read, and not just the last used attribute. Some games require that this @@ -6158,8 +6161,8 @@ void test_vshader_input(IDirect3DDevice9 *device) * * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). */ - ok(color == 0x000000FF || color == 0x00808080, - "Input test: Quad 2(different colors) returned color 0x%08x, expected 0x000000FF\n", color); + ok(color == 0x000000FF || color == 0x00808080 || color == 0x00000000, + "Input test: Quad 2(different colors) returned color 0x%08x, expected 0x000000FF, 0x00808080 or 0x00000000\n", color); color = getPixelColor(device, 160, 120); IDirect3DDevice9_SetVertexShader(device, NULL); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7ec4051..55d37a7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3017,6 +3017,14 @@ static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock) { for (i = 0; i < maxAttribs; ++i) { GL_EXTCALL(glDisableVertexAttribArrayARB(i)); checkGLcall("glDisableVertexAttribArrayARB(reg)"); + /* Some Windows drivers(NV GF 7) use the latest value that was used when drawing with the now + * deactivated stream disabled, some other drivers(ATI, NV GF 8) set the undefined values to 0x00. + * Let's set them to 0x00 to avoid hitting some undefined aspects of OpenGL. All that is really + * important here is the glDisableVertexAttribArrayARB call above. The test shows that the refrast + * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2 Eposide 2 + */ + GL_EXTCALL(glVertexAttrib4NubARB(i, 0, 0, 0, 0)); + checkGLcall("glVertexAttrib4NubARB(i, 0, 0, 0, 0)"); } }

1 0

Stefan Dösinger : d3d9: Accept erros in the fvp->3. 0 pixel shader varying test.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 1c3e725d6363c34837f76d03e40d3cabd69110ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3e725d6363c34837f76d03e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 14:07:22 2008 +0200 d3d9: Accept erros in the fvp->3.0 pixel shader varying test. Some cards/drivers like ATI and the Geforce 8 driver return an error in this case, make the test accept that. This lifts some constraints we have to care for in WineD3D and removes one of the requirement for the packing shader. We still need the packing shader for vs_1_1 -> ps_3_0 mapping and for indirect pixel shader varying addressing though. --- dlls/d3d9/tests/visual.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 879e2c4..969f79b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5181,6 +5181,7 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { HRESULT hr; unsigned int i; DWORD color, r, g, b, r_e, g_e, b_e; + BOOL drawok; memcpy(data2, data, sizeof(data2)); data2[0].pos_x = 0; data2[0].pos_y = 0; @@ -5212,16 +5213,25 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + drawok = FALSE; if(SUCCEEDED(hr)) { hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, data, sizeof(data[0])); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "DrawPrimitiveUP failed (%08x)\n", hr); + drawok = SUCCEEDED(hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + /* Some drivers reject the combination of ps_3_0 and fixed function vertex processing. Accept + * the failure and do not check the color if it failed + */ + if(!drawok) { + continue; + } + color = getPixelColor(device, 360, 240); r = color & 0x00ff0000 >> 16; g = color & 0x0000ff00 >> 8;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008