May 2011 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Change the sign we use for origin. x in DrawDriverString.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 11754452d22b6f3fb830bbedabf5d4e201f28a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11754452d22b6f3fb830bbeda… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 23 16:33:46 2011 -0500 gdiplus: Change the sign we use for origin.x in DrawDriverString. Apparently characters whose black boxes extend to the left of the origin have a negative x value, but characters whose black boxes extend above the origin have a positive y value. --- dlls/gdiplus/graphics.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ed024ad..867889d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5753,9 +5753,9 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (glyphsize > max_glyphsize) max_glyphsize = glyphsize; - left = pti[i].x - glyphmetrics.gmptGlyphOrigin.x; + left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; - right = pti[i].x - glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; + right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; if (left < min_x) min_x = left; @@ -5786,7 +5786,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI GetGlyphOutlineW(hdc, text[i], ggo_flags, &glyphmetrics, max_glyphsize, glyph_mask, &identity); - left = pti[i].x - glyphmetrics.gmptGlyphOrigin.x; + left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; stride = (glyphmetrics.gmBlackBoxX + 3) & (~3);

1 0

Vincent Povirk : gdiplus: Implement DriverStringOptionsRealizedAdvance in software.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 9793ab9fa678d703e290dfa85400399657fe32ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9793ab9fa678d703e290dfa85… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 23 16:35:41 2011 -0500 gdiplus: Implement DriverStringOptionsRealizedAdvance in software. --- dlls/gdiplus/graphics.c | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 867889d..8c6a042 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5674,9 +5674,9 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix ) { - static const INT unsupported_flags = ~(DriverStringOptionsCmapLookup); + static const INT unsupported_flags = ~(DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance); GpStatus stat; - PointF *real_positions; + PointF *real_positions, real_position; POINT *pti; HFONT hfont; HDC hdc; @@ -5695,12 +5695,6 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (length <= 0) return Ok; - if (flags & DriverStringOptionsRealizedAdvance) - { - FIXME("Not implemented for DriverStringOptionsRealizedAdvance\n"); - return NotImplemented; - } - if (!(flags & DriverStringOptionsCmapLookup)) ggo_flags |= GGO_GLYPH_INDEX; @@ -5710,22 +5704,31 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (matrix) FIXME("Ignoring matrix\n"); - real_positions = GdipAlloc(sizeof(PointF) * length); - if (!real_positions) - return OutOfMemory; - pti = GdipAlloc(sizeof(POINT) * length); if (!pti) - { - GdipFree(real_positions); return OutOfMemory; + + if (flags & DriverStringOptionsRealizedAdvance) + { + real_position = positions[0]; + + transform_and_round_points(graphics, pti, &real_position, 1); } + else + { + real_positions = GdipAlloc(sizeof(PointF) * length); + if (!real_positions) + { + GdipFree(pti); + return OutOfMemory; + } - memcpy(real_positions, positions, sizeof(PointF) * length); + memcpy(real_positions, positions, sizeof(PointF) * length); - transform_and_round_points(graphics, pti, real_positions, length); + transform_and_round_points(graphics, pti, real_positions, length); - GdipFree(real_positions); + GdipFree(real_positions); + } get_font_hfont(graphics, font, &hfont); @@ -5762,6 +5765,12 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (top < min_y) min_y = top; if (right > max_x) max_x = right; if (bottom > max_y) max_y = bottom; + + if (i+1 < length && (flags & DriverStringOptionsRealizedAdvance) == DriverStringOptionsRealizedAdvance) + { + pti[i+1].x = pti[i].x + glyphmetrics.gmCellIncX; + pti[i+1].y = pti[i].y + glyphmetrics.gmCellIncY; + } } glyph_mask = GdipAlloc(max_glyphsize);

1 0

Alexandre Julliard : makefiles: Create test resource files directly from the test build directory.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 9b99cd1d317b72184a74d4eb964160ebe66f062b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b99cd1d317b72184a74d4eb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 11:11:22 2011 +0200 makefiles: Create test resource files directly from the test build directory. --- .gitignore | 3 +- Make.vars.in | 1 - Maketest.rules.in | 10 +++- aclocal.m4 | 12 ++--- configure | 108 ++--------------------------------------- configure.ac | 2 - programs/winetest/Makefile.in | 5 +- tools/make_makefiles | 3 +- 8 files changed, 22 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b99cd1d317b72184a74d…

1 0

Henri Verbeet : ddraw/tests: Add a test for mode settings calls with different coop levels.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 43aac32fd572982ae65a8c0a3cb7d64a87ae86cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=43aac32fd572982ae65a8c0a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 23 22:11:33 2011 +0200 ddraw/tests: Add a test for mode settings calls with different coop levels. --- dlls/ddraw/tests/d3d.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 6511a26..ff208c7 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3983,6 +3983,92 @@ static void test_redundant_mode_set(void) DestroyWindow(window); } + +static void test_coop_level_mode_set(void) +{ + RECT fullscreen_rect, r, s; + IDirectDraw7 *ddraw7; + HWND window; + HRESULT hr; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + SetRect(&s, 0, 0, 640, 480); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + DestroyWindow(window); + return; + } + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirectDraw7_SetDisplayMode(ddraw7, 640, 480, 32, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + s.left, s.top, s.right, s.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirectDraw_RestoreDisplayMode(ddraw7); + ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirectDraw7_SetDisplayMode(ddraw7, 640, 480, 32, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + todo_wine ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirectDraw_RestoreDisplayMode(ddraw7); + ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + + DestroyWindow(window); +} + START_TEST(d3d) { init_function_pointers(); @@ -4026,4 +4112,5 @@ START_TEST(d3d) test_wndproc(); test_window_style(); test_redundant_mode_set(); + test_coop_level_mode_set(); }

1 0

Henri Verbeet : ddraw: Don't touch the window during mode setting if we' re not in exclusive mode.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: f147c1e9289185cc3c523a0537c2bcee87744f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f147c1e9289185cc3c523a053… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 23 22:11:34 2011 +0200 ddraw: Don't touch the window during mode setting if we're not in exclusive mode. --- dlls/ddraw/ddraw.c | 9 +++++++-- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4a7e5ed..58eb452 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -883,8 +883,13 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD /* TODO: Lose the primary surface */ hr = wined3d_device_set_display_mode(ddraw->wined3d_device, 0, &Mode); - wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window); - wined3d_device_setup_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, Width, Height); + + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) + { + wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window); + wined3d_device_setup_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, Width, Height); + } + LeaveCriticalSection(&ddraw_cs); switch(hr) { diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ff208c7..9ac3ffa 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4046,7 +4046,7 @@ static void test_coop_level_mode_set(void) ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); GetWindowRect(window, &r); - todo_wine ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, r.left, r.top, r.right, r.bottom);

1 0

Henri Verbeet : d3d8/tests: Fix the depth clamping test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 022db6808032da1ba7dcbfb5614791bbbb43fcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022db6808032da1ba7dcbfb56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 23 22:11:36 2011 +0200 d3d8/tests: Fix the depth clamping test. --- dlls/d3d8/tests/visual.c | 124 ++++++++++++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1f6a115..d2ab518 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -140,9 +140,10 @@ static IDirect3DDevice8 *init_d3d8(void) present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; present_parameters.EnableAutoDepthStencil = TRUE; - present_parameters.AutoDepthStencilFormat = D3DFMT_D16; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D_CreateDevice returned: %#08x\n", hr); return device_ptr; @@ -1292,59 +1293,63 @@ static void texop_test(IDirect3DDevice8 *device) } /* This test tests depth clamping / clipping behaviour: - * - When D3DRS_CLIPPING is disabled depth values are *clamped* to the - * minimum/maximum z value. + * - With software vertex processing, depth values are clamped to the + * minimum / maximum z value when D3DRS_CLIPPING is disabled, and clipped + * when D3DRS_CLIPPING is enabled. Pretransformed vertices behave the + * same as regular vertices here. + * - With hardware vertex processing, D3DRS_CLIPPING seems to be ignored. + * Normal vertices are always clipped. Pretransformed vertices are + * clipped when D3DPMISCCAPS_CLIPTLVERTS is set, clamped when it isn't. * - The viewport's MinZ/MaxZ is irrelevant for this. - * - When D3DRS_CLIPPING is enabled depth values are clipped. - * - Pretransformed vertices behave the same as regular vertices. */ static void depth_clamp_test(IDirect3DDevice8 *device) { const struct tvertex quad1[] = { - { 0, 0, 5.0f, 1.0, 0xff002b7f}, - { 640, 0, 5.0f, 1.0, 0xff002b7f}, - { 0, 480, 5.0f, 1.0, 0xff002b7f}, - { 640, 480, 5.0f, 1.0, 0xff002b7f}, + { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, + {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, + { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, + {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, }; const struct tvertex quad2[] = { - { 0, 300, 10.0f, 1.0, 0xfff9e814}, - { 640, 300, 10.0f, 1.0, 0xfff9e814}, - { 0, 360, 10.0f, 1.0, 0xfff9e814}, - { 640, 360, 10.0f, 1.0, 0xfff9e814}, + { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, + {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, + { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, + {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, }; - const struct vertex quad3[] = + const struct tvertex quad3[] = { - {-0.65f, 0.55f, 5.0f, 0xffffffff}, - {-0.35f, 0.55f, 5.0f, 0xffffffff}, - {-0.65f, 0.15f, 5.0f, 0xffffffff}, - {-0.35f, 0.15f, 5.0f, 0xffffffff}, + {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, + {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, + {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, + {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, }; - const struct vertex quad4[] = + const struct tvertex quad4[] = { - {-0.87f, 0.83f, 10.0f, 0xffffffff}, - {-0.65f, 0.83f, 10.0f, 0xffffffff}, - {-0.87f, 0.55f, 10.0f, 0xffffffff}, - {-0.65f, 0.55f, 10.0f, 0xffffffff}, + { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, + {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, + { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; const struct vertex quad5[] = { - { -0.5, 0.5, 10.0f, 0xff14f914}, - { 0.5, 0.5, 10.0f, 0xff14f914}, - { -0.5, -0.5, 10.0f, 0xff14f914}, - { 0.5, -0.5, 10.0f, 0xff14f914}, + { -0.5f, 0.5f, 10.0f, 0xff14f914}, + { 0.5f, 0.5f, 10.0f, 0xff14f914}, + { -0.5f, -0.5f, 10.0f, 0xff14f914}, + { 0.5f, -0.5f, 10.0f, 0xff14f914}, }; - const struct tvertex quad6[] = + const struct vertex quad6[] = { - { 0, 120, 10.0f, 1.0, 0xfff91414}, - { 640, 120, 10.0f, 1.0, 0xfff91414}, - { 0, 180, 10.0f, 1.0, 0xfff91414}, - { 640, 180, 10.0f, 1.0, 0xfff91414}, + { -1.0f, 0.5f, 10.0f, 0xfff91414}, + { 1.0f, 0.5f, 10.0f, 0xfff91414}, + { -1.0f, 0.25f, 10.0f, 0xfff91414}, + { 1.0f, 0.25f, 10.0f, 0xfff91414}, }; D3DVIEWPORT8 vp; D3DCOLOR color; + D3DCAPS8 caps; HRESULT hr; vp.X = 0; @@ -1354,10 +1359,13 @@ static void depth_clamp_test(IDirect3DDevice8 *device) vp.MinZ = 0.0; vp.MaxZ = 7.5; + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetViewport(device, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); @@ -1380,22 +1388,24 @@ static void depth_clamp_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(*quad4)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, TRUE); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad5, sizeof(*quad5)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad6, sizeof(*quad6)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -1403,16 +1413,32 @@ static void depth_clamp_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); - color = getPixelColor(device, 75, 75); - ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); - color = getPixelColor(device, 150, 150); - ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); - color = getPixelColor(device, 320, 330); - ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); - color = getPixelColor(device, 320, 330); - ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) + { + color = getPixelColor(device, 75, 75); + todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 150); + todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + } + else + { + color = getPixelColor(device, 75, 75); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 150); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr);

1 0

Jacek Caban : wininet: Added connection closing tests.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 6eff315555df27704bcfa76cd528074330b2c9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eff315555df27704bcfa76cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 16:10:22 2011 +0200 wininet: Added connection closing tests. --- dlls/wininet/tests/http.c | 88 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b1b310c..5db7f64 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -102,7 +102,7 @@ static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; static const char *status_string[MAX_INTERNET_STATUS]; -static HANDLE hCompleteEvent; +static HANDLE hCompleteEvent, conn_close_event; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 @@ -1765,6 +1765,13 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_conn_close")) + { + static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; + send(c, conn_close_response, sizeof(conn_close_response)-1, 0); + WaitForSingleObject(conn_close_event, INFINITE); + trace("closing connection\n"); + } shutdown(c, 2); closesocket(c); @@ -2174,6 +2181,84 @@ static void test_no_content(int port) CloseHandle(hCompleteEvent); } +static void test_conn_close(int port) +{ + HINTERNET session, connection, req; + DWORD res, avail, size; + BYTE buf[1024]; + + trace("Testing connection close connection...\n"); + + hCompleteEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + conn_close_event = CreateEvent(NULL, FALSE, FALSE, NULL); + + session = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(session, callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + connection = InternetConnectA(session, "localhost", port, + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequestA(connection, "GET", "/test_conn_close", NULL, NULL, NULL, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, -1, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + avail = 0; + res = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail != 0, "avail = 0\n"); + + size = 0; + res = InternetReadFile(req, buf, avail, &size); + ok(res, "InternetReadFile failed: %u\n", GetLastError()); + + res = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + ok(!avail, "avail = %u, expected 0\n", avail); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + SetEvent(conn_close_event); + WaitForSingleObject(hCompleteEvent, INFINITE); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + close_async_handle(session, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -2708,6 +2793,7 @@ static void test_http_connection(void) test_options(si.port); test_url_caching(si.port, &si.num_testH_retrievals); test_no_content(si.port); + test_conn_close(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Francois Gouget : msvcrt: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 37daab560ce4cd1a7555ea61c74e5e1ea94e3895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37daab560ce4cd1a7555ea61c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 23 16:20:30 2011 +0200 msvcrt: Add a trailing '\n' to an ERR() call. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 90f8a45..61e31d1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -198,7 +198,7 @@ static inline MSVCRT_FILE* msvcrt_get_file(int i) if(!ret) { MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE] = MSVCRT_calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(file_crit)); if(!MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE]) { - ERR("out of memory"); + ERR("out of memory\n"); *MSVCRT__errno() = MSVCRT_ENOMEM; return NULL; }

1 0

Francois Gouget : hostname: Make display_computer_name() static.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 6a651fa7f4fd200c1b43547d6a122a10281272f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a651fa7f4fd200c1b43547d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 23 16:20:36 2011 +0200 hostname: Make display_computer_name() static. --- programs/hostname/hostname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 75095df..003bbba 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -107,7 +107,7 @@ static int hostname_message(int msg) return hostname_printfW(formatW, msg_buffer); } -void display_computer_name(void) +static void display_computer_name(void) { static const WCHAR fmtW[] = {'%','s','\n',0};

1 0

Alexandre Julliard : server: Grab the current pointer to avoid referencing it after it could become invalid .
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: be23f5a7a6f8a657cc4ee2927e1b138118a858e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be23f5a7a6f8a657cc4ee2927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 23 19:51:00 2011 +0200 server: Grab the current pointer to avoid referencing it after it could become invalid. --- server/debugger.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index d8a390e..35cb3e3 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -632,6 +632,7 @@ DECL_HANDLER(queue_exception_event) { debug_event_t data; struct debug_event *event; + struct thread *thread = current; if ((req->len % sizeof(client_ptr_t)) != 0 || req->len > get_req_data_size() || @@ -649,19 +650,19 @@ DECL_HANDLER(queue_exception_event) data.exception.nb_params = req->len / sizeof(client_ptr_t); memcpy( data.exception.params, get_req_data(), req->len ); - if ((event = alloc_debug_event( current, EXCEPTION_DEBUG_EVENT, &data ))) + if ((event = alloc_debug_event( thread, EXCEPTION_DEBUG_EVENT, &data ))) { const context_t *context = (const context_t *)((const char *)get_req_data() + req->len); data_size_t size = get_req_data_size() - req->len; memset( &event->context, 0, sizeof(event->context) ); memcpy( &event->context, context, min( sizeof(event->context), size ) ); - current->context = &event->context; + thread->context = &event->context; - if ((reply->handle = alloc_handle( current->process, event, SYNCHRONIZE, 0 ))) + if ((reply->handle = alloc_handle( thread->process, event, SYNCHRONIZE, 0 ))) { link_event( event ); - suspend_process( current->process ); + suspend_process( thread->process ); } release_object( event ); }

1 0