wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Alexandre Julliard : comctl32/status: Use DrawFrameControl to draw the size grip.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 7f8bf3e7bb1d7e3441e17dfc2b83a3b1963d838e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8bf3e7bb1d7e3441e17dfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 12:38:18 2016 +0900 comctl32/status: Use DrawFrameControl to draw the size grip. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 48 +++++++----------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 4528e24..738c33b 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -143,60 +143,26 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) static void STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) { - HPEN hPenFace, hPenShadow, hPenHighlight, hOldPen; - POINT pt; - INT i; + RECT rc = *lpRect; TRACE("draw size grip %s\n", wine_dbgstr_rect(lpRect)); if (theme) { - RECT gripperRect; SIZE gripperSize; - gripperRect = *lpRect; if (SUCCEEDED (GetThemePartSize (theme, hdc, SP_GRIPPER, 0, lpRect, TS_DRAW, &gripperSize))) { - gripperRect.left = gripperRect.right - gripperSize.cx; - gripperRect.top = gripperRect.bottom - gripperSize.cy; - if (SUCCEEDED (DrawThemeBackground(theme, hdc, SP_GRIPPER, 0, &gripperRect, NULL))) + rc.left = rc.right - gripperSize.cx; + rc.top = rc.bottom - gripperSize.cy; + if (SUCCEEDED (DrawThemeBackground(theme, hdc, SP_GRIPPER, 0, &rc, NULL))) return; } } - pt.x = lpRect->right - 1; - pt.y = lpRect->bottom - 1; - - hPenFace = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace); - hOldPen = SelectObject( hdc, hPenFace ); - MoveToEx (hdc, pt.x - 12, pt.y, NULL); - LineTo (hdc, pt.x, pt.y); - LineTo (hdc, pt.x, pt.y - 13); - - pt.x--; - pt.y--; - - hPenShadow = CreatePen( PS_SOLID, 1, comctl32_color.clr3dShadow); - SelectObject( hdc, hPenShadow ); - for (i = 1; i < 11; i += 4) { - MoveToEx (hdc, pt.x - i, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 1); - - MoveToEx (hdc, pt.x - i - 1, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 2); - } - - hPenHighlight = CreatePen( PS_SOLID, 1, comctl32_color.clr3dHilight); - SelectObject( hdc, hPenHighlight ); - for (i = 3; i < 13; i += 4) { - MoveToEx (hdc, pt.x - i, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 1); - } - - SelectObject (hdc, hOldPen); - DeleteObject( hPenFace ); - DeleteObject( hPenShadow ); - DeleteObject( hPenHighlight ); + rc.left = max( rc.left, rc.right - GetSystemMetrics(SM_CXVSCROLL) - 1 ); + rc.top = max( rc.top, rc.bottom - GetSystemMetrics(SM_CYHSCROLL) - 1 ); + DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); }

1 0

Jacek Caban : wininet: Added open_simple_request helper and use it where appropriate.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f5c97b5060a6633a5ca71efb5fdd087818ed323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c97b5060a6633a5ca71efb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:48:36 2016 +0200 wininet: Added open_simple_request helper and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 341 +++++++++++++++++----------------------------- 1 file changed, 125 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5c97b5060a6633a5ca71…

1 0

Jacek Caban : wininet: Get rid of test_http1_1 test.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 1d834438ca1a490ab7e3725c6dbed17461790b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d834438ca1a490ab7e3725c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:48:23 2016 +0200 wininet: Get rid of test_http1_1 test. I can only guess what author meant to test, but those are useless in their current shape and we already have better persistent connection tests anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b09f20d..1b4ce3b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2041,7 +2041,6 @@ static DWORD CALLBACK server_thread(LPVOID param) int last_request = 0; char host_header[22]; char host_header_override[30]; - static BOOL test_b = FALSE; static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2190,13 +2189,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (!test_b && strstr(buffer, "/testB HTTP/1.1")) - { - test_b = TRUE; - send(c, okmsg, sizeof okmsg-1, 0); - recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); - send(c, okmsg, sizeof okmsg-1, 0); - } if (strstr(buffer, "/testC")) { if (strstr(buffer, "Cookie: cookie=biscuit")) @@ -3098,37 +3090,6 @@ static void test_header_override(int port) InternetCloseHandle(ses); } -static void test_http1_1(int port) -{ - HINTERNET ses, con, req; - BOOL ret; - - ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(ses != NULL, "InternetOpen failed\n"); - - con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(con != NULL, "InternetConnect failed\n"); - - req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); - ok(req != NULL, "HttpOpenRequest failed\n"); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - if (ret) - { - InternetCloseHandle(req); - - req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); - ok(req != NULL, "HttpOpenRequest failed\n"); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); - } - - InternetCloseHandle(req); - InternetCloseHandle(con); - InternetCloseHandle(ses); -} - static void test_connection_closing(int port) { HINTERNET session, connection, req; @@ -4840,7 +4801,6 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); test_header_override(si.port); - test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port); test_invalid_response_headers(si.port);

1 0

Jacek Caban : wininet: Fixed http tests on win10.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f4e68eef37615e6351f8264886c686d9980b9876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e68eef37615e6351f826488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:46:40 2016 +0200 wininet: Fixed http tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3f65784..b09f20d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -520,7 +520,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); - ok(length == 0, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); + ok(length == 0 || (length == 1 && !*buffer) /* win10 */, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); ok(!strcmp(buffer, ""), "HTTP_QUERY_RAW_HEADERS: expected string \"\", but got \"%s\"\n", buffer); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -1759,8 +1759,8 @@ static void HttpHeaders_test(void) memset(buffer, 'x', sizeof(buffer)); ok(HttpQueryInfoA(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF, buffer,&len,&index) == TRUE,"Query failed\n"); - ok(len == 2, "Expected 2, got %d\n", len); - ok(strcmp(buffer, "\r\n") == 0, "Expected CRLF, got '%s'\n", buffer); + ok(len == 2 || len == 4 /* win10 */, "Expected 2 or 4, got %d\n", len); + ok(memcmp(buffer, "\r\n\r\n", len) == 0, "Expected CRLF, got '%s'\n", buffer); ok(index == 0, "Index was incremented\n"); ok(HttpAddRequestHeadersA(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), @@ -1962,8 +1962,7 @@ static const char contmsg[] = static const char expandcontmsg[] = "HTTP/1.1 100 Continue\r\n" "Server: winecontinue\r\n" -"Tag: something witty\r\n" -"\r\n"; +"Tag: something witty\r\n"; static const char okmsg[] = "HTTP/1.1 200 OK\r\n" @@ -2390,6 +2389,8 @@ static void test_basic_request(int port, const char *verb, const char *url) DWORD r, count, error; char buffer[0x100]; + trace("basic request %s %s\n", verb, url); + hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); @@ -2403,7 +2404,7 @@ static void test_basic_request(int port, const char *verb, const char *url) r = HttpSendRequestA(hr, NULL, 0, NULL, 0); error = GetLastError(); ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed: %u\n", GetLastError()); count = 0; memset(buffer, 0, sizeof buffer); @@ -3073,14 +3074,24 @@ static void test_header_override(int port) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); - err = GetLastError(); - todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n"); - todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + if(ret) { /* win10 returns success */ + trace("replacing host header is supported.\n"); - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); - test_status_code_todo(req, 400); + test_status_code(req, 200); + }else { + trace("replacing host header is not supported.\n"); + + err = GetLastError(); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + } InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Jacek Caban : wininet: Updated winehq.org cert info.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f6714f3832541250476989ad579523b4e8b28f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6714f3832541250476989ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:46:21 2016 +0200 wininet: Updated winehq.org cert info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fde2254..3f65784 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4876,14 +4876,11 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)14\r\n" - "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org", "US\r\n" "GeoTrust Inc.\r\n" - "RapidSSL SHA256 CA - G3" + "RapidSSL SHA256 CA" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Andrew Eikum : winegstreamer: Flip video output.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 6107b36e561fad97a96249b438aff4a9f3007176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6107b36e561fad97a96249b43… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:27:04 2016 -0500 winegstreamer: Flip video output. Gstreamer handles video top-down, but Windows's dshow handles it bottom-up. So let's insert a videoflip filter to fix the discrepancy instead of relying on videorenderer to flip it like we did before. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 137 ++++++++++++++++++++++++++++++++------- dlls/winegstreamer/gsttffilter.c | 8 --- 2 files changed, 114 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6107b36e561fad97a9624…

1 0

Andrew Eikum : winegstreamer: Add YUV to ARGB32 transformation filter.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 008e4d3e86073c77c173fdaa339cbb6fa06cfd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008e4d3e86073c77c173fdaa3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:27:00 2016 -0500 winegstreamer: Add YUV to ARGB32 transformation filter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 3 +- dlls/winegstreamer/gst_private.h | 3 +- dlls/winegstreamer/gsttffilter.c | 116 +++++++++++++++++++++++++++++++++++++-- dlls/winegstreamer/main.c | 35 +++++++++--- 4 files changed, 141 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 6b45bc4..b445dc5 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -23,4 +23,5 @@ DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32 DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); -DEFINE_GUID(CLSID_Gstreamer_YUV, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); +DEFINE_GUID(CLSID_Gstreamer_YUV2RGB, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); +DEFINE_GUID(CLSID_Gstreamer_YUV2ARGB, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x02); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 4b29f21..a1f201c 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,8 @@ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); -IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); +IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *pUnkOuter, HRESULT *phr); +IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); DWORD Gstreamer_init(void); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 2209c5e..52aa267 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -677,7 +677,7 @@ static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECT return S_OK; } -static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -748,13 +748,13 @@ static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { +static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { Gstreamer_transform_DecideBufferSize, Gstreamer_transform_ProcessBegin, Gstreamer_transform_ProcessData, Gstreamer_transform_ProcessEnd, Gstreamer_YUV_QueryConnect, - Gstreamer_YUV_SetMediaType, + Gstreamer_YUV2RGB_SetMediaType, Gstreamer_YUV_ConnectInput, Gstreamer_transform_Cleanup, Gstreamer_transform_EndOfStream, @@ -764,7 +764,7 @@ static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { Gstreamer_transform_QOS }; -IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkouter, HRESULT *phr) +IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) { IUnknown *obj = NULL; @@ -776,7 +776,113 @@ IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkouter, HRESULT *phr) return NULL; } - *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV, "videoconvert", &Gstreamer_YUV_vtbl, (LPVOID*)&obj); + *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV2RGB, "videoconvert", &Gstreamer_YUV2RGB_vtbl, (LPVOID*)&obj); + + TRACE("returning %p\n", obj); + + return obj; +} + +static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +{ + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + HRESULT hr; + int avgtime; + LONG width, height; + + TRACE("%p 0x%x %p\n", This, dir, amt); + + mark_wine_thread(); + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return E_FAIL; + + FreeMediaType(outpmt); + CopyMediaType(outpmt, amt); + + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if (vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; + } else { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if (vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; + } + if (!avgtime) + avgtime = 10000000 / 30; + + outpmt->subtype = MEDIASUBTYPE_ARGB32; + + capsin = gst_caps_new_simple("video/x-raw", + "format", G_TYPE_STRING, + gst_video_format_to_string( + gst_video_format_from_fourcc(amt->subtype.Data1)), + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + capsout = gst_caps_new_simple("video/x-raw", + "format", G_TYPE_STRING, "BGRA", + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = width * height * 4; + return hr; +} + +static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_YUV_QueryConnect, + Gstreamer_YUV2ARGB_SetMediaType, + Gstreamer_YUV_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment, + Gstreamer_transform_QOS +}; + +IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) +{ + IUnknown *obj = NULL; + + TRACE("%p %p\n", punkouter, phr); + + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + + *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV2ARGB, "videoconvert", &Gstreamer_YUV2ARGB_vtbl, (LPVOID*)&obj); TRACE("returning %p\n", obj); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 7b9cd31..2bb69f4 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -43,8 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; -static const WCHAR wGstreamer_YUV[] = -{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV2RGB[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','t','o',' ','R','G','B',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV2ARGB[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','t','o',' ','A','R','G','B',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_AudioConvert[] = @@ -115,9 +117,17 @@ static const AMOVIESETUP_PIN amfYUVPin[] = }, }; -static const AMOVIESETUP_FILTER amfYUV = -{ &CLSID_Gstreamer_YUV, - wGstreamer_YUV, +static const AMOVIESETUP_FILTER amfYUV2RGB = +{ &CLSID_Gstreamer_YUV2RGB, + wGstreamer_YUV2RGB, + MERIT_UNLIKELY, + 2, + amfYUVPin +}; + +static const AMOVIESETUP_FILTER amfYUV2ARGB = +{ &CLSID_Gstreamer_YUV2ARGB, + wGstreamer_YUV2ARGB, MERIT_UNLIKELY, 2, amfYUVPin @@ -184,11 +194,18 @@ FactoryTemplate const g_Templates[] = { &amfSplitter, }, { - wGstreamer_YUV, - &CLSID_Gstreamer_YUV, - Gstreamer_YUV_create, + wGstreamer_YUV2RGB, + &CLSID_Gstreamer_YUV2RGB, + Gstreamer_YUV2RGB_create, + NULL, + &amfYUV2RGB, + }, + { + wGstreamer_YUV2ARGB, + &CLSID_Gstreamer_YUV2ARGB, + Gstreamer_YUV2ARGB_create, NULL, - &amfYUV, + &amfYUV2ARGB, }, { wGstreamer_Mp3,

1 0

Andrey Gusev : wined3d: Fix a typo in FIXME() messages.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 05132fa73561282589b56f123aae994cdd0a177d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05132fa73561282589b56f123… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 9 18:09:43 2016 +0300 wined3d: Fix a typo in FIXME() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e2e3ec9..70a4b03 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3875,7 +3875,7 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t D3DTEXTUREFILTERTYPE_TO_STR(WINED3D_TEXF_GAUSSIAN_QUAD); #undef D3DTEXTUREFILTERTYPE_TO_STR default: - FIXME("Unrecognied texture filter type 0x%08x.\n", filter_type); + FIXME("Unrecognized texture filter type 0x%08x.\n", filter_type); return "unrecognized"; } } @@ -4113,7 +4113,7 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNDEFINED); #undef FBOSTATUS_TO_STR default: - FIXME("Unrecognied FBO status 0x%08x\n", status); + FIXME("Unrecognized FBO status 0x%08x.\n", status); return "unrecognized"; } } @@ -4131,7 +4131,7 @@ const char *debug_glerror(GLenum error) { GLERROR_TO_STR(GL_INVALID_FRAMEBUFFER_OPERATION); #undef GLERROR_TO_STR default: - FIXME("Unrecognied GL error 0x%08x\n", error); + FIXME("Unrecognized GL error 0x%08x.\n", error); return "unrecognized"; } }

1 0

Andrey Gusev : d3d9/tests: Fix a typo in skip() message.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 0a9f22facc3ebe8b1fb91979893ac95c87e08cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9f22facc3ebe8b1fb919798… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 9 18:07:56 2016 +0300 d3d9/tests: Fix a typo in skip() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c337c6c..a308311 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11751,7 +11751,7 @@ static void stream_test(void) hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); if(!shader) { - skip("Failed to create a vetex shader\n"); + skip("Failed to create a vertex shader.\n"); goto out; }

1 0

Ken Thomases : winemac: When a child window' s client area is equal to its whole area, use a single Cocoa view for both.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 053b4a81ed56be72d66323f81302c519cec922e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053b4a81ed56be72d66323f81… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:47 2016 -0500 winemac: When a child window's client area is equal to its whole area, use a single Cocoa view for both. This should be a common case and will reduce the number of Cocoa views. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 57 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 59d7763..0d507f4 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -746,14 +746,24 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) */ static void create_cocoa_view(struct macdrv_win_data *data) { + BOOL equal = !memcmp(&data->window_rect, &data->client_rect, sizeof(data->whole_rect)); + CGRect frame = cgrect_from_rect(data->window_rect); + data->shaped = FALSE; data->whole_rect = data->window_rect; TRACE("creating %p window %s whole %s client %s\n", data->hwnd, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); - data->cocoa_view = macdrv_create_view(cgrect_from_rect(data->whole_rect)); + if (!equal) + data->cocoa_view = macdrv_create_view(frame); create_client_cocoa_view(data); + if (equal) + { + data->cocoa_view = data->client_cocoa_view; + macdrv_set_view_hidden(data->cocoa_view, TRUE); + macdrv_set_view_frame(data->cocoa_view, frame); + } } @@ -768,7 +778,8 @@ static void destroy_cocoa_view(struct macdrv_win_data *data) TRACE("win %p Cocoa view %p\n", data->hwnd, data->cocoa_view); - macdrv_dispose_view(data->cocoa_view); + if (data->cocoa_view != data->client_cocoa_view) + macdrv_dispose_view(data->cocoa_view); data->cocoa_view = NULL; data->on_screen = FALSE; } @@ -1007,7 +1018,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c const RECT *old_whole_rect) { CGRect frame = cgrect_from_rect(data->whole_rect); - RECT rect; + BOOL force_z_order = FALSE; if (data->cocoa_window) { @@ -1020,11 +1031,37 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); } else - macdrv_set_view_frame(data->cocoa_view, frame); + { + BOOL were_equal = (data->cocoa_view == data->client_cocoa_view); + BOOL now_equal = !memcmp(&data->whole_rect, &data->client_rect, sizeof(data->whole_rect)); - rect = data->client_rect; - OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); + if (were_equal && !now_equal) + { + data->cocoa_view = macdrv_create_view(frame); + macdrv_set_view_hidden(data->cocoa_view, !data->on_screen); + macdrv_set_view_superview(data->client_cocoa_view, data->cocoa_view, NULL, NULL, NULL); + macdrv_set_view_hidden(data->client_cocoa_view, FALSE); + force_z_order = TRUE; + } + else if (!were_equal && now_equal) + { + macdrv_dispose_view(data->cocoa_view); + data->cocoa_view = data->client_cocoa_view; + macdrv_set_view_hidden(data->cocoa_view, !data->on_screen); + macdrv_set_view_frame(data->cocoa_view, frame); + force_z_order = TRUE; + } + else + macdrv_set_view_frame(data->cocoa_view, frame); + } + + if (data->cocoa_view != data->client_cocoa_view) + { + RECT rect = data->client_rect; + OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); + macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); + TRACE("win %p/%p client %s\n", data->hwnd, data->client_cocoa_view, wine_dbgstr_rect(&rect)); + } if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || @@ -1032,11 +1069,11 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c old_window_rect->top - old_whole_rect->top != data->window_rect.top - data->whole_rect.top)) sync_window_region(data, (HRGN)1); - TRACE("win %p/%p whole_rect %s frame %s client %s\n", data->hwnd, + TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window ? (void*)data->cocoa_window : (void*)data->cocoa_view, - wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame), wine_dbgstr_rect(&rect)); + wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame)); - if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + if (force_z_order || !(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) sync_window_z_order(data); }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016