wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

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

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

Nikolay Sivov : gdiplus/metafile: Support hatch brushes for recording.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: f25f0fa2ac47af177de8ea7ef3a476b2b78a4941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25f0fa2ac47af177de8ea7ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:41 2017 +0300 gdiplus/metafile: Support hatch brushes for recording. 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 | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0630779..8e9ad87 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3752,25 +3752,45 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) { - if (brush->bt == BrushTypeSolidColor) + switch (brush->bt) { - *size = FIELD_OFFSET(EmfPlusBrush, BrushData.solid) + sizeof(EmfPlusSolidBrushData); - return Ok; + 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; } - FIXME("unsupported brush type: %d\n", brush->bt); - return NotImplemented; + return Ok; } static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) { - if (brush->bt == BrushTypeSolidColor) - { - GpSolidFill *solid = (GpSolidFill*)brush; + data->Version = VERSION_MAGIC2; + data->Type = brush->bt; - data->Version = VERSION_MAGIC2; - data->Type = solid->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); } }

1 0

Nikolay Sivov : gdiplus/metafile: Support texture brushes playback.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 905bd23b2e46f800ab2100feec8abbdc2565d8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=905bd23b2e46f800ab2100fee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:40 2017 +0300 gdiplus/metafile: Support texture brushes playback. 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 c9ddcc6..0630779 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -225,6 +225,18 @@ typedef struct EmfPlusPenData BYTE OptionalData[1]; } EmfPlusPenData; +enum BrushDataFlags +{ + BrushDataPath = 1 << 0, + BrushDataTransform = 1 << 1, + BrushDataPresetColors = 1 << 2, + BrushDataBlendFactorsH = 1 << 3, + BrushDataBlendFactorsV = 1 << 4, + BrushDataFocusScales = 1 << 6, + BrushDataIsGammaCorrected = 1 << 7, + BrushDataDoNotTransform = 1 << 8, +}; + typedef struct EmfPlusSolidBrushData { EmfPlusARGB SolidColor; @@ -237,6 +249,13 @@ typedef struct EmfPlusHatchBrushData EmfPlusARGB BackColor; } EmfPlusHatchBrushData; +typedef struct EmfPlusTextureBrushData +{ + DWORD BrushDataFlags; + INT WrapMode; + BYTE OptionalData[1]; +} EmfPlusTextureBrushData; + typedef struct EmfPlusBrush { DWORD Version; @@ -244,6 +263,7 @@ typedef struct EmfPlusBrush union { EmfPlusSolidBrushData solid; EmfPlusHatchBrushData hatch; + EmfPlusTextureBrushData texture; } BrushData; } EmfPlusBrush; @@ -1848,6 +1868,36 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si status = GdipCreateHatchBrush(data->BrushData.hatch.HatchStyle, data->BrushData.hatch.ForeColor, data->BrushData.hatch.BackColor, (GpHatch **)brush); break; + case BrushTypeTextureFill: + { + UINT offset = header_size + FIELD_OFFSET(EmfPlusTextureBrushData, OptionalData); + EmfPlusTransformMatrix *transform = NULL; + DWORD brushflags; + GpImage *image; + + if (data_size <= offset) + return InvalidParameter; + + brushflags = data->BrushData.texture.BrushDataFlags; + if (brushflags & BrushDataTransform) + { + if (data_size <= offset + sizeof(EmfPlusTransformMatrix)) + return InvalidParameter; + transform = (EmfPlusTransformMatrix *)(record_data + offset); + offset += sizeof(EmfPlusTransformMatrix); + } + + status = metafile_deserialize_image(record_data + offset, data_size - offset, &image); + if (status != Ok) + return status; + + status = GdipCreateTexture(image, data->BrushData.texture.WrapMode, (GpTexture **)brush); + if (status == Ok && transform && !(brushflags & BrushDataDoNotTransform)) + GdipSetTextureTransform((GpTexture *)*brush, (const GpMatrix *)transform); + + GdipDisposeImage(image); + break; + } default: FIXME("brush type %u is not supported.\n", data->Type); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Support hatch brushes in playback.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 6d0ca495b8b0555c5f62911e43fee04396cd7fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0ca495b8b0555c5f62911e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:39 2017 +0300 gdiplus/metafile: Support hatch brushes in playback. 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index bf07fed..c9ddcc6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -230,12 +230,20 @@ typedef struct EmfPlusSolidBrushData EmfPlusARGB SolidColor; } EmfPlusSolidBrushData; +typedef struct EmfPlusHatchBrushData +{ + DWORD HatchStyle; + EmfPlusARGB ForeColor; + EmfPlusARGB BackColor; +} EmfPlusHatchBrushData; + typedef struct EmfPlusBrush { DWORD Version; DWORD Type; union { EmfPlusSolidBrushData solid; + EmfPlusHatchBrushData hatch; } BrushData; } EmfPlusBrush; @@ -1833,6 +1841,13 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si status = GdipCreateSolidFill(data->BrushData.solid.SolidColor, (GpSolidFill **)brush); break; + case BrushTypeHatchFill: + if (data_size != header_size + sizeof(EmfPlusHatchBrushData)) + return InvalidParameter; + + status = GdipCreateHatchBrush(data->BrushData.hatch.HatchStyle, data->BrushData.hatch.ForeColor, + data->BrushData.hatch.BackColor, (GpHatch **)brush); + break; default: FIXME("brush type %u is not supported.\n", data->Type); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Simplify EmfPlusARGB definition.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 0625b33834b108c4d0bf6466cbf0571fa2bf52ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625b33834b108c4d0bf6466c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:38 2017 +0300 gdiplus/metafile: Simplify EmfPlusARGB definition. 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 | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e40487a..bf07fed 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -45,13 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); -typedef struct EmfPlusARGB -{ - BYTE Blue; - BYTE Green; - BYTE Red; - BYTE Alpha; -} EmfPlusARGB; +typedef ARGB EmfPlusARGB; typedef struct EmfPlusRecordHeader { @@ -1837,7 +1831,7 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si if (data_size != header_size + sizeof(EmfPlusSolidBrushData)) return InvalidParameter; - status = GdipCreateSolidFill(*(ARGB *)&data->BrushData.solid.SolidColor, (GpSolidFill **)brush); + status = GdipCreateSolidFill(data->BrushData.solid.SolidColor, (GpSolidFill **)brush); break; default: FIXME("brush type %u is not supported.\n", data->Type); @@ -2274,7 +2268,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill((ARGB)record->BrushID, (GpSolidFill**)&temp_brush); + stat = GdipCreateSolidFill(record->BrushID, (GpSolidFill **)&temp_brush); brush = temp_brush; } else @@ -2714,7 +2708,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(*(ARGB *)&fill->data.Color, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->data.Color, (GpSolidFill **)&solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3565,10 +3559,7 @@ static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const Gp attrs_record->Version = VERSION_MAGIC2; attrs_record->Reserved1 = 0; attrs_record->WrapMode = attrs->wrap; - attrs_record->ClampColor.Blue = attrs->outside_color & 0xff; - attrs_record->ClampColor.Green = (attrs->outside_color >> 8) & 0xff; - attrs_record->ClampColor.Red = (attrs->outside_color >> 16) & 0xff; - attrs_record->ClampColor.Alpha = attrs->outside_color >> 24; + attrs_record->ClampColor = attrs->outside_color; attrs_record->ObjectClamp = attrs->clamp; attrs_record->Reserved2 = 0; return Ok; @@ -3714,10 +3705,7 @@ static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) data->Version = VERSION_MAGIC2; data->Type = solid->brush.bt; - data->BrushData.solid.SolidColor.Blue = solid->color & 0xff; - data->BrushData.solid.SolidColor.Green = (solid->color >> 8) & 0xff; - data->BrushData.solid.SolidColor.Red = (solid->color >> 16) & 0xff; - data->BrushData.solid.SolidColor.Alpha = solid->color >> 24; + data->BrushData.solid.SolidColor = solid->color; } } @@ -3970,10 +3958,7 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) if (inline_color) { fill_path_record->Header.Flags = 0x8000 | path_id; - fill_path_record->data.Color.Blue = ((GpSolidFill*)brush)->color & 0xff; - fill_path_record->data.Color.Green = (((GpSolidFill*)brush)->color >> 8) & 0xff; - fill_path_record->data.Color.Red = (((GpSolidFill*)brush)->color >> 16) & 0xff; - fill_path_record->data.Color.Alpha = ((GpSolidFill*)brush)->color >> 24; + fill_path_record->data.Color = ((GpSolidFill *)brush)->color; } else {

1 0

Andrey Gusev : hidclass.sys: Remove check for negative value.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 495ade93baa2ed13248a4a0e42cb35fda012bcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495ade93baa2ed13248a4a0e4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 1 18:41:37 2017 +0200 hidclass.sys: Remove check for negative value. 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/hidclass.sys/descriptor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index ee13055..6b84997 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -440,10 +440,8 @@ static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, static void parse_collection(unsigned int bSize, int itemVal, struct collection *collection) { - if (bSize <= 0) - return; - else - { + if (bSize) + { collection->type = itemVal; if (itemVal >= 0x07 && itemVal <= 0x7F) {

1 0

Alex Henrie : vbscript/tests: Fix test for WeekDayName(foo, bar, 0).
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 4438b2706b5dad21e9aa8dd29d19be9c5e1a0c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4438b2706b5dad21e9aa8dd29… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 14:12:21 2017 +0100 vbscript/tests: Fix test for WeekDayName(foo, bar, 0). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 4 +++- dlls/vbscript/tests/run.c | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 95ef84f..baa0553 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -594,7 +594,6 @@ if isEnglishLang then Call ok(WeekDayName(1, false) = "Sunday", "WeekDayName(1, false) = " & WeekDayName(1, false)) Call ok(WeekDayName(1, true) = "Sun", "WeekDayName(1, true) = " & WeekDayName(1, true)) Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) - Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) Call ok(WeekDayName(1, true, 2.5) = "Mon", "WeekDayName(1, true, 2.5) = " & WeekDayName(1, true, 2.5)) Call ok(WeekDayName(1, true, 1.5) = "Mon", "WeekDayName(1, true, 1.5) = " & WeekDayName(1, true, 1.5)) @@ -609,6 +608,9 @@ if isEnglishLang then Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true)) end if +Call ok(WeekDayName(1, true, 0) = WeekDayName(1, true, firstDayOfWeek), _ + "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) + Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) Call ok(vbOKOnly = 0, "vbOKOnly = " & vbOKOnly) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 81b1ced..7c97db2 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -123,6 +123,7 @@ DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_LETOBJ 1018 #define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_GLOBAL_TODO_WINE_OK 1020 +#define DISPID_GLOBAL_WEEKSTARTDAY 1021 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -136,6 +137,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check, is_english, allow_ui; +static int first_day_of_week; static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; @@ -204,27 +206,23 @@ static const char *vt2a(VARIANT *v) } } -/* Returns true if the user interface is in English. Note that this does not - * presume of the formatting of dates, numbers, etc. +/* Sets is_english to true if the user interface is in English. Note that this + * does not presume the formatting of dates, numbers, etc. + * Sets first_day_of_week to 1 if Sunday, 2 if Monday, and so on. */ -static BOOL is_lang_english(void) +static void detect_locale(void) { - static HMODULE hkernel32 = NULL; - static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; - static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + LANGID (WINAPI *pGetThreadUILanguage)(void) = (void*)GetProcAddress(kernel32, "GetThreadUILanguage"); - if (!hkernel32) - { - hkernel32 = GetModuleHandleA("kernel32.dll"); - pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); - pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); - } - if (pGetThreadUILanguage && PRIMARYLANGID(pGetThreadUILanguage()) != LANG_ENGLISH) - return FALSE; - if (pGetUserDefaultUILanguage && PRIMARYLANGID(pGetUserDefaultUILanguage()) != LANG_ENGLISH) - return FALSE; + is_english = ((!pGetThreadUILanguage || PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH) && + PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && + PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; + GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), + LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + (void*)&first_day_of_week, sizeof(first_day_of_week)); + first_day_of_week = 1 + (first_day_of_week + 1) % 7; } static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) @@ -1010,6 +1008,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLANG; return S_OK; } + if(!strcmp_wa(bstrName, "firstDayOfWeek")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_WEEKSTARTDAY; + return S_OK; + } if(!strcmp_wa(bstrName, "testObj")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_TESTOBJ; @@ -1183,6 +1186,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_BOOL(pvarRes) = is_english ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; + case DISPID_GLOBAL_WEEKSTARTDAY: + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = first_day_of_week; + return S_OK; + case DISPID_GLOBAL_VBVAR: CHECK_EXPECT(global_vbvar_i); @@ -2355,7 +2363,7 @@ START_TEST(run) int argc; char **argv; - is_english = is_lang_english(); + detect_locale(); if(!is_english) skip("Skipping some tests in non-English locale\n");

1 0

Zhiyi Zhang : kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 1354c0f3e4d4c46218a8657bb89cc0c25f102606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1354c0f3e4d4c46218a8657bb… Author: Zhiyi Zhang <gd.yi(a)139.com> Date: Wed Nov 1 22:26:38 2017 +0800 kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName. Signed-off-by: Zhiyi Zhang <gd.yi(a)139.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 86fcc33..11a5788 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2779,7 +2779,7 @@ static void test_LocaleNameToLCID(void) ptr++; } - /* zh-Hant */ + /* zh-Hant has LCID 0x7c04, but LocaleNameToLCID actually returns 0x0c04, which is the LCID of zh-HK */ lcid = pLocaleNameToLCID(zhHantW, 0); todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHantW), lcid); @@ -2787,6 +2787,11 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); + /* check that 0x7c04 also works and is mapped to zh-HK */ + ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_CHINESE_TRADITIONAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); + todo_wine ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); + todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* zh-hant */ lcid = pLocaleNameToLCID(zhhantW, 0); @@ -2798,14 +2803,20 @@ static void test_LocaleNameToLCID(void) todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhantW), wine_dbgstr_w(buffer)); - /* zh-Hans */ + /* zh-Hans has LCID 0x0004, but LocaleNameToLCID actually returns 0x0804, which is the LCID of zh-CN */ lcid = pLocaleNameToLCID(zhHansW, 0); + /* check that LocaleNameToLCID actually returns 0x0804 */ todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); + /* check that 0x0004 also works and is mapped to zh-CN */ + ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE, SUBLANG_NEUTRAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); /* zh-hans */ lcid = pLocaleNameToLCID(zhhansW, 0);

1 0

Nikolay Sivov : dwrite: Set lfItalic style to get more compatible results for gdiinterop.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: e5276c766b25d19c35e5dd2e0394e9d336db4410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5276c766b25d19c35e5dd2e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 13:15:34 2017 +0300 dwrite: Set lfItalic style to get more compatible results for gdiinterop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4f570f5..18fb00b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1375,6 +1375,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->style = DWRITE_FONT_STYLE_OBLIQUE; else if (fsSelection & OS2_FSSELECTION_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); @@ -1404,12 +1405,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (macStyle & TT_HEAD_MACSTYLE_BOLD) props->weight = DWRITE_FONT_WEIGHT_BOLD; - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) { props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = 1; + } } props->lf.lfWeight = props->weight; - props->lf.lfItalic = props->style == DWRITE_FONT_STYLE_ITALIC; TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);

1 0

← Newer
1
...
36
37
38
39
40
41
42
43
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2017