October 2016 - Wine-Commits

Matteo Bruni : wined3d: Ignore driver model if the requested driver model entry is missing.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: b29e3b4ffac7d1e7c8b7b2de02e390149dfabf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e3b4ffac7d1e7c8b7b2de0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:36 2016 +0200 wined3d: Ignore driver model if the requested driver model entry is missing. Signed-off-by: Matteo Bruni <mbruni(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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e16f718..a8c8c9f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -61,6 +61,7 @@ enum wined3d_display_driver enum wined3d_driver_model { + DRIVER_MODEL_GENERIC, DRIVER_MODEL_WIN9X, DRIVER_MODEL_NT40, DRIVER_MODEL_NT5X, @@ -1444,7 +1445,8 @@ static const struct driver_version_information *get_driver_version_info(enum win { const struct driver_version_information *entry = &driver_version_table[i]; - if (entry->driver == driver && entry->driver_model == driver_model) + if (entry->driver == driver && (driver_model == DRIVER_MODEL_GENERIC + || entry->driver_model == driver_model)) { TRACE("Found driver \"%s\", version %u, subversion %u, build %u.\n", entry->driver_name, entry->version, entry->subversion, entry->build); @@ -1619,8 +1621,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * This could be an indication that our database is not up to date, so this should be fixed. */ if ((version_info = get_driver_version_info(driver, driver_model)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT6X))) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_GENERIC))) { driver_info->name = version_info->driver_name; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version);

1 0

Matteo Bruni : wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 339321dd2073fea7383378a7cf3212140013a2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339321dd2073fea7383378a7c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:35 2016 +0200 wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions. Signed-off-by: Matteo Bruni <mbruni(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 | 32 ++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 24 ++++++++++++++++++++---- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ceb436..e16f718 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1408,14 +1408,30 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IG6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD6000, "Intel(R) HD Graphics 6000", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP6300, "Intel(R) Iris(TM) Pro Graphics P6300", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_1, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_2, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD510_3, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD515, "Intel(R) HD Graphics 515", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520_1, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520_2, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IPP580, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HDP530, "Intel(R) HD Graphics P530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I550, "Intel(R) Iris(TM) Graphics 550", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_I555, "Intel(R) Iris(TM) Graphics 555", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP555, "Intel(R) Iris(TM) Graphics P555", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP580_1, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -2029,13 +2045,13 @@ cards_amd_binary[] = cards_intel[] = { /* Skylake */ - {"Iris Pro Graphics P580", CARD_INTEL_IPP580}, - {"Skylake", CARD_INTEL_HD520}, + {"Iris Pro Graphics P580", CARD_INTEL_IPP580_1}, + {"Skylake", CARD_INTEL_HD520_1}, /* Broadwell */ {"Iris Pro P6300", CARD_INTEL_IPP6300}, {"Iris Pro 6200", CARD_INTEL_IP6200}, - {"Iris 6100", CARD_INTEL_IG6100}, - {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ + {"Iris 6100", CARD_INTEL_I6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9800b3..4326bee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,14 +2001,30 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, - CARD_INTEL_IG6100 = 0x162b, + CARD_INTEL_HD5300 = 0x161e, + CARD_INTEL_HD5500 = 0x1616, + CARD_INTEL_HD5600 = 0x1612, + CARD_INTEL_HD6000 = 0x1626, + CARD_INTEL_I6100 = 0x162b, CARD_INTEL_IP6200 = 0x1622, CARD_INTEL_IPP6300 = 0x162a, - CARD_INTEL_HD520 = 0x1916, + CARD_INTEL_HD510_1 = 0x1902, + CARD_INTEL_HD510_2 = 0x1906, + CARD_INTEL_HD510_3 = 0x190b, + CARD_INTEL_HD515 = 0x191e, + CARD_INTEL_HD520_1 = 0x1916, + CARD_INTEL_HD520_2 = 0x1921, CARD_INTEL_HD530_1 = 0x1912, CARD_INTEL_HD530_2 = 0x191b, - CARD_INTEL_HD540 = 0x1926, - CARD_INTEL_IPP580 = 0x193d, + CARD_INTEL_HDP530 = 0x191d, + CARD_INTEL_I540 = 0x1926, + CARD_INTEL_I550 = 0x1927, + CARD_INTEL_I555 = 0x192b, + CARD_INTEL_IP555 = 0x192d, + CARD_INTEL_IP580_1 = 0x1932, + CARD_INTEL_IP580_2 = 0x193b, + CARD_INTEL_IPP580_1 = 0x193a, + CARD_INTEL_IPP580_2 = 0x193d, }; struct wined3d_fbo_ops

1 0

Huw Davies : riched20: Remove unnecessary spaces before carriage returns.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 6e97ddc93039c23f65d4e4f4f7296a54cdcdc21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e97ddc93039c23f65d4e4f4f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:07 2016 +0100 riched20: Remove unnecessary spaces before carriage returns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 44b9246..baa2886 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -580,7 +580,7 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) return FALSE; } else { - if (!ME_StreamOutPrint(pStream, "\\row \r\n")) + if (!ME_StreamOutPrint(pStream, "\\row\r\n")) return FALSE; } return TRUE; @@ -1078,7 +1078,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, cursor.pPara->member.para.fmt.wEffects & PFE_TABLE && !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))) { - if (!ME_StreamOutPrint(pStream, "\\row \r\n")) + if (!ME_StreamOutPrint(pStream, "\\row\r\n")) return FALSE; } else { if (!ME_StreamOutPrint(pStream, "\\par\r\n")) @@ -1087,7 +1087,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* Skip as many characters as required by current line break */ nChars = max(0, nChars - cursor.pRun->member.run.len); } else if (cursor.pRun->member.run.nFlags & MERF_ENDROW) { - if (!ME_StreamOutPrint(pStream, "\\line \r\n")) + if (!ME_StreamOutPrint(pStream, "\\line\r\n")) return FALSE; nChars--; } else {

1 0

Huw Davies : riched20: Initialize the remaining CHARFORMAT2 members.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 3ac78b763bd28fae0d08fc088433e9abc79610bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac78b763bd28fae0d08fc088… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:02 2016 +0100 riched20: Initialize the remaining CHARFORMAT2 members. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 6 ++++-- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ dlls/riched20/tests/richole.c | 1 - 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index d94e213..f050b2e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -52,11 +52,12 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) GetObjectW(hf, sizeof(LOGFONTW), &lf); ZeroMemory(&cf, sizeof(cf)); cf.cbSize = sizeof(cf); - cf.dwMask = CFM_BACKCOLOR|CFM_COLOR|CFM_FACE|CFM_SIZE|CFM_CHARSET; + cf.dwMask = CFM_ANIMATION|CFM_BACKCOLOR|CFM_CHARSET|CFM_COLOR|CFM_FACE|CFM_KERNING|CFM_LCID|CFM_OFFSET; + cf.dwMask |= CFM_REVAUTHOR|CFM_SIZE|CFM_SPACING|CFM_STYLE|CFM_UNDERLINETYPE|CFM_WEIGHT; cf.dwMask |= CFM_ALLCAPS|CFM_BOLD|CFM_DISABLED|CFM_EMBOSS|CFM_HIDDEN; cf.dwMask |= CFM_IMPRINT|CFM_ITALIC|CFM_LINK|CFM_OUTLINE|CFM_PROTECTED; cf.dwMask |= CFM_REVISED|CFM_SHADOW|CFM_SMALLCAPS|CFM_STRIKEOUT; - cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINETYPE|CFM_WEIGHT; + cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINE; cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); @@ -69,6 +70,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) if (lf.lfStrikeOut) cf.dwEffects |= CFE_STRIKEOUT; cf.bPitchAndFamily = lf.lfPitchAndFamily; cf.bCharSet = lf.lfCharSet; + cf.lcid = GetSystemDefaultLCID(); style = ME_MakeStyle(&cf); text->pDefaultStyle = style; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 36e082e..8d7d209 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -764,11 +764,28 @@ static void test_EM_SETCHARFORMAT(void) CHARRANGE cr; LOCALESIGNATURE sig; BOOL rtl; + DWORD expect_effects; rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); + /* check charformat defaults */ + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + ok(cf2.dwMask == CFM_ALL2, "got %08x\n", cf2.dwMask); + expect_effects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; + if (cf2.wWeight > 550) expect_effects |= CFE_BOLD; + ok(cf2.dwEffects == expect_effects, "got %08x\n", cf2.dwEffects); + ok(cf2.yOffset == 0, "got %d\n", cf2.yOffset); + ok(cf2.sSpacing == 0, "got %d\n", cf2.sSpacing); + ok(cf2.lcid == GetSystemDefaultLCID(), "got %x\n", cf2.lcid); + ok(cf2.sStyle == 0, "got %d\n", cf2.sStyle); + ok(cf2.wKerning == 0, "got %d\n", cf2.wKerning); + ok(cf2.bAnimation == 0, "got %d\n", cf2.bAnimation); + ok(cf2.bRevAuthor == 0, "got %d\n", cf2.bRevAuthor); + /* Invalid flags, CHARFORMAT2 structure blanked out */ memset(&cf2, 0, sizeof(cf2)); rc = SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM)0xfffffff0, (LPARAM)&cf2); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 6da3ce3..656eee1 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1741,7 +1741,6 @@ static void test_GetFont(void) value = 0; hr = ITextFont_GetLanguageID(font, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(value == GetSystemDefaultLCID(), "got lcid %x, user lcid %x\n", value, GetSystemDefaultLCID());

1 0

Sebastian Lackner : winebus.sys: Add a strdupAtoW implementation.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 66d70e38f5508042a6acf80f216b76e3c6fd8d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d70e38f5508042a6acf80f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 14 08:54:33 2016 +0200 winebus.sys: Add a strdupAtoW implementation. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 22ea07d..fd5de70 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -78,6 +78,17 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de return (struct platform_private *)get_platform_private(device); } +static inline WCHAR *strdupAtoW(const char *src) +{ + WCHAR *dst; + DWORD len; + if (!src) return NULL; + len = MultiByteToWideChar(CP_UNIXCP, 0, src, -1, NULL, 0); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_UNIXCP, 0, src, -1, dst, len); + return dst; +} + static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); @@ -92,17 +103,12 @@ static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); - WCHAR *dst; - DWORD len; if (!attr) { WARN("Could not get %s from device\n", sysattr); return NULL; } - len = MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, NULL, 0); - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, dst, len); - return dst; + return strdupAtoW(attr); } static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev)

1 0

Huw Davies : riched20: Simplify call to ME_StreamOutRTFParaProps().
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: ee68e100b43955a00d21f3f1ccaa55080b245283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee68e100b43955a00d21f3f1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:05 2016 +0100 riched20: Simplify call to ME_StreamOutRTFParaProps(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fa20215..d5563a1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1012,7 +1012,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, const ME_Cursor *start, int nChars, int dwFormat) { ME_Cursor cursor = *start; - ME_DisplayItem *prev_para = cursor.pPara; + ME_DisplayItem *prev_para = NULL; ME_Cursor endCur = cursor; ME_MoveCursorChars(editor, &endCur, nChars, TRUE); @@ -1037,9 +1037,6 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: section formatting properties */ - if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) - return FALSE; - do { if (cursor.pPara != prev_para) {

1 0

Huw Davies : riched20: Fix the interaction between CFE_UNDERLINE and bUnderlineType.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: aa57db38dd9cf7afb903e39b64b7274b9e175a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa57db38dd9cf7afb903e39b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:03 2016 +0100 riched20: Fix the interaction between CFE_UNDERLINE and bUnderlineType. The effect specifies whether underlining is turned on, while bUnderlineType indicates the type of underlining. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 29 +++++++++------- dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 3 +- dlls/riched20/run.c | 10 ------ dlls/riched20/style.c | 53 ++++++++--------------------- dlls/riched20/tests/editor.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/writer.c | 23 ++++++------- 7 files changed, 124 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa57db38dd9cf7afb903e…

1 0

Sebastian Lackner : ntoskrnl.exe: Do not abuse UserEvent to store event handle.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 02c861306e97e10ac58da74c3b390247cbd87bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c861306e97e10ac58da74c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 14 06:46:12 2016 +0200 ntoskrnl.exe: Do not abuse UserEvent to store event handle. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 974f946..428e700 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2883,7 +2883,8 @@ done: static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) { - SetEvent( irp->UserEvent ); + HANDLE event = context; + SetEvent( event ); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -2891,15 +2892,11 @@ static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void static NTSTATUS send_device_irp( DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info ) { NTSTATUS status; - IO_STACK_LOCATION *irpsp; HANDLE event = CreateEventA( NULL, FALSE, FALSE, NULL ); DEVICE_OBJECT *toplevel_device; - irp->UserEvent = event; irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->CompletionRoutine = internal_complete; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_CANCEL; + IoSetCompletionRoutine( irp, internal_complete, event, TRUE, TRUE, TRUE ); toplevel_device = IoGetAttachedDeviceReference( device ); status = IoCallDriver( toplevel_device, irp );

1 0

Alexandre Julliard : ntdll: Prevent importing the Zw functions.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 624deeb49d7dd4591ae65299079ce2f107d8942a URL: http://source.winehq.org/git/wine.git/?a=commit;h=624deeb49d7dd4591ae652990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 09:39:34 2016 +0200 ntdll: Prevent importing the Zw functions. It's better to consistently use the Nt ones. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 394 ++++++++++++++++++------------------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 206 +++++++++---------- 2 files changed, 300 insertions(+), 300 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=624deeb49d7dd4591ae65…

1 0

Aric Stewart : wine.inf: Add WineHID to the CriticalDeviceDatabase.
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: wine Branch: master Commit: 41e18693e24c38a3b5411fe1b3c2de620c6a94f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e18693e24c38a3b5411fe1b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 14 06:40:59 2016 +0200 wine.inf: Add WineHID to the CriticalDeviceDatabase. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fcf9c4a..991857e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -35,6 +35,7 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ + CriticalDevice,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -59,6 +60,7 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ + CriticalDevice,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -85,6 +87,7 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ + CriticalDevice,\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ @@ -466,6 +469,9 @@ HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092 HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" +[CriticalDevice] +HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" + [CurrentVersion] HKCU,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%"

1 0