October 2017 - Wine-commits

Fabian Maurer : wpcapi.idl: Fix IWindowsParentalControls UUID.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: b96688aa0bffd47322ec4a647cded1821b2df265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96688aa0bffd47322ec4a647… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 2 23:05:10 2017 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 116 ++++++++++++++------------------------------------------------- 1 file changed, 25 insertions(+), 91 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6bc81a3..b787108 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-08 15:45+0900\n" +"PO-Revision-Date: 2017-10-02 22:05+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -7250,19 +7250,19 @@ msgstr "キー: [1], 名前: [2], 値: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{致命的エラー: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{エラー [1]。 }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "警告 [1]。" #: msi.rc:74 msgid "Info [1]." -msgstr "情報 [1]." +msgstr "情報 [1]。" #: msi.rc:75 msgid "" @@ -7275,48 +7275,40 @@ msgstr "" "[3], [4]}}" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "ディスクがいっぱいです。\n" +msgstr "{{ディスク領域不足: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "アクション %s: [1]. [2]" +msgstr "アクション [Time]: [1]。 [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "メッセージ種別: [1], 引数: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== ログの開始: %s %s ===" +msgstr "=== ログの開始: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "アクション開始 %s: [1]." +msgstr "アクション開始 [Time]: [1]。" #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "アクション終了 %s: [1]. 戻り値 [2]." +msgstr "アクション終了 [Time]: [1]。戻り値 [2]。" #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "ディスクを挿入してください: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"コピー元のファイルが見つかりません{{(cabファイル))}}: [2]。ファイルが存在" +"し、アクセスできることを確認してください。" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -11975,17 +11967,6 @@ msgid "Icons (*.ico)" msgstr "アイコン (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12001,7 +11982,7 @@ msgstr "" " REG [操作] [パラメータ]\n" "\n" "対応している操作:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "特定の操作に対するヘルプは以下を入力:\n" " REG [操作] /?\n" @@ -12129,25 +12110,19 @@ msgstr "(値の設定なし)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT ファイル.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: ファイル '%1' が見つかりません。\n" +msgstr "reg: ファイル '%1' が見つかりません。\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: レジストリキー '%1' を開けません。\n" +msgstr "reg: レジストリキー '%1' を開けません。\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: 認識できないエスケープシーケンスです [%1!c!]\n" +msgstr "reg: 認識できないエスケープシーケンスです [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry" @@ -12414,38 +12389,6 @@ msgstr "" "ファイルではありません。" #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12501,7 +12444,7 @@ msgstr "" "使い方の例:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12549,7 +12492,7 @@ msgstr "" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: 認識できないエスケープシーケンスです [%1!c!]\n" +msgstr "regedit: 認識できないエスケープシーケンスです [\\%1!c!]\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -12572,12 +12515,11 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: レジストリキー '%1' を開けません。\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: サポートされていないレジストリデータ型 [%1] が '%2' にあります。\n" +"regedit: サポートされていないレジストリデータ型 [0x%1!x!] が '%2' にありま" +"す。\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12585,10 +12527,8 @@ msgstr "" "regedit: レジストリ値 '%1' はバイナリデータとしてエクスポートされます。\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: キー名が無効です\n" +msgstr "regedit: システムキーが無効です [%1]\n" #: regedit.rc:428 msgid "" @@ -12597,10 +12537,8 @@ msgstr "" "regedit: '%1' をエクスポートできません。指定されたキーが見つかりません。\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: レジストリクラス '%1' を削除できません。\n" +msgstr "regedit: レジストリキー '%1' を削除できません。\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12747,13 +12685,9 @@ msgid "Confirm Key Delete" msgstr "値の削除確認" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "本当にレジストリキー '%1' とそのサブキーを削除しますか?" +msgstr "本当にこのレジストリキーとそのサブキーすべてを削除しますか?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Nikolay Sivov : comctl32/taskdialog: Support loading window title from resources.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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

Nikolay Sivov : usp10/tests: Some tests for ScriptCacheGetHeight() caching behaviour.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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 : usp10: Return whole SCRIPT_FONTPROPERTIES structure.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: 40bc04ae6196d21716db736a9ba0e5ea5a77d6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bc04ae6196d21716db736a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:57 2017 +0300 usp10: Return whole SCRIPT_FONTPROPERTIES 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/tests/usp10.c | 1 + dlls/usp10/usp10.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cd129ff..4d8d6a7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2515,6 +2515,7 @@ static void test_ScriptGetFontProperties(HDC hdc) hr = ScriptGetFontProperties(hdc,&psc,&sfp); ok( hr == E_INVALIDARG, "(hdc,&psc,&sfp) invalid, expected E_INVALIDARG, got %08x\n", hr); ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); + ok( sfp.cBytes == sizeof(SCRIPT_FONTPROPERTIES) - 1, "Unexpected cBytes.\n"); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 40fc89a..a1f9c15 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -741,6 +741,8 @@ BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T /* TODO Fix font properties on Arabic locale */ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { + sc->sfp.cBytes = sizeof(sc->sfp); + if (!sc->sfnt) { sc->sfp.wgBlank = sc->tm.tmBreakChar; @@ -788,11 +790,7 @@ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) static inline void get_cache_font_properties(SCRIPT_FONTPROPERTIES *sfp, ScriptCache *sc) { - sfp->wgBlank = sc->sfp.wgBlank; - sfp->wgDefault = sc->sfp.wgDefault; - sfp->wgInvalid = sc->sfp.wgInvalid; - sfp->wgKashida = sc->sfp.wgKashida; - sfp->iKashidaWidth = sc->sfp.iKashidaWidth; + *sfp = sc->sfp; } static inline LONG get_cache_height(SCRIPT_CACHE *psc)

1 0

Nikolay Sivov : usp10/tests: Simple ScriptString_pSize() test.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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: Store per-item ABC structure directly.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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: Make string analysis size part of a main structure.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: c5b41a45f92830fe64306e5b343cf0cc336fcd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b41a45f92830fe64306e5b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:47:00 2017 +0300 usp10: Make string analysis size part of a main 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 | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f6be836..5769240 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -688,9 +688,15 @@ typedef struct { HFONT fallbackFont; } StringGlyphs; +enum stringanalysis_flags +{ + SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, +}; + typedef struct { HDC hdc; - DWORD dwFlags; + DWORD ssa_flags; + DWORD flags; BOOL invalid; int clip_len; int cItems; @@ -699,7 +705,7 @@ typedef struct { int numItems; StringGlyphs* glyphs; SCRIPT_LOGATTR* logattrs; - SIZE* sz; + SIZE sz; int* logical2visual; } StringAnalysis; @@ -1954,7 +1960,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, /* FIXME: handle clipping */ analysis->clip_len = cString; analysis->hdc = hdc; - analysis->dwFlags = dwFlags; + analysis->ssa_flags = dwFlags; if (psState) sState = *psState; @@ -2319,7 +2325,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; - if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return E_INVALIDARG; for (item = 0; item < analysis->numItems; item++) { @@ -2356,7 +2362,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); if (!ssa || !pX) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; /* icp out of range */ if(icp < 0) @@ -2418,7 +2424,7 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); if (!ssa || !piCh || !piTrailing) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; /* out of range */ if(iX < 0) @@ -2523,7 +2529,6 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) heap_free(analysis->pItem); heap_free(analysis->logattrs); - heap_free(analysis->sz); heap_free(analysis->logical2visual); heap_free(analysis); @@ -3746,7 +3751,7 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD TRACE("%p, %p\n", ssa, piDx); if (!analysis) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; for (i = 0; i < analysis->numItems; i++) { @@ -3818,23 +3823,22 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return NULL; - if (!(analysis->dwFlags & SSA_GLYPHS)) return NULL; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return NULL; - if (!analysis->sz) + if (!(analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_SIZE)) { - if (!(analysis->sz = heap_alloc(sizeof(SIZE)))) return NULL; - analysis->sz->cy = analysis->glyphs[0].sc->tm.tmHeight; + analysis->sz.cy = analysis->glyphs[0].sc->tm.tmHeight; - analysis->sz->cx = 0; + analysis->sz.cx = 0; for (i = 0; i < analysis->numItems; i++) { - if (analysis->glyphs[i].sc->tm.tmHeight > analysis->sz->cy) - analysis->sz->cy = analysis->glyphs[i].sc->tm.tmHeight; + if (analysis->glyphs[i].sc->tm.tmHeight > analysis->sz.cy) + analysis->sz.cy = analysis->glyphs[i].sc->tm.tmHeight; for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) - analysis->sz->cx += analysis->glyphs[i].piAdvance[j]; + analysis->sz.cx += analysis->glyphs[i].piAdvance[j]; } } - return analysis->sz; + return &analysis->sz; } /*********************************************************************** @@ -3856,7 +3860,7 @@ const SCRIPT_LOGATTR * WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return NULL; - if (!(analysis->dwFlags & SSA_BREAK)) return NULL; + if (!(analysis->ssa_flags & SSA_BREAK)) return NULL; return analysis->logattrs; } @@ -3904,7 +3908,7 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) TRACE("(%p)\n", ssa); if (!analysis) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; /* FIXME: handle RTL scripts */ for (i = 0, k = 0; i < analysis->numItems; i++)

1 0

Nikolay Sivov : usp10: Remove separate invalid flag from string analysis structure.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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

Nikolay Sivov : shell32/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard 02 Oct '17

02 Oct '17

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