March 2017 - Wine-Commits - list.winehq.org

Huw Davies : oledb32: Fixed length calculation in conversion to DBTYPE_STR.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 28debe67d251f91400f4d23e23795a853eda5fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28debe67d251f91400f4d23e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 11:32:05 2017 +0000 oledb32: Fixed length calculation in conversion to DBTYPE_STR. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ac462f2..e3e29e0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -813,26 +813,27 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, SysFreeString(b); return hr; } + case DBTYPE_STR: { BSTR b; - DBLENGTH bstr_len; + DBLENGTH length; INT bytes_to_copy; - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, src, &b, sizeof(BSTR), src_status, dst_status, precision, scale, flags); if(hr != S_OK) return hr; - bstr_len = SysStringLen(b); - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ + length = WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b), NULL, 0, NULL, NULL); + *dst_len = length; /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; - bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); + bytes_to_copy = min(length + 1, dst_max_len); if(dst) { if(bytes_to_copy >= sizeof(char)) { - WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); - *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; - if(bytes_to_copy < *dst_len + sizeof(char)) + WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b), dst, bytes_to_copy - 1, NULL, NULL); + *((char *)dst + bytes_to_copy - 1) = 0; + if(bytes_to_copy < length + 1) *dst_status = DBSTATUS_S_TRUNCATED; } else

1 0

Henri Verbeet : usp10: Use memmove() in GSUB_apply_LigatureSubst().
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: bab506e1cd99d1284cb6bfe05610a2416d04b6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab506e1cd99d1284cb6bfe05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:55 2017 +0100 usp10: Use memmove() in GSUB_apply_LigatureSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 4f3b559..3bbf5ec 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1058,9 +1058,8 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN TRACE("0x%x\n",glyphs[replaceIdx]); if (CompCount > 0) { - int j; - for (j = replaceIdx + 1; j < *glyph_count; j++) - glyphs[j] =glyphs[j+CompCount]; + unsigned int j = replaceIdx + 1; + memmove(&glyphs[j], &glyphs[j + CompCount], (*glyph_count - j) * sizeof(*glyphs)); *glyph_count = *glyph_count - CompCount; } return replaceIdx + write_dir;

1 0

Henri Verbeet : ddraw: Avoid destroying ddraw objects from DllMain().
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 1a14a6efd574922b46ed410623e3bfd0c03918f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a14a6efd574922b46ed41062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:53 2017 +0100 ddraw: Avoid destroying ddraw objects from DllMain(). It's not clear we're supposed to clean up after the application like this, and it seems questionable whether it makes things better in general. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/main.c | 114 +++++++----------------------------------------------- 1 file changed, 14 insertions(+), 100 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4caa923..863dc31 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -792,52 +792,6 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( instance ); } -/******************************************************************************* - * DestroyCallback - * - * Callback function for the EnumSurfaces call in DllMain. - * Dumps some surface info and releases the surface - * - * Params: - * surf: The enumerated surface - * desc: its description - * context: Pointer to the ddraw impl - * - * Returns: - * DDENUMRET_OK; - *******************************************************************************/ -static HRESULT WINAPI -DestroyCallback(IDirectDrawSurface7 *surf, - DDSURFACEDESC2 *desc, - void *context) -{ - struct ddraw_surface *Impl = impl_from_IDirectDrawSurface7(surf); - ULONG ref7, ref4, ref3, ref2, ref1, gamma_count, iface_count; - - ref7 = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ - ref4 = Impl->ref4; - ref3 = Impl->ref3; - ref2 = Impl->ref2; - ref1 = Impl->ref1; - gamma_count = Impl->gamma_count; - - WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u gamma: %u\n", - Impl, ref7, ref4, ref3, ref2, ref1, gamma_count); - - /* Skip surfaces which are attached somewhere or which are - * part of a complex compound. They will get released when destroying - * the root - */ - if( (!Impl->is_complex_root) || (Impl->first_attached != Impl) ) - return DDENUMRET_OK; - - /* Destroy the surface */ - iface_count = ddraw_surface_release_iface(Impl); - while (iface_count) iface_count = ddraw_surface_release_iface(Impl); - - return DDENUMRET_OK; -} - /*********************************************************************** * DllMain (DDRAW.0) * @@ -923,66 +877,26 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) } case DLL_PROCESS_DETACH: - if(!list_empty(&global_ddraw_list)) + if (WARN_ON(ddraw)) { - struct list *entry, *entry2; - WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n"); + struct ddraw *ddraw; - /* We remove elements from this loop */ - LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list) + LIST_FOR_EACH_ENTRY(ddraw, &global_ddraw_list, struct ddraw, ddraw_list_entry) { - struct ddraw *ddraw = LIST_ENTRY(entry, struct ddraw, ddraw_list_entry); - HRESULT hr; - DDSURFACEDESC2 desc; - int i; - - WARN("DDraw %p has a refcount of %d\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref3 + ddraw->ref2 + ddraw->ref1); - - /* Add references to each interface to avoid freeing them unexpectedly */ - IDirectDraw_AddRef(&ddraw->IDirectDraw_iface); - IDirectDraw2_AddRef(&ddraw->IDirectDraw2_iface); - IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface); - IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - - /* Does a D3D device exist? Destroy it - * TODO: Destroy all Vertex buffers, Lights, Materials - * and execute buffers too - */ - if(ddraw->d3ddevice) - { - WARN("DDraw %p has d3ddevice %p attached\n", ddraw, ddraw->d3ddevice); - while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface)); - } + struct ddraw_surface *surface; - /* Destroy the swapchain after any 3D device. The 3D device - * cleanup code needs a swapchain. Specifically, it tries to - * set the current render target to the front buffer. */ - if (ddraw->wined3d_swapchain) - ddraw_destroy_swapchain(ddraw); - - /* Try to release the objects - * Do an EnumSurfaces to find any hanging surfaces - */ - memset(&desc, 0, sizeof(desc)); - desc.dwSize = sizeof(desc); - for(i = 0; i <= 1; i++) - { - hr = IDirectDraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface, DDENUMSURFACES_ALL, - &desc, ddraw, DestroyCallback); - if(hr != D3D_OK) - ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); - } + WARN("DirectDraw object %p has reference counts {%u, %u, %u, %u, %u}.\n", + ddraw, ddraw->ref7, ddraw->ref4, ddraw->ref3, ddraw->ref2, ddraw->ref1); - if (!list_empty(&ddraw->surface_list)) - ERR("DDraw %p still has surfaces attached.\n", ddraw); + if (ddraw->d3ddevice) + WARN("DirectDraw object %p has Direct3D device %p attached.\n", ddraw, ddraw->d3ddevice); - /* Release all hanging references to destroy the objects. This - * restores the screen mode too - */ - while(IDirectDraw_Release(&ddraw->IDirectDraw_iface)); - while(IDirectDraw2_Release(&ddraw->IDirectDraw2_iface)); - while(IDirectDraw4_Release(&ddraw->IDirectDraw4_iface)); - while(IDirectDraw7_Release(&ddraw->IDirectDraw7_iface)); + LIST_FOR_EACH_ENTRY(surface, &ddraw->surface_list, struct ddraw_surface, surface_list_entry) + { + WARN("Surface %p has reference counts {%u, %u, %u, %u, %u, %u}.\n", + surface, surface->ref7, surface->ref4, surface->ref3, + surface->ref2, surface->ref1, surface->gamma_count); + } } }

1 0

Henri Verbeet : wined3d: Send swapchain context creation through the command stream.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 3b0e37a0f49e4d0c94da18188dd150c601071855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0e37a0f49e4d0c94da18188… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:52 2017 +0100 wined3d: Send swapchain context creation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 86 +++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1f31352..dff1354 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -782,6 +782,50 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } +static void wined3d_swapchain_cs_init(void *object) +{ + struct wined3d_swapchain *swapchain = object; + const struct wined3d_gl_info *gl_info; + unsigned int i; + + static const enum wined3d_format_id formats[] = + { + WINED3DFMT_D24_UNORM_S8_UINT, + WINED3DFMT_D32_UNORM, + WINED3DFMT_R24_UNORM_X8_TYPELESS, + WINED3DFMT_D16_UNORM, + WINED3DFMT_S1_UINT_D15_UNORM, + }; + + gl_info = &swapchain->device->adapter->gl_info; + + /* Without ORM_FBO, switching the depth/stencil format is hard. Always + * request a depth/stencil buffer in the likely case it's needed later. */ + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + swapchain->ds_format = wined3d_get_format(gl_info, formats[i], WINED3DUSAGE_DEPTHSTENCIL); + if ((swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) + break; + TRACE("Depth stencil format %s is not supported, trying next format.\n", debug_d3dformat(formats[i])); + } + + if (!swapchain->context[0]) + { + WARN("Failed to create context.\n"); + return; + } + swapchain->num_contexts = 1; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (!swapchain->desc.enable_auto_depth_stencil + || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) + FIXME("Add OpenGL context recreation support.\n"); + + context_release(swapchain->context[0]); + + swapchain_update_swap_interval(swapchain); +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -908,17 +952,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (!(device->wined3d->flags & WINED3D_NO3D)) { - static const enum wined3d_format_id formats[] = - { - WINED3DFMT_D24_UNORM_S8_UINT, - WINED3DFMT_D32_UNORM, - WINED3DFMT_R24_UNORM_X8_TYPELESS, - WINED3DFMT_D16_UNORM, - WINED3DFMT_S1_UINT_D15_UNORM - }; - - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context) { @@ -927,42 +960,13 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } - /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. - * You are able to add a depth + stencil surface at a later stage when you need it. - * In order to support this properly in WineD3D we need the ability to recreate the opengl context and - * drawable when this is required. This is very tricky as we need to reapply ALL opengl states for the new - * context, need torecreate shaders, textures and other resources. - * - * The context manager already takes care of the state problem and for the other tasks code from Reset - * can be used. These changes are way to risky during the 1.0 code freeze which is taking place right now. - * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the - * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this - * issue needs to be fixed. */ - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) - { - swapchain->ds_format = wined3d_get_format(gl_info, formats[i], WINED3DUSAGE_DEPTHSTENCIL); - swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); - if (swapchain->context[0]) break; - TRACE("Depth stencil format %s is not supported, trying next format\n", - debug_d3dformat(formats[i])); - } + wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); if (!swapchain->context[0]) { - WARN("Failed to create context.\n"); hr = WINED3DERR_NOTAVAILABLE; goto err; } - swapchain->num_contexts = 1; - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (!desc->enable_auto_depth_stencil - || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) - { - FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); - } - context_release(swapchain->context[0]); - swapchain_update_swap_interval(swapchain); } if (swapchain->desc.backbuffer_count > 0)

1 0

Alistair Leslie-Hughes : dpwsockx: Implementation of GetCaps callback.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 8952040a0e46bc531bbc18a0c045584ca2bbedd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8952040a0e46bc531bbc18a0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 28 23:17:17 2017 +0000 dpwsockx: Implementation of GetCaps callback. Based on patch by Ismael Barros. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 6 +++++ dlls/dplayx/tests/dplayx.c | 56 ++++++++++++++++++++----------------------- dlls/dpwsockx/dpwsockx_dll.h | 9 +++++++ dlls/dpwsockx/dpwsockx_main.c | 27 +++++++++++++++++++-- 4 files changed, 66 insertions(+), 32 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index f4d934f..4a80f1c 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2891,9 +2891,15 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags); + if ( !caps ) + return DPERR_INVALIDPARAMS; + if ( This->dp2->connectionInitialized == NO_PROVIDER ) return DPERR_UNINITIALIZED; + if( caps->dwSize != sizeof(DPCAPS) ) + return DPERR_INVALIDPARAMS; + /* Query the service provider */ data.idPlayer = player; data.dwFlags = flags; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index de392aa..4c68873 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1088,7 +1088,7 @@ static void test_GetCaps(void) /* dpcaps not ininitialized */ hr = IDirectPlayX_GetCaps( pDP, &dpcaps, 0 ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpcaps.dwSize = sizeof(DPCAPS); @@ -1098,35 +1098,30 @@ static void test_GetCaps(void) { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); - - - if ( hr == DP_OK ) + checkHR( DP_OK, hr ); + check( sizeof(DPCAPS), dpcaps.dwSize ); + check( DPCAPS_ASYNCSUPPORTED | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED, + dpcaps.dwFlags ); + check( 0, dpcaps.dwMaxQueueSize ); + check( 0, dpcaps.dwHundredBaud ); + check( 500, dpcaps.dwLatency ); + check( 65536, dpcaps.dwMaxLocalPlayers ); + check( 20, dpcaps.dwHeaderLength ); + check( 5000, dpcaps.dwTimeout ); + + switch (dwFlags) { - check( sizeof(DPCAPS), dpcaps.dwSize ); - check( DPCAPS_ASYNCSUPPORTED | - DPCAPS_GUARANTEEDOPTIMIZED | - DPCAPS_GUARANTEEDSUPPORTED, - dpcaps.dwFlags ); - check( 0, dpcaps.dwMaxQueueSize ); - check( 0, dpcaps.dwHundredBaud ); - check( 500, dpcaps.dwLatency ); - check( 65536, dpcaps.dwMaxLocalPlayers ); - check( 20, dpcaps.dwHeaderLength ); - check( 5000, dpcaps.dwTimeout ); - - switch (dwFlags) - { - case 0: - check( 65479, dpcaps.dwMaxBufferSize ); - check( 65536, dpcaps.dwMaxPlayers ); - break; - case DPGETCAPS_GUARANTEED: - check( 1048547, dpcaps.dwMaxBufferSize ); - check( 64, dpcaps.dwMaxPlayers ); - break; - default: break; - } + case 0: + check( 65479, dpcaps.dwMaxBufferSize ); + check( 65536, dpcaps.dwMaxPlayers ); + break; + case DPGETCAPS_GUARANTEED: + check( 1048547, dpcaps.dwMaxBufferSize ); + check( 64, dpcaps.dwMaxPlayers ); + break; + default: break; } } @@ -2189,7 +2184,6 @@ static void test_GetPlayerCaps(void) hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); checkHR( DPERR_INVALIDPARAMS, hr ); - /* Invalid player */ playerCaps.dwSize = sizeof(DPCAPS); @@ -2202,6 +2196,8 @@ static void test_GetPlayerCaps(void) hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); checkHR( DP_OK, hr ); + hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], NULL, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); /* Regular parameters */ for (i=0; i<2; i++) diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h index 1a6ad6c..ea3780f 100644 --- a/dlls/dpwsockx/dpwsockx_dll.h +++ b/dlls/dpwsockx/dpwsockx_dll.h @@ -25,6 +25,15 @@ #include "winnt.h" #include "wine/dplaysp.h" +#define DPWS_MAXQUEUESIZE 0 +#define DPWS_HUNDREDBAUD 0 +#define DPWS_LATENCY 500 +#define DPWS_MAXLOCALPLAYERS 65536 +#define DPWS_TIMEOUT 5000 +#define DPWS_MAXBUFFERSIZE 65479 +#define DPWS_MAXPLAYERS 65536 +#define DPWS_GUARANTEED_MAXBUFFERSIZE 1048547 +#define DPWS_GUARANTEED_MAXPLAYERS 64 typedef struct tagDPWS_THREADDATA { diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index 548f37e..9606d73 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -100,9 +100,32 @@ static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) { - FIXME( "(%d,%p,0x%08x,%p)\n", + TRACE( "(%d,%p,0x%08x,%p)\n", data->idPlayer, data->lpCaps, data->dwFlags, data->lpISP ); - return DPERR_UNSUPPORTED; + + data->lpCaps->dwFlags = ( DPCAPS_ASYNCSUPPORTED | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED ); + + data->lpCaps->dwMaxQueueSize = DPWS_MAXQUEUESIZE; + data->lpCaps->dwHundredBaud = DPWS_HUNDREDBAUD; + data->lpCaps->dwLatency = DPWS_LATENCY; + data->lpCaps->dwMaxLocalPlayers = DPWS_MAXLOCALPLAYERS; + data->lpCaps->dwHeaderLength = sizeof(DPSP_MSG_HEADER); + data->lpCaps->dwTimeout = DPWS_TIMEOUT; + + if ( data->dwFlags & DPGETCAPS_GUARANTEED ) + { + data->lpCaps->dwMaxBufferSize = DPWS_GUARANTEED_MAXBUFFERSIZE; + data->lpCaps->dwMaxPlayers = DPWS_GUARANTEED_MAXPLAYERS; + } + else + { + data->lpCaps->dwMaxBufferSize = DPWS_MAXBUFFERSIZE; + data->lpCaps->dwMaxPlayers = DPWS_MAXPLAYERS; + } + + return DP_OK; } static HRESULT WINAPI DPWSCB_Open( LPDPSP_OPENDATA data )

1 0

Alistair Leslie-Hughes : oledb32/tests: Add tests for conversion to DBTYPE_STR.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 853de70bc0279bc6805dce81d89186b70734e5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=853de70bc0279bc6805dce81d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 1 11:32:06 2017 +0000 oledb32/tests: Add tests for conversion to DBTYPE_STR. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 0e4a834..663f78e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1516,6 +1516,9 @@ static void test_converttostr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + static const WCHAR idW[] = {'0','C','7','3','3','A','8','D','-','2','A','1','C',0 }; + static const char idA[] = "0C733A8D"; + static const char withnull[] = "test\0ed"; static const char ten_a[] = "10"; static const char fourthreetwoone[] = "4321"; static const char guid_str[] = "{0C733A8D-2A1C-11CE-ADE5-00AA0044773D}"; @@ -1877,6 +1880,47 @@ static void test_converttostr(void) ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); SysFreeString(b); + b = SysAllocString(idW); + *(BSTR *)src = b; + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_STR, 0, &dst_len, src, dst, 9, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 13, "got %ld\n", dst_len); + ok(!lstrcmpA(idA, dst), "got %s\n", dst); + SysFreeString(b); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, sizeof(withnull), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 8), "got %s\n", dst); + ok(dst[8] == 0, "got %02x\n", dst[8]); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 7, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 7, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 7), "got %s\n", dst); + ok(dst[7] == 0, "got %02x\n", dst[7]); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 6, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 6, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 6), "got %s\n", dst); + ok(dst[6] == 0, "got %02x\n", dst[6]); + memcpy(src, ten, sizeof(ten)); memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234;

1 0

Henri Verbeet : usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters() .
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 1727dd41568cc445cf33e211f580ca706b622f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1727dd41568cc445cf33e211f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:56 2017 +0100 usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8daefcc..9e0addc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -753,11 +753,9 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch { int i; int target_glyph = nextIndex - write_dir; - int seeking_glyph; int target_index = -1; int replacing_glyph = -1; int changed = 0; - int top_logclust = 0; if (changeCount > 0) { @@ -767,35 +765,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch target_glyph = nextIndex + (changeCount + 1); } - seeking_glyph = target_glyph; - for (i = 0; i < chars; i++) - if (pwLogClust[i] > top_logclust) - top_logclust = pwLogClust[i]; - - do { - if (write_dir > 0) - for (i = 0; i < chars; i++) - { - if (pwLogClust[i] == seeking_glyph) - { - target_index = i; - break; - } - } - else - for (i = chars - 1; i >= 0; i--) - { - if (pwLogClust[i] == seeking_glyph) - { - target_index = i; - break; - } - } - if (target_index == -1) - seeking_glyph ++; - } - while (target_index == -1 && seeking_glyph <= top_logclust); - + target_index = USP10_FindGlyphInLogClust(pwLogClust, chars, target_glyph); if (target_index == -1) { ERR("Unable to find target glyph\n");

1 0