wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Józef Kucia : d3d10core/tests: Initialize texture data in test_update_subresource().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 5b155ea16c3f8513b086dcc36ea4d058df132859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b155ea16c3f8513b086dcc36… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:24 2016 +0100 d3d10core/tests: Initialize texture data in test_update_subresource(). Fixes test failures on Intel GPUs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fc0745a..3bd6ea6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6487,6 +6487,7 @@ static void test_fragment_coords(void) static void test_update_subresource(void) { struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; ID3D10SamplerState *sampler_state; ID3D10ShaderResourceView *ps_srv; @@ -6527,6 +6528,7 @@ static void test_update_subresource(void) 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6559,7 +6561,11 @@ static void test_update_subresource(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &ps_srv);

1 0

Józef Kucia : d3d11/tests: Initialize texture data in test_update_subresource().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 0175a267a80750960c6124b1710e6561630b8793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0175a267a80750960c6124b17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:23 2016 +0100 d3d11/tests: Initialize texture data in test_update_subresource(). Fixes test failures on Intel GPUs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 38a3d65..d66f929 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6781,6 +6781,7 @@ static void test_fragment_coords(void) static void test_update_subresource(void) { struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; @@ -6822,6 +6823,7 @@ static void test_update_subresource(void) 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6855,7 +6857,11 @@ static void test_update_subresource(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &ps_srv);

1 0

Józef Kucia : d3d10core/tests: Initialize buffer data in test_copy_subresource_region().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: d78aa12da650dd2ed8f246c3fcf1d8aa0de471cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78aa12da650dd2ed8f246c3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:22 2016 +0100 d3d10core/tests: Initialize buffer data in test_copy_subresource_region(). This test fails randomly on Windows 10 with AMD GPU. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e617319..fc0745a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6859,7 +6859,8 @@ static void test_copy_subresource_region(void) ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); ID3D10Device_PSSetShader(device, ps); - dst_buffer = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(float_colors), NULL); + memset(float_colors, 0, sizeof(float_colors)); + dst_buffer = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(float_colors), float_colors); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &dst_buffer);

1 0

Józef Kucia : d3d11/tests: Initialize buffer data in test_copy_subresource_region().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 9e2ac906146c748082889e1324feb10006ed23b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2ac906146c748082889e132… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:21 2016 +0100 d3d11/tests: Initialize buffer data in test_copy_subresource_region(). This test fails randomly on Windows 10 with AMD GPU. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 54df386..38a3d65 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7157,7 +7157,8 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - dst_buffer = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(float_colors), NULL); + memset(float_colors, 0, sizeof(float_colors)); + dst_buffer = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(float_colors), float_colors); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &dst_buffer); src_buffer = create_buffer(device, 0, 256 * sizeof(*float_colors), NULL);

1 0

Nikolay Sivov : d2d1/tests: Some tests for GetRect() and GetRoundedRect().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: adfdfe79b2183c35b16e761ac7bdd3ed924f40db URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfdfe79b2183c35b16e761ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 8 20:14:22 2016 +0300 d2d1/tests: Some tests for GetRect() and GetRoundedRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 721afa4..04ce2b5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -55,6 +55,14 @@ static void set_rect(D2D1_RECT_F *rect, float left, float top, float right, floa rect->bottom = bottom; } +static void set_rounded_rect(D2D1_ROUNDED_RECT *rect, float left, float top, float right, float bottom, + float radius_x, float radius_y) +{ + set_rect(&rect->rect, left, top, right, bottom); + rect->radiusX = radius_x; + rect->radiusY = radius_y; +} + static void set_rect_u(D2D1_RECT_U *rect, UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) { rect->left = left; @@ -1752,15 +1760,47 @@ static void test_path_geometry(void) static void test_rectangle_geometry(void) { ID2D1RectangleGeometry *geometry; + D2D1_RECT_F rect, rect2; ID2D1Factory *factory; D2D1_POINT_2F point; - D2D1_RECT_F rect; BOOL contains; HRESULT hr; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + + set_rect(&rect, 50.0f, 0.0f, 40.0f, 100.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + + set_rect(&rect, 0.0f, 100.0f, 40.0f, 50.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + + set_rect(&rect, 50.0f, 100.0f, 40.0f, 50.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + set_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f); hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); @@ -1809,6 +1849,58 @@ static void test_rectangle_geometry(void) ID2D1Factory_Release(factory); } +static void test_rounded_rectangle_geometry(void) +{ + ID2D1RoundedRectangleGeometry *geometry; + D2D1_ROUNDED_RECT rect, rect2; + ID2D1Factory *factory; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rounded_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); +todo_wine + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + if (FAILED(hr)) + { + ID2D1Factory_Release(factory); + return; + } + + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + /* X radius larger than half width. */ + set_rounded_rect(&rect, 0.0f, 0.0f, 50.0f, 40.0f, 30.0f, 5.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + /* Y radius larger than half height. */ + set_rounded_rect(&rect, 0.0f, 0.0f, 50.0f, 40.0f, 5.0f, 30.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + /* Both exceed rectangle size. */ + set_rounded_rect(&rect, 0.0f, 0.0f, 50.0f, 40.0f, 30.0f, 25.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + ID2D1Factory_Release(factory); +} + static void test_bitmap_formats(void) { D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -3249,6 +3341,7 @@ START_TEST(d2d1) test_bitmap_brush(); test_path_geometry(); test_rectangle_geometry(); + test_rounded_rectangle_geometry(); test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap();

1 0

Alistair Leslie-Hughes : setupapi: Add SetupDiGetDevicePropertyW stub.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: b32a0eaab9971af4045d6def9c4b2ebaa336636a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32a0eaab9971af4045d6def9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 4 06:55:22 2016 +0000 setupapi: Add SetupDiGetDevicePropertyW stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 1 + include/setupapi.h | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 02e75b6..ef1a6b7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4143,3 +4143,17 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO info_set, PSP_DEVINFO_DATA info_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + FIXME("%p, %p, %p, %p, %p, %d, %p, 0x%08x stub\n", info_set, info_data, prop_key, + prop_type, prop_buff, prop_buff_size, required_size, flags); + + SetLastError(ERROR_NOT_FOUND); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cc873ae..da6bf5d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -342,6 +342,7 @@ @ stub SetupDiGetDeviceInterfaceAlias @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) +@ stdcall SetupDiGetDevicePropertyW(ptr ptr ptr ptr ptr long ptr long) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @ stub SetupDiGetDriverInfoDetailA diff --git a/include/setupapi.h b/include/setupapi.h index 0d6911d..76e255c 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1564,8 +1564,12 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); #define SetupDiGetDeviceInterfaceDetail WINELIB_NAME_AW(SetupDiGetDeviceInterfaceDetail) +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, + DWORD *, DWORD); +#define SetupDiGetDeviceProperty WINELIB_NAME_AW(SetupDiGetDeviceProperty) /* note: A function doesn't exist */ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +#define SetupDiGetDeviceRegistryProperty WINELIB_NAME_AW(SetupDiGetDeviceRegistryProperty) BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_A, PSP_DRVINFO_DETAIL_DATA_A, DWORD, PDWORD); BOOL WINAPI SetupDiGetDriverInfoDetailW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_W, PSP_DRVINFO_DETAIL_DATA_W, DWORD, PDWORD); #define SetupDiGetDriverInfoDetail WINELIB_NAME_AW(SetupDiGetDriverInfoDetail)

1 0

Hadrien Boizard : uxtheme: Use straight assignments instead of CopyRect().
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 3155079e413de5afc1c1f3194ff663efbdc0dfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3155079e413de5afc1c1f3194… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Fri Nov 4 16:56:23 2016 +0100 uxtheme: Use straight assignments instead of CopyRect(). Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 2a37a56..e917dd1 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -686,7 +686,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, } oldSrc = SelectObject(hdcSrc, bmpSrc); - CopyRect(&rcDst, pRect); + rcDst = *pRect; get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, &transparentcolor, FALSE); @@ -863,7 +863,7 @@ draw_error: DeleteDC(hdcSrc); if (bmpSrcResized) DeleteObject(bmpSrcResized); if (hdcOrigSrc) DeleteDC(hdcOrigSrc); - CopyRect(pRect, &rcDst); + *pRect = rcDst; return hr; } @@ -1001,7 +1001,7 @@ static HRESULT UXTHEME_DrawBorderBackground(HTHEME hTheme, HDC hdc, int iPartId, HRESULT hr; RECT rt; - CopyRect(&rt, pRect); + rt = *pRect; hr = UXTHEME_DrawBorderRectangle(hTheme, hdc, iPartId, iStateId, &rt, pOptions); if(FAILED(hr)) @@ -1043,7 +1043,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId, else IntersectClipRect(hdc, opts->rcClip.left, opts->rcClip.top, opts->rcClip.right, opts->rcClip.bottom); } - CopyRect(&rt, pRect); + rt = *pRect; if(bgtype == BT_IMAGEFILE) hr = UXTHEME_DrawImageBackground(hTheme, hdc, iPartId, iStateId, &rt, opts); @@ -1641,7 +1641,7 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, TRACE("%d %d\n", iPartId, iStateId); - CopyRect(&rt, pRect); + rt = *pRect; opts.dwSize = sizeof(opts); if (flags2 & DTT_GRAYED) { @@ -2033,7 +2033,7 @@ HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId, oldFont = SelectObject(hdc, hFont); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags|DT_CALCRECT); - CopyRect(pExtentRect, &rt); + *pExtentRect = rt; if(hFont) { SelectObject(hdc, oldFont);

1 0

Jacek Caban : rpcrt4: Initialize all rpc_server_registered_auth_info fields in RpcServerRegisterAuthInfoW.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: ad77b4c5fdaaa782c3787388d2496ece74e0213b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad77b4c5fdaaa782c3787388d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 17:29:53 2016 +0100 rpcrt4: Initialize all rpc_server_registered_auth_info fields in RpcServerRegisterAuthInfoW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d77354d..73e9742 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1449,13 +1449,11 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au max_token = package->cbMaxToken; FreeContextBuffer(packages); - auth_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*auth_info)); + auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); if (!auth_info) return RPC_S_OUT_OF_RESOURCES; - if (!ServerPrincName) { - auth_info->principal = NULL; - }else if (!(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; }

1 0

Aric Stewart : winebus.sys: IOCTL_HID_GET_FEATURE for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 11a5964d3a1b51656a9f269bef9ae037948c1bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a5964d3a1b51656a9f269be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:45 2016 -0600 winebus.sys: IOCTL_HID_GET_FEATURE for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 3b4b0a9..10635f8 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -235,14 +235,39 @@ static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, static NTSTATUS get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) { - *read = 0; - return STATUS_NOT_IMPLEMENTED; + IOReturn ret; + CFIndex report_length = length; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + ret = IOHIDDeviceGetReport(private->device, kIOHIDReportTypeFeature, id, report, &report_length); + if (ret == kIOReturnSuccess) + { + *read = report_length; + return STATUS_SUCCESS; + } + else + { + *read = 0; + return STATUS_UNSUCCESSFUL; + } } static NTSTATUS set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { - *written = 0; - return STATUS_NOT_IMPLEMENTED; + IOReturn result; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + result = IOHIDDeviceSetReport(private->device, kIOHIDReportTypeFeature, id, report, length); + if (result == kIOReturnSuccess) + { + *written = length; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } } static const platform_vtbl iohid_vtbl =

1 0

Aric Stewart : winebus.sys: IOCTL_HID_SET_OUTPUTREPORT for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 45a7f9f04713b09c93f3b0dc1e7ceca39dae40cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a7f9f04713b09c93f3b0dc1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:41 2016 -0600 winebus.sys: IOCTL_HID_SET_OUTPUTREPORT for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index e728b34..3b4b0a9 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -218,8 +218,19 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { - *written = 0; - return STATUS_NOT_IMPLEMENTED; + IOReturn result; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + result = IOHIDDeviceSetReport(private->device, kIOHIDReportTypeOutput, id, report, length); + if (result == kIOReturnSuccess) + { + *written = length; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } } static NTSTATUS get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
47
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 November 2016