April 2019 - Wine-commits - list.winehq.org

Henri Verbeet : d3d11/tests: Introduce and use check_readback_data_u16.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 310849de20c9fa5c8a6a13725480512f66d524a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=310849de20c9fa5c8a6a1372… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:46 2019 +0430 d3d11/tests: Introduce and use check_readback_data_u16. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 101 +++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a02b3f..6f43848 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -936,11 +936,16 @@ static void *get_readback_data(struct resource_readback *rb, return (BYTE *)rb->map_desc.pData + z * rb->map_desc.DepthPitch + y * rb->map_desc.RowPitch + x * byte_width; } -static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +static BYTE get_readback_u8(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(BYTE *)get_readback_data(rb, x, y, z, sizeof(BYTE)); } +static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return *(WORD *)get_readback_data(rb, x, y, z, sizeof(WORD)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(DWORD *)get_readback_data(rb, x, y, z, sizeof(DWORD)); @@ -980,12 +985,12 @@ static DWORD get_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigne return color; } -#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) -static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, +#define check_readback_data_u8(a, b, c, d) check_readback_data_u8_(__LINE__, a, b, c, d) +static void check_readback_data_u8_(unsigned int line, struct resource_readback *rb, const RECT *rect, BYTE expected_value, BYTE max_diff) { unsigned int x = 0, y = 0, z = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; BYTE value = 0; @@ -1001,30 +1006,61 @@ static void check_readback_data_byte_(unsigned int line, struct resource_readbac { for (x = rect->left; x < rect->right; ++x) { - value = get_readback_byte(rb, x, y, z); - if (!compare_color(value, expected_value, max_diff)) - { - all_match = FALSE; - break; - } + value = get_readback_u8(rb, x, y, z); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; } - if (!all_match) - break; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u, %u), sub-resource %u.\n", value, expected_value, x, y, z, rb->sub_resource_idx); } +#define check_readback_data_u16(a, b, c, d) check_readback_data_u16_(__LINE__, a, b, c, d) +static void check_readback_data_u16_(unsigned int line, struct resource_readback *rb, + const RECT *rect, WORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0, z = 0; + BOOL all_match = FALSE; + RECT default_rect; + WORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (z = 0; z < rb->depth; ++z) + { + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u16(rb, x, y, z); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%04x, expected 0x%04x at (%u, %u, %u), sub-resource %u.\n", + value, expected_value, x, y, z, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) { unsigned int x = 0, y = 0, z = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; DWORD color = 0; @@ -1042,17 +1078,13 @@ static void check_readback_data_color_(unsigned int line, struct resource_readba { color = get_readback_color(rb, x, y, z); if (!compare_color(color, expected_color, max_diff)) - { - all_match = FALSE; - break; - } + goto done; } - if (!all_match) - break; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u), sub-resource %u.\n", color, expected_color, x, y, z, rb->sub_resource_idx); @@ -25514,14 +25546,7 @@ static void test_depth_bias(void) break; case DXGI_FORMAT_D16_UNORM: get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); - } - } + check_readback_data_u16(&rb, NULL, 0xffffu, 0); release_resource_readback(&rb); break; default: @@ -25586,17 +25611,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - } - } + check_readback_data_u16(&rb, NULL, depth * 65535.0f + 0.5f, 1); release_resource_readback(&rb); break; default: @@ -29007,7 +29022,7 @@ static void test_render_a8(void) ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); draw_quad(&test_context); get_texture_readback(texture, 0, &rb); - check_readback_data_byte(&rb, NULL, 0xff, 0); + check_readback_data_u8(&rb, NULL, 0xff, 0); release_resource_readback(&rb); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, black);

1 0

Henri Verbeet : d3d11/tests: Introduce and use check_readback_data_u24.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 7bca617c6a91be96dc4e58b615393f0845eadfd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bca617c6a91be96dc4e58b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 2 21:30:47 2019 +0430 d3d11/tests: Introduce and use check_readback_data_u24. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 58 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6f43848..90bcbae 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -946,11 +946,16 @@ static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsig return *(WORD *)get_readback_data(rb, x, y, z, sizeof(WORD)); } -static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +static DWORD get_readback_u32(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(DWORD *)get_readback_data(rb, x, y, z, sizeof(DWORD)); } +static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return get_readback_u32(rb, x, y, z); +} + static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(float *)get_readback_data(rb, x, y, 0, sizeof(float)); @@ -1055,6 +1060,41 @@ done: value, expected_value, x, y, z, rb->sub_resource_idx); } +#define check_readback_data_u24(a, b, c, d, e) check_readback_data_u24_(__LINE__, a, b, c, d, e) +static void check_readback_data_u24_(unsigned int line, struct resource_readback *rb, + const RECT *rect, unsigned int shift, DWORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0, z = 0; + BOOL all_match = FALSE; + RECT default_rect; + DWORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (z = 0; z < rb->depth; ++z) + { + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u32(rb, x, y, z) >> shift; + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%06x, expected 0x%06x at (%u, %u, %u), sub-resource %u.\n", + value, expected_value, x, y, z, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -25446,10 +25486,10 @@ static void test_depth_bias(void) struct resource_readback rb; ID3D11DepthStencilView *dsv; unsigned int expected_value; - unsigned int x, y, i, j, k; ID3D11RasterizerState *rs; ID3D11Texture2D *texture; unsigned int format_idx; + unsigned int y, i, j, k; unsigned int shift = 0; ID3D11Device *device; float *depth_values; @@ -25590,19 +25630,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u32 = get_readback_data(&rb, x, y, 0, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - } - } + check_readback_data_u24(&rb, NULL, shift, depth * 16777215.0f + 0.5f, 1); release_resource_readback(&rb); break; case DXGI_FORMAT_D16_UNORM:

1 0

Michael Müller : taskmgr: Use system font instead of special bitmap font.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 5cd7f63f727516468913ef5a1337d5d771943a38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cd7f63f727516468913ef5a… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 1 13:38:28 2019 +0200 taskmgr: Use system font instead of special bitmap font. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/font.bmp | Bin 646 -> 0 bytes programs/taskmgr/graph.c | 14 ++++++++++++-- programs/taskmgr/resource.h | 1 - programs/taskmgr/taskmgr.c | 29 ----------------------------- programs/taskmgr/taskmgr.rc | 3 --- 5 files changed, 12 insertions(+), 35 deletions(-) diff --git a/programs/taskmgr/font.bmp b/programs/taskmgr/font.bmp deleted file mode 100644 index c1f8410..0000000 Binary files a/programs/taskmgr/font.bmp and /dev/null differ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index e6819cf..7e978e1 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -43,6 +43,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONG CpuUsage; ULONG CpuKernelUsage; @@ -96,7 +97,11 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph @@ -223,6 +228,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; @@ -257,7 +263,11 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index cd43f15..4153f66 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -35,7 +35,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDB_FONT 154 #define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDC_DEBUG_CHANNELS_LIST 156 diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b99d238..d3337d2 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -76,35 +76,6 @@ static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLef FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); } -void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) -{ - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT)); - hOldBitmap = SelectObject(hFontDC, hFontBitmap); - - for (i = 0; lpwszText[i]; i++) { - if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpwszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpwszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpwszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); -} - static BOOL OnCreate(HWND hWnd) { HMENU hMenu; diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index e6742a7..ffd0699 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -609,6 +609,3 @@ IDB_TRAYMASK BITMAP traymask.bmp /* @makedep: trayicon.bmp */ IDB_TRAYICON BITMAP trayicon.bmp - -/* @makedep: font.bmp */ -IDB_FONT BITMAP font.bmp

1 0

Zebediah Figura : rpcrt4: Properly handle complex arrays in the typelib marshaller.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 3fd7a32a015923a5e153343cdc7b1d26ffb81c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd7a32a015923a5e153343c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 17:38:25 2019 -0500 rpcrt4: Properly handle complex arrays in the typelib marshaller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 52 ++++++++++++++++++++++++------------------ dlls/rpcrt4/ndr_typelib.c | 33 +++++++++++++++++++-------- 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4f84442..ac0969b 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1481,21 +1481,21 @@ static HRESULT WINAPI Widget_variant_array(IWidget *iface, VARIANT in[2], VARIAN { ok(V_VT(&in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[0])); ok(V_I4(&in[0]) == 1, "Got wrong value %d.\n", V_I4(&in[0])); - ok(V_VT(&in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[1])); - ok(V_I4(&in[1]) == 2, "Got wrong value %d.\n", V_I4(&in[1])); + ok(V_VT(&in[1]) == (VT_BYREF|VT_I4), "Got wrong type %u.\n", V_VT(&in[1])); + ok(*V_I4REF(&in[1]) == 2, "Got wrong value %d.\n", *V_I4REF(&in[1])); ok(V_VT(&out[0]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[0])); ok(V_VT(&out[1]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[1])); ok(V_VT(&in_out[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[0])); ok(V_I4(&in_out[0]) == 5, "Got wrong type %u.\n", V_VT(&in_out[0])); - ok(V_VT(&in_out[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[1])); - ok(V_I4(&in_out[1]) == 6, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(V_VT(&in_out[1]) == VT_BSTR, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(!lstrcmpW(V_BSTR(&in_out[1]), test_bstr1), "Got wrong value %s.\n", wine_dbgstr_w(V_BSTR(&in[1]))); - V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; - V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; - V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; - V_VT(&out[1]) = VT_I1; V_I1(&out[1]) = 10; - V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; - V_VT(&in_out[1]) = VT_I1; V_I1(&in_out[1]) = 12; + V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; + V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; + V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; + V_VT(&out[1]) = VT_BSTR; V_BSTR(&out[1]) = SysAllocString(test_bstr2); + V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; + V_VT(&in_out[1]) = VT_UNKNOWN; V_UNKNOWN(&in_out[1]) = (IUnknown *)create_disp_obj(); return S_OK; } @@ -2581,9 +2581,11 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) static void test_marshal_array(IWidget *widget, IDispatch *disp) { VARIANT var_in[2], var_out[2], var_in_out[2]; + ISomethingFromDispatch *proxy_sfd; array_t in, out, in_out; MYSTRUCT struct_in[2]; HRESULT hr; + int i = 2; memcpy(in, test_array1, sizeof(array_t)); memcpy(out, test_array2, sizeof(array_t)); @@ -2594,26 +2596,32 @@ static void test_marshal_array(IWidget *widget, IDispatch *disp) ok(!memcmp(&out, &test_array5, sizeof(array_t)), "Arrays didn't match.\n"); ok(!memcmp(&in_out, &test_array6, sizeof(array_t)), "Arrays didn't match.\n"); - V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; - V_VT(&var_in[1]) = VT_I4; V_I4(&var_in[1]) = 2; - V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; - V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; - V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; - V_VT(&var_in_out[1]) = VT_I4; V_I4(&var_in_out[1]) = 6; + V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; + V_VT(&var_in[1]) = VT_BYREF|VT_I4; V_I4REF(&var_in[1]) = &i; + V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; + V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; + V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; + V_VT(&var_in_out[1]) = VT_BSTR; V_BSTR(&var_in_out[1]) = SysAllocString(test_bstr1); hr = IWidget_variant_array(widget, var_in, var_out, var_in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(V_VT(&var_in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[0])); ok(V_I4(&var_in[0]) == 1, "Got wrong value %d.\n", V_I4(&var_in[0])); - ok(V_VT(&var_in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[1])); - ok(V_I4(&var_in[1]) == 2, "Got wrong value %d.\n", V_I4(&var_in[1])); + ok(V_VT(&var_in[1]) == (VT_BYREF|VT_I4), "Got wrong type %u.\n", V_VT(&var_in[1])); + ok(V_I4REF(&var_in[1]) == &i, "Got wrong value %p.\n", V_I4REF(&var_in[1])); + ok(i == 2, "Got wrong value %d.\n", i); ok(V_VT(&var_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[0])); ok(V_I1(&var_out[0]) == 9, "Got wrong value %u.\n", V_VT(&var_out[0])); - ok(V_VT(&var_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[1])); - ok(V_I1(&var_out[1]) == 10, "Got wrong value %u.\n", V_VT(&var_out[1])); + ok(V_VT(&var_out[1]) == VT_BSTR, "Got wrong type %u.\n", V_VT(&var_out[1])); + ok(!lstrcmpW(V_BSTR(&var_out[1]), test_bstr2), "Got wrong value %s.\n", wine_dbgstr_w(V_BSTR(&var_out[1]))); ok(V_VT(&var_in_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[0])); ok(V_I1(&var_in_out[0]) == 11, "Got wrong value %u.\n", V_VT(&var_in_out[0])); - ok(V_VT(&var_in_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[1])); - ok(V_I1(&var_in_out[1]) == 12, "Got wrong value %u.\n", V_VT(&var_in_out[1])); + ok(V_VT(&var_in_out[1]) == VT_UNKNOWN, "Got wrong type %u.\n", V_VT(&var_in_out[1])); + hr = IUnknown_QueryInterface(V_UNKNOWN(&var_in_out[1]), &IID_ISomethingFromDispatch, (void **)&proxy_sfd); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ISomethingFromDispatch_anotherfn(proxy_sfd); + ok(hr == 0x01234567, "Got hr %#x.\n", hr); + ISomethingFromDispatch_Release(proxy_sfd); + release_iface(V_UNKNOWN(&var_in_out[1])); memcpy(&struct_in[0], &test_mystruct1, sizeof(MYSTRUCT)); memcpy(&struct_in[1], &test_mystruct2, sizeof(MYSTRUCT)); diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 5a4de51..5c48010 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -326,9 +326,13 @@ static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) { - if (get_basetype(typeinfo, desc)) + switch (desc->vt) + { + case VT_CY: return FC_LGFARRAY; - else if (desc->vt == VT_USERDEFINED) + case VT_CARRAY: + return get_array_fc(typeinfo, &desc->lpadesc->tdescElem); + case VT_USERDEFINED: { ITypeInfo *refinfo; TYPEATTR *attr; @@ -351,8 +355,9 @@ static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) return fc; } - else - return FC_BOGUS_ARRAY; + default: + return get_basetype(typeinfo, desc) ? FC_LGFARRAY : FC_BOGUS_ARRAY; + } } static BOOL type_is_non_iface_pointer(ITypeInfo *typeinfo, TYPEDESC *desc) @@ -616,14 +621,11 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, ARRAYDESC *desc) { unsigned char fc = get_array_fc(typeinfo, &desc->tdescElem); - ULONG size = type_memsize(typeinfo, &desc->tdescElem); unsigned char basetype; size_t ref = 0, off; + ULONG size = 1; USHORT i; - if (fc != FC_LGFARRAY) - FIXME("complex arrays not implemented\n"); - if (!(basetype = get_basetype(typeinfo, &desc->tdescElem))) ref = write_type_tfs(typeinfo, str, len, &desc->tdescElem, FALSE, FALSE); @@ -633,9 +635,20 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, off = *len; - WRITE_CHAR(str, *len, FC_LGFARRAY); + WRITE_CHAR(str, *len, fc); WRITE_CHAR(str, *len, 0); - WRITE_INT (str, *len, size); + if (fc == FC_BOGUS_ARRAY) + { + WRITE_SHORT(str, *len, size); + WRITE_INT(str, *len, 0xffffffff); /* conformance */ + WRITE_INT(str, *len, 0xffffffff); /* variance */ + } + else + { + size *= type_memsize(typeinfo, &desc->tdescElem); + WRITE_INT(str, *len, size); + } + if (basetype) WRITE_CHAR(str, *len, basetype); else

1 0

Alistair Leslie-Hughes : uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 10c51972e99f3a97b7e40ac28ec9c5cd55240c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c51972e99f3a97b7e40ac2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 1 23:37:19 2019 +0000 uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 8 ++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 0fa9bfb..92d594f 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -23,6 +23,8 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" #include "uianimation.h" @@ -30,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uianimation); +static HINSTANCE hinstance; + BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { TRACE("(%p %d %p)\n", dll, reason, reserved); @@ -39,8 +43,44 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + hinstance = dll; DisableThreadLibraryCalls( dll ); break; } return TRUE; } + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) +{ + FIXME( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj ); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + TRACE( "()\n" ); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec index a43b12d..b16365d 100644 --- a/dlls/uianimation/uianimation.spec +++ b/dlls/uianimation/uianimation.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow() -@ stub DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer() -@ stub DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer media types.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 3f5ab4c06c21a6afcb20f0fe2485f6abbcd563e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5ab4c06c21a6afcb20f0fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:21 2019 -0500 quartz/tests: Add some tests for video renderer media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c7f0df4..c7053e5 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -269,6 +269,74 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_video_renderer(); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB8, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -333,6 +401,7 @@ START_TEST(videorenderer) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Link to strmiids and uuid.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 90114c4adf514788f39f645aaf0a33b1b10e23e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90114c4adf514788f39f645a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:22 2019 -0500 quartz/tests: Link to strmiids and uuid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/filtermapper.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index f4c56c1..902e57e 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = oleaut32 ole32 advapi32 user32 msvfw32 +IMPORTS = advapi32 msvfw32 ole32 oleaut32 strmiids user32 uuid C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 2f82ce0..fc4fa95 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -22,14 +22,11 @@ #include "wine/test.h" #include "winbase.h" -#include "initguid.h" #include "dshow.h" #include "winternl.h" - +#include "initguid.h" #include "wine/fil_data.h" -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - /* Helper function, checks if filter with given name was enumerated. */ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) {

1 0

Zebediah Figura : quartz/tests: Add tests for IVMRFilterConfig on the VMR7.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 0efaac5108140f4c08619097324344bca6621af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efaac5108140f4c08619097… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:23 2019 -0500 quartz/tests: Add tests for IVMRFilterConfig on the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/vmr7.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 902e57e..ce59b73 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ mpegsplit.c \ systemclock.c \ videorenderer.c \ + vmr7.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c new file mode 100644 index 0000000..b420991 --- /dev/null +++ b/dlls/quartz/tests/vmr7.c @@ -0,0 +1,140 @@ +/* + * Video Mixing Renderer 7 unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Renderless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_SetNumberOfStreams(config, 3); + if (hr != VFW_E_DDRAW_CAPS_NOT_SUITABLE) + { + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + } + else + skip("Mixing mode is not supported.\n"); + + ref = IVMRFilterConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr7) +{ + CoInitialize(NULL); + + test_filter_config(); + + CoUninitialize(); +}

1 0

Zebediah Figura : quartz/vmr9: Avoid unloading d3d9 while holding d3d9 objects.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: e4b58b450b1c0e35a1ef02d15b9dbb024ae210a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b58b450b1c0e35a1ef02d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:24 2019 -0500 quartz/vmr9: Avoid unloading d3d9 while holding d3d9 objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index de30049..885fbe2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -834,7 +834,6 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { TRACE("Destroying\n"); BaseControlWindow_Destroy(&This->baseControlWindow); - FreeLibrary(This->hD3d9); if (This->allocator) IVMRSurfaceAllocatorEx9_Release(This->allocator); @@ -848,6 +847,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) This->allocator_d3d9_dev = NULL; } + FreeLibrary(This->hD3d9); CoTaskMemFree(This); } return refCount;

1 0

Zebediah Figura : quartz/vmr9: Implement IVMRFilterConfig:: SetRenderingMode().
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: edf1e7696f36b650cddb76275d3a460c271a93ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf1e7696f36b650cddb7627… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:25 2019 -0500 quartz/vmr9: Implement IVMRFilterConfig::SetRenderingMode(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 20 ++++++++++---------- dlls/quartz/vmr9.c | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b420991..105e6b2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -40,14 +40,14 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -57,14 +57,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -74,14 +74,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Renderless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -111,11 +111,11 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); todo_wine { diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 885fbe2..2a39d11 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1246,10 +1246,11 @@ static HRESULT WINAPI VMR7FilterConfig_GetRenderingPrefs(IVMRFilterConfig *iface static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface, DWORD mode) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface); - FIXME("(%p/%p)->(%u) stub\n", iface, This, mode); - return E_NOTIMPL; + TRACE("iface %p, mode %#x.\n", iface, mode); + + return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode); } static HRESULT WINAPI VMR7FilterConfig_GetRenderingMode(IVMRFilterConfig *iface, DWORD *mode)

1 0