November 2018 - Wine-devel - list.winehq.org

[PATCH 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 05 Nov '18

05 Nov '18

Hi, Please find attached a patch that implements enumerating remembered (aka persistent) connections from registry. Note that this leads to the removal of the null enumerator code which is no longer used. The next patches implement the creation and the deletion of persistent connections. As usual, this patch series got tested on ReactOS and its purpose is to reduce the diff between Wine's MPR and ReactOS' one. The initial implementation was too broken to get into Wine. This one is correct. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 1

[PATCH v6 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior
by Gabriel Ivăncescu 05 Nov '18

05 Nov '18

Windows doesn't reset and re-enumerate it everytime autocompletion happens, and it also sorts the strings. This matches it more closely and makes it more useable on large lists as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 206 +++++++++++++++++++++++++++++++------------- 1 file changed, 146 insertions(+), 60 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b3f86f3..69d9cc8 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -25,7 +25,6 @@ - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style - implement ResetEnumerator - - string compares should be case-insensitive, the content of the list should be sorted */ #include "config.h" @@ -62,6 +61,8 @@ typedef struct LONG ref; BOOL initialized; BOOL enabled; + UINT enum_strs_num; + WCHAR **enum_strs; HWND hwndEdit; HWND hwndListBox; WNDPROC wpOrigEditProc; @@ -103,10 +104,94 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } -static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd) +static int enumerate_strings_cmpfn(const void *a, const void *b) +{ + return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); +} + +/* + Enumerate all of the strings and sort them in the internal list. + + We don't free the enumerated strings (except on error) to avoid needless + copies, until the next reset (or the object itself is destroyed) +*/ +static void enumerate_strings(IAutoCompleteImpl *ac) +{ + UINT cur = 0, array_size = 1024; + LPOLESTR *strs = NULL, *tmp; + ULONG read; + + do + { + if ((tmp = heap_realloc(strs, array_size * sizeof(*strs))) == NULL) + goto fail; + strs = tmp; + + do + { + if (FAILED(IEnumString_Next(ac->enumstr, array_size - cur, &strs[cur], &read))) + read = 0; + } while (read != 0 && (cur += read) < array_size); + + array_size *= 2; + } while (read != 0); + + /* Allocate even if there were zero strings enumerated, to mark it non-NULL */ + if ((tmp = heap_realloc(strs, cur * sizeof(*strs)))) + { + strs = tmp; + if (cur > 0) + qsort(strs, cur, sizeof(*strs), enumerate_strings_cmpfn); + + ac->enum_strs = strs; + ac->enum_strs_num = cur; + return; + } + +fail: + while (cur--) + CoTaskMemFree(strs[cur]); + heap_free(strs); +} + +static UINT find_matching_enum_str(IAutoCompleteImpl *ac, UINT start, WCHAR *text, + UINT len, int direction) +{ + WCHAR **strs = ac->enum_strs; + UINT index = ~0, a = start, b = ac->enum_strs_num; + while (a < b) + { + UINT i = (a + b - 1) / 2; + int cmp = strncmpiW(text, strs[i], len); + if (cmp == 0) + { + index = i; + cmp = direction; + } + if (cmp <= 0) b = i; + else a = i + 1; + } + return index; +} + +static void free_enum_strs(IAutoCompleteImpl *ac) +{ + WCHAR **strs = ac->enum_strs; + if (strs) + { + UINT i = ac->enum_strs_num; + ac->enum_strs = NULL; + while (i--) + CoTaskMemFree(strs[i]); + heap_free(strs); + } +} + +static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) { ShowWindow(hwnd, SW_HIDE); SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); + if (reset) free_enum_strs(ac); } static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) @@ -167,14 +252,14 @@ static BOOL select_item_with_return_key(IAutoCompleteImpl *ac, HWND hwnd) { len = SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)text); set_text_and_selection(ac, hwnd, text, 0, len); - hide_listbox(ac, hwndListBox); + hide_listbox(ac, hwndListBox, TRUE); ac->no_fwd_char = '\r'; /* RETURN char */ heap_free(text); return TRUE; } } } - hide_listbox(ac, hwndListBox); + hide_listbox(ac, hwndListBox, TRUE); return FALSE; } @@ -241,6 +326,10 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) static BOOL do_aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt, WCHAR *last_delim) { WCHAR c = last_delim[1]; + + free_enum_strs(ac); + IEnumString_Reset(ac->enumstr); /* call before expand */ + last_delim[1] = '\0'; IACList_Expand(ac->aclist, txt); last_delim[1] = c; @@ -276,6 +365,9 @@ static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) while (i--) if (strchrW(delims, txt[i])) return do_aclist_expand(ac, txt, &txt[i]); + + /* Windows doesn't expand without a delim, but it does reset */ + free_enum_strs(ac); } return FALSE; @@ -312,66 +404,57 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND hwnd, enum autoappend_flag flag) { /* Return FALSE if we need to hide the listbox */ - UINT cpt; + WCHAR **str = ac->enum_strs; + UINT cnt, start, end; + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; - if (ac->options & ACO_AUTOSUGGEST) + if (len) { - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); - SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + start = find_matching_enum_str(ac, 0, text, len, -1); + if (start == ~0) + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (flag == autoappend_flag_yes) + autoappend_str(ac, text, len, str[start], hwnd); + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + + /* Find the index beyond the last string that matches */ + end = find_matching_enum_str(ac, start + 1, text, len, 1); + end = (end == ~0 ? start : end) + 1; } - for (cpt = 0;;) - { - HRESULT hr; - LPOLESTR strs = NULL; - ULONG fetched; - - hr = IEnumString_Next(ac->enumstr, 1, &strs, &fetched); - if (hr != S_OK) - break; - - if (!strncmpiW(text, strs, len)) - { - if (cpt == 0 && flag == autoappend_flag_yes) - { - autoappend_str(ac, text, len, strs, hwnd); - if (!(ac->options & ACO_AUTOSUGGEST)) - { - CoTaskMemFree(strs); - break; - } - } - - if (ac->options & ACO_AUTOSUGGEST) - SendMessageW(ac->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - - cpt++; - } - - CoTaskMemFree(strs); - } - - if (ac->options & ACO_AUTOSUGGEST) + else { - if (cpt) - { - show_listbox(ac, cpt); - SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); - } - else + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + start = 0; + end = ac->enum_strs_num; + if (end == 0) return FALSE; } + cnt = end - start; + + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + for (; start < end; start++) + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); + + show_listbox(ac, cnt); + SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); return TRUE; } static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) { WCHAR *text; + BOOL expanded = FALSE; UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); if (flag != autoappend_flag_displayempty && len == 0) { if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, TRUE); return; } @@ -382,28 +465,31 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); - /* Reset it here to simplify the logic in aclist_expand for - empty strings, since it tracks changes using txtbackup, - and Reset needs to be called before IACList::Expand */ - IEnumString_Reset(ac->enumstr); if (ac->aclist) { - aclist_expand(ac, text); if (text[len - 1] == '\\' || text[len - 1] == '/') flag = autoappend_flag_no; + expanded = aclist_expand(ac, text); + } + if (expanded || !ac->enum_strs) + { + if (!expanded) IEnumString_Reset(ac->enumstr); + enumerate_strings(ac); } - /* Set txtbackup to point to text itself (which must not be released) */ + /* Set txtbackup to point to text itself (which must not be released), + and it must be done here since aclist_expand uses it to track changes */ heap_free(ac->txtbackup); ac->txtbackup = text; if (!display_matching_strs(ac, text, len, hwnd, flag)) - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, FALSE); } static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; + free_enum_strs(ac); if (ac->hwndListBox) DestroyWindow(ac->hwndListBox); IAutoComplete2_Release(&ac->IAutoComplete2_iface); @@ -421,7 +507,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT /* When pressing ESC, Windows hides the auto-suggest listbox, if visible */ if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBox)) { - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, FALSE); ac->no_fwd_char = 0x1B; /* ESC char */ return 0; } @@ -448,7 +534,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT } if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, TRUE); heap_free(text); return 0; } @@ -512,12 +598,12 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { case CB_SHOWDROPDOWN: if (This->options & ACO_AUTOSUGGEST) - hide_listbox(This, This->hwndListBox); + hide_listbox(This, This->hwndListBox, TRUE); return 0; case WM_KILLFOCUS: if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) { - hide_listbox(This, This->hwndListBox); + hide_listbox(This, This->hwndListBox, FALSE); } break; case WM_KEYDOWN: @@ -583,7 +669,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); - hide_listbox(This, hwnd); + hide_listbox(This, hwnd, TRUE); heap_free(msg); break; default: @@ -861,7 +947,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( if ((This->options & ACO_AUTOSUGGEST) && This->hwndEdit && !This->hwndListBox) create_listbox(This); else if (!(This->options & ACO_AUTOSUGGEST) && This->hwndListBox) - hide_listbox(This, This->hwndListBox); + hide_listbox(This, This->hwndListBox, TRUE); return hr; } -- 1.9.1

2 7

[PATCH v2] msi: Don't consider read-only drives when enumerating volumes.
by Pierre Schweitzer 05 Nov '18

05 Nov '18

Just fixing a stupid typo. As both Fabian & my patch do basically the same thing with different coding style, feel free to pick whichever you like ;-). -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 1

[PATCH] msi: In dialogs show show titlebar buttons
by Fabian Maurer 05 Nov '18

05 Nov '18

Implemented according to my tests on windows with a bunch of msi files: -All dialogs have a close box, which acts like cancel -Main Dialogs can have a minimize box -When clicking cancel, that new dialog must never have a minimize box Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46080 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6184da84f1..a3797c2c04 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3858,6 +3858,10 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_COMMAND: return msi_dialog_oncommand( dialog, wParam, (HWND)lParam ); + case WM_CLOSE: + /* Simulate escape press */ + return msi_dialog_oncommand(dialog, 2, NULL); + case WM_ACTIVATE: if( LOWORD(wParam) == WA_INACTIVE ) dialog->hWndFocus = GetFocus(); @@ -3903,10 +3907,13 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - style = WS_OVERLAPPED; + style = WS_OVERLAPPED | WS_SYSMENU; if( dialog->attributes & msidbDialogAttributesVisible ) style |= WS_VISIBLE; + if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) + style |= WS_MINIMIZEBOX; + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog ); -- 2.19.1

2 1

[PATCH] wshom: Split the command line before passing it to ShellExecuteEx.
by Hans Leidekker 05 Nov '18

05 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 34 ++++++++++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1aa353a17a..ca4f7ff899 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1218,12 +1218,37 @@ static inline BOOL is_optional_argument(const VARIANT *arg) return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } +static WCHAR *split_command( BSTR cmd, WCHAR **params ) +{ + WCHAR *ret, *ptr; + BOOL in_quotes = FALSE; + + if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + strcpyW( ret, cmd ); + + *params = NULL; + for (ptr = ret; *ptr; ptr++) + { + if (*ptr == '"') in_quotes = !in_quotes; + else if (*ptr == ' ' && !in_quotes) + { + *ptr = 0; + *params = ptr + 1; + break; + } + } + + return ret; +} + static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; + WCHAR *file, *params; VARIANT s; HRESULT hr; + BOOL ret; TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); @@ -1251,13 +1276,18 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, waitforprocess = V_I4(&w); } + if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY; + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; - info.lpFile = cmd; + info.lpFile = file; + info.lpParameters = params; info.nShow = V_I4(&s); - if (!ShellExecuteExW(&info)) + ret = ShellExecuteExW(&info); + heap_free( file ); + if (!ret) { TRACE("ShellExecute failed, %d\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 18ff4d6228..c1f9519ff8 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -66,6 +66,17 @@ static void test_wshshell(void) static const WCHAR path2W[] = {'P','A','T','H',0}; static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; + static const WCHAR cmdexeW[] = {'\\','c','m','d','.','e','x','e',0}; + static const WCHAR testdirW[] = {'w','s','h','o','m',' ','t','e','s','t',' ','d','i','r',0}; + static const WCHAR paramsW[] = + {' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\','n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmdW[] = + {'c','m','d','.','e','x','e',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmd2W[] = + {'"','c','m','d','.','e','x','e',' ','"',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + WCHAR path[MAX_PATH], path2[MAX_PATH], buf[MAX_PATH]; IWshEnvironment *env; IWshExec *shexec; IWshShell3 *sh3; @@ -82,7 +93,7 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval; + DWORD retval, attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -238,9 +249,53 @@ static void test_wshshell(void) hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); ok(retval == 10, "got %u\n", retval); + SysFreeString(str); + + V_VT(&arg2) = VT_BOOL; + V_BOOL(&arg2) = VARIANT_TRUE; + retval = 0xdeadbeef; + str = SysAllocString(cmdW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); SysFreeString(str); + retval = 0xdeadbeef; + str = SysAllocString(cmd2W); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, cmdexeW); + attrs = GetFileAttributesW(path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "cmd.exe not found\n"); + + /* copy cmd.exe to a path with spaces */ + GetTempPathW(ARRAY_SIZE(path2), path2); + lstrcatW(path2, testdirW); + CreateDirectoryW(path2, NULL); + lstrcatW(path2, cmdexeW); + CopyFileW(path, path2, FALSE); + + buf[0] = '"'; + lstrcpyW(buf + 1, path2); + buf[lstrlenW(buf)] = '"'; + lstrcpyW(buf + lstrlenW(path2) + 2, paramsW); + + retval = 0xdeadbeef; + str = SysAllocString(buf); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + DeleteFileW(path2); + path2[lstrlenW(path2) - lstrlenW(cmdexeW)] = 0; + RemoveDirectoryW(path2); + /* current directory */ if (0) /* crashes on native */ hr = IWshShell3_get_CurrentDirectory(sh3, NULL); -- 2.11.0

2 2

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 05 Nov '18

05 Nov '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 132 ++++++++++++++++++++++++++----------------------------- 1 file changed, 63 insertions(+), 69 deletions(-) diff --git a/po/ko.po b/po/ko.po index f80ede4c63..882acf574f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-30 20:17+0900\n" +"PO-Revision-Date: 2018-11-05 10:52+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -867,7 +867,7 @@ msgstr "" #: comdlg32.rc:36 msgid "Invalid character(s) in path" -msgstr "경로에 올바르지 않은 문자가 들어 있습니다." +msgstr "경로에 올바르지 않은 문자가 들어 있습니다" #: comdlg32.rc:37 msgid "" @@ -2438,16 +2438,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "인증서 내보내기 마법사를 완료했습니다." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "인증서 저장소 선택" +msgstr "인증서 선택" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "사용하고자 하는 인증서 저장소를 선택하십시오:" +msgstr "사용하고자 하는 인증서를 선택하십시오" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2968,20 +2964,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "참고: 이 인증서의 개인 키는 내보낼 수 없습니다." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "지정된 용도(&N):" +msgstr "지정된 용도" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "위치" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "인증서 저장소 선택" +msgstr "인증서 선택" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -9064,7 +9056,7 @@ msgstr "구성요소 설치 실패: %08x" #: urlmon.rc:52 msgid "Install (%d)" -msgstr "설치 (%D)" +msgstr "설치 (%d)" #: urlmon.rc:53 msgid "Install" @@ -10219,11 +10211,11 @@ msgid "" msgstr "" "<배치파일 이름>을 호출하는 것은 배치 파일 안에서 다른 배치 파일의\n" "명령을 실행하는 것입니다. 배치 파일이 끝나면, 제어권은 배치 파일을\n" -"호출한 배치 파일로 돌아갑니다. CALL 명령은 매개변수를 지원합니다.\n" -"\n" -"\n" -"기본 디렉터리, 환경 변수 등을 바꾸는 것은 호출자에게 상속됩니다.\n" +"호출한 배치 파일로 돌아갑니다.\n" +"CALL 명령은 매개변수를 지원합니다.\n" "\n" +"호출된 프로시저 안에서 기본 디렉터리, 환경 변수 등을 바꾸는 것은\n" +"호출자에게 상속됩니다.\n" #: cmd.rc:44 msgid "" @@ -10312,7 +10304,8 @@ msgid "" "\n" "GOTO has no effect when used interactively.\n" msgstr "" -"GOTO는 배치 파일 안에서 다른 구문으로 실행을 전환합니다.\n" +"GOTO 명령은 배치 파일 안에서 다른 구문으로 실행을\n" +"전환합니다.\n" "\n" "GOTO의 타겟인 레이블은 255자까지 가능합니다만, 공백은 포함하지 않을 수도\n" "있습니다(운영체제에 따라서 다를 수도 있습니다).\n" @@ -10566,7 +10559,8 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"프로그램을 시작하거나, 파일 확장자와 연관된 프로그램으로 문서를 엽니다.\n" +"프로그램을 시작하거나, 파일 확장자와 연관된 프로그램으로\n" +"문서를 엽니다.\n" "사용법:\n" "start [옵션] 프로그램_파일 이름 [...]\n" "start [옵션] 문서_파일 이름\n" @@ -12140,7 +12134,7 @@ msgstr "도움말은 가능하지않습니다." #: progman.rc:78 msgid "Unknown feature in %s" -msgstr "%s의 없는 특징" +msgstr "%s의 알 수 없는 특징" #: progman.rc:79 msgid "File `%s' exists. Not overwritten." @@ -12225,11 +12219,11 @@ msgstr "reg : 지원되지 않는 레지스트리 데이터 유형 [%1]\n" #: reg.rc:45 msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "reg : 옵션 [/d] 다음에 유효한 정수가 있어야 합니다.\n" +msgstr "reg : 옵션 [/d] 다음에 유효한 정수가 있어야 합니다\n" #: reg.rc:46 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg : 옵션 [/d] 다음에 유효한 16 진수 값이 있어야 합니다.\n" +msgstr "reg : 옵션 [/d] 다음에 유효한 16 진수 값이 있어야 합니다\n" #: reg.rc:47 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -12280,7 +12274,7 @@ msgstr "" #: reg.rc:60 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "검색 완료. 일치하는 항목 수: %1!d!\n" +msgstr "검색 완료. 일치하는 항목 수: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " @@ -12488,28 +12482,29 @@ msgstr "다중 문자열 편집" #: regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "모든 레지스트리 작업 명령 포함" +msgstr "전체 레지스트리 작업 명령이 포함되어 있습니다" #: regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "키의 값 편집 명령 포함" +msgstr "값 또는 키 편집에 대한 명령이 포함되어 있습니다" #: regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "레지스트리 창 사용자 정의하는 명령 포함" +msgstr "레지스트리 창 사용자 정의 명령이 포함되어 있습니다" #: regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "자주 사용하는 키 접근하는 명령 포함" +msgstr "자주 사용되는 키에 액세스하는 명령이 포함되어 있습니다" #: regedit.rc:163 msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "레지스트리 편집기 정보와 도움말 보여주는 명령 포함" +msgstr "" +"레지스트리 편집기에 대한 도움말 및 정보를 표시하기 위한 명령이 포함되어 있습니다" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "새 키나 값 만드는 명령 포함" +msgstr "새 키 또는 값을 만드는 명령이 포함되어 있습니다" #: regedit.rc:149 msgid "Data" @@ -12537,11 +12532,11 @@ msgstr "Win9x/NT4 레지스트리 파일 (REGEDIT4)" #: regedit.rc:241 msgid "(cannot display value)" -msgstr "(값을 보여 줄수 없음)" +msgstr "(값을 표시할 수 없음)" #: regedit.rc:242 msgid "(unknown %d)" -msgstr "( 없는 %d)" +msgstr "(알 수 없음: %d)" #: regedit.rc:247 msgid "Unable to modify the selected registry value." @@ -12650,11 +12645,11 @@ msgstr "" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: [%1](은)는 유효하지 않은 또는 없는 스위치입니다\n" +msgstr "regedit: [%1](은)는 유효하지 않거나 인식할 수 없는 스위치입니다\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "\"regedit /?\"를 입력해 도움말을 볼 수 있습니다.\n" +msgstr "도움말을 보려면 \"regedit /?\"를 입력하십시오.\n" #: regedit.rc:411 msgid "regedit: No filename was specified.\n" @@ -12662,7 +12657,7 @@ msgstr "regedit: 파일 이름이 지정되지 않았습니다.\n" #: regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "regedit: 제거 할 레지스트리 키가 지정되지 않았습니다.\n" +msgstr "regedit: 제거할 레지스트리 키가 지정되지 않았습니다.\n" #: regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" @@ -12674,11 +12669,11 @@ msgstr "regedit: '%1'(을)를 열 수 없습니다.\n" #: regedit.rc:415 msgid "regedit: Unhandled action.\n" -msgstr "regedit: 올바르지 않은 핸들 작업.\n" +msgstr "regedit: 처리되지 않은 작업.\n" #: regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "regedit: 메모리 초과! (%2!u!번째 줄, %1!S!, )\n" +msgstr "regedit: 메모리 초과! (%1!S!, line %2!u!)\n" #: regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" @@ -12693,19 +12688,19 @@ 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" -msgstr "regedit: [0x%1!x!](은)는 지원하지 않는 레지스트리 형태입니다\n" +msgstr "regedit: [0x%1!x!](은)는 지원하지 않는 레지스트리 데이터 유형입니다\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: '%1'(은)는 예상치 못한 마지막 문자입니다.\n" +msgstr "regedit: '%1' 라인이 예상대로 끝나지 않았습니다.\n" #: regedit.rc:422 msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: 명령줄 '%1'(을)를 인식할 수 없습니다.\n" +msgstr "regedit: '%1' 라인을 인식할 수 없습니다.\n" #: regedit.rc:423 msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" @@ -12713,13 +12708,13 @@ msgstr "regedit: 레지스트리 값 '%1'(을)를 '%2'에 더할 수 없습니 #: regedit.rc:424 msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: 레지스트리 키 '%1'를 열 수 없습니다.\n" +msgstr "regedit: 레지스트리 키 '%1'을(를) 열 수 없습니다.\n" #: regedit.rc:425 msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: '%2'의 형태는 [0x%1!x!](으)로 지원하지 않는 정보 형태입니다.\n" +"regedit: 지원하지 않는 레지스트리 데이터 유형 [0x%1!x!]이(가) '%2'에서 발생하였습니다.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12756,7 +12751,7 @@ msgstr "즐겨 찾기 목록에서 키 제거" #: regedit.rc:190 msgid "Shows or hides the status bar" -msgstr "상태 표시줄을 표시하거나 숨김니다" +msgstr "상태 표시줄을 표시하거나 숨깁니다" #: regedit.rc:191 msgid "Changes the position of the split between two panes" @@ -12780,7 +12775,7 @@ msgstr "선택한 키의 이름을 클립보드에 복사합니다" #: regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "키,값, 데이터에서 텍스트 문자열을 찾습니다" +msgstr "키, 값, 데이터에서 텍스트 문자열을 찾습니다" #: regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -12812,11 +12807,11 @@ msgstr "텍스트 파일을 레지스트리로 가져옵니다" #: regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "레지스트리의 전부나 일부분을 텍스트 파일로 내보내기" +msgstr "레지스트리 전부 또는 일부분을 텍스트 파일로 내보내기" #: regedit.rc:180 msgid "Prints all or part of the registry" -msgstr "레지스트리 전부나 부분 인쇄하기" +msgstr "레지스트리 전부 또는 일부분을 인쇄하기" #: regedit.rc:181 msgid "Opens Registry Editor Help" @@ -12824,15 +12819,15 @@ msgstr "레지스트리 편집기 도움말 열기" #: regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "프로그램 정보,버전, 저작권 보기" +msgstr "프로그램 정보, 버전, 저작권 보기" #: regedit.rc:206 msgid "Unable to query the registry value '%1'." -msgstr "레지스트리 값 '%1'를 찾을 수 없음." +msgstr "레지스트리 값 '%1'을(를) 찾을 수 없습니다." #: regedit.rc:207 msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "이 형식(%1!u!)의 값을 편집할 수 없습니다." +msgstr "(%1!u!) 유형의 값을 편집할 수 없습니다." #: regedit.rc:208 msgid "The value is too big (%1!u!)." @@ -12852,7 +12847,7 @@ msgstr "검색이 완료되었습니다. '%1' 문자열을 찾을 수 없습니 #: regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "이 값을 지우려는 것이 확실합니까?" +msgstr "이 값을 지우시겠습니까?" #: regedit.rc:214 msgid "New Key #%d" @@ -12864,19 +12859,19 @@ msgstr "새 값 #%d" #: regedit.rc:205 msgid "Unable to query the registry key '%1'." -msgstr "레지스트리 키 '%1'을(를) 쿼리할 수 없습니다." +msgstr "레지스트리 키 '%1'을(를) 질의할 수 없습니다." #: regedit.rc:170 msgid "Modifies the value's data in binary form" -msgstr "값의 데이터를 이진 형식으로 수정합니다" +msgstr "이 값의 데이터를 이진 형식으로 수정합니다" #: regedit.rc:175 msgid "Adds a new multi-string value" -msgstr "새 다중 문자열 값 추가" +msgstr "새 다중 문자열 값을 추가합니다" #: regedit.rc:198 msgid "Exports the selected branch of the registry to a text file" -msgstr "레지스트리의 선택된 부분을 텍스트 파일로 내보내기" +msgstr "레지스트리의 선택된 부분을 텍스트 파일로 내보냅니다" #: regedit.rc:176 msgid "Adds a new expandable string value" @@ -12932,8 +12927,7 @@ msgstr "" " [/s] 침묵 모드. 메시지를 표시하지 않습니다.\n" " [/i] DllInstall을 호출합니다. 선택적으로 [cmdline]을 전달합니다.\n" " [/u] 옵션을 함께 쓰면, 제거 모드에서 DllInstall을 호출합니다.\n" -" [/n] DllRegisterServer를 호출하지 않습니다. 이 옵션은 [/i]를 함께\n" -" 사용해야 합니다.\n" +" [/n] DllRegisterServer를 호출하지 않습니다. [/i]과 함께 사용합니다.\n" "\n" #: regsvr32.rc:41 @@ -13797,9 +13791,11 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"경고: 프로세스를 종료하면 데이터 손실 및 시스템 불안정관 같은\n" -"원하지 않는 결과가 발생할 수 있습니다. 프로세스는 종료되기 전에 상태\n" -"또는 데이터를 저장할 기회를 얻지 못합니다. 프로세스를 종료하시겠습니까?" +"경고: 프로세스를 종료하면 데이터 손실 및 시스템 불안정과\n" +"같은 원하지 않는 결과가 발생할 수 있습니다.\n" +"프로세스는 종료되기 전에 상태 또는 데이터를 저장할 기회를\n" +"얻지 못합니다.\n" +"프로세스를 종료하시겠습니까?" #: taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -13847,7 +13843,7 @@ msgstr "작업" #: uninstaller.rc:29 msgid "Wine Application Uninstaller" -msgstr "Wine Application Uninstaller" +msgstr "Wine 프로그램 삭제기" #: uninstaller.rc:30 msgid "" @@ -13900,13 +13896,11 @@ msgstr "" " uninstaller [옵션]\n" "\n" "옵션:\n" -" --help 지금 보고 있는 정보를 출력합니다.\n" -" --list 현재 실행한 Wine에 설치된 모든 프로그램의 목록을 출력합니다.\n" -" --remove {GUID}\n" -" 지정한 프로그램을 제거합니다. 프로그램의 GUID를 알아 내기\n" -" 위해서는 '--list' 옵션을 사용하십시오.\n" -"\n" -" 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" +" --help 지금 보고 있는 정보를 출력합니다.\n" +" --list 실행한 Wine에 설치된 모든 프로그램의 목록을 출력합니다.\n" +" --remove {GUID} 지정한 프로그램을 제거합니다. 프로그램의 GUID를 알아\n" +" 내기 위해서는 '--list' 옵션을 사용하십시오.\n" +" [옵션 없음] 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" "\n" #: view.rc:36 -- 2.19.1

1 0

[PATCH v3] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 05 Nov '18

05 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/address.c | 120 +++++++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 160 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 270 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 0bfa2bc..a6792f0 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -47,6 +47,22 @@ static char *heap_strdupA( const char *str ) return ret; } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) { if(This->comp_count == This->comp_array_size) @@ -258,20 +274,104 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + const static WCHAR semi[] = {';',0}; + const static WCHAR format_stringW[] = {'%', 's','=','%','s',0}; + const static WCHAR format_dword[] = {'%', 's','=','%','d',0}; + static const WCHAR format_guid[] = { '%', 's','=','%', '%','7','B', + '%','0','8','X','-','%','0','4','X','-','%','0','4','X','-','%','0','2', + 'X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0', + '2','X','%','0','2','X','%','%','7','D',0}; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + int position = strlenW(buffer); + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], semi); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + sprintfW( &buffer[position], format_guid, entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], entry->data.guid.Data4[3], + entry->data.guid.Data4[4], entry->data.guid.Data4[5], entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + break; + case DPNA_DATATYPE_STRING: + sprintfW(&buffer[position], format_stringW, entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + sprintfW(&buffer[position], format_dword, entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + { + WCHAR *str = heap_strdupAtoW(entry->data.ansi); + sprintfW(&buffer[position], format_stringW, entry->name, str); + heap_free(str); + break; + } + case DPNA_DATATYPE_BINARY: + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + if(size >= *length) + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, *length, NULL, NULL); + else + { + *length = size; + hr = DPNERR_BUFFERTOOSMALL; + } + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a1dcdef..613eda4 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -305,6 +305,164 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const WCHAR urlW1[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D',0 }; + static const WCHAR urlW2[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',0 }; + static const WCHAR urlW3[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',';','h','o','s','t','n','a','m','e','=','l', + 'o','c','a','l','h','o','s','t', 0 }; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == lstrlenW(urlW1)+1, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW1, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(bufflen == lstrlenW(urlW2)+1, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW2, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(bufflen == lstrlenW(urlW3)+1, "got %d\n", bufflen); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW3, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(bufflen == lstrlenA(urlA1)+1, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(bufflen == lstrlenA(urlA2)+1, "got %d\n", bufflen); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(bufflen == lstrlenA(urlA3)+1, "got %d\n", bufflen); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -382,6 +540,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 1.9.1

1 0

[PATCH 1/3] gdi32: Fix the truetype interpreter version problem.
by Byeongsik Jeon 05 Nov '18

05 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- This is also a problem in Linux. It just seemed to stand out in MacOS(Tahoma builtined) XQuartz2.7.11 Freetype2.7(subpixel turned off). The truetype bytecode interpreter of the Freetype appears to have the following problems depending on the version. - v35: MS cleartype font(ex. Consolas) rendering is ugly. - v40: MS legacy font (ex. Tahoma) rendering is ugly. Some fonts return the wrong values even for the glyph metrics. Is this a Freetype bug? Bagically NOT. https://docs.microsoft.com/en-us/typography/opentype/spec/tt_instructions#g… The bytecode interptreter is a stack-based virtual maching the interprets the truetype bytecode instructions. Ths bytecode program receives the interpreter version information through the GETINFO instruction. GETINFO also provided the information of the fontsmoothing, cleartype, etc. The bytecode program actually changes the location of the glyph points based on this information. So, what looks like a bug above is that the wrong version information was delivered to the bytecode program. To determine this version value, this patch use the gasp table version. This idea is inspired by the following documentation. https://www.freetype.org/freetype2/docs/reference/ft2-properties.html#TT_IN… -- Note that ‘Gray ClearType’ is essentially the same as v1.6's grayscale rendering. However, the GETINFO instruction handles it differently: v1.6 returns bit 12 (hinting for grayscale), while v2.1 returns bits 13 (hinting for ClearType), 18 (symmetrical smoothing), and 19 (Gray ClearType). Also, this mode respects bits 2 and 3 for the version 1 gasp table exclusively (like Color ClearType), while v1.6 only respects the values of version 0 (bits 0 and 1). -- I think the maximum value that can be applied to the gasp version 0 font is the interpreter version 37. The Freetype interpreter version 38 includes tweaks based on the font names. I was able to use the v38 by modifying the build option of the Freetype. #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) This allows the gasp version 0 fonts to be rendered more similar to the Windows old cleartype in the subpixel rendering mode. However, this is not applied because the build option must be modified and the Freetype document is marked as a feature to be deleted. To quickly check changes with the Freetype version up, I have added the WINE_GDI_PROPERTIES code. WINE_GDI_PROPERTIES="truetype:interpreter-version=35" winecfg dlls/gdi32/freetype.c | 69 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 07de6f2f6c..1e54e65ed4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -92,6 +92,15 @@ #ifdef FT_LCD_FILTER_H #include FT_LCD_FILTER_H #endif + +#ifdef FT_DRIVER_H +#include FT_DRIVER_H +#else +#ifdef FT_TRUETYPE_DRIVER_H /* Deprecated since version 2.9 */ +#include FT_TRUETYPE_DRIVER_H +#endif +#endif + #endif /* HAVE_FT2BUILD_H */ #include "windef.h" @@ -130,6 +139,7 @@ typedef struct } FT_Version_t; static FT_Version_t FT_Version; static DWORD FT_SimpleVersion; +static FT_UInt forced_interpreter_version = 0; static void *ft_handle = NULL; @@ -158,6 +168,8 @@ MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_Get_CBox); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); +MAKE_FUNCPTR(FT_Property_Get); +MAKE_FUNCPTR(FT_Property_Set); MAKE_FUNCPTR(FT_Render_Glyph); MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); @@ -399,6 +411,7 @@ struct tagGdiFont { DWORD total_kern_pairs; KERNINGPAIR *kern_pairs; struct list child_fonts; + FT_UInt interpreter_version; /* the following members can be accessed without locking, they are never modified after creation */ FT_Face ft_face; @@ -4101,6 +4114,20 @@ static void update_font_info(void) } } +static void set_forced_interpreter_version(void) +{ + static const char property_name[] = "truetype:interpreter-version="; + const char *env; + + env = getenv( "WINE_GDI_PROPERTIES" ); + if ( env && (env = strstr( env, property_name )) ) + { + forced_interpreter_version = atoi( env + sizeof(property_name) - 1 ); + + TRACE( "forced_interpreter_version = %d\n" , forced_interpreter_version ); + } +} + static BOOL init_freetype(void) { ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); @@ -4137,6 +4164,8 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_Get_CBox) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) + LOAD_FUNCPTR(FT_Property_Get) + LOAD_FUNCPTR(FT_Property_Set) LOAD_FUNCPTR(FT_Render_Glyph) LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) @@ -4164,6 +4193,8 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + set_forced_interpreter_version(); + font_driver = &freetype_funcs; return TRUE; @@ -5153,7 +5184,7 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } -static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) +static BOOL get_gasp_flags( GdiFont *font, WORD *flags, WORD *gasp_version ) { DWORD size; WORD buf[16]; /* Enough for seven ranges before we need to alloc */ @@ -5161,7 +5192,8 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) WORD num_recs, version; BOOL ret = FALSE; - *flags = 0; + if ( !flags && !gasp_version ) return FALSE; + size = get_font_data( font, MS_GASP_TAG, 0, NULL, 0 ); if (size == GDI_ERROR) return FALSE; if (size < 4 * sizeof(WORD)) return FALSE; @@ -5182,6 +5214,13 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) goto done; } + if (gasp_version) + *gasp_version = version; + + ret = TRUE; + if (!flags) goto done; + + *flags = 0; while (num_recs--) { *flags = GET_BE_WORD( *(ptr + 1) ); @@ -5189,7 +5228,6 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) ptr += 2; } TRACE( "got flags %04x for ppem %d\n", *flags, font->ft_face->size->metrics.y_ppem ); - ret = TRUE; done: HeapFree( GetProcessHeap(), 0, alloced ); @@ -5779,6 +5817,8 @@ found_face: done: if (ret) { + WORD gasp_version; + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); switch (lf.lfQuality) @@ -5810,7 +5850,7 @@ done: if ((!antialias_fakes || (!ret->fake_bold && !ret->fake_italic)) && is_hinting_enabled()) { WORD gasp_flags; - if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + if (get_gasp_flags( ret, &gasp_flags, NULL ) && !(gasp_flags & GASP_DOGRAY)) { TRACE( "font %s %d aa disabled by GASP\n", debugstr_w(lf.lfFaceName), lf.lfHeight ); @@ -5819,7 +5859,15 @@ done: } } } - TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); + + if (!forced_interpreter_version && get_gasp_flags( ret, NULL, &gasp_version )) + ret->interpreter_version = gasp_version == 0 ? TT_INTERPRETER_VERSION_35 + : TT_INTERPRETER_VERSION_40; + else + ret->interpreter_version = forced_interpreter_version; + + TRACE( "%p %s %d aa_flags %x interpreter_version %d\n", hfont, + debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags, ret->interpreter_version ); release_font( physdev->font ); physdev->font = ret; } @@ -7001,6 +7049,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; + /* FT_Property_Set and FT_Load_Glyph must be in the same locking section. */ + if (font->interpreter_version && pFT_Property_Set && pFT_Property_Get) + { + FT_UInt interpreter_version = 0; + + pFT_Property_Set( library, "truetype", "interpreter-version", &font->interpreter_version ); + pFT_Property_Get( library, "truetype", "interpreter-version", &interpreter_version ); + if ( interpreter_version != font->interpreter_version ) + FIXME( "truetype:interpreter-version: expected %d, got %d\n", + font->interpreter_version, interpreter_version ); + } err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); if(err) { -- 2.19.1

2 5

[PATCH] api-ms-win-core-processthreads-l1-1-3: Add dll.
by Andrey Gusev 04 Nov '18

04 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46086 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-3.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) create mode 100644 dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in create mode 100644 dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec diff --git a/configure b/configure index 5bf21e4ef7..9787693013 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 +enable_api_ms_win_core_processthreads_l1_1_3 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 @@ -19084,6 +19085,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-processenvironment-l1-2-0 enable_ap wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-3 enable_api_ms_win_core_processthreads_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-processtopology-obsolete-l1-1-0 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 diff --git a/configure.ac b/configure.ac index 878fa4c0fd..39a2310c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -2935,6 +2935,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processtopology-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in new file mode 100644 index 0000000000..520db5c2f8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-3.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec new file mode 100644 index 0000000000..756001f687 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -0,0 +1,10 @@ +@ stub GetProcessDefaultCpuSets +@ stub GetProcessInformation +@ stub GetSystemCpuSetInformation +@ stub GetThreadSelectedCpuSets +@ stub SetProcessDefaultCpuSets +@ stub SetProcessInformation +@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stub SetThreadSelectedCpuSets +@ stub GetThreadDescription +@ stub SetThreadDescription diff --git a/tools/make_specfiles b/tools/make_specfiles index 545d436308..aa5aad6076 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -302,6 +302,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-processthreads-l1-1-3", ], [ "kernel32", -- 2.17.2

1 0

[PATCH] api-ms-win-core-winrt-string-l1-1-1: Add dll.
by Andrey Gusev 04 Nov '18

04 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46085 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-winrt-string-l1-1-1.spec | 26 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 31 insertions(+) create mode 100644 dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec diff --git a/configure b/configure index 60ec9898a6..5bf21e4ef7 100755 --- a/configure +++ b/configure @@ -1028,6 +1028,7 @@ enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_registration_l1_1_0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 +enable_api_ms_win_core_winrt_string_l1_1_1 enable_api_ms_win_core_wow64_l1_1_0 enable_api_ms_win_core_wow64_l1_1_1 enable_api_ms_win_core_xstate_l1_1_0 @@ -19132,6 +19133,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core wine_fn_config_makefile dlls/api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_core_winrt_registration_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-winrt-string-l1-1-1 enable_api_ms_win_core_winrt_string_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-wow64-l1-1-0 enable_api_ms_win_core_wow64_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-wow64-l1-1-1 enable_api_ms_win_core_wow64_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-xstate-l1-1-0 enable_api_ms_win_core_xstate_l1_1_0 diff --git a/configure.ac b/configure.ac index 82a3c46a24..878fa4c0fd 100644 --- a/configure.ac +++ b/configure.ac @@ -2984,6 +2984,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-registration-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-string-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-string-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-wow64-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-wow64-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-xstate-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in new file mode 100644 index 0000000000..df4284a85c --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-string-l1-1-1.dll diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec b/dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec new file mode 100644 index 0000000000..bb11ca2d53 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec @@ -0,0 +1,26 @@ +@ stub HSTRING_UserFree +@ stub HSTRING_UserFree64 +@ stub HSTRING_UserMarshal +@ stub HSTRING_UserMarshal64 +@ stub HSTRING_UserSize +@ stub HSTRING_UserSize64 +@ stub HSTRING_UserUnmarshal +@ stub HSTRING_UserUnmarshal64 +@ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) combase.WindowsCompareStringOrdinal +@ stdcall WindowsConcatString(ptr ptr ptr) combase.WindowsConcatString +@ stdcall WindowsCreateString(wstr long ptr) combase.WindowsCreateString +@ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference +@ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString +@ stdcall WindowsDeleteStringBuffer(ptr) combase.WindowsDeleteStringBuffer +@ stdcall WindowsDuplicateString(ptr ptr) combase.WindowsDuplicateString +@ stdcall WindowsGetStringLen(ptr) combase.WindowsGetStringLen +@ stdcall WindowsGetStringRawBuffer(ptr ptr) combase.WindowsGetStringRawBuffer +@ stdcall WindowsIsStringEmpty(ptr) combase.WindowsIsStringEmpty +@ stdcall WindowsPreallocateStringBuffer(long ptr ptr) combase.WindowsPreallocateStringBuffer +@ stdcall WindowsPromoteStringBuffer(ptr ptr) combase.WindowsPromoteStringBuffer +@ stub WindowsReplaceString +@ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull +@ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring +@ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) combase.WindowsSubstringWithSpecifiedLength +@ stdcall WindowsTrimStringEnd(ptr ptr ptr) combase.WindowsTrimStringEnd +@ stdcall WindowsTrimStringStart(ptr ptr ptr) combase.WindowsTrimStringStart diff --git a/tools/make_specfiles b/tools/make_specfiles index 7d4a85bdc3..545d436308 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -445,6 +445,7 @@ my @dll_groups = "api-ms-win-core-winrt-registration-l1-1-0", "api-ms-win-core-winrt-roparameterizediid-l1-1-0", "api-ms-win-core-winrt-string-l1-1-0", + "api-ms-win-core-winrt-string-l1-1-1", ], [ "uxtheme", -- 2.17.2

1 0