October 2017 - Wine-Commits

Huw Davies : dwrite: Use the correct array index.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: cd746afd0dc81a0852212a8dd42aab7d23957898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd746afd0dc81a0852212a8dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 2 10:26:22 2017 +0100 dwrite: Use the correct array index. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ed66929..bb08017 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2298,7 +2298,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac UINT32 j; for (j = 0; j < mapping->families_count; j++) - heap_free(mapping->families[i]); + heap_free(mapping->families[j]); heap_free(mapping->families); if (mapping->collection)

1 0

Nikolay Sivov : usp10: Store per-item ABC structure directly.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: abf71afdffe48a27801f23e116c7f999f2f4e7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf71afdffe48a27801f23e11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:59 2017 +0300 usp10: Store per-item ABC structure directly. 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> --- dlls/usp10/usp10.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a1f9c15..f6be836 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -683,7 +683,7 @@ typedef struct { int* piAdvance; SCRIPT_VISATTR* psva; GOFFSET* pGoffset; - ABC* abc; + ABC abc; int iMaxPosX; HFONT fallbackFont; } StringGlyphs; @@ -2029,7 +2029,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); - ABC *abc = heap_alloc_zero(sizeof(ABC)); int numGlyphsReturned; HFONT originalFont = 0x0; @@ -2037,7 +2036,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, const WCHAR* pStr = (const WCHAR*)pString; analysis->glyphs[i].fallbackFont = NULL; - if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) + if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset) { heap_free (BidiLevel); heap_free (glyphs); @@ -2045,7 +2044,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, heap_free (piAdvance); heap_free (psva); heap_free (pGoffset); - heap_free (abc); hr = E_OUTOFMEMORY; goto error; } @@ -2078,7 +2076,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, - piAdvance, pGoffset, abc); + piAdvance, pGoffset, &analysis->glyphs[i].abc); if (originalFont) SelectObject(hdc,originalFont); @@ -2099,7 +2097,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, analysis->glyphs[i].piAdvance = piAdvance; analysis->glyphs[i].psva = psva; analysis->glyphs[i].pGoffset = pGoffset; - analysis->glyphs[i].abc = abc; analysis->glyphs[i].iMaxPosX= -1; BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; @@ -2516,7 +2513,6 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) heap_free(analysis->glyphs[i].piAdvance); heap_free(analysis->glyphs[i].psva); heap_free(analysis->glyphs[i].pGoffset); - heap_free(analysis->glyphs[i].abc); if (analysis->glyphs[i].fallbackFont) DeleteObject(analysis->glyphs[i].fallbackFont); ScriptFreeCache((SCRIPT_CACHE *)&analysis->glyphs[i].sc);

1 0

Nikolay Sivov : usp10/tests: Simple ScriptString_pSize() test.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 82ed7410cb3cdd38b1aaa89678b10cd2f18fcb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ed7410cb3cdd38b1aaa8967… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:58 2017 +0300 usp10/tests: Simple ScriptString_pSize() test. 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> --- dlls/usp10/tests/usp10.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 4d8d6a7..47f83ee 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3173,7 +3173,7 @@ static void test_ScriptString(HDC hdc) * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This * memory is freed by ScriptStringFree. There needs to be a valid hdc for this as - * ScriptStringAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. + * ScriptStringAnalyse calls ScriptItemize, ScriptShape and ScriptPlace which require it. * */ @@ -4048,6 +4048,36 @@ static void test_ScriptIsComplex(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); } +static void test_ScriptString_pSize(HDC hdc) +{ + static const WCHAR textW[] = {'A',0}; + SCRIPT_STRING_ANALYSIS ssa; + const SIZE *size; + TEXTMETRICW tm; + HRESULT hr; + ABC abc; + + hr = ScriptStringAnalyse(hdc, textW, 1, 16, -1, SSA_GLYPHS, 0, NULL, NULL, NULL, NULL, NULL, &ssa); + ok(hr == S_OK, "ScriptStringAnalyse failed, hr %#x.\n", hr); + + size = ScriptString_pSize(NULL); + ok(size == NULL || broken(size != NULL) /* <win7 */, "Unexpected size pointer.\n"); + + GetCharABCWidthsW(hdc, textW[0], textW[0], &abc); + + memset(&tm, 0, sizeof(tm)); + GetTextMetricsW(hdc, &tm); + ok(tm.tmHeight > 0, "Unexpected tmHeight.\n"); + + size = ScriptString_pSize(ssa); + ok(size != NULL, "Unexpected size pointer.\n"); + ok(size->cx == abc.abcA + abc.abcB + abc.abcC, "Unexpected cx size %d.\n", size->cx); + ok(size->cy == tm.tmHeight, "Unexpected cy size %d.\n", size->cy); + + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "Failed to free ssa, hr %#x.\n", hr); +} + static void init_tests(void) { HMODULE module = GetModuleHandleA("usp10.dll"); @@ -4109,6 +4139,7 @@ START_TEST(usp10) test_ScriptXtoX(); test_ScriptString(hdc); test_ScriptStringXtoCP_CPtoX(hdc); + test_ScriptString_pSize(hdc); test_ScriptLayout(); test_digit_substitution();

1 0

Nikolay Sivov : usp10/tests: Some tests for ScriptCacheGetHeight() caching behaviour.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 68c9ac60a5f7fa62ffa18a7eb553f2308d5321a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c9ac60a5f7fa62ffa18a7eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:56 2017 +0300 usp10/tests: Some tests for ScriptCacheGetHeight() caching behaviour. 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> --- dlls/usp10/tests/usp10.c | 67 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 524c47f..cd129ff 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3440,11 +3440,27 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) } } +static HWND create_test_window(void) +{ + HWND hwnd = CreateWindowExA(0, "Static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + + return hwnd; +} + static void test_ScriptCacheGetHeight(HDC hdc) { - HRESULT hr; + HFONT hfont, prev_hfont; SCRIPT_CACHE sc = NULL; - LONG height; + LONG height, height2; + TEXTMETRICW tm; + LOGFONTA lf; + HRESULT hr; + HWND hwnd; + HDC hdc2; hr = ScriptCacheGetHeight(NULL, NULL, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); @@ -3455,11 +3471,54 @@ static void test_ScriptCacheGetHeight(HDC hdc) hr = ScriptCacheGetHeight(NULL, &sc, &height); ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); - height = 0; + height = 123; + hr = ScriptCacheGetHeight(hdc, NULL, &height); + ok(hr == E_INVALIDARG, "Uexpected hr %#x.\n", hr); + ok(height == 123, "Unexpected height.\n"); + + memset(&tm, 0, sizeof(tm)); + GetTextMetricsW(hdc, &tm); + ok(tm.tmHeight > 0, "Unexpected tmHeight %u.\n", tm.tmHeight); + height = 0; hr = ScriptCacheGetHeight(hdc, &sc, &height); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(height > 0, "expected height > 0\n"); + ok(height == tm.tmHeight, "expected height > 0\n"); + + /* Try again with NULL dc. */ + height2 = 0; + hr = ScriptCacheGetHeight(NULL, &sc, &height2); + ok(hr == S_OK, "Failed to get cached height, hr %#x.\n", hr); + ok(height2 == height, "Unexpected height %u.\n", height2); + + hwnd = create_test_window(); + + hdc2 = GetDC(hwnd); + ok(hdc2 != NULL, "Failed to get window dc.\n"); + + memset(&lf, 0, sizeof(LOGFONTA)); + lstrcpyA(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -32; + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "Failed to create font.\n"); + + prev_hfont = SelectObject(hdc2, hfont); + + memset(&tm, 0, sizeof(tm)); + GetTextMetricsW(hdc2, &tm); + ok(tm.tmHeight > height, "Unexpected tmHeight %u.\n", tm.tmHeight); + + height2 = 0; + hr = ScriptCacheGetHeight(hdc2, &sc, &height2); + ok(hr == S_OK, "Failed to get cached height, hr %#x.\n", hr); + ok(height2 == height, "Unexpected height.\n"); + + SelectObject(hdc2, prev_hfont); + DeleteObject(hfont); + + ReleaseDC(hwnd, hdc2); + DestroyWindow(hwnd); ScriptFreeCache(&sc); }

1 0

Nikolay Sivov : comctl32/taskdialog: Support loading window title from resources.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 2d73886c3311d734b457c0d694d673b0e1c6ca8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d73886c3311d734b457c0d69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 16:56:57 2017 +0300 comctl32/taskdialog: Support loading window title from resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 2558174..5c4af2a 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -399,6 +399,20 @@ static unsigned int taskdialog_get_reference_rect(const struct taskdialog_templa return info.rcWork.right - info.rcWork.left; } +static WCHAR *taskdialog_get_exe_name(const TASKDIALOGCONFIG *taskconfig, WCHAR *name, DWORD length) +{ + DWORD len = GetModuleFileNameW(NULL, name, length); + if (len && len < length) + { + WCHAR *p; + if ((p = strrchrW(name, '/'))) name = p + 1; + if ((p = strrchrW(name, '\\'))) name = p + 1; + return name; + } + else + return NULL; +} + static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfig) { struct taskdialog_control *control, *control2; @@ -409,15 +423,19 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi const WCHAR *titleW = NULL; DLGTEMPLATE *template; NONCLIENTMETRICSW ncm; + WCHAR pathW[MAX_PATH]; RECT ref_rect; char *ptr; HDC hdc; /* Window title */ if (!taskconfig->pszWindowTitle) - FIXME("use executable name for window title\n"); + titleW = taskdialog_get_exe_name(taskconfig, pathW, sizeof(pathW)/sizeof(pathW[0])); else if (IS_INTRESOURCE(taskconfig->pszWindowTitle)) - FIXME("load window title from resources\n"); + { + if (!LoadStringW(taskconfig->hInstance, LOWORD(taskconfig->pszWindowTitle), (WCHAR *)&titleW, 0)) + titleW = taskdialog_get_exe_name(taskconfig, pathW, sizeof(pathW)/sizeof(pathW[0])); + } else titleW = taskconfig->pszWindowTitle; if (!titleW)

1 0

Fabian Maurer : wpcapi.idl: Fix IWindowsParentalControls UUID.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: f275815c0cd684eecba4c6d1b9fef367ad120a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f275815c0cd684eecba4c6d1b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Oct 1 22:35:45 2017 +0200 wpcapi.idl: Fix IWindowsParentalControls UUID. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wpcapi.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wpcapi.idl b/include/wpcapi.idl index a46a310..053c882 100644 --- a/include/wpcapi.idl +++ b/include/wpcapi.idl @@ -109,7 +109,7 @@ interface IWindowsParentalControlsCore : IUnknown } [ - uuid(4ff40a0f-3f3b-4d7c-a41b-4f39d7b44d05), + uuid(28b4d88b-e072-49e6-804d-26edbe21a7b9), object ] interface IWindowsParentalControls : IWindowsParentalControlsCore

1 0

Fabian Maurer : midimap: Add warning for user in case midi won't work.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: e9d25b834ceb91544a81581320cc7f3327faef39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d25b834ceb91544a8158132… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 30 22:07:08 2017 +0200 midimap: Add warning for user in case midi won't work. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 64b4dc8..f36b252 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -77,6 +77,7 @@ */ WINE_DEFAULT_DEBUG_CHANNEL(msacm); +WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct tagMIDIOUTPORT { @@ -553,6 +554,8 @@ static LRESULT MIDIMAP_drvOpen(void) { MIDIOUTCAPSW moc; unsigned dev, i; + WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; + BOOL found_valid_port = FALSE; if (midiOutPorts) return 0; @@ -571,6 +574,8 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; + if (strncmpW(midiOutPorts[0].name, throughportW, strlenW(throughportW)) != 0) + found_valid_port = TRUE; } else { @@ -578,6 +583,9 @@ static LRESULT MIDIMAP_drvOpen(void) } } + if (!found_valid_port) + ERR_(winediag)("No software synthesizer midi port found, Midi sound output probably won't work.\n"); + return 1; }

1 0

Akihiro Sagawa : ntdll: Treat CIFS/SMB2 file systems as remote devices.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: f9a5ad134836cf2e9acf6a93dd8460c9fd5b8833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a5ad134836cf2e9acf6a93d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 1 21:23:10 2017 +0900 ntdll: Treat CIFS/SMB2 file systems as remote devices. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 ++ dlls/ntdll/file.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 9d5cf92..3b76f9b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -640,6 +640,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { /* don't even bother stat'ing network mounts, there's no meaningful device anyway */ if (!strcmp( entry->mnt_type, "nfs" ) || + !strcmp( entry->mnt_type, "cifs" ) || !strcmp( entry->mnt_type, "smbfs" ) || !strcmp( entry->mnt_type, "ncpfs" )) continue; @@ -918,6 +919,7 @@ static char *get_device_mount_point( dev_t dev ) { /* don't even bother stat'ing network mounts, there's no meaningful device anyway */ if (!strcmp( entry->mnt_type, "nfs" ) || + !strcmp( entry->mnt_type, "cifs" ) || !strcmp( entry->mnt_type, "smbfs" ) || !strcmp( entry->mnt_type, "ncpfs" )) continue; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d498581..c12110e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3114,7 +3114,9 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->Characteristics |= FILE_REMOVABLE_MEDIA|FILE_READ_ONLY_DEVICE; break; case 0x6969: /* nfs */ - case 0x517B: /* smbfs */ + case 0xff534d42: /* cifs */ + case 0xfe534d42: /* smb2 */ + case 0x517b: /* smbfs */ case 0x564c: /* ncpfs */ info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE;

1 0

Nikolay Sivov : shell32/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: e9c69fde09f0aca171652aaa2e26db2ef075d243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c69fde09f0aca171652aaa2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 21:46:35 2017 +0300 shell32/tests: Fixed some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3735c9b..9825c3a 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -638,6 +638,8 @@ static void test_items(void) SysFreeString(name); SysFreeString(bstr); + FolderItem_Release(item); + item = NULL; r = FolderItems_Item(items, str_index, &item); ok(r == S_OK, "file_defs[%d]: FolderItems::Item failed: %08x\n", i, r); @@ -1403,6 +1405,7 @@ static void test_ShellExecute(void) ok(hr == S_OK, "ShellExecute failed: %08x\n", hr); SysFreeString(name); + IShellDispatch2_Release(sd); } START_TEST(shelldispatch)

1 0

Nikolay Sivov : usp10: Remove separate invalid flag from string analysis structure.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 3cbd598e814f9187d3a847e8b61820ac3b3bd3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbd598e814f9187d3a847e8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:47:01 2017 +0300 usp10: Remove separate invalid flag from string analysis structure. 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> --- dlls/usp10/usp10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5769240..0b8c28e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -690,14 +690,14 @@ typedef struct { enum stringanalysis_flags { - SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, + SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, + SCRIPT_STRING_ANALYSIS_FLAGS_INVALID = 0x2, }; typedef struct { HDC hdc; DWORD ssa_flags; DWORD flags; - BOOL invalid; int clip_len; int cItems; int cMaxGlyphs; @@ -2367,7 +2367,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai /* icp out of range */ if(icp < 0) { - analysis->invalid = TRUE; + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; return E_INVALIDARG; } @@ -2408,7 +2408,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai } /* icp out of range */ - analysis->invalid = TRUE; + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; return E_INVALIDARG; } @@ -2508,7 +2508,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; - invalid = analysis->invalid; + invalid = analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; if (analysis->glyphs) { @@ -3800,7 +3800,7 @@ HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return E_INVALIDARG; - return (analysis->invalid) ? S_FALSE : S_OK; + return analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_INVALID ? S_FALSE : S_OK; } /***********************************************************************

1 0