January 2017 - Wine-commits

André Hentschel : iphlpapi/tests: Fix usage of broken ().
by Alexandre Julliard 18 Jan '17

18 Jan '17

Module: wine Branch: master Commit: 4712f24060cd90b7f2b303e548cdf53cfc063a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4712f24060cd90b7f2b303e54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 18:29:59 2017 +0100 iphlpapi/tests: Fix usage of broken(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 893e7cd..6991a39 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1587,7 +1587,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) } ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, GetProcessHeap(), 0, 0 ); - ok( ret == ERROR_INVALID_PARAMETER || broken(ERROR_NOT_SUPPORTED) /* win2k */, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_NOT_SUPPORTED) /* win2k */, "got %u\n", ret ); ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, GetProcessHeap(), 0, AF_INET ); ok( ret == ERROR_SUCCESS, "got %u\n", ret );

1 0

Nikolay Sivov : dwrite: Let freetype face cache manage lifetime of requested file fragments.
by Alexandre Julliard 18 Jan '17

18 Jan '17

Module: wine Branch: master Commit: 274a82b33c2907a2d28a50ba6919711cfabf1b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274a82b33c2907a2d28a50ba6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 18 23:02:41 2017 +0300 dwrite: Let freetype face cache manage lifetime of requested file fragments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3179438..9cc157e 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -93,6 +93,22 @@ MAKE_FUNCPTR(FTC_Manager_LookupSize); MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR +struct face_finalizer_data +{ + IDWriteFontFileStream *stream; + void *context; +}; + +static void face_finalizer(void *object) +{ + FT_Face face = object; + struct face_finalizer_data *data = (struct face_finalizer_data *)face->generic.data; + + IDWriteFontFileStream_ReleaseFileFragment(data->stream, data->context); + IDWriteFontFileStream_Release(data->stream); + heap_free(data); +} + static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) { IDWriteFontFace *fontface = (IDWriteFontFace*)face_id; @@ -136,7 +152,19 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe index = IDWriteFontFace_GetIndex(fontface); fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - IDWriteFontFileStream_ReleaseFileFragment(stream, context); + if (fterror == FT_Err_Ok) { + struct face_finalizer_data *data; + + data = heap_alloc(sizeof(*data)); + data->stream = stream; + data->context = context; + + (*face)->generic.data = data; + (*face)->generic.finalizer = face_finalizer; + return fterror; + } + else + IDWriteFontFileStream_ReleaseFileFragment(stream, context); fail: IDWriteFontFileStream_Release(stream);

1 0

Michael Stefaniuc : testbot: Fix a typo in the documentation.
by Alexandre Julliard 18 Jan '17

18 Jan '17

Module: tools Branch: master Commit: b87440943d0e3167ddbb375e7599a71f55d745a7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b87440943d0e3167ddbb375e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 18 14:40:26 2017 +0100 testbot: Fix a typo in the documentation. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c41b77a..10f325f 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -104,7 +104,7 @@ commands in it. This part is used to start the tasks in the VM but is implemented independently from the VM's hypervisor since most do not provide this functionality. -The VM type defines what the it can do: +The VM type defines what it can do: =over 12

1 0

Huw Davies : msctf/tests: Fix usage of test_ShouldDeactivate which is a BOOL.
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: 543496a4fc72a556802b666b38bdc8601b326da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=543496a4fc72a556802b666b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 17 11:41:20 2017 +0000 msctf/tests: Fix usage of test_ShouldDeactivate which is a BOOL. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 18a248f..5b386ad 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2175,11 +2175,11 @@ static void test_AssociateFocus(void) test_CurrentFocus = dm1; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; - test_ShouldDeactivate = SINK_OPTIONAL; + test_ShouldDeactivate = TRUE; hr = ITfThreadMgr_AssociateFocus(g_tm,wnd1,dm1,&olddm); ok(SUCCEEDED(hr),"AssociateFocus failed\n"); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - test_ShouldDeactivate = SINK_UNEXPECTED; + test_ShouldDeactivate = FALSE; processPendingMessages();

1 0

Huw Davies : msctf/tests: Fix tests on Windows 8 and 10.
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: 5fb2267a78a79d7afafae0d1f6cfe9a9ec973a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb2267a78a79d7afafae0d1f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 17 11:41:21 2017 +0000 msctf/tests: Fix tests on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 5b386ad..e44eafd 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2211,12 +2211,14 @@ static void test_AssociateFocus(void) test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; + test_ShouldDeactivate = TRUE; /* win 8/10 */ ShowWindow(wnd2,SW_SHOWNORMAL); SetFocus(wnd2); sink_check_saved(&test_OnSetFocus,dm1,dm2,"OnSetFocus"); test_CurrentFocus = FOCUS_IGNORE; /* occasional wine race */ test_PrevFocus = FOCUS_IGNORE; /* occasional wine race */ test_OnSetFocus = SINK_IGNORE; /* occasional wine race */ + test_ShouldDeactivate = FALSE; processPendingMessages(); ShowWindow(wnd3,SW_SHOWNORMAL);

1 0

Huw Davies : msctf/tests: Return if the constructor fails. This avoids several clang warnings.
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: aac4cc8fbbad8236abfdae8086e1dc76ecc8b778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac4cc8fbbad8236abfdae808… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 17 11:41:22 2017 +0000 msctf/tests: Return if the constructor fails. This avoids several clang warnings. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index e44eafd..7c12936 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1550,11 +1550,11 @@ static void test_startSession(void) ITfDocumentMgr_Release(dmtest); hr = TextStoreACP_Constructor((IUnknown**)&ts); - if (SUCCEEDED(hr)) - { - hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie); - ok(SUCCEEDED(hr),"CreateContext Failed\n"); - } + ok(SUCCEEDED(hr),"Constructor Failed\n"); + if (FAILED(hr)) return; + + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie); + ok(SUCCEEDED(hr),"CreateContext Failed\n"); hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt2, &editCookie); ok(SUCCEEDED(hr),"CreateContext Failed\n");

1 0

Józef Kucia : ddraw/tests: Rewrite StructSizeTest().
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: 2c46fd0807ea251fe206401d83c2790b378415f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c46fd0807ea251fe206401d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 17 12:26:36 2017 +0100 ddraw/tests: Rewrite StructSizeTest(). 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/ddraw/tests/ddraw1.c | 161 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 198 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 204 ++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 216 +++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/dsurface.c | 107 ---------------------- 5 files changed, 775 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c46fd0807ea251fe2064…

1 0

Józef Kucia : d3d9/tests: Remove redundant state setting calls.
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: 14e24127833c2c125ec213c2501bbc76746f5242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e24127833c2c125ec213c25… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 17 12:44:17 2017 +0100 d3d9/tests: Remove redundant state setting calls. 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/d3d9/tests/visual.c | 81 ------------------------------------------------ 1 file changed, 81 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 43c0cbc..4213779 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -21643,13 +21643,6 @@ static void test_line_antialiasing_blending(void) HWND window; HRESULT hr; - static const D3DMATRIX mat = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; static const struct { struct vec3 position; @@ -21690,22 +21683,10 @@ static void test_line_antialiasing_blending(void) ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); trace("Line antialiasing support: %#x.\n", caps.LineCaps & D3DLINECAPS_ANTIALIAS); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); @@ -21947,13 +21928,6 @@ static void test_evict_bound_resources(void) void *data; HRESULT hr; - static const D3DMATRIX mat = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; static const struct { struct vec3 position; @@ -21988,37 +21962,13 @@ static void test_evict_bound_resources(void) D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); @@ -22075,13 +22025,6 @@ static void test_evict_bound_resources(void) /* This test shows that 0xffff is valid index in D3D9. */ static void test_max_index16(void) { - static const D3DMATRIX mat = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; static const struct vertex { struct vec3 position; @@ -22146,37 +22089,13 @@ static void test_max_index16(void) D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);

1 0

Jarkko Korpi : winex11.drv: Add 640x400 mode to virtual desktop.
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: be139063e4d20f90971432f0e8970fa54d00bff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be139063e4d20f90971432f0e… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Tue Jan 17 18:06:39 2017 +0200 winex11.drv: Add 640x400 mode to virtual desktop. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com>= Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 034d7f3..bf2c463 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 240, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 320, 400, 512, 640, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 240, 300, 384, 400, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Samuele Guerrini : winebus.sys: Buffer length check fix.
by Alexandre Julliard 17 Jan '17

17 Jan '17

Module: wine Branch: master Commit: b510dccecbfe80c26b030b78b903b38350d41012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b510dccecbfe80c26b030b78b… Author: Samuele Guerrini <sguerrini97(a)gmail.com> Date: Tue Jan 17 17:28:16 2017 +0000 winebus.sys: Buffer length check fix. Signed-off-by: Samuele Guerrini <sguerrini97(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d6bb48a..415bd3d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -351,7 +351,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE if (id == 0) { - if (length + 1 > sizeof(feature_buffer)) + if (length + 1 > sizeof(buffer)) { ERR("Output feature buffer too small\n"); return STATUS_UNSUCCESSFUL;

1 0