April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add depth fills to the blitter interface.
by Alexandre Julliard April 6, 2011

April 6, 2011

Module: wine Branch: master Commit: 519a3a9162b8485fdce22bb340abfcf92d86a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519a3a9162b8485fdce22bb34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 19:01:31 2011 +0200 wined3d: Add depth fills to the blitter interface. --- dlls/wined3d/arb_program_shader.c | 11 +++- dlls/wined3d/surface.c | 121 ++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 90 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1848287..77f04d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7253,11 +7253,20 @@ static HRESULT arbfp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurface return WINED3DERR_INVALIDCALL; } +/* Do not call while under the GL lock. */ +static HRESULT arbfp_blit_depth_fill(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) +{ + FIXME("Depth filling not implemented by arbfp_blit.\n"); + return WINED3DERR_INVALIDCALL; +} + const struct blit_shader arbfp_blit = { arbfp_blit_alloc, arbfp_blit_free, arbfp_blit_set, arbfp_blit_unset, arbfp_blit_supported, - arbfp_blit_color_fill + arbfp_blit_color_fill, + arbfp_blit_depth_fill, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58cd197..3086e26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3897,10 +3897,19 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, /* Do not call while under the GL lock. */ static HRESULT wined3d_surface_depth_fill(IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) { - const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; + const struct wined3d_resource *resource = &surface->resource; + IWineD3DDeviceImpl *device = resource->device; + const struct blit_shader *blitter; + + blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_FILL, + NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); + if (!blitter) + { + FIXME("No blitter is capable of performing the requested depth fill operation.\n"); + return WINED3DERR_INVALIDCALL; + } - return device_clear_render_targets(surface->resource.device, 0, NULL, surface, - !!rect, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + return blitter->depth_fill(device, surface, rect, depth); } /* Do not call while under the GL lock. */ @@ -3929,13 +3938,16 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT if (flags & WINEDDBLT_DEPTHFILL) { float depth; + RECT rect; TRACE("Depth fill.\n"); + surface_get_rect(This, DestRect, &rect); + if (!surface_convert_depth_to_float(This, DDBltFx->u5.dwFillDepth, &depth)) return WINED3DERR_INVALIDCALL; - if (SUCCEEDED(wined3d_surface_depth_fill(This, DestRect, depth))) + if (SUCCEEDED(wined3d_surface_depth_fill(This, &rect, depth))) return WINED3D_OK; } else @@ -4862,51 +4874,54 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined { enum complex_fixup src_fixup; - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) + switch (blit_op) { - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) - { - TRACE("Color fill not supported\n"); - return FALSE; - } + case WINED3D_BLIT_OP_COLOR_BLIT: + src_fixup = get_complex_fixup(src_format->color_fixup); + if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) + { + TRACE("Checking support for fixup:\n"); + dump_color_fixup_desc(src_format->color_fixup); + } - return TRUE; - } + if (!is_identity_fixup(dst_format->color_fixup)) + { + TRACE("Destination fixups are not supported\n"); + return FALSE; + } - src_fixup = get_complex_fixup(src_format->color_fixup); - if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(src_format->color_fixup); - } + if (src_fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) + { + TRACE("P8 fixup supported\n"); + return TRUE; + } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT) - { - TRACE("Unsupported blit_op=%d\n", blit_op); - return FALSE; - } + /* We only support identity conversions. */ + if (is_identity_fixup(src_format->color_fixup)) + { + TRACE("[OK]\n"); + return TRUE; + } - if (!is_identity_fixup(dst_format->color_fixup)) - { - TRACE("Destination fixups are not supported\n"); - return FALSE; - } + TRACE("[FAILED]\n"); + return FALSE; - if (src_fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) - { - TRACE("P8 fixup supported\n"); - return TRUE; - } + case WINED3D_BLIT_OP_COLOR_FILL: + if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + { + TRACE("Color fill not supported\n"); + return FALSE; + } - /* We only support identity conversions. */ - if (is_identity_fixup(src_format->color_fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } + return TRUE; - TRACE("[FAILED]\n"); - return FALSE; + case WINED3D_BLIT_OP_DEPTH_FILL: + return TRUE; + + default: + TRACE("Unsupported blit_op=%d\n", blit_op); + return FALSE; + } } /* Do not call while under the GL lock. */ @@ -4919,13 +4934,24 @@ static HRESULT ffp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceIm 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); } +/* Do not call while under the GL lock. */ +static HRESULT ffp_blit_depth_fill(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) +{ + const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; + + return device_clear_render_targets(device, 0, NULL, surface, + 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); +} + const struct blit_shader ffp_blit = { ffp_blit_alloc, ffp_blit_free, ffp_blit_set, ffp_blit_unset, ffp_blit_supported, - ffp_blit_color_fill + ffp_blit_color_fill, + ffp_blit_depth_fill, }; static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device) @@ -4974,13 +5000,22 @@ static HRESULT cpu_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceIm NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); } +/* Do not call while under the GL lock. */ +static HRESULT cpu_blit_depth_fill(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) +{ + FIXME("Depth filling not implemented by cpu_blit.\n"); + return WINED3DERR_INVALIDCALL; +} + const struct blit_shader cpu_blit = { cpu_blit_alloc, cpu_blit_free, cpu_blit_set, cpu_blit_unset, cpu_blit_supported, - cpu_blit_color_fill + cpu_blit_color_fill, + cpu_blit_depth_fill, }; static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eb015eb..190e877 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1170,6 +1170,7 @@ enum wined3d_blit_op { WINED3D_BLIT_OP_COLOR_BLIT, WINED3D_BLIT_OP_COLOR_FILL, + WINED3D_BLIT_OP_DEPTH_FILL, }; /* Shaders for color conversions in blits. Do not do blit operations while @@ -1185,6 +1186,7 @@ struct blit_shader const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color); + HRESULT (*depth_fill)(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *surface, const RECT *rect, float depth); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN;

1 0

Vincent Povirk : windowscodecs: Implement TiffEncoder_CreateNewFrame.
by Alexandre Julliard April 6, 2011

April 6, 2011

Module: wine Branch: master Commit: c876357c11ea63a56d15ff001963fa0d11eb6123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c876357c11ea63a56d15ff001… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 16:24:19 2011 -0500 windowscodecs: Implement TiffEncoder_CreateNewFrame. --- dlls/windowscodecs/tiffformat.c | 214 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 211 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b1d472d..98e2376 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -64,6 +64,7 @@ MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); +MAKE_FUNCPTR(TIFFWriteDirectory); #undef MAKE_FUNCPTR static void *load_libtiff(void) @@ -92,6 +93,7 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedStrip); LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); + LOAD_FUNCPTR(TIFFWriteDirectory); #undef LOAD_FUNCPTR } @@ -1118,9 +1120,11 @@ typedef struct TiffEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; IStream *stream; - CRITICAL_SECTION lock; /* Must be held when tiff is used or initiailzed is set */ + CRITICAL_SECTION lock; /* Must be held when tiff is used or fields below are set */ TIFF *tiff; BOOL initialized; + ULONG num_frames; + ULONG num_frames_committed; } TiffEncoder; static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1128,6 +1132,159 @@ static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, TiffEncoder, IWICBitmapEncoder_iface); } +typedef struct TiffFrameEncode { + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; + LONG ref; + TiffEncoder *parent; +} TiffFrameEncode; + +static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, TiffFrameEncode, IWICBitmapFrameEncode_iface); +} + +static HRESULT WINAPI TiffFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, + void **ppv) +{ + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->IWICBitmapFrameEncode_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TiffFrameEncode_AddRef(IWICBitmapFrameEncode *iface) +{ + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI TiffFrameEncode_Release(IWICBitmapFrameEncode *iface) +{ + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IWICBitmapEncoder_Release(&This->parent->IWICBitmapEncoder_iface); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) +{ + FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl TiffFrameEncode_Vtbl = { + TiffFrameEncode_QueryInterface, + TiffFrameEncode_AddRef, + TiffFrameEncode_Release, + TiffFrameEncode_Initialize, + TiffFrameEncode_SetSize, + TiffFrameEncode_SetResolution, + TiffFrameEncode_SetPixelFormat, + TiffFrameEncode_SetColorContexts, + TiffFrameEncode_SetPalette, + TiffFrameEncode_SetThumbnail, + TiffFrameEncode_WritePixels, + TiffFrameEncode_WriteSource, + TiffFrameEncode_Commit, + TiffFrameEncode_GetMetadataQueryWriter +}; + static HRESULT WINAPI TiffEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -1257,8 +1414,57 @@ static HRESULT WINAPI TiffEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitma static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); - return E_NOTIMPL; + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + TiffFrameEncode *result; + + HRESULT hr=S_OK; + + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + + EnterCriticalSection(&This->lock); + + if (This->num_frames != This->num_frames_committed) + { + FIXME("New frame created before previous frame was committed\n"); + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + hr = CreatePropertyBag2(ppIEncoderOptions); + } + + if (SUCCEEDED(hr)) + { + result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); + + if (result) + { + result->IWICBitmapFrameEncode_iface.lpVtbl = &TiffFrameEncode_Vtbl; + result->ref = 1; + result->parent = This; + + IWICBitmapEncoder_AddRef(iface); + *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface; + + if (This->num_frames != 0) + pTIFFWriteDirectory(This->tiff); + + This->num_frames++; + } + else + hr = E_OUTOFMEMORY; + + if (FAILED(hr)) + { + IPropertyBag2_Release(*ppIEncoderOptions); + *ppIEncoderOptions = NULL; + } + } + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI TiffEncoder_Commit(IWICBitmapEncoder *iface) @@ -1317,6 +1523,8 @@ HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TiffEncoder.lock"); This->tiff = NULL; This->initialized = FALSE; + This->num_frames = 0; + This->num_frames_committed = 0; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Piotr Caban : msvcrt: Added _snscanf implementation.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 405e6eb309ba7dbefe88725a96fe280c92af040e URL: http://source.winehq.org/git/wine.git/?a=commit;h=405e6eb309ba7dbefe88725a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 5 17:06:58 2011 +0200 msvcrt: Added _snscanf implementation. --- dlls/msvcr100/msvcr100.spec | 8 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 8 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/msvcrt.spec | 8 ++-- dlls/msvcrt/scanf.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/scanf.h | 18 +++++++++++ 8 files changed, 104 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 45f4220..569192c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1093,10 +1093,10 @@ @ stub _snprintf_l @ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l -@ stub _snscanf -@ stub _snscanf_l -@ stub _snscanf_s -@ stub _snscanf_s_l +@ varargs _snscanf(str long str) msvcrt._snscanf +@ varargs _snscanf_l(str long str ptr) msvcrt._snscanf_l +@ varargs _snscanf_s(str long str) msvcrt._snscanf_s +@ varargs _snscanf_s_l(str long str ptr) msvcrt._snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index b1f0da6..815262d 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -526,7 +526,7 @@ @ stub _setsystime @ cdecl _sleep(long) msvcrt._sleep @ varargs _snprintf(ptr long str) msvcrt._snprintf -@ stub _snscanf +@ varargs _snscanf(str long str) msvcrt._snscanf @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwscanf @ varargs _sopen(str long long) msvcrt._sopen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 9a6018c..de8fffe 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -522,7 +522,7 @@ @ cdecl _setsystime(ptr long) msvcrt._setsystime @ cdecl _sleep(long) msvcrt._sleep @ varargs _snprintf(str long str) msvcrt._snprintf -@ stub _snscanf +@ varargs _snscanf(str long str) msvcrt._snscanf @ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf @ stub _snwscanf @ varargs _sopen(str long long) msvcrt._sopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13ff03d..813f20a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -947,10 +947,10 @@ @ stub _snprintf_l @ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l -@ stub _snscanf -@ stub _snscanf_l -@ stub _snscanf_s -@ stub _snscanf_s_l +@ varargs _snscanf(str long str) msvcrt._snscanf +@ varargs _snscanf_l(str long str ptr) msvcrt._snscanf_l +@ varargs _snscanf_s(str long str) msvcrt._snscanf_s +@ varargs _snscanf_s_l(str long str ptr) msvcrt._snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 54c583e..b27bbbb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -933,10 +933,10 @@ @ stub _snprintf_l @ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l -@ stub _snscanf -@ stub _snscanf_l -@ stub _snscanf_s -@ stub _snscanf_s_l +@ varargs _snscanf(str long str) msvcrt._snscanf +@ varargs _snscanf_l(str long str ptr) msvcrt._snscanf_l +@ varargs _snscanf_s(str long str) msvcrt._snscanf_s +@ varargs _snscanf_s_l(str long str ptr) msvcrt._snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9b1937b..43bcec0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -876,10 +876,10 @@ # stub _snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l -# stub _snscanf -# stub _snscanf_l -# stub _snscanf_s -# stub _snscanf_s_l +@ varargs _snscanf(str long str) MSVCRT__snscanf +@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l +@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s +@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf # stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index c795e15..d02892c 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -91,6 +91,16 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #define SECURE 1 #include "scanf.h" +/* vsnscanf_l */ +#undef SECURE +#define STRING_LEN 1 +#include "scanf.h" + +/* vsnscanf_s_l */ +#define SECURE +#include "scanf.h" +#undef STRING_LEN + /* vswscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE @@ -582,3 +592,61 @@ int CDECL _cwscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) __ms_va_end(valist); return res; } + +/********************************************************************* + * _snscanf (MSVCRT.@) + */ +int CDECL MSVCRT__snscanf(char *input, MSVCRT_size_t length, const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vsnscanf_l(input, length, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _snscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snscanf_l(char *input, MSVCRT_size_t length, + const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vsnscanf_l(input, length, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _snscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT__snscanf_s(char *input, MSVCRT_size_t length, const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vsnscanf_s_l(input, length, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _snscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, + const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); + __ms_va_end(valist); + return res; +} diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index b78d57c..8b796b1 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -65,6 +65,23 @@ #ifdef STRING #undef _EOF_ #define _EOF_ 0 +#ifdef STRING_LEN +#define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) +#define _UNGETC_(nch, file) do { file--; consumed--; } while(0) +#ifdef WIDE_SCANF +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vsnwscanf_s_l(const MSVCRT_wchar_t *file, MSVCRT_size_t length, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int MSVCRT_vsnwscanf_l(const MSVCRT_wchar_t *file, MSVCRT_size_t length, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ +#else /* WIDE_SCANF */ +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vsnscanf_s_l(const char *file, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int MSVCRT_vsnscanf_l(const char *file, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ +#endif /* WIDE_SCANF */ +#else /* STRING_LEN */ #define _GETC_(file) (consumed++, *file++) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #ifdef WIDE_SCANF @@ -80,6 +97,7 @@ #define _FUNCTION_ static int MSVCRT_vsscanf_l(const char *file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #endif /* SECURE */ #endif /* WIDE_SCANF */ +#endif /* STRING_LEN */ #else /* STRING */ #ifdef WIDE_SCANF #define _GETC_(file) (consumed++, MSVCRT_fgetwc(file))

1 0

Piotr Caban : msvcrt: Added _snwscanf implementation.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: d09ab74d9bc6d6ad8221a22b315b53705cbccad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09ab74d9bc6d6ad8221a22b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 5 17:07:17 2011 +0200 msvcrt: Added _snwscanf implementation. --- dlls/msvcr100/msvcr100.spec | 8 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 8 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/msvcrt.spec | 8 ++-- dlls/msvcrt/scanf.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 87 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 569192c..c1f6e47 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1101,10 +1101,10 @@ @ stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l -@ stub _snwscanf -@ stub _snwscanf_l -@ stub _snwscanf_s -@ stub _snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf +@ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l +@ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s +@ varargs _snwscanf_s_l(wstr long wstr ptr) msvcrt._snwscanf_s_l @ varargs _sopen(str long long) msvcrt._sopen @ cdecl _sopen_s(ptr str long long long) msvcrt._sopen_s @ varargs _spawnl(long str str) msvcrt._spawnl diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 815262d..58bdb0c 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -528,7 +528,7 @@ @ varargs _snprintf(ptr long str) msvcrt._snprintf @ varargs _snscanf(str long str) msvcrt._snscanf @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf -@ stub _snwscanf +@ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _sopen(str long long) msvcrt._sopen @ varargs _spawnl(long str str) msvcrt._spawnl @ varargs _spawnle(long str str) msvcrt._spawnle diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index de8fffe..0d2744b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -524,7 +524,7 @@ @ varargs _snprintf(str long str) msvcrt._snprintf @ varargs _snscanf(str long str) msvcrt._snscanf @ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf -@ stub _snwscanf +@ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _sopen(str long long) msvcrt._sopen @ varargs _spawnl(long str str) msvcrt._spawnl @ varargs _spawnle(long str str) msvcrt._spawnle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 813f20a..6b898a5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -955,10 +955,10 @@ @ stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l -@ stub _snwscanf -@ stub _snwscanf_l -@ stub _snwscanf_s -@ stub _snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf +@ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l +@ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s +@ varargs _snwscanf_s_l(wstr long wstr ptr) msvcrt._snwscanf_s_l @ varargs _sopen(str long long) msvcrt._sopen @ cdecl _sopen_s(ptr str long long long) msvcrt._sopen_s @ varargs _spawnl(long str str) msvcrt._spawnl diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b27bbbb..43582cd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -941,10 +941,10 @@ @ stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l -@ stub _snwscanf -@ stub _snwscanf_l -@ stub _snwscanf_s -@ stub _snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf +@ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l +@ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s +@ varargs _snwscanf_s_l(wstr long wstr ptr) msvcrt._snwscanf_s_l @ varargs _sopen(str long long) msvcrt._sopen @ cdecl _sopen_s(ptr str long long long) msvcrt._sopen_s @ varargs _spawnl(long str str) msvcrt._spawnl diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43bcec0..ef88e71 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -884,10 +884,10 @@ # stub _snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s # stub _snwprintf_s_l -# stub _snwscanf -# stub _snwscanf_l -# stub _snwscanf_s -# stub _snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf +@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l +@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s +@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index d02892c..b998400 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -99,6 +99,15 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { /* vsnscanf_s_l */ #define SECURE #include "scanf.h" + +/* vsnwscanf_l */ +#define WIDE_SCANF 1 +#undef SECURE +#include "scanf.h" + +/* vsnwscanf_s_l */ +#define SECURE 1 +#include "scanf.h" #undef STRING_LEN /* vswscanf_l */ @@ -650,3 +659,63 @@ int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, __ms_va_end(valist); return res; } + +/********************************************************************* + * _snwscanf (MSVCRT.@) + */ +int CDECL MSVCRT__snwscanf(MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vsnwscanf_l(input, length, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _snwscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snwscanf_l(MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vsnwscanf_l(input, length, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _snwscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT__snwscanf_s(MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vsnwscanf_s_l(input, length, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _snscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__snwscanf_s_l(MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + __ms_va_end(valist); + return res; +}

1 0

Piotr Caban : msvcr90: Added _CRT_RTC_INIT and _CRT_RTC_INITW implementation.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 2d7fa5f2435ed2a7f322851a594e993c52d85395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7fa5f2435ed2a7f322851a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 5 17:07:31 2011 +0200 msvcr90: Added _CRT_RTC_INIT and _CRT_RTC_INITW implementation. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.c | 18 ++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 6 +++--- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c1f6e47..88655cf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -290,7 +290,7 @@ @ stub ?lock(a)critical_section@Concurrency@@QAEXXZ @ stub ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ @ stub ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const +@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 @ stub ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ @ thiscall -arch=win32 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ @@ -334,8 +334,8 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stub _CRT_RTC_INIT -@ stub _CRT_RTC_INITW +@ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT +@ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 58bdb0c..9df4d9c 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -107,7 +107,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stub _CRT_RTC_INIT +@ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 0d2744b..7949a4b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -101,7 +101,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stub _CRT_RTC_INIT +@ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b898a5..8dc251b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -109,7 +109,7 @@ @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const +@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 @ thiscall -arch=win32 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QEBAPEBDXZ @@ -145,8 +145,8 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stub _CRT_RTC_INIT -@ stub _CRT_RTC_INITW +@ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT +@ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 32a874b..f2adb04 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -338,3 +338,21 @@ const char * __thiscall MSVCRT_type_info_name_internal_method(type_info * _this, TRACE("(%p) returning %s\n", _this, _this->name); return _this->name; } + +/********************************************************************* + * _CRT_RTC_INIT (MSVCR90.@) + */ +void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) +{ + TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); + return NULL; +} + +/********************************************************************* + * _CRT_RTC_INITW (MSVCR90.@) + */ +void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) +{ + TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); + return NULL; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 43582cd..94810e5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -109,7 +109,7 @@ @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const +@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 @ thiscall -arch=win32 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QEBAPEBDXZ @@ -142,8 +142,8 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stub _CRT_RTC_INIT -@ stub _CRT_RTC_INITW +@ cdecl _CRT_RTC_INIT(ptr ptr long long long) +@ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _CreateFrameInfo @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog

1 0

Piotr Caban : msvcrt: Added _wassert implementation.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 220b6ab37f9d42f9e2d09fdad8c990036f8a7d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=220b6ab37f9d42f9e2d09fdad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 5 17:06:45 2011 +0200 msvcrt: Added _wassert implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/exit.c | 69 +++++++++++++++++++++++++++++++----------- dlls/msvcrt/msvcrt.h | 3 ++ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1812407..45f4220 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1277,7 +1277,7 @@ @ cdecl _waccess_s(wstr long) msvcrt._waccess_s @ cdecl _wasctime(ptr) msvcrt._wasctime @ stub _wasctime_s -@ stub _wassert +@ cdecl _wassert(wstr wstr long) msvcrt._wassert @ cdecl _wchdir(wstr) msvcrt._wchdir @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8b58e7d..13ff03d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1130,7 +1130,7 @@ @ cdecl _waccess_s(wstr long) msvcrt._waccess_s @ cdecl _wasctime(ptr) msvcrt._wasctime @ stub _wasctime_s -@ stub _wassert +@ cdecl _wassert(wstr wstr long) msvcrt._wassert @ cdecl _wchdir(wstr) msvcrt._wchdir @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d18651d..54c583e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1117,7 +1117,7 @@ @ cdecl _waccess_s(wstr long) msvcrt._waccess_s @ cdecl _wasctime(ptr) msvcrt._wasctime @ stub _wasctime_s -@ stub _wassert +@ cdecl _wassert(wstr wstr long) msvcrt._wassert @ cdecl _wchdir(wstr) msvcrt._wchdir @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index d7f28f1..6c6b55f 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -37,7 +37,7 @@ static MSVCRT_purecall_handler purecall_handler = NULL; static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; extern int MSVCRT_app_type; -extern char *MSVCRT__pgmptr; +extern MSVCRT_wchar_t *MSVCRT__wpgmptr; static unsigned int MSVCRT_abort_behavior = MSVCRT__WRITE_ABORT_MSG | MSVCRT__CALL_REPORTFAULT; static int MSVCRT_error_mode = MSVCRT__OUT_TO_DEFAULT; @@ -103,32 +103,45 @@ void CDECL MSVCRT__exit(int exitcode) } /* Print out an error message with an option to debug */ -static void DoMessageBox(LPCSTR lead, LPCSTR message) +static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *message) { - MSGBOXPARAMSA msgbox; - char text[2048]; + static const MSVCRT_wchar_t message_format[] = {'%','s','\n','\n','P','r','o','g','r','a','m',':',' ','%','s','\n', + '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', + 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', + 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; + + MSGBOXPARAMSW msgbox; + MSVCRT_wchar_t text[2048]; INT ret; - snprintf(text,sizeof(text),"%s\n\nProgram: %s\n%s\n\n" - "Press OK to exit the program, or Cancel to start the Wine debugger.\n ", - lead, MSVCRT__pgmptr, message); + MSVCRT__snwprintf(text,sizeof(text),message_format, lead, MSVCRT__wpgmptr, message); msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow(); msgbox.hInstance = 0; - msgbox.lpszText = text; - msgbox.lpszCaption = szMsgBoxTitle; + msgbox.lpszText = (LPCWSTR)text; + msgbox.lpszCaption = (LPCWSTR)szMsgBoxTitle; msgbox.dwStyle = MB_OKCANCEL|MB_ICONERROR; msgbox.lpszIcon = NULL; msgbox.dwContextHelpId = 0; msgbox.lpfnMsgBoxCallback = NULL; msgbox.dwLanguageId = LANG_NEUTRAL; - ret = MessageBoxIndirectA(&msgbox); + ret = MessageBoxIndirectW(&msgbox); if (ret == IDCANCEL) DebugBreak(); } +static void DoMessageBox(const char *lead, const char *message) +{ + MSVCRT_wchar_t leadW[1024], messageW[1024]; + + MSVCRT_mbstowcs(leadW, lead, 1024); + MSVCRT_mbstowcs(messageW, message, 1024); + + return DoMessageBoxW(leadW, messageW); +} + /********************************************************************* * _amsg_exit (MSVCRT.@) */ @@ -188,26 +201,46 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m } /********************************************************************* - * _assert (MSVCRT.@) + * _wassert (MSVCRT.@) */ -void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line) +void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file, unsigned int line) { - TRACE("(%s,%s,%d)\n",str,file,line); + static const MSVCRT_wchar_t assertion_failed[] = {'A','s','s','e','r','t','i','o','n',' ','f','a','i','l','e','d','!',0}; + static const MSVCRT_wchar_t format_msgbox[] = {'F','i','l','e',':',' ','%','s','\n','L','i','n','e',':',' ','%','d', + '\n','\n','E','x','p','r','e','s','s','i','o','n',':',' ','\"','%','s','\"',0}; + static const MSVCRT_wchar_t format_console[] = {'A','s','s','e','r','t','i','o','n',' ','f','a','i','l','e','d',':',' ', + '%','s',',',' ','f','i','l','e',' ','%','s',',',' ','l','i','n','e',' ','%','d','\n','\n',0}; + + TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line); + if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) || ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2))) { - char text[2048]; - snprintf(text, sizeof(text), "File: %s\nLine: %d\n\nExpression: \"%s\"", file, line, str); - DoMessageBox("Assertion failed!", text); + MSVCRT_wchar_t text[2048]; + MSVCRT__snwprintf(text, sizeof(text), format_msgbox, file, line, str); + DoMessageBoxW(assertion_failed, text); } else - _cprintf("Assertion failed: %s, file %s, line %d\n\n",str, file, line); + _cwprintf(format_console, str, file, line); + MSVCRT_raise(MSVCRT_SIGABRT); - /* in case raise() returns */ MSVCRT__exit(3); } /********************************************************************* + * _assert (MSVCRT.@) + */ +void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line) +{ + MSVCRT_wchar_t strW[1024], fileW[1024]; + + MSVCRT_mbstowcs(strW, str, 1024); + MSVCRT_mbstowcs(fileW, file, 1024); + + MSVCRT__wassert(strW, fileW, line); +} + +/********************************************************************* * _c_exit (MSVCRT.@) */ void CDECL MSVCRT__c_exit(void) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 69d3668..e401929 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -804,6 +804,7 @@ MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); +int __cdecl MSVCRT__snwprintf(MSVCRT_wchar_t*, unsigned int, const MSVCRT_wchar_t*, ...); int __cdecl MSVCRT_sprintf(char*,const char*,...); int __cdecl MSVCRT__scprintf(const char*,...); int __cdecl MSVCRT_raise(int sig); @@ -871,6 +872,7 @@ int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); +MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl _wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *); @@ -883,6 +885,7 @@ char* __cdecl _strset(char*,int); int __cdecl _ungetch(int); int __cdecl _cputs(const char*); int __cdecl _cprintf(const char*,...); +int __cdecl _cwprintf(const MSVCRT_wchar_t*,...); char*** __cdecl __p__environ(void); int* __cdecl __p___mb_cur_max(void); unsigned int* __cdecl __p__fmode(void); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 103142e..9b1937b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1052,7 +1052,7 @@ @ cdecl _waccess_s(wstr long) @ cdecl _wasctime(ptr) MSVCRT__wasctime # stub _wasctime_s -# stub _wassert +@ cdecl _wassert(wstr wstr long) MSVCRT__wassert @ cdecl _wchdir(wstr) @ cdecl _wchmod(wstr long) @ extern _wcmdln MSVCRT__wcmdln

1 0

Jacek Caban : mshtml: Properly handle upload streams containing headers.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 589c213890f2ae749359ab5d7016d9c579ea1445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589c213890f2ae749359ab5d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 5 15:23:25 2011 +0200 mshtml: Properly handle upload streams containing headers. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 125 +++++++++++++++++++++++++++++------------ dlls/mshtml/nsio.c | 5 +- 3 files changed, 94 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a449b18..44b6b1d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -500,6 +500,7 @@ typedef struct { nsWineURI *uri; nsIInputStream *post_data_stream; + BOOL post_data_contains_headers; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; nsISupports *owner; @@ -687,7 +688,7 @@ HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**); HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD); -HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD,BOOL*); +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*); HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index db624d8..446b57b 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -684,33 +684,6 @@ static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) return S_OK; } -static HRESULT read_post_data_stream(nsIInputStream *stream, HGLOBAL *post_data, - ULONG *post_data_len) -{ - PRUint32 data_len = 0, available = 0; - char *data; - nsresult nsres; - - nsres = nsIInputStream_Available(stream, &available); - if(NS_FAILED(nsres)) - return E_FAIL; - - data = GlobalAlloc(0, available+1); - if(!data) - return E_OUTOFMEMORY; - - nsres = nsIInputStream_Read(stream, data, available, &data_len); - if(NS_FAILED(nsres)) { - GlobalFree(data); - return E_FAIL; - } - - data[data_len] = 0; - *post_data = data; - *post_data_len = data_len; - return S_OK; -} - HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -899,6 +872,90 @@ struct nsChannelBSC { nsProtocolStream *nsstream; }; +static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) +{ + PRUint32 data_len = 0, available = 0; + char *data, *post_data; + nsresult nsres; + HRESULT hres = S_OK; + + if(!nschannel->post_data_stream) + return S_OK; + + nsres = nsIInputStream_Available(nschannel->post_data_stream, &available); + if(NS_FAILED(nsres)) + return E_FAIL; + + post_data = data = GlobalAlloc(0, available+1); + if(!data) + return E_OUTOFMEMORY; + + nsres = nsIInputStream_Read(nschannel->post_data_stream, data, available, &data_len); + if(NS_FAILED(nsres)) { + GlobalFree(data); + return E_FAIL; + } + + data[data_len++] = 0; + + if(nschannel->post_data_contains_headers) { + if(data[0] == '\r' && data[1] == '\n') { + post_data = data+2; + data_len -= 2; + }else { + WCHAR *headers; + DWORD size; + + post_data = strstr(data, "\r\n\r\n"); + if(post_data) + post_data += 4; + else + post_data = data+data_len; + + data_len -= post_data-data; + + size = MultiByteToWideChar(CP_ACP, 0, data, post_data-data, NULL, 0); + headers = heap_alloc((size+1)*sizeof(WCHAR)); + if(headers) { + MultiByteToWideChar(CP_ACP, 0, data, post_data-data, headers, size); + headers[size] = 0; + hres = parse_headers(headers , &nschannel->request_headers); + if(SUCCEEDED(hres)) + This->bsc.headers = headers; + else + heap_free(headers); + }else { + hres = E_OUTOFMEMORY; + } + } + } + + if(FAILED(hres)) { + GlobalFree(data); + return hres; + } + + if(!data_len) { + GlobalFree(data); + post_data = NULL; + }else if(post_data != data) { + char *new_data; + + new_data = GlobalAlloc(0, data_len); + if(new_data) + memcpy(new_data, post_data, data_len); + GlobalFree(data); + if(!new_data) + return E_OUTOFMEMORY; + post_data = new_data; + } + + This->bsc.post_data = post_data; + This->bsc.post_data_len = data_len; + TRACE("post_data = %s\n", debugstr_a(This->bsc.post_data)); + return S_OK; +} + static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; @@ -1068,12 +1125,9 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) HRESULT hres; if(This->nschannel && This->nschannel->post_data_stream) { - hres = read_post_data_stream(This->nschannel->post_data_stream, - &This->bsc.post_data, &This->bsc.post_data_len); + hres = read_post_data_stream(This, This->nschannel); if(FAILED(hres)) return hres; - - TRACE("post_data = %s\n", debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); } return S_OK; @@ -1512,8 +1566,7 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis } } -HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, - nsIInputStream *post_data_stream, DWORD hlnf, BOOL *cancel) +HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschannel, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; nsChannelBSC *callback; @@ -1542,10 +1595,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, return hres; } - if(post_data_stream) { - read_post_data_stream(post_data_stream, &callback->bsc.post_data, &callback->bsc.post_data_len); - TRACE("post_data = %s\n", debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); - } + if(nschannel) + read_post_data_stream(callback, nschannel); hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b2dab98..b25aae0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -149,7 +149,7 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) return FALSE; - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf, &cancel); + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, &cancel); return FAILED(hres) || cancel; } @@ -1304,6 +1304,8 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength); + This->post_data_contains_headers = TRUE; + if(aContentType) { nsACString_GetData(aContentType, &content_type); if(*content_type) { @@ -1316,6 +1318,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, set_http_header(&This->request_headers, content_typeW, sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); heap_free(ct); + This->post_data_contains_headers = FALSE; } }

1 0

Huw Davies : gdi32: Add support for 32 bpp BI_BITFIELDS.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: ba3d34875a844ec09648499fba226241ad34f1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3d34875a844ec09648499fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 13:26:08 2011 +0100 gdi32: Add support for 32 bpp BI_BITFIELDS. --- dlls/gdi32/dibdrv/dc.c | 28 ++++++++++++++++++++++++---- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 30 ++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a230fbf..473bf82 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -36,11 +36,34 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) return 0; } +static void calc_shift_and_len(DWORD mask, int *shift, int *len) +{ + int s, l; + + s = 0; + while ((mask & 1) == 0) + { + mask >>= 1; + s++; + } + l = 0; + while ((mask & 1) == 1) + { + mask >>= 1; + l++; + } + *shift = s; + *len = l; +} + static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) { dib->red_mask = bit_fields[0]; dib->green_mask = bit_fields[1]; dib->blue_mask = bit_fields[2]; + calc_shift_and_len(dib->red_mask, &dib->red_shift, &dib->red_len); + calc_shift_and_len(dib->green_mask, &dib->green_shift, &dib->green_len); + calc_shift_and_len(dib->blue_mask, &dib->blue_shift, &dib->blue_len); } static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) @@ -71,10 +94,7 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) dib->funcs = &funcs_8888; else - { - TRACE("32 bpp bitmasks not supported, will forward to graphics driver.\n"); - return FALSE; - } + dib->funcs = &funcs_32; break; default: diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index da41f21..9ed7661 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -29,4 +29,5 @@ typedef struct primitive_funcs } primitive_funcs; extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 8bbfc4d..92559d2 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -26,6 +26,31 @@ static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); } +static inline DWORD put_field(DWORD field, int shift, int len) +{ + shift = shift - (8 - len); + if (len <= 8) + field &= (((1 << len) - 1) << (8 - len)); + if (shift < 0) + field >>= -shift; + else + field <<= shift; + return field; +} + +static DWORD colorref_to_pixel_masks(const dib_info *dib, COLORREF colour) +{ + DWORD r,g,b; + + r = GetRValue(colour); + g = GetGValue(colour); + b = GetBValue(colour); + + return put_field(r, dib->red_shift, dib->red_len) | + put_field(g, dib->green_shift, dib->green_len) | + put_field(b, dib->blue_shift, dib->blue_len); +} + static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) { return 0; @@ -36,6 +61,11 @@ const primitive_funcs funcs_8888 = colorref_to_pixel_888 }; +const primitive_funcs funcs_32 = +{ + colorref_to_pixel_masks +}; + const primitive_funcs funcs_null = { colorref_to_pixel_null diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8aa23bd..5f27106 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -86,6 +86,8 @@ typedef struct void *bits; /* points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; + int red_shift, green_shift, blue_shift; + int red_len, green_len, blue_len; const struct primitive_funcs *funcs; } dib_info;

1 0

Joris Huizer : dxdiagn: Plug memory leak.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 8c6c2261b3cb59fec6913f68ce1960730fd0a315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6c2261b3cb59fec6913f68c… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Tue Apr 5 16:01:04 2011 +0200 dxdiagn: Plug memory leak. --- dlls/dxdiagn/provider.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 459f8e9..1731b8f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -433,8 +433,12 @@ static BOOL is_netmeeting_running(void) { if (get_process_name_from_pid(pid_list[i], process_name, sizeof(process_name)/sizeof(WCHAR)) && !lstrcmpW(conf_exe, process_name)) + { + HeapFree(GetProcessHeap(), 0, pid_list); return TRUE; + } } + HeapFree(GetProcessHeap(), 0, pid_list); } return FALSE;

1 0

Huw Davies : gdi32/tests: Start of a framework for writing dib driver tests .
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 0aebe831b441046e306f616c864023880221ecc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aebe831b441046e306f616c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 14:23:49 2011 +0100 gdi32/tests: Start of a framework for writing dib driver tests. --- dlls/gdi32/tests/Makefile.in | 3 +- dlls/gdi32/tests/dib.c | 152 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90f937e..c77f9e2 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,11 +1,12 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ brush.c \ clipping.c \ dc.c \ + dib.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c new file mode 100644 index 0000000..7dd1ba3 --- /dev/null +++ b/dlls/gdi32/tests/dib.c @@ -0,0 +1,152 @@ +/* + * DIB driver tests. + * + * Copyright 2011 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wincrypt.h" + +#include "wine/test.h" + +static HCRYPTPROV crypt_prov; + +static const char *sha1_graphics_a8r8g8b8[] = +{ + "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", + NULL +}; + +static inline DWORD get_stride(BITMAPINFO *bmi) +{ + return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; +} + +static inline DWORD get_dib_size(BITMAPINFO *bmi) +{ + return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); +} + +static char *hash_dib(BITMAPINFO *bmi, void *bits) +{ + DWORD dib_size = get_dib_size(bmi); + HCRYPTHASH hash; + char *buf; + BYTE hash_buf[20]; + DWORD hash_size = sizeof(hash_buf); + int i; + static const char *hex = "0123456789abcdef"; + + if(!crypt_prov) return NULL; + + if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; + + CryptHashData(hash, bits, dib_size, 0); + + CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); + if(hash_size != sizeof(hash_buf)) return NULL; + + CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); + CryptDestroyHash(hash); + + buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + + for(i = 0; i < hash_size; i++) + { + buf[i * 2] = hex[hash_buf[i] >> 4]; + buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; + } + buf[i * 2] = '\0'; + + return buf; +} + +static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const char *info) +{ + char *hash = hash_dib(bmi, bits); + + if(!hash) + { + skip("SHA1 hashing unavailable on this platform\n"); + return; + } + + if(**sha1) + { + ok(!strcmp(hash, **sha1), "%d: %s: expected hash %s got %s\n", + bmi->bmiHeader.biBitCount, info, **sha1, hash); + (*sha1)++; + } + else trace("\"%s\",\n", hash); + + HeapFree(GetProcessHeap(), 0, hash); +} + +static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) +{ + DWORD dib_size = get_dib_size(bmi); + + memset(bits, 0xcc, dib_size); + compare_hash(bmi, bits, sha1, "empty"); +} + +static void test_simple_graphics(void) +{ + char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + HDC mem_dc; + BYTE *bits; + HBITMAP dib, orig_bm; + const char **sha1; + + /* a8r8g8b8 */ + trace("8888\n"); + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = 512; + bmi->bmiHeader.biWidth = 512; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + mem_dc = CreateCompatibleDC(NULL); + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_a8r8g8b8; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + DeleteDC(mem_dc); +} + +START_TEST(dib) +{ + CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + + test_simple_graphics(); + + CryptReleaseContext(crypt_prov, 0); +}

1 0