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

Rico Schüller : d3dx9: Parse effect textures.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: ca5b8e11cc90620250eff2e629143d1af1e489ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5b8e11cc90620250eff2e62… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 13 11:35:34 2011 +0200 d3dx9: Parse effect textures. --- dlls/d3dx9_36/effect.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9de5517..ee0a5ab 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -319,12 +319,17 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) if (param->class == D3DXPC_OBJECT && !param->element_count) { - switch(param->type) + switch (param->type) { case D3DXPT_STRING: HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); break; + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); @@ -1207,7 +1212,10 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH if (data && param && param->data && param->bytes <= bytes) { - if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER + || param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE) { UINT i; @@ -3358,6 +3366,11 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons switch (param->type) { case D3DXPT_STRING: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: read_dword(ptr, &id); @@ -3579,6 +3592,14 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = sizeof(LPDIRECT3DVERTEXSHADER9); break; + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + param->bytes = sizeof(LPDIRECT3DBASETEXTURE9); + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break;

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTexture().
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 041a651431d0532810bc7291967ad9498afeb895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041a651431d0532810bc72919… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 13 11:35:37 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTexture(). --- dlls/d3dx9_36/effect.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ee0a5ab..4332386 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1569,10 +1569,24 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3D static HRESULT WINAPI ID3DXBaseEffectImpl_GetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 *texture) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, texture %p stub\n", This, parameter, texture); + TRACE("iface %p, parameter %p, texture %p\n", This, parameter, texture); - return E_NOTIMPL; + if (texture && param && !param->element_count && + (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + *texture = *(LPDIRECT3DBASETEXTURE9 *)param->data; + if (*texture) IDirect3DBaseTexture9_AddRef(*texture); + TRACE("Returning %p\n", *texture); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 *pshader)

1 0

Jacek Caban : wininet: Added 204 No Content response tests.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 5a5eddfe81d04efdc4e608c69c554a8b7dc8074d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5eddfe81d04efdc4e608c69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:49:00 2011 +0200 wininet: Added 204 No Content response tests. --- dlls/wininet/tests/http.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a754dd7..b1b310c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1760,6 +1760,11 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "GET /test_no_content")) + { + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; + send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2112,6 +2117,63 @@ static void test_http1_1(int port) InternetCloseHandle(ses); } +static void test_no_content(int port) +{ + HINTERNET session, connection, req; + DWORD res; + + trace("Testing 204 no content response...\n"); + + hCompleteEvent = 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_no_content", 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_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + 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_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}; @@ -2645,6 +2707,7 @@ static void test_http_connection(void) test_last_error(si.port); test_options(si.port); test_url_caching(si.port, &si.num_testH_retrievals); + test_no_content(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Huw Davies : gdi32: Initialise the pen pattern to an empty pattern for unpatterned pens.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 8ae156dc31555e7c9ccc6bba806c602ebccb2ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae156dc31555e7c9ccc6bba8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 14:03:32 2011 +0100 gdi32: Initialise the pen pattern to an empty pattern for unpatterned pens. --- dlls/gdi32/dibdrv/objects.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 795bd5e..681a8cb 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -819,8 +819,9 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static const dash_pattern dash_patterns[4] = +static const dash_pattern dash_patterns[5] = { + {0, {0}, 0}, /* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */ {2, {18, 6}, 24}, /* PS_DASH */ {2, {3, 3}, 6}, /* PS_DOT */ {4, {9, 6, 3, 6}, 24}, /* PS_DASHDOT */ @@ -865,6 +866,8 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + pdev->pen_pattern = dash_patterns[PS_SOLID]; + pdev->defer |= DEFER_PEN; style = logpen.lopnStyle & PS_STYLE_MASK; @@ -875,7 +878,6 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; pdev->pen_line = solid_pen_line; - pdev->pen_pattern.count = 0; pdev->defer &= ~DEFER_PEN; break; @@ -886,7 +888,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; pdev->pen_line = dashed_pen_line; - pdev->pen_pattern = dash_patterns[style - PS_DASH]; + pdev->pen_pattern = dash_patterns[style]; pdev->defer &= ~DEFER_PEN; break;

1 0

Huw Davies : gdi32: Add support for the null brush.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: b025a74b40d64b1c3d3ec029b776a3b5dde4108b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b025a74b40d64b1c3d3ec029b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 14:11:56 2011 +0100 gdi32: Add support for the null brush. --- dlls/gdi32/dibdrv/objects.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 681a8cb..800db12 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1062,6 +1062,11 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) return TRUE; } +static BOOL null_brush(dibdrv_physdev *pdev, int num, RECT *rects) +{ + return TRUE; +} + void update_brush_rop( dibdrv_physdev *pdev, INT rop ) { pdev->brush_rop = rop; @@ -1101,6 +1106,11 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) pdev->defer &= ~DEFER_BRUSH; break; + case BS_NULL: + pdev->brush_rects = null_brush; + pdev->defer &= ~DEFER_BRUSH; + break; + case BS_DIBPATTERN: { BITMAPINFOHEADER *bi = GlobalLock((HGLOBAL)logbrush.lbHatch);

1 0

Huw Davies : gdi32: Add support for the null pen.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 74aab5f6000f68744808300cdf5aa67877cac5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74aab5f6000f68744808300cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 14:13:35 2011 +0100 gdi32: Add support for the null pen. --- dlls/gdi32/dibdrv/objects.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 800db12..30be496 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -819,6 +819,11 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL null_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) +{ + return TRUE; +} + static const dash_pattern dash_patterns[5] = { {0, {0}, 0}, /* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */ @@ -892,6 +897,11 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->defer &= ~DEFER_PEN; break; + case PS_NULL: + pdev->pen_line = null_pen_line; + pdev->defer &= ~DEFER_PEN; + break; + default: break; }

1 0

Huw Davies : gdi32: Implement Rectangle().
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: cf290ea6596f734e25fa3a42f0f5200162b6d670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf290ea6596f734e25fa3a42f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 13 13:28:15 2011 +0100 gdi32: Implement Rectangle(). --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 7a11bec..50a7682 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -404,7 +404,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pPolylineTo */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ - NULL, /* pRectangle */ + dibdrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index a502c72..2ec604c 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,6 +20,7 @@ extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index c231434..bc7c488 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -117,3 +117,45 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWOR return TRUE; } + +/*********************************************************************** + * dibdrv_Rectangle + */ +BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + RECT rect = get_device_rect( dev->hdc, left, top, right, bottom ); + POINT pts[4]; + + TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); + + if(rect.left == rect.right || rect.top == rect.bottom) return TRUE; + + if(defer_pen(pdev) || defer_brush(pdev)) + return next->funcs->pRectangle( next, left, top, right, bottom ); + + reset_dash_origin(pdev); + + /* 4 pts going anti-clockwise starting from top-right */ + pts[0].x = pts[3].x = rect.right - 1; + pts[0].y = pts[1].y = rect.top; + pts[1].x = pts[2].x = rect.left; + pts[2].y = pts[3].y = rect.bottom - 1; + + pdev->pen_line(pdev, pts , pts + 1); + pdev->pen_line(pdev, pts + 1, pts + 2); + pdev->pen_line(pdev, pts + 2, pts + 3); + pdev->pen_line(pdev, pts + 3, pts ); + + /* FIXME: Will need updating when we support wide pens */ + + rect.left += 1; + rect.top += 1; + rect.right -= 1; + rect.bottom -= 1; + + pdev->brush_rects(pdev, 1, &rect); + + return TRUE; +}

1 0

Huw Davies : gdi32/tests: Tests for Rectangle().
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 075ad8eae5cf38da6cdf736bd05c86a082cf6207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075ad8eae5cf38da6cdf736bd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 13 13:28:46 2011 +0100 gdi32/tests: Tests for Rectangle(). --- dlls/gdi32/tests/dib.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 4a9c692..e69de1f 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -92,6 +92,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "b2261353decda2712b83538ab434a49ce21f3172", "a8b59f25984b066fc6b91cae6bf983a78028ba7f", "3d95adb85b9673a932ac847a4b5451fa59885f74", + "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", NULL }; @@ -242,6 +243,24 @@ static const RECT patblt_clips[] = {170, 200, 176, 210}, /* t edge on b edgecase clipped */ }; +static const RECT rectangles[] = +{ + {10, 11, 100, 101}, + {250, 100, 350, 10}, + {120, 10, 120, 20}, /* zero width */ + {120, 10, 130, 10}, /* zero height */ + {120, 40, 121, 41}, /* 1 x 1 */ + {130, 50, 132, 52}, /* 2 x 2 */ + {140, 60, 143, 63}, /* 3 x 3 */ + {150, 70, 154, 74}, /* 4 x 4 */ + {120, 20, 121, 30}, /* width == 1 */ + {130, 20, 132, 30}, /* width == 2 */ + {140, 20, 143, 30}, /* width == 3 */ + {200, 20, 210, 21}, /* height == 1 */ + {200, 30, 210, 32}, /* height == 2 */ + {200, 40, 210, 43} /* height == 3 */ +}; + static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) @@ -480,6 +499,25 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh SetBrushOrgEx(hdc, 0, 0, NULL); + /* Rectangle */ + + SelectObject(hdc, solid_pen); + SelectObject(hdc, solid_brush); + + for(i = 0; i < sizeof(rectangles)/sizeof(rectangles[0]); i++) + { + Rectangle(hdc, rectangles[i].left, rectangles[i].top, rectangles[i].right, rectangles[i].bottom); + } + + SelectObject(hdc, dashed_pen); + for(i = 0; i < sizeof(rectangles)/sizeof(rectangles[0]); i++) + { + Rectangle(hdc, rectangles[i].left, rectangles[i].top + 150, rectangles[i].right, rectangles[i].bottom + 150); + } + + compare_hash(bmi, bits, sha1, "rectangles"); + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(dib_brush);

1 0

Stefan Dösinger : wined3d: Pass the render target height as UINT.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 560c63d64e0d02f00bc448a37fd2c52b4546a58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=560c63d64e0d02f00bc448a37… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 20:12:41 2011 +0200 wined3d: Pass the render target height as UINT. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7f86ba5..6f87f0b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -528,7 +528,7 @@ static void shader_arb_load_np2fixup_constants(void *shader_priv, /* GL locking is done by the caller. */ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *gl_shader, - const struct wined3d_context *context, const struct wined3d_state *state, float rt_height) + const struct wined3d_context *context, const struct wined3d_state *state, UINT rt_height) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned char i; @@ -564,7 +564,7 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g * ycorrection.w: 0.0 */ float val[4]; - val[0] = context->render_offscreen ? 0.0f : rt_height; + val[0] = context->render_offscreen ? 0.0f : (float) rt_height; val[1] = context->render_offscreen ? 1.0f : -1.0f; val[2] = 1.0f; val[3] = 0.0f; @@ -649,7 +649,7 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha { struct wined3d_shader *pshader = stateBlock->state.pixel_shader; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; - float rt_height = device->render_targets[0]->resource.height; + UINT rt_height = device->render_targets[0]->resource.height; /* Load DirectX 9 float constants for pixel shader */ device->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, @@ -4627,7 +4627,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, } else { - float rt_height = This->render_targets[0]->resource.height; + UINT rt_height = This->render_targets[0]->resource.height; shader_arb_ps_local_constants(compiled, context, state, rt_height); }

1 0

Stefan Dösinger : wined3d: Separate two unrelated variables.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: c2aab4258a476512a62cd824a30f262d76994709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aab4258a476512a62cd824a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 20:24:51 2011 +0200 wined3d: Separate two unrelated variables. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6f87f0b..c987674 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3521,7 +3521,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, const local_constant *lconst; GLuint retval; char fragcolor[16]; - DWORD *lconst_map = local_const_mapping(shader), next_local, cur; + DWORD *lconst_map = local_const_mapping(shader), next_local; struct shader_arb_ctx_priv priv_ctx; BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; @@ -3684,13 +3684,15 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) { + unsigned char bump_const; + if (!(map & 1)) continue; - cur = compiled->numbumpenvmatconsts; - compiled->bumpenvmatconst[cur].const_num = WINED3D_CONST_NUM_UNUSED; - compiled->bumpenvmatconst[cur].texunit = i; - compiled->luminanceconst[cur].const_num = WINED3D_CONST_NUM_UNUSED; - compiled->luminanceconst[cur].texunit = i; + bump_const = compiled->numbumpenvmatconsts; + compiled->bumpenvmatconst[bump_const].const_num = WINED3D_CONST_NUM_UNUSED; + compiled->bumpenvmatconst[bump_const].texunit = i; + compiled->luminanceconst[bump_const].const_num = WINED3D_CONST_NUM_UNUSED; + compiled->luminanceconst[bump_const].texunit = i; /* We can fit the constants into the constant limit for sure because texbem, texbeml, bem and beml are only supported * in 1.x shaders, and GL_ARB_fragment_program has a constant limit of 24 constants. So in the worst case we're loading @@ -3701,16 +3703,16 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, * shaders in newer shader models. Since the bump env parameters have to share their space with NP2 fixup constants, * their location is shader dependent anyway and they cannot be loaded globally. */ - compiled->bumpenvmatconst[cur].const_num = next_local++; + compiled->bumpenvmatconst[bump_const].const_num = next_local++; shader_addline(buffer, "PARAM bumpenvmat%d = program.local[%d];\n", - i, compiled->bumpenvmatconst[cur].const_num); - compiled->numbumpenvmatconsts = cur + 1; + i, compiled->bumpenvmatconst[bump_const].const_num); + compiled->numbumpenvmatconsts = bump_const + 1; if (!(reg_maps->luminanceparams & (1 << i))) continue; - compiled->luminanceconst[cur].const_num = next_local++; + compiled->luminanceconst[bump_const].const_num = next_local++; shader_addline(buffer, "PARAM luminance%d = program.local[%d];\n", - i, compiled->luminanceconst[cur].const_num); + i, compiled->luminanceconst[bump_const].const_num); } for(i = 0; i < MAX_CONST_I; i++) @@ -3763,6 +3765,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, * applied / activated. This will probably result in wrong rendering of the texture, but will save us from * shader compilation errors and the subsequent errors when drawing with this shader. */ if (priv_ctx.cur_ps_args->super.np2_fixup) { + unsigned char cur_fixup_sampler = 0; struct arb_ps_np2fixup_info* const fixup = priv_ctx.cur_np2fixup_info; const WORD map = priv_ctx.cur_ps_args->super.np2_fixup; @@ -3771,13 +3774,12 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, fixup->offset = next_local; fixup->super.active = 0; - cur = 0; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { if (!(map & (1 << i))) continue; - if (fixup->offset + (cur >> 1) < max_lconsts) { + if (fixup->offset + (cur_fixup_sampler >> 1) < max_lconsts) { fixup->super.active |= (1 << i); - fixup->super.idx[i] = cur++; + fixup->super.idx[i] = cur_fixup_sampler++; } else { FIXME("No free constant found to load NP2 fixup data into shader. " "Sampling from this texture will probably look wrong.\n"); @@ -3785,7 +3787,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, } } - fixup->super.num_consts = (cur + 1) >> 1; + fixup->super.num_consts = (cur_fixup_sampler + 1) >> 1; if (fixup->super.num_consts) { shader_addline(buffer, "PARAM np2fixup[%u] = { program.env[%u..%u] };\n", fixup->super.num_consts, fixup->offset, fixup->super.num_consts + fixup->offset - 1);

1 0