wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Stefan Dösinger : wined3d: Add a usage flag for vertex buffer optimization.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 63326b1925337406a6e74225e3bacce4c9fd909b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63326b1925337406a6e74225e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 20 14:09:25 2009 +0200 wined3d: Add a usage flag for vertex buffer optimization. --- dlls/d3d8/vertexbuffer.c | 3 ++- dlls/d3d9/vertexbuffer.c | 3 ++- dlls/wined3d/device.c | 5 ++--- include/wine/wined3d.idl | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index bf1900b..ae5307a 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -277,7 +277,8 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - usage & WINED3DUSAGE_MASK, 0, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, + (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_OPTIMIZE, 0, + (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d8_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 16b7d70..0ea630e 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -278,7 +278,8 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - usage & WINED3DUSAGE_MASK, 0, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, + (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_OPTIMIZE, 0, + (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d9_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f212a9d..59c18e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -485,7 +485,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; - int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion; HRESULT hr; BOOL conv; @@ -543,8 +542,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); } else if(Usage & WINED3DUSAGE_DYNAMIC) { TRACE("Not creating a vbo because the buffer has dynamic usage\n"); - } else if(dxVersion <= 7 && conv) { - TRACE("Not creating a vbo because dxVersion is 7 and the fvf needs conversion\n"); + } else if(!(Usage & WINED3DUSAGE_OPTIMIZE) && conv) { + TRACE("Not creating a vbo because the fvf needs conversion, but VB optimization is disabled\n"); } else { object->flags |= WINED3D_BUFFER_CREATEBO; } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 25a4870..65306a3 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -901,6 +901,7 @@ const UINT WINED3DUSAGE_DYNAMIC = 0x00000200; const UINT WINED3DUSAGE_AUTOGENMIPMAP = 0x00000400; const UINT WINED3DUSAGE_DMAP = 0x00004000; const UINT WINED3DUSAGE_MASK = 0x00004fff; +const UINT WINED3DUSAGE_OPTIMIZE = 0x40000000; const UINT WINED3DUSAGE_OVERLAY = 0x80000000; const UINT WINED3DUSAGE_QUERY_LEGACYBUMPMAP = 0x00008000;

1 0

Stefan Dösinger : wined3d: Add a parameter for SetRenderTarget viewport setup.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 90e443758aae46f80125fea61ee8e2d181415bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e443758aae46f80125fea61… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 20 14:13:26 2009 +0200 wined3d: Add a parameter for SetRenderTarget viewport setup. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 6 ++++-- dlls/ddraw/direct3d.c | 14 ++------------ dlls/wined3d/device.c | 6 +++--- include/wine/wined3d.idl | 3 ++- 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d0504ed..e6c1f5b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1005,7 +1005,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 ifa { hr = IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, pZSurface ? pZSurface->wineD3DSurface : NULL); if (SUCCEEDED(hr) && pSurface) - hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface); + hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface, TRUE); if (FAILED(hr)) IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, original_ds); } if (original_ds) IWineD3DSurface_Release(original_ds); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5aacbc8..bb63270 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1042,7 +1042,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9EX } wined3d_mutex_lock(); - hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? pSurface->wineD3DSurface : NULL); + hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? pSurface->wineD3DSurface : NULL, TRUE); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 1883a5d..68b149e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -348,7 +348,8 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) * vanish soon. */ IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, - This->ddraw->d3d_target->WineD3DSurface); + This->ddraw->d3d_target->WineD3DSurface, + FALSE); /* This->target is the offscreen target. * This->ddraw->d3d_target is the target used by DDraw */ @@ -1984,7 +1985,8 @@ IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface, hr = IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, - Target ? Target->WineD3DSurface : NULL); + Target ? Target->WineD3DSurface : NULL, + FALSE); if(hr != D3D_OK) { LeaveCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 42884e5..798518a 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -865,7 +865,6 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, if(!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && (This->d3d_target != target)) { - WINED3DVIEWPORT vp; TRACE("(%p) Using %p as front buffer, %p as back buffer\n", This, This->d3d_target, target); hr = IWineD3DDevice_SetFrontBackBuffers(This->wineD3DDevice, This->d3d_target->WineD3DSurface, @@ -875,17 +874,8 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, /* Render to the back buffer */ IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, - target->WineD3DSurface); - - vp.X = 0; - vp.Y = 0; - vp.Width = target->surface_desc.dwWidth; - vp.Height = target->surface_desc.dwHeight; - vp.MinZ = 0.0; - vp.MaxZ = 1.0; - IWineD3DDevice_SetViewport(This->wineD3DDevice, - &vp); - + target->WineD3DSurface, + TRUE); object->OffScreenTarget = TRUE; } else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a1b8944..f212a9d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6184,9 +6184,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED context_release(context); } -static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget, + BOOL set_viewport) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion; TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); @@ -6220,7 +6220,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, This->render_targets[RenderTargetIndex] = pRenderTarget; /* Render target 0 is special */ - if(RenderTargetIndex == 0 && dxVersion > 7) { + if(RenderTargetIndex == 0 && set_viewport) { /* Finally, reset the viewport and scissor rect as the MSDN states. * Tests show that stateblock recording is ignored, the change goes * directly into the primary stateblock. diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b690b39..25a4870 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3205,7 +3205,8 @@ interface IWineD3DDevice : IWineD3DBase ); HRESULT SetRenderTarget( [in] DWORD render_target_idx, - [in] IWineD3DSurface *render_target + [in] IWineD3DSurface *render_target, + [in] BOOL set_viewport ); HRESULT GetRenderTarget( [in] DWORD render_target_idx,

1 0

Gerald Pfeifer : winex11: Handle error situation earlier in X11DRV_GetDIBits().
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 1f2611607f33cd1172fed1189962553437b83292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2611607f33cd1172fed1189… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 1 01:11:09 2009 +0100 winex11: Handle error situation earlier in X11DRV_GetDIBits(). --- dlls/winex11.drv/dib.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 1fc8812..587c7c7 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4096,6 +4096,11 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); + if (bitmap_type == -1) + { + ERR("Invalid bitmap\n"); + return 0; + } if (physBitmap->pixmap_depth > 1) { @@ -4107,11 +4112,6 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start palette[1] = peWhite; } - if (bitmap_type == -1) - { - ERR("Invalid bitmap\n"); - return 0; - } descr.lines = tempHeight; core_header = (bitmap_type == 0); colorPtr = (LPBYTE) info + (WORD) info->bmiHeader.biSize;

1 0

Jerome Leclanche : msvcirt: Make sure a FIXME doesn't overflow.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: de1b44892d3e85ceffbb65fd71d43a801d8e0949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1b44892d3e85ceffbb65fd7… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Sat Oct 31 21:13:49 2009 +0200 msvcirt: Make sure a FIXME doesn't overflow. --- dlls/msvcirt/msvcirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a498662..924e84c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -68,7 +68,7 @@ void * __stdcall MSVCIRT_operator_sl_int(class_ostream * _this, int integer) DEFINE_THISCALL_WRAPPER(MSVCIRT_operator_sl_pchar,8) void * __stdcall MSVCIRT_operator_sl_pchar(class_ostream * _this, const char * string) { - FIXME("(%p)->(%s) stub\n", _this, string); + FIXME("(%p)->(%s) stub\n", _this, debugstr_a(string)); return _this; }

1 0

Eric Pouech : winedump, dbghelp: In .pdb files (>= VC2005), handle the case where the codeview_linetab2_file structure is not the first one .
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 64144519a0cf3be1ea9203274a1ee95dfcdcb281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64144519a0cf3be1ea9203274… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 31 14:57:40 2009 +0100 winedump, dbghelp: In .pdb files (>= VC2005), handle the case where the codeview_linetab2_file structure is not the first one. --- dlls/dbghelp/msc.c | 82 +++++++++++++++++++++++++++++++----------------- include/wine/mscvpdb.h | 47 +++++++++++++++++++-------- tools/winedump/msc.c | 74 +++++++++++++++++++++++++++++-------------- 3 files changed, 136 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64144519a0cf3be1ea920…

1 0

Eric Pouech : winedump: Correctly handle the constant fields.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: ad440940945901885d831d1e309edc9401da2e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad440940945901885d831d1e3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 31 14:56:37 2009 +0100 winedump: Correctly handle the constant fields. --- tools/winedump/msc.c | 85 +++++++++++++++++++++++++++++++------------------ 1 files changed, 54 insertions(+), 31 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index ff4c71d..b029852 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -57,20 +57,25 @@ static const char* p_string(const struct p_string* s) return tmp; } -union full_value +struct full_value { - int i; - long long unsigned llu; + enum {fv_integer, fv_longlong} type; + union + { + int i; + long long unsigned llu; + } v; }; -static int full_numeric_leaf(union full_value* fv, const unsigned short int* leaf) +static int full_numeric_leaf(struct full_value* fv, const unsigned short int* leaf) { unsigned short int type = *leaf++; int length = 2; + fv->type = fv_integer; if (type < LF_NUMERIC) { - fv->i = type; + fv->v.i = type; } else { @@ -78,114 +83,132 @@ static int full_numeric_leaf(union full_value* fv, const unsigned short int* lea { case LF_CHAR: length += 1; - fv->i = *(const char*)leaf; + fv->v.i = *(const char*)leaf; break; case LF_SHORT: length += 2; - fv->i = *(const short*)leaf; + fv->v.i = *(const short*)leaf; break; case LF_USHORT: length += 2; - fv->i = *(const unsigned short*)leaf; + fv->v.i = *(const unsigned short*)leaf; break; case LF_LONG: length += 4; - fv->i = *(const int*)leaf; + fv->v.i = *(const int*)leaf; break; case LF_ULONG: length += 4; - fv->i = *(const unsigned int*)leaf; + fv->v.i = *(const unsigned int*)leaf; break; case LF_QUADWORD: length += 8; - fv->llu = *(const long long int*)leaf; + fv->type = fv_longlong; + fv->v.llu = *(const long long int*)leaf; break; case LF_UQUADWORD: length += 8; - fv->llu = *(const long long unsigned int*)leaf; + fv->type = fv_longlong; + fv->v.llu = *(const long long unsigned int*)leaf; break; case LF_REAL32: length += 4; printf(">>> unsupported leaf value %04x\n", type); - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ break; case LF_REAL48: length += 6; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_REAL64: length += 8; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_REAL80: length += 10; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_REAL128: length += 16; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX32: length += 4; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX64: length += 8; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX80: length += 10; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX128: length += 16; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; case LF_VARSTRING: length += 2 + *leaf; - fv->i = 0; /* FIXME */ + fv->v.i = 0; /* FIXME */ printf(">>> unsupported leaf value %04x\n", type); break; default: printf(">>> Unsupported numeric leaf-id %04x\n", type); - fv->i = 0; + fv->v.i = 0; break; } } return length; } +static const char* full_value_string(const struct full_value* fv) +{ + static char tmp[128]; + + switch (fv->type) + { + case fv_integer: sprintf(tmp, "0x%x", fv->v.i); break; + case fv_longlong: sprintf(tmp, "0x%x%08x", (unsigned)(fv->v.llu >> 32), (unsigned)fv->v.llu); break; + } + return tmp; +} + static int numeric_leaf(int* value, const unsigned short int* leaf) { - union full_value fv; + struct full_value fv; int len = len = full_numeric_leaf(&fv, leaf); - *value = fv.i; + switch (fv.type) + { + case fv_integer: *value = fv.v.i; break; + case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break; + } return len; } @@ -1194,24 +1217,24 @@ int codeview_dump_symbols(const void* root, unsigned long size) case S_CONSTANT_V2: { int vlen; - union full_value fv; + struct full_value fv; vlen = full_numeric_leaf(&fv, &sym->constant_v2.cvalue); - printf("\tS-Constant V2 '%s' = 0x%x%08x type:%x\n", + printf("\tS-Constant V2 '%s' = %s type:%x\n", p_string(PSTRING(&sym->constant_v2.cvalue, vlen)), - (unsigned)(fv.llu >> 32), (unsigned)fv.llu, sym->constant_v2.type); + full_value_string(&fv), sym->constant_v2.type); } break; case S_CONSTANT_V3: { int vlen; - union full_value fv; + struct full_value fv; vlen = full_numeric_leaf(&fv, &sym->constant_v3.cvalue); - printf("\tS-Constant V3 '%s' = 0x%x%08x type:%x\n", + printf("\tS-Constant V3 '%s' = %s type:%x\n", (const char*)&sym->constant_v3.cvalue + vlen, - (unsigned)(fv.llu >> 32), (unsigned)fv.llu, sym->constant_v3.type); + full_value_string(&fv), sym->constant_v3.type); } break;

1 0

Eric Pouech : winedump: Ensure all PDB fields are printed.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: a1021a12089202e27ffb7b5e0a213cca12cbe09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1021a12089202e27ffb7b5e0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 31 14:56:29 2009 +0100 winedump: Ensure all PDB fields are printed. --- tools/winedump/pdb.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 24ca4e4..5098d85 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -189,7 +189,12 @@ static void pdb_dump_symbols(struct pdb_reader* reader) "\toffset_size: %08x\n" "\thash_size: %08x\n" "\tsrc_module_size %08x\n" - "\tpdbimport_size %08x\n", + "\tpdbimport_size %08x\n" + "\tresvd[0] %08x\n" + "\tresvd[1] %08x\n" + "\tresvd[2] %08x\n" + "\tresvd[3] %08x\n" + "\tresvd[4] %08x\n", symbols->signature, symbols->version, symbols->unknown, @@ -201,7 +206,12 @@ static void pdb_dump_symbols(struct pdb_reader* reader) symbols->offset_size, symbols->hash_size, symbols->srcmodule_size, - symbols->pdbimport_size); + symbols->pdbimport_size, + symbols->resvd[0], + symbols->resvd[1], + symbols->resvd[2], + symbols->resvd[3], + symbols->resvd[4]); if (symbols->offset_size) {

1 0

Juan Lang : crypt32: Allow errors in locally installed root certs.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 16036dd27a746b1b42d1a905107c140ed4d8e242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16036dd27a746b1b42d1a9051… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 30 14:09:57 2009 -0700 crypt32: Allow errors in locally installed root certs. --- dlls/crypt32/rootstore.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index bd6dfac..a4a75ab 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -261,9 +261,23 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to) "chain creation failed"); else { - /* The only allowed error is CERT_TRUST_IS_UNTRUSTED_ROOT */ - if (chain->TrustStatus.dwErrorStatus & - ~CERT_TRUST_IS_UNTRUSTED_ROOT) + DWORD allowedErrors = CERT_TRUST_IS_UNTRUSTED_ROOT | + CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_INVALID_BASIC_CONSTRAINTS | + CERT_TRUST_IS_NOT_TIME_VALID; + + /* The certificate chain verification only allows certain + * invalid CA certs if they're installed locally: CA + * certs missing the key usage extension, and CA certs + * missing the basic constraints extension. Of course + * there's a chicken and egg problem: we have to accept + * them here in order for them to be accepted later. + * Expired, locally installed certs are also allowed here, + * because we don't know (yet) what date will be checked + * for an item signed by one of these certs. + * Thus, accept certs with any of the allowed errors. + */ + if (chain->TrustStatus.dwErrorStatus & ~allowedErrors) TRACE("rejecting %s: %s\n", get_cert_common_name(cert), trust_status_to_str(chain->TrustStatus.dwErrorStatus & ~CERT_TRUST_IS_UNTRUSTED_ROOT));

1 0

Juan Lang : crypt32: Trace contents of CERT_CHAIN_PARA.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: d6795bd908089616bddbf50ad7043139d4992de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6795bd908089616bddbf50ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 30 12:46:38 2009 -0700 crypt32: Trace contents of CERT_CHAIN_PARA. --- dlls/crypt32/chain.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c583812..c4ecfa4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2009,6 +2009,31 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, } } +static void dump_usage_match(LPCSTR name, const CERT_USAGE_MATCH *usageMatch) +{ + DWORD i; + + TRACE_(chain)("%s: %s\n", name, + usageMatch->dwType == USAGE_MATCH_TYPE_AND ? "AND" : "OR"); + for (i = 0; i < usageMatch->Usage.cUsageIdentifier; i++) + TRACE_(chain)("%s\n", usageMatch->Usage.rgpszUsageIdentifier[i]); +} + +static void dump_chain_para(const CERT_CHAIN_PARA *pChainPara) +{ + TRACE_(chain)("%d\n", pChainPara->cbSize); + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS)) + dump_usage_match("RequestedUsage", &pChainPara->RequestedUsage); + if (pChainPara->cbSize >= sizeof(CERT_CHAIN_PARA)) + { + dump_usage_match("RequestedIssuancePolicy", + &pChainPara->RequestedIssuancePolicy); + TRACE_(chain)("%d\n", pChainPara->dwUrlRetrievalTimeout); + TRACE_(chain)("%d\n", pChainPara->fCheckRevocationFreshnessTime); + TRACE_(chain)("%d\n", pChainPara->dwRevocationFreshnessTime); + } +} + BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, @@ -2035,6 +2060,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, if (!hChainEngine) hChainEngine = CRYPT_GetDefaultChainEngine(); + if (TRACE_ON(chain)) + dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ ret = CRYPT_BuildCandidateChainFromCert(hChainEngine, pCertContext, pTime, hAdditionalStore, &chain);

1 0

Austin English : wininet: Add stubs for FreeUrlCacheSpace.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 2387532c3fc04742fef68fc0330aa1b10f0831ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2387532c3fc04742fef68fc03… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 30 14:34:41 2009 -0500 wininet: Add stubs for FreeUrlCacheSpace. --- dlls/wininet/urlcache.c | 22 ++++++++++++++++++++++ dlls/wininet/wininet.spec | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 37d7b25..29d26ab 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1449,6 +1449,28 @@ static BOOL URLCache_EnumHashTableEntries(LPCURLCACHE_HEADER pHeader, const HASH } /*********************************************************************** + * FreeUrlCacheSpaceA (WININET.@) + * + */ +BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) +{ + FIXME("stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + /*********************************************************************** + * FreeUrlCacheSpaceW (WININET.@) + * + */ +BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) +{ + FIXME("stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetUrlCacheEntryInfoExA (WININET.@) * */ diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index d5995eb..46dd043 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -50,8 +50,8 @@ @ stdcall FindNextUrlCacheGroup(long ptr ptr) @ stub ForceNexusLookup @ stub ForceNexusLookupExW -@ stub FreeUrlCacheSpaceA -@ stub FreeUrlCacheSpaceW +@ stdcall FreeUrlCacheSpaceA(str long long) +@ stdcall FreeUrlCacheSpaceW(wstr long long) @ stdcall FtpCommandA(long long long str ptr ptr) @ stdcall FtpCommandW(long long long wstr ptr ptr) @ stdcall FtpCreateDirectoryA(ptr str)

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 November 2009