wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Jacek Caban : urlmon: Include extra info in object name passed to HttpOpenRequest.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 90b1bcc1aefd27e7c8719ab7e906ecc9296bbb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b1bcc1aefd27e7c8719ab7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:09:22 2009 +0100 urlmon: Include extra info in object name passed to HttpOpenRequest. --- dlls/urlmon/http.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index bb81ec8..2e47b11 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -95,7 +95,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ memset(&url_comp, 0, sizeof(url_comp)); url_comp.dwStructSize = sizeof(url_comp); - url_comp.dwSchemeLength = url_comp.dwHostNameLength = url_comp.dwUrlPathLength = + url_comp.dwSchemeLength = url_comp.dwHostNameLength = url_comp.dwUrlPathLength = url_comp.dwExtraInfoLength = url_comp.dwUserNameLength = url_comp.dwPasswordLength = 1; if (!InternetCrackUrlW(url, 0, 0, &url_comp)) return MK_E_SYNTAX; @@ -124,7 +124,12 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ } accept_mimes[num] = 0; - path = heap_strndupW(url_comp.lpszUrlPath, url_comp.dwUrlPathLength); + path = heap_alloc((url_comp.dwUrlPathLength+url_comp.dwExtraInfoLength+1)*sizeof(WCHAR)); + if(url_comp.dwUrlPathLength) + memcpy(path, url_comp.lpszUrlPath, url_comp.dwUrlPathLength*sizeof(WCHAR)); + if(url_comp.dwExtraInfoLength) + memcpy(path+url_comp.dwUrlPathLength, url_comp.lpszExtraInfo, url_comp.dwExtraInfoLength*sizeof(WCHAR)); + path[url_comp.dwUrlPathLength+url_comp.dwExtraInfoLength] = 0; if(This->https) request_flags |= INTERNET_FLAG_SECURE; This->base.request = HttpOpenRequestW(This->base.connection,

1 0

Jacek Caban : wininet: Set lpszUrlPath in InternetCrackUrlW if its length is 0.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 5b76702e84652832ba21ca22afb4544c5f6fb95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b76702e84652832ba21ca22a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:09:06 2009 +0100 wininet: Set lpszUrlPath in InternetCrackUrlW if its length is 0. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/url.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ac845a8..d749e53 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1603,7 +1603,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR * <protocol>:[//<net_loc>][/path][;<params>][?<query>][#<fragment>] * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */ - if (lpszcp != 0 && lpszcp - lpszUrl < dwUrlLength && (!lpszParam || lpszcp < lpszParam)) + if (lpszcp != 0 && lpszcp - lpszUrl < dwUrlLength && (!lpszParam || lpszcp <= lpszParam)) { INT len; diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 527c2c7..7439cd3 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -94,6 +94,7 @@ typedef struct { INTERNET_SCHEME scheme; int host_off; int host_len; + int host_skip_broken; INTERNET_PORT port; int user_off; int user_len; @@ -107,15 +108,17 @@ typedef struct { static const crack_url_test_t crack_url_tests[] = { {"http://www.winehq.org/site/about#hi", - 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 80, -1, 0, -1, 0, 21, 11, 32, 3}, + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, -1, 80, -1, 0, -1, 0, 21, 11, 32, 3}, {"http://www.myserver.com/myscript.php?arg=1", - 0, 4, INTERNET_SCHEME_HTTP, 7, 16, 80, -1, 0, -1, 0, 23, 13, 36, 6}, + 0, 4, INTERNET_SCHEME_HTTP, 7, 16, -1, 80, -1, 0, -1, 0, 23, 13, 36, 6}, + {"http://www.winehq.org?test=123", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, 21, 9}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", - 0, 4, INTERNET_SCHEME_FILE, -1, 0, 0, -1, 0, -1, 0, 7, 55, -1, 0}, + 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0}, {"fide:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", - 0, 4, INTERNET_SCHEME_UNKNOWN, 7, 0, 0, -1, 0, -1, 0, 7, 55, -1, 0}, + 0, 4, INTERNET_SCHEME_UNKNOWN, 7, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0}, {"file://C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", - 0, 4, INTERNET_SCHEME_FILE, -1, 0, 0, -1, 0, -1, 0, 7, 54, -1, 0}, + 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 54, -1, 0}, }; static void test_crack_url(const crack_url_test_t *test) @@ -143,6 +146,10 @@ static void test_crack_url(const crack_url_test_t *test) else ok(url.lpszHostName == test->url+test->host_off, "[%s] url.lpszHostName = %p, expected %p\n", test->url, url.lpszHostName, test->url+test->host_off); + if(test->host_skip_broken != -1 && url.dwHostNameLength == test->host_skip_broken) { + win_skip("skipping broken dwHostNameLength result\n"); + return; + } ok(url.dwHostNameLength == test->host_len, "[%s] url.lpszHostNameLength = %d, expected %d\n", test->url, url.dwHostNameLength, test->host_len);

1 0

Jacek Caban : wininet: Make InternetCrackUrlA tests more generic and add more tests.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: d153344eaad550aec87ac1932de4b322498b19bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d153344eaad550aec87ac1932… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:08:48 2009 +0100 wininet: Make InternetCrackUrlA tests more generic and add more tests. --- dlls/wininet/tests/url.c | 152 ++++++++++++++++++++++++++++++---------------- 1 files changed, 99 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d153344eaad550aec87ac…

1 0

Jacek Caban : wininet: lpszUrlPath should be NULL for URLs in file:///... format.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 5e8e358a71746110b654ad0df893f7faa248a396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8e358a71746110b654ad0df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:08:26 2009 +0100 wininet: lpszUrlPath should be NULL for URLs in file:///... format. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8a3340c..ac845a8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1550,7 +1550,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR } /* If the scheme is "file" and the host is just one letter, it's not a host */ - if(lpUC->nScheme==INTERNET_SCHEME_FILE && (lpszPort-lpszHost)==1) + if(lpUC->nScheme==INTERNET_SCHEME_FILE && lpszPort <= lpszHost+1) { lpszcp=lpszHost; SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength,

1 0

Henri Verbeet : dxgi: Implement IDXGIOutput::GetDisplayModeList().
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: f282db24083c4d4d0c91368266132383d24458ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f282db24083c4d4d0c9136826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:10 2009 +0100 dxgi: Implement IDXGIOutput::GetDisplayModeList(). --- dlls/dxgi/output.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5b83427..eee6e55 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -117,10 +117,54 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p stub!\n", + struct dxgi_output *This = (struct dxgi_output *)iface; + WINED3DFORMAT wined3d_format; + IWineD3D *wined3d; + UINT i; + + TRACE("iface %p, format %s, flags %#x, mode_count %p, desc %p.\n", iface, debug_dxgi_format(format), flags, mode_count, desc); - return E_NOTIMPL; + wined3d = IWineDXGIFactory_get_wined3d(This->adapter->parent); + wined3d_format = wined3dformat_from_dxgi_format(format); + + if (!desc) + { + EnterCriticalSection(&dxgi_cs); + *mode_count = IWineD3D_GetAdapterModeCount(wined3d, This->adapter->ordinal, wined3d_format); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + + return S_OK; + } + + EnterCriticalSection(&dxgi_cs); + for (i = 0; i < *mode_count; ++i) + { + WINED3DDISPLAYMODE mode; + HRESULT hr; + + hr = IWineD3D_EnumAdapterModes(wined3d, This->adapter->ordinal, wined3d_format, i, &mode); + if (FAILED(hr)) + { + WARN("EnumAdapterModes failed, hr %#x.\n", hr); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + return hr; + } + + desc[i].Width = mode.Width; + desc[i].Height = mode.Height; + desc[i].RefreshRate.Numerator = mode.RefreshRate; + desc[i].RefreshRate.Denominator = 1; + desc[i].Format = format; + desc[i].ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; /* FIXME */ + desc[i].Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ + } + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput *iface,

1 0

Henri Verbeet : wined3d: Support more formats for display mode enumeration.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: b85a070598196da2de7cbbf7f30ffca94f2c7a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85a070598196da2de7cbbf7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:09 2009 +0100 wined3d: Support more formats for display mode enumeration. ddraw/d3d8/d3d9 only support a limited number of formats, but those already limit the supported formats themselves. --- dlls/wined3d/directx.c | 62 +++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 405ae97..a29b90c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2199,6 +2199,8 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad /* TODO: Store modes per adapter and read it from the adapter structure */ if (Adapter == 0) { /* Display */ + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapters[Adapter].gl_info); + UINT format_bits = format_desc->byte_count * CHAR_BIT; unsigned int i = 0; unsigned int j = 0; DEVMODEW mode; @@ -2209,28 +2211,15 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad while (EnumDisplaySettingsExW(NULL, j, &mode, 0)) { ++j; - switch (Format) + + if (Format == WINED3DFMT_UNKNOWN) + { + /* This is for D3D8, do not enumerate P8 here */ + if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; + } + else if (mode.dmBitsPerPel == format_bits) { - case WINED3DFMT_UNKNOWN: - /* This is for D3D8, do not enumerate P8 here */ - if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; - break; - - case WINED3DFMT_B8G8R8X8_UNORM: - if (mode.dmBitsPerPel == 32) ++i; - break; - - case WINED3DFMT_B5G6R5_UNORM: - if (mode.dmBitsPerPel == 16) ++i; - break; - - case WINED3DFMT_P8_UINT: - if (mode.dmBitsPerPel == 8) ++i; - break; - - default: - /* Skip other modes as they do not match the requested format */ - break; + ++i; } } @@ -2257,6 +2246,8 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte /* TODO: Store modes per adapter and read it from the adapter structure */ if (Adapter == 0) { + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapters[Adapter].gl_info); + UINT format_bits = format_desc->byte_count * CHAR_BIT; DEVMODEW DevModeW; int ModeIdx = 0; UINT i = 0; @@ -2268,27 +2259,16 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte /* If we are filtering to a specific format (D3D9), then need to skip all unrelated modes, but if mode is irrelevant (D3D8), then we can just count through the ones with valid bit depths */ - while ((i<=Mode) && EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) { - switch (Format) + while ((i<=Mode) && EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) + { + if (Format == WINED3DFMT_UNKNOWN) + { + /* This is for D3D8, do not enumerate P8 here */ + if (DevModeW.dmBitsPerPel == 32 || DevModeW.dmBitsPerPel == 16) ++i; + } + else if (DevModeW.dmBitsPerPel == format_bits) { - case WINED3DFMT_UNKNOWN: - /* This is D3D8. Do not enumerate P8 here */ - if (DevModeW.dmBitsPerPel == 32 || - DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_B8G8R8X8_UNORM: - if (DevModeW.dmBitsPerPel == 32) i++; - break; - case WINED3DFMT_B5G6R5_UNORM: - if (DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_P8_UINT: - if (DevModeW.dmBitsPerPel == 8) i++; - break; - default: - /* Modes that don't match what we support can get an early-out */ - TRACE_(d3d_caps)("Searching for %s, returning D3DERR_INVALIDCALL\n", debug_d3dformat(Format)); - return WINED3DERR_INVALIDCALL; + ++i; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6c97888..35887f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -26,6 +26,7 @@ #include <stdarg.h> #include <math.h> +#include <limits.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS

1 0

Henri Verbeet : wined3d: Rename "wineD3DDevice" to "device".
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: b3defd4c8058d451a606eebee297ac4d93ee9779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3defd4c8058d451a606eebee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:08 2009 +0100 wined3d: Rename "wineD3DDevice" to "device". --- dlls/wined3d/arb_program_shader.c | 20 ++-- dlls/wined3d/ati_fragment_shader.c | 6 +- dlls/wined3d/basetexture.c | 8 +- dlls/wined3d/buffer.c | 26 +++--- dlls/wined3d/context.c | 16 ++-- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 10 +- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/nvidia_texture_shader.c | 12 +- dlls/wined3d/palette.c | 3 +- dlls/wined3d/query.c | 24 +++--- dlls/wined3d/resource.c | 8 +- dlls/wined3d/state.c | 177 +++++++++++++++++---------------- dlls/wined3d/stateblock.c | 28 +++--- dlls/wined3d/surface.c | 80 ++++++++------- dlls/wined3d/surface_base.c | 15 +-- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/swapchain.c | 80 +++++++++------- dlls/wined3d/swapchain_base.c | 4 +- dlls/wined3d/swapchain_gdi.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 6 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/volume.c | 8 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 17 ++-- 26 files changed, 290 insertions(+), 274 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3defd4c8058d451a606e…

1 0

Henri Verbeet : wined3d: Don't restore the draw buffer in color_fill_fbo().
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: bd9828a0393a45b7fdd8c1ecb01a294355e3aa58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9828a0393a45b7fdd8c1ecb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:07 2009 +0100 wined3d: Don't restore the draw buffer in color_fill_fbo(). This should be done by the context management these days. --- dlls/wined3d/device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 51c2fa7..cebb709 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5742,12 +5742,6 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, glClear(GL_COLOR_BUFFER_BIT); checkGLcall("glClear"); - if (swapchain && surface == ((IWineD3DSwapChainImpl *)swapchain)->frontBuffer - && ((IWineD3DSwapChainImpl *)swapchain)->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer()"); - } - LEAVE_GL(); context_release(context); }

1 0

Henri Verbeet : ddraw: Avoid enumerating display modes for formats that arent't supported anyway.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: ddddc60eb9a2a03083fda1d844044c90ebe5715c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddddc60eb9a2a03083fda1d84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:06 2009 +0100 ddraw: Avoid enumerating display modes for formats that arent't supported anyway. Some of these formats can't even be translated by ddraw. --- dlls/ddraw/ddraw.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aeaffbd..46fd729 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1291,21 +1291,8 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, WINED3DFORMAT checkFormatList[] = { - WINED3DFMT_B8G8R8_UNORM, - WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B5G6R5_UNORM, - WINED3DFMT_B5G5R5X1_UNORM, - WINED3DFMT_B5G5R5A1_UNORM, - WINED3DFMT_B4G4R4A4_UNORM, - WINED3DFMT_B2G3R3_UNORM, - WINED3DFMT_B2G3R3A8_UNORM, - WINED3DFMT_B4G4R4X4_UNORM, - WINED3DFMT_R10G10B10A2_UNORM, - WINED3DFMT_R8G8B8A8_UNORM, - WINED3DFMT_R8G8B8X8_UNORM, - WINED3DFMT_B10G10R10A2_UNORM, - WINED3DFMT_P8_UINT_A8_UNORM, WINED3DFMT_P8_UINT, };

1 0

Jeremy White : usrmarshal: Add a test for marshalling a SAFEARRAY of VT_BSTR.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 7e0c4fa404c570e107953b8882a09afcedfe0f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0c4fa404c570e107953b888… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Dec 9 15:02:44 2009 -0600 usrmarshal: Add a test for marshalling a SAFEARRAY of VT_BSTR. --- dlls/oleaut32/tests/usrmarshal.c | 92 +++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d180946..d57802c 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -109,6 +109,14 @@ static ULONG get_cell_count(const SAFEARRAY *psa) return ulNumCells; } +static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) +{ + if (sftype == SF_BSTR) + return sizeof(DWORD); + else + return lpsa->cbElements; +} + static void check_safearray(void *buffer, LPSAFEARRAY lpsa) { unsigned char *wiresa = buffer; @@ -136,7 +144,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) wiresa += sizeof(WORD); ok(*(WORD *)wiresa == lpsa->fFeatures, "wiresa + 0xa should be lpsa->fFeatures instead of 0x%08x\n", *(WORD *)wiresa); wiresa += sizeof(WORD); - ok(*(DWORD *)wiresa == lpsa->cbElements, "wiresa + 0xc should be lpsa->cbElements instead of 0x%08x\n", *(DWORD *)wiresa); + ok(*(DWORD *)wiresa == elem_wire_size(lpsa, sftype), "wiresa + 0xc should be 0x%08x instead of 0x%08x\n", elem_wire_size(lpsa, sftype), *(DWORD *)wiresa); wiresa += sizeof(DWORD); ok(*(WORD *)wiresa == lpsa->cLocks, "wiresa + 0x10 should be lpsa->cLocks instead of 0x%04x\n", *(WORD *)wiresa); wiresa += sizeof(WORD); @@ -197,7 +205,7 @@ static void init_user_marshal_cb(USER_MARSHAL_CB *umcb, static void test_marshal_LPSAFEARRAY(void) { - unsigned char *buffer; + unsigned char *buffer, *p; ULONG size, expected; LPSAFEARRAY lpsa; LPSAFEARRAY lpsa2 = NULL; @@ -207,6 +215,10 @@ static void test_marshal_LPSAFEARRAY(void) USER_MARSHAL_CB umcb; HRESULT hr; VARTYPE vt; + OLECHAR *values[10]; + int expected_bstr_size; + int i; + LONG indices[1]; sab.lLbound = 5; sab.cElements = 10; @@ -324,6 +336,82 @@ static void test_marshal_LPSAFEARRAY(void) SafeArrayDestroyData(lpsa); SafeArrayDestroyDescriptor(lpsa); + /* Test an array of VT_BSTR */ + sab.lLbound = 3; + sab.cElements = sizeof(values) / sizeof(values[0]); + + lpsa = SafeArrayCreate(VT_BSTR, 1, &sab); + expected_bstr_size = 0; + for (i = 0; i < sab.cElements; i++) + { + int j; + WCHAR buf[128]; + for (j = 0; j <= i; j++) + buf[j] = 'a' + j; + buf[j] = 0; + indices[0] = i + sab.lLbound; + values[i] = SysAllocString(buf); + hr = SafeArrayPutElement(lpsa, indices, values[i]); + ok(hr == S_OK, "Failed to put bstr element hr 0x%x\n", hr); + expected_bstr_size += (j * sizeof(WCHAR)) + (3 * sizeof(DWORD)); + if (i % 2 == 0) /* Account for DWORD padding. Works so long as cElements is even */ + expected_bstr_size += sizeof(WCHAR); + } + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); + expected = 44 + (sab.cElements * sizeof(DWORD)) + expected_bstr_size; + if (sizeof(void *) == 8) /* win64 */ + expected += 12; + todo_wine + ok(size == (expected + sizeof(DWORD)), "size should be %u bytes, not %u\n", expected + (ULONG) sizeof(DWORD), size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); + todo_wine + ok(size == expected, "size should be %u bytes, not %u\n", expected, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memset(buffer, 0xcc, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + p = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + trace("LPSAFEARRAY_UserMarshal processed %ld bytes\n", p ? (long) (p - buffer) : 0); + + check_safearray(buffer, lpsa); + + lpsa2 = NULL; + if (LPSAFEARRAY_UNMARSHAL_WORKS) + { + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + p = LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); + trace("LPSAFEARRAY_UserUnmarshal processed %ld bytes\n", p ? (long) (p - buffer) : 0); + ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal, result %p\n", p); + } + + for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) + { + BSTR gotvalue = NULL; + + if (lpsa2) + { + indices[0] = i + sab.lLbound; + hr = SafeArrayGetElement(lpsa2, indices, &gotvalue); + ok(hr == S_OK, "Failed to get bstr element at hres 0x%x\n", hr); + if (hr == S_OK) + ok(VarBstrCmp(values[i], gotvalue, 0, 0) == VARCMP_EQ, "String %d does not match\n", i); + } + + SysFreeString(values[i]); + } + + if (LPSAFEARRAY_UNMARSHAL_WORKS) + { + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + } + + HeapFree(GetProcessHeap(), 0, buffer); + SafeArrayDestroy(lpsa); + + /* VARTYPE-less arrays with FADF_VARIANT */ hr = SafeArrayAllocDescriptor(1, &lpsa); ok(hr == S_OK, "saad failed %08x\n", hr);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009