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

Henri Verbeet : d3dx9: Introduce a special case for simple loads in D3DXLoadSurfaceFromMemory().
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: e925553072ddbdeacc1705e8aed25be1421c0cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e925553072ddbdeacc1705e8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:54 2012 +0200 d3dx9: Introduce a special case for simple loads in D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/surface.c | 75 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f436c53..49d4c1e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -957,11 +957,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); - srcformatdesc = get_format_info(SrcFormat); - destformatdesc = get_format_info(surfdesc.Format); - if( srcformatdesc->type == FORMAT_UNKNOWN || srcformatdesc->bytes_per_pixel > 4) return E_NOTIMPL; - if(destformatdesc->type == FORMAT_UNKNOWN || destformatdesc->bytes_per_pixel > 4) return E_NOTIMPL; - srcsize.x = pSrcRect->right - pSrcRect->left; srcsize.y = pSrcRect->bottom - pSrcRect->top; if( !pDestRect ) { @@ -976,21 +971,67 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if(destsize.x == 0 || destsize.y == 0) return D3D_OK; } - hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; + srcformatdesc = get_format_info(SrcFormat); + if (srcformatdesc->type == FORMAT_UNKNOWN) + return E_NOTIMPL; + + destformatdesc = get_format_info(surfdesc.Format); + if (destformatdesc->type == FORMAT_UNKNOWN) + return E_NOTIMPL; + + if (SrcFormat == surfdesc.Format + && destsize.x == srcsize.x + && destsize.y == srcsize.y) /* Simple copy. */ + { + const BYTE *src_addr; + BYTE *dst_addr; + UINT y; + + if (FAILED(hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0))) + return D3DXERR_INVALIDDATA; + + src_addr = pSrcMemory; + src_addr += pSrcRect->top * SrcPitch; + src_addr += pSrcRect->left * srcformatdesc->bytes_per_pixel; + dst_addr = lockrect.pBits; + + for (y = 0; y < srcsize.y; ++y) + { + memcpy(dst_addr, src_addr, srcsize.x * srcformatdesc->bytes_per_pixel); + src_addr += SrcPitch; + dst_addr += lockrect.Pitch; + } + + IDirect3DSurface9_UnlockRect(pDestSurface); + } + else /* Stretching or format conversion. */ + { + if (srcformatdesc->bytes_per_pixel > 4) + return E_NOTIMPL; + if (destformatdesc->bytes_per_pixel > 4) + return E_NOTIMPL; + + if (FAILED(hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0))) + return D3DXERR_INVALIDDATA; + + if ((dwFilter & 0xf) == D3DX_FILTER_NONE) + { + copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + Colorkey); + } + else /* if ((dwFilter & 0xf) == D3DX_FILTER_POINT) */ + { + /* Always apply a point filter until D3DX_FILTER_LINEAR, + * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ + point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + Colorkey); + } - if((dwFilter & 0xF) == D3DX_FILTER_NONE) { - copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, - lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, - Colorkey); - } else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { - /* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ - point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, - lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, - Colorkey); + IDirect3DSurface9_UnlockRect(pDestSurface); } - IDirect3DSurface9_UnlockRect(pDestSurface); return D3D_OK; }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetPixelShader ().
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: c638aab2b47447b47fb5a532812000cfe9c6e6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c638aab2b47447b47fb5a5328… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:53 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetPixelShader(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1f0f809..987867c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2652,6 +2652,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if IDirect3DPixelShader9 **shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DPixelShader9Impl *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2662,7 +2663,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if wined3d_shader = wined3d_device_get_pixel_shader(This->wined3d_device); if (wined3d_shader) { - *shader = wined3d_shader_get_parent(wined3d_shader); + shader_impl = wined3d_shader_get_parent(wined3d_shader); + *shader = &shader_impl->IDirect3DPixelShader9_iface; IDirect3DPixelShader9_AddRef(*shader); wined3d_shader_decref(wined3d_shader); }

1 0

Henri Verbeet : d3dx9: Add basic support for loading DXT formats to D3DXLoadSurfaceFromMemory().
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: b11d8db279d52e836f8f95a6b18cf12645622a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11d8db279d52e836f8f95a6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:55 2012 +0200 d3dx9: Add basic support for loading DXT formats to D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++ dlls/d3dx9_36/surface.c | 27 +++++++++++++++++++---- dlls/d3dx9_36/util.c | 43 +++++++++++++++++++++---------------- 3 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 95006e4..a6c4fcd 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -48,6 +48,9 @@ typedef struct _PixelFormatDesc { BYTE bits[4]; BYTE shift[4]; UINT bytes_per_pixel; + UINT block_width; + UINT block_height; + UINT block_byte_count; FormatType type; void (*from_rgba)(const struct vec4 *src, struct vec4 *dst); void (*to_rgba)(const struct vec4 *src, struct vec4 *dst); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 49d4c1e..567282c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -983,21 +983,34 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, && destsize.x == srcsize.x && destsize.y == srcsize.y) /* Simple copy. */ { + UINT row_block_count = ((srcsize.x + srcformatdesc->block_width - 1) / srcformatdesc->block_width); + UINT row_count = (srcsize.y + srcformatdesc->block_height - 1) / srcformatdesc->block_height; const BYTE *src_addr; BYTE *dst_addr; - UINT y; + UINT row; + + if (pSrcRect->left & (srcformatdesc->block_width - 1) + || pSrcRect->top & (srcformatdesc->block_height - 1) + || (pSrcRect->right & (srcformatdesc->block_width - 1) + && srcsize.x != surfdesc.Width) + || (pSrcRect->bottom & (srcformatdesc->block_height - 1) + && srcsize.y != surfdesc.Height)) + { + WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(pSrcRect)); + return D3DXERR_INVALIDDATA; + } if (FAILED(hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0))) return D3DXERR_INVALIDDATA; src_addr = pSrcMemory; - src_addr += pSrcRect->top * SrcPitch; - src_addr += pSrcRect->left * srcformatdesc->bytes_per_pixel; + src_addr += (pSrcRect->top / srcformatdesc->block_height) * SrcPitch; + src_addr += (pSrcRect->left / srcformatdesc->block_width) * srcformatdesc->block_byte_count; dst_addr = lockrect.pBits; - for (y = 0; y < srcsize.y; ++y) + for (row = 0; row < row_count; ++row) { - memcpy(dst_addr, src_addr, srcsize.x * srcformatdesc->bytes_per_pixel); + memcpy(dst_addr, src_addr, row_block_count * srcformatdesc->block_byte_count); src_addr += SrcPitch; dst_addr += lockrect.Pitch; } @@ -1010,6 +1023,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, return E_NOTIMPL; if (destformatdesc->bytes_per_pixel > 4) return E_NOTIMPL; + if (srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1) + return E_NOTIMPL; + if (destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + return E_NOTIMPL; if (FAILED(hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0))) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 62ff996..4dbf44c 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -44,26 +44,31 @@ static void la_to_rgba(const struct vec4 *la, struct vec4 *rgba) */ static const PixelFormatDesc formats[] = { - /* format bpc shifts bpp type from_rgba to_rgba */ - {D3DFMT_R8G8B8, {0, 8, 8, 8}, { 0, 16, 8, 0}, 3, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A8R8G8B8, {8, 8, 8, 8}, {24, 16, 8, 0}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_X8R8G8B8, {0, 8, 8, 8}, { 0, 16, 8, 0}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A8B8G8R8, {8, 8, 8, 8}, {24, 0, 8, 16}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_X8B8G8R8, {0, 8, 8, 8}, { 0, 0, 8, 16}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_R5G6B5, {0, 5, 6, 5}, { 0, 11, 5, 0}, 2, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_X1R5G5B5, {0, 5, 5, 5}, { 0, 10, 5, 0}, 2, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A1R5G5B5, {1, 5, 5, 5}, {15, 10, 5, 0}, 2, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_R3G3B2, {0, 3, 3, 2}, { 0, 5, 2, 0}, 1, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A8R3G3B2, {8, 3, 3, 2}, { 8, 5, 2, 0}, 2, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A4R4G4B4, {4, 4, 4, 4}, {12, 8, 4, 0}, 2, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_X4R4G4B4, {0, 4, 4, 4}, { 0, 8, 4, 0}, 2, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A2R10G10B10, {2, 10, 10, 10}, {30, 20, 10, 0}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A2B10G10R10, {2, 10, 10, 10}, {30, 0, 10, 20}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_G16R16, {0, 16, 16, 0}, { 0, 0, 16, 0}, 4, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + /* format bpc shifts bpp blocks type from_rgba to_rgba */ + {D3DFMT_R8G8B8, {0, 8, 8, 8}, { 0, 16, 8, 0}, 3, 1, 1, 3, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A8R8G8B8, {8, 8, 8, 8}, {24, 16, 8, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_X8R8G8B8, {0, 8, 8, 8}, { 0, 16, 8, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A8B8G8R8, {8, 8, 8, 8}, {24, 0, 8, 16}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_X8B8G8R8, {0, 8, 8, 8}, { 0, 0, 8, 16}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_R5G6B5, {0, 5, 6, 5}, { 0, 11, 5, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_X1R5G5B5, {0, 5, 5, 5}, { 0, 10, 5, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A1R5G5B5, {1, 5, 5, 5}, {15, 10, 5, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_R3G3B2, {0, 3, 3, 2}, { 0, 5, 2, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A8R3G3B2, {8, 3, 3, 2}, { 8, 5, 2, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A4R4G4B4, {4, 4, 4, 4}, {12, 8, 4, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_X4R4G4B4, {0, 4, 4, 4}, { 0, 8, 4, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A2R10G10B10, {2, 10, 10, 10}, {30, 20, 10, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A2B10G10R10, {2, 10, 10, 10}, {30, 0, 10, 20}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_G16R16, {0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, /* marks last element */ - {D3DFMT_UNKNOWN, {0, 0, 0, 0}, { 0, 0, 0, 0}, 0, FORMAT_UNKNOWN, NULL, NULL }, + {D3DFMT_UNKNOWN, {0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, };

1 0

Andrew Eikum : dsound: Map MMDevAPI error to DSound error.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 3ef92af6a8783343ace4c4bfc745940a7ca83f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef92af6a8783343ace4c4bfc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 26 14:14:59 2012 -0500 dsound: Map MMDevAPI error to DSound error. --- dlls/dsound/capture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 90cddb7..7970537 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -705,6 +705,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); + if(err == AUDCLNT_E_UNSUPPORTED_FORMAT) + return DSERR_BADFORMAT; return err; }

1 0

Nikolay Sivov : msxml3: Query for handler interface instead of using what was passed in Variant directly .
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 28335fb39bb55121d594041ca2d3cfd9a51e6e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28335fb39bb55121d594041ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 23:54:22 2012 +0400 msxml3: Query for handler interface instead of using what was passed in Variant directly. --- dlls/msxml3/saxreader.c | 31 ++++++--- dlls/msxml3/tests/saxreader.c | 138 +++++++++++++++++++++++++++++++++-------- 2 files changed, 132 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28335fb39bb55121d5940…

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetVertexShader ().
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 722e60ab2e3ad231924ba202d12abaa98652bff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722e60ab2e3ad231924ba202d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:52 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetVertexShader(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f1eea..1f0f809 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2339,6 +2339,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(IDirect3DDevice9Ex *i IDirect3DVertexShader9 **shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DVertexShader9Impl *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2347,7 +2348,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(IDirect3DDevice9Ex *i wined3d_shader = wined3d_device_get_vertex_shader(This->wined3d_device); if (wined3d_shader) { - *shader = wined3d_shader_get_parent(wined3d_shader); + shader_impl = wined3d_shader_get_parent(wined3d_shader); + *shader = &shader_impl->IDirect3DVertexShader9_iface; IDirect3DVertexShader9_AddRef(*shader); wined3d_shader_decref(wined3d_shader); }

1 0

Piotr Caban : kernel32/tests: Added IdnToNameprepUnicode tests.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 6cda3776f6d19877196f8abff2b4c28a1e6e669c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cda3776f6d19877196f8abff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 16:11:52 2012 +0200 kernel32/tests: Added IdnToNameprepUnicode tests. --- dlls/kernel32/tests/locale.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 79653ba..63cace1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -76,6 +76,7 @@ static INT (WINAPI *pLCIDToLocaleName)(LCID, LPWSTR, INT, DWORD); static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); +static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -89,6 +90,7 @@ static void InitFunctionPointers(void) pIsValidLanguageGroup = (void*)GetProcAddress(hKernel32, "IsValidLanguageGroup"); pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); + pIdnToNameprepUnicode = (void*)GetProcAddress(hKernel32, "IdnToNameprepUnicode"); } #define eq(received, expected, label, type) \ @@ -2826,6 +2828,159 @@ static void test_GetStringTypeW(void) ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); } +static void test_IdnToNameprepUnicode(void) +{ + struct { + DWORD in_len; + const WCHAR in[64]; + DWORD ret; + const WCHAR out[64]; + DWORD flags; + DWORD err; + DWORD todo; + } test_data[] = { + { + 5, {'t','e','s','t',0}, + 5, {'t','e','s','t',0}, + 0, 0xdeadbeef + }, + { + 3, {'a',0xe111,'b'}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 4, {'t',0,'e',0}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 1, {'T',0}, + 1, {'T',0}, + 0, 0xdeadbeef + }, + { + 1, {0}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 6, {' ','-','/','[',']',0}, + 6, {' ','-','/','[',']',0}, + 0, 0xdeadbeef + }, + { + 3, {'a','-','a'}, + 3, {'a','-','a'}, + IDN_USE_STD3_ASCII_RULES, 0xdeadbeef + }, + { + 3, {'a','a','-'}, + 0, {0}, + IDN_USE_STD3_ASCII_RULES, ERROR_INVALID_NAME + }, + { /* FoldString is not working as expected when MAP_FOLDCZONE is specified (composition+compatibility) */ + 10, {'T',0xdf,0x130,0x143,0x37a,0x6a,0x30c,' ',0xaa,0}, + 12, {'t','s','s','i',0x307,0x144,' ',0x3b9,0x1f0,' ','a',0}, + 0, 0xdeadbeef, TRUE + }, + { + 11, {'t',0xad,0x34f,0x1806,0x180b,0x180c,0x180d,0x200b,0x200c,0x200d,0}, + 2, {'t',0}, + 0, 0xdeadbeef + }, + { /* Another example of incorrectly working FoldString (composition) */ + 2, {0x3b0, 0}, + 2, {0x3b0, 0}, + 0, 0xdeadbeef, TRUE + }, + { + 2, {0x221, 0}, + 0, {0}, + 0, ERROR_NO_UNICODE_TRANSLATION + }, + { + 2, {0x221, 0}, + 2, {0x221, 0}, + IDN_ALLOW_UNASSIGNED, 0xdeadbeef + }, + }; + + WCHAR buf[1024]; + DWORD i, ret, err; + + if (!pIdnToNameprepUnicode) + { + win_skip("IdnToNameprepUnicode is not available\n"); + return; + } + + ret = pIdnToNameprepUnicode(0, test_data[0].in, + test_data[0].in_len, NULL, 0); + ok(ret == test_data[0].ret, "ret = %d\n", ret); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[1].in, + test_data[1].in_len, NULL, 0); + err = GetLastError(); + ok(ret == test_data[1].ret, "ret = %d\n", ret); + ok(err == test_data[1].err, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[0].in, -1, + buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + ok(ret == test_data[0].ret, "ret = %d\n", ret); + ok(err == 0xdeadbeef, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[0].in, -2, + buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[0].in, 0, + buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_NAME, "err = %d\n", err); + + ret = pIdnToNameprepUnicode(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES, + test_data[0].in, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == test_data[0].ret, "ret = %d\n", ret); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, NULL, 0, NULL, 0); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(4, NULL, 0, NULL, 0); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_FLAGS, "err = %d\n", err); + + for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) + { + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(test_data[i].flags, test_data[i].in, + test_data[i].in_len, buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + if(!test_data[i].todo) { + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + }else { + todo_wine ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + } + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -2853,6 +3008,7 @@ START_TEST(locale) test_EnumUILanguageA(); test_GetCPInfo(); test_GetStringTypeW(); + test_IdnToNameprepUnicode(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Nikolay Sivov : msxml3: Support disabled escaping mode when writing attribute values.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 3bc1bdaee79aaaf76d1ac9da217f03cfbb3b3f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc1bdaee79aaaf76d1ac9da2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 20:40:53 2012 +0400 msxml3: Support disabled escaping mode when writing attribute values. --- dlls/msxml3/mxwriter.c | 20 +++++++++++++------- dlls/msxml3/tests/saxreader.c | 35 +++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index c512d5c..07ff1ff 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1019,19 +1019,20 @@ static HRESULT WINAPI SAXContentHandler_startElement( if (attr) { + int length, i, escape; HRESULT hr; - INT length; - INT i; hr = ISAXAttributes_getLength(attr, &length); if (FAILED(hr)) return hr; + escape = This->props[MXWriter_DisableEscaping] == VARIANT_FALSE || + (This->class_version == MSXML4 || This->class_version == MSXML6); + for (i = 0; i < length; i++) { static const WCHAR eqW[] = {'='}; const WCHAR *str; - WCHAR *escaped; - INT len = 0; + int len = 0; hr = ISAXAttributes_getQName(attr, i, &str, &len); if (FAILED(hr)) return hr; @@ -1046,9 +1047,14 @@ static HRESULT WINAPI SAXContentHandler_startElement( hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - escaped = get_escaped_string(str, EscapeValue, &len); - write_output_buffer_quoted(This->buffer, escaped, len); - heap_free(escaped); + if (escape) + { + WCHAR *escaped = get_escaped_string(str, EscapeValue, &len); + write_output_buffer_quoted(This->buffer, escaped, len); + heap_free(escaped); + } + else + write_output_buffer_quoted(This->buffer, str, len); } } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 04a0648..ebb9d89 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2832,9 +2832,10 @@ static void test_mxwriter_startenddocument(void) enum startendtype { - StartElement, - EndElement, - StartEndElement + StartElement = 0x001, + EndElement = 0x010, + StartEndElement = 0x011, + DisableEscaping = 0x100 }; struct writer_startendelement_t { @@ -2850,6 +2851,7 @@ struct writer_startendelement_t { static const char startelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\">"; static const char startendelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\"/>"; +static const char startendelement_noescape_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&\">\"/>"; static const struct writer_startendelement_t writer_startendelement[] = { /* 0 */ @@ -2948,6 +2950,13 @@ static const struct writer_startendelement_t writer_startendelement[] = { { &CLSID_MXXMLWriter40, StartEndElement, "", "", "", "</>", S_OK }, /* 75 */ { &CLSID_MXXMLWriter60, StartEndElement, "", "", "", "</>", S_OK }, + + /* with disabled output escaping */ + { &CLSID_MXXMLWriter, StartEndElement | DisableEscaping, "uri", "local", "uri:local", startendelement_noescape_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter30, StartEndElement | DisableEscaping, "uri", "local", "uri:local", startendelement_noescape_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter40, StartEndElement | DisableEscaping, "uri", "local", "uri:local", startendelement_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter60, StartEndElement | DisableEscaping, "uri", "local", "uri:local", startendelement_xml, S_OK, &saxattributes }, + { NULL } }; @@ -2998,23 +3007,21 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem hr = ISAXContentHandler_startDocument(content); EXPECT_HR(hr, S_OK); - if (table->type == StartElement) - { - hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), table->attr); - ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); - } - else if (table->type == EndElement) + if (table->type & DisableEscaping) { - hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname)); - ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + hr = IMXWriter_put_disableOutputEscaping(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); } - else + + if (table->type & StartElement) { hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), table->attr); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + } + + if (table->type & EndElement) + { hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), lstrlen(table->uri), _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname)); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr);

1 0

Piotr Caban : make_unicode: Create tables with data needed by nameprep algorithm.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 047793e1aab100d8d64d6b252535ca20f7b6de98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047793e1aab100d8d64d6b252… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 25 17:56:33 2012 +0200 make_unicode: Create tables with data needed by nameprep algorithm. --- dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nameprep.c | 1430 +++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 190 ++++++ 3 files changed, 1621 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=047793e1aab100d8d64d6…

1 0

Piotr Caban : kernel32/tests: Added more FoldString tests.
by Alexandre Julliard April 26, 2012

April 26, 2012

Module: wine Branch: master Commit: 4242fc94a5aace8126b87dc03b40cf1dde237db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4242fc94a5aace8126b87dc03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 16:11:12 2012 +0200 kernel32/tests: Added more FoldString tests. --- dlls/kernel32/tests/locale.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 49678ce..79653ba 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2102,6 +2102,18 @@ static void test_FoldStringW(void) { 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e','\0' }; + static const WCHAR foldczone_todo_src[] = + { + 0x3c5,0x308,0x6a,0x30c,0xa0,0xaa,0 + }; + static const WCHAR foldczone_todo_dst[] = + { + 0x3cb,0x1f0,' ','a',0 + }; + static const WCHAR foldczone_todo_broken_dst[] = + { + 0x3cb,0x1f0,0xa0,0xaa,0 + }; static const WCHAR ligatures_src[] = { 'W', 'i', 'n', 'e', 0x03a6, 0x03b9, 0x03bd, 0x03b5, @@ -2246,6 +2258,13 @@ static void test_FoldStringW(void) ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)), "MAP_FOLDCZONE: Expanded incorrectly\n"); + ret = pFoldStringW(MAP_FOLDCZONE|MAP_PRECOMPOSED, foldczone_todo_src, -1, dst, 256); + todo_wine ok(ret == sizeof(foldczone_todo_dst)/sizeof(foldczone_todo_dst[0]), + "Got %d, error %d\n", ret, GetLastError()); + todo_wine ok(!memcmp(dst, foldczone_todo_dst, sizeof(foldczone_todo_dst)) + || broken(!memcmp(dst, foldczone_todo_broken_dst, sizeof(foldczone_todo_broken_dst))), + "MAP_FOLDCZONE: Expanded incorrectly (%s)\n", wine_dbgstr_w(dst)); + /* MAP_EXPAND_LIGATURES */ SetLastError(0); ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);

1 0