winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1085 discussions
Start a n
N
ew thread
Juan Lang : crypt32: Add and use a helper function for getting cert properties.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 90824039acf6ddf5e328524a4fca4c310945a976 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=90824039acf6ddf5e328524a4…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:21:10 2007 -0700 crypt32: Add and use a helper function for getting cert properties. --- dlls/crypt32/cert.c | 74 ++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 940778d..b630f3d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -167,6 +167,27 @@ static BOOL CertContext_GetHashProp(void *context, DWORD dwPropId, return ret; } +static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, + DWORD cb) +{ + BOOL ret = TRUE; + + if (!pvData) + *pcbData = cb; + else if (*pcbData < cb) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = cb; + ret = FALSE; + } + else + { + memcpy(pvData, pb, cb); + *pcbData = cb; + } + return ret; +} + static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -183,21 +204,7 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, else ret = FALSE; if (ret) - { - if (!pvData) - *pcbData = blob.cbData; - else if (*pcbData < blob.cbData) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = blob.cbData; - ret = FALSE; - } - else - { - memcpy(pvData, blob.pbData, blob.cbData); - *pcbData = blob.cbData; - } - } + ret = CertContext_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); else { /* Implicit properties */ @@ -283,25 +290,14 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = FALSE; break; case CERT_ACCESS_STATE_PROP_ID: - if (!pvData) - { - *pcbData = sizeof(DWORD); - ret = TRUE; - } - else if (*pcbData < sizeof(DWORD)) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = sizeof(DWORD); - ret = FALSE; - } + if (pCertContext->hCertStore) + ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, + pvData, pcbData); else { - if (pCertContext->hCertStore) - ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, - pvData, pcbData); - else - *(DWORD *)pvData = 0; - ret = TRUE; + DWORD state = 0; + + ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state)); } break; case CERT_KEY_IDENTIFIER_PROP_ID: @@ -318,18 +314,8 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = CertContext_GetProperty((void *)pCertContext, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); if (ret) - { - if (!pvData) - *pcbData = sizeof(HCRYPTPROV); - else if (*pcbData < sizeof(HCRYPTPROV)) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = sizeof(HCRYPTPROV); - ret = FALSE; - } - else - *(HCRYPTPROV *)pvData = keyContext.hCryptProv; - } + ret = CertContext_CopyParam(pvData, pcbData, &keyContext.hCryptProv, + sizeof(keyContext.hCryptProv)); break; } case CERT_KEY_PROV_INFO_PROP_ID:
1
0
0
0
Chris Robinson : winex11: Don' t use ConvertAttribWGLtoGLX for wglCreatePbufferARB.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: a2475921b14d9ef2a4a07dd5d73a33a8242f04be URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a2475921b14d9ef2a4a07dd5d…
Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 2 13:52:22 2007 -0700 winex11: Don't use ConvertAttribWGLtoGLX for wglCreatePbufferARB. --- dlls/winex11.drv/opengl.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b8dfac4..74fba01 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2055,16 +2055,19 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->height = iHeight; object->fmt = fmt; - nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); - if (-1 == nAttribs) { - WARN("Cannot convert WGL to GLX attributes\n"); - goto create_failed; - } PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); while (piAttribList && 0 != *piAttribList) { int attr_v; switch (*piAttribList) { + case WGL_PBUFFER_LARGEST_ARB: { + ++piAttribList; + attr_v = *piAttribList; + TRACE("WGL_LARGEST_PBUFFER_ARB = %d\n", attr_v); + PUSH2(attribs, GLX_LARGEST_PBUFFER, attr_v); + break; + } + case WGL_TEXTURE_FORMAT_ARB: { ++piAttribList; attr_v = *piAttribList;
1
0
0
0
Chris Robinson : winex11: Report accumulation buffer bits for pixel formats .
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: ccb9da5f8555c2c356cc1c551c573a9fbaacd8af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ccb9da5f8555c2c356cc1c551…
Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 2 12:20:56 2007 -0700 winex11: Report accumulation buffer bits for pixel formats. --- dlls/winex11.drv/opengl.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ed109e1..b8dfac4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1226,7 +1226,18 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->cAlphaBits = 0; ppfd->cAlphaShift = 0; } - /* Accums : to do ... */ + + /* Accum RGBA bits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_RED_SIZE, &rb); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_GREEN_SIZE, &gb); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_BLUE_SIZE, &bb); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_ALPHA_SIZE, &ab); + + ppfd->cAccumBits = rb+gb+bb+ab; + ppfd->cAccumRedBits = rb; + ppfd->cAccumGreenBits = gb; + ppfd->cAccumBlueBits = bb; + ppfd->cAccumAlphaBits = ab; /* Depth bits */ pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &value); @@ -2685,6 +2696,34 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF curGLXAttr = GLX_FLOAT_COMPONENTS_NV; break; + case WGL_ACCUM_RED_BITS_ARB: + curGLXAttr = GLX_ACCUM_RED_SIZE; + break; + case WGL_ACCUM_GREEN_BITS_ARB: + curGLXAttr = GLX_ACCUM_GREEN_SIZE; + break; + case WGL_ACCUM_BLUE_BITS_ARB: + curGLXAttr = GLX_ACCUM_BLUE_SIZE; + break; + case WGL_ACCUM_ALPHA_BITS_ARB: + curGLXAttr = GLX_ACCUM_ALPHA_SIZE; + break; + case WGL_ACCUM_BITS_ARB: + if (!fmt) goto pix_error; + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_RED_SIZE, &tmp); + if (hTest) goto get_error; + piValues[i] = tmp; + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_GREEN_SIZE, &tmp); + if (hTest) goto get_error; + piValues[i] += tmp; + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_BLUE_SIZE, &tmp); + if (hTest) goto get_error; + piValues[i] += tmp; + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_ALPHA_SIZE, &tmp); + if (hTest) goto get_error; + piValues[i] += tmp; + continue; + default: FIXME("unsupported %x WGL Attribute\n", curWGLAttr); }
1
0
0
0
Stefan Dösinger : d3d9: Check for volume texture support before running the volume test.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 17fe57e212599cd9cdeea3a8c650036b4ad7cec0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=17fe57e212599cd9cdeea3a8c…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 2 20:29:41 2007 +0200 d3d9: Check for volume texture support before running the volume test. --- dlls/d3d9/tests/volume.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index e1ad947..3f31084 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -122,7 +122,9 @@ START_TEST(volume) { HMODULE d3d9_handle; IDirect3DDevice9 *device_ptr; + D3DCAPS9 caps; + memset(&caps, 0, sizeof(caps)); d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { @@ -132,6 +134,12 @@ START_TEST(volume) device_ptr = init_d3d9(d3d9_handle); if (!device_ptr) return; + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + + if(!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { + skip("No volume texture support\n"); + return; + } test_volume_get_container(device_ptr); }
1
0
0
0
Stefan Dösinger : d3d9: Some visual test fixes.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 878414a5e6e4a987ce4f371d269a2021656b4724 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=878414a5e6e4a987ce4f371d2…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 21:07:59 2007 +0200 d3d9: Some visual test fixes. --- dlls/d3d9/tests/visual.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3ab45e1..1d92d22 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -429,6 +429,7 @@ static void fog_test(IDirect3DDevice9 *device) HRESULT hr; DWORD color; float start = 0.0f, end = 1.0f; + D3DCAPS9 caps; /* Gets full z based fog with linear fog, no fog with specular color */ struct sVertex unstransformed_1[] = { @@ -461,6 +462,9 @@ static void fog_test(IDirect3DDevice9 *device) }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps returned %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); @@ -538,8 +542,20 @@ static void fog_test(IDirect3DDevice9 *device) ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); - color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + if(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) + { + color = getPixelColor(device, 480, 360); + ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + } + else + { + /* Without fog table support the vertex fog is still applied, even though table fog is turned on. + * The settings above result in no fogging with vertex fog + */ + color = getPixelColor(device, 480, 120); + ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + trace("Info: Table fog not supported by this device\n"); + } /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); @@ -1222,7 +1238,12 @@ START_TEST(visual) lighting_test(device_ptr); clear_test(device_ptr); fog_test(device_ptr); - test_cube_wrap(device_ptr); + if(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + test_cube_wrap(device_ptr); + } else { + skip("No cube texture support\n"); + } present_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) @@ -1231,13 +1252,13 @@ START_TEST(visual) } else skip("No vs_2_0 support\n"); - if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1) && caps.PixelShaderVersion >= D3DVS_VERSION(1, 1)) + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1) && caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { fog_with_shader_test(device_ptr); } else skip("No vs_1_1 and ps_1_1 support\n"); - if (caps.PixelShaderVersion >= D3DVS_VERSION(1, 1)) + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { texbem_test(device_ptr); }
1
0
0
0
Stefan Dösinger : ddraw: SetDisplayMode may fail.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: df75a7e007857c1a1d92cfe21fdb973b40078096 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=df75a7e007857c1a1d92cfe21…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 20:44:05 2007 +0200 ddraw: SetDisplayMode may fail. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/visual.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b447403..dbab8db 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -614,7 +614,7 @@ IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, LeaveCriticalSection(&ddraw_cs); switch(hr) { - case WINED3DERR_NOTAVAILABLE: return DDERR_INVALIDMODE; + case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; default: return hr; }; } diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 930f3d5..4e7400e 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -61,8 +61,12 @@ static BOOL createObjects(void) hr = IDirectDraw7_SetDisplayMode(DirectDraw, 640, 480, 24, 0, 0); } - ok(hr == DD_OK, "IDirectDraw7_SetDisplayMode failed with %08x\n", hr); - if(FAILED(hr)) goto err; + ok(hr == DD_OK || hr == DDERR_UNSUPPORTED, "IDirectDraw7_SetDisplayMode failed with %08x\n", hr); + if(FAILED(hr)) { + /* use trace, the caller calls skip() */ + trace("SetDisplayMode failed\n"); + goto err; + } hr = IDirectDraw7_QueryInterface(DirectDraw, &IID_IDirect3D7, (void**) &Direct3D); if (hr == E_NOINTERFACE) goto err;
1
0
0
0
Stefan Dösinger : wined3d: Downgrade an ERR.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 8de07265a63c81338476cfc89ac78d8607039d06 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8de07265a63c81338476cfc89…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 2 20:37:54 2007 +0200 wined3d: Downgrade an ERR. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c5ad58e..7bd8c7f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1370,7 +1370,7 @@ static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock, } } else { if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { - ERR("Multisample antialiasing not supported by gl\n"); + WARN("Multisample antialiasing not supported by gl\n"); } } }
1
0
0
0
Stefan Dösinger : ddraw: Some drivers return DDERR_INVALIDPARAMS if DXTn surfaces aren't supported.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 1f4d71c0f68d4d7eac1e1caaf9a247b297b4b82e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f4d71c0f68d4d7eac1e1caaf…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 2 20:22:26 2007 +0200 ddraw: Some drivers return DDERR_INVALIDPARAMS if DXTn surfaces aren't supported. --- dlls/ddraw/tests/dsurface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e999aeb..b2cd033 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1787,7 +1787,8 @@ static void CompressedTest(void) U4(ddsd).ddpfPixelFormat.dwFourCC = MAKEFOURCC('D','X','T','1'); hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); - ok(hr == DD_OK || hr == DDERR_NOTEXTUREHW, "CreateSurface returned %08x\n", hr); + ok(hr == DD_OK || hr == DDERR_NOTEXTUREHW || hr == DDERR_INVALIDPARAMS, + "CreateSurface returned %08x\n", hr); /* Not supported everywhere */ if(SUCCEEDED(hr))
1
0
0
0
Juan Lang : crypt32: Implement decoding OID and directory name alt name entries.
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 44948c3b38859cf63a3115b81a7c234a2ca9cba8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=44948c3b38859cf63a3115b81…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:49:40 2007 -0700 crypt32: Implement decoding OID and directory name alt name entries. --- dlls/crypt32/decode.c | 23 +++++++++++++++++++++-- dlls/crypt32/tests/encode.c | 2 -- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index b54b841..495febd 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2143,13 +2143,22 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, case 6: /* uniformResourceIdentifier */ bytesNeeded += (dataLen + 1) * sizeof(WCHAR); break; + case 4: /* directoryName */ case 7: /* iPAddress */ bytesNeeded += dataLen; break; case 8: /* registeredID */ - /* FIXME: decode as OID */ + ret = CRYPT_AsnDecodeOidIgnoreTag(dwCertEncodingType, NULL, + pbEncoded, cbEncoded, 0, NULL, NULL, &dataLen); + if (ret) + { + /* FIXME: ugly, shouldn't need to know internals of OID decode + * function to use it. + */ + bytesNeeded += dataLen - sizeof(LPSTR); + } + break; case 0: /* otherName */ - case 4: /* directoryName */ FIXME("%d: stub\n", pbEncoded[0] & ASN_TYPE_MASK); SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; @@ -2196,6 +2205,11 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, debugstr_w(entry->u.pwszURL)); break; } + case 4: /* directoryName */ + entry->dwAltNameChoice = CERT_ALT_NAME_DIRECTORY_NAME; + /* The data are memory-equivalent with the IPAddress case, + * fall-through + */ case 7: /* iPAddress */ /* The next data pointer is in the pwszURL spot, that is, * the first 4 bytes. Need to move it to the next spot. @@ -2205,6 +2219,11 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, memcpy(entry->u.IPAddress.pbData, pbEncoded + 1 + lenBytes, dataLen); break; + case 8: /* registeredID */ + ret = CRYPT_AsnDecodeOidIgnoreTag(dwCertEncodingType, NULL, + pbEncoded, cbEncoded, 0, NULL, &entry->u.pszRegisteredID, + &dataLen); + break; } } } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 92dca63..75dd321 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1522,7 +1522,6 @@ static void test_decodeAltName(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedOidName, sizeof(encodedOidName), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -1540,7 +1539,6 @@ static void test_decodeAltName(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedDirectoryName, sizeof(encodedDirectoryName), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (buf) {
1
0
0
0
Juan Lang : crypt32: Introduce a OID decoding function that ignores the tag and use it where the caller already checks the tag .
by Alexandre Julliard
03 Aug '07
03 Aug '07
Module: wine Branch: master Commit: 005b50e913595892aa0f5832a9f552b67168bd52 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=005b50e913595892aa0f5832a…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:48:53 2007 -0700 crypt32: Introduce a OID decoding function that ignores the tag and use it where the caller already checks the tag. --- dlls/crypt32/decode.c | 169 +++++++++++++++++++++++++++---------------------- 1 files changed, 93 insertions(+), 76 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=005b50e913595892aa0f5…
1
0
0
0
← Newer
1
...
96
97
98
99
100
101
102
...
109
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
Results per page:
10
25
50
100
200