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

Francois Gouget : winecoreaudio: Protect pthread.h inclusion.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 21668ad76a75fcc7e41756b31d8b85960985cda4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21668ad76a75fcc7e41756b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 23 18:28:42 2006 +0200 winecoreaudio: Protect pthread.h inclusion. --- dlls/winmm/winecoreaudio/audio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 50ae0be..e7d2ce1 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -32,7 +32,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #include <fcntl.h> -#include <pthread.h> +#ifdef HAVE_PTHREAD_H +# include <pthread.h> +#endif #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : ddraw: Fix compilation with gcc 2.95.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 5629f74d0dd392d87389a196f491bc410359c8b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5629f74d0dd392d87389a19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 23 18:25:41 2006 +0200 ddraw: Fix compilation with gcc 2.95. --- dlls/ddraw/tests/refcount.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 466868e..bcdc535 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -81,9 +81,9 @@ static void test_ddraw(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 8; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; hr = IDirectDraw7_CreateSurface(DDraw, &ddsd, &surface, NULL); ok(hr == DD_OK, "CreateSurface failed with %08lx\n", hr);

1 0

Francois Gouget : crypt32: Fix compilation with gcc 2.95.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: e72b9f0e5509e602b92acfaa4d298af49b29875f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e72b9f0e5509e602b92acfa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 23 18:24:10 2006 +0200 crypt32: Fix compilation with gcc 2.95. --- dlls/crypt32/tests/encode.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d2ea0c3..3b6137f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2639,7 +2639,7 @@ static void test_encodeCRLIssuingDistPoi "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* empty name */ point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; - point.DistPointName.FullName.cAltEntry = 0; + U(point.DistPointName).FullName.cAltEntry = 0; ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -2651,9 +2651,9 @@ static void test_encodeCRLIssuingDistPoi } /* name with URL entry */ entry.dwAltNameChoice = CERT_ALT_NAME_URL; - entry.pwszURL = (LPWSTR)url; - point.DistPointName.FullName.cAltEntry = 1; - point.DistPointName.FullName.rgAltEntry = &entry; + U(entry).pwszURL = (LPWSTR)url; + U(point.DistPointName).FullName.cAltEntry = 1; + U(point.DistPointName).FullName.rgAltEntry = &entry; ret = CryptEncodeObjectEx(dwEncoding, X509_ISSUING_DIST_POINT, &point, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); @@ -2680,16 +2680,16 @@ static void compareAltNameEntry(const CE case CERT_ALT_NAME_EDI_PARTY_NAME: case CERT_ALT_NAME_URL: case CERT_ALT_NAME_REGISTERED_ID: - ok((!expected->pwszURL && !got->pwszURL) || - !lstrcmpW(expected->pwszURL, got->pwszURL), "Unexpected name\n"); + ok((!U(*expected).pwszURL && !U(*got).pwszURL) || + !lstrcmpW(U(*expected).pwszURL, U(*got).pwszURL), "Unexpected name\n"); break; case CERT_ALT_NAME_X400_ADDRESS: case CERT_ALT_NAME_DIRECTORY_NAME: case CERT_ALT_NAME_IP_ADDRESS: - ok(got->IPAddress.cbData == expected->IPAddress.cbData, - "Unexpected IP address length %ld\n", got->IPAddress.cbData); - ok(!memcmp(got->IPAddress.pbData, got->IPAddress.pbData, - got->IPAddress.cbData), "Unexpected value\n"); + ok(U(*got).IPAddress.cbData == U(*expected).IPAddress.cbData, + "Unexpected IP address length %ld\n", U(*got).IPAddress.cbData); + ok(!memcmp(U(*got).IPAddress.pbData, U(*got).IPAddress.pbData, + U(*got).IPAddress.cbData), "Unexpected value\n"); break; } } @@ -2712,7 +2712,7 @@ static void compareDistPointName(const C ok(got->dwDistPointNameChoice == expected->dwDistPointNameChoice, "Unexpected name choice %ld\n", got->dwDistPointNameChoice); if (got->dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) - compareAltNameInfo(&expected->FullName, &got->FullName); + compareAltNameInfo(&(U(*expected).FullName), &(U(*got).FullName)); } static void compareCRLIssuingDistPoints(const CRL_ISSUING_DIST_POINT *expected, @@ -2763,7 +2763,7 @@ static void test_decodeCRLIssuingDistPoi { point.fOnlyContainsCACerts = point.fOnlyContainsUserCerts = FALSE; point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; - point.DistPointName.FullName.cAltEntry = 0; + U(point.DistPointName).FullName.cAltEntry = 0; compareCRLIssuingDistPoints(&point, (PCRL_ISSUING_DIST_POINT)buf); LocalFree(buf); } @@ -2775,9 +2775,9 @@ static void test_decodeCRLIssuingDistPoi CERT_ALT_NAME_ENTRY entry; entry.dwAltNameChoice = CERT_ALT_NAME_URL; - entry.pwszURL = (LPWSTR)url; - point.DistPointName.FullName.cAltEntry = 1; - point.DistPointName.FullName.rgAltEntry = &entry; + U(entry).pwszURL = (LPWSTR)url; + U(point.DistPointName).FullName.cAltEntry = 1; + U(point.DistPointName).FullName.rgAltEntry = &entry; compareCRLIssuingDistPoints(&point, (PCRL_ISSUING_DIST_POINT)buf); LocalFree(buf); }

1 0

Stefan Dösinger : ddraw: Set the video memory and visible flag on render targets.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 36a8a8e6f30424c9176b0d811b57ddfefce0340e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36a8a8e6f30424c9176b0d8… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 24 23:39:24 2006 +0200 ddraw: Set the video memory and visible flag on render targets. --- dlls/ddraw/ddraw.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ca0258e..5db0e34 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1787,6 +1787,10 @@ IDirectDrawImpl_CreateNewSurface(IDirect DDSCAPS_3DDEVICE ) ) { Usage |= WINED3DUSAGE_RENDERTARGET; + + pDDSD->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY | + DDSCAPS_VISIBLE | + DDSCAPS_LOCALVIDMEM; } if(This->depthstencil) {

1 0

Stefan Dösinger : ddraw: Enumerate the reference d3ddevice.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 546a60ff2f26899d4bfcfead49afdb21987b4528 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=546a60ff2f26899d4bfcfea… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 24 16:17:10 2006 +0200 ddraw: Enumerate the reference d3ddevice. --- dlls/ddraw/ddraw.c | 4 ++++ dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/direct3d.c | 26 +++++++++++++++++++++++--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5fad1cd..ca0258e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -159,21 +159,25 @@ IDirectDrawImpl_QueryInterface(IDirectDr if ( IsEqualGUID( &IID_IDirect3D , refiid ) ) { + This->d3dversion = 1; *obj = ICOM_INTERFACE(This, IDirect3D); TRACE(" returning Direct3D interface at %p.\n", *obj); } else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) { + This->d3dversion = 2; *obj = ICOM_INTERFACE(This, IDirect3D2); TRACE(" returning Direct3D2 interface at %p.\n", *obj); } else if ( IsEqualGUID( &IID_IDirect3D3 , refiid ) ) { + This->d3dversion = 3; *obj = ICOM_INTERFACE(This, IDirect3D3); TRACE(" returning Direct3D3 interface at %p.\n", *obj); } else if(IsEqualGUID( &IID_IDirect3D7 , refiid )) { + This->d3dversion = 7; *obj = ICOM_INTERFACE(This, IDirect3D7); TRACE(" returning Direct3D7 interface at %p.\n", *obj); } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 905e42f..8994c29 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -119,13 +119,14 @@ struct IDirectDrawImpl IDirectDrawSurfaceImpl *d3d_target; HWND d3d_window; IDirect3DDeviceImpl *d3ddevice; + int d3dversion; /* Varios HWNDs */ HWND focuswindow; HWND devicewindow; /* The surface type to request */ - WINED3DSURFTYPE ImplType; + WINED3DSURFTYPE ImplType; /* The surface list - can't relay this to WineD3D * because of IParent diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 23efef9..e0b6dcb 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -276,7 +276,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * hr = IDirect3DImpl_GetCaps(This->wineD3D, &dref, &newDesc); if(hr != D3D_OK) return hr; - /* Do I have to enumerate the reference id? I try without. Note from old d3d7: + /* Do I have to enumerate the reference id? Note from old d3d7: * "It seems that enumerating the reference IID on Direct3D 1 games * (AvP / Motoracer2) breaks them". So do not enumerate this iid in V1 * @@ -284,14 +284,34 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * * which enables / disables enumerating the reference rasterizer. It's a DWORD, * 0 means disabled, 2 means enabled. The enablerefrast.reg and disablerefrast.reg * files in the DirectX 7.0 sdk demo directory suggest this. + * + * Some games(GTA 2) seem to use the secound enumerated device, so I have to enumerate + * at least 2 devices. So enumerate the reference device to have 2 devices. */ + if(This->d3dversion != 1) + { + TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This); + d1 = dref; + d2 = dref; + hr = Callback( (LPIID) &IID_IDirect3DRefDevice, "Reference Direct3D ID", device_name, &d1, &d2, Context); + if(hr != D3DENUMRET_OK) + { + TRACE("Application cancelled the enumeration\n"); + return D3D_OK; + } + } + TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This); d1 = dref; d2 = dref; - Callback( (LPIID) &IID_D3DDEVICE_WineD3D, "Wine D3DDevice using WineD3D and OpenGL", device_name, &d1, &d2, Context); + hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, "Wine D3DDevice using WineD3D and OpenGL", device_name, &d1, &d2, Context); + if(hr != D3DENUMRET_OK) + { + TRACE("Application cancelled the enumeration\n"); + return D3D_OK; + } TRACE("(%p) End of enumeration\n", This); - if(hr != D3DENUMRET_OK) return D3D_OK; return D3D_OK; }

1 0

Stefan Dösinger : wined3d: Fix single buffering.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: e18b89aca7c478603fde25278e35b7ba572ad104 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e18b89aca7c478603fde252… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 24 12:32:18 2006 +0200 wined3d: Fix single buffering. Tell gl to draw to the back buffer when a back buffer is used, do not use the value from gl. --- dlls/wined3d/surface.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 25a3e7a..da8f766 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -768,7 +768,6 @@ static HRESULT WINAPI IWineD3DSurfaceImp if (backbuf || iface == implSwapChain->frontBuffer || iface == myDevice->renderTarget) { GLint prev_store; - GLint prev_draw; GLint prev_depth_test; GLint prev_rasterpos[4]; @@ -792,8 +791,6 @@ static HRESULT WINAPI IWineD3DSurfaceImp glFlush(); vcheckGLcall("glFlush"); - glGetIntegerv(GL_DRAW_BUFFER, &prev_draw); - vcheckGLcall("glIntegerv"); glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); vcheckGLcall("glIntegerv"); glGetIntegerv(GL_CURRENT_RASTER_POSITION, &prev_rasterpos[0]); @@ -920,8 +917,10 @@ static HRESULT WINAPI IWineD3DSurfaceImp glPixelZoom(1.0,1.0); vcheckGLcall("glPixelZoom"); - glDrawBuffer(prev_draw); - vcheckGLcall("glDrawBuffer"); + if(implSwapChain->backBuffer && implSwapChain->backBuffer[0]) { + glDrawBuffer(GL_BACK); + vcheckGLcall("glDrawBuffer"); + } glRasterPos3iv(&prev_rasterpos[0]); vcheckGLcall("glRasterPos3iv"); if(prev_depth_test) glEnable(GL_DEPTH_TEST); @@ -2357,7 +2356,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOv /* This is easy to handle for the D3D Device... */ DWORD color; IWineD3DSwapChainImpl *implSwapChain; - GLint prev_draw; TRACE("Colorfill\n"); @@ -2396,10 +2394,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOv return WINED3DERR_INVALIDCALL; } - /* Are we drawing to the Front buffer or the back buffer? */ - glGetIntegerv(GL_DRAW_BUFFER, &prev_draw); - vcheckGLcall("glIntegerv"); - TRACE("Calling GetSwapChain with mydevice = %p\n", myDevice); IWineD3DDevice_GetSwapChain((IWineD3DDevice *)myDevice, 0, (IWineD3DSwapChain **)&implSwapChain); IWineD3DSwapChain_Release( (IWineD3DSwapChain *) implSwapChain ); @@ -2427,8 +2421,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOv 0 /* Stencil */); /* Restore the original draw buffer */ - glDrawBuffer(prev_draw); - vcheckGLcall("glDrawBuffer"); + if(implSwapChain->backBuffer && implSwapChain->backBuffer[0]) { + glDrawBuffer(GL_BACK); + vcheckGLcall("glDrawBuffer"); + } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Fix a bad trace.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 2a406428041e1dcb523230a94b48cf12880bca75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a406428041e1dcb523230a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 24 11:44:11 2006 +0200 wined3d: Fix a bad trace. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4206c66..e1e35f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1779,7 +1779,7 @@ #endif object->wantsDepthStencilBuffer = FALSE; } - TRACE("FrontBuf @ %p, BackBuf @ %p, DepthStencil %d\n",object->frontBuffer, object->backBuffer ? NULL : object->backBuffer[0], object->wantsDepthStencilBuffer); + TRACE("FrontBuf @ %p, BackBuf @ %p, DepthStencil %d\n",object->frontBuffer, object->backBuffer ? object->backBuffer[0] : NULL, object->wantsDepthStencilBuffer); /*********************

1 0

Stefan Dösinger : wined3d: Create vertex buffer objects for D3D vertex buffers.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 2122026713baa318093181607db79d7577f728e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2122026713baa3180931816… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 21 15:05:38 2006 +0200 wined3d: Create vertex buffer objects for D3D vertex buffers. --- dlls/wined3d/device.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 268 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2122026713baa318093…

1 0

Stefan Dösinger : wined3d: Vertex fixups.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 232dfc9b3a621bbda14000bacdf93a9f93aed6ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=232dfc9b3a621bbda14000b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 21 15:04:19 2006 +0200 wined3d: Vertex fixups. --- dlls/wined3d/vertexbuffer.c | 291 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 283 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=232dfc9b3a621bbda14…

1 0

Stefan Dösinger : wined3d: Add support for VBOs to the drawing code.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 7d31ab95e41cf4bd9b7d1f9a2a6d12402aeedb50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d31ab95e41cf4bd9b7d1f9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 21 15:01:38 2006 +0200 wined3d: Add support for VBOs to the drawing code. --- dlls/wined3d/device.c | 6 - dlls/wined3d/drawprim.c | 387 ++++++++++++++++++++++++++-------------- dlls/wined3d/vertexbuffer.c | 3 dlls/wined3d/wined3d_private.h | 34 +++- include/wine/wined3d_types.h | 1 5 files changed, 282 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7d31ab95e41cf4bd9b7…

1 0