August 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Exponentially grow successive point buffers.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 9fe77b4d7bf326b5eb26b960a3ec68cfb1e479b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe77b4d7bf326b5eb26b960a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 16 15:09:30 2016 +0100 gdi32: Exponentially grow successive point buffers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index a4cf733..e9bed18 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -173,31 +173,28 @@ static inline BOOL is_in_rect( const RECT *rect, int x, int y ) } /* - * number of points to buffer before sending them off - * to scanlines() : Must be an even number - */ -#define NUMPTSTOBUFFER 200 - -/* * used to allocate buffers for points and link * the buffers together */ struct point_block { - POINT pts[NUMPTSTOBUFFER]; - int count; + int count, size; struct point_block *next; + POINT pts[1]; /* Variable sized array - must be last. */ }; static struct point_block *add_point( struct point_block *block, int x, int y ) { - if (block->count == NUMPTSTOBUFFER) + if (block->count == block->size) { - struct point_block *new = HeapAlloc( GetProcessHeap(), 0, sizeof(*new) ); + struct point_block *new; + int size = block->size * 2; + new = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct point_block, pts[size] ) ); if (!new) return NULL; block->next = new; new->count = 0; + new->size = size; new->next = NULL; block = new; } @@ -2676,6 +2673,9 @@ static WINEREGION *REGION_PtsToRegion( struct point_block *FirstPtBlock ) return reg; } +/* Number of points in the first point buffer. Must be an even number. */ +#define NUMPTSTOBUFFER 200 + /*********************************************************************** * CreatePolyPolygonRgn (GDI32.@) */ @@ -2692,7 +2692,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ ScanLineListBlock SLLBlock; /* header for scanlinelist */ BOOL fixWAET = FALSE; - struct point_block FirstPtBlock, *block; /* PtBlock buffers */ + char first_blk_buf[FIELD_OFFSET( struct point_block, pts[NUMPTSTOBUFFER] )]; + struct point_block *first_block = (struct point_block *)first_blk_buf, *block; struct edge_table_entry *active, *next; INT poly, total; @@ -2721,9 +2722,10 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, REGION_CreateEdgeTable(Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock); list_init( &AET ); pSLL = ET.scanlines.next; - block = &FirstPtBlock; - FirstPtBlock.count = 0; - FirstPtBlock.next = NULL; + block = first_block; + first_block->count = 0; + first_block->size = NUMPTSTOBUFFER; + first_block->next = NULL; if (mode != WINDING) { /* @@ -2802,13 +2804,13 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, } } - if (!(obj = REGION_PtsToRegion( &FirstPtBlock ))) goto done; + if (!(obj = REGION_PtsToRegion( first_block ))) goto done; if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); done: REGION_FreeStorage(SLLBlock.next); - free_point_blocks( FirstPtBlock.next ); + free_point_blocks( first_block->next ); HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn; }

1 0

Nikolay Sivov : user32: Handle invalid dialog handles in IsDialogMessage() .
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 17987c589fc4587b0adfb9de841adf1201efa111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17987c589fc4587b0adfb9de8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 16 10:38:32 2016 +0300 user32: Handle invalid dialog handles in IsDialogMessage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 3 +++ dlls/user32/tests/dialog.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0663693..8b77ae2 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1152,6 +1152,9 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { INT dlgCode; + if (!IsWindow( hwndDlg )) + return FALSE; + if (CallMsgFilterW( msg, MSGF_DIALOGBOX )) return TRUE; hwndDlg = WIN_GetFullHandle( hwndDlg ); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index a6cd1be..a37c678 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -710,8 +710,23 @@ static void test_WM_NEXTDLGCTL(void) DestroyWindow(g_hwndTestDlg); } +static LRESULT CALLBACK hook_proc(INT code, WPARAM wParam, LPARAM lParam) +{ + ok(0, "unexpected hook called, code %d\n", code); + return CallNextHookEx(NULL, code, wParam, lParam); +} + +static BOOL g_MSGF_DIALOGBOX; +static LRESULT CALLBACK hook_proc2(INT code, WPARAM wParam, LPARAM lParam) +{ + ok(code == MSGF_DIALOGBOX, "unexpected hook called, code %d\n", code); + g_MSGF_DIALOGBOX = code == MSGF_DIALOGBOX; + return CallNextHookEx(NULL, code, wParam, lParam); +} + static void test_IsDialogMessage(void) { + HHOOK hook; MSG msg; g_hwndMain = CreateWindowA("IsDialogMessageWindowClass", "IsDialogMessageWindowClass", @@ -723,11 +738,34 @@ static void test_IsDialogMessage(void) assert (g_hwndButton1); assert (g_hwndButtonCancel); + if (0) + { + /* crashes on Windows */ + IsDialogMessageA(NULL, NULL); + IsDialogMessageA(g_hwndMain, NULL); + } + /* The focus should initially be nowhere. The first TAB should take it * to the first button. The second TAB should take it to the Cancel * button. */ + + /* valid window, invalid message window */ + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc2, NULL, GetCurrentThreadId()); + FormTabMsg (&msg, (HWND)0xbeefbeef); + ok (!IsDialogMessageA(g_hwndMain, &msg), "expected failure\n"); + ok(g_MSGF_DIALOGBOX, "hook wasn't called\n"); + g_MSGF_DIALOGBOX = FALSE; + UnhookWindowsHookEx(hook); + + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc, NULL, GetCurrentThreadId()); FormTabMsg (&msg, g_hwndMain); + + ok (!IsDialogMessageA(NULL, &msg), "expected failure\n"); + ok (!IsDialogMessageA((HWND)0xbeefbeef, &msg), "expected failure\n"); + + UnhookWindowsHookEx(hook); + ok (IsDialogMessageA(g_hwndMain, &msg), "Did not handle first TAB\n"); ok ((GetFocus() == g_hwndButton1), "Focus did not move to first button\n"); FormTabMsg (&msg, g_hwndButton1); @@ -737,6 +775,18 @@ static void test_IsDialogMessage(void) FormEnterMsg (&msg, g_hwndButtonCancel); ok (IsDialogMessageA(g_hwndMain, &msg), "Did not handle the ENTER\n"); ok (g_terminated, "ENTER did not terminate\n"); + + /* matching but invalid window handles, NULL */ + hook = SetWindowsHookExA(WH_MSGFILTER, hook_proc, NULL, GetCurrentThreadId()); + + FormTabMsg (&msg, NULL); + ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); + + /* matching but invalid window handles, not NULL */ + FormTabMsg (&msg, (HWND)0xbeefbeef); + ok (!IsDialogMessageA(msg.hwnd, &msg), "expected failure\n"); + + UnhookWindowsHookEx(hook); }

1 0

Andrew Church : dinput: Report DIDOI_ASPECTPOSITION flag for axes objects.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 5ce8a1a91b5462bc90629385d618ceb6b75cd2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce8a1a91b5462bc90629385d… Author: Andrew Church <achurch(a)achurch.org> Date: Tue Aug 16 17:28:34 2016 -0300 dinput: Report DIDOI_ASPECTPOSITION flag for axes objects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9425c0b..1c4b436 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -495,9 +495,10 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (pdidoi->dwType & DIDFT_AXIS) + if (pdidoi->dwType & DIDFT_AXIS) { sprintfW(pdidoi->tszName, axisW, DIDFT_GETINSTANCE(pdidoi->dwType)); - else if (pdidoi->dwType & DIDFT_POV) + pdidoi->dwFlags |= DIDOI_ASPECTPOSITION; + } else if (pdidoi->dwType & DIDFT_POV) sprintfW(pdidoi->tszName, povW, DIDFT_GETINSTANCE(pdidoi->dwType)); else if (pdidoi->dwType & DIDFT_BUTTON) sprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType));

1 0

Bruno Jesus : dinput/tests: Test for DIDOI_ASPECTPOSITION on joystick axes.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 03181015c372588ae7950555207416f584b21283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03181015c372588ae79505552… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 16 17:28:38 2016 -0300 dinput/tests: Test for DIDOI_ASPECTPOSITION on joystick axes. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 4882744..35ec2d9 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -142,6 +142,10 @@ static BOOL CALLBACK EnumAxes(const DIDEVICEOBJECTINSTANCEA *pdidoi, void *pCont hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %08x\n", hr); + /* ensure DIDOI_ASPECTPOSITION is set for axes objects */ + ok(pdidoi->dwFlags & DIDOI_ASPECTPOSITION, "Missing DIDOI_ASPECTPOSITION, flags are 0x%x\n", + pdidoi->dwFlags); + info->axis++; } else if (IsEqualIID(&pdidoi->guidType, &GUID_POV)) info->pov++;

1 0

Vincent Povirk : gdiplus: Add support for containers in metafiles.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: f28803c0a4b34ad4a46fcb1700076c17633c4fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28803c0a4b34ad4a46fcb170… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 15 16:25:41 2016 -0500 gdiplus: Add support for containers in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 5 + dlls/gdiplus/graphics.c | 14 +++ dlls/gdiplus/image.c | 1 + dlls/gdiplus/metafile.c | 205 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 225 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f28803c0a4b34ad4a46fc…

1 0

Vincent Povirk : gdiplus/tests: Add test for containers in metafiles.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 977ba49768f355582af47e2fa3bb2279525b1677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=977ba49768f355582af47e2fa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 15 16:25:42 2016 -0500 gdiplus/tests: Add test for containers in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index c2cc400..a9d54a7 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1709,6 +1709,166 @@ static void test_frameunit(void) expect(Ok, stat); } +static const emfplus_record container_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndContainer}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSave}, + {0, EmfPlusRecordTypeRestore}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeEndContainer}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_containers(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + GpBitmap *bitmap; + GpBrush *brush; + ARGB color; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GraphicsContainer state1, state2; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* Normal usage */ + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff000000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 5.0, 5.0, 5.0, 5.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 1.0, 1.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 5.0, 5.0, 5.0, 5.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipSaveGraphics(graphics, &state1); + expect(Ok, stat); + + stat = GdipRestoreGraphics(graphics, state1); + expect(Ok, stat); + + /* Popping two states at once */ + stat = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 4.0, 4.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipBeginContainer2(graphics, &state2); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff00ff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 20.0, 20.0, 5.0, 5.0); + expect(Ok, stat); + + /* Restoring an invalid state seems to break the graphics object? */ + if (0) { + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + } + + /* Ending metafile with a state open */ + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, container_records, "container metafile", dst_points, &frame, UnitPixel); + + sync_metafile(&metafile, "container.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, container_records, "container playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 12, 12, &color); + expect(Ok, stat); + expect(0xff000000, color); + + stat = GdipBitmapGetPixel(bitmap, 8, 8, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 42, 42, &color); + expect(Ok, stat); + expect(0xff00ff00, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1743,6 +1903,7 @@ START_TEST(metafile) test_worldtransform(); test_converttoemfplus(); test_frameunit(); + test_containers(); GdiplusShutdown(gdiplusToken); }

1 0

Bruno Jesus : winejoystick.drv: Don' t assume the first joystick is at the first device on Linux.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 62876f3fc5feb1ca23d27a6de5adca580d963d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62876f3fc5feb1ca23d27a6de… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 15 19:01:48 2016 -0300 winejoystick.drv: Don't assume the first joystick is at the first device on Linux. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 35 ++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index b8fda4f..289e728 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -126,6 +126,7 @@ LRESULT driver_open(LPSTR str, DWORD dwIntf) return 0; JSTCK_Data[dwIntf].joyIntf = dwIntf; + JSTCK_Data[dwIntf].dev = -1; JSTCK_Data[dwIntf].in_use = TRUE; return (LRESULT)&JSTCK_Data[dwIntf]; } @@ -160,25 +161,43 @@ struct js_status */ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { - char buf[20]; - int flags; + char buf[20]; + int flags, fd, found_ix, i; if (jstick->dev > 0) return jstick->dev; - sprintf(buf, JOYDEV_NEW, jstick->joyIntf); #ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; #else flags = O_RDONLY; #endif - if ((jstick->dev = open(buf, flags)) < 0) { - sprintf(buf, JOYDEV_OLD, jstick->joyIntf); - if ((jstick->dev = open(buf, flags)) < 0) - return jstick->dev; + + /* The first joystick may not be at /dev/input/js0, find the correct + * first or second device. For example the driver for XBOX 360 wireless + * receiver creates entries starting at 20. + */ + for (found_ix = i = 0; i < MAXJOYSTICK; i++) { + sprintf(buf, JOYDEV_NEW, i); + if ((fd = open(buf, flags)) < 0) { + sprintf(buf, JOYDEV_OLD, i); + if ((fd = open(buf, flags)) < 0) + continue; + } + + if (found_ix++ == jstick->joyIntf) + { + TRACE("Found joystick[%d] at %s\n", jstick->joyIntf, buf); + jstick->dev = fd; + break; + } + + close(fd); } + #ifdef HAVE_LINUX_22_JOYSTICK_API - ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); + if (jstick->dev > 0) + ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); #endif return jstick->dev; }

1 0

Bruno Jesus : winmm/tests: Enumerate all joystick devices during the test.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: f2fa2448aa946e79431a965b3a9608a35ce48f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fa2448aa946e79431a965b3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 15 19:11:38 2016 -0300 winmm/tests: Enumerate all joystick devices during the test. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 2f230f5..5714001 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -82,7 +82,9 @@ static void test_api(void) ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc)); if (ret == JOYERR_NOERROR) { - joyid = JOYSTICKID1 + i; + if (joyid == -1) /* Cache the first found joystick to run advanced tests below */ + joyid = JOYSTICKID1 + i; + trace("Joystick[%d] - name: '%s', axes: %d, buttons: %d, period range: %d - %d\n", JOYSTICKID1 + i, jc.szPname, jc.wNumAxes, jc.wNumButtons, jc.wPeriodMin, jc.wPeriodMax); ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw)); @@ -93,7 +95,6 @@ static void test_api(void) ok(jc.wNumButtons == jcw.wNumButtons, "Expected %d == %d\n", jc.wNumButtons, jcw.wNumButtons); } else win98++; - break; } else {

1 0

André Hentschel : kernel32/tests: Fill in the delay IAT to succeed on Win10.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: bdd7be374723bb92b7f2f735c5ed91827acd4cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd7be374723bb92b7f2f735c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 15 17:52:53 2016 +0200 kernel32/tests: Fill in the delay IAT to succeed on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7585b9b..28449ac 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2608,7 +2608,7 @@ static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) ok(!!pd->ThunkAddress, "no ThunkAddress supplied\n"); if (pd->ThunkAddress) - ok(pd->ThunkAddress->u1.Ordinal == 0, "expected 0, got %x\n", (UINT)pd->ThunkAddress->u1.Ordinal); + ok(pd->ThunkAddress->u1.Ordinal, "no ThunkAddress value supplied\n"); ok(!!pd->TargetDllName, "no TargetDllName supplied\n"); if (pd->TargetDllName) @@ -2782,9 +2782,20 @@ static void test_ResolveDelayLoadedAPI(void) ret = WriteFile(hfile, test_func, sizeof(test_func), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); - file_size = GetFileSize(hfile, NULL); + SetFilePointer( hfile, idd.ImportAddressTableRVA, NULL, SEEK_SET ); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + /* 0x1a00 is an empty space between delay data and extended delay data, real thunks are not necessary */ + itd32.u1.Function = nt_header.OptionalHeader.ImageBase + 0x1a00 + i * 0x20; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + } + + itd32.u1.Function = 0; SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.ImportNameTableRVA - file_size, &dummy, NULL); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)

1 0

Józef Kucia : wined3d: Do not switch display mode when windowed is TRUE.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 910fc594d9e483143863e27eb7498dd26ccdd3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910fc594d9e483143863e27eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:15 2016 +0200 wined3d: Do not switch display mode when windowed is TRUE. Fixes a regression introduced by commit cad279449c62a965a70a712a91b11ba52c4ff4f7. 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/wined3d/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 406dca9..c2a8c55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4648,6 +4648,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view_desc view_desc; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; + BOOL backbuffer_resized; HRESULT hr = WINED3D_OK; unsigned int i; @@ -4737,10 +4738,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_swapchain_set_window(swapchain, NULL); } + backbuffer_resized = swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width + || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height; + if (!swapchain_desc->windowed != !swapchain->desc.windowed || swapchain->reapply_mode || mode - || swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width - || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height) + || (!swapchain_desc->windowed && backbuffer_resized)) { if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) return hr;

1 0