November 2009 - Wine-commits

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

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, 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

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

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

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

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

Alexandre Julliard : setupx: Use the correct field index for string substitutions.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 50bc161eb2b06cf9f2fbe09c311848d6f347fe1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bc161eb2b06cf9f2fbe09c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 19:42:44 2009 +0100 setupx: Use the correct field index for string substitutions. --- dlls/setupx.dll16/infparse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupx.dll16/infparse.c b/dlls/setupx.dll16/infparse.c index d6cbed0..0fbc25d 100644 --- a/dlls/setupx.dll16/infparse.c +++ b/dlls/setupx.dll16/infparse.c @@ -115,7 +115,7 @@ static const char *get_string_subst( HINF hinf, const char *str, unsigned int *l buffer[*len] = 0; if (SetupFindFirstLineA( hinf, "Strings", buffer, &context ) && - SetupGetStringFieldA( &context, 0, subst, MAX_INF_STRING_LENGTH, NULL )) + SetupGetStringFieldA( &context, 1, subst, MAX_INF_STRING_LENGTH, NULL )) { *len = strlen( subst ); return subst;

1 0

Juan Lang : crypt32: Partially implement CryptBinaryToStringW.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 2d5ac92d9a6878785158301b90ace6a6d05ad1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5ac92d9a6878785158301b9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 29 15:13:29 2009 -0700 crypt32: Partially implement CryptBinaryToStringW. --- dlls/crypt32/base64.c | 194 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 195 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 17e05d9..d542db1 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -60,6 +60,8 @@ static const char b64[] = typedef BOOL (*BinaryToStringAFunc)(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString); +typedef BOOL (*BinaryToStringWFunc)(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString); static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString) @@ -280,6 +282,198 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); } +static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, + WCHAR* out_buf, DWORD *out_len) +{ + int div, i; + const BYTE *d = in_buf; + int bytes = (in_len*8 + 5)/6, pad_bytes = (bytes % 4) ? 4 - (bytes % 4) : 0; + DWORD needed; + LPWSTR ptr; + + TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); + needed = bytes + pad_bytes + 1; + needed += (needed / 64 + 1) * strlenW(sep); + + if (needed > *out_len) + { + *out_len = needed; + return ERROR_INSUFFICIENT_BUFFER; + } + else + *out_len = needed; + + /* Three bytes of input give 4 chars of output */ + div = in_len / 3; + + ptr = out_buf; + i = 0; + while (div > 0) + { + if (i && i % 64 == 0) + { + strcpyW(ptr, sep); + ptr += strlenW(sep); + } + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte and the first 4 + * bits of the second byte */ + *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + /* third char is the last 4 bits of the second byte and the first 2 + * bits of the third byte */ + *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; + /* fourth char is the remaining 6 bits of the third byte */ + *ptr++ = b64[ d[2] & 0x3f]; + i += 4; + d += 3; + div--; + } + + switch(pad_bytes) + { + case 1: + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte and the first 4 + * bits of the second byte */ + *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + /* third char is the last 4 bits of the second byte padded with + * two zeroes */ + *ptr++ = b64[ ((d[1] << 2) & 0x3c) ]; + /* fourth char is a = to indicate one byte of padding */ + *ptr++ = '='; + break; + case 2: + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte padded with + * four zeroes*/ + *ptr++ = b64[ ((d[0] << 4) & 0x30)]; + /* third char is = to indicate padding */ + *ptr++ = '='; + /* fourth char is = to indicate padding */ + *ptr++ = '='; + break; + } + strcpyW(ptr, sep); + + return ERROR_SUCCESS; +} + +static BOOL BinaryToBase64W(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) +{ + static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }; + BOOL ret = TRUE; + LPCWSTR header = NULL, trailer = NULL, sep = NULL; + DWORD charsNeeded; + + if (dwFlags & CRYPT_STRING_NOCR) + sep = lf; + else + sep = crlf; + switch (dwFlags & 0x7fffffff) + { + case CRYPT_STRING_BASE64: + /* no header or footer */ + break; + case CRYPT_STRING_BASE64HEADER: + header = CERT_HEADER_W; + trailer = CERT_TRAILER_W; + break; + case CRYPT_STRING_BASE64REQUESTHEADER: + header = CERT_REQUEST_HEADER_W; + trailer = CERT_REQUEST_TRAILER_W; + break; + case CRYPT_STRING_BASE64X509CRLHEADER: + header = X509_HEADER_W; + trailer = X509_TRAILER_W; + break; + } + + charsNeeded = 0; + encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded); + charsNeeded += strlenW(sep); + if (header) + charsNeeded += strlenW(header) + strlenW(sep); + if (trailer) + charsNeeded += strlenW(trailer) + strlenW(sep); + if (charsNeeded <= *pcchString) + { + LPWSTR ptr = pszString; + DWORD size = charsNeeded; + + if (header) + { + strcpyW(ptr, header); + ptr += strlenW(ptr); + strcpyW(ptr, sep); + ptr += strlenW(sep); + } + encodeBase64W(pbBinary, cbBinary, sep, ptr, &size); + ptr += size - 1; + if (trailer) + { + strcpyW(ptr, trailer); + ptr += strlenW(ptr); + strcpyW(ptr, sep); + ptr += strlenW(sep); + } + *pcchString = charsNeeded - 1; + } + else if (pszString) + { + *pcchString = charsNeeded; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else + *pcchString = charsNeeded; + return ret; +} + +BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) +{ + BinaryToStringWFunc encoder = NULL; + + TRACE("(%p, %d, %08x, %p, %p)\n", pbBinary, cbBinary, dwFlags, pszString, + pcchString); + + if (!pbBinary) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!pcchString) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (dwFlags & 0x7fffffff) + { + case CRYPT_STRING_BASE64: + case CRYPT_STRING_BASE64HEADER: + case CRYPT_STRING_BASE64REQUESTHEADER: + case CRYPT_STRING_BASE64X509CRLHEADER: + encoder = BinaryToBase64W; + break; + case CRYPT_STRING_BINARY: + case CRYPT_STRING_HEX: + case CRYPT_STRING_HEXASCII: + case CRYPT_STRING_HEXADDR: + case CRYPT_STRING_HEXASCIIADDR: + FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff); + /* fall through */ + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); +} + static inline BYTE decodeBase64Byte(int c) { BYTE ret; diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 534bee7..bcab030 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -98,7 +98,7 @@ @ stdcall CertVerifyValidityNesting(ptr ptr) @ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) -@ stub CryptBinaryToStringW # (ptr long long ptr ptr) +@ stdcall CryptBinaryToStringW(ptr long long ptr ptr) @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) @ stdcall CryptStringToBinaryW (wstr long long ptr ptr ptr ptr) @ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW

1 0

Juan Lang : crypt32: Add support for the CRYPT_STRING_NOCRLF flag to CryptBinaryToStringA/W.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: fc0aff0d2e326ba3e162a7fe91a47a7b87aebf62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0aff0d2e326ba3e162a7fe9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 29 15:43:37 2009 -0700 crypt32: Add support for the CRYPT_STRING_NOCRLF flag to CryptBinaryToStringA/W. --- dlls/crypt32/base64.c | 70 ++++++++++++++++++++++++++++++++----------------- include/wincrypt.h | 1 + 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index d542db1..4a6504a 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -99,7 +99,8 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; - needed += (needed / 64 + 1) * strlen(sep); + if (sep) + needed += (needed / 64 + 1) * strlen(sep); if (needed > *out_len) { @@ -116,7 +117,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, i = 0; while (div > 0) { - if (i && i % 64 == 0) + if (sep && i && i % 64 == 0) { strcpy(ptr, sep); ptr += strlen(sep); @@ -162,7 +163,8 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, *ptr++ = '='; break; } - strcpy(ptr, sep); + if (sep) + strcpy(ptr, sep); return ERROR_SUCCESS; } @@ -172,14 +174,16 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { static const char crlf[] = "\r\n", lf[] = "\n"; BOOL ret = TRUE; - LPCSTR header = NULL, trailer = NULL, sep = NULL; + LPCSTR header = NULL, trailer = NULL, sep; DWORD charsNeeded; if (dwFlags & CRYPT_STRING_NOCR) sep = lf; + else if (dwFlags & CRYPT_STRING_NOCRLF) + sep = NULL; else sep = crlf; - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BASE64: /* no header or footer */ @@ -200,7 +204,8 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, charsNeeded = 0; encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded); - charsNeeded += strlen(sep); + if (sep) + charsNeeded += strlen(sep); if (header) charsNeeded += strlen(header) + strlen(sep); if (trailer) @@ -214,8 +219,11 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { strcpy(ptr, header); ptr += strlen(ptr); - strcpy(ptr, sep); - ptr += strlen(sep); + if (sep) + { + strcpy(ptr, sep); + ptr += strlen(sep); + } } encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -223,8 +231,11 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { strcpy(ptr, trailer); ptr += strlen(ptr); - strcpy(ptr, sep); - ptr += strlen(sep); + if (sep) + { + strcpy(ptr, sep); + ptr += strlen(sep); + } } *pcchString = charsNeeded - 1; } @@ -258,7 +269,7 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, return FALSE; } - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BINARY: encoder = EncodeBinaryToBinaryA; @@ -273,7 +284,7 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: - FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff); + FIXME("Unimplemented type %d\n", dwFlags & 0x0fffffff); /* fall through */ default: SetLastError(ERROR_INVALID_PARAMETER); @@ -293,7 +304,8 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; - needed += (needed / 64 + 1) * strlenW(sep); + if (sep) + needed += (needed / 64 + 1) * strlenW(sep); if (needed > *out_len) { @@ -310,7 +322,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, i = 0; while (div > 0) { - if (i && i % 64 == 0) + if (sep && i && i % 64 == 0) { strcpyW(ptr, sep); ptr += strlenW(sep); @@ -356,7 +368,8 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, *ptr++ = '='; break; } - strcpyW(ptr, sep); + if (sep) + strcpyW(ptr, sep); return ERROR_SUCCESS; } @@ -366,14 +379,16 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }; BOOL ret = TRUE; - LPCWSTR header = NULL, trailer = NULL, sep = NULL; + LPCWSTR header = NULL, trailer = NULL, sep; DWORD charsNeeded; if (dwFlags & CRYPT_STRING_NOCR) sep = lf; + else if (dwFlags & CRYPT_STRING_NOCRLF) + sep = NULL; else sep = crlf; - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BASE64: /* no header or footer */ @@ -394,7 +409,8 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, charsNeeded = 0; encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded); - charsNeeded += strlenW(sep); + if (sep) + charsNeeded += strlenW(sep); if (header) charsNeeded += strlenW(header) + strlenW(sep); if (trailer) @@ -408,8 +424,11 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { strcpyW(ptr, header); ptr += strlenW(ptr); - strcpyW(ptr, sep); - ptr += strlenW(sep); + if (sep) + { + strcpyW(ptr, sep); + ptr += strlenW(sep); + } } encodeBase64W(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -417,8 +436,11 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { strcpyW(ptr, trailer); ptr += strlenW(ptr); - strcpyW(ptr, sep); - ptr += strlenW(sep); + if (sep) + { + strcpyW(ptr, sep); + ptr += strlenW(sep); + } } *pcchString = charsNeeded - 1; } @@ -452,7 +474,7 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, return FALSE; } - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BASE64: case CRYPT_STRING_BASE64HEADER: @@ -465,7 +487,7 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: - FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff); + FIXME("Unimplemented type %d\n", dwFlags & 0x0fffffff); /* fall through */ default: SetLastError(ERROR_INVALID_PARAMETER); diff --git a/include/wincrypt.h b/include/wincrypt.h index 56a0155..e9fbef0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2750,6 +2750,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CRYPT_STRING_BASE64X509CRLHEADER 0x00000009 #define CRYPT_STRING_HEXADDR 0x0000000a #define CRYPT_STRING_HEXASCIIADDR 0x0000000b +#define CRYPT_STRING_NOCRLF 0x40000000 #define CRYPT_STRING_NOCR 0x80000000 /* OIDs */

1 0