wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

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: 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 : 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

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

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

Huw Davies : dwrite: Use the correct array index.
by Alexandre Julliard 02 Oct '17

02 Oct '17

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

Huw Davies : winhttp: Send basic authorization credentials with the first request if they' ve been set.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: 6ce8624760a219cea311b70246df6b455c706ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce8624760a219cea311b7024… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 2 09:47:27 2017 +0100 winhttp: Send basic authorization credentials with the first request if they've been set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 10 ++++++--- dlls/winhttp/tests/winhttp.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 05f4b96..a355887 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1142,24 +1142,25 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla const WCHAR *auth_target, *username, *password; WCHAR auth_value[2048], *auth_reply; DWORD len = sizeof(auth_value), len_scheme, flags; - BOOL ret; + BOOL ret, has_auth_value; if (scheme == SCHEME_INVALID) return FALSE; switch (target) { case WINHTTP_AUTH_TARGET_SERVER: - if (!get_authvalue( request, WINHTTP_QUERY_WWW_AUTHENTICATE, scheme_flag, auth_value, len )) - return FALSE; + has_auth_value = get_authvalue( request, WINHTTP_QUERY_WWW_AUTHENTICATE, scheme_flag, auth_value, len ); auth_ptr = &request->authinfo; auth_target = attr_authorization; if (request->creds[TARGET_SERVER][scheme].username) { + if (scheme != SCHEME_BASIC && !has_auth_value) return FALSE; username = request->creds[TARGET_SERVER][scheme].username; password = request->creds[TARGET_SERVER][scheme].password; } else { + if (!has_auth_value) return FALSE; username = request->connect->username; password = request->connect->password; } @@ -2086,6 +2087,9 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len if (connect->hostname) add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); + if (request->creds[TARGET_SERVER][SCHEME_BASIC].username) + do_authorization( request, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC ); + if (total_len || (request->verb && !strcmpW( request->verb, postW ))) { WCHAR length[21]; /* decimal long int + null */ diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2babe98..469b882 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2075,6 +2075,7 @@ static const char largeauth[] = static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; +static const char auth_unseen[] = "Auth Unseen"; struct server_info { @@ -2134,6 +2135,15 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof okmsg - 1, 0); send(c, page1, sizeof page1 - 1, 0); } + if (strstr(buffer, "/auth_with_creds")) + { + send(c, okauthmsg, sizeof okauthmsg - 1, 0); + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, hello_world, sizeof hello_world - 1, 0); + else + send(c, auth_unseen, sizeof auth_unseen - 1, 0); + continue; + } if (strstr(buffer, "/auth")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -2309,6 +2319,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) static void test_basic_authentication(int port) { static const WCHAR authW[] = {'/','a','u','t','h',0}; + static const WCHAR auth_with_credsW[] = {'/','a','u','t','h','_','w','i','t','h','_','c','r','e','d','s',0}; static WCHAR userW[] = {'u','s','e','r',0}; static WCHAR passW[] = {'p','w','d',0}; static WCHAR pass2W[] = {'p','w','d','2',0}; @@ -2472,6 +2483,45 @@ static void test_basic_authentication(int port) WinHttpCloseHandle(con); WinHttpCloseHandle(ses); + /* now set the credentials first to show that they get sent with the first request */ + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, auth_with_credsW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %u\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + + size = 0; + ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + error = GetLastError(); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + if (ret) + { + ok(size == 11, "expected 11, got %u\n", size); + ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); + } + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + /* credentials set with WinHttpSetCredentials take precedence over those set through options */ ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0);

1 0

Huw Davies : winhttp: Move the authorization code above send_request().
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: 9c2cce092358177b403fbd396fa2ee7b39eecc47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2cce092358177b403fbd396… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 2 09:47:26 2017 +0100 winhttp: Move the authorization code above send_request(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2095 ++++++++++++++++++++++++------------------------ 1 file changed, 1048 insertions(+), 1047 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c2cce092358177b403fb…

1 0

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

02 Oct '17

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 02 Oct '17

02 Oct '17

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017