November 2017 - Wine-commits

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillEllipse.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: f75b57ad81c4f352b68d2fc821383786d29f409c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75b57ad81c4f352b68d2fc82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:13 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillEllipse. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 614fc43..051f33e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -465,6 +465,17 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFillEllipse +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusFillEllipse; + typedef struct EmfPlusFont { DWORD Version; @@ -2867,6 +2878,45 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillEllipse: + { + EmfPlusFillEllipse *fill = (EmfPlusFillEllipse *)header; + GpSolidFill *solidfill = NULL; + GpBrush *brush; + + if (dataSize <= FIELD_OFFSET(EmfPlusFillEllipse, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusFillEllipse, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x8000) + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & 0x4000) + stat = GdipFillEllipseI(real_metafile->playback_graphics, brush, fill->RectData.rect.X, + fill->RectData.rect.Y, fill->RectData.rect.Width, fill->RectData.rect.Height); + else + stat = GdipFillEllipse(real_metafile->playback_graphics, brush, fill->RectData.rectF.X, + fill->RectData.rectF.Y, fill->RectData.rectF.Width, fill->RectData.rectF.Height); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeDrawPath: { EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPie.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 9c47baa3fcf132203eb87832cfe92cf48270ece1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c47baa3fcf132203eb87832c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:14 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPie. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 051f33e..3a9c8a8 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -476,6 +476,19 @@ typedef struct EmfPlusFillEllipse } RectData; } EmfPlusFillEllipse; +typedef struct EmfPlusFillPie +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusFillPie; + typedef struct EmfPlusFont { DWORD Version; @@ -2917,6 +2930,47 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillPie: + { + EmfPlusFillPie *fill = (EmfPlusFillPie *)header; + GpSolidFill *solidfill = NULL; + GpBrush *brush; + + if (dataSize <= FIELD_OFFSET(EmfPlusFillPie, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusFillPie, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x8000) /* S */ + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & 0x4000) /* C */ + stat = GdipFillPieI(real_metafile->playback_graphics, brush, fill->RectData.rect.X, + fill->RectData.rect.Y, fill->RectData.rect.Width, fill->RectData.rect.Height, + fill->StartAngle, fill->SweepAngle); + else + stat = GdipFillPie(real_metafile->playback_graphics, brush, fill->RectData.rectF.X, + fill->RectData.rectF.Y, fill->RectData.rectF.Width, fill->RectData.rectF.Height, + fill->StartAngle, fill->SweepAngle); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeDrawPath: { EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header;

1 0

Nikolay Sivov : gdiplus/metafile: Add brush object if needed in FillRectangles().
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: fd8185132ee15873bb15404d8fcfcc699dd32879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8185132ee15873bb15404d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:15 2017 +0300 gdiplus/metafile: Add brush object if needed in FillRectangles(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 141 ++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3a9c8a8..f923a9b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -931,6 +931,74 @@ static BOOL is_integer_rect(const GpRectF *rect) return TRUE; } +static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) +{ + switch (brush->bt) + { + case BrushTypeSolidColor: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); + break; + case BrushTypeHatchFill: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); + break; + default: + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; + } + + return Ok; +} + +static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) +{ + data->Version = VERSION_MAGIC2; + data->Type = brush->bt; + + switch (brush->bt) + { + case BrushTypeSolidColor: + { + GpSolidFill *solid = (GpSolidFill *)brush; + data->BrushData.solid.SolidColor = solid->color; + break; + } + case BrushTypeHatchFill: + { + GpHatch *hatch = (GpHatch *)brush; + data->BrushData.hatch.HatchStyle = hatch->hatchstyle; + data->BrushData.hatch.ForeColor = hatch->forecol; + data->BrushData.hatch.BackColor = hatch->backcol; + break; + } + default: + FIXME("unsupported brush type: %d\n", brush->bt); + } +} + +static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) +{ + EmfPlusObject *object_record; + GpStatus stat; + DWORD size; + + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + stat = METAFILE_PrepareBrushData(brush, &size); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeBrush << 8; + METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); + return Ok; +} + GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) { @@ -950,8 +1018,9 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, } else { - FIXME("brush serialization not implemented\n"); - return NotImplemented; + stat = METAFILE_AddBrushObject(metafile, brush, &brushid); + if (stat != Ok) + return stat; } for (i=0; i<count; i++) @@ -3989,50 +4058,6 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; } -static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) -{ - switch (brush->bt) - { - case BrushTypeSolidColor: - *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); - break; - case BrushTypeHatchFill: - *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); - break; - default: - FIXME("unsupported brush type: %d\n", brush->bt); - return NotImplemented; - } - - return Ok; -} - -static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) -{ - data->Version = VERSION_MAGIC2; - data->Type = brush->bt; - - switch (brush->bt) - { - case BrushTypeSolidColor: - { - GpSolidFill *solid = (GpSolidFill *)brush; - data->BrushData.solid.SolidColor = solid->color; - break; - } - case BrushTypeHatchFill: - { - GpHatch *hatch = (GpHatch *)brush; - data->BrushData.hatch.HatchStyle = hatch->hatchstyle; - data->BrushData.hatch.ForeColor = hatch->forecol; - data->BrushData.hatch.BackColor = hatch->backcol; - break; - } - default: - FIXME("unsupported brush type: %d\n", brush->bt); - } -} - static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) { DWORD i, data_flags, pen_data_size, brush_size; @@ -4228,30 +4253,6 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) return Ok; } -static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) -{ - EmfPlusObject *object_record; - GpStatus stat; - DWORD size; - - *id = -1; - if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) - return Ok; - - stat = METAFILE_PrepareBrushData(brush, &size); - if (stat != Ok) return stat; - - stat = METAFILE_AllocateRecord(metafile, - FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); - if (stat != Ok) return stat; - - *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; - object_record->Header.Flags = *id | ObjectTypeBrush << 8; - METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); - return Ok; -} - GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) { EmfPlusFillPath *fill_path_record;

1 0

Andrey Gusev : usp10: Remove worthless check.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: f6ad192cd220278a17fa840ba4e062ff1e39f02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ad192cd220278a17fa840ba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 2 18:22:36 2017 +0200 usp10: Remove worthless check. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 59abbad..5d257b2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3028,9 +3028,6 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) for (i = 0; i < len; i+=consumed) { - if (i >= len) - break; - if ((flag & SIC_ASCIIDIGIT) && chars[i] >= 0x30 && chars[i] <= 0x39) return S_OK;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawImage.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 5787727f9e6e8566e81692235abad12ced1db7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5787727f9e6e8566e81692235… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:42 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawImage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 8e9ad87..9beb3a3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -398,6 +398,19 @@ typedef struct EmfPlusPointF float Y; } EmfPlusPointF; +typedef struct EmfPlusDrawImage +{ + EmfPlusRecordHeader Header; + DWORD ImageAttributesID; + DWORD SrcUnit; + EmfPlusRectF SrcRect; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawImage; + typedef struct EmfPlusDrawImagePoints { EmfPlusRecordHeader Header; @@ -2696,6 +2709,46 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data); } + case EmfPlusRecordTypeDrawImage: + { + EmfPlusDrawImage *draw = (EmfPlusDrawImage *)header; + BYTE image = flags & 0xff; + GpPointF points[3]; + + if (image >= EmfPlusObjectTableSize || real_metafile->objtable[image].type != ObjectTypeImage) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawImage, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (draw->ImageAttributesID >= EmfPlusObjectTableSize || + real_metafile->objtable[draw->ImageAttributesID].type != ObjectTypeImageAttributes) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + { + points[0].X = draw->RectData.rect.X; + points[0].Y = draw->RectData.rect.Y; + points[1].X = points[0].X + draw->RectData.rect.Width; + points[1].Y = points[0].Y; + points[2].X = points[1].X; + points[2].Y = points[1].Y + draw->RectData.rect.Height; + } + else + { + points[0].X = draw->RectData.rectF.X; + points[0].Y = draw->RectData.rectF.Y; + points[1].X = points[0].X + draw->RectData.rectF.Width; + points[1].Y = points[0].Y; + points[2].X = points[1].X; + points[2].Y = points[1].Y + draw->RectData.rectF.Height; + } + + return GdipDrawImagePointsRect(real_metafile->playback_graphics, real_metafile->objtable[image].u.image, + points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit, + real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL); + } case EmfPlusRecordTypeDrawImagePoints: { EmfPlusDrawImagePoints *draw = (EmfPlusDrawImagePoints *)header;

1 0

Fabian Maurer : comctl32/tests: Add taskdialog callback tests.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 18fbca709071c5ade31743114ce5617bf27262f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18fbca709071c5ade31743114… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 2 17:26:42 2017 +0300 comctl32/tests: Add taskdialog callback tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/taskdialog.c | 121 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 57f33f3..dfb6808 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -26,11 +26,118 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" + +#define WM_TD_CALLBACK (WM_APP) /* Custom dummy message to wrap callback notifications */ + +#define NUM_MSG_SEQUENCES 1 +#define TASKDIALOG_SEQ_INDEX 0 static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + +struct message_info +{ + UINT message; + WPARAM wparam; + LPARAM lparam; + + HRESULT callback_retval; + const struct message_info *send; /* Message to send to trigger the next callback message */ +}; + +static const struct message_info *current_message_info; + +/* Messages to send */ +static const struct message_info msg_send_return[] = +{ + { WM_KEYDOWN, VK_RETURN, 0 }, + { 0 } +}; + +/* Messages to test against */ +static const struct message_info msg_return_press_ok[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_return }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) +{ + msg->message = WM_TD_CALLBACK; + msg->flags = sent|wparam|lparam|id; + msg->wParam = wParam; + msg->lParam = lParam; + msg->id = message; + msg->stage = 0; +} + +#define run_test(info, expect_button, expect_radio, seq, context) \ + run_test_(info, expect_button, expect_radio, seq, context, \ + sizeof(seq)/sizeof(seq[0]) - 1, __FILE__, __LINE__) + +void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radio, const struct message_info *test_messages, + const char *context, int test_messages_len, const char *file, int line) +{ + struct message *msg, *msg_start; + int ret_button = 0; + int ret_radio = 0; + HRESULT hr; + int i; + + /* Allocate messages to test against, plus 2 implicit and 1 empty */ + msg_start = msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*msg) * (test_messages_len + 3)); + + /* Always needed, thus made implicit */ + init_test_message(TDN_DIALOG_CONSTRUCTED, 0, 0, msg++); + for (i = 0; i < test_messages_len; i++) + init_test_message(test_messages[i].message, test_messages[i].wparam, test_messages[i].lparam, msg++); + /* Always needed, thus made implicit */ + init_test_message(TDN_DESTROYED, 0, 0, msg++); + + current_message_info = test_messages; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hr = pTaskDialogIndirect(info, &ret_button, &ret_radio, NULL); + ok_(file, line)(hr == S_OK, "TaskDialogIndirect() failed, got %#x.\n", hr); + + ok_sequence_(sequences, TASKDIALOG_SEQ_INDEX, msg_start, context, FALSE, file, line); + ok_(file, line)(ret_button == expect_button, + "Wrong button. Expected %d, got %d\n", expect_button, ret_button); + ok_(file, line)(ret_radio == expect_radio, + "Wrong radio button. Expected %d, got %d\n", expect_radio, ret_radio); + + HeapFree(GetProcessHeap(), 0, msg_start); +} + +static const LONG_PTR test_ref_data = 123456; + +static HRESULT CALLBACK taskdialog_callback_proc(HWND hwnd, UINT notification, + WPARAM wParam, LPARAM lParam, LONG_PTR ref_data) +{ + int msg_pos = sequences[TASKDIALOG_SEQ_INDEX]->count - 1; /* Skip implicit message */ + const struct message_info *msg_send; + struct message msg; + + ok(test_ref_data == ref_data, "Unexpected ref data %lu.\n", ref_data); + + init_test_message(notification, wParam, lParam, &msg); + add_message(sequences, TASKDIALOG_SEQ_INDEX, &msg); + + if (notification == TDN_DIALOG_CONSTRUCTED || notification == TDN_DESTROYED) /* Skip implicit messages */ + return S_OK; + + msg_send = current_message_info[msg_pos].send; + for(; msg_send && msg_send->message; msg_send++) + PostMessageW(hwnd, msg_send->message, msg_send->wparam, msg_send->lparam); + + return current_message_info[msg_pos].callback_retval; +} + static void test_invalid_parameters(void) { TASKDIALOGCONFIG info = { 0 }; @@ -52,6 +159,17 @@ static void test_invalid_parameters(void) ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); } +static void test_callback(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + + run_test(&info, IDOK, 0, msg_return_press_ok, "Press VK_RETURN."); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -83,7 +201,10 @@ START_TEST(taskdialog) ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect); + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + test_invalid_parameters(); + test_callback(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Alexandre Julliard : ntdll: Don't change packing of fd cache entries.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 59963983606a96175567a4af0053a5b2ef5a01be URL: http://source.winehq.org/git/wine.git/?a=commit;h=59963983606a96175567a4af0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 16:59:11 2017 +0100 ntdll: Don't change packing of fd cache entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 1e84fbf..4c329d0 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -808,7 +808,6 @@ static int receive_fd( obj_handle_t *handle ) /***********************************************************************/ /* fd cache support */ -#include "pshpack1.h" union fd_cache_entry { LONG64 data; @@ -820,7 +819,6 @@ union fd_cache_entry unsigned int options : 24; } s; }; -#include "poppack.h" C_ASSERT( sizeof(union fd_cache_entry) == sizeof(LONG64) );

1 0

Jacek Caban : mshtml: Introduce variant_bool helper.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 0bff85cd44854ffc0c9dfad3d6e696ad62457fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff85cd44854ffc0c9dfad3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:47:45 2017 +0100 mshtml: Introduce variant_bool helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 11 ++++++----- dlls/mshtml/mshtml_private.h | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index b0380a2..0dea8cb 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -275,7 +275,7 @@ static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VA nsIDOMHTMLInputElement_GetDisabled(This->nsinput, &disabled); - *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(disabled); return S_OK; } @@ -474,7 +474,8 @@ static HRESULT WINAPI HTMLInputElement_get_readOnly(IHTMLInputElement *iface, VA ERR("Get ReadOnly Failed: %08x\n", nsres); return E_FAIL; } - *p = b ? VARIANT_TRUE : VARIANT_FALSE; + + *p = variant_bool(b); return S_OK; } @@ -529,7 +530,7 @@ static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *ifa return E_FAIL; } - *p = default_checked ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(default_checked); return S_OK; } @@ -563,7 +564,7 @@ static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VAR return E_FAIL; } - *p = checked ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(checked); TRACE("checked=%x\n", *p); return S_OK; } @@ -1891,7 +1892,7 @@ static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface, return E_FAIL; } - *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(disabled); return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 98daa65..8965d46 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1333,6 +1333,11 @@ static inline void windowref_release(windowref_t *ref) heap_free(ref); } +static inline VARIANT_BOOL variant_bool(BOOL b) +{ + return b ? VARIANT_TRUE : VARIANT_FALSE; +} + UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IDOMEvent:: get_defaultPrevented implementation.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: bbffabf1b1c8d3fe78861912a14e3ddf78ebe913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbffabf1b1c8d3fe78861912a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:47:53 2017 +0100 mshtml: Added IDOMEvent::get_defaultPrevented implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 +++++-- dlls/mshtml/tests/events.js | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d57ff19..9e232be 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -995,8 +995,11 @@ static HRESULT WINAPI DOMEvent_get_currentTarget(IDOMEvent *iface, IEventTarget static HRESULT WINAPI DOMEvent_get_defaultPrevented(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->prevent_default); + return S_OK; } static HRESULT WINAPI DOMEvent_get_eventPhase(IDOMEvent *iface, USHORT *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 4a064f9..4c552b6 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -267,6 +267,31 @@ function test_stop_propagation() { next_test(); } +function test_prevent_default() { + document.body.innerHTML = '<div><a href="about:blank"></a></div>'; + var div = document.body.firstChild; + var a = div.firstChild; + var calls; + + div.addEventListener("click", function(e) { + calls += "div,"; + ok(e.defaultPrevented === false, "e.defaultPrevented = " + e.defaultPrevented); + e.preventDefault(); + ok(e.defaultPrevented === true, "e.defaultPrevented = " + e.defaultPrevented); + }, true); + + a.addEventListener("click", function(e) { + calls += "a,"; + ok(e.defaultPrevented === true, "e.defaultPrevented = " + e.defaultPrevented); + }, true); + + calls = ""; + a.click(); + ok(calls === "div,a,", "calls = " + calls); + + next_test(); +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -274,5 +299,6 @@ var tests = [ test_remove_listener_in_listener, test_event_phase, test_stop_propagation, + test_prevent_default, test_listener_order ];

1 0

Jacek Caban : mshtml: Use variant_bool helper where appropriate.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: eafbe884a293a4429ba33778990f648dea604a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafbe884a293a4429ba337789… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:48:02 2017 +0100 mshtml: Use variant_bool helper where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 5 ++--- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlimg.c | 5 +++-- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlscript.c | 4 +--- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyle.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 2 +- 15 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e42b068..b04fb81 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -971,7 +971,7 @@ static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvi case VT_BOOL: if(V_VT(src) == VT_BSTR) { V_VT(dst) = VT_BOOL; - V_BOOL(dst) = V_BSTR(src) && *V_BSTR(src) ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(dst) = variant_bool(V_BSTR(src) && *V_BSTR(src)); return S_OK; } break; diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 89630ce..e3a16df 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_expando(IHTMLDOMAttribute2 *iface, V TRACE("(%p)->(%p)\n", This, p); - *p = !This->elem || get_dispid_type(This->dispid) == DISPEXPROP_BUILTIN ? VARIANT_FALSE : VARIANT_TRUE; + *p = variant_bool(This->elem && get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN); return S_OK; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5f33e84..fbb70c1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2606,7 +2606,7 @@ static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL nsres = nsIDOMHTMLDocument_HasFocus(This->doc_node->nsdoc, &has_focus); assert(nsres == NS_OK); - *pfFocus = has_focus ? VARIANT_TRUE : VARIANT_FALSE; + *pfFocus = variant_bool(has_focus); return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ed1aa86..dc712f3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC assert(nsres == NS_OK); } - *pfResult = result ? VARIANT_TRUE : VARIANT_FALSE; + *pfResult = variant_bool(result); return S_OK; } @@ -1777,8 +1777,7 @@ static HRESULT WINAPI HTMLElement_get_isTextEdit(IHTMLElement *iface, VARIANT_BO TRACE("(%p)->(%p)\n", This, p); - *p = This->node.vtbl->is_text_edit && This->node.vtbl->is_text_edit(&This->node) - ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(This->node.vtbl->is_text_edit && This->node.vtbl->is_text_edit(&This->node)); return S_OK; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9e232be..46697b3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -421,7 +421,7 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL } } - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } @@ -451,7 +451,7 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO } } - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } @@ -481,7 +481,7 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO } } - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } @@ -529,7 +529,7 @@ static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - *p = This->event && This->event->stop_propagation ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(This->event && This->event->stop_propagation); return S_OK; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index abf7f5c..02f0cba 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -131,7 +131,8 @@ static HRESULT WINAPI HTMLImgElement_get_isMap(IHTMLImgElement *iface, VARIANT_B ERR("Get IsMap failed: %08x\n", nsres); return E_FAIL; } - *p = b ? VARIANT_TRUE : VARIANT_FALSE; + + *p = variant_bool(b); return S_OK; } @@ -391,7 +392,7 @@ static HRESULT WINAPI HTMLImgElement_get_complete(IHTMLImgElement *iface, VARIAN return E_FAIL; } - *p = complete ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(complete); return S_OK; } diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index d7b774d..43a4f4c 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -302,7 +302,7 @@ static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARI if(NS_FAILED(nsres)) return E_FAIL; - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 70b0d0d..70b8758 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -610,7 +610,7 @@ static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOO if(NS_FAILED(nsres)) ERR("HasChildNodes failed: %08x\n", nsres); - *fChildren = has_child ? VARIANT_TRUE : VARIANT_FALSE; + *fChildren = variant_bool(has_child); return S_OK; } diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index a4ea95d..616328b 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -129,7 +129,7 @@ static HRESULT WINAPI HTMLOptionElement_get_selected(IHTMLOptionElement *iface, return E_FAIL; } - *p = selected ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(selected); return S_OK; } @@ -211,7 +211,7 @@ static HRESULT WINAPI HTMLOptionElement_get_defaultSelected(IHTMLOptionElement * return E_FAIL; } - *p = val ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(val); return S_OK; } diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 4c3ea16..49d82aa 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -258,9 +258,7 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR ERR("GetSrc failed: %08x\n", nsres); } - *p = defer ? VARIANT_TRUE : VARIANT_FALSE; - - TRACE("*p = %d\n", *p); + *p = variant_bool(defer); return S_OK; } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a9f47cc..59e6811 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -198,7 +198,7 @@ static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, nsres = nsIDOMHTMLSelectElement_GetMultiple(This->nsselect, &val); assert(nsres == NS_OK); - *p = val ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(val); return S_OK; } @@ -364,7 +364,7 @@ static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, return E_FAIL; } - *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(disabled); return S_OK; } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0c6f3bc..12ce92b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -628,7 +628,7 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - *p = strcmpW(value, exval) ? VARIANT_FALSE : VARIANT_TRUE; + *p = variant_bool(!strcmpW(value, exval)); nsAString_Finish(&str_value); TRACE("%s -> %x\n", debugstr_w(style_tbl[sid].name), *p); @@ -2927,7 +2927,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri /* filter property is a special case */ if(style_entry->dispid == DISPID_IHTMLSTYLE_FILTER) { - *pfSuccess = This->elem->filter && *This->elem->filter ? VARIANT_TRUE : VARIANT_FALSE; + *pfSuccess = variant_bool(This->elem->filter && *This->elem->filter); heap_free(This->elem->filter); This->elem->filter = NULL; update_filter(This); @@ -2940,7 +2940,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri if(NS_SUCCEEDED(nsres)) { const PRUnichar *ret; nsAString_GetData(&ret_str, &ret); - *pfSuccess = *ret ? VARIANT_TRUE : VARIANT_FALSE; + *pfSuccess = variant_bool(*ret); }else { ERR("RemoveProperty failed: %08x\n", nsres); } diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 457df12..71a8798 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -318,7 +318,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa return E_FAIL; } - *p = b ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(b); return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 759f1b6..3a34f5c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -862,7 +862,7 @@ static BOOL notify_webbrowser_close(HTMLOuterWindow *window, HTMLDocumentObj *do V_VT(args) = VT_BYREF|VT_BOOL; V_BOOLREF(args) = &cancel; V_VT(args+1) = VT_BOOL; - V_BOOL(args+1) = window->parent ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(args+1) = variant_bool(window->parent != NULL); hres = IDispatch_Invoke(disp, DISPID_WINDOWCLOSING, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); IDispatch_Release(disp); if(FAILED(hres)) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1597de9..a8d3330 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -610,7 +610,7 @@ static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface SysFreeString(frame_name); } - *vbCancel = cancel ? VARIANT_TRUE : VARIANT_FALSE; + *vbCancel = variant_bool(cancel); return hres; }

1 0