January 2012 - Wine-Commits

Nikolay Sivov : msxml3: Trace VARIANT parameters.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: d56070a233b091dd40fec8375ede7527bde670cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56070a233b091dd40fec8375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 12:40:22 2012 +0300 msxml3: Trace VARIANT parameters. --- dlls/msxml3/domdoc.c | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1ae0d56..64122ce 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1000,7 +1000,7 @@ static HRESULT WINAPI domdoc_put_nodeValue( VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(v%d)\n", This, V_VT(&value)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); return E_FAIL; } @@ -1110,7 +1110,7 @@ static HRESULT WINAPI domdoc_insertBefore( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%p x%d %p)\n", This, newChild, V_VT(&refChild), outNewChild); + TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), outNewChild); return node_insert_before(&This->node, newChild, &refChild, outNewChild); } @@ -1868,7 +1868,7 @@ static HRESULT WINAPI domdoc_createNode( xmlChar *xml_name, *href; HRESULT hr; - TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_variant(&Type), debugstr_w(name), debugstr_w(namespaceURI), node); if(!node) return E_INVALIDARG; @@ -2503,21 +2503,17 @@ static HRESULT WINAPI domdoc_put_onreadystatechange( } -static HRESULT WINAPI domdoc_put_onDataAvailable( - IXMLDOMDocument3 *iface, - VARIANT onDataAvailableSink ) +static HRESULT WINAPI domdoc_put_onDataAvailable(IXMLDOMDocument3 *iface, VARIANT sink) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("%p\n", This); + FIXME("(%p)->(%s): stub\n", This, debugstr_variant(&sink)); return E_NOTIMPL; } -static HRESULT WINAPI domdoc_put_onTransformNode( - IXMLDOMDocument3 *iface, - VARIANT onTransformNodeSink ) +static HRESULT WINAPI domdoc_put_onTransformNode(IXMLDOMDocument3 *iface, VARIANT sink ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("%p\n", This); + FIXME("(%p)->(%s): stub\n", This, debugstr_variant(&sink)); return E_NOTIMPL; } @@ -2573,21 +2569,21 @@ static HRESULT WINAPI domdoc_get_schemas( static HRESULT WINAPI domdoc_putref_schemas( IXMLDOMDocument3* iface, - VARIANT var1) + VARIANT schema) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); HRESULT hr = E_FAIL; IXMLDOMSchemaCollection2* new_schema = NULL; - FIXME("(%p): semi-stub\n", This); - switch(V_VT(&var1)) + FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&schema)); + switch(V_VT(&schema)) { case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&var1), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + hr = IUnknown_QueryInterface(V_UNKNOWN(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); break; case VT_DISPATCH: - hr = IDispatch_QueryInterface(V_DISPATCH(&var1), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + hr = IDispatch_QueryInterface(V_DISPATCH(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); break; case VT_NULL: @@ -2596,7 +2592,7 @@ static HRESULT WINAPI domdoc_putref_schemas( break; default: - WARN("Can't get schema from vt %x\n", V_VT(&var1)); + WARN("Can't get schema from vt %x\n", V_VT(&schema)); } if(SUCCEEDED(hr)) @@ -2766,11 +2762,11 @@ static HRESULT WINAPI domdoc_validate( static HRESULT WINAPI domdoc_setProperty( IXMLDOMDocument3* iface, BSTR p, - VARIANT var) + VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(p), debugstr_variant(&value)); if (lstrcmpiW(p, PropertySelectionLanguageW) == 0) { @@ -2779,14 +2775,14 @@ static HRESULT WINAPI domdoc_setProperty( BSTR bstr; V_VT(&varStr) = VT_EMPTY; - if (V_VT(&var) != VT_BSTR) + if (V_VT(&value) != VT_BSTR) { - if (FAILED(hr = VariantChangeType(&varStr, &var, 0, VT_BSTR))) + if (FAILED(hr = VariantChangeType(&varStr, &value, 0, VT_BSTR))) return hr; bstr = V_BSTR(&varStr); } else - bstr = V_BSTR(&var); + bstr = V_BSTR(&value); hr = S_OK; if (lstrcmpiW(bstr, PropValueXPathW) == 0) @@ -2808,14 +2804,14 @@ static HRESULT WINAPI domdoc_setProperty( BSTR bstr; V_VT(&varStr) = VT_EMPTY; - if (V_VT(&var) != VT_BSTR) + if (V_VT(&value) != VT_BSTR) { - if (FAILED(hr = VariantChangeType(&varStr, &var, 0, VT_BSTR))) + if (FAILED(hr = VariantChangeType(&varStr, &value, 0, VT_BSTR))) return hr; bstr = V_BSTR(&varStr); } else - bstr = V_BSTR(&var); + bstr = V_BSTR(&value); hr = S_OK; @@ -2933,7 +2929,7 @@ static HRESULT WINAPI domdoc_setProperty( lstrcmpiW(p, PropertyResolveExternalsW) == 0) { /* Ignore */ - FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&var)); + FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&value)); return S_OK; }

1 0

Stefan Dösinger : ddraw/tests: Port the depth blit test to ddraw2.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 60ef7e0bd4d3f0c1f17364edfbe7d5f3d29243ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ef7e0bd4d3f0c1f17364edf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 30 08:41:59 2012 +0100 ddraw/tests: Port the depth blit test to ddraw2. --- dlls/ddraw/tests/ddraw2.c | 239 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 239 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60ef7e0bd4d3f0c1f1736…

1 0

Erich Hoover : crypt32: Fix domain component length check.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: bfa2c5ea98b007e0081b025902165a0eeb9aca0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa2c5ea98b007e0081b02590… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jan 29 12:25:59 2012 -0700 crypt32: Fix domain component length check. --- dlls/crypt32/chain.c | 5 + dlls/crypt32/tests/chain.c | 237 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 242 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfa2c5ea98b007e0081b0…

1 0

Alexandre Julliard : winex11: Disallow clipping to fullscreen rectangle if XInput2 is not available.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 1592b9c9de2338a70835ecbdd5a48318162b123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1592b9c9de2338a70835ecbdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 17:46:32 2012 +0100 winex11: Disallow clipping to fullscreen rectangle if XInput2 is not available. --- dlls/winex11.drv/mouse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 07a420e..85df63b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -388,6 +388,11 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) /* don't clip to 1x1 rectangle if we don't have XInput */ if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; + /* don't clip to fullscreen rectangle either (with 1-pixel offset to catch the dinput case) */ + if (clip->left <= virtual_screen_rect.left + 1 || clip->right >= virtual_screen_rect.right - 1 || + clip->top <= virtual_screen_rect.top + 1 || clip->bottom >= virtual_screen_rect.bottom - 1) + only_with_xinput = TRUE; + if (only_with_xinput && data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) );

1 0

Aric Stewart : user32: Have a fallback in linebreaking if uniscribe fails to analyse a string.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 1967fae847abff72ac1ccd415a15ec11b5af6527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1967fae847abff72ac1ccd415… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:12 2012 -0600 user32: Have a fallback in linebreaking if uniscribe fails to analyse a string. --- dlls/user32/edit.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ab58145..ab87418 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -598,9 +598,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta const SIZE *sz; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - /* Calculate line width */ - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + /* Calculate line width */ + current_line->width = sz->cx; + } + else current_line->width = es->char_width * current_line->net_length; } else current_line->width = 0; @@ -644,18 +648,23 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - count = ScriptString_pcOutChars(current_line->ssa); - piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); - ScriptStringGetLogicalWidths(current_line->ssa,piDx); - - prev = current_line->net_length-1; - do { - current_line->width -= piDx[prev]; - prev--; - } while ( prev > 0 && current_line->width > fw); - if (prev<=0) - prev = 1; - HeapFree(GetProcessHeap(),0,piDx); + if (current_line->ssa) + { + count = ScriptString_pcOutChars(current_line->ssa); + piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); + ScriptStringGetLogicalWidths(current_line->ssa,piDx); + + prev = current_line->net_length-1; + do { + current_line->width -= piDx[prev]; + prev--; + } while ( prev > 0 && current_line->width > fw); + if (prev<=0) + prev = 1; + HeapFree(GetProcessHeap(),0,piDx); + } + else + prev = (fw / es->char_width); } /* If the first line we are calculating, wrapped before istart, we must

1 0

Stefan Dösinger : ddraw/tests: Port the depth blit test to ddraw7.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 8a82f0083ad1c7c0ad52a24b930522b6c27f54a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a82f0083ad1c7c0ad52a24b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 30 08:41:57 2012 +0100 ddraw/tests: Port the depth blit test to ddraw7. --- dlls/ddraw/tests/ddraw7.c | 183 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7564cb8..8eb7098 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -944,6 +944,188 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } +static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) +{ + IDirectDrawSurface7 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(rt); + return ret; +} + +static void test_depth_blit(void) +{ + IDirect3DDevice7 *device; + static struct + { + float x, y, z; + DWORD color; + } + quad1[] = + { + { -1.0, 1.0, 0.50f, 0xff00ff00}, + { 1.0, 1.0, 0.50f, 0xff00ff00}, + { -1.0, -1.0, 0.50f, 0xff00ff00}, + { 1.0, -1.0, 0.50f, 0xff00ff00}, + }; + static const D3DCOLOR expected_colors[4][4] = + { + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + }; + DDSURFACEDESC2 ddsd_new, ddsd_existing; + + IDirectDrawSurface7 *ds1, *ds2, *ds3, *rt; + RECT src_rect, dst_rect; + unsigned int i, j; + D3DCOLOR color; + HRESULT hr; + IDirect3D7 *d3d; + IDirectDraw7 *ddraw; + DDBLTFX fx; + HWND window; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw7 interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + ds1 = get_depth_stencil(device); + + memset(&ddsd_new, 0, sizeof(ddsd_new)); + ddsd_new.dwSize = sizeof(ddsd_new); + memset(&ddsd_existing, 0, sizeof(ddsd_existing)); + ddsd_existing.dwSize = sizeof(ddsd_existing); + hr = IDirectDrawSurface7_GetSurfaceDesc(ds1, &ddsd_existing); + ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + ddsd_new.dwWidth = ddsd_existing.dwWidth; + ddsd_new.dwHeight = ddsd_existing.dwHeight; + U4(ddsd_new).ddpfPixelFormat = U4(ddsd_existing).ddpfPixelFormat; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd_new, &ds2, NULL); + ok(SUCCEEDED(hr), "Failed to create a z buffer, hr %#x.\n", hr); + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd_new, &ds3, NULL); + ok(SUCCEEDED(hr), "Failed to create a z buffer, hr %#x.\n", hr); + IDirectDraw7_Release(ddraw); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the z buffer, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Different locations. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 320, 240, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Streched. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Flipped. */ + SetRect(&src_rect, 0, 480, 640, 0); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 480, 640, 0); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Depth -> color blit: Succeeds on Win7 + Radeon HD 5700, fails on WinXP + Radeon X1600 */ + + /* Depth blit inside a BeginScene / EndScene pair */ + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start scene, hr %#x.\n", hr); + /* From the current depth stencil */ + hr = IDirectDrawSurface7_Blt(ds2, NULL, ds1, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* To the current depth stencil */ + hr = IDirectDrawSurface7_Blt(ds1, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Between unbound surfaces */ + hr = IDirectDrawSurface7_Blt(ds3, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Avoid changing the depth stencil, it doesn't work properly on Windows. + * Instead use DDBLT_DEPTHFILL to clear the depth stencil. Unfortunately + * drivers disagree on the meaning of dwFillDepth. Only 0 seems to produce + * a reliable result(z = 0.0) */ + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + hr = IDirectDrawSurface7_Blt(ds2, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to clear the source z buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the color and z buffers, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface7_Blt(ds1, &dst_rect, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(ds3); + IDirectDrawSurface7_Release(ds2); + IDirectDrawSurface7_Release(ds1); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, + quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, expected_colors[i][j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + + IDirectDrawSurface7_Release(rt); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -960,4 +1142,5 @@ START_TEST(ddraw7) test_coop_level_d3d_state(); test_surface_interface_mismatch(); test_coop_level_threaded(); + test_depth_blit(); }

1 0

Aric Stewart : usp10: Limit runs in ScriptStringAnalyse to 255.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: f50f05da231ab5f1f463cd5ba929bb77009d1141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50f05da231ab5f1f463cd5ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:15 2012 -0600 usp10: Limit runs in ScriptStringAnalyse to 255. --- dlls/usp10/usp10.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index beecce9..1342303 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1772,19 +1772,12 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - while (hr == E_OUTOFMEMORY) + if FAILED(hr) { - SCRIPT_ITEM *tmp; - - num_items *= 2; - if (!(tmp = heap_realloc_zero(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) - goto error; - - analysis->pItem = tmp; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); + if (hr == E_OUTOFMEMORY) + hr = E_INVALIDARG; + goto error; } - if (hr != S_OK) goto error; /* set back to out of memory for default goto error behaviour */ hr = E_OUTOFMEMORY;

1 0

Aric Stewart : usp10: Use a bsearch function to find a glyph in the LogClust array.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 4df4929198696161e1daf7ee006997e425654a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df4929198696161e1daf7ee0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:08 2012 -0600 usp10: Use a bsearch function to find a glyph in the LogClust array. --- dlls/usp10/opentype.c | 7 +++- dlls/usp10/shape.c | 60 +++++++++++++++++------------------------- dlls/usp10/usp10.c | 52 +++++++++++++++++++++++++++++++++--- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 78 insertions(+), 43 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index c30d513..3c0af41 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -438,9 +438,12 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly int char_count = 0; int k; - for (k = 0; k < cChars; k++) - if (pwLogClust[k] == i) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k >= 0) + { + for (; k < cChars && pwLogClust[k] == i; k++) char_count++; + } class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a893f7e..5ba6e6f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2359,13 +2359,11 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2425,13 +2423,11 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI int char_count = 0; BOOL isInit, isFinal; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } isInit = (i == initGlyph || (i+dirR > 0 && i+dirR < cGlyphs && spaces[i+dirR])); @@ -2534,13 +2530,11 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2581,13 +2575,11 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2614,13 +2606,11 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2658,13 +2648,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (override_gsub) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ef8a7ac..beecce9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -25,6 +25,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -703,6 +704,11 @@ typedef struct { int* logical2visual; } StringAnalysis; +typedef struct { + BOOL ascending; + WORD target; +} FindGlyph_struct; + static inline void *heap_alloc(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); @@ -881,6 +887,46 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) return SCRIPT_UNDEFINED; } +static int compare_FindGlyph(const void *a, const void* b) +{ + const FindGlyph_struct *find = (FindGlyph_struct*)a; + const WORD *idx= (WORD*)b; + int rc = 0; + + if ( find->target > *idx) + rc = 1; + else if (find->target < *idx) + rc = -1; + + if (!find->ascending) + rc *= -1; + return rc; +} + +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) +{ + FindGlyph_struct fgs; + WORD *ptr; + INT k; + + if (pwLogClust[0] < pwLogClust[cChars-1]) + fgs.ascending = TRUE; + else + fgs.ascending = FALSE; + + fgs.target = target; + ptr = bsearch(&fgs, pwLogClust, cChars, sizeof(WORD), compare_FindGlyph); + + if (!ptr) + return -1; + + for (k = (ptr - pwLogClust)-1; k >= 0 && pwLogClust[k] == target; k--) + ; + k++; + + return k; +} + /*********************************************************************** * DllMain * @@ -1873,13 +1919,9 @@ error: static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cChars, int glyph, int direction) { - int i; - if (pva[glyph].fClusterStart) return TRUE; - for (i = 0; i < cChars; i++) - if (pwLogClust[i] == glyph) break; - if (i != cChars) + if (USP10_FindGlyphInLogClust(pwLogClust, cChars, glyph) >= 0) return TRUE; return FALSE; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 02beaf6..558eb55 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -204,6 +204,8 @@ typedef void (*reorder_function)(LPWSTR pwChar, IndicSyllable *syllable, lexical #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0 +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; + BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c,

1 0

Alexandre Julliard : regedit: Use virtkeys for all accelerators.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

1 0

Alexandre Julliard : wordpad: Use virtkeys for all accelerators.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 974e27e6faf9843824b9e4721399eb32089b8363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974e27e6faf9843824b9e4721… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:13:43 2012 +0100 wordpad: Use virtkeys for all accelerators. --- po/ar.po | 78 +++++++++--------------------------- po/bg.po | 78 +++++++++--------------------------- po/ca.po | 80 +++++++++---------------------------- po/cs.po | 79 +++++++++---------------------------- po/da.po | 83 +++++++++----------------------------- po/de.po | 87 ++++++++++------------------------------ po/el.po | 78 +++++++++--------------------------- po/en.po | 80 +++++++++---------------------------- po/en_US.po | 92 ++++++++++++------------------------------- po/eo.po | 78 +++++++++--------------------------- po/es.po | 82 +++++++++----------------------------- po/fa.po | 78 +++++++++--------------------------- po/fi.po | 78 +++++++++--------------------------- po/fr.po | 92 ++++++++++++------------------------------- po/he.po | 81 +++++++++----------------------------- po/hi.po | 78 +++++++++--------------------------- po/hu.po | 79 +++++++++---------------------------- po/it.po | 82 ++++++++++---------------------------- po/ja.po | 83 +++++++++----------------------------- po/ko.po | 92 ++++++++++++------------------------------- po/lt.po | 92 ++++++++++++------------------------------- po/ml.po | 78 +++++++++--------------------------- po/nb_NO.po | 83 +++++++++----------------------------- po/nl.po | 87 ++++++++++------------------------------ po/or.po | 78 +++++++++--------------------------- po/pa.po | 78 +++++++++--------------------------- po/pl.po | 92 ++++++++++++------------------------------- po/pt_BR.po | 87 ++++++++++------------------------------ po/pt_PT.po | 80 +++++++++---------------------------- po/rm.po | 78 +++++++++--------------------------- po/ro.po | 83 +++++++++----------------------------- po/ru.po | 83 +++++++++----------------------------- po/sk.po | 78 +++++++++--------------------------- po/sl.po | 85 ++++++++++------------------------------ po/sr_RS(a)cyrillic.po | 80 +++++++++---------------------------- po/sr_RS(a)latin.po | 80 +++++++++---------------------------- po/sv.po | 83 +++++++++----------------------------- po/te.po | 78 +++++++++--------------------------- po/th.po | 78 +++++++++--------------------------- po/tr.po | 78 +++++++++--------------------------- po/uk.po | 79 +++++++++---------------------------- po/wa.po | 78 +++++++++--------------------------- po/wine.pot | 78 +++++++++--------------------------- po/zh_CN.po | 78 +++++++++--------------------------- po/zh_TW.po | 78 +++++++++--------------------------- programs/wordpad/wordpad.rc | 34 ++++++++-------- 46 files changed, 931 insertions(+), 2771 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=974e27e6faf9843824b9e…

1 0