wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Vincent Povirk : gdiplus/tests: Add metafile test for SetClipRect.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 5ef00ff17e61b544aa0091a7766afeea4094c902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef00ff17e61b544aa0091a77… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 16 16:00:27 2016 -0500 gdiplus/tests: Add metafile test for SetClipRect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 109 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index a9d54a7..a965d4c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1869,6 +1869,114 @@ static void test_containers(void) expect(Ok, stat); } +static const emfplus_record clipping_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeSave}, + {0, EmfPlusRecordTypeSetClipRect}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeRestore}, + {0, EmfPlusRecordTypeSetClipRect}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_clipping(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}; + GraphicsState state; + + 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); + + stat = GdipSaveGraphics(graphics, &state); + expect(Ok, stat); + + stat = GdipSetClipRect(graphics, 30, 30, 10, 10, CombineModeReplace); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff000000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 0, 0, 100, 100); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipRestoreGraphics(graphics, state); + expect(Ok, stat); + + stat = GdipSetClipRect(graphics, 30, 30, 10, 10, CombineModeXor); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 30, 30, 20, 10); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, clipping_records, "clipping metafile", dst_points, &frame, UnitPixel); + + sync_metafile(&metafile, "clipping.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, clipping_records, "clipping playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 35, 35, &color); + expect(Ok, stat); + expect(0xff000000, color); + + stat = GdipBitmapGetPixel(bitmap, 45, 35, &color); + expect(Ok, stat); + expect(0xff0000ff, 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; @@ -1904,6 +2012,7 @@ START_TEST(metafile) test_converttoemfplus(); test_frameunit(); test_containers(); + test_clipping(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Implement playback/recording for SetClipRect.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 3f6faddd565b3465c17da6748e069a3ceb320316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6faddd565b3465c17da6748… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 16 16:00:26 2016 -0500 gdiplus: Implement playback/recording for SetClipRect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 6 +++ dlls/gdiplus/graphics.c | 12 ++++-- dlls/gdiplus/metafile.c | 83 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 96 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4ad49ca..678daed 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -81,6 +81,9 @@ extern REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN; +extern GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpMatrix *matrix) DECLSPEC_HIDDEN; + extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) DECLSPEC_HIDDEN; @@ -89,6 +92,8 @@ extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDE extern GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetClipRect(GpMetafile* metafile, + REAL x, REAL y, REAL width, REAL height, CombineMode mode) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* transform) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; @@ -372,6 +377,7 @@ struct GpMetafile{ GpUnit page_unit; REAL page_scale; GpRegion *base_clip; /* clip region in device space for all metafile output */ + GpRegion *clip; /* clip region within the metafile */ struct list containers; }; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 370fa88..84afee1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -51,9 +51,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix); -static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, - GpCoordinateSpace src_space, GpMatrix *matrix); - /* Converts from gdiplus path point type to gdi path point type. */ static BYTE convert_path_point_type(BYTE type) { @@ -5642,6 +5639,13 @@ GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + status = METAFILE_SetClipRect((GpMetafile*)graphics->image, x, y, width, height, mode); + if (status != Ok) + return status; + } + rect.X = x; rect.Y = y; rect.Width = width; @@ -5983,7 +5987,7 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) return Ok; } -static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, +GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) { GpStatus stat = Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a854e55..02cacb2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -70,6 +70,12 @@ typedef struct EmfPlusFillRects DWORD Count; } EmfPlusFillRects; +typedef struct EmfPlusSetClipRect +{ + EmfPlusRecordHeader Header; + GpRectF ClipRect; +} EmfPlusSetClipRect; + typedef struct EmfPlusSetPageTransform { EmfPlusRecordHeader Header; @@ -137,6 +143,7 @@ typedef struct container GpMatrix world_transform; GpUnit page_unit; REAL page_scale; + GpRegion *clip; } container; static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) @@ -588,6 +595,32 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, return Ok; } +GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, REAL height, CombineMode mode) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusSetClipRect *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusSetClipRect), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeSetClipRect; + record->Header.Flags = (mode & 0xf) << 8; + record->ClipRect.X = x; + record->ClipRect.Y = y; + record->ClipRect.Width = width; + record->ClipRect.Height = height; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -1014,7 +1047,11 @@ static void METAFILE_PlaybackReleaseDC(GpMetafile *metafile) static GpStatus METAFILE_PlaybackUpdateClip(GpMetafile *metafile) { - return GdipCombineRegionRegion(metafile->playback_graphics->clip, metafile->base_clip, CombineModeReplace); + GpStatus stat; + stat = GdipCombineRegionRegion(metafile->playback_graphics->clip, metafile->base_clip, CombineModeReplace); + if (stat == Ok) + stat = GdipCombineRegionRegion(metafile->playback_graphics->clip, metafile->clip, CombineModeIntersect); + return stat; } static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) @@ -1166,6 +1203,32 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return stat; } + case EmfPlusRecordTypeSetClipRect: + { + EmfPlusSetClipRect *record = (EmfPlusSetClipRect*)header; + CombineMode mode = (CombineMode)((flags >> 8) & 0xf); + GpRegion *region; + GpMatrix world_to_device; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(*record)) + return InvalidParameter; + + stat = GdipCreateRegionRect(&record->ClipRect, &region); + + if (stat == Ok) + { + get_graphics_transform(real_metafile->playback_graphics, + CoordinateSpaceDevice, CoordinateSpaceWorld, &world_to_device); + + GdipTransformRegion(region, &world_to_device); + + GdipCombineRegionRegion(real_metafile->clip, region, mode); + + GdipDeleteRegion(region); + } + + return METAFILE_PlaybackUpdateClip(real_metafile); + } case EmfPlusRecordTypeSetPageTransform: { EmfPlusSetPageTransform *record = (EmfPlusSetPageTransform*)header; @@ -1257,6 +1320,13 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (!cont) return OutOfMemory; + stat = GdipCloneRegion(metafile->clip, &cont->clip); + if (stat != Ok) + { + heap_free(cont); + return stat; + } + if (recordType == EmfPlusRecordTypeBeginContainerNoParams) stat = GdipBeginContainer2(metafile->playback_graphics, &cont->state); else @@ -1264,6 +1334,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (stat != Ok) { + GdipDeleteRegion(cont->clip); heap_free(cont); return stat; } @@ -1310,6 +1381,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, while ((cont2 = LIST_ENTRY(list_head(&real_metafile->containers), container, entry)) != cont) { list_remove(&cont2->entry); + GdipDeleteRegion(cont2->clip); heap_free(cont2); } @@ -1321,8 +1393,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, *real_metafile->world_transform = cont->world_transform; real_metafile->page_unit = cont->page_unit; real_metafile->page_scale = cont->page_scale; + GdipCombineRegionRegion(real_metafile->clip, cont->clip, CombineModeReplace); list_remove(&cont->entry); + GdipDeleteRegion(cont->clip); heap_free(cont); } @@ -1453,6 +1527,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, stat = GdipGetClip(graphics, real_metafile->base_clip); if (stat == Ok) + stat = GdipCreateRegion(&real_metafile->clip); + + if (stat == Ok) stat = GdipCreatePath(FillModeAlternate, &dst_path); if (stat == Ok) @@ -1506,10 +1583,14 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, GdipDeleteRegion(real_metafile->base_clip); real_metafile->base_clip = NULL; + GdipDeleteRegion(real_metafile->clip); + real_metafile->clip = NULL; + while (list_head(&real_metafile->containers)) { container* cont = LIST_ENTRY(list_head(&real_metafile->containers), container, entry); list_remove(&cont->entry); + GdipDeleteRegion(cont->clip); heap_free(cont); }

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

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

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

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

Alistair Leslie-Hughes : d3dx11: Add D3DX11CreateTextureFromMemory stub.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 77568fd0326941a6cd212e7ac29a8f900c3521fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=77568fd0326941a6cd212e7ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 16 05:47:15 2016 +0000 d3dx11: Add D3DX11CreateTextureFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/async.c | 10 ++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index cb02a95..45e8482 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -22,7 +22,7 @@ @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA @ stub D3DX11CreateTextureFromFileW -@ stub D3DX11CreateTextureFromMemory +@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index b33c235..6eb2a10 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -65,3 +65,13 @@ HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_ return E_NOTIMPL; } + +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, data, data_size, load_info, pump, texture, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 69c12fb..7c3a598 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -22,7 +22,7 @@ @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA @ stub D3DX11CreateTextureFromFileW -@ stub D3DX11CreateTextureFromMemory +@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump

1 0

Józef Kucia : d3d11: Remove redundant 'break' statement.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 51afeca5aa2f9bc0b78d7cc69799587ca6a1d678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51afeca5aa2f9bc0b78d7cc69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:23 2016 +0200 d3d11: Remove redundant 'break' statement. 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/shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index dab2b9b..1da1293 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -108,7 +108,6 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * else { TRACE("Skipping feature level 9 shader code on feature level %#x.\n", ctx->feature_level); - break; } break;

1 0

Józef Kucia : dxgi/tests: Check fullscreen state in test_create_swapchain().
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 20b39d41e124231f8ab97baf2848b8b1fc4448ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b39d41e124231f8ab97baf2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:22 2016 +0200 dxgi/tests: Check fullscreen state in test_create_swapchain(). 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/dxgi/tests/device.c | 300 ++++++++++++++++++++++++----------------------- 1 file changed, 155 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20b39d41e124231f8ab97…

1 0

Józef Kucia : dxgi: Properly switch to fullscreen mode when creating fullscreen swapchains.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 0d92a9a7a429f5727c997d814155acdd8f4095fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d92a9a7a429f5727c997d814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:21 2016 +0200 dxgi: Properly switch to fullscreen mode when creating fullscreen swapchains. 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/dxgi/swapchain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 172b0f4..0057aa2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -485,6 +485,8 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); + swapchain->fullscreen = !desc->windowed; + desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { @@ -492,10 +494,10 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device goto cleanup; } - swapchain->fullscreen = !desc->windowed; swapchain->target = NULL; if (swapchain->fullscreen) { + desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, desc, NULL))) {

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
78
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 August 2016