November 2017 - Wine-Commits

Fabian Maurer : comctl32/tests: Add taskdialog callback tests.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

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

Jacek Caban : mshtml: Introduce variant_bool helper.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

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

Nikolay Sivov : gdiplus/metafile: Support hatch brushes for recording.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

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 Nov. 2, 2017

Nov. 2, 2017

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

Zhiyi Zhang : kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

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

Józef Kucia : d3d11/tests: Add test for SV_InstanceID.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: dfbcc93da34f6b628838353d4a87d10149fb5ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbcc93da34f6b628838353d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:48 2017 +0100 d3d11/tests: Add test for SV_InstanceID. 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/tests/d3d11.c | 268 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 256 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfbcc93da34f6b6288383…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexedInstancedIndirect().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 8151875fcbf5355e9ea4c1b84b022edc874bb370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8151875fcbf5355e9ea4c1b84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:44 2017 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexedInstancedIndirect(). 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/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c216b07..7a8f3df 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -842,7 +842,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, UINT offset) { - FIXME("iface %p, buffer %p, offset %u stub!\n", iface, buffer, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *d3d_buffer; + + TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); + + d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); + + wined3d_mutex_lock(); + wined3d_device_draw_indexed_primitive_instanced_indirect(device->wined3d_device, + d3d_buffer->wined3d_buffer, offset); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawInstancedIndirect().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6ff0e0041532fe157cbb01f6a5eb6ec11e621914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff0e0041532fe157cbb01f6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:43 2017 +0100 d3d11: Implement d3d11_immediate_context_DrawInstancedIndirect(). 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/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ced9a13..c216b07 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -848,7 +848,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndire static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, UINT offset) { - FIXME("iface %p, buffer %p, offset %u stub!\n", iface, buffer, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *d3d_buffer; + + TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); + + d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); + + wined3d_mutex_lock(); + wined3d_device_draw_primitive_instanced_indirect(device->wined3d_device, + d3d_buffer->wined3d_buffer, offset); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Add ARB_draw_indirect extension.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: f51f86cc196acb54096a5468d7276871585294df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51f86cc196acb54096a5468d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:40 2017 +0100 wined3d: Add ARB_draw_indirect extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e060017..eae7505 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -123,6 +123,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, + {"GL_ARB_draw_indirect", ARB_DRAW_INDIRECT }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, @@ -2715,6 +2716,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDrawElementsInstancedBaseVertex) USE_GL_FUNC(glDrawRangeElementsBaseVertex) USE_GL_FUNC(glMultiDrawElementsBaseVertex) + /* GL_ARB_draw_indirect */ + USE_GL_FUNC(glDrawArraysIndirect) + USE_GL_FUNC(glDrawElementsIndirect) /* GL_ARB_draw_instanced */ USE_GL_FUNC(glDrawArraysInstancedARB) USE_GL_FUNC(glDrawElementsInstancedARB) @@ -3866,6 +3870,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, + {ARB_DRAW_INDIRECT, MAKEDWORD_VERSION(4, 0)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TESSELLATION_SHADER, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8366111..47f3770 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -56,6 +56,7 @@ enum wined3d_gl_extension ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, ARB_DRAW_ELEMENTS_BASE_VERTEX, + ARB_DRAW_INDIRECT, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, ARB_ES3_COMPATIBILITY,

1 0

Nikolay Sivov : gdiplus/metafile: Simplify EmfPlusARGB definition.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

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