March 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 6cc87406cfe423178622d8d7d19a918ededeaa84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6cc87406cfe423178622d8d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Mar 14 23:14:40 2006 +0100 wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h. --- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d9/indexbuffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/indexbuffer.c | 2 +- include/wine/wined3d_interface.h | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 7d18a44..2f06cf9 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, pDesc); + return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 1b17ebd..5e5def0 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -127,7 +127,7 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, pDesc); + return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eab7fbf..84b7d14 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5024,7 +5024,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Draw IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT idxStride = 2; IWineD3DIndexBuffer *pIB; - D3DINDEXBUFFER_DESC IdxBufDsc; + WINED3DINDEXBUFFER_DESC IdxBufDsc; pIB = This->stateBlock->pIndexData; This->stateBlock->streamIsUP = FALSE; diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 834b79a..ffa55ce 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -116,7 +116,7 @@ HRESULT WINAPI IWineD3DIndexBuff TRACE("(%p) : stub\n", This); return D3D_OK; } -HRESULT WINAPI IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, D3DINDEXBUFFER_DESC *pDesc) { +HRESULT WINAPI IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, WINED3DINDEXBUFFER_DESC *pDesc) { IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; TRACE("(%p)\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 7739225..f1ff945 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -684,7 +684,7 @@ DECLARE_INTERFACE_(IWineD3DIndexBuffer,I /*** IWineD3DIndexBuffer methods ***/ STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC * pDesc) PURE; + STDMETHOD(GetDesc)(THIS_ WINED3DINDEXBUFFER_DESC * pDesc) PURE; }; #undef INTERFACE diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 6b8a558..d5fe5f7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -610,6 +610,14 @@ typedef struct _WINED3DVERTEXBUFFER_DESC DWORD FVF; } WINED3DVERTEXBUFFER_DESC; +typedef struct _WINED3DINDEXBUFFER_DESC { + WINED3DFORMAT Format; + WINED3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Size; +} WINED3DINDEXBUFFER_DESC; + /* * The wined3dcaps structure */

1 0

András Kovács : avifil32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 64d5b80a02c54bbda7f6787737042c8e929e848b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64d5b80a02c54bbda7f6787… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 avifil32: Added Hungarian translation. --- dlls/avifil32/avifile_Hu.rc | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 dlls/avifil32/avifile_Hu.rc diff --git a/dlls/avifil32/avifile_Hu.rc b/dlls/avifil32/avifile_Hu.rc new file mode 100644 index 0000000..7fba293 --- /dev/null +++ b/dlls/avifil32/avifile_Hu.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2006 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "T�m�r�t�si be�ll�t�sok" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&V�lassuon folyamot:",-1,2,5,114,10 + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opci�k...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Be�kel minden",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL + LTEXT "k�pkock�t",-1,104,43,36,9 + LTEXT "Jelenlegi form�tum:",-1,3,56,53,9 + LTEXT "Ez hely k�lcs�nz�sre",IDC_FORMATTEXT,55,56,90,26 + DEFPUSHBUTTON "OK",IDOK,145,42,45,14 + PUSHBUTTON "M�gse",IDCANCEL,145,61,45,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Hull�mforma: %s" + IDS_WAVEFILETYPE "Hull�mforma" + IDS_ALLMULTIMEDIA "Minden multim�dia f�jl" + IDS_ALLFILES "Minden f�jl (*.*)(a)*.*" + IDS_VIDEO "video" + IDS_AUDIO "hang" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-alap�rtelmezett-f�jlkezel�" + IDS_UNCOMPRESSED "t�m�r�tetlen" +} diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index a420171..c29ee18 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -43,6 +43,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_En.rc" #include "avifile_Es.rc" #include "avifile_Fr.rc" +#include "avifile_Hu.rc" #include "avifile_It.rc" #include "avifile_Ja.rc" #include "avifile_Ko.rc"

1 0

Robert Reif : dsound: Add info to failed tests.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: c460d9becf818d85fd8f65786a3d1b18a155efef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c460d9becf818d85fd8f657… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Mar 14 19:17:43 2006 -0500 dsound: Add info to failed tests. Print format for failed SetFormat calls. --- dlls/dsound/tests/ds3d.c | 4 ++-- dlls/dsound/tests/ds3d8.c | 4 ++-- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index ce7be84..3d0c434 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -378,8 +378,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDI init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx2), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 6d440e2..c0c5d51 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -270,8 +270,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx2), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 672ffe2..7905c99 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -550,8 +550,8 @@ static HRESULT test_primary_secondary(LP formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b5dc483..7a58330 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -582,8 +582,8 @@ static HRESULT test_primary_secondary8(L formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard

1 0

Mike McCormack : comctl32: Fix some gcc 4.1 warnings.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: cba422261b8b4beec427093b4959f00555c20327 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cba422261b8b4beec427093… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 15 14:04:44 2006 +0900 comctl32: Fix some gcc 4.1 warnings. --- dlls/comctl32/tests/treeview.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 4cb1cbd..966dfef 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -94,36 +94,38 @@ static void FillRoot(void) static void DoTest1(void) { - TreeView_SelectItem(hTree, NULL); + BOOL r; + r = TreeView_SelectItem(hTree, NULL); Clear(); AddItem('1'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('2'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('3'); - TreeView_SelectItem(hTree, NULL); + r = TreeView_SelectItem(hTree, NULL); AddItem('4'); - TreeView_SelectItem(hTree, NULL); + r = TreeView_SelectItem(hTree, NULL); AddItem('5'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n"); } static void DoTest2(void) { - TreeView_SelectItem(hTree, NULL); + BOOL r; + r = TreeView_SelectItem(hTree, NULL); Clear(); AddItem('1'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('2'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('3'); - TreeView_SelectItem(hTree, hChild); + r = TreeView_SelectItem(hTree, hChild); AddItem('4'); - TreeView_SelectItem(hTree, hChild); + r = TreeView_SelectItem(hTree, hChild); AddItem('5'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); }

1 0

Aric Cyr : dplayx: Fix semaphore deadlock.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 75fc82c965611d8f71f93131008771f2252d18fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75fc82c965611d8f71f9313… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Sat Mar 4 03:43:04 2006 +0900 dplayx: Fix semaphore deadlock. - Make sure to release the dplayx semaphore in for error cases as well. - Prevent race condition between creation of the semaphore and grabbing of the lock by creating the semaphore in the locked state instead of unlocked. --- dlls/dplayx/dplayx_global.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 5255f71..723b7e5 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -229,7 +229,7 @@ BOOL DPLAYX_ConstructData(void) s_attrib.lpSecurityDescriptor = NULL; s_attrib.nLength = sizeof(s_attrib); - hDplayxSema = CreateSemaphoreA( &s_attrib, 1, 1, lpszDplayxSemaName ); + hDplayxSema = CreateSemaphoreA( &s_attrib, 0, 1, lpszDplayxSemaName ); /* First instance creates the semaphore. Others just use it */ if( GetLastError() == ERROR_SUCCESS ) @@ -242,6 +242,7 @@ BOOL DPLAYX_ConstructData(void) else if ( GetLastError() == ERROR_ALREADY_EXISTS ) { TRACE( "Found semaphore handle %p\n", hDplayxSema ); + DPLAYX_AquireSemaphore(); } else { @@ -251,8 +252,6 @@ BOOL DPLAYX_ConstructData(void) SetLastError( ERROR_SUCCESS ); - DPLAYX_AquireSemaphore(); - hDplayxSharedMem = CreateFileMappingA( INVALID_HANDLE_VALUE, &s_attrib, PAGE_READWRITE | SEC_COMMIT, @@ -271,6 +270,7 @@ BOOL DPLAYX_ConstructData(void) else { ERR( ": unable to create shared memory (%ld)\n", GetLastError() ); + DPLAYX_ReleaseSemaphore(); return FALSE; } @@ -282,6 +282,7 @@ BOOL DPLAYX_ConstructData(void) { ERR( ": unable to map static data into process memory space (%ld)\n", GetLastError() ); + DPLAYX_ReleaseSemaphore(); return FALSE; } else

1 0

James Hawkins : advpack: Forward OpenINFEngineA and TranslateInfStringA to their
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 8efe95e70a4e111df91cf12696e8e721b2bb0795 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8efe95e70a4e111df91cf12… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 8 23:29:40 2006 -0600 advpack: Forward OpenINFEngineA and TranslateInfStringA to their unicode counterparts. --- dlls/advpack/advpack.c | 167 ++++++++++++++++++++++++++++++++++++--------- dlls/advpack/advpack.spec | 4 + 2 files changed, 136 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8efe95e70a4e111df91…

1 0

Rein Klazes : x11drv: Avoid unaligned 32 bit reads, and reads beyond the input pixel
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 883e0b0edc21d16da5eb2f6bf02d5a18ac31ce38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=883e0b0edc21d16da5eb2f6… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Mar 1 16:39:42 2006 +0100 x11drv: Avoid unaligned 32 bit reads, and reads beyond the input pixel buffer in the convert_888_to_0888_* functions. --- dlls/x11drv/dib_convert.c | 102 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 78 insertions(+), 24 deletions(-) diff --git a/dlls/x11drv/dib_convert.c b/dlls/x11drv/dib_convert.c index b504843..347e1b3 100644 --- a/dlls/x11drv/dib_convert.c +++ b/dlls/x11drv/dib_convert.c @@ -821,18 +821,36 @@ static void convert_888_to_0888_asis(int const DWORD* srcpixel; DWORD* dstpixel; int x,y; - int oddwidth; - - oddwidth=width & 3; - width=width/4; + int w1, w2, w3; + + w1 = min( (INT_PTR)srcbits & 3, width); + w2 = ( width - w1) / 4; + w3 = ( width - w1) & 3; for (y=0; y<height; y++) { srcpixel=srcbits; dstpixel=dstbits; - for (x=0; x<width; x++) { + /* advance w1 pixels to make srcpixel 32 bit alignd */ + srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3); + srcpixel += w1; + dstpixel += w1; + /* and do the w1 pixels */ + x = w1; + if( x) { + dstpixel[ -1] = ( srcpixel[ -1] >> 8); /* h4, g4, l4 */ + if( --x) { + dstpixel[ -2] = ( srcpixel[ -2] >> 16) | /* g3, l3 */ + ((srcpixel[ -1] << 16) & 0x00ff0000); /* h3 */ + if( --x) { + dstpixel[ -3] = ( srcpixel[ -3] >> 24) | /* l2 */ + ((srcpixel[ -2] << 8) & 0x00ffff00); /* h2, g2 */ + } + } + } + for (x=0; x < w2; x++) { /* Do 4 pixels at a time: 3 dwords in and 4 dwords out */ DWORD srcval1,srcval2; srcval1=srcpixel[0]; - dstpixel[0]=( srcval1 & 0x00ffffff); /* h1, g1, l1 */ + dstpixel[0]=( srcval1 & 0x00ffffff); /* h1, g1, l1 */ srcval2=srcpixel[1]; dstpixel[1]=( srcval1 >> 24) | /* l2 */ ((srcval2 << 8) & 0x00ffff00); /* h2, g2 */ @@ -843,12 +861,18 @@ static void convert_888_to_0888_asis(int srcpixel+=3; dstpixel+=4; } - /* And now up to 3 odd pixels */ - for (x=0; x<oddwidth; x++) { - DWORD srcval; - srcval=*srcpixel; - srcpixel=(const DWORD*)(((const char*)srcpixel)+3); - *dstpixel++=( srcval & 0x00ffffff); /* h, g, l */ + /* do last w3 pixels */ + x = w3; + if( x) { + dstpixel[0]=( srcpixel[0] & 0x00ffffff); /* h1, g1, l1 */ + if( --x) { + dstpixel[1]=( srcpixel[0]>> 24) | /* l2 */ + ((srcpixel[1]<< 8) & 0x00ffff00); /* h2, g2 */ + if( --x) { + dstpixel[2]=( srcpixel[1]>> 16) | /* g3, l3 */ + ((srcpixel[2]<< 16) & 0x00ff0000); /* h3 */ + } + } } srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes; @@ -862,14 +886,36 @@ static void convert_888_to_0888_reverse( const DWORD* srcpixel; DWORD* dstpixel; int x,y; - int oddwidth; + int w1, w2, w3; - oddwidth=width & 3; - width=width/4; + w1 = min( (INT_PTR)srcbits & 3, width); + w2 = ( width - w1) / 4; + w3 = ( width - w1) & 3; for (y=0; y<height; y++) { srcpixel=srcbits; dstpixel=dstbits; - for (x=0; x<width; x++) { + /* advance w1 pixels to make srcpixel 32 bit alignd */ + srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3); + srcpixel += w1; + dstpixel += w1; + /* and do the w1 pixels */ + x = w1; + if( x) { + dstpixel[ -1]=((srcpixel[ -1] >> 24) & 0x0000ff) | /* h4 */ + ((srcpixel[ -1] >> 8) & 0x00ff00) | /* g4 */ + ((srcpixel[ -1] << 8) & 0xff0000); /* l4 */ + if( --x) { + dstpixel[ -2]=( srcpixel[ -2] & 0xff0000) | /* l3 */ + ((srcpixel[ -2] >> 16) & 0x00ff00) | /* g3 */ + ( srcpixel[ -1] & 0x0000ff); /* h3 */ + if( --x) { + dstpixel[ -3]=((srcpixel[ -3] >> 8) & 0xff0000) | /* l2 */ + ((srcpixel[ -2] << 8) & 0x00ff00) | /* g2 */ + ((srcpixel[ -2] >> 8) & 0x0000ff); /* h2 */ + } + } + } + for (x=0; x < w2; x++) { /* Do 4 pixels at a time: 3 dwords in and 4 dwords out */ DWORD srcval1,srcval2; @@ -891,14 +937,22 @@ static void convert_888_to_0888_reverse( srcpixel+=3; dstpixel+=4; } - /* And now up to 3 odd pixels */ - for (x=0; x<oddwidth; x++) { - DWORD srcval; - srcval=*srcpixel; - srcpixel=(const DWORD*)(((const char*)srcpixel)+3); - *dstpixel++=((srcval >> 16) & 0x0000ff) | /* h */ - ( srcval & 0x00ff00) | /* g */ - ((srcval << 16) & 0xff0000); /* l */ + /* do last w3 pixels */ + x = w3; + if( x) { + dstpixel[0]=((srcpixel[0] >> 16) & 0x0000ff) | /* h1 */ + ( srcpixel[0] & 0x00ff00) | /* g1 */ + ((srcpixel[0] << 16) & 0xff0000); /* l1 */ + if( --x) { + dstpixel[1]=((srcpixel[0] >> 8) & 0xff0000) | /* l2 */ + ((srcpixel[1] << 8) & 0x00ff00) | /* g2 */ + ((srcpixel[1] >> 8) & 0x0000ff); /* h2 */ + if( --x) { + dstpixel[2]=( srcpixel[1] & 0xff0000) | /* l3 */ + ((srcpixel[1] >> 16) & 0x00ff00) | /* g3 */ + ( srcpixel[2] & 0x0000ff); /* h3 */ + } + } } srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes;

1 0

Vitaliy Margolen : x11drv: Fix one case of "glXChooseFBConfig returns NULL" problem.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: c04cbbfeae627cc20b55972df12f5dcc437ab10e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c04cbbfeae627cc20b55972… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Mar 4 22:27:11 2006 -0700 x11drv: Fix one case of "glXChooseFBConfig returns NULL" problem. Using alpha bits > 8 makes this function fail, while it should not. --- dlls/x11drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index eb58da9..3fc0231 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -226,7 +226,8 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV ADD2(GLX_ALPHA_SIZE, 8); } else { ADD2(GLX_BUFFER_SIZE, ppfd->cColorBits); - TEST_AND_ADD2(ppfd->cAlphaBits, GLX_ALPHA_SIZE, ppfd->cAlphaBits); + /* Some broken apps try to ask for more than 8 bits of alpha */ + TEST_AND_ADD2(ppfd->cAlphaBits, GLX_ALPHA_SIZE, min(ppfd->cAlphaBits,8)); } } TEST_AND_ADD2(ppfd->cStencilBits, GLX_STENCIL_SIZE, ppfd->cStencilBits);

1 0

Alexandre Julliard : msvideo: Renamed the msvideo directory to msvfw32.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: ac3be957e4677895ab48ef46b81e45f2e10082eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac3be957e4677895ab48ef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 10:04:53 2006 +0100 msvideo: Renamed the msvideo directory to msvfw32. --- configure | 4 configure.ac | 2 dlls/.gitignore | 1 dlls/Makefile.in | 18 dlls/msvfw32/.gitignore | 3 dlls/msvfw32/Makefile.in | 24 + dlls/msvfw32/drawdib.c | 501 +++++++++++++ dlls/msvfw32/mciwnd.c | 1434 ++++++++++++++++++++++++++++++++++++ dlls/msvfw32/msvfw32.spec | 51 + dlls/msvfw32/msvfw32_De.rc | 52 + dlls/msvfw32/msvfw32_En.rc | 51 + dlls/msvfw32/msvfw32_Ko.rc | 52 + dlls/msvfw32/msvfw32_No.rc | 51 + dlls/msvfw32/msvfw32_Tr.rc | 53 + dlls/msvfw32/msvideo.spec | 68 ++ dlls/msvfw32/msvideo16.c | 916 +++++++++++++++++++++++ dlls/msvfw32/msvideo_main.c | 1593 ++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/msvideo_private.h | 73 ++ dlls/msvfw32/rsrc.rc | 27 + dlls/msvfw32/vfw16.h | 130 +++ dlls/msvideo/.gitignore | 3 dlls/msvideo/Makefile.in | 24 - dlls/msvideo/drawdib.c | 501 ------------- dlls/msvideo/mciwnd.c | 1434 ------------------------------------ dlls/msvideo/msvfw32.spec | 51 - dlls/msvideo/msvfw32_De.rc | 52 - dlls/msvideo/msvfw32_En.rc | 51 - dlls/msvideo/msvfw32_Ko.rc | 52 - dlls/msvideo/msvfw32_No.rc | 51 - dlls/msvideo/msvfw32_Tr.rc | 53 - dlls/msvideo/msvideo.spec | 68 -- dlls/msvideo/msvideo16.c | 916 ----------------------- dlls/msvideo/msvideo_main.c | 1593 ---------------------------------------- dlls/msvideo/msvideo_private.h | 73 -- dlls/msvideo/rsrc.rc | 27 - dlls/msvideo/vfw16.h | 130 --- 36 files changed, 5089 insertions(+), 5094 deletions(-) create mode 100644 dlls/msvfw32/.gitignore create mode 100644 dlls/msvfw32/Makefile.in create mode 100644 dlls/msvfw32/drawdib.c create mode 100644 dlls/msvfw32/mciwnd.c create mode 100644 dlls/msvfw32/msvfw32.spec create mode 100644 dlls/msvfw32/msvfw32_De.rc create mode 100644 dlls/msvfw32/msvfw32_En.rc create mode 100644 dlls/msvfw32/msvfw32_Ko.rc create mode 100644 dlls/msvfw32/msvfw32_No.rc create mode 100644 dlls/msvfw32/msvfw32_Tr.rc create mode 100644 dlls/msvfw32/msvideo.spec create mode 100644 dlls/msvfw32/msvideo16.c create mode 100644 dlls/msvfw32/msvideo_main.c create mode 100644 dlls/msvfw32/msvideo_private.h create mode 100644 dlls/msvfw32/rsrc.rc create mode 100644 dlls/msvfw32/vfw16.h delete mode 100644 dlls/msvideo/.gitignore delete mode 100644 dlls/msvideo/Makefile.in delete mode 100644 dlls/msvideo/drawdib.c delete mode 100644 dlls/msvideo/mciwnd.c delete mode 100644 dlls/msvideo/msvfw32.spec delete mode 100644 dlls/msvideo/msvfw32_De.rc delete mode 100644 dlls/msvideo/msvfw32_En.rc delete mode 100644 dlls/msvideo/msvfw32_Ko.rc delete mode 100644 dlls/msvideo/msvfw32_No.rc delete mode 100644 dlls/msvideo/msvfw32_Tr.rc delete mode 100644 dlls/msvideo/msvideo.spec delete mode 100644 dlls/msvideo/msvideo16.c delete mode 100644 dlls/msvideo/msvideo_main.c delete mode 100644 dlls/msvideo/msvideo_private.h delete mode 100644 dlls/msvideo/rsrc.rc delete mode 100644 dlls/msvideo/vfw16.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ac3be957e4677895ab4…

1 0

Alexandre Julliard : win32s: Renamed the win32s directory to w32skrnl.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 1a909d1929cb43d35340d2488549cd22c8182673 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a909d1929cb43d35340d24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 10:01:56 2006 +0100 win32s: Renamed the win32s directory to w32skrnl. --- configure | 4 + configure.ac | 2 - dlls/Makefile.in | 8 +-- dlls/w32skrnl/.gitignore | 1 dlls/w32skrnl/Makefile.in | 21 +++++++ dlls/w32skrnl/w32skernel.c | 59 +++++++++++++++++++ dlls/w32skrnl/w32skrnl.spec | 136 +++++++++++++++++++++++++++++++++++++++++++ dlls/w32skrnl/w32sys.c | 119 ++++++++++++++++++++++++++++++++++++++ dlls/w32skrnl/w32sys.spec | 12 ++++ dlls/w32skrnl/win32s16.c | 129 +++++++++++++++++++++++++++++++++++++++++ dlls/w32skrnl/win32s16.spec | 56 ++++++++++++++++++ dlls/win32s/.gitignore | 1 dlls/win32s/Makefile.in | 21 ------- dlls/win32s/w32skernel.c | 59 ------------------- dlls/win32s/w32skrnl.spec | 136 ------------------------------------------- dlls/win32s/w32sys.c | 119 -------------------------------------- dlls/win32s/w32sys.spec | 12 ---- dlls/win32s/win32s16.c | 129 ----------------------------------------- dlls/win32s/win32s16.spec | 56 ------------------ 19 files changed, 540 insertions(+), 540 deletions(-) create mode 100644 dlls/w32skrnl/.gitignore create mode 100644 dlls/w32skrnl/Makefile.in create mode 100644 dlls/w32skrnl/w32skernel.c create mode 100644 dlls/w32skrnl/w32skrnl.spec create mode 100644 dlls/w32skrnl/w32sys.c create mode 100644 dlls/w32skrnl/w32sys.spec create mode 100644 dlls/w32skrnl/win32s16.c create mode 100644 dlls/w32skrnl/win32s16.spec delete mode 100644 dlls/win32s/.gitignore delete mode 100644 dlls/win32s/Makefile.in delete mode 100644 dlls/win32s/w32skernel.c delete mode 100644 dlls/win32s/w32skrnl.spec delete mode 100644 dlls/win32s/w32sys.c delete mode 100644 dlls/win32s/w32sys.spec delete mode 100644 dlls/win32s/win32s16.c delete mode 100644 dlls/win32s/win32s16.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1a909d1929cb43d3534…

1 0