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

Rico Schüller : d3dx9: Improve get_parameter_by_name() .
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: ae2c6a164fab7323ea4a8b61f48078b2beed1f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2c6a164fab7323ea4a8b61f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 13 11:35:27 2011 +0200 d3dx9: Improve get_parameter_by_name(). --- dlls/d3dx9_36/effect.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d8877c0..9de5517 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -112,8 +112,7 @@ struct ID3DXEffectCompilerImpl static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name); -static struct d3dx_parameter *get_parameter_annotation_by_name(struct ID3DXBaseEffectImpl *base, - struct d3dx_parameter *parameter, LPCSTR name); +static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name); static inline void read_dword(const char **ptr, DWORD *d) { @@ -527,14 +526,13 @@ static inline BOOL get_bool(void *data) return (*(DWORD *)data) ? TRUE : FALSE; } -static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffectImpl *base, - struct d3dx_parameter *parameter, LPCSTR name) +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT element; struct d3dx_parameter *temp_parameter; LPCSTR part; - TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); + TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); if (!name || !*name) return parameter; @@ -548,10 +546,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffe switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(base, temp_parameter, part); + return get_parameter_annotation_by_name(temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -567,14 +565,13 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffe return NULL; } -static struct d3dx_parameter *get_parameter_annotation_by_name(struct ID3DXBaseEffectImpl *base, - struct d3dx_parameter *parameter, LPCSTR name) +static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT i, length; struct d3dx_parameter *temp_parameter; LPCSTR part; - TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); + TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); if (!name || !*name) return parameter; @@ -595,10 +592,10 @@ static struct d3dx_parameter *get_parameter_annotation_by_name(struct ID3DXBaseE switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(NULL, temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -651,13 +648,13 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(base, temp_parameter, part); + return get_parameter_annotation_by_name(temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part);

1 0

Juan Lang : wininet: Handle invalid HTTP time of "0".
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: d797e5fc7e9fc7710d6c925a386847698c641a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d797e5fc7e9fc7710d6c925a3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 13 06:47:49 2011 -0700 wininet: Handle invalid HTTP time of "0". --- dlls/wininet/http.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 19c7e76..c6542a8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4255,9 +4255,15 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) */ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) { + static const WCHAR zero[] = { '0',0 }; BOOL ret; - if (strchrW(value, ',')) + if (!strcmpW(value, zero)) + { + ft->dwLowDateTime = ft->dwHighDateTime = 0; + ret = TRUE; + } + else if (strchrW(value, ',')) ret = HTTP_ParseRfc1123Date(value, ft); else {

1 0

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

May 13, 2011

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: Implement Rectangle().
by Alexandre Julliard May 13, 2011

May 13, 2011

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 May 13, 2011

May 13, 2011

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

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

May 13, 2011

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

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

May 13, 2011

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: Add support for the null pen.
by Alexandre Julliard May 13, 2011

May 13, 2011

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

Jacek Caban : wininet: Better closing async handles in tests.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 188de034974feb31fd67cec0d013257edde533c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188de034974feb31fd67cec0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:50 2011 +0200 wininet: Better closing async handles in tests. --- dlls/wininet/tests/http.c | 65 ++++++++++++++------------------------------- 1 files changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c959e5c..a754dd7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -178,6 +178,8 @@ static BOOL proxy_active(void) return proxy_enable != 0; } +static int close_handle_cnt; + static VOID WINAPI callback( HINTERNET hInternet, DWORD_PTR dwContext, @@ -276,6 +278,8 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); + if(!--close_handle_cnt) + SetEvent(hCompleteEvent); break; case INTERNET_STATUS_REQUEST_COMPLETE: { @@ -309,6 +313,20 @@ static VOID WINAPI callback( } } +static void close_async_handle(HINTERNET handle, HANDLE complete_event, int handle_cnt) +{ + BOOL res; + + close_handle_cnt = handle_cnt; + + SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); + res = InternetCloseHandle(handle); + ok(res, "InternetCloseHandle failed: %u\n", GetLastError()); + WaitForSingleObject(hCompleteEvent, INFINITE); + CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); + SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); +} + static void InternetReadFile_test(int flags, const test_data_t *test) { char *post_data = NULL; @@ -567,32 +585,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } abort: trace("aborting\n"); - SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor != 0x0) { - SetLastError(0xdeadbeef); - trace("closing\n"); - res = InternetCloseHandle(hor); - ok (res, "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); - SetLastError(0xdeadbeef); - res = InternetCloseHandle(hor); - ok (!res, "Double close of handle opened by HttpOpenRequestA succeeded\n"); - ok (GetLastError() == ERROR_INVALID_HANDLE, - "Double close of handle should have set ERROR_INVALID_HANDLE instead of %u\n", - GetLastError()); - } - /* We intentionally do not close the handle opened by InternetConnectA as this - * tickles bug #9479: native closes child internet handles when the parent handles - * are closed. This is verified below by checking that the number of - * INTERNET_STATUS_HANDLE_CLOSING notifications matches the number expected. */ - if (hi != 0x0) { - SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); - trace("closing 2\n"); - res = InternetCloseHandle(hi); - ok (res, "InternetCloseHandle of handle opened by InternetOpenA failed\n"); - if (flags & INTERNET_FLAG_ASYNC) - Sleep(100); - } - CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); + close_async_handle(hi, hCompleteEvent, 2); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; } @@ -930,25 +923,7 @@ static void InternetReadFileExA_test(int flags) trace("Finished. Read %d bytes\n", length); abort: - SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor) { - rc = InternetCloseHandle(hor); - ok ((rc != 0), "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); - rc = InternetCloseHandle(hor); - ok ((rc == 0), "Double close of handle opened by HttpOpenRequestA succeeded\n"); - } - if (hic) { - rc = InternetCloseHandle(hic); - ok ((rc != 0), "InternetCloseHandle of handle opened by InternetConnectA failed\n"); - } - if (hi) { - SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); - rc = InternetCloseHandle(hi); - ok ((rc != 0), "InternetCloseHandle of handle opened by InternetOpenA failed\n"); - if (flags & INTERNET_FLAG_ASYNC) - Sleep(100); - CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - } + close_async_handle(hi, hCompleteEvent, 2); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; }

1 0

Jacek Caban : wininet: Clean up closing connection notifications tests.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 3ab297125da177198cf1ce28822ab3792864bc82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab297125da177198cf1ce288… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:36 2011 +0200 wininet: Clean up closing connection notifications tests. --- dlls/wininet/tests/http.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 239f7a7..c959e5c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -402,8 +402,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); - else - SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); if(test->flags & TESTF_COMPRESSED) { BOOL b = TRUE; @@ -465,8 +463,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - else - CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); /* Sent on WinXP only if first_connection_to_test_url is TRUE, on Win98 always sent */ CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -597,16 +593,6 @@ abort: Sleep(100); } CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor != 0x0) - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - } - else - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - } CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; } @@ -860,8 +846,6 @@ static void InternetReadFileExA_test(int flags) inetbuffers.dwOffsetLow = 5678; SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); rc = InternetReadFileEx(hor, &inetbuffers, 0, 0xdeadcafe); ok(rc, "InternetReadFileEx failed with error %u\n", GetLastError()); trace("read %i bytes\n", inetbuffers.dwBufferLength); @@ -879,8 +863,6 @@ static void InternetReadFileExA_test(int flags) length = 0; trace("Entering Query loop\n"); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); while (TRUE) { inetbuffers.dwStructSize = sizeof(INTERNET_BUFFERS); @@ -891,8 +873,6 @@ static void InternetReadFileExA_test(int flags) SET_WINE_ALLOW(INTERNET_STATUS_RECEIVING_RESPONSE); SET_WINE_ALLOW(INTERNET_STATUS_RESPONSE_RECEIVED); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); rc = InternetReadFileExA(hor, &inetbuffers, IRF_ASYNC | IRF_USE_CONTEXT, 0xcafebabe); if (!rc) @@ -949,9 +929,6 @@ static void InternetReadFileExA_test(int flags) ok(length > 0, "failed to read any of the document\n"); trace("Finished. Read %d bytes\n", length); - /* WinXP does not send, but Win98 does */ - CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); abort: SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); if (hor) { @@ -972,12 +949,6 @@ abort: Sleep(100); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); } - /* to enable once Wine is fixed to never send it - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - */ - CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; }

1 0