July 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : shell32: Fix string leak.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: ff5a6fc7343db6ab063e4f95967484c656546004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5a6fc7343db6ab063e4f959… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 23 18:29:08 2017 +0300 shell32: Fix string leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f74e1b1fb1d9033385375b93152484734753dc14) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 543e012..1a02c83 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -99,7 +99,6 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); - LPOLESTR strs; HRESULT hr; WCHAR hwndText[255]; WCHAR *hwndQCText; @@ -222,7 +221,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IEnumString_Reset(This->enumstr); filled = FALSE; for(cpt = 0;;) { + LPOLESTR strs = NULL; ULONG fetched; + hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); if (hr != S_OK) break; @@ -235,8 +236,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, strcatW(buffW, &strs[len]); SetWindowTextW(hwnd, buffW); SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); - if (!(This->options & ACO_AUTOSUGGEST)) + if (!(This->options & ACO_AUTOSUGGEST)) { + CoTaskMemFree(strs); break; + } } if (This->options & ACO_AUTOSUGGEST) { @@ -246,6 +249,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, filled = TRUE; } + + CoTaskMemFree(strs); } if (This->options & ACO_AUTOSUGGEST) {

1 0

Thierry Vermeylen : wnaspi32: Do not crash on SC_GETSET_TIMEOUTS.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: f1739cc6a1dd327fe262b0dc43b28d9322d6aef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1739cc6a1dd327fe262b0dc4… Author: Thierry Vermeylen <t_chan4958(a)hotmail.com> Date: Sat Feb 11 09:06:03 2017 +0000 wnaspi32: Do not crash on SC_GETSET_TIMEOUTS. Signed-off-by: Thierry Vermeylen <t_chan4958(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 77af98e3dfdc1556d7c897451fd7973a8cb2e304) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wnaspi32/winaspi32.c | 6 ++++++ include/wnaspi32.h | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 0ce72aa..e915fbd 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -573,6 +573,12 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB) FIXME("SC_GET_DISK_INFO always return 'int13 unassociated disk'.\n"); lpSRB->diskinfo.SRB_DriveFlags = 0; /* disk is not int13 served */ return SS_COMP; + case SC_GETSET_TIMEOUTS: { + PSRB_GetSetTimeouts psrb_gst = (PSRB_GetSetTimeouts)lpSRB; + FIXME("SC_GETSET_TIMEOUTS doesn't actually change the timeout value nor does it return the current value.\n"); + psrb_gst->SRB_Status = SS_COMP; /* synchronous call, should be the same as the return value of SendASPI32Command */ + return SS_COMP; + } default: FIXME("Unknown command %d\n", lpSRB->common.SRB_Cmd); } diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 9051f00..5b0f808 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -200,6 +200,17 @@ typedef struct tagSRB32_GetDiskInfo { BYTE SRB_Rsvd1[10]; /* 0E Reserved */ } SRB_GetDiskInfo, *PSRB_GetDiskInfo; +typedef struct tagSRB32_GetSetTimeouts { + BYTE SRB_Cmd; /* 00 ASPI cmd code = SC_GETSET_TIMEOUTS */ + BYTE SRB_Status; /* 01 ASPI command status byte */ + BYTE SRB_HaId; /* 02 ASPI host adapter number */ + BYTE SRB_Flags; /* 03 Reserved */ + DWORD SRB_Hdr_Rsvd; /* 04 Reserved */ + BYTE SRB_Target; /* 08 Target's SCSI ID */ + BYTE SRB_Lun; /* 09 Target's LUN number */ + DWORD SRB_Timeout; /* 10 Target's Timeout value */ +} SRB_GetSetTimeouts, *PSRB_GetSetTimeouts; + /* SRB header */ typedef struct tagSRB32_Header { BYTE SRB_Cmd; /* 00 ASPI cmd code = SC_RESET_DEV */

1 0

Christopher Berner : wined3d: Add Nvidia TitanX (Pascal).
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 03ea90e2b4f0b6ec52a1cbd5f036b132aa60569c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ea90e2b4f0b6ec52a1cbd5f… Author: Christopher Berner <christopherberner(a)gmail.com> Date: Sun Apr 23 12:12:05 2017 -0700 wined3d: Add Nvidia TitanX (Pascal). Signed-off-by: Christopher Berner <christopherberner(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dad06728ce75e0422218bff06168e0c6328b9b7e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fbae9c1..175013e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1334,6 +1334,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1817,6 +1818,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3579e21..d38bb55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2032,6 +2032,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Alex Henrie : comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 03215c684bf503e84f6faaea15d0f3bed11f6995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03215c684bf503e84f6faaea1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 20 00:06:12 2017 -0700 comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 690022c61b6dfc3af59bd3afdc53b33cc51201b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 8 ++------ dlls/comctl32/tests/listview.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 56e2563..c01d816 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7989,12 +7989,8 @@ static BOOL LISTVIEW_IsItemVisible(const LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_RedrawItems(const LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast) { INT i; - - if (nLast < nFirst || min(nFirst, nLast) < 0 || - max(nFirst, nLast) >= infoPtr->nItemCount) - return FALSE; - - for (i = nFirst; i <= nLast; i++) + + for (i = max(nFirst, 0); i <= min(nLast, infoPtr->nItemCount - 1); i++) LISTVIEW_InvalidateItem(infoPtr, i); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d21b05..f497673 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5529,6 +5529,43 @@ static void test_LVM_SETITEMTEXT(void) DestroyWindow(hwnd); } +static void test_LVM_REDRAWITEMS(void) +{ + HWND list; + DWORD ret; + + list = create_listview_control(LVS_ICON); + ok(list != NULL, "failed to create listview window\n"); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + insert_item(list, 0); + + ret = SendMessageA(list, LVM_REDRAWITEMS, -1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, -1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 2); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 2, 3); + expect(TRUE, ret); + + DestroyWindow(list); +} + static void test_imagelists(void) { HWND hwnd, header; @@ -5903,6 +5940,7 @@ START_TEST(listview) test_createdragimage(); test_dispinfo(); test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); test_imagelists(); test_deleteitem(); test_insertitem();

1 0

Józef Kucia : wined3d: Implement buffer samplers.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 8be01c226e2819957b9656b123dc4e180a8cbdcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be01c226e2819957b9656b12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:33 2017 +0100 wined3d: Implement buffer samplers. 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> (cherry picked from commit 63b8360e4daeb6a1b86be1a400db9c32ad042be4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fedc216..78e1764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -59,7 +59,7 @@ static const struct resource_type_info[] = { {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, 1, "Buffer"}, /* WINED3D_SHADER_RESOURCE_BUFFER */ {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ @@ -2032,6 +2032,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shadow_sampler = glsl_is_shadow_sampler(shader, ps_args, entry->resource_idx, entry->sampler_idx); switch (reg_maps->resource_info[entry->resource_idx].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + sampler_type = "samplerBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: if (shadow_sampler) sampler_type = "sampler1DShadow";

1 0

Nikolay Sivov : usp10: Ignore device tables with invalid delta format.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 179500a7ef2db21f9a20ed06ac3f41765640befb URL: http://source.winehq.org/git/wine.git/?a=commit;h=179500a7ef2db21f9a20ed06a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 20 02:36:39 2017 +0300 usp10: Ignore device tables with invalid delta format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fefd15118fa643c16a34be889baf79cda1768a0f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/opentype.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index d7afbe1..d20361e 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1114,10 +1114,18 @@ static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD p static const WORD mask[3] = {3,0xf,0xff}; if (DeviceTable && ppem >= GET_BE_WORD(DeviceTable->StartSize) && ppem <= GET_BE_WORD(DeviceTable->EndSize)) { - int format = GET_BE_WORD(DeviceTable->DeltaFormat); + WORD format = GET_BE_WORD(DeviceTable->DeltaFormat); int index = ppem - GET_BE_WORD(DeviceTable->StartSize); int value; - TRACE("device table, format %i, index %i\n",format, index); + + TRACE("device table, format %#x, index %i\n", format, index); + + if (format & ~0x3) + { + WARN("invalid delta format %#x\n", format); + return 0; + } + index = index << format; value = (DeviceTable->DeltaValue[index/sizeof(WORD)] << (index%sizeof(WORD)))&mask[format-1]; TRACE("offset %i, value %i\n",index, value);

1 0

Aric Stewart : usp10: Fix Contextual Shaping for Languages with RTL write order.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 1426e447c0572661c19beee9f6936c1cd18b77c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1426e447c0572661c19beee9f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:15 2017 -0600 usp10: Fix Contextual Shaping for Languages with RTL write order. Including Arabic, Syriac, Phags pa, and Mongolian. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10e9adfb27ef9ea5e0ee7a9c4bc9cea0480d7527) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/shape.c | 124 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 94 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1c8d064..850e929 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1072,6 +1072,8 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1115,8 +1117,12 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { BOOL shaped = FALSE; @@ -1124,29 +1130,34 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { - i = nextIndex; - UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + char_index += dirL; + glyph_index = nextIndex; } shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) { - if (context_shape[i] == Xn) + if (context_shape[char_index] == Xn) { - WORD newGlyph = pwOutGlyphs[i]; - if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + WORD newGlyph = pwOutGlyphs[glyph_index]; + if (pwcChars[char_index] >= FIRST_ARABIC_CHAR && pwcChars[char_index] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */ - WCHAR context_char = wine_shaping_forms[pwcChars[i] - FIRST_ARABIC_CHAR][context_shape[i]]; - if (context_char != pwcChars[i] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) - pwOutGlyphs[i] = newGlyph; + WCHAR context_char = wine_shaping_forms[pwcChars[char_index] - FIRST_ARABIC_CHAR][context_shape[char_index]]; + if (context_char != pwcChars[char_index] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) + pwOutGlyphs[glyph_index] = newGlyph; } } - i++; + char_index += dirL; + glyph_index += dirL; } } @@ -1293,6 +1304,8 @@ static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1355,19 +1368,45 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -1427,6 +1466,8 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1475,24 +1516,36 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { - if (context_shape[i] >= 0) + if (context_shape[char_index] >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -2769,6 +2822,8 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS INT *context_shape; INT dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -2805,19 +2860,28 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw7 surface segfaults.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 8f2fec9af9dec770eb24eb71094c35b06d1caed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2fec9af9dec770eb24eb710… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:06 2017 -0700 ddraw: Don't crash if writing out a new ddraw7 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c9e29bff7bbded119e9052b6740545e70cafdcd8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw7.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1329587..10bba4e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2817,15 +2817,23 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1dd7cb1..9fa2593 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1996,6 +1996,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface7 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Józef Kucia : gdiplus: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 5f36ec6cca3fe801ed68e30f3383f56b37fc234d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f36ec6cca3fe801ed68e30f3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 11 09:46:36 2017 +0200 gdiplus: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c2a4f194cab6e3b7aaedb1598977c2de5f8747c3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/metafile.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 69d8a16..d5b1b14 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -19,6 +19,8 @@ #include <stdarg.h> #include <math.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -947,7 +949,7 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) bounds_rc.right = ceilf(metafile->auto_frame_max.X * x_scale); bounds_rc.bottom = ceilf(metafile->auto_frame_max.Y * y_scale); - gdi_bounds_rc = header.EmfHeader.rclBounds; + gdi_bounds_rc = header.u.EmfHeader.rclBounds; if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) { bounds_rc.left = min(bounds_rc.left, gdi_bounds_rc.left); @@ -1913,7 +1915,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY); header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX); header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY); - header->EmfHeader = emfheader; + header->u.EmfHeader = emfheader; if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly) { @@ -2016,11 +2018,11 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->image.frame_count = 1; (*metafile)->image.xres = header.DpiX; (*metafile)->image.yres = header.DpiY; - (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; - (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; - (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left) + (*metafile)->bounds.X = (REAL)header.u.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; + (*metafile)->bounds.Y = (REAL)header.u.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; + (*metafile)->bounds.Width = (REAL)(header.u.EmfHeader.rclFrame.right - header.u.EmfHeader.rclFrame.left) / 2540.0 * header.DpiX; - (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top) + (*metafile)->bounds.Height = (REAL)(header.u.EmfHeader.rclFrame.bottom - header.u.EmfHeader.rclFrame.top) / 2540.0 * header.DpiY; (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = header.Type;

1 0

Hans Leidekker : netprofm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: d1706e04444870333d0ba3e1ecbe19fbd84f8316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1706e04444870333d0ba3e1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 10 14:28:12 2017 +0200 netprofm: Fix compilation on systems that don't support nameless unions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25d3bc3064da2006210236feb49a388a48a12034) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 33b2fa6..745c8e8 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -18,6 +18,8 @@ */ #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "config.h" #include <stdarg.h> @@ -1693,7 +1695,7 @@ static void init_networks( struct list_manager *mgr ) struct network *network; struct connection *connection; - id.Data1 = aa->IfIndex; + id.Data1 = aa->u.s.IfIndex; /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0