May 2018 - Wine-Commits - list.winehq.org

Zhiyi Zhang : comctl32/taskdialog: Send TDN_CREATED before window gets visible.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: fe182ce1f0da54e02fdca8f943c3cba1b3e499be URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe182ce1f0da54e02fdca8f9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 23 23:11:20 2018 +0800 comctl32/taskdialog: Send TDN_CREATED before window gets visible. TDN_CREATED notification is sent before dialog window is shown. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ec04485..7edb8ef 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -572,8 +572,6 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); - break; - case WM_SHOWWINDOW: taskdialog_notify(dialog_info, TDN_CREATED, 0, 0); break; case WM_COMMAND:

1 0

Pablo Martin : wined3d: Add unimplemented flags parameter to wined3d_device_update_sub_resource.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: b7d21a669dde9fef8a0bfd30fbe14cc55334c702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d21a669dde9fef8a0bfd30… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 22 14:37:49 2018 +0200 wined3d: Add unimplemented flags parameter to wined3d_device_update_sub_resource. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 10 +++++++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 68d6cf0..4ca4f46 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1054,7 +1054,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, - subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); + subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, 0); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3f4552f..e06d156 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1407,7 +1407,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (data) wined3d_device_update_sub_resource(device, &buffer->resource, - 0, NULL, data->data, data->row_pitch, data->slice_pitch); + 0, NULL, data->data, data->row_pitch, data->slice_pitch, 0); return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9906f74..0f590c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4299,13 +4299,17 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch) + unsigned int depth_pitch, unsigned int flags) { unsigned int width, height, depth; struct wined3d_box b; - TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u.\n", - device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch); + TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, " + "flags %#x.\n", + device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); if (resource->type == WINED3D_RTYPE_BUFFER) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0b05453..91c703c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3392,7 +3392,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_device_update_sub_resource(device, &object->resource, - i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch); + i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch, 0); } } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7a8cf20..db50a44 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -200,7 +200,7 @@ @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr) @ cdecl wined3d_device_uninit_gdi(ptr) -@ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long) +@ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb4ad48..e15269f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2466,7 +2466,7 @@ HRESULT __cdecl wined3d_device_uninit_3d(struct wined3d_device *device); HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch); + unsigned int depth_pitch, unsigned int flags); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes);

1 0

Jactry Zeng : riched20/tests: Free retext after use.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 42b325b855f52014fd08def1a552842aeb85485d URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b325b855f52014fd08def1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 22 16:31:18 2018 +0800 riched20/tests: Free retext after use. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 73ca7cd..88b5adf 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -654,6 +654,7 @@ static void test_TxGetText(void) hres = ITextServices_TxGetText(txtserv, &rettext); ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); + SysFreeString(rettext); ITextServices_Release(txtserv); ITextHost_Release(host);

1 0

Louis Lenders : include: Add IWMCodecInfo interfaces.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 15284a972c036e008a46807cd5eb14a28f380029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15284a972c036e008a46807c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue May 22 16:01:30 2018 +0200 include: Add IWMCodecInfo interfaces. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 60d8b2c..5bc8546 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -511,6 +511,98 @@ cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") [ object, + uuid(a970f41e-34de-4a98-b3ba-e4b3ca7528f0), + pointer_default(unique), + local +] +interface IWMCodecInfo : IUnknown +{ + HRESULT GetCodecInfoCount( + [in] REFGUID guid, + [out] DWORD *count); + + HRESULT GetCodecFormatCount( + [in] REFGUID guid, + [in] DWORD codecindex, + [out] DWORD *formatcount); + + HRESULT GetCodecFormat( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] DWORD formatindex, + [out] IWMStreamConfig **streamconfig); +} + +[ + object, + uuid(aa65e273-b686-4056-91ec-dd768d4df710), + pointer_default(unique), + local +] +interface IWMCodecInfo2 : IWMCodecInfo +{ + HRESULT GetCodecName( + [in] REFGUID guid, + [in] DWORD codecindex, + [out, size_is(*namesize)] WCHAR *name, + [in, out] DWORD *namesize); + + HRESULT GetCodecFormatDesc( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] DWORD formatindex, + [out] IWMStreamConfig **streamconfig, + [out, size_is(*descrsize)] WCHAR *description, + [in, out] DWORD *descrsize); +} + +[ + object, + uuid(7e51f487-4d93-4f98-8ab4-27d0565adc51), + pointer_default(unique), + local +] +interface IWMCodecInfo3 : IWMCodecInfo2 +{ + HRESULT GetCodecFormatProp( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] DWORD formatindex, + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is(*size)] BYTE *value, + [in, out] DWORD *size); + + HRESULT GetCodecProp( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is(*size)] BYTE *value, + [in, out] DWORD *size); + + HRESULT SetCodecEnumerationSetting( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] const WCHAR *name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is(size)] const BYTE *value, + [in] DWORD size); + + HRESULT GetCodecEnumerationSetting( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is(*size)] BYTE *value, + [in, out] DWORD *size); +} + +cpp_quote("static const WCHAR g_wszNumPasses[] = {'_','P','A','S','S','E','S','U','S','E','D',0};") +cpp_quote("static const WCHAR g_wszVBREnabled[] = {'_','V','B','R','E','N','A','B','L','E','D',0};") + +[ + object, uuid(96406bce-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local

1 0

Gijs Vermeulen : include: Add IO_REPARSE* definitions.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: f32862b0995255bb1801740914e0137072266f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32862b0995255bb18017409… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue May 22 23:25:25 2018 +0200 include: Add IO_REPARSE* definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index ba10be7..54bf11d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2424,6 +2424,58 @@ extern struct _TEB * WINAPI NtCurrentTeb(void); #define TLS_MINIMUM_AVAILABLE 64 +#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE (16 * 1024) + +#define IO_REPARSE_TAG_RESERVED_ZERO 0 +#define IO_REPARSE_TAG_RESERVED_ONE 1 +#define IO_REPARSE_TAG_RESERVED_TWO 2 + +#define IO_REPARSE_TAG_RESERVED_RANGE IO_REPARSE_TAG_RESERVED_TWO + +#define IO_REPARSE_TAG_MOUNT_POINT __MSABI_LONG(0xA0000003) +#define IO_REPARSE_TAG_HSM __MSABI_LONG(0xC0000004) +#define IO_REPARSE_TAG_DRIVE_EXTENDER __MSABI_LONG(0x80000005) +#define IO_REPARSE_TAG_HSM2 __MSABI_LONG(0x80000006) +#define IO_REPARSE_TAG_SIS __MSABI_LONG(0x80000007) +#define IO_REPARSE_TAG_WIM __MSABI_LONG(0x80000008) +#define IO_REPARSE_TAG_CSV __MSABI_LONG(0x80000009) +#define IO_REPARSE_TAG_DFS __MSABI_LONG(0x8000000A) +#define IO_REPARSE_TAG_FILTER_MANAGER __MSABI_LONG(0x8000000B) +#define IO_REPARSE_TAG_SYMLINK __MSABI_LONG(0xA000000C) +#define IO_REPARSE_TAG_IIS_CACHE __MSABI_LONG(0xA0000010) +#define IO_REPARSE_TAG_DFSR __MSABI_LONG(0x80000012) +#define IO_REPARSE_TAG_DEDUP __MSABI_LONG(0x80000013) +#define IO_REPARSE_TAG_NFS __MSABI_LONG(0x80000014) +#define IO_REPARSE_TAG_FILE_PLACEHOLDER __MSABI_LONG(0x80000015) +#define IO_REPARSE_TAG_WOF __MSABI_LONG(0x80000017) +#define IO_REPARSE_TAG_WCI __MSABI_LONG(0x80000018) +#define IO_REPARSE_TAG_WCI_1 __MSABI_LONG(0x90001018) +#define IO_REPARSE_TAG_GLOBAL_REPARSE __MSABI_LONG(0xA0000019) +#define IO_REPARSE_TAG_CLOUD __MSABI_LONG(0x9000001A) +#define IO_REPARSE_TAG_CLOUD_1 __MSABI_LONG(0x9000101A) +#define IO_REPARSE_TAG_CLOUD_2 __MSABI_LONG(0x9000201A) +#define IO_REPARSE_TAG_CLOUD_3 __MSABI_LONG(0x9000301A) +#define IO_REPARSE_TAG_CLOUD_4 __MSABI_LONG(0x9000401A) +#define IO_REPARSE_TAG_CLOUD_5 __MSABI_LONG(0x9000501A) +#define IO_REPARSE_TAG_CLOUD_6 __MSABI_LONG(0x9000601A) +#define IO_REPARSE_TAG_CLOUD_7 __MSABI_LONG(0x9000701A) +#define IO_REPARSE_TAG_CLOUD_8 __MSABI_LONG(0x9000801A) +#define IO_REPARSE_TAG_CLOUD_9 __MSABI_LONG(0x9000901A) +#define IO_REPARSE_TAG_CLOUD_A __MSABI_LONG(0x9000A01A) +#define IO_REPARSE_TAG_CLOUD_B __MSABI_LONG(0x9000B01A) +#define IO_REPARSE_TAG_CLOUD_C __MSABI_LONG(0x9000C01A) +#define IO_REPARSE_TAG_CLOUD_D __MSABI_LONG(0x9000D01A) +#define IO_REPARSE_TAG_CLOUD_E __MSABI_LONG(0x9000E01A) +#define IO_REPARSE_TAG_CLOUD_F __MSABI_LONG(0x9000F01A) +#define IO_REPARSE_TAG_CLOUD_MASK __MSABI_LONG(0x0000F000) +#define IO_REPARSE_TAG_APPEXECLINK __MSABI_LONG(0x8000001B) +#define IO_REPARSE_TAG_GVFS __MSABI_LONG(0x9000001C) +#define IO_REPARSE_TAG_STORAGE_SYNC __MSABI_LONG(0x8000001E) +#define IO_REPARSE_TAG_WCI_TOMBSTONE __MSABI_LONG(0xA000001F) +#define IO_REPARSE_TAG_UNHANDLED __MSABI_LONG(0x80000020) +#define IO_REPARSE_TAG_ONEDRIVE __MSABI_LONG(0x80000021) +#define IO_REPARSE_TAG_GVFS_TOMBSTONE __MSABI_LONG(0xA0000022) + /* * File formats definitions */

1 0

Michael Stefaniuc : notepad: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: d98be23eaba1cd49a2d0733581266b233f6e52d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98be23eaba1cd49a2d07335… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 23 00:41:53 2018 +0200 notepad: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 6f567a9..da39eec 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -76,7 +76,7 @@ VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc) { lstrcpyW(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitleW(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle) / sizeof(WCHAR)); + GetFileTitleW(szFileName, Globals.szFileTitle, ARRAY_SIZE(Globals.szFileTitle)); Globals.encFile = enc; }

1 0

Nikolay Sivov : dwrite/tests: Skip some tests on variable fonts.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: abe71945ef04578daf356b8f2ad904d9fe6c7ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abe71945ef04578daf356b8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 08:24:38 2018 +0300 dwrite/tests: Skip some tests on variable fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 34 ++++++++++++++++++++++++++++++++++ include/dwrite_3.idl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 6c72319..44a81a1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2544,6 +2544,19 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) IDWriteFontFace_Release(fontface); } +static BOOL has_face_variations(IDWriteFontFace *fontface) +{ + IDWriteFontFace5 *fontface5; + BOOL ret = FALSE; + + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) { + ret = IDWriteFontFace5_HasVariations(fontface5); + IDWriteFontFace5_Release(fontface5); + } + + return ret; +} + static void test_ConvertFontFaceToLOGFONT(void) { IDWriteFontCollection *collection; @@ -2614,6 +2627,13 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); + if (has_face_variations(fontface)) { + skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + continue; + } + memset(&logfont, 0xcc, sizeof(logfont)); hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, &logfont); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4014,6 +4034,8 @@ if (0) { /* crashes on native */ for (j = 0; j < font_count; j++) { static const WCHAR spaceW[] = {' ', 0}; + IDWriteFontFace *fontface; + BOOL has_variations; hr = IDWriteFontFamily_GetFont(family, j, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4028,6 +4050,18 @@ if (0) { /* crashes on native */ lstrcatW(nameW, spaceW); lstrcatW(nameW, facenameW); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + has_variations = has_face_variations(fontface); + IDWriteFontFace_Release(fontface); + + if (has_variations) { + skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + IDWriteFont_Release(font); + continue; + } + system = FALSE; memset(&logfont, 0xcc, sizeof(logfont)); hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, &logfont, &system); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 6b4931c..af4ffc8 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -22,6 +22,7 @@ interface IDWriteFontFaceReference; interface IDWriteFontFace3; interface IDWriteFontSet; interface IDWriteFontDownloadQueue; +interface IDWriteFontResource; cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ @@ -457,6 +458,37 @@ interface IDWriteFontFace4 : IDWriteFontFace3 void ReleaseGlyphImageData(void *context); } +typedef enum DWRITE_FONT_AXIS_TAG +{ + DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */ + DWRITE_FONT_AXIS_TAG_WIDTH = 0x68746477, /* 'wdth' */ + DWRITE_FONT_AXIS_TAG_SLANT = 0x746e6c73, /* 'slnt' */ + DWRITE_FONT_AXIS_TAG_OPTICAL_SIZE = 0x7a73706f, /* 'opsz' */ + DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ +} DWRITE_FONT_AXIS_TAG; + +typedef struct DWRITE_FONT_AXIS_VALUE +{ + DWRITE_FONT_AXIS_TAG axisTag; + FLOAT value; +} DWRITE_FONT_AXIS_VALUE; + +[ + local, + object, + uuid(98eff3a5-b667-479a-b145-e2fa5b9fdc29) +] +interface IDWriteFontFace5 : IDWriteFontFace4 +{ + UINT32 GetFontAxisValueCount(); + HRESULT GetFontAxisValues( + DWRITE_FONT_AXIS_VALUE *values, + UINT32 value_count); + BOOL HasVariations(); + HRESULT GetFontResource(IDWriteFontResource **resource); + BOOL Equals(IDWriteFontFace *fontface); +} + typedef struct DWRITE_COLOR_GLYPH_RUN1 { DWRITE_GLYPH_RUN glyphRun;

1 0

Józef Kucia : wined3d: Remove redundant entries from "formats" table.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 638037bb28d07b55e016f7f0fad35d028c555e25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=638037bb28d07b55e016f7f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 22 15:53:55 2018 +0200 wined3d: Remove redundant entries from "formats" table. Those formats are initialized based on the "typed_formats" table. 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/utils.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7cecd8c..937c1bc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -122,7 +122,6 @@ static const struct wined3d_format_channels formats[] = /* Bump mapping stuff */ {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, - {WINED3DFMT_R8G8B8A8_SNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, @@ -133,8 +132,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_S1_UINT_D15_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 15, 1}, {WINED3DFMT_X8D24_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 0}, {WINED3DFMT_S4X4_UINT_D24_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 4}, - {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, - {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0},

1 0

Hans Leidekker : winhttp: Ignore empty proxy strings read from the environment.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 2752da05db370a9b438ea8c28d4c77550befd6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2752da05db370a9b438ea8c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 11:36:44 2018 +0200 winhttp: Ignore empty proxy strings read from the environment. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c878d68..e2b91fa 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1597,29 +1597,21 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) { - char *colon, *http_proxy; + char *colon, *http_proxy = NULL; - if ((colon = strchr( envproxy, ':' ))) + if (!(colon = strchr( envproxy, ':' ))) http_proxy = envproxy; + else { if (*(colon + 1) == '/' && *(colon + 2) == '/') { - static const char http[] = "http://"; - /* It's a scheme, check that it's http */ - if (!strncmp( envproxy, http, strlen( http ) )) - http_proxy = envproxy + strlen( http ); - else - { - WARN("unsupported scheme in $http_proxy: %s\n", envproxy); - http_proxy = NULL; - } + if (!strncmp( envproxy, "http://", 7 )) http_proxy = envproxy + 7; + else WARN("unsupported scheme in $http_proxy: %s\n", envproxy); } - else - http_proxy = envproxy; + else http_proxy = envproxy; } - else - http_proxy = envproxy; - if (http_proxy) + + if (http_proxy && http_proxy[0]) { WCHAR *http_proxyW; int len; @@ -1632,8 +1624,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; info->lpszProxy = http_proxyW; info->lpszProxyBypass = NULL; - TRACE("http proxy (from environment) = %s\n", - debugstr_w(info->lpszProxy)); + TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); } } }

1 0

Pablo Martin : d3d11: Make UpdateSubresource1 call wined3d_device_update_sub_resource directly.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 04a9e3330f6db1dea6fb87aae451f69a954fea94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a9e3330f6db1dea6fb87aa… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 22 14:37:50 2018 +0200 d3d11: Make UpdateSubresource1 call wined3d_device_update_sub_resource directly. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4ca4f46..36ed44b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2631,13 +2631,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11D ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch, UINT flags) { + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct wined3d_resource *wined3d_resource; + struct wined3d_box wined3d_box; + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); - if (flags) - FIXME("Ignoring flags %#x.\n", flags); + if (box) + wined3d_box_set(&wined3d_box, box->left, box->top, box->right, box->bottom, + box->front, box->back); - d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + wined3d_mutex_lock(); + wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, subresource_idx, + box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, flags); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface,

1 0