- wine-devel - 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

[PATCH 4/4] gdiplus: Convert to 32bppARGB when indexed color PNG image with transparency is loaded.
by Akihiro Sagawa 04 Nov '18

04 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44409 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/image.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-)

2 1

[PATCH 3/4] gdiplus/tests: Add more PNG color format tests.
by Akihiro Sagawa 04 Nov '18

04 Nov '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/tests/image.c | 235 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 195 insertions(+), 40 deletions(-)

2 1

[PATCH resend 1/3] mfplat: Move IMFAttributes interface up to avoid forward declarations.
by Sven Baars 03 Nov '18

03 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mfplat/main.c | 666 ++++++++++++++++++++++----------------------- 1 file changed, 333 insertions(+), 333 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..598072121d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -448,339 +448,6 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } -typedef struct _mfbytestream -{ - IMFByteStream IMFByteStream_iface; - LONG ref; -} mfbytestream; - -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) -{ - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); -} - -static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFByteStream)) - { - *out = &This->IMFByteStream_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, capabilities); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, length); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, endstream); - - if(endstream) - *endstream = TRUE; - - return S_OK; -} - -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, - DWORD flags, QWORD *current) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static const IMFByteStreamVtbl mfbytesteam_vtbl = -{ - mfbytestream_QueryInterface, - mfbytestream_AddRef, - mfbytestream_Release, - mfbytestream_GetCapabilities, - mfbytestream_GetLength, - mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, - mfbytestream_Read, - mfbytestream_BeginRead, - mfbytestream_EndRead, - mfbytestream_Write, - mfbytestream_BeginWrite, - mfbytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close -}; - -HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) -{ - mfbytestream *object; - - TRACE("(%p, %p): stub\n", stream, bytestream); - - object = heap_alloc( sizeof(*object) ); - if(!object) - return E_OUTOFMEMORY; - - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; - - *bytestream = &object->IMFByteStream_iface; - - return S_OK; -} - -static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { - TRACE("(IID_IMFPluginControl %p)\n", ppv); - *ppv = iface; - }else { - FIXME("(%s %p)\n", debugstr_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) -{ - TRACE("\n"); - return 2; -} - -static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) -{ - TRACE("\n"); - return 1; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, CLSID *clsid) -{ - FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, - DWORD index, WCHAR **selector, CLSID *clsid) -{ - FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, const CLSID *clsid) -{ - FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) -{ - FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) -{ - FIXME("(%d %d %p)\n", plugin_type, index, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) -{ - FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); - return E_NOTIMPL; -} - -static const IMFPluginControlVtbl MFPluginControlVtbl = { - MFPluginControl_QueryInterface, - MFPluginControl_AddRef, - MFPluginControl_Release, - MFPluginControl_GetPreferredClsid, - MFPluginControl_GetPreferredClsidByIndex, - MFPluginControl_SetPreferredClsid, - MFPluginControl_IsDisabled, - MFPluginControl_GetDisabledByIndex, - MFPluginControl_SetDisabled -}; - -static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; - -/*********************************************************************** - * MFGetPluginControl (mfplat.@) - */ -HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) -{ - TRACE("(%p)\n", ret); - - *ret = &plugin_control; - return S_OK; -} - typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; @@ -1178,6 +845,339 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) return S_OK; } +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { + TRACE("(IID_IMFPluginControl %p)\n", ppv); + *ppv = iface; + }else { + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, CLSID *clsid) +{ + FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, + DWORD index, WCHAR **selector, CLSID *clsid) +{ + FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, const CLSID *clsid) +{ + FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) +{ + FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) +{ + FIXME("(%d %d %p)\n", plugin_type, index, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) +{ + FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + return E_NOTIMPL; +} + +static const IMFPluginControlVtbl MFPluginControlVtbl = { + MFPluginControl_QueryInterface, + MFPluginControl_AddRef, + MFPluginControl_Release, + MFPluginControl_GetPreferredClsid, + MFPluginControl_GetPreferredClsidByIndex, + MFPluginControl_SetPreferredClsid, + MFPluginControl_IsDisabled, + MFPluginControl_GetDisabledByIndex, + MFPluginControl_SetDisabled +}; + +static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; + +/*********************************************************************** + * MFGetPluginControl (mfplat.@) + */ +HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) +{ + TRACE("(%p)\n", ret); + + *ret = &plugin_control; + return S_OK; +} + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; -- 2.17.1

1 2

[PATCH] msi: Don't show read-only volumes
by Fabian Maurer 03 Nov '18

03 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46081 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a3797c2c04..ce73b4dcd7 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3289,7 +3289,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; - DWORD size; + DWORD size, flags; int i = 0; cost = msi_vcl_get_cost(dialog); @@ -3306,6 +3306,15 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { + if (!GetVolumeInformationW(ptr, NULL, 0, NULL, NULL, &flags, NULL, 0)) + ERR("GetVolumeInformationW failed: %d\n", GetLastError()); + + if (flags & FILE_READ_ONLY_VOLUME) + { + ptr += lstrlenW(ptr) + 1; + continue; + } + lvitem.mask = LVIF_TEXT; lvitem.iItem = i; lvitem.iSubItem = 0; -- 2.19.1

1 0

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

03 Nov '18

Hi, Please find attached a patch that avoids listing read-only volumes when enumerating drives in MSI dialog (displaying free disk space for volumes, and so on). This matches Windows behavior, even though I'm not sure how to test it. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH v6 1/3] mscoree: Add test for registration-less COM components
by Fabian Maurer 03 Nov '18

03 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v5: check for admin rights before trying to write into system32 fix test failure on xp. dll can't be in same folder as manifest give test runs better names v6: Fix test failure by compiling into temp folder and then moving file --- dlls/mscoree/tests/Makefile.in | 6 +- dlls/mscoree/tests/comtest.c | 356 ++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 23 ++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 33 +++ dlls/mscoree/tests/resource.rc | 30 ++ 7 files changed, 474 insertions(+), 1 deletion(-) create mode 100644 dlls/mscoree/tests/comtest.c create mode 100644 dlls/mscoree/tests/comtest.cs create mode 100644 dlls/mscoree/tests/comtest_dll.manifest create mode 100644 dlls/mscoree/tests/comtest_exe.manifest create mode 100644 dlls/mscoree/tests/interfaces.idl create mode 100644 dlls/mscoree/tests/resource.rc diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7c1ba5cb11..f65e1bc6c2 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,7 +1,11 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid +IMPORTS = ole32 shlwapi uuid shell32 C_SRCS = \ + comtest.c \ debugging.c \ metahost.c \ mscoree.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c new file mode 100644 index 0000000000..e9812eb6b9 --- /dev/null +++ b/dlls/mscoree/tests/comtest.c @@ -0,0 +1,356 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "mscoree.h" +#include "corerror.h" +#include "shlwapi.h" +#include "shlobj.h" + +#include "wine/test.h" + +#include "initguid.h" +#include "interfaces.h" + +HMODULE hmscoree; + +typedef enum _run_type +{ + run_type_current_working_directory = 0, + run_type_exe_directory, + run_type_system32, +} run_type; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static BOOL compile_cs_to_dll(char *source_path, char *dest_path) +{ + const char *path_csc = "C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + char cmdline[MAX_PATH]; + char path_temp[MAX_PATH] = {0}; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + if (!PathFileExistsA(path_csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + GetTempPathA(MAX_PATH, path_temp); + PathAppendA(path_temp, "comtest.dll"); + + sprintf(cmdline, "%s /t:library /out:\"%s\" \"%s\"", path_csc, path_temp, source_path); + + si.cb = sizeof(si); + ret = CreateProcessA(path_csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + WaitForSingleObject(pi.hProcess, 5000); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsA(path_temp); + ok(ret, "Compilation failed\n"); + + ret = MoveFileA(path_temp, dest_path); + ok(ret, "Moving temporary file failed\n"); + return ret; +} + +static void run_test(BOOL expect_success) +{ + typedef HRESULT (WINAPI *_DllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + ITest *test = NULL; + HRESULT hr; + _DllGetClassObject getClassObject; + IClassFactory *classFactory = NULL; + HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + getClassObject = (_DllGetClassObject)GetProcAddress(hmscoree, "DllGetClassObject"); + hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); + todo_wine_if(!expect_success) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + ITest *test2 = NULL; + hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test2, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test2); + } + IClassFactory_Release(classFactory); + } +} + +static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + + GetTempPathA(MAX_PATH, path_tmp); + + switch (run) + { + case run_type_current_working_directory: + strcpy(path_dll, path_tmp); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_exe_directory: + GetModuleFileNameA(NULL, path_dll, path_dll_size); + PathRemoveFileSpecA(path_dll); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_system32: + GetSystemDirectoryA(path_dll, path_dll_size); + PathAppendA(path_dll, "comtest.dll"); + break; + } +} +static void prepare_and_run_test(const char *dll_source, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + char path_tmp_manifest[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_dll_source[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetTempPathA(MAX_PATH, path_tmp); + GetTempPathA(MAX_PATH, path_tmp_manifest); + PathAppendA(path_tmp_manifest, "manifests"); + + CreateDirectoryA(path_tmp_manifest, NULL); + + if (run == run_type_system32) + { + if (!IsUserAnAdmin()) + { + skip("Can't test dll in system32 due to user not being admin.\n"); + return; + } + } + + if (!write_resource_file(path_tmp, dll_source, "comtest.cs", path_dll_source)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!compile_cs_to_dll(path_dll_source, path_dll)) + goto cleanup; + + if (!write_resource_file(path_tmp_manifest, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp_manifest, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp_manifest; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run: %d, CreateActCtxA failed: %d\n", run, GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + ok(0, "run: %d, Failed to create activation context\n", run); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run: %d, ActivateActCtx failed: %d\n", run, GetLastError()); + + if (run == run_type_current_working_directory) + SetCurrentDirectoryA(path_tmp); + + run_test(run == run_type_exe_directory); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run: %d, DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_dll_source) + { + success = DeleteFileA(path_dll_source); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + RemoveDirectoryA(path_tmp_manifest); + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + + +static void cleanup_test(run_type run) +{ + char path_dll[MAX_PATH] = {0}; + BOOL success; + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!PathFileExistsA(path_dll)) + return; + + success = DeleteFileA(path_dll); + if (!success) + { + Sleep(500); + success = DeleteFileA(path_dll); + } + ok(success, "DeleteFileA failed: %d\n", GetLastError()); +} + +static void run_child_process(const char *dll_source, run_type run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %s %d", argv[0], argv[1], dll_source, run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_test(run); +} + +START_TEST(comtest) +{ + int argc; + char **argv; + + CoInitialize(NULL); + + hmscoree = LoadLibraryA("mscoree.dll"); + if (!hmscoree) + { + skip(".NET or mono not available\n"); + return; + } + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + const char *dll_source = argv[2]; + run_type run = atoi(argv[3]); + prepare_and_run_test(dll_source, run); + + goto cleanup; + } + + run_child_process("comtest.cs", run_type_current_working_directory); + run_child_process("comtest.cs", run_type_exe_directory); + run_child_process("comtest.cs", run_type_system32); + +cleanup: + FreeLibrary(hmscoree); + CoUninitialize(); +} diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs new file mode 100644 index 0000000000..4fe2a718b2 --- /dev/null +++ b/dlls/mscoree/tests/comtest.cs @@ -0,0 +1,23 @@ +/* Compile with + csc /target:library /out:dll.dll comtest.cs +*/ + +using System.Runtime.InteropServices; + +namespace DLL +{ + [Guid("1dbc4491-080d-45c5-a15d-1e3c4610bdd9"), ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest + { + void Func(ref int i); + } + + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] + public class Test : ITest + { + public void Func(ref int i) + { + i = 42; + } + } +} diff --git a/dlls/mscoree/tests/comtest_dll.manifest b/dlls/mscoree/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/mscoree/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/mscoree/tests/comtest_exe.manifest b/dlls/mscoree/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/mscoree/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/mscoree/tests/interfaces.idl b/dlls/mscoree/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/mscoree/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc new file mode 100644 index 0000000000..9a1b89f656 --- /dev/null +++ b/dlls/mscoree/tests/resource.rc @@ -0,0 +1,30 @@ +/* + * Resources for mscoree test suite. + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: comtest.cs */ +comtest.cs RCDATA comtest.cs + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest -- 2.18.0

2 6

[PATCH resend 1/3] mfplat: Move IMFAttributes interface up to avoid forward declarations.
by Sven Baars 02 Nov '18

02 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch and the next one are patch 153340 split into two parts. This one just moves the IMFAttributes interface up to avoid forward declarations in the next patch. dlls/mfplat/main.c | 666 ++++++++++++++++++++++----------------------- 1 file changed, 333 insertions(+), 333 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..598072121d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -448,339 +448,6 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } -typedef struct _mfbytestream -{ - IMFByteStream IMFByteStream_iface; - LONG ref; -} mfbytestream; - -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) -{ - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); -} - -static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFByteStream)) - { - *out = &This->IMFByteStream_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, capabilities); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, length); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, endstream); - - if(endstream) - *endstream = TRUE; - - return S_OK; -} - -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, - DWORD flags, QWORD *current) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static const IMFByteStreamVtbl mfbytesteam_vtbl = -{ - mfbytestream_QueryInterface, - mfbytestream_AddRef, - mfbytestream_Release, - mfbytestream_GetCapabilities, - mfbytestream_GetLength, - mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, - mfbytestream_Read, - mfbytestream_BeginRead, - mfbytestream_EndRead, - mfbytestream_Write, - mfbytestream_BeginWrite, - mfbytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close -}; - -HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) -{ - mfbytestream *object; - - TRACE("(%p, %p): stub\n", stream, bytestream); - - object = heap_alloc( sizeof(*object) ); - if(!object) - return E_OUTOFMEMORY; - - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; - - *bytestream = &object->IMFByteStream_iface; - - return S_OK; -} - -static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { - TRACE("(IID_IMFPluginControl %p)\n", ppv); - *ppv = iface; - }else { - FIXME("(%s %p)\n", debugstr_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) -{ - TRACE("\n"); - return 2; -} - -static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) -{ - TRACE("\n"); - return 1; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, CLSID *clsid) -{ - FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, - DWORD index, WCHAR **selector, CLSID *clsid) -{ - FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, const CLSID *clsid) -{ - FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) -{ - FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) -{ - FIXME("(%d %d %p)\n", plugin_type, index, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) -{ - FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); - return E_NOTIMPL; -} - -static const IMFPluginControlVtbl MFPluginControlVtbl = { - MFPluginControl_QueryInterface, - MFPluginControl_AddRef, - MFPluginControl_Release, - MFPluginControl_GetPreferredClsid, - MFPluginControl_GetPreferredClsidByIndex, - MFPluginControl_SetPreferredClsid, - MFPluginControl_IsDisabled, - MFPluginControl_GetDisabledByIndex, - MFPluginControl_SetDisabled -}; - -static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; - -/*********************************************************************** - * MFGetPluginControl (mfplat.@) - */ -HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) -{ - TRACE("(%p)\n", ret); - - *ret = &plugin_control; - return S_OK; -} - typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; @@ -1178,6 +845,339 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) return S_OK; } +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { + TRACE("(IID_IMFPluginControl %p)\n", ppv); + *ppv = iface; + }else { + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, CLSID *clsid) +{ + FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, + DWORD index, WCHAR **selector, CLSID *clsid) +{ + FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, const CLSID *clsid) +{ + FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) +{ + FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) +{ + FIXME("(%d %d %p)\n", plugin_type, index, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) +{ + FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + return E_NOTIMPL; +} + +static const IMFPluginControlVtbl MFPluginControlVtbl = { + MFPluginControl_QueryInterface, + MFPluginControl_AddRef, + MFPluginControl_Release, + MFPluginControl_GetPreferredClsid, + MFPluginControl_GetPreferredClsidByIndex, + MFPluginControl_SetPreferredClsid, + MFPluginControl_IsDisabled, + MFPluginControl_GetDisabledByIndex, + MFPluginControl_SetDisabled +}; + +static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; + +/*********************************************************************** + * MFGetPluginControl (mfplat.@) + */ +HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) +{ + TRACE("(%p)\n", ret); + + *ret = &plugin_control; + return S_OK; +} + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; -- 2.17.1

2 7

[PATCH 1/3] mfplat: Move IMFAttributes interface up to avoid forward declarations.
by Sven Baars 02 Nov '18

02 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch and the next one are patch 153340 split into two parts. This one just moves the IMFAttributes interface up to avoid forward declarations in the next patch. dlls/mfplat/main.c | 666 ++++++++++++++++++++++----------------------- 1 file changed, 333 insertions(+), 333 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..598072121d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -448,339 +448,6 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } -typedef struct _mfbytestream -{ - IMFByteStream IMFByteStream_iface; - LONG ref; -} mfbytestream; - -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) -{ - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); -} - -static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFByteStream)) - { - *out = &This->IMFByteStream_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, capabilities); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, length); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, endstream); - - if(endstream) - *endstream = TRUE; - - return S_OK; -} - -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, - DWORD flags, QWORD *current) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static const IMFByteStreamVtbl mfbytesteam_vtbl = -{ - mfbytestream_QueryInterface, - mfbytestream_AddRef, - mfbytestream_Release, - mfbytestream_GetCapabilities, - mfbytestream_GetLength, - mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, - mfbytestream_Read, - mfbytestream_BeginRead, - mfbytestream_EndRead, - mfbytestream_Write, - mfbytestream_BeginWrite, - mfbytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close -}; - -HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) -{ - mfbytestream *object; - - TRACE("(%p, %p): stub\n", stream, bytestream); - - object = heap_alloc( sizeof(*object) ); - if(!object) - return E_OUTOFMEMORY; - - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; - - *bytestream = &object->IMFByteStream_iface; - - return S_OK; -} - -static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { - TRACE("(IID_IMFPluginControl %p)\n", ppv); - *ppv = iface; - }else { - FIXME("(%s %p)\n", debugstr_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) -{ - TRACE("\n"); - return 2; -} - -static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) -{ - TRACE("\n"); - return 1; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, CLSID *clsid) -{ - FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, - DWORD index, WCHAR **selector, CLSID *clsid) -{ - FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, const CLSID *clsid) -{ - FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) -{ - FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) -{ - FIXME("(%d %d %p)\n", plugin_type, index, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) -{ - FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); - return E_NOTIMPL; -} - -static const IMFPluginControlVtbl MFPluginControlVtbl = { - MFPluginControl_QueryInterface, - MFPluginControl_AddRef, - MFPluginControl_Release, - MFPluginControl_GetPreferredClsid, - MFPluginControl_GetPreferredClsidByIndex, - MFPluginControl_SetPreferredClsid, - MFPluginControl_IsDisabled, - MFPluginControl_GetDisabledByIndex, - MFPluginControl_SetDisabled -}; - -static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; - -/*********************************************************************** - * MFGetPluginControl (mfplat.@) - */ -HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) -{ - TRACE("(%p)\n", ret); - - *ret = &plugin_control; - return S_OK; -} - typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; @@ -1178,6 +845,339 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) return S_OK; } +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { + TRACE("(IID_IMFPluginControl %p)\n", ppv); + *ppv = iface; + }else { + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, CLSID *clsid) +{ + FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, + DWORD index, WCHAR **selector, CLSID *clsid) +{ + FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, const CLSID *clsid) +{ + FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) +{ + FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) +{ + FIXME("(%d %d %p)\n", plugin_type, index, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) +{ + FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + return E_NOTIMPL; +} + +static const IMFPluginControlVtbl MFPluginControlVtbl = { + MFPluginControl_QueryInterface, + MFPluginControl_AddRef, + MFPluginControl_Release, + MFPluginControl_GetPreferredClsid, + MFPluginControl_GetPreferredClsidByIndex, + MFPluginControl_SetPreferredClsid, + MFPluginControl_IsDisabled, + MFPluginControl_GetDisabledByIndex, + MFPluginControl_SetDisabled +}; + +static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; + +/*********************************************************************** + * MFGetPluginControl (mfplat.@) + */ +HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) +{ + TRACE("(%p)\n", ret); + + *ret = &plugin_control; + return S_OK; +} + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; -- 2.17.1

2 4

[PATCH 3/3] mpr: Implement support for deleting persistent, connections.
by Pierre Schweitzer 02 Nov '18

02 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 2/3] mpr: Implement support for making connections persistent.
by Pierre Schweitzer 02 Nov '18

02 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 1/2] widl: Check for actual function name when handling call_as attribute.
by Jacek Caban 02 Nov '18

02 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/2] crypt32: Add support for 3rd party CSPs to CertGetPublicKeyLength.
by Dmitry Timoshkov 02 Nov '18

02 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c44e4bc30b..faf70de607 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1317,9 +1317,30 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, } else { + PCCRYPT_OID_INFO info; DWORD size; PBYTE buf; - BOOL ret = CryptDecodeObjectEx(dwCertEncodingType, + BOOL ret; + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, pPublicKey->Algorithm.pszObjId, 0); + if (info) + { + HCRYPTKEY key; + + TRACE("public key algid %#x (%s)\n", info->u.Algid, debugstr_a(pPublicKey->Algorithm.pszObjId)); + + ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(0), dwCertEncodingType, pPublicKey, &key); + if (ret) + { + size = sizeof(len); + ret = CryptGetKeyParam(key, KP_KEYLEN, (BYTE *)&len, &size, 0); + CryptDestroyKey(key); + return len; + } + /* fallback to RSA */ + } + + ret = CryptDecodeObjectEx(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pPublicKey->PublicKey.pbData, pPublicKey->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); -- 2.17.1

1 0

[PATCH 1/2] crypt32: Directly call I_CryptGetDefaultCryptProv to make hooking from a 3rd party CSP work.
by Dmitry Timoshkov 02 Nov '18

02 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 10 +++++----- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/main.c | 2 +- dlls/crypt32/msg.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a7a2605e6b..c44e4bc30b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2169,7 +2169,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); if (!Algid) Algid = CALG_SHA1; if (ret) @@ -2198,7 +2198,7 @@ BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, dwCertEncodingType, pInfo, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); if (!Algid) Algid = CALG_MD5; if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING) @@ -2250,7 +2250,7 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv, HCRYPTHASH hHash; if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, info->SignatureAlgorithm.pszObjId, 0); if (!oidInfo) @@ -2299,7 +2299,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, if (info->dwGroupId == CRYPT_HASH_ALG_OID_GROUP_ID) { if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash); if (ret) { @@ -2423,7 +2423,7 @@ static BOOL CRYPT_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEnco pubKeyID = hashID; /* Load the default provider if necessary */ if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, pubKeyInfo, pubKeyID, 0, NULL, &key); if (ret) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index e58db989b7..c6e20120fc 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -149,7 +149,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, /* Returns a handle to the default crypto provider; loads it if necessary. * Returns NULL on failure. */ -HCRYPTPROV CRYPT_GetDefaultProvider(void) DECLSPEC_HIDDEN; +HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD); HINSTANCE hInstance DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d93fb91677..d37bf4a712 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) return TRUE; } -HCRYPTPROV CRYPT_GetDefaultProvider(void) +static HCRYPTPROV CRYPT_GetDefaultProvider(void) { if (!hDefProv) { diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 005fbf2c1f..f37c462aa9 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -567,7 +567,7 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, prov = info->hCryptProv; else { - prov = CRYPT_GetDefaultProvider(); + prov = I_CryptGetDefaultCryptProv(0); dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CHashEncodeMsg)); @@ -1956,7 +1956,7 @@ static HCRYPTMSG CEnvelopedEncodeMsg_Open(DWORD dwFlags, prov = info->hCryptProv; else { - prov = CRYPT_GetDefaultProvider(); + prov = I_CryptGetDefaultCryptProv(0); dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CEnvelopedEncodeMsg)); @@ -3545,7 +3545,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = hCryptProv; else { - msg->crypt_prov = CRYPT_GetDefaultProvider(); + msg->crypt_prov = I_CryptGetDefaultCryptProv(0); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } memset(&msg->u, 0, sizeof(msg->u)); -- 2.17.1

1 0

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

02 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 | 209 +++++++++++++++++++++++++++++++------------- 1 file changed, 148 insertions(+), 61 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b3f86f3..d557a4a 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; } @@ -240,7 +325,11 @@ 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]; + WCHAR c; + free_enum_strs(ac); + IEnumString_Reset(ac->enumstr); /* call before expand */ + + c = last_delim[1]; 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,58 @@ 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, i, k; + 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); + i = find_matching_enum_str(ac, 0, text, len, -1); + if (i == ~0) + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (flag == autoappend_flag_yes) + autoappend_str(ac, text, len, str[i], hwnd); + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + + /* Find the index beyond the last string that matches */ + k = find_matching_enum_str(ac, i + 1, text, len, 1); + k = (k == ~0 ? i : k) + 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; + i = 0; + k = ac->enum_strs_num; + if (k == 0) return FALSE; } + cnt = k - i; + + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + do + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[i]); + while (++i < k); + + 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 +466,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 +508,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 +535,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 +599,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 +670,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 +948,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 6

[PATCH 1/2] widl: Correctly handle conformant arrays in clear_output_vars().
by Zebediah Figura 02 Nov '18

02 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes the test failure with the following patch reported here: https://www.winehq.org/pipermail/wine-devel/2018-November/134397.html tools/widl/proxy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c56ef48d2b..12424d9eab 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -110,7 +110,13 @@ static void clear_output_vars( const var_list_t *args ) if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_BASIC) continue; if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_ENUM) continue; } - print_proxy( "if (%s) MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name, arg->name ); + print_proxy( "if (%s) MIDL_memset( %s, 0, ", arg->name, arg->name ); + if (is_array(arg->type) && type_array_has_conformance(arg->type)) + { + write_expr( proxy, type_array_get_conformance(arg->type), 1, 1, NULL, NULL, "" ); + fprintf( proxy, " * " ); + } + fprintf( proxy, "sizeof( *%s ));\n", arg->name ); } } -- 2.19.1

2 3

[PATCH] msi: Avoid duplicate product codes in FindRelatedProducts.
by Hans Leidekker 02 Nov '18

02 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/upgrade.c | 68 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 36d65be8fe..034d891c1f 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -55,45 +55,59 @@ static BOOL check_language(DWORD lang1, LPCWSTR lang2, DWORD attributes) return (lang1 == langdword); } -static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, - LPCWSTR productid) +static BOOL find_product( const WCHAR *list, const WCHAR *product ) { - LPWSTR prop; - LPWSTR newprop; - DWORD len; - UINT r; - - prop = msi_dup_property(package->db, action_property ); - if (prop) - len = strlenW(prop); - else - len = 0; + const WCHAR *p = list, *q; - /*separator*/ - len ++; + if (!list) return FALSE; + for (;;) + { + while (*p && *p != '{') p++; + if (*p != '{') return FALSE; + q = p; + while (*q && *q != '}') q++; + if (*q != '}') return FALSE; + q++; + if (q - p < strlenW( product )) return FALSE; + if (!memcmp( p, product, (q - p) * sizeof(WCHAR) )) return TRUE; + p = q + 1; + while (*p && *p != ';') p++; + if (*p != ';') break; + } - len += strlenW(productid); + return FALSE; +} - /*null*/ - len++; +static void append_productcode( MSIPACKAGE *package, const WCHAR *action_prop, const WCHAR *product ) +{ + WCHAR *prop, *newprop; + DWORD len = 0; + UINT r; - newprop = msi_alloc( len*sizeof(WCHAR) ); + prop = msi_dup_property( package->db, action_prop ); + if (find_product( prop, product )) + { + TRACE( "related product property %s already contains %s\n", debugstr_w(action_prop), debugstr_w(product) ); + msi_free( prop ); + return; + } + if (prop) len += strlenW( prop ); + len += strlenW( product ) + 2; + if (!(newprop = msi_alloc( len * sizeof(WCHAR) ))) return; if (prop) { - strcpyW(newprop,prop); - strcatW(newprop,szSemiColon); + strcpyW( newprop, prop ); + strcatW( newprop, szSemiColon ); } - else - newprop[0] = 0; - strcatW(newprop,productid); + else newprop[0] = 0; + strcatW( newprop, product ); - r = msi_set_property( package->db, action_property, newprop, -1 ); - if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) + r = msi_set_property( package->db, action_prop, newprop, -1 ); + if (r == ERROR_SUCCESS && !strcmpW( action_prop, szSourceDir )) msi_reset_source_folders( package ); - TRACE("Found Related Product... %s now %s\n", - debugstr_w(action_property), debugstr_w(newprop)); + TRACE( "related product property %s now %s\n", debugstr_w(action_prop), debugstr_w(newprop) ); msi_free( prop ); msi_free( newprop ); -- 2.11.0

1 0

[PATCH] d3d11/tests: Add test for SO statistics queries.
by Józef Kucia 02 Nov '18

02 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 632ef4f35382..0174289879bc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5789,6 +5789,98 @@ static void test_timestamp_query(void) release_test_context(&test_context); } +static void test_so_statistics_query(void) +{ + struct d3d11_test_context test_context; + D3D11_QUERY_DATA_SO_STATISTICS data; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + unsigned int data_size; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const struct + { + D3D11_QUERY query; + D3D_FEATURE_LEVEL feature_level; + } + tests[] = + { + {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM2, D3D_FEATURE_LEVEL_11_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM3, D3D_FEATURE_LEVEL_11_0}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (ID3D11Device_GetFeatureLevel(device) < tests[i].feature_level) + { + skip("Feature level %#x is required.\n", tests[i].feature_level); + continue; + } + + query_desc.Query = tests[i].query; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) continue; + data_size = ID3D11Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Begin(context, query); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.NumPrimitivesWritten == ~(UINT64)0, "Data was modified.\n"); + ok(data.PrimitivesStorageNeeded == ~(UINT64)0, "Data was modified.\n"); + + draw_quad(&test_context); + + ID3D11DeviceContext_End(context, query); + get_query_data(context, query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", + (unsigned int)data.NumPrimitivesWritten); + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D11DeviceContext_Begin(context, query); + draw_quad(&test_context); + ID3D11DeviceContext_End(context, query); + get_query_data(context, query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", + (unsigned int)data.NumPrimitivesWritten); + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D11Asynchronous_Release(query); + } + + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D11Device *device; @@ -28691,6 +28783,7 @@ START_TEST(d3d11) queue_test(test_occlusion_query); queue_test(test_pipeline_statistics_query); queue_test(test_timestamp_query); + queue_test(test_so_statistics_query); queue_test(test_device_removed_reason); queue_test(test_private_data); queue_for_each_feature_level(test_state_refcounting); -- 2.18.1

3 2

[PATCH 5/5] wined3d: Prefer bind flags over usage flags in texture2d_load_sysmem().
by Henri Verbeet 02 Nov '18

02 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 99cc1a5f5d7..5f5c53a8b8f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1450,7 +1450,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res return TRUE; } - if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (!(texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { texture2d_read_from_framebuffer(texture, sub_resource_idx, context, -- 2.11.0

1 0

[PATCH 4/5] wined3d: Prefer bind flags over usage flags in texture2d_load_drawable().
by Henri Verbeet 02 Nov '18

02 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 902611c00c9..99cc1a5f5d7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1473,7 +1473,7 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int level; RECT r; - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { DWORD current = texture->sub_resources[sub_resource_idx].locations; FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", -- 2.11.0

1 0

[PATCH 3/5] wined3d: Prefer bind flags over usage flags in texture2d_load_texture().
by Henri Verbeet 02 Nov '18

02 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3254b850c26..902611c00c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1525,7 +1525,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_box src_box; BOOL depth; - depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; + depth = texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL; sub_resource = &texture->sub_resources[sub_resource_idx]; if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO -- 2.11.0

1 0

[PATCH 2/5] wined3d: Prefer bind flags over usage flags in texture2d_load_renderbuffer().
by Henri Verbeet 02 Nov '18

02 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cad5282f248..3254b850c26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1672,7 +1672,7 @@ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int s sub_resource = &texture->sub_resources[sub_resource_idx]; locations = sub_resource->locations; - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", wined3d_debug_location(locations)); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Prefer bind flags over usage flags in ffp_blitter_clear().
by Henri Verbeet 02 Nov '18

02 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 133055ba4d5..cad5282f248 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2066,7 +2066,7 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de continue; if (ffp_blitter_use_cpu_clear(view) - || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET) + || (!(view->resource->bind_flags & WINED3D_BIND_RENDER_TARGET) && (wined3d_settings.offscreen_rendering_mode != ORM_FBO || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)))) { -- 2.11.0

1 0

[PATCH vkd3d 4/4] build: Build libvkd3d-shader as public library.
by Józef Kucia 02 Nov '18

02 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- The API isn't necessarily final yet, but I would like to have it finalized before the next release. --- Makefile.am | 29 ++++++++++++++++++------- include/{private => }/vkd3d_shader.h | 0 libs/vkd3d-shader/libvkd3d-shader.pc.in | 10 +++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) rename include/{private => }/vkd3d_shader.h (100%) create mode 100644 libs/vkd3d-shader/libvkd3d-shader.pc.in diff --git a/Makefile.am b/Makefile.am index 8d4743995a68..111671837b87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ vkd3d_public_headers = \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ + include/vkd3d_shader.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h @@ -51,13 +52,13 @@ vkd3d_demos_headers = \ BUILT_SOURCES = $(widl_headers) -noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d-shader.la +noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ include/private/vkd3d_debug.h \ libs/vkd3d-common/debug.c \ libs/vkd3d-common/memory.c -lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la +lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la libvkd3d_shader_la_SOURCES = \ include/private/list.h \ @@ -73,9 +74,10 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ +libvkd3d_shader_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT -libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map +libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map endif libvkd3d_la_SOURCES = \ @@ -116,13 +118,16 @@ EXTRA_DIST = LICENSE pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers) -nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-utils.pc -CLEANFILES = libvkd3d.pc libvkd3d-utils.pc -EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in +nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc +CLEANFILES = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc +EXTRA_DIST += \ + libs/vkd3d/libvkd3d.pc.in \ + libs/vkd3d-shader/libvkd3d-shader.pc.in \ + libs/vkd3d-utils/libvkd3d-utils.pc.in noinst_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c -vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la +vkd3d_compiler_LDADD = libvkd3d-shader.la LDADD = libvkd3d.la libvkd3d-utils.la check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) @@ -170,6 +175,14 @@ libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ +libvkd3d-shader.pc: $(srcdir)/libs/vkd3d-shader/libvkd3d-shader.pc.in + $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ + -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ + -e 's![@]includedir[@]!$(includedir)!g' \ + -e 's![@]libdir[@]!$(libdir)!g' \ + -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ + $< > $@ + libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ diff --git a/include/private/vkd3d_shader.h b/include/vkd3d_shader.h similarity index 100% rename from include/private/vkd3d_shader.h rename to include/vkd3d_shader.h diff --git a/libs/vkd3d-shader/libvkd3d-shader.pc.in b/libs/vkd3d-shader/libvkd3d-shader.pc.in new file mode 100644 index 000000000000..b93e6ed9c6d6 --- /dev/null +++ b/libs/vkd3d-shader/libvkd3d-shader.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: vkd3d-shader +Description: The vkd3d Shader Translation Library +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir}/vkd3d +Libs: -L${libdir} -lvkd3d-shader -- 2.18.1

3 2

[PATCH vkd3d 3/4] vkd3d-shader: Fix swizzling for scalars.
by Józef Kucia 02 Nov '18

02 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 + tests/d3d12.c | 92 +++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e70c2d62be8b..c9634ed62ca6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2542,6 +2542,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler { component_idx = vkd3d_write_mask_get_component_idx(write_mask); component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); + component_idx -= vkd3d_write_mask_get_component_idx(val_write_mask); return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 16d0d0824911..b50723b11995 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8505,6 +8505,42 @@ static void test_shader_input_output_components(void) 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps2 = {ps2_code, sizeof(ps2_code)}; + static const DWORD ps3_code[] = + { +#if 0 + void main(float4 position : Sv_Position, + float2 texcoord0 : TEXCOORD0, float2 texcoord1 : TEXCOORD1, + float4 texcoord2 : TEXCOORD2, float3 texcoord3 : TEXCOORD3, + out float4 target0 : Sv_Target0, out uint4 target1 : SV_Target1) + { + target0.x = texcoord0.x; + target0.y = texcoord1.y; + target0.z = texcoord3.z; + target0.w = texcoord3.z; + + target1.x = texcoord2.x; + target1.y = 0; + target1.w = texcoord2.w; + target1.z = 0; + } +#endif + 0x43425844, 0x2df3a11d, 0x885fc859, 0x332d922b, 0xf8e01020, 0x00000001, 0x000001d8, 0x00000003, + 0x0000002c, 0x000000cc, 0x00000120, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000103, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000001, + 0x0000080c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000090f, 0x0000008c, + 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000407, 0x505f7653, 0x7469736f, 0x006e6f69, + 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000042, 0x00000001, 0x00000000, + 0x00000001, 0x00000001, 0x0000000f, 0x545f7653, 0x65677261, 0x56530074, 0x7261545f, 0x00746567, + 0x52444853, 0x000000b0, 0x00000040, 0x0000002c, 0x03001062, 0x00101012, 0x00000001, 0x03001062, + 0x00101082, 0x00000001, 0x03001062, 0x00101092, 0x00000002, 0x03001062, 0x00101042, 0x00000003, + 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x00102032, + 0x00000000, 0x001010c6, 0x00000001, 0x05000036, 0x001020c2, 0x00000000, 0x00101aa6, 0x00000003, + 0x0500001c, 0x00102092, 0x00000001, 0x00101c06, 0x00000002, 0x08000036, 0x00102062, 0x00000001, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps3 = {ps3_code, sizeof(ps3_code)}; static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = { {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, @@ -8523,13 +8559,23 @@ static void test_shader_input_output_components(void) } quad[] = { - {{-1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, - {{-1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, - {{ 1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, - {{ 1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{-1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}}, + {{-1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}}, + {{ 1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}}, + {{ 1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f, 5.0f}}, + }; + static const struct vec4 expected_vec4[] = + { + {1.0f, 2.0f, 3.0f, 0.0f}, + {6.0f, 4.0f, 7.0f, 8.0f}, + {3.0f, 8.0f, 7.0f, 7.0f}, + }; + static const struct uvec4 expected_uvec4[] = + { + {0xdeadbeef, 0, 2, 3}, + { 9, 5, 0, 1}, + { 9, 0, 0, 1}, }; - static const struct vec4 expected_vec4[] = {{1.0f, 2.0f, 3.0f, 0.0f}, {6.0f, 4.0f, 7.0f, 8.0f}}; - static const struct uvec4 expected_uvec4[] = {{0xdeadbeef, 0, 2, 3}, {9, 5, 0, 1}}; memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; @@ -8580,18 +8626,46 @@ static void test_shader_input_output_components(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[0]); + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.VS = vs2; + pso_desc.PS = ps2; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); transition_resource_state(command_list, uint_render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, TRUE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[1], 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[1]); + ID3D12PipelineState_Release(context.pipeline_state); pso_desc.VS = vs2; - pso_desc.PS = ps2; + pso_desc.PS = ps3; hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, TRUE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -8604,11 +8678,11 @@ static void test_shader_input_output_components(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[1], 0); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[2], 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, uint_render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[1]); + check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[2]); ID3D12Resource_Release(vb); ID3D12Resource_Release(uint_render_target); -- 2.18.1

2 1

[PATCH vkd3d 2/4] tests: Add test for shader input/output components.
by Józef Kucia 02 Nov '18

02 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 504c77deb74b..16d0d0824911 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8356,6 +8356,265 @@ static void test_shader_interstage_interface(void) destroy_test_context(&context); } +static void test_shader_input_output_components(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2]; + ID3D12Resource *uint_render_target; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + HRESULT hr; + + static const DWORD vs1_code[] = + { +#if 0 + void main(float4 in_position : POSITION, uint4 in_uint : UINT, + out float4 out_position : SV_POSITION, out uint out_uint : UINT, + out float3 out_float : FLOAT) + { + out_position = in_position; + out_uint = in_uint.y; + out_float = float3(1, 2, 3); + } +#endif + 0x43425844, 0x0521bc60, 0xd39733a4, 0x1522eea3, 0x0c741ea3, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000ec, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x0000020f, 0x49534f50, 0x4e4f4954, 0x4e495500, 0xabab0054, 0x4e47534f, + 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000e01, 0x00000061, + 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x544e4955, 0x4f4c4600, 0xab005441, 0x58454853, 0x00000098, 0x00010050, 0x00000026, 0x0100086a, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101022, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x03000065, 0x00102072, 0x00000002, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, + 0x0010101a, 0x00000001, 0x08000036, 0x00102072, 0x00000002, 0x00004002, 0x3f800000, 0x40000000, + 0x40400000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs1 = {vs1_code, sizeof(vs1_code)}; + static const DWORD ps1_code[] = + { +#if 0 + void main(float4 position : SV_POSITION, uint in_uint : UINT, + float3 in_float : FLOAT, out float4 out_float : SV_TARGET0, + out uint4 out_uint : SV_TARGET1) + { + out_float.x = position.w; + out_float.y = in_uint; + out_float.z = in_float.z; + out_float.w = 0; + out_uint.x = 0xdeadbeef; + out_uint.y = 0; + out_uint.z = in_uint; + out_uint.w = in_float.z; + } +#endif + 0x43425844, 0x762dbf5e, 0x2cc83972, 0x60c7aa48, 0xbca6118a, 0x00000001, 0x000001d4, 0x00000003, + 0x0000002c, 0x0000009c, 0x000000e8, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000080f, 0x0000005c, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, + 0x00000407, 0x505f5653, 0x5449534f, 0x004e4f49, 0x544e4955, 0x4f4c4600, 0xab005441, 0x4e47534f, + 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x0000000f, 0x545f5653, + 0x45475241, 0xabab0054, 0x52444853, 0x000000e4, 0x00000040, 0x00000039, 0x04002064, 0x00101082, + 0x00000000, 0x00000001, 0x03000862, 0x00101012, 0x00000001, 0x03001062, 0x00101042, 0x00000002, + 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000056, 0x00102022, + 0x00000000, 0x0010100a, 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010103a, 0x00000000, + 0x05000036, 0x00102042, 0x00000000, 0x0010102a, 0x00000002, 0x05000036, 0x00102082, 0x00000000, + 0x00004001, 0x00000000, 0x0500001c, 0x00102082, 0x00000001, 0x0010102a, 0x00000002, 0x08000036, + 0x00102032, 0x00000001, 0x00004002, 0xdeadbeef, 0x00000000, 0x00000000, 0x00000000, 0x05000036, + 0x00102042, 0x00000001, 0x0010100a, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps1 = {ps1_code, sizeof(ps1_code)}; + static const DWORD vs2_code[] = + { +#if 0 + void main(float4 in_position : POSITION, + float4 in_texcoord0 : TEXCOORD0, float4 in_texcoord1 : TEXCOORD1, + float4 in_texcoord2 : TEXCOORD2, + out float4 position : Sv_Position, + out float2 texcoord0 : TEXCOORD0, out float2 texcoord1 : TEXCOORD1, + out float4 texcoord2 : TEXCOORD2, out float3 texcoord3 : TEXCOORD3) + { + position = in_position; + texcoord0 = in_texcoord0.yx; + texcoord1 = in_texcoord0.wz; + texcoord2 = in_texcoord1; + texcoord3 = in_texcoord2.yzx; + } +#endif + 0x43425844, 0x6721613b, 0xb997c7e4, 0x8bc3df4d, 0x813c93b9, 0x00000001, 0x00000224, 0x00000003, + 0x0000002c, 0x000000b0, 0x00000150, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000071, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x00000071, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x0000070f, 0x49534f50, + 0x4e4f4954, 0x58455400, 0x524f4f43, 0xabab0044, 0x4e47534f, 0x00000098, 0x00000005, 0x00000008, + 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000c03, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, + 0x00000001, 0x0000030c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, + 0x0000008c, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000807, 0x505f7653, 0x7469736f, + 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, 0x000000cc, 0x00010040, 0x00000033, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x001010f2, + 0x00000002, 0x0300005f, 0x00101072, 0x00000003, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x03000065, 0x001020f2, + 0x00000002, 0x03000065, 0x00102072, 0x00000003, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, + 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101b16, 0x00000001, 0x05000036, 0x001020f2, + 0x00000002, 0x00101e46, 0x00000002, 0x05000036, 0x00102072, 0x00000003, 0x00101496, 0x00000003, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs2 = {vs2_code, sizeof(vs2_code)}; + static const DWORD ps2_code[] = + { +#if 0 + void main(float4 position : Sv_Position, + float2 texcoord0 : TEXCOORD0, float2 texcoord1 : TEXCOORD1, + float4 texcoord2 : TEXCOORD2, float3 texcoord3 : TEXCOORD3, + out float4 target0 : Sv_Target0, out uint4 target1 : SV_Target1) + { + target0.x = texcoord0.x + texcoord0.y; + target0.y = texcoord1.x; + target0.z = texcoord3.z; + target0.w = texcoord1.y; + + target1.x = texcoord2.x; + target1.y = texcoord2.y; + target1.w = texcoord2.w; + target1.z = 0; + } +#endif + 0x43425844, 0xa6c0df60, 0x5bf34683, 0xa0093595, 0x98cca724, 0x00000001, 0x000001e8, 0x00000003, + 0x0000002c, 0x000000cc, 0x00000120, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000001, + 0x00000c0c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000b0f, 0x0000008c, + 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000407, 0x505f7653, 0x7469736f, 0x006e6f69, + 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000042, 0x00000001, 0x00000000, + 0x00000001, 0x00000001, 0x0000000f, 0x545f7653, 0x65677261, 0x56530074, 0x7261545f, 0x00746567, + 0x52444853, 0x000000c0, 0x00000040, 0x00000030, 0x03001062, 0x00101032, 0x00000001, 0x03001062, + 0x001010c2, 0x00000001, 0x03001062, 0x001010b2, 0x00000002, 0x03001062, 0x00101042, 0x00000003, + 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x07000000, 0x00102012, + 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000001, 0x05000036, 0x001020a2, 0x00000000, + 0x00101ea6, 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010102a, 0x00000003, 0x0500001c, + 0x001020b2, 0x00000001, 0x00101c46, 0x00000002, 0x05000036, 0x00102042, 0x00000001, 0x00004001, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps2 = {ps2_code, sizeof(ps2_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"UINT", 0, DXGI_FORMAT_R32G32B32A32_UINT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 32, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 48, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 2, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 64, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec4 position; + struct uvec4 u; + struct vec4 t0; + struct vec4 t1; + struct vec4 t2; + } + quad[] = + { + {{-1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{-1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{ 1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{ 1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + }; + static const struct vec4 expected_vec4[] = {{1.0f, 2.0f, 3.0f, 0.0f}, {6.0f, 4.0f, 7.0f, 8.0f}}; + static const struct uvec4 expected_uvec4[] = {{0xdeadbeef, 0, 2, 3}, {9, 5, 0, 1}}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_descriptor_count = 2; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, desc.rt_format, &vs1, &ps1, &input_layout); + pso_desc.NumRenderTargets = 2; + pso_desc.RTVFormats[1] = DXGI_FORMAT_R32G32B32A32_UINT; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + rtvs[0] = context.rtv; + rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + desc.rt_format = pso_desc.RTVFormats[1]; + create_render_target(&context, &desc, &uint_render_target, &rtvs[1]); + + vb = create_upload_buffer(context.device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, TRUE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[0], 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[0]); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.VS = vs2; + pso_desc.PS = ps2; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, TRUE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[1], 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[1]); + + ID3D12Resource_Release(vb); + ID3D12Resource_Release(uint_render_target); + destroy_test_context(&context); +} + static void test_incompletely_initialized_shader_outputs(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -20914,6 +21173,7 @@ START_TEST(d3d12) run_test(test_compute_shader_instructions); run_test(test_discard_instruction); run_test(test_shader_interstage_interface); + run_test(test_shader_input_output_components); run_test(test_incompletely_initialized_shader_outputs); run_test(test_root_signature_byte_code); run_test(test_cs_constant_buffer); -- 2.18.1

2 1

[PATCH v2 vkd3d 1/4] tests: Introduce check_sub_resource_uvec4().
by Józef Kucia 02 Nov '18

02 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Use sub_resource_idx in check_sub_resource_*() functions. --- tests/d3d12.c | 55 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 25c2fdf80439..504c77deb74b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -749,7 +749,7 @@ static void check_sub_resource_uint8_(unsigned int line, ID3D12Resource *texture { struct resource_readback rb; - get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); + get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); check_readback_data_uint8_(line, &rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -805,7 +805,7 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, bool all_match = true; struct vec4 got = {}; - get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); + get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -826,6 +826,39 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } +#define check_sub_resource_uvec4(a, b, c, d, e) check_sub_resource_uvec4_(__LINE__, a, b, c, d, e) +static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture, + unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + const struct uvec4 *expected_value) +{ + struct resource_readback rb; + struct uvec4 value = {}; + unsigned int x = 0, y; + bool all_match = true; + + get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = *get_readback_uvec4(&rb, x, y); + if (!compare_uvec4(&value, expected_value)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + release_resource_readback(&rb); + + ok_(line)(all_match, + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", + value.x, value.y, value.z, value.w, + expected_value->x, expected_value->y, expected_value->z, expected_value->w, x, y); +} + static bool use_warp_device; static unsigned int use_adapter_idx; @@ -5459,10 +5492,9 @@ static void test_shader_instructions(void) ID3D12GraphicsCommandList *command_list; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; - unsigned int i, x, y; ID3D12Resource *cb; + unsigned int i; HRESULT hr; static const DWORD ps_div_code[] = @@ -7850,20 +7882,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - - get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) - { - const struct uvec4 *v = get_readback_uvec4(&rb, x, y); - ok(compare_uvec4(v, &uint_tests[i].output.u), - "Got 0x%08x, 0x%08x, 0x%08x, 0x%08x expected 0x%08x, 0x%08x, 0x%08x, 0x%08x.\n", - v->x, v->y, v->z, v->w, uint_tests[i].output.u.x, uint_tests[i].output.u.y, - uint_tests[i].output.u.z, uint_tests[i].output.u.w); - } - } - release_resource_readback(&rb); + check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uint_tests[i].output.u); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, -- 2.18.1

2 1

[PATCH 1/2] xmllite/writer: Implement WriteDocType().
by Nikolay Sivov 02 Nov '18

02 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 8 +-- dlls/xmllite/tests/writer.c | 110 +++++++++++++++++++++++++++++++- dlls/xmllite/writer.c | 113 +++++++++++++++++++++++++++++++-- dlls/xmllite/xmllite_private.h | 3 + 4 files changed, 223 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 97c269ceda..a6d1f3edce 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -95,7 +95,7 @@ static const WCHAR gtW[] = {'>',0}; static const WCHAR commentW[] = {'<','!','-','-',0}; static const WCHAR piW[] = {'<','?',0}; -static BOOL is_namestartchar(WCHAR ch); +BOOL is_namestartchar(WCHAR ch); static const char *debugstr_nodetype(XmlNodeType nodetype) { @@ -1491,7 +1491,7 @@ static inline BOOL is_char(WCHAR ch) } /* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ -static inline BOOL is_pubchar(WCHAR ch) +BOOL is_pubchar(WCHAR ch) { return (ch == ' ') || (ch >= 'a' && ch <= 'z') || @@ -1504,7 +1504,7 @@ static inline BOOL is_pubchar(WCHAR ch) (ch == '_') || (ch == '\r') || (ch == '\n'); } -static inline BOOL is_namestartchar(WCHAR ch) +BOOL is_namestartchar(WCHAR ch) { return (ch == ':') || (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1548,7 +1548,7 @@ BOOL is_ncnamechar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline BOOL is_namechar(WCHAR ch) +BOOL is_namechar(WCHAR ch) { return (ch == ':') || is_ncnamechar(ch); } diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 5ddb1ef2a7..99ad168c53 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -135,7 +135,8 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) hr = IXmlWriter_WriteComment(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); - /* FIXME: add WriteDocType */ + hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); @@ -353,7 +354,8 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) hr = IXmlWriter_WriteComment(writer, aW); ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); - /* TODO: WriteDocType */ + hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); @@ -2113,6 +2115,109 @@ static void test_WriteString(void) IStream_Release(stream); } +static HRESULT write_doctype(IXmlWriter *writer, const char *name, const char *pubid, const char *sysid, + const char *subset) +{ + WCHAR *nameW, *pubidW, *sysidW, *subsetW; + HRESULT hr; + + nameW = strdupAtoW(name); + pubidW = strdupAtoW(pubid); + sysidW = strdupAtoW(sysid); + subsetW = strdupAtoW(subset); + + hr = IXmlWriter_WriteDocType(writer, nameW, pubidW, sysidW, subsetW); + + heap_free(nameW); + heap_free(pubidW); + heap_free(sysidW); + heap_free(subsetW); + + return hr; +} + +static void test_WriteDocType(void) +{ + static const struct + { + const char *name; + const char *pubid; + const char *sysid; + const char *subset; + const char *output; + } + doctype_tests[] = + { + { "a", "", NULL, NULL, "<!DOCTYPE a PUBLIC \"\" \"\">" }, + { "a", NULL, NULL, NULL, "<!DOCTYPE a>" }, + { "a", NULL, "", NULL, "<!DOCTYPE a SYSTEM \"\">" }, + { "a", "", "", NULL, "<!DOCTYPE a PUBLIC \"\" \"\">" }, + { "a", "pubid", "", NULL, "<!DOCTYPE a PUBLIC \"pubid\" \"\">" }, + { "a", "pubid", NULL, NULL, "<!DOCTYPE a PUBLIC \"pubid\" \"\">" }, + { "a", "", "sysid", NULL, "<!DOCTYPE a PUBLIC \"\" \"sysid\">" }, + { "a", NULL, NULL, "", "<!DOCTYPE a []>" }, + { "a", NULL, NULL, "subset", "<!DOCTYPE a [subset]>" }, + { "a", "", NULL, "subset", "<!DOCTYPE a PUBLIC \"\" \"\" [subset]>" }, + { "a", NULL, "", "subset", "<!DOCTYPE a SYSTEM \"\" [subset]>" }, + { "a", "", "", "subset", "<!DOCTYPE a PUBLIC \"\" \"\" [subset]>" }, + { "a", "pubid", NULL, "subset", "<!DOCTYPE a PUBLIC \"pubid\" \"\" [subset]>" }, + { "a", "pubid", "", "subset", "<!DOCTYPE a PUBLIC \"pubid\" \"\" [subset]>" }, + { "a", NULL, "sysid", "subset", "<!DOCTYPE a SYSTEM \"sysid\" [subset]>" }, + { "a", "", "sysid", "subset", "<!DOCTYPE a PUBLIC \"\" \"sysid\" [subset]>" }, + { "a", "pubid", "sysid", "subset", "<!DOCTYPE a PUBLIC \"pubid\" \"sysid\" [subset]>" }, + }; + static const WCHAR pubidW[] = {'p',0x100,'i','d',0}; + static const WCHAR nameW[] = {'-','a',0}; + static const WCHAR emptyW[] = { 0 }; + IXmlWriter *writer; + IStream *stream; + unsigned int i; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); + ok(hr == S_OK, "Failed to create writer instance, hr %#x.\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteDocType(writer, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteDocType(writer, emptyW, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Name validation. */ + hr = IXmlWriter_WriteDocType(writer, nameW, NULL, NULL, NULL); + ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#x.\n", hr); + + /* Pubid validation. */ + hr = IXmlWriter_WriteDocType(writer, aW, pubidW, NULL, NULL); + ok(hr == WC_E_PUBLICID, "Unexpected hr %#x.\n", hr); + + IStream_Release(stream); + + for (i = 0; i < ARRAY_SIZE(doctype_tests); i++) + { + stream = writer_set_output(writer); + + hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, + doctype_tests[i].subset); + ok(hr == S_OK, "%u: failed to write doctype, hr %#x.\n", i, hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, doctype_tests[i].output); + + hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, + doctype_tests[i].subset); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#x.\n", hr); + + IStream_Release(stream); + } + + IXmlWriter_Release(writer); +} + START_TEST(writer) { test_writer_create(); @@ -2134,4 +2239,5 @@ START_TEST(writer) test_WriteFullEndElement(); test_WriteCharEntity(); test_WriteString(); + test_WriteDocType(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 8d1fb3a2da..e1fc232d4f 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -366,6 +366,50 @@ static HRESULT is_valid_ncname(const WCHAR *str, int *out) return S_OK; } +static HRESULT is_valid_name(const WCHAR *str, unsigned int *out) +{ + unsigned int len = 1; + + *out = 0; + + if (!str || !*str) + return S_OK; + + if (!is_namestartchar(*str++)) + return WC_E_NAMECHARACTER; + + while (*str++) + { + if (!is_namechar(*str)) + return WC_E_NAMECHARACTER; + len++; + } + + *out = len; + return S_OK; +} + +static HRESULT is_valid_pubid(const WCHAR *str, unsigned int *out) +{ + unsigned int len = 0; + + *out = 0; + + if (!str || !*str) + return S_OK; + + while (*str) + { + if (!is_pubchar(*str++)) + return WC_E_PUBLICID; + len++; + } + + *out = len; + + return S_OK; +} + static HRESULT init_output_buffer(xmlwriteroutput *output) { struct output_buffer *buffer = &output->buffer; @@ -457,6 +501,11 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +static HRESULT write_output_buffer_char(xmlwriteroutput *output, WCHAR ch) +{ + return write_output_buffer(output, &ch, 1); +} + /* TODO: test if we need to validate char range */ static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, int prefix_len, const WCHAR *local_name, int local_len) @@ -1103,15 +1152,69 @@ static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) return S_OK; } -static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId, - LPCWSTR pwszSystemId, LPCWSTR pwszSubset) +static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR name, LPCWSTR pubid, + LPCWSTR sysid, LPCWSTR subset) { + static const WCHAR doctypeW[] = {'<','!','D','O','C','T','Y','P','E',' '}; + static const WCHAR publicW[] = {' ','P','U','B','L','I','C',' '}; + static const WCHAR systemW[] = {' ','S','Y','S','T','E','M',' '}; xmlwriter *This = impl_from_IXmlWriter(iface); + unsigned int name_len, pubid_len; + HRESULT hr; - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszPublicId), - wine_dbgstr_w(pwszSystemId), wine_dbgstr_w(pwszSubset)); + TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(name), wine_dbgstr_w(pubid), wine_dbgstr_w(sysid), + wine_dbgstr_w(subset)); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; + case XmlWriterState_Content: + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + if (is_empty_string(name)) + return E_INVALIDARG; + + if (FAILED(hr = is_valid_name(name, &name_len))) + return hr; + + if (FAILED(hr = is_valid_pubid(pubid, &pubid_len))) + return hr; + + write_output_buffer(This->output, doctypeW, ARRAY_SIZE(doctypeW)); + write_output_buffer(This->output, name, name_len); + + if (pubid) + { + write_output_buffer(This->output, publicW, ARRAY_SIZE(publicW)); + write_output_buffer_quoted(This->output, pubid, pubid_len); + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_quoted(This->output, sysid, -1); + } + else if (sysid) + { + write_output_buffer(This->output, systemW, ARRAY_SIZE(systemW)); + write_output_buffer_quoted(This->output, sysid, -1); + } + + if (subset) + { + write_output_buffer_char(This->output, ' '); + write_output_buffer_char(This->output, '['); + write_output_buffer(This->output, subset, -1); + write_output_buffer_char(This->output, ']'); + } + write_output_buffer_char(This->output, '>'); + + This->state = XmlWriterState_Content; + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 9fb9e82d33..10f43760b4 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -61,5 +61,8 @@ const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN; xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN; BOOL is_ncnamechar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_pubchar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_namestartchar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_namechar(WCHAR ch) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */ -- 2.19.1

1 1

[PATCH v3 1/3] oleaut32/tests: Add some more tests for marshalling arrays.
by Zebediah Figura 02 Nov '18

02 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: remove tests that fail on Windows < 7. v3: temporarily disable tests that fail on Wine. dlls/oleaut32/tests/tmarshal.c | 166 +++++++++++++++++++------------ dlls/oleaut32/tests/tmarshal.idl | 22 ++-- 2 files changed, 118 insertions(+), 70 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 7567a53ee3..887c4c8134 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -67,6 +67,13 @@ static const RECT test_rect5 = {17,18,19,20}; static const RECT test_rect6 = {21,22,23,24}; static const RECT test_rect7 = {25,26,27,28}; +static const array_t test_array1 = {1,2,3,4}; +static const array_t test_array2 = {5,6,7,8}; +static const array_t test_array3 = {9,10,11,12}; +static const array_t test_array4 = {13,14,15,16}; +static const array_t test_array5 = {17,18,19,20}; +static const array_t test_array6 = {21,22,23,24}; + #define RELEASEMARSHALDATA WM_USER struct host_object_data @@ -727,14 +734,6 @@ static HRESULT WINAPI Widget_Value( return S_OK; } -static HRESULT WINAPI Widget_Array( - IWidget * iface, - SAFEARRAY * values) -{ - trace("Array(%p)\n", values); - return S_OK; -} - static HRESULT WINAPI Widget_VariantArrayPtr( IWidget * iface, SAFEARRAY ** values) @@ -743,46 +742,6 @@ static HRESULT WINAPI Widget_VariantArrayPtr( return S_OK; } -static HRESULT WINAPI Widget_VariantCArray( - IWidget * iface, - ULONG count, - VARIANT values[]) -{ - ULONG i; - - trace("VariantCArray(%u,%p)\n", count, values); - - ok(count == 2, "count is %d\n", count); - for (i = 0; i < count; i++) - ok(V_VT(&values[i]) == VT_I4, "values[%d] is not VT_I4\n", i); - - if (pVarAdd) - { - VARIANT inc, res; - HRESULT hr; - - V_VT(&inc) = VT_I4; - V_I4(&inc) = 1; - for (i = 0; i < count; i++) { - VariantInit(&res); - hr = pVarAdd(&values[i], &inc, &res); - if (FAILED(hr)) { - ok(0, "VarAdd failed at %u with error 0x%x\n", i, hr); - return hr; - } - hr = VariantCopy(&values[i], &res); - if (FAILED(hr)) { - ok(0, "VariantCopy failed at %u with error 0x%x\n", i, hr); - return hr; - } - } - } - else - win_skip("VarAdd is not available\n"); - - return S_OK; -} - static HRESULT WINAPI Widget_VarArg( IWidget * iface, int numexpect, @@ -1310,6 +1269,51 @@ static HRESULT WINAPI Widget_rect(IWidget *iface, RECT in, RECT *out, RECT *in_p return S_OK; } +static HRESULT WINAPI Widget_array(IWidget *iface, array_t in, array_t out, array_t in_out) +{ + static const array_t empty = {0}; + ok(!memcmp(in, test_array1, sizeof(array_t)), "Arrays didn't match.\n"); +todo_wine + ok(!memcmp(out, empty, sizeof(array_t)), "Arrays didn't match.\n"); + ok(!memcmp(in_out, test_array3, sizeof(array_t)), "Arrays didn't match.\n"); + + memcpy(in, test_array4, sizeof(array_t)); + memcpy(out, test_array5, sizeof(array_t)); + memcpy(in_out, test_array6, sizeof(array_t)); + + return S_OK; +} + +static HRESULT WINAPI Widget_variant_array(IWidget *iface, VARIANT in[2], VARIANT out[2], VARIANT in_out[2]) +{ + ok(V_VT(&in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[0])); + ok(V_I4(&in[0]) == 1, "Got wrong value %d.\n", V_I4(&in[0])); + ok(V_VT(&in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[1])); + ok(V_I4(&in[1]) == 2, "Got wrong value %d.\n", V_I4(&in[1])); + ok(V_VT(&out[0]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[0])); + ok(V_VT(&out[1]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[1])); + ok(V_VT(&in_out[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[0])); + ok(V_I4(&in_out[0]) == 5, "Got wrong type %u.\n", V_VT(&in_out[0])); + ok(V_VT(&in_out[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[1])); + ok(V_I4(&in_out[1]) == 6, "Got wrong type %u.\n", V_VT(&in_out[1])); + + V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7; + V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8; + V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9; + V_VT(&out[1]) = VT_I1; V_I1(&out[1]) = 10; + V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11; + V_VT(&in_out[1]) = VT_I1; V_I1(&in_out[1]) = 12; + + return S_OK; +} + +static HRESULT WINAPI Widget_mystruct_array(IWidget *iface, MYSTRUCT in[2]) +{ + ok(!memcmp(&in[0], &test_mystruct1, sizeof(MYSTRUCT)), "Structs didn't match.\n"); + ok(!memcmp(&in[1], &test_mystruct2, sizeof(MYSTRUCT)), "Structs didn't match.\n"); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1331,9 +1335,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_CloneDispatch, Widget_CloneCoclass, Widget_Value, - Widget_Array, Widget_VariantArrayPtr, - Widget_VariantCArray, Widget_VarArg, Widget_Error, Widget_CloneInterface, @@ -1363,6 +1365,9 @@ static const struct IWidgetVtbl Widget_VTable = Widget_mystruct_ptr_ptr, Widget_thin_struct, Widget_rect, + Widget_array, + Widget_variant_array, + Widget_mystruct_array, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2285,6 +2290,54 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) ok(EqualRect(&rect_in_out, &test_rect7), "Rects didn't match.\n"); } +static void test_marshal_array(IWidget *widget, IDispatch *disp) +{ + VARIANT var_in[2], var_out[2], var_in_out[2]; + array_t in, out, in_out; + MYSTRUCT struct_in[2]; + HRESULT hr; + +if (0) { + memcpy(in, test_array1, sizeof(array_t)); + memcpy(out, test_array2, sizeof(array_t)); + memcpy(in_out, test_array3, sizeof(array_t)); + hr = IWidget_array(widget, in, out, in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(!memcmp(&in, &test_array1, sizeof(array_t)), "Arrays didn't match.\n"); + ok(!memcmp(&out, &test_array5, sizeof(array_t)), "Arrays didn't match.\n"); + ok(!memcmp(&in_out, &test_array6, sizeof(array_t)), "Arrays didn't match.\n"); +} + + V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1; + V_VT(&var_in[1]) = VT_I4; V_I4(&var_in[1]) = 2; + V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3; + V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4; + V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5; + V_VT(&var_in_out[1]) = VT_I4; V_I4(&var_in_out[1]) = 6; + hr = IWidget_variant_array(widget, var_in, var_out, var_in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var_in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[0])); + ok(V_I4(&var_in[0]) == 1, "Got wrong value %d.\n", V_I4(&var_in[0])); + ok(V_VT(&var_in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[1])); + ok(V_I4(&var_in[1]) == 2, "Got wrong value %d.\n", V_I4(&var_in[1])); +todo_wine { + ok(V_VT(&var_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[0])); + ok(V_I1(&var_out[0]) == 9, "Got wrong value %u.\n", V_VT(&var_out[0])); + ok(V_VT(&var_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[1])); + ok(V_I1(&var_out[1]) == 10, "Got wrong value %u.\n", V_VT(&var_out[1])); + ok(V_VT(&var_in_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[0])); + ok(V_I1(&var_in_out[0]) == 11, "Got wrong value %u.\n", V_VT(&var_in_out[0])); + ok(V_VT(&var_in_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[1])); + ok(V_I1(&var_in_out[1]) == 12, "Got wrong value %u.\n", V_VT(&var_in_out[1])); +} + + memcpy(&struct_in[0], &test_mystruct1, sizeof(MYSTRUCT)); + memcpy(&struct_in[1], &test_mystruct2, sizeof(MYSTRUCT)); + hr = IWidget_mystruct_array(widget, struct_in); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2579,18 +2632,6 @@ static void test_typelibmarshal(void) ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected DISP_E_TYPEMISMATCH, got %#x\n", hr); SysFreeString(V_BSTR(&vararg[0])); - /* call VariantCArray - test marshaling of variant arrays */ - V_VT(&vararg[0]) = VT_I4; - V_I4(&vararg[0]) = 1; - V_VT(&vararg[1]) = VT_I4; - V_I4(&vararg[1]) = 2; - hr = IWidget_VariantCArray(pWidget, 2, vararg); - ok_ole_success(hr, IWidget_VariantCArray); -todo_wine - ok(V_VT(&vararg[0]) == VT_I4 && V_I4(&vararg[0]) == 2, "vararg[0] = %d[%d]\n", V_VT(&vararg[0]), V_I4(&vararg[0])); -todo_wine - ok(V_VT(&vararg[1]) == VT_I4 && V_I4(&vararg[1]) == 3, "vararg[1] = %d[%d]\n", V_VT(&vararg[1]), V_I4(&vararg[1])); - /* call VarArg */ VariantInit(&vararg[3]); V_VT(&vararg[3]) = VT_I4; @@ -2877,6 +2918,7 @@ todo_wine test_marshal_variant(pWidget, pDispatch); test_marshal_safearray(pWidget, pDispatch); test_marshal_struct(pWidget, pDispatch); + test_marshal_array(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index d2ebc0b010..cce97cd977 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -34,9 +34,7 @@ enum IWidget_dispids DISPID_TM_CLONEDISPATCH, DISPID_TM_CLONECOCLASS, DISPID_TM_VALUE, - DISPID_TM_ARRAY, DISPID_TM_VARARRAYPTR, - DISPID_TM_VARCARRAY, DISPID_TM_VARARG, DISPID_TM_ERROR, DISPID_TM_CLONEINTERFACE, @@ -67,6 +65,9 @@ enum IWidget_dispids DISPID_TM_STRUCT_PTR_PTR, DISPID_TM_THIN_STRUCT, DISPID_TM_RECT, + DISPID_TM_ARRAY, + DISPID_TM_VARIANT_ARRAY, + DISPID_TM_STRUCT_ARRAY, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -184,15 +185,9 @@ library TestTypelib [propget, id(DISPID_VALUE)] HRESULT Value([in] VARIANT *value, [out, retval] VARIANT *retval); - [id(DISPID_TM_ARRAY)] - HRESULT Array([in] SAFEARRAY(BSTR) values); - [id(DISPID_TM_VARARRAYPTR)] HRESULT VariantArrayPtr([in] SAFEARRAY(VARIANT) *values); - [id(DISPID_TM_VARCARRAY)] - HRESULT VariantCArray([in] ULONG count, [in, out] VARIANT values[2]); - [vararg, id(DISPID_TM_VARARG)] HRESULT VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); @@ -289,6 +284,17 @@ library TestTypelib [id(DISPID_TM_RECT)] HRESULT rect([in] RECT in, [out] RECT *out, [in] RECT *in_ptr, [in, out] RECT *in_out); + + typedef int array_t[4]; + + [id(DISPID_TM_ARRAY)] + HRESULT array([in] array_t in, [out] array_t out, [in, out] array_t in_out); + + [id(DISPID_TM_VARIANT_ARRAY)] + HRESULT variant_array([in] VARIANT in[2], [out] VARIANT out[2], [in, out] VARIANT in_out[2]); + + [id(DISPID_TM_STRUCT_ARRAY)] + HRESULT mystruct_array([in] MYSTRUCT in[2]); } [ -- 2.19.1

1 2

[PATCH] po: Update Norwegian translation.
by Kim Malmo 01 Nov '18

01 Nov '18

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 91e3dc4e90..1077159b14 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.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-25 11:58+0200\n" +"PO-Revision-Date: 2018-11-01 22:38+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -2448,16 +2448,12 @@ msgstr "" "vellykket." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Velg sertifikatlager" +msgstr "Velg sertifikat" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Velg sertifikatlageret du vil bruke:" +msgstr "Velg et sertifikat du vil bruke" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2989,20 +2985,16 @@ msgstr "" "Merk: Den private nøkkelen for dette sertifikatet kan ikke eksporteres." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "Tilte&nkt formål:" +msgstr "Tiltenkt formål" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Plassering" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Velg sertifikatlager" +msgstr "Velg et sertifikat" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" -- 2.17.1

1 0

[PATCH 1/2] rpcrt4: Add some tests for marshalling interface pointers.
by Zebediah Figura 01 Nov '18

01 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 276 +++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index de2fd0151a..5da03e2ef7 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -21,6 +21,7 @@ #define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ +#define COBJMACROS #include <stdarg.h> @@ -1173,6 +1174,280 @@ static void test_simple_struct(void) test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct"); } +struct testiface +{ + IPersist IPersist_iface; + LONG ref; +}; + +static struct testiface *impl_from_IPersist(IPersist *iface) +{ + return CONTAINING_RECORD(iface, struct testiface, IPersist_iface); +} + +static HRESULT WINAPI test_persist_QueryInterface(IPersist *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IPersist)) + { + *out = iface; + IPersist_AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_persist_AddRef(IPersist *iface) +{ + struct testiface *unk = impl_from_IPersist(iface); + return ++unk->ref; +} + +static ULONG WINAPI test_persist_Release(IPersist *iface) +{ + struct testiface *unk = impl_from_IPersist(iface); + return --unk->ref; +} + +static HRESULT WINAPI test_persist_GetClassId(IPersist *iface, GUID *clsid) +{ + *clsid = IID_IPersist; + return S_OK; +} + +static IPersistVtbl testiface_vtbl = { + test_persist_QueryInterface, + test_persist_AddRef, + test_persist_Release, + test_persist_GetClassId, +}; + +static void test_iface_ptr(void) +{ + struct testiface server_obj = {{&testiface_vtbl}, 1}; + struct testiface client_obj = {{&testiface_vtbl}, 1}; + + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + RPC_MESSAGE RpcMessage; + IPersist *proxy; + HRESULT hr; + GUID clsid; + void *ptr; + LONG ref; + + static const unsigned char fmtstr_ip[] = + { + FC_IP, + FC_CONSTANT_IID, + NdrFcLong(0x0000010c), + NdrFcShort(0x0000), + NdrFcShort(0x0000), + 0xc0, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x46, + }; + + CoInitialize(NULL); + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_ip; + + NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0); + StubMsg.BufferLength = 0; + NdrInterfacePointerBufferSize(&StubMsg, (unsigned char *)&client_obj.IPersist_iface, fmtstr_ip); + + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + /* server -> client */ + + StubMsg.IsClient = 0; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + IPersist_AddRef(&server_obj.IPersist_iface); + ptr = NdrInterfacePointerMarshall(&StubMsg, (unsigned char *)&server_obj.IPersist_iface, fmtstr_ip); + ok(!ptr, "ret %p\n", ptr); + ok(server_obj.ref > 2, "got %d references\n", server_obj.ref); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + + NdrInterfacePointerFree(&StubMsg, (unsigned char *)&server_obj.IPersist_iface, fmtstr_ip); + ok(server_obj.ref > 1, "got %d references\n", server_obj.ref); + + StubMsg.IsClient = 1; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + proxy = NULL; + ptr = NdrInterfacePointerUnmarshall(&StubMsg, (unsigned char **)&proxy, fmtstr_ip, 0); + ok(!ptr, "ret %p\n", ptr); + ok(!!proxy, "mem not alloced\n"); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + ok(server_obj.ref > 1, "got %d references\n", server_obj.ref); + + hr = IPersist_GetClassID(proxy, &clsid); + ok(hr == S_OK, "got hr %#x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IPersist), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + ref = IPersist_Release(proxy); + ok(ref == 1, "got %d references\n", ref); + ok(server_obj.ref == 1, "got %d references\n", server_obj.ref); + + /* An existing interface pointer is released; this is necessary so that an + * [in, out] pointer which changes does not leak references. */ + + StubMsg.IsClient = 0; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + IPersist_AddRef(&server_obj.IPersist_iface); + ptr = NdrInterfacePointerMarshall(&StubMsg, (unsigned char *)&server_obj.IPersist_iface, fmtstr_ip); + ok(!ptr, "ret %p\n", ptr); + ok(server_obj.ref > 2, "got %d references\n", server_obj.ref); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + + NdrInterfacePointerFree(&StubMsg, (unsigned char *)&server_obj.IPersist_iface, fmtstr_ip); + ok(server_obj.ref > 1, "got %d references\n", server_obj.ref); + + StubMsg.IsClient = 1; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + proxy = &client_obj.IPersist_iface; + IPersist_AddRef(proxy); + ptr = NdrInterfacePointerUnmarshall(&StubMsg, (unsigned char **)&proxy, fmtstr_ip, 0); + ok(!ptr, "ret %p\n", ptr); + ok(!!proxy && proxy != &client_obj.IPersist_iface, "mem not alloced\n"); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + ok(server_obj.ref > 1, "got %d references\n", server_obj.ref); +todo_wine + ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); +client_obj.ref = 1; + + hr = IPersist_GetClassID(proxy, &clsid); + ok(hr == S_OK, "got hr %#x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IPersist), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + ref = IPersist_Release(proxy); + ok(ref == 1, "got %d references\n", ref); + ok(server_obj.ref == 1, "got %d references\n", server_obj.ref); + + /* client -> server */ + + StubMsg.IsClient = 1; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + IPersist_AddRef(&client_obj.IPersist_iface); + ptr = NdrInterfacePointerMarshall(&StubMsg, (unsigned char *)&client_obj.IPersist_iface, fmtstr_ip); + ok(!ptr, "ret %p\n", ptr); + ok(client_obj.ref > 2, "got %d references\n", client_obj.ref); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + + StubMsg.IsClient = 0; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + proxy = NULL; + ptr = NdrInterfacePointerUnmarshall(&StubMsg, (unsigned char **)&proxy, fmtstr_ip, 0); + ok(!ptr, "ret %p\n", ptr); + ok(!!proxy, "mem not alloced\n"); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + ok(client_obj.ref > 2, "got %d references\n", client_obj.ref); + + hr = IPersist_GetClassID(proxy, &clsid); + ok(hr == S_OK, "got hr %#x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IPersist), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + ref = IPersist_Release(proxy); + ok(client_obj.ref > 1, "got %d references\n", client_obj.ref); + ok(ref == client_obj.ref, "expected %d references, got %d\n", client_obj.ref, ref); + + NdrInterfacePointerFree(&StubMsg, (unsigned char *)proxy, fmtstr_ip); + ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); + + /* same, but free the interface after calling NdrInterfacePointerFree */ + + StubMsg.IsClient = 1; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + IPersist_AddRef(&client_obj.IPersist_iface); + ptr = NdrInterfacePointerMarshall(&StubMsg, (unsigned char *)&client_obj.IPersist_iface, fmtstr_ip); + ok(!ptr, "ret %p\n", ptr); + ok(client_obj.ref > 2, "got %d references\n", client_obj.ref); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + + StubMsg.IsClient = 0; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + proxy = NULL; + ptr = NdrInterfacePointerUnmarshall(&StubMsg, (unsigned char **)&proxy, fmtstr_ip, 0); + ok(!ptr, "ret %p\n", ptr); + ok(!!proxy, "mem not alloced\n"); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + ok(client_obj.ref > 2, "got %d references\n", client_obj.ref); + + NdrInterfacePointerFree(&StubMsg, (unsigned char *)proxy, fmtstr_ip); + ok(client_obj.ref > 1, "got %d references\n", client_obj.ref); + + hr = IPersist_GetClassID(proxy, &clsid); + ok(hr == S_OK, "got hr %#x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IPersist), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + ref = IPersist_Release(proxy); + ok(ref == 1, "got %d references\n", ref); + ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); + + /* An existing interface pointer is *not* released (in fact, it is ignored + * and may be invalid). In practice it will always be NULL anyway. */ + + StubMsg.IsClient = 1; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + IPersist_AddRef(&client_obj.IPersist_iface); + ptr = NdrInterfacePointerMarshall(&StubMsg, (unsigned char *)&client_obj.IPersist_iface, fmtstr_ip); + ok(!ptr, "ret %p\n", ptr); + ok(client_obj.ref > 2, "got %d references\n", client_obj.ref); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + + StubMsg.IsClient = 0; + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + proxy = &server_obj.IPersist_iface; + IPersist_AddRef(proxy); + ptr = NdrInterfacePointerUnmarshall(&StubMsg, (unsigned char **)&proxy, fmtstr_ip, 0); + ok(!ptr, "ret %p\n", ptr); + ok(!!proxy && proxy != &server_obj.IPersist_iface, "mem not alloced\n"); + ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); + ok(!my_free_called, "free called %d\n", my_free_called); + ok(client_obj.ref > 2, "got %d references\n", client_obj.ref); + ok(server_obj.ref == 2, "got %d references\n", server_obj.ref); + IPersist_Release(&server_obj.IPersist_iface); + + hr = IPersist_GetClassID(proxy, &clsid); + ok(hr == S_OK, "got hr %#x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IPersist), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); + + ref = IPersist_Release(proxy); + ok(client_obj.ref > 1, "got %d references\n", client_obj.ref); + ok(ref == client_obj.ref, "expected %d references, got %d\n", client_obj.ref, ref); + + NdrInterfacePointerFree(&StubMsg, (unsigned char *)proxy, fmtstr_ip); + ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); + + CoUninitialize(); +} + static void test_fullpointer_xlat(void) { PFULL_PTR_XLAT_TABLES pXlatTables; @@ -2635,6 +2910,7 @@ START_TEST( ndr_marshall ) test_simple_types(); test_nontrivial_pointer_types(); test_simple_struct(); + test_iface_ptr(); test_fullpointer_xlat(); test_client_init(); test_server_init(); -- 2.19.1

3 4

[PATCH v2 1/5] oleaut32/tests: Add some tests for marshalling safe arrays.
by Zebediah Figura 01 Nov '18

01 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 74 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++ 2 files changed, 78 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f2197425de..e3656d6dac 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1248,6 +1248,56 @@ static HRESULT WINAPI Widget_variant(IWidget *iface, VARIANT in, VARIANT *out, V return S_OK; } +static SAFEARRAY *make_safearray(ULONG len) +{ + SAFEARRAY *sa = SafeArrayCreateVector(VT_I4, 0, len); + int i, *data; + + SafeArrayAccessData(sa, (void **)&data); + for (i = 0; i < len; ++i) + data[i] = len + i; + SafeArrayUnaccessData(sa); + + return sa; +} + +static void check_safearray(SAFEARRAY *sa, LONG expect) +{ + LONG len, i, *data; + HRESULT hr; + + hr = SafeArrayGetUBound(sa, 1, &len); + len++; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == expect, "Expected len %d, got %d.\n", expect, len); + + hr = SafeArrayAccessData(sa, (void **)&data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < len; ++i) + ok(data[i] == len + i, "Expected data %d at %d, got %d.\n", len + i, i, data[i]); + + SafeArrayUnaccessData(sa); +} + +static HRESULT WINAPI Widget_safearray(IWidget *iface, SAFEARRAY *in, SAFEARRAY **out, SAFEARRAY **in_ptr, SAFEARRAY **in_out) +{ + HRESULT hr; + + check_safearray(in, 3); + ok(!*out, "Got array %p.\n", *out); + check_safearray(*in_ptr, 7); + check_safearray(*in_out, 9); + + hr = SafeArrayDestroy(*in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + *out = make_safearray(4); + *in_out = make_safearray(6); + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1297,6 +1347,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_ptr, Widget_bstr, Widget_variant, + Widget_safearray, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2160,6 +2211,28 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out)); } +static void test_marshal_safearray(IWidget *widget, IDispatch *disp) +{ + SAFEARRAY *in, *out, *in_ptr, *in_out; + HRESULT hr; + + in = make_safearray(3); + out = make_safearray(5); + in_ptr = make_safearray(7); + in_out = make_safearray(9); + hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_safearray(in, 3); + check_safearray(out, 4); + check_safearray(in_ptr, 7); + check_safearray(in_out, 6); + + SafeArrayDestroy(in); + SafeArrayDestroy(out); + SafeArrayDestroy(in_ptr); + SafeArrayDestroy(in_out); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2758,6 +2831,7 @@ todo_wine test_marshal_iface(pWidget, pDispatch); test_marshal_bstr(pWidget, pDispatch); test_marshal_variant(pWidget, pDispatch); + test_marshal_safearray(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 16d2f9d2d9..d630091f25 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -63,6 +63,7 @@ enum IWidget_dispids DISPID_TM_IFACE_PTR, DISPID_TM_BSTR, DISPID_TM_VARIANT, + DISPID_TM_SAFEARRAY, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -267,6 +268,9 @@ library TestTypelib [id(DISPID_TM_VARIANT)] HRESULT variant([in] VARIANT in, [out] VARIANT *out, [in] VARIANT *in_ptr, [in, out] VARIANT *in_out); + + [id(DISPID_TM_SAFEARRAY)] + HRESULT safearray([in] SAFEARRAY(int) in, [out] SAFEARRAY(int) *out, [in] SAFEARRAY(int) *in_ptr, [in, out] SAFEARRAY(int) *in_out); } [ -- 2.19.1

2 8

[PATCH] msvcp100: Add Concurrency::_GetCombinableSize stub.
by Piotr Caban 01 Nov '18

01 Nov '18

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41419 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 8 ++++++++ 6 files changed, 18 insertions(+), 10 deletions(-)

1 0

[PATCH] xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback.
by Andrew Eikum 01 Nov '18

01 Nov '18

From: Sebastian Lackner <sebastian(a)fds-team.de> During a callback function, some games use the wrong function signature for an xaudio2 function, which changed between xaudio2 versions. As a result, the EDI and ESI registers are overwritten by the game. Apparently Windows's implementation happens not to use these registers in a way that causes the crash. This patch pushes EDI and ESI onto the stack before calling the callback, then pops them back after the callback exits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42520 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43358 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Focht analyzed the bugs and suggested this patch could be upstreamed. I'm probably not the right person to review the ASM, but it looks OK to me. dlls/xaudio2_7/xaudio_dll.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 461ac56ffe..0bbe943f15 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> #define NONAMELESSUNION @@ -50,6 +51,37 @@ static HINSTANCE instance; #define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED #endif +#if XAUDIO2_VER != 0 && defined(__i386__) +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +#define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) +extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); +__ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "subl $8,%esp\n\t" + "pushl 12(%ebp)\n\t" /* BytesRequired */ + "pushl 8(%ebp)\n\t" /* This */ + "movl 8(%ebp),%eax\n\t" + "movl 0(%eax),%eax\n\t" + "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#endif + static void dump_fmt(const WAVEFORMATEX *fmt) { TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); -- 2.19.1

1 0

[PATCH 1/3] gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount().
by Nikolay Sivov 01 Nov '18

01 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 961d8459cb..0a3a3bef79 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1238,6 +1238,27 @@ static void test_GdipGetFontCollectionFamilyList(void) GdipDeleteFontFamily(family2); } +static void test_GdipGetFontCollectionFamilyCount(void) +{ + GpFontCollection *collection; + GpStatus status; + INT count; + + status = GdipGetFontCollectionFamilyCount(NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + count = 123; + status = GdipGetFontCollectionFamilyCount(NULL, &count); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(count == 123, "Unexpected family count %d.\n", count); + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + status = GdipGetFontCollectionFamilyCount(collection, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1269,6 +1290,7 @@ START_TEST(font) test_installedfonts(); test_heightgivendpi(); test_GdipGetFontCollectionFamilyList(); + test_GdipGetFontCollectionFamilyCount(); GdiplusShutdown(gdiplusToken); } -- 2.19.1

2 5

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

01 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> --- v4: Simplified it more and culled many variables. dlls/shell32/autocomplete.c | 193 ++++++++++++++++++++++++++++++++------------ 1 file changed, 143 insertions(+), 50 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b3f86f3..5a31259 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,88 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } +static int enumerate_strings_cmpfn(const void *a, const void *b) +{ + return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); +} + +static void enumerate_strings(IAutoCompleteImpl *ac) +{ + /* + 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) + */ + UINT i, cur = 0, array_size = 1024; + LPOLESTR *strs = NULL, *tmp; + ULONG n; + + do + { + if ((tmp = heap_realloc(strs, array_size * sizeof(*strs))) == NULL) + goto fail; + strs = tmp; + + do + IEnumString_Next(ac->enumstr, array_size - cur, &strs[cur], &n); + while (n != 0 && (cur += n) < array_size); + + array_size *= 2; + } while (n != 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: + i = cur; + while (i--) + CoTaskMemFree(strs[i]); + heap_free(strs); +} + +static UINT find_first_matching_enum_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len) +{ + WCHAR **strs = ac->enum_strs; + UINT index = ~0, a = 0, 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; + 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) { ShowWindow(hwnd, SW_HIDE); SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); + free_enum_strs(ac); } static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) @@ -240,7 +319,11 @@ 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]; + WCHAR c; + free_enum_strs(ac); + IEnumString_Reset(ac->enumstr); /* call before expand */ + + c = last_delim[1]; last_delim[1] = '\0'; IACList_Expand(ac->aclist, txt); last_delim[1] = c; @@ -276,6 +359,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,60 +398,60 @@ 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, a, b, i; + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; - if (ac->options & ACO_AUTOSUGGEST) - { - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); - SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); - } - for (cpt = 0;;) + if (len) { - 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)) + i = find_first_matching_enum_str(ac, text, len); + if (i == ~0) + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (flag == autoappend_flag_yes) + autoappend_str(ac, text, len, str[i], hwnd); + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + + /* Find the last string that begins with text, starting the search from i, + which is guaranteed to find at least one string (if none other, then i) */ + a = i, b = ac->enum_strs_num; + do { - 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); + UINT mid = (a + b - 1) / 2; + if (!strncmpiW(text, str[mid], len)) + a = mid + 1; + else + b = mid; + } while (a < b); } - - 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; + i = 0; + a = ac->enum_strs_num; + if (a == 0) return FALSE; } + cnt = a - i; + + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + do + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[i]); + while (++i < a); + + 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) @@ -382,28 +468,35 @@ 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 the listbox, but do not clear the enum strs, to match Windows */ + ShowWindow(ac->hwndListBox, SW_HIDE); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + } } 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); -- 1.9.1

2 9

[PATCH 2/2] widl: Ignore -robust command line option.
by Jacek Caban 01 Nov '18

01 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] widl: Add __int32 type support.
by Jacek Caban 01 Nov '18

01 Nov '18

1 0

[PATCH] server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support.
by Jacek Caban 01 Nov '18

01 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/pipe.c | 4 ---- server/fd.c | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-)

2 1

[PATCH 2/2] ntdll: Update debug trace.
by Jacek Caban 01 Nov '18

01 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] ntdll: Remove no longer needed event handle from async_irp.
by Jacek Caban 01 Nov '18

01 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 5 ----- 1 file changed, 5 deletions(-)

1 0

[PATCH] comctl32/pager: Support header notification conversion.
by Zhiyi Zhang 01 Nov '18

01 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 44 +++++++++++++++++++ dlls/comctl32/tests/pager.c | 87 +++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 421dbedd81..4763ed5640 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -1051,6 +1051,16 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) case DTN_FORMATQUERYW: return DTN_FORMATQUERYA; case DTN_USERSTRINGW: return DTN_USERSTRINGA; case DTN_WMKEYDOWNW: return DTN_WMKEYDOWNA; + /* Header */ + case HDN_BEGINTRACKW: return HDN_BEGINTRACKA; + case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + case HDN_ENDTRACKW: return HDN_ENDTRACKA; + case HDN_GETDISPINFOW: return HDN_GETDISPINFOA; + case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_ITEMDBLCLICKW: return HDN_ITEMDBLCLICKA; + case HDN_TRACKW: return HDN_TRACKA; /* List View */ case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; @@ -1252,6 +1262,40 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) NMDATETIMESTRINGW *nmdts = (NMDATETIMESTRINGW *)hdr; return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, (WCHAR **)&nmdts->pszUserString, NULL, CONVERT_SEND); } + /* Header */ + case HDN_BEGINTRACKW: + case HDN_DIVIDERDBLCLICKW: + case HDN_ENDTRACKW: + case HDN_ITEMCHANGEDW: + case HDN_ITEMCHANGINGW: + case HDN_ITEMCLICKW: + case HDN_ITEMDBLCLICKW: + case HDN_TRACKW: + { + NMHEADERW *nmh = (NMHEADERW *)hdr; + WCHAR *oldText = NULL, *oldFilterText = NULL; + HD_TEXTFILTERW *tf = NULL; + + hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + + if (!nmh->pitem) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + if (nmh->pitem->mask & HDI_TEXT) oldText = PAGER_ConvertText(&nmh->pitem->pszText); + if ((nmh->pitem->mask & HDI_FILTER) && (nmh->pitem->type == HDFT_ISSTRING) && nmh->pitem->pvFilter) + { + tf = (HD_TEXTFILTERW *)nmh->pitem->pvFilter; + oldFilterText = PAGER_ConvertText(&tf->pszText); + } + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + PAGER_RestoreText(&nmh->pitem->pszText, oldText); + if (tf) PAGER_RestoreText(&tf->pszText, oldFilterText); + return ret; + } + case HDN_GETDISPINFOW: + { + NMHDDISPINFOW *nmhddi = (NMHDDISPINFOW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmhddi->mask, HDI_TEXT, &nmhddi->pszText, &nmhddi->cchTextMax, + SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE); + } /* List View */ case LVN_BEGINLABELEDITW: case LVN_ENDLABELEDITW: diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index ff10be8074..718df2510f 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -282,6 +282,14 @@ static const struct message set_pos_empty_seq[] = { { 0 } }; +static CHAR *heap_strdup(const CHAR *str) +{ + int len = lstrlenA(str) + 1; + CHAR *ret = heap_alloc(len * sizeof(CHAR)); + lstrcpyA(ret, str); + return ret; +} + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -643,6 +651,10 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) if (receive_data->write_text) memcpy(*text, receive_data->write_text, receive_data->write_text_size); + /* 64bit Windows will try to free the text pointer even if it's application provided when handling + * HDN_GETDISPINFOW. Deliberate leak here. */ + else if(notify_test_info.unicode == HDN_GETDISPINFOW) + *text = heap_strdup(receive_data->write_pointer); else *text = receive_data->write_pointer; if (text_max && receive_data->write_text_max != -1) *text_max = receive_data->write_text_max; @@ -759,6 +771,45 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L notify_generic_text_handler((CHAR **)&nmdts->pszUserString, NULL); break; } + /* Header */ + case HDN_BEGINDRAG: + case HDN_ENDDRAG: + case HDN_BEGINFILTEREDIT: + case HDN_ENDFILTEREDIT: + case HDN_DROPDOWN: + case HDN_FILTERCHANGE: + case HDN_ITEMKEYDOWN: + case HDN_ITEMSTATEICONCLICK: + case HDN_OVERFLOWCLICK: + { + NMHEADERW *nmhd = (NMHEADERW *)hdr; + ok(!lstrcmpW(nmhd->pitem->pszText, test_w), "Expect %s, got %s\n", wine_dbgstr_w(test_w), + wine_dbgstr_w(nmhd->pitem->pszText)); + ok(!lstrcmpW(((HD_TEXTFILTERW *)nmhd->pitem->pvFilter)->pszText, test_w), "Expect %s, got %s\n", + wine_dbgstr_w(test_w), wine_dbgstr_w(((HD_TEXTFILTERW *)nmhd->pitem->pvFilter)->pszText)); + break; + } + case HDN_BEGINTRACKA: + case HDN_DIVIDERDBLCLICKA: + case HDN_ENDTRACKA: + case HDN_ITEMCHANGEDA: + case HDN_ITEMCHANGINGA: + case HDN_ITEMCLICKA: + case HDN_ITEMDBLCLICKA: + case HDN_TRACKA: + { + NMHEADERA *nmhd = (NMHEADERA *)hdr; + ok(!lstrcmpA(nmhd->pitem->pszText, test_a), "Expect %s, got %s\n", test_a, nmhd->pitem->pszText); + ok(!lstrcmpA(((HD_TEXTFILTERA *)nmhd->pitem->pvFilter)->pszText, test_a), "Expect %s, got %s\n", test_a, + ((HD_TEXTFILTERA *)nmhd->pitem->pvFilter)->pszText); + break; + } + case HDN_GETDISPINFOA: + { + NMHDDISPINFOA *nmhddi = (NMHDDISPINFOA *)hdr; + notify_generic_text_handler(&nmhddi->pszText, &nmhddi->cchTextMax); + break; + } /* List View */ case LVN_BEGINLABELEDITA: case LVN_ENDLABELEDITA: @@ -1046,6 +1097,36 @@ static void test_wm_notify_datetime(HWND pager) } } +static void test_wm_notify_header(HWND pager) +{ + NMHEADERW nmh = {0}; + HDITEMW hdi = {0}; + HD_TEXTFILTERW hdtf = {0}; + + hdi.mask = HDI_TEXT | HDI_FILTER; + hdi.pszText = test_w; + hdtf.pszText = test_w; + nmh.pitem = &hdi; + nmh.pitem->pvFilter = &hdtf; + send_notify(pager, HDN_BEGINDRAG, HDN_BEGINDRAG, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ENDDRAG, HDN_ENDDRAG, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_BEGINFILTEREDIT, HDN_BEGINFILTEREDIT, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ENDFILTEREDIT, HDN_ENDFILTEREDIT, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_DROPDOWN, HDN_DROPDOWN, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_FILTERCHANGE, HDN_FILTERCHANGE, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMKEYDOWN, HDN_ITEMKEYDOWN, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMSTATEICONCLICK, HDN_ITEMSTATEICONCLICK, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_OVERFLOWCLICK, HDN_OVERFLOWCLICK, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_BEGINTRACKW, HDN_BEGINTRACKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_DIVIDERDBLCLICKW, HDN_DIVIDERDBLCLICKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ENDTRACKW, HDN_ENDTRACKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMCHANGEDW, HDN_ITEMCHANGEDA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMCHANGINGW, HDN_ITEMCHANGINGA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMCLICKW, HDN_ITEMCLICKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_ITEMDBLCLICKW, HDN_ITEMDBLCLICKA, (LPARAM)&nmh, TRUE); + send_notify(pager, HDN_TRACKW, HDN_TRACKA, (LPARAM)&nmh, TRUE); +} + static void test_wm_notify_tooltip(HWND pager) { NMTTDISPINFOW nmttdi; @@ -1094,6 +1175,8 @@ static void test_wm_notify(void) static NMDATETIMEFORMATQUERYW nmdtfq; static NMDATETIMEWMKEYDOWNW nmdtkd; static NMDATETIMESTRINGW nmdts; + /* Header */ + static NMHDDISPINFOW nmhddi; /* List View */ static NMLVDISPINFOW nmlvdi; static NMLVGETINFOTIPW nmlvgit; @@ -1124,6 +1207,9 @@ static void test_wm_notify(void) CONVERT_SEND}, {&nmdts, sizeof(nmdts), NULL, 0, (WCHAR **)&nmdts.pszUserString, NULL, DTN_USERSTRINGW, DTN_USERSTRINGA, CONVERT_SEND}, + /* Header */ + {&nmhddi, sizeof(nmhddi), &nmhddi.mask, HDI_TEXT, &nmhddi.pszText, &nmhddi.cchTextMax, HDN_GETDISPINFOW, + HDN_GETDISPINFOA, SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE}, /* List View */ {&nmlvfi, sizeof(nmlvfi), &nmlvfi.lvfi.flags, LVFI_STRING, (WCHAR **)&nmlvfi.lvfi.psz, NULL, LVN_INCREMENTALSEARCHW, LVN_INCREMENTALSEARCHA, CONVERT_SEND}, @@ -1212,6 +1298,7 @@ static void test_wm_notify(void) /* Tests for those that can't be covered by generic text test helper */ test_wm_notify_comboboxex(pager); test_wm_notify_datetime(pager); + test_wm_notify_header(pager); test_wm_notify_tooltip(pager); DestroyWindow(parent); -- 2.19.1

2 1

[PATCH 1/2] widl: Only mark simple [out] pointers as on-stack if they are [ref] pointers.
by Zebediah Figura 01 Nov '18

01 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 030102493d..9cee15b9a3 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2145,7 +2145,7 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, else fc = get_basic_fc(ref); - if (out_attr && !in_attr) + if (out_attr && !in_attr && pointer_fc == FC_RP) flags |= FC_ALLOCED_ON_STACK; print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n", -- 2.19.1

2 3

[PATCH] webservices: Don't use MSG_PEEK.
by Hans Leidekker 01 Nov '18

01 Nov '18

As suggested by Jacek. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 94c3dc1e99..b945c7f55a 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1150,27 +1150,21 @@ static void set_blocking( SOCKET socket, BOOL blocking ) ioctlsocket( socket, FIONBIO, &state ); } -static int sock_peek( SOCKET socket ) +static int sock_recv( SOCKET socket, char *buf, int len ) { - int ret; - char byte; + int count, ret; - set_blocking( socket, FALSE ); - ret = recv( socket, &byte, 1, MSG_PEEK ); - set_blocking( socket, TRUE ); - return ret; -} + if ((ret = recv( socket, buf, len, 0 )) <= 0) return ret; + len -= ret; -static int sock_recv( SOCKET socket, char *buf, int len ) -{ - int count, ret = 0; + set_blocking( socket, FALSE ); for (;;) { if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; ret += count; len -= count; - if (sock_peek( socket ) != 1) break; } + set_blocking( socket, TRUE ); return ret; } -- 2.11.0

1 0

[PATCH 5/5] wined3d: Prefer bind flags over usage flags in ffp_blit_supported().
by Henri Verbeet 01 Nov '18

01 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e41909778a1..133055ba4d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2016,7 +2016,7 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 } } - if (!(dst_resource->usage & WINED3DUSAGE_RENDERTARGET)) + if (!(dst_resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) { TRACE("Can only blit to render targets.\n"); return FALSE; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Prefer bind flags over usage flags in fbo_blitter_supported().
by Henri Verbeet 01 Nov '18

01 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40d8974672e..e41909778a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -312,10 +312,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->bind_flags & WINED3D_BIND_RENDER_TARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->bind_flags & WINED3D_BIND_RENDER_TARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Prefer bind flags over usage flags in wined3d_texture_prepare_texture().
by Henri Verbeet 01 Nov '18

01 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5ee86d3e58c..e01becd44f8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1783,7 +1783,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (srgb) internal = format_gl->srgb_internal; - else if (resource->usage & WINED3DUSAGE_RENDERTARGET && wined3d_resource_is_offscreen(resource)) + else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) internal = format_gl->rt_internal; else internal = format_gl->internal; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Prefer bind flags over usage flags in wined3d_texture_upload_data().
by Henri Verbeet 01 Nov '18

01 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df92b53f1f5..5ee86d3e58c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2053,7 +2053,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s if (srgb) internal = format_gl->srgb_internal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + else if (texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(&texture->resource)) internal = format_gl->rt_internal; else -- 2.11.0

1 0

[PATCH 1/5] wined3d: Prefer bind flags over usage flags in wined3d_texture_init().
by Henri Verbeet 01 Nov '18

01 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 45de4a10d1a..df92b53f1f5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if (!(desc->usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL)) - && (flags & WINED3D_TEXTURE_CREATE_MAPPABLE)) + if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) + || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - if (desc->usage & WINED3DUSAGE_RENDERTARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) + if (desc->bind_flags & WINED3D_BIND_RENDER_TARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) FIXME("Trying to create a CPU accessible render target.\n"); pow2_width = desc->width; @@ -2955,7 +2955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->pow2_height = pow2_height; if ((pow2_width > d3d_info->limits.texture_size || pow2_height > d3d_info->limits.texture_size) - && (desc->usage & WINED3DUSAGE_TEXTURE)) + && (desc->bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { /* One of four options: * 1: Do the same as we do with NPOT and scale the texture. (Any -- 2.11.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 01 Nov '18

01 Nov '18

1 0

[PATCH 1/5] oleaut32/tests: Add some tests for marshalling safe arrays.
by Zebediah Figura 01 Nov '18

01 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 74 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++ 2 files changed, 78 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f2197425de..e3656d6dac 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1248,6 +1248,56 @@ static HRESULT WINAPI Widget_variant(IWidget *iface, VARIANT in, VARIANT *out, V return S_OK; } +static SAFEARRAY *make_safearray(ULONG len) +{ + SAFEARRAY *sa = SafeArrayCreateVector(VT_I4, 0, len); + int i, *data; + + SafeArrayAccessData(sa, (void **)&data); + for (i = 0; i < len; ++i) + data[i] = len + i; + SafeArrayUnaccessData(sa); + + return sa; +} + +static void check_safearray(SAFEARRAY *sa, LONG expect) +{ + LONG len, i, *data; + HRESULT hr; + + hr = SafeArrayGetUBound(sa, 1, &len); + len++; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == expect, "Expected len %d, got %d.\n", expect, len); + + hr = SafeArrayAccessData(sa, (void **)&data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < len; ++i) + ok(data[i] == len + i, "Expected data %d at %d, got %d.\n", len + i, i, data[i]); + + SafeArrayUnaccessData(sa); +} + +static HRESULT WINAPI Widget_safearray(IWidget *iface, SAFEARRAY *in, SAFEARRAY **out, SAFEARRAY **in_ptr, SAFEARRAY **in_out) +{ + HRESULT hr; + + check_safearray(in, 3); + ok(!*out, "Got array %p.\n", *out); + check_safearray(*in_ptr, 7); + check_safearray(*in_out, 9); + + hr = SafeArrayDestroy(*in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + *out = make_safearray(4); + *in_out = make_safearray(6); + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1297,6 +1347,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_ptr, Widget_bstr, Widget_variant, + Widget_safearray, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2160,6 +2211,28 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out)); } +static void test_marshal_safearray(IWidget *widget, IDispatch *disp) +{ + SAFEARRAY *in, *out, *in_ptr, *in_out; + HRESULT hr; + + in = make_safearray(3); + out = make_safearray(5); + in_ptr = make_safearray(7); + in_out = make_safearray(9); + hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_safearray(in, 3); + check_safearray(out, 4); + check_safearray(in_ptr, 7); + check_safearray(in_out, 6); + + SafeArrayDestroy(in); + SafeArrayDestroy(out); + SafeArrayDestroy(in_ptr); + SafeArrayDestroy(in_out); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2758,6 +2831,7 @@ todo_wine test_marshal_iface(pWidget, pDispatch); test_marshal_bstr(pWidget, pDispatch); test_marshal_variant(pWidget, pDispatch); + test_marshal_safearray(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 16d2f9d2d9..d630091f25 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -63,6 +63,7 @@ enum IWidget_dispids DISPID_TM_IFACE_PTR, DISPID_TM_BSTR, DISPID_TM_VARIANT, + DISPID_TM_SAFEARRAY, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -267,6 +268,9 @@ library TestTypelib [id(DISPID_TM_VARIANT)] HRESULT variant([in] VARIANT in, [out] VARIANT *out, [in] VARIANT *in_ptr, [in, out] VARIANT *in_out); + + [id(DISPID_TM_SAFEARRAY)] + HRESULT safearray([in] SAFEARRAY(int) in, [out] SAFEARRAY(int) *out, [in] SAFEARRAY(int) *in_ptr, [in, out] SAFEARRAY(int) *in_out); } [ -- 2.19.1

2 7

[PATCH v2 1/5] mfplat: Add MFCreateFile stub
by Sven Baars 01 Nov '18

01 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch series stops Disgaea 5 from crashing. This is the first time I send any functional patches, so feel free to correct me. v2: Use the right Release method and test for IUnknown dlls/mfplat/main.c | 30 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/Makefile.in | 2 + dlls/mfplat/tests/mfplat.c | 101 +++++++++++++++++++++++++++++++++- dlls/mfplat/tests/resource.rc | 24 ++++++++ dlls/mfplat/tests/test.mp4 | Bin 0 -> 1554 bytes include/mfapi.h | 2 + 7 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 dlls/mfplat/tests/resource.rc create mode 100644 dlls/mfplat/tests/test.mp4 diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..0bf4d07bbd 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -452,6 +452,8 @@ typedef struct _mfbytestream { IMFByteStream IMFByteStream_iface; LONG ref; + + IMFAttributes *attributes; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -470,6 +472,10 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r { *out = &This->IMFByteStream_iface; } + else if(IsEqualGUID(riid, &IID_IMFAttributes) && This->attributes) + { + *out = This->attributes; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -500,6 +506,8 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + if (This->attributes) + IMFAttributes_Release(This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -681,12 +689,34 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt object->ref = 1; object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + MFCreateAttributes(&object->attributes, 0); + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + LPCWSTR url, IMFByteStream **bytestream) +{ + mfbytestream *object; + + FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + MFCreateAttributes(&object->attributes, 0); *bytestream = &object->IMFByteStream_iface; return S_OK; } + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 3e42d2fd70..4533eeb71c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -43,7 +43,7 @@ @ stub MFCreateAudioMediaType @ stub MFCreateCollection @ stdcall MFCreateEventQueue(ptr) -@ stub MFCreateFile +@ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index a5553a5af3..07cf328ad2 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -3,3 +3,5 @@ IMPORTS = ole32 mfplat C_SRCS = \ mfplat.c + +RC_SRCS = resource.rc diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46579..2c7dfda767 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -49,6 +49,36 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), + &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), + "couldn't write resource\n" ); + CloseHandle(file); + + return pathW; +} + static BOOL check_clsid(CLSID *clsids, UINT32 count) { int i; @@ -170,6 +200,9 @@ static void test_source_resolver(void) { IMFSourceResolver *resolver, *resolver2; HRESULT hr; + WCHAR *filename; + + static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; if (!pMFCreateSourceResolver) { @@ -177,6 +210,12 @@ static void test_source_resolver(void) return; } + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pMFCreateSourceResolver(NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -259,6 +298,8 @@ static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; IStream *stream; + IMFAttributes *attributes = NULL; + IUnknown *unknown; HRESULT hr; if(!pMFCreateMFByteStreamOnStream) @@ -270,13 +311,70 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + + if (hr == S_OK) + { + ok(attributes != NULL, "got NULL\n"); + IMFAttributes_Release(attributes); + } + + hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + IUnknown_Release(unknown); + IStream_Release(stream); IMFByteStream_Release(bytestream); } +static void test_MFCreateFile(void) +{ + IMFByteStream *bytestream; + IMFAttributes *attributes = NULL; + IUnknown *unknown; + HRESULT hr; + WCHAR *filename; + + filename = load_resource(mp4file); + + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attributes != NULL, "got NULL\n"); + IMFAttributes_Release(attributes); + + hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + IUnknown_Release(unknown); + + IMFByteStream_Release(bytestream); + + MFShutdown(); + + DeleteFileW(filename); +} + static void test_MFCreateMemoryBuffer(void) { IMFMediaBuffer *buffer; @@ -390,6 +488,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFSample(); + test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); diff --git a/dlls/mfplat/tests/resource.rc b/dlls/mfplat/tests/resource.rc new file mode 100644 index 0000000000..e9bf920c31 --- /dev/null +++ b/dlls/mfplat/tests/resource.rc @@ -0,0 +1,24 @@ +/* + * Resources for mfplat test suite. + * + * Copyright 2018 Sven Baars + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: test.mp4 */ +test.mp4 RCDATA test.mp4 diff --git a/dlls/mfplat/tests/test.mp4 b/dlls/mfplat/tests/test.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a5bbca6bbf7692eab047050b79b8ccc83516e6b4 GIT binary patch literal 1554 zcmZuxeN0nV6u<3bttg}g3M<<3v4A5C7=;cYskS&=aH+Gw(TQ=|2k#+BpKbac6$q26 zgvfMZE^O--6L1NclR1flh8QLw4%rM5#eGC{R2Jv(j|s9(8MANazOwnmo#gk<x#yhw zyZ4@R-$e*%%DGx+CF@`ik|L}DS&UP!LkKM^chNNX_cIj9Atd<{DdnJiN*lZEK&*TH zLUnilE|&Pi#`t<(V2JeCh0xUFbE~$JpP!3QD)e^to@B05Kdu~jt~KuYz}1=h$wy;^ z-(P&iYuL#r*6qMlmYD;w&8gboiuVmim)E`@VY(w}d_`I2ihOP3>WzsJPV$oN<)LWX zeE-6+iWMz`xA<B45szMa^nqwQ5w>wzrc-v;{3ns3&Hgygab@co_v%sWh^~kxZdgv1 zG$e27=y&X0FwfM)&vJ1wQfF>hX5`>p!|hca@<xwAt#6-gnD>;lG>BPmWrt3nUp`73 z+Yr|+TbnzS=UsV1v;C6gviW|rw)-!S-=bHn;0v1+QGDC}Ia|1D&?ob%jF`h$Wc#Ew zV;vf3`obS*$vM<kEDwCQ`|#nw>4L6xr#4wnKY06wGT*}wdIn7LW=}zVn#?n%4mVMz zS*QG<-xMcs%$)a1n<6jX{=IjfF~joa!xMeyYRwY|Cr0Vm>*3w%uu#*`=0;_WapAn$ zU<`El@AbuA79AjpWMkq|c1;#tZJ#~+J(2cx>Nm%BvdmP*5AP|wGW~$TESZLVhn6a1 ztO^C+GL%><v}DW7eXsQJ-HUG|I!ZcwqEv0#Ya@m<t5KG7N5rlo$2IYtr*eGsbj8h0 z?c@jJ8?GH6PW~!_$shUIcJraKf^47ff8>qKKRQs;^7r5rKP{`hCoZsRD*LTIOV>}^ zv}Z#0Dsy%(f4!(s5zT+wRX-W1@{bU&DxT$gcYNB95Wz4GhZ`=WopD!CphZIb3Y&Tt zN#HB;J~@EE6G4Pb;@qcgDO~ywITu+4q3v9iuqGi&TV#WEm&%fL{&(FFn1q2)5>0U| zXbo*=;Rh207#4X2E~$c{DoKbWFx1ksXMtOViZ2NB(km#tOR(VMuB70{eJoZOI||7? zl%2*olCw<Zo^mi$Zbl##Z##(!#x#_R#yMDUJgnMfPYBwQI+iQ7gFVc0?7t1cIX-wf zaHFt@IfI@MICdeJ7+9Xp2>Ks?)jSUa8_iO<Oo;G!Jey%!2<ZHT2<$>SD4dRa20SkU zV;68rdYYqx<dOt*;hjTh6eXe7GH{(SlkT#Yax=1Y8M;ip4CY9n)kw{9LK`q0-qUjY z7J{U}>4bH`mH}`KUjy7ccnDD_0CJHA@_=3toU_OwXamIR7Gqf9{35_wfE7@%h&<3n zKs;bQARC}!xiSZ6ESNJ5P+CoKB<O7nEod-NqPX>NU0kHoiM#Wkq*n&-SMq0^0~2cD TJ;x-N6hTeOp(eUDP!ruh^$B~# literal 0 HcmV?d00001 diff --git a/include/mfapi.h b/include/mfapi.h index bc832bf95f..0230a08471 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,8 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + LPCWSTR url, IMFByteStream **bytestream); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); -- 2.17.1

2 3

[PATCH vkd3d 4/5] tests: Introduce check_sub_resource_uvec4().
by Józef Kucia 31 Oct '18

31 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 25c2fdf80439..47591948ce4d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -826,6 +826,39 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } +#define check_sub_resource_uvec4(a, b, c, d, e) check_sub_resource_uvec4_(__LINE__, a, b, c, d, e) +static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture, + unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + const struct uvec4 *expected_value) +{ + struct resource_readback rb; + struct uvec4 value = {}; + unsigned int x = 0, y; + bool all_match = true; + + get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = *get_readback_uvec4(&rb, x, y); + if (!compare_uvec4(&value, expected_value)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + release_resource_readback(&rb); + + ok_(line)(all_match, + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", + value.x, value.y, value.z, value.w, + expected_value->x, expected_value->y, expected_value->z, expected_value->w, x, y); +} + static bool use_warp_device; static unsigned int use_adapter_idx; @@ -5459,10 +5492,9 @@ static void test_shader_instructions(void) ID3D12GraphicsCommandList *command_list; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; - unsigned int i, x, y; ID3D12Resource *cb; + unsigned int i; HRESULT hr; static const DWORD ps_div_code[] = @@ -7850,20 +7882,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - - get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) - { - const struct uvec4 *v = get_readback_uvec4(&rb, x, y); - ok(compare_uvec4(v, &uint_tests[i].output.u), - "Got 0x%08x, 0x%08x, 0x%08x, 0x%08x expected 0x%08x, 0x%08x, 0x%08x, 0x%08x.\n", - v->x, v->y, v->z, v->w, uint_tests[i].output.u.x, uint_tests[i].output.u.y, - uint_tests[i].output.u.z, uint_tests[i].output.u.w); - } - } - release_resource_readback(&rb); + check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uint_tests[i].output.u); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, -- 2.18.1

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Use vkd3d_dxbc_compiler_emit_swizzle_ext() in vkd3d_dxbc_compiler_emit_input().
by Józef Kucia 31 Oct '18

31 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9493d53591bb..a754489c060d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3223,6 +3223,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { component_type = builtin->component_type; input_component_count = builtin->component_count; + component_idx = 0; } else { @@ -3238,8 +3239,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); } else { @@ -3301,9 +3300,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_bitcast(builder, float_type_id, val_id); } - if (input_component_count != component_count) - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); + val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + vkd3d_write_mask_from_component_count(input_component_count) << component_idx, + VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); } -- 2.18.1

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Check more accurately if swizzle is required.
by Józef Kucia 31 Oct '18

31 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Eliminates redundant OpVectorShuffle instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 8 +++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dee561ac033c..9493d53591bb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2528,10 +2528,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, components[VKD3D_VEC4_SIZE]; - if (swizzle == VKD3D_NO_SWIZZLE && write_mask == val_write_mask) + component_count = vkd3d_write_mask_component_count(write_mask); + val_component_count = vkd3d_write_mask_component_count(val_write_mask); + + if (component_count == val_component_count + && vkd3d_compact_swizzle(swizzle, write_mask) == vkd3d_compact_swizzle(VKD3D_NO_SWIZZLE, val_write_mask)) return val_id; - component_count = vkd3d_write_mask_component_count(write_mask); type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); if (component_count == 1) @@ -2541,7 +2544,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); } - val_component_count = vkd3d_write_mask_component_count(val_write_mask); if (val_component_count == 1) { for (i = 0, component_idx = 0; i < VKD3D_VEC4_SIZE; ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index dd3650b2d828..651a5959f1d1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -882,6 +882,22 @@ static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, return (swizzle >> VKD3D_SWIZZLE_SHIFT(idx)) & VKD3D_SWIZZLE_MASK; } +static inline unsigned int vkd3d_compact_swizzle(unsigned int swizzle, unsigned int write_mask) +{ + unsigned int i, compacted_swizzle = 0; + + for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + { + compacted_swizzle <<= VKD3D_SWIZZLE_SHIFT(1); + compacted_swizzle |= vkd3d_swizzle_get_component(swizzle, i); + } + } + + return compacted_swizzle; +} + #define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) -- 2.18.1

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Try harder to avoid using private variables for inputs.
by Józef Kucia 31 Oct '18

31 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 43 ++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a754489c060d..e70c2d62be8b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2442,8 +2442,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_count, index_count = 0; uint32_t type_id, ptr_type_id; - unsigned int index_count = 0; uint32_t indexes[2]; if (reg->type == VKD3DSPR_CONSTBUFFER) @@ -2472,7 +2472,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp if (index_count) { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + component_count = vkd3d_write_mask_component_count(register_info->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, register_info->component_type, component_count); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id); register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id, indexes, index_count); @@ -2642,8 +2643,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler reg_component_count = vkd3d_write_mask_component_count(reg_info->write_mask); - if (component_idx > reg_component_count) - ERR("Invalid component_idx for register %#x, %u.\n", reg->type, reg->idx[0].offset); + if (!(reg_info->write_mask & (VKD3DSP_WRITEMASK_0 << component_idx))) + ERR("Invalid component_idx for register %#x, %u (write_mask %#x).\n", + reg->type, reg->idx[0].offset, reg_info->write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); reg_id = reg_info->id; @@ -3175,6 +3177,20 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } +static unsigned int vkd3d_count_signature_elements_for_reg( + const struct vkd3d_shader_signature *signature, unsigned int reg_idx) +{ + unsigned int i, count; + + count = 0; + for (i = 0; i < signature->element_count; ++i) + { + if (signature->elements[i].register_index == reg_idx) + ++count; + } + return count; +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3228,9 +3244,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi else { component_type = signature_element->component_type; - input_component_count = component_count; + input_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); + component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask & 0xff); + } + + use_private_var = builtin && builtin->fixup_pfn; + if (input_component_count != VKD3D_VEC4_SIZE + && vkd3d_count_signature_elements_for_reg(compiler->input_signature, reg_idx) > 1) + { + use_private_var = true; + component_count = VKD3D_VEC4_SIZE; } - assert(component_count <= input_component_count); storage_class = SpvStorageClassInput; input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, @@ -3247,8 +3271,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } - use_private_var = component_count != VKD3D_VEC4_SIZE || (builtin && builtin->fixup_pfn); - vkd3d_symbol_make_register(&reg_symbol, reg); if (!use_private_var) @@ -3259,14 +3281,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { storage_class = SpvStorageClassPrivate; var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, array_size); + storage_class, VKD3D_TYPE_FLOAT, component_count, array_size); } if (!entry) { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.write_mask = use_private_var + ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); -- 2.18.1

2 1

[PATCH] user32/tests: Add scrollbar subclassing tests.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/scroll.c | 74 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+)

1 0

[PATCH] qwave: add new stub dll
by Louis Lenders 31 Oct '18

31 Oct '18

fix for https://bugs.winehq.org/show_bug.cgi?id=46066 this dll seems to be present on winversions >= winVista (on testbots) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/qwave/Makefile.in | 4 ++++ dlls/qwave/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/qwave/qwave.spec | 14 ++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 dlls/qwave/Makefile.in create mode 100644 dlls/qwave/main.c create mode 100644 dlls/qwave/qwave.spec diff --git a/configure b/configure index 9d4a7a8b78..780c5c475d 100755 --- a/configure +++ b/configure @@ -1486,6 +1486,7 @@ enable_qmgr enable_qmgrprxy enable_quartz enable_query +enable_qwave enable_rasapi32 enable_rasdlg enable_regapi @@ -19758,6 +19759,7 @@ wine_fn_config_makefile dlls/qmgrprxy enable_qmgrprxy wine_fn_config_makefile dlls/quartz enable_quartz wine_fn_config_makefile dlls/quartz/tests enable_tests wine_fn_config_makefile dlls/query enable_query +wine_fn_config_makefile dlls/qwave enable_qwave wine_fn_config_makefile dlls/rasapi16.dll16 enable_win16 wine_fn_config_makefile dlls/rasapi32 enable_rasapi32 wine_fn_config_makefile dlls/rasapi32/tests enable_tests diff --git a/configure.ac b/configure.ac index b64d99e9d1..82a3c46a24 100644 --- a/configure.ac +++ b/configure.ac @@ -3611,6 +3611,7 @@ WINE_CONFIG_MAKEFILE(dlls/qmgrprxy) WINE_CONFIG_MAKEFILE(dlls/quartz) WINE_CONFIG_MAKEFILE(dlls/quartz/tests) WINE_CONFIG_MAKEFILE(dlls/query) +WINE_CONFIG_MAKEFILE(dlls/qwave) WINE_CONFIG_MAKEFILE(dlls/rasapi16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/rasapi32) WINE_CONFIG_MAKEFILE(dlls/rasapi32/tests) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in new file mode 100644 index 0000000000..9de8224697 --- /dev/null +++ b/dlls/qwave/Makefile.in @@ -0,0 +1,4 @@ +MODULE = qwave.dll + +C_SRCS = \ + main.c diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c new file mode 100644 index 0000000000..ce1cfbd670 --- /dev/null +++ b/dlls/qwave/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qwave); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec new file mode 100644 index 0000000000..27b07f55d6 --- /dev/null +++ b/dlls/qwave/qwave.spec @@ -0,0 +1,14 @@ +@ stub QDLHPathDiagnostics +@ stub QDLHStartDiagnosingPath +@ stub QOSAddSocketToFlow +@ stub QOSCancel +@ stub QOSCloseHandle +@ stub QOSCreateHandle +@ stub QOSEnumerateFlows +@ stub QOSNotifyFlow +@ stub QOSQueryFlow +@ stub QOSRemoveSocketFromFlow +@ stub QOSSetFlow +@ stub QOSStartTrackingClient +@ stub QOSStopTrackingClient +@ stub ServiceMain -- 2.17.1

1 0

[PATCH 3/3] server: Use file mode flags in async_handoff to decide if request is blocking.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 20 +++++++------------- server/async.c | 4 ++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 14 insertions(+), 20 deletions(-)

1 0

[PATCH 2/3] server: Introduce is_fd_synchronous helper.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/fd.c | 10 ++++++++-- server/file.c | 7 +------ server/file.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-)

1 0

[PATCH 1/3 v3] ntdll/tests: Add more I/O blocking and completion tests.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 319 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3 v2] ntdll/tests: Add more I/O blocking and completion tests.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed uninitialized memory access. dlls/ntdll/tests/pipe.c | 319 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 1 deletion(-)

2 2

[PATCH 2/6] webservices: Try to receive the whole message at once.
by Hans Leidekker 31 Oct '18

31 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 464645b095..91ffe5be00 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1137,9 +1137,39 @@ done: return hr; } +static void set_blocking( SOCKET socket, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( socket, FIONBIO, &state ); +} + +static int sock_peek( SOCKET socket ) +{ + int ret; + char byte; + + set_blocking( socket, FALSE ); + ret = recv( socket, &byte, 1, MSG_PEEK ); + set_blocking( socket, TRUE ); + return ret; +} + +static int sock_recv( SOCKET socket, char *buf, int len ) +{ + int count, ret = 0; + for (;;) + { + if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; + ret += count; + len -= count; + if (sock_peek( socket ) != 1) break; + } + return ret; +} + static HRESULT receive_bytes( struct channel *channel, unsigned char *bytes, int len ) { - int count = recv( channel->u.tcp.socket, (char *)bytes, len, 0 ); + int count = sock_recv( channel->u.tcp.socket, (char *)bytes, len ); if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); if (count != len) return WS_E_INVALID_FORMAT; return S_OK; @@ -1494,7 +1524,7 @@ static HRESULT receive_message_unsized( struct channel *channel, SOCKET socket ) if ((hr = resize_read_buffer( channel, max_len )) != S_OK) return hr; channel->read_size = 0; - if ((bytes_read = recv( socket, channel->read_buf, max_len, 0 )) < 0) + if ((bytes_read = sock_recv( socket, channel->read_buf, max_len )) < 0) { return HRESULT_FROM_WIN32( WSAGetLastError() ); } @@ -1513,7 +1543,7 @@ static HRESULT receive_message_sized( struct channel *channel, unsigned int size channel->read_size = 0; while (channel->read_size < size) { - if ((bytes_read = recv( channel->u.tcp.socket, channel->read_buf + offset, to_read, 0 )) < 0) + if ((bytes_read = sock_recv( channel->u.tcp.socket, channel->read_buf + offset, to_read )) < 0) { return HRESULT_FROM_WIN32( WSAGetLastError() ); } -- 2.11.0

2 1

[PATCH vkd3d 5/5] tests: Add test for shader input/output components.
by Józef Kucia 31 Oct '18

31 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 47591948ce4d..9832cd8cabda 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8356,6 +8356,265 @@ static void test_shader_interstage_interface(void) destroy_test_context(&context); } +static void test_shader_input_output_components(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2]; + ID3D12Resource *uint_render_target; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + HRESULT hr; + + static const DWORD vs1_code[] = + { +#if 0 + void main(float4 in_position : POSITION, uint4 in_uint : UINT, + out float4 out_position : SV_POSITION, out uint out_uint : UINT, + out float3 out_float : FLOAT) + { + out_position = in_position; + out_uint = in_uint.y; + out_float = float3(1, 2, 3); + } +#endif + 0x43425844, 0x0521bc60, 0xd39733a4, 0x1522eea3, 0x0c741ea3, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000ec, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x0000020f, 0x49534f50, 0x4e4f4954, 0x4e495500, 0xabab0054, 0x4e47534f, + 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000e01, 0x00000061, + 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x544e4955, 0x4f4c4600, 0xab005441, 0x58454853, 0x00000098, 0x00010050, 0x00000026, 0x0100086a, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101022, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x03000065, 0x00102072, 0x00000002, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, + 0x0010101a, 0x00000001, 0x08000036, 0x00102072, 0x00000002, 0x00004002, 0x3f800000, 0x40000000, + 0x40400000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs1 = {vs1_code, sizeof(vs1_code)}; + static const DWORD ps1_code[] = + { +#if 0 + void main(float4 position : SV_POSITION, uint in_uint : UINT, + float3 in_float : FLOAT, out float4 out_float : SV_TARGET0, + out uint4 out_uint : SV_TARGET1) + { + out_float.x = position.w; + out_float.y = in_uint; + out_float.z = in_float.z; + out_float.w = 0; + out_uint.x = 0xdeadbeef; + out_uint.y = 0; + out_uint.z = in_uint; + out_uint.w = in_float.z; + } +#endif + 0x43425844, 0x762dbf5e, 0x2cc83972, 0x60c7aa48, 0xbca6118a, 0x00000001, 0x000001d4, 0x00000003, + 0x0000002c, 0x0000009c, 0x000000e8, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000080f, 0x0000005c, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, + 0x00000407, 0x505f5653, 0x5449534f, 0x004e4f49, 0x544e4955, 0x4f4c4600, 0xab005441, 0x4e47534f, + 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x0000000f, 0x545f5653, + 0x45475241, 0xabab0054, 0x52444853, 0x000000e4, 0x00000040, 0x00000039, 0x04002064, 0x00101082, + 0x00000000, 0x00000001, 0x03000862, 0x00101012, 0x00000001, 0x03001062, 0x00101042, 0x00000002, + 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000056, 0x00102022, + 0x00000000, 0x0010100a, 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010103a, 0x00000000, + 0x05000036, 0x00102042, 0x00000000, 0x0010102a, 0x00000002, 0x05000036, 0x00102082, 0x00000000, + 0x00004001, 0x00000000, 0x0500001c, 0x00102082, 0x00000001, 0x0010102a, 0x00000002, 0x08000036, + 0x00102032, 0x00000001, 0x00004002, 0xdeadbeef, 0x00000000, 0x00000000, 0x00000000, 0x05000036, + 0x00102042, 0x00000001, 0x0010100a, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps1 = {ps1_code, sizeof(ps1_code)}; + static const DWORD vs2_code[] = + { +#if 0 + void main(float4 in_position : POSITION, + float4 in_texcoord0 : TEXCOORD0, float4 in_texcoord1 : TEXCOORD1, + float4 in_texcoord2 : TEXCOORD2, + out float4 position : Sv_Position, + out float2 texcoord0 : TEXCOORD0, out float2 texcoord1 : TEXCOORD1, + out float4 texcoord2 : TEXCOORD2, out float3 texcoord3 : TEXCOORD3) + { + position = in_position; + texcoord0 = in_texcoord0.yx; + texcoord1 = in_texcoord0.wz; + texcoord2 = in_texcoord1; + texcoord3 = in_texcoord2.yzx; + } +#endif + 0x43425844, 0x6721613b, 0xb997c7e4, 0x8bc3df4d, 0x813c93b9, 0x00000001, 0x00000224, 0x00000003, + 0x0000002c, 0x000000b0, 0x00000150, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000071, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x00000071, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x0000070f, 0x49534f50, + 0x4e4f4954, 0x58455400, 0x524f4f43, 0xabab0044, 0x4e47534f, 0x00000098, 0x00000005, 0x00000008, + 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000c03, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, + 0x00000001, 0x0000030c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, + 0x0000008c, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000807, 0x505f7653, 0x7469736f, + 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, 0x000000cc, 0x00010040, 0x00000033, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x001010f2, + 0x00000002, 0x0300005f, 0x00101072, 0x00000003, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x03000065, 0x001020f2, + 0x00000002, 0x03000065, 0x00102072, 0x00000003, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, + 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101b16, 0x00000001, 0x05000036, 0x001020f2, + 0x00000002, 0x00101e46, 0x00000002, 0x05000036, 0x00102072, 0x00000003, 0x00101496, 0x00000003, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs2 = {vs2_code, sizeof(vs2_code)}; + static const DWORD ps2_code[] = + { +#if 0 + void main(float4 position : Sv_Position, + float2 texcoord0 : TEXCOORD0, float2 texcoord1 : TEXCOORD1, + float4 texcoord2 : TEXCOORD2, float3 texcoord3 : TEXCOORD3, + out float4 target0 : Sv_Target0, out uint4 target1 : SV_Target1) + { + target0.x = texcoord0.x + texcoord0.y; + target0.y = texcoord1.x; + target0.z = texcoord3.z; + target0.w = texcoord1.y; + + target1.x = texcoord2.x; + target1.y = texcoord2.y; + target1.w = texcoord2.w; + target1.z = 0; + } +#endif + 0x43425844, 0xa6c0df60, 0x5bf34683, 0xa0093595, 0x98cca724, 0x00000001, 0x000001e8, 0x00000003, + 0x0000002c, 0x000000cc, 0x00000120, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000001, + 0x00000c0c, 0x0000008c, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000b0f, 0x0000008c, + 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000407, 0x505f7653, 0x7469736f, 0x006e6f69, + 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000042, 0x00000001, 0x00000000, + 0x00000001, 0x00000001, 0x0000000f, 0x545f7653, 0x65677261, 0x56530074, 0x7261545f, 0x00746567, + 0x52444853, 0x000000c0, 0x00000040, 0x00000030, 0x03001062, 0x00101032, 0x00000001, 0x03001062, + 0x001010c2, 0x00000001, 0x03001062, 0x001010b2, 0x00000002, 0x03001062, 0x00101042, 0x00000003, + 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x07000000, 0x00102012, + 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000001, 0x05000036, 0x001020a2, 0x00000000, + 0x00101ea6, 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010102a, 0x00000003, 0x0500001c, + 0x001020b2, 0x00000001, 0x00101c46, 0x00000002, 0x05000036, 0x00102042, 0x00000001, 0x00004001, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps2 = {ps2_code, sizeof(ps2_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"UINT", 0, DXGI_FORMAT_R32G32B32A32_UINT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 32, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 48, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 2, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 64, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec4 position; + struct uvec4 u; + struct vec4 t0; + struct vec4 t1; + struct vec4 t2; + } + quad[] = + { + {{-1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{-1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{ 1.0f, -1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + {{ 1.0f, 1.0f}, {1, 2, 3, 4}, {3.0f, 3.0f, 8.0f, 4.0f}, {9.0f, 5.0f, 3.0f, 1.0f}, {7.0f, 2.0f}}, + }; + static const struct vec4 expected_vec4[] = {{1.0f, 2.0f, 3.0f, 0.0f}, {6.0f, 4.0f, 7.0f, 8.0f}}; + static const struct uvec4 expected_uvec4[] = {{0xdeadbeef, 0, 2, 3}, {9, 5, 0, 1}}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_descriptor_count = 2; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, desc.rt_format, &vs1, &ps1, &input_layout); + pso_desc.NumRenderTargets = 2; + pso_desc.RTVFormats[1] = DXGI_FORMAT_R32G32B32A32_UINT; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + rtvs[0] = context.rtv; + rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + desc.rt_format = pso_desc.RTVFormats[1]; + create_render_target(&context, &desc, &uint_render_target, &rtvs[1]); + + vb = create_upload_buffer(context.device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, TRUE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[0], 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[0]); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.VS = vs2; + pso_desc.PS = ps2; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 2, &context.rtv, TRUE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4[1], 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, uint_render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(uint_render_target, 0, queue, command_list, &expected_uvec4[1]); + + ID3D12Resource_Release(vb); + ID3D12Resource_Release(uint_render_target); + destroy_test_context(&context); +} + static void test_incompletely_initialized_shader_outputs(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -20914,6 +21173,7 @@ START_TEST(d3d12) run_test(test_compute_shader_instructions); run_test(test_discard_instruction); run_test(test_shader_interstage_interface); + run_test(test_shader_input_output_components); run_test(test_incompletely_initialized_shader_outputs); run_test(test_root_signature_byte_code); run_test(test_cs_constant_buffer); -- 2.18.1

1 0

[PATCH 3/3] server: Use file mode flags in async_handoff to decide if request is blocking.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 20 +++++++------------- server/async.c | 4 ++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 14 insertions(+), 20 deletions(-)

1 0

[PATCH 2/3] server: Introduce is_fd_synchronous helper.
by Jacek Caban 31 Oct '18

31 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/fd.c | 10 ++++++++-- server/file.c | 7 +------ server/file.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-)

1 0

[PATCH 6/6] webservices: Implement WsRequestReply.
by Hans Leidekker 31 Oct '18

31 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 115 +++++++++++++++++++++ dlls/webservices/tests/channel.c | 205 ++++++++++++++++++++++++++------------ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 3 + 4 files changed, 262 insertions(+), 63 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index de84b0e66f..94c3dc1e99 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2007,6 +2007,121 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M return hr; } +static HRESULT request_reply( struct channel *channel, WS_MESSAGE *request, + const WS_MESSAGE_DESCRIPTION *request_desc, WS_WRITE_OPTION write_option, + const void *request_body, ULONG request_size, WS_MESSAGE *reply, + const WS_MESSAGE_DESCRIPTION *reply_desc, WS_READ_OPTION read_option, + WS_HEAP *heap, void *value, ULONG size ) +{ + HRESULT hr; + WsInitializeMessage( request, WS_REQUEST_MESSAGE, NULL, NULL ); + if ((hr = WsAddressMessage( request, &channel->addr, NULL )) != S_OK) return hr; + if ((hr = message_set_action( request, request_desc->action )) != S_OK) return hr; + + if ((hr = init_writer( channel )) != S_OK) return hr; + if ((hr = write_message( channel, request, request_desc->bodyElementDescription, write_option, request_body, + request_size )) != S_OK) return hr; + if ((hr = send_message( channel, request )) != S_OK) return hr; + + return receive_message( channel, reply, &reply_desc, 1, WS_RECEIVE_OPTIONAL_MESSAGE, read_option, heap, + value, size, NULL ); +} + +struct request_reply +{ + struct task task; + struct channel *channel; + WS_MESSAGE *request; + const WS_MESSAGE_DESCRIPTION *request_desc; + WS_WRITE_OPTION write_option; + const void *request_body; + ULONG request_size; + WS_MESSAGE *reply; + const WS_MESSAGE_DESCRIPTION *reply_desc; + WS_READ_OPTION read_option; + WS_HEAP *heap; + void *value; + ULONG size; + WS_ASYNC_CONTEXT ctx; +}; + +static void request_reply_proc( struct task *task ) +{ + struct request_reply *r = (struct request_reply *)task; + HRESULT hr; + + hr = request_reply( r->channel, r->request, r->request_desc, r->write_option, r->request_body, r->request_size, + r->reply, r->reply_desc, r->read_option, r->heap, r->value, r->size ); + + TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); + TRACE( "%p returned\n", r->ctx.callback ); +} + +static HRESULT queue_request_reply( struct channel *channel, WS_MESSAGE *request, + const WS_MESSAGE_DESCRIPTION *request_desc, WS_WRITE_OPTION write_option, + const void *request_body, ULONG request_size, WS_MESSAGE *reply, + const WS_MESSAGE_DESCRIPTION *reply_desc, WS_READ_OPTION read_option, + WS_HEAP *heap, void *value, ULONG size, const WS_ASYNC_CONTEXT *ctx ) +{ + struct request_reply *r; + + if (!(r = heap_alloc( sizeof(*r) ))) return E_OUTOFMEMORY; + r->task.proc = request_reply_proc; + r->channel = channel; + r->request = request; + r->request_desc = request_desc; + r->write_option = write_option; + r->request_body = request_body; + r->request_size = request_size; + r->reply = reply; + r->reply_desc = reply_desc; + r->read_option = read_option; + r->heap = heap; + r->value = value; + r->size = size; + r->ctx = *ctx; + return queue_task( &channel->recv_q, &r->task ); +} + +/************************************************************************** + * WsRequestReply [webservices.@] + */ +HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS_MESSAGE_DESCRIPTION *request_desc, + WS_WRITE_OPTION write_option, const void *request_body, ULONG request_size, + WS_MESSAGE *reply, const WS_MESSAGE_DESCRIPTION *reply_desc, WS_READ_OPTION read_option, + WS_HEAP *heap, void *value, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, + request_body, request_size, reply, reply_desc, read_option, heap, value, size, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!channel || !request || !reply) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if (ctx) + hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, + reply_desc, read_option, heap, value, size, ctx ); + else + hr = request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, + reply_desc, read_option, heap, value, size ); + + LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + /************************************************************************** * WsReadMessageStart [webservices.@] */ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index db17893138..6a45671057 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -433,16 +433,21 @@ static void test_WsResetListener(void) WsFreeListener( listener ); } +static const WCHAR fmt_soap_udp[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; +static const WCHAR fmt_net_tcp[] = + {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + struct listener_info { int port; HANDLE wait; WS_CHANNEL_BINDING binding; WS_CHANNEL_TYPE type; - void (*test_func)( WS_CHANNEL * ); + void (*server_func)( WS_CHANNEL * ); }; -static void client_message_read_write( WS_CHANNEL *channel ) +static void server_message_read_write( WS_CHANNEL *channel ) { WS_MESSAGE *msg; HRESULT hr; @@ -476,10 +481,8 @@ static void client_message_read_write( WS_CHANNEL *channel ) WsFreeMessage( msg ); } -static void test_message_read_write( const struct listener_info *info ) +static void client_message_read_write( const struct listener_info *info ) { - static const WCHAR fmt[] = - {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; WS_ENDPOINT_ADDRESS addr; WCHAR buf[64]; WS_CHANNEL *channel; @@ -491,7 +494,7 @@ static void test_message_read_write( const struct listener_info *info ) ok( hr == S_OK, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.length = wsprintfW( buf, fmt_soap_udp, info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -545,7 +548,7 @@ struct async_test HANDLE wait; }; -static void CALLBACK callback_duplex_session( HRESULT hr, WS_CALLBACK_MODEL model, void *state ) +static void CALLBACK async_callback( HRESULT hr, WS_CALLBACK_MODEL model, void *state ) { struct async_test *test = state; @@ -555,7 +558,7 @@ static void CALLBACK callback_duplex_session( HRESULT hr, WS_CALLBACK_MODEL mode SetEvent( test->wait ); } -static void client_duplex_session( WS_CHANNEL *channel ) +static void server_duplex_session( WS_CHANNEL *channel ) { WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; WS_ELEMENT_DESCRIPTION desc_body; @@ -580,7 +583,7 @@ static void client_duplex_session( WS_CHANNEL *channel ) test.call_count = 0; test.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - ctx.callback = callback_duplex_session; + ctx.callback = async_callback; ctx.callbackState = &test; hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_OPTIONAL_MESSAGE, WS_READ_REQUIRED_VALUE, @@ -612,10 +615,8 @@ static void client_duplex_session( WS_CHANNEL *channel ) WsFreeMessage( msg2 ); } -static void test_duplex_session( const struct listener_info *info ) +static void client_duplex_session( const struct listener_info *info ) { - static const WCHAR fmt[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; WS_ELEMENT_DESCRIPTION desc_body; WS_MESSAGE_DESCRIPTION desc; @@ -634,7 +635,7 @@ static void test_duplex_session( const struct listener_info *info ) ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.length = wsprintfW( buf, fmt_net_tcp, info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -675,7 +676,7 @@ static void test_duplex_session( const struct listener_info *info ) WsFreeChannel( channel ); } -static void client_accept_channel( WS_CHANNEL *channel ) +static void server_accept_channel( WS_CHANNEL *channel ) { WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; WS_ELEMENT_DESCRIPTION body; @@ -704,13 +705,9 @@ static void client_accept_channel( WS_CHANNEL *channel ) WsFreeMessage( msg ); } -static void test_WsAcceptChannel( const struct listener_info *info ) +static void client_accept_channel( const struct listener_info *info ) { - static const WCHAR fmt_tcp[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - static const WCHAR fmt_udp[] = - {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_net_tcp : fmt_soap_udp; WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; WCHAR buf[64]; WS_LISTENER *listener; @@ -773,14 +770,104 @@ static void test_WsAcceptChannel( const struct listener_info *info ) WsFreeChannel( channel ); } +static void server_request_reply( WS_CHANNEL *channel ) +{ + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + WS_XML_STRING req_action = {7, (BYTE *)"request"}, reply_action= {5, (BYTE *)"reply"}; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION in_desc, out_desc; + const WS_MESSAGE_DESCRIPTION *desc[1]; + WS_MESSAGE *msg; + INT32 val = 0; + HRESULT hr; + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + in_desc.action = &req_action; + in_desc.bodyElementDescription = &body; + desc[0] = &in_desc; + + hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == -1, "got %d\n", val ); + WsFreeMessage( msg ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + out_desc.action = &reply_action; + out_desc.bodyElementDescription = &body; + + hr = WsSendMessage( channel, msg, &out_desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeMessage( msg ); +} + +static void client_request_reply( const struct listener_info *info ) +{ + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + WS_XML_STRING req_action = {7, (BYTE *)"request"}, reply_action= {5, (BYTE *)"reply"}; + WCHAR buf[64]; + WS_CHANNEL *channel; + WS_MESSAGE *req, *reply; + WS_ENDPOINT_ADDRESS addr; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION req_desc, reply_desc; + INT32 val_in = -1, val_out = 0; + HRESULT hr; + + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, fmt_net_tcp, info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &req, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &reply, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( req, WS_BLANK_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + req_desc.action = &req_action; + req_desc.bodyElementDescription = &body; + + reply_desc.action = &reply_action; + reply_desc.bodyElementDescription = &body; + + hr = WsRequestReply( channel, req, &req_desc, WS_WRITE_REQUIRED_VALUE, &val_in, sizeof(val_in), reply, + &reply_desc, WS_READ_REQUIRED_VALUE, NULL, &val_out, sizeof(val_out), NULL, NULL ); + ok( val_out == -1, "got %d\n", val_out ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( req ); + WsFreeMessage( reply ); + WsFreeChannel( channel ); +} + static DWORD CALLBACK listener_proc( void *arg ) { - static const WCHAR fmt_tcp[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - static const WCHAR fmt_udp[] = - {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; struct listener_info *info = arg; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_net_tcp : fmt_soap_udp; WS_LISTENER *listener; WS_CHANNEL *channel; WCHAR buf[64]; @@ -803,7 +890,7 @@ static DWORD CALLBACK listener_proc( void *arg ) hr = WsAcceptChannel( listener, channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - info->test_func( channel ); + info->server_func( channel ); SetEvent( info->wait ); @@ -956,6 +1043,22 @@ START_TEST(channel) struct listener_info info; HANDLE thread; HRESULT hr; + unsigned int i; + static const struct test + { + WS_CHANNEL_BINDING binding; + WS_CHANNEL_TYPE type; + void (*server_func)( WS_CHANNEL * ); + void (*client_func)( const struct listener_info * ); + } + tests[] = + { + { WS_UDP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX, server_message_read_write, client_message_read_write }, + { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_duplex_session, client_duplex_session }, + { WS_UDP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX, server_accept_channel, client_accept_channel }, + { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_accept_channel, client_accept_channel }, + { WS_TCP_CHANNEL_BINDING, WS_CHANNEL_TYPE_DUPLEX_SESSION, server_request_reply, client_request_reply }, + }; if (firewall_enabled) { @@ -979,42 +1082,20 @@ START_TEST(channel) test_WsCreateChannelForListener(); test_WsResetListener(); - info.port = 7533; - info.wait = CreateEventW( NULL, 0, 0, NULL ); - info.type = WS_CHANNEL_TYPE_DUPLEX; - info.binding = WS_UDP_CHANNEL_BINDING; - info.test_func = client_message_read_write; - - thread = start_listener( &info ); - test_message_read_write( &info ); - WaitForSingleObject( thread, 3000 ); - CloseHandle(thread); - - info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; - info.binding = WS_TCP_CHANNEL_BINDING; - info.test_func = client_duplex_session; - - thread = start_listener( &info ); - test_duplex_session( &info ); - WaitForSingleObject( thread, 3000 ); - CloseHandle(thread); - - info.type = WS_CHANNEL_TYPE_DUPLEX; - info.binding = WS_UDP_CHANNEL_BINDING; - info.test_func = client_accept_channel; - - thread = start_listener( &info ); - test_WsAcceptChannel( &info ); - WaitForSingleObject( thread, 3000 ); - CloseHandle(thread); - - info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; - info.binding = WS_TCP_CHANNEL_BINDING; - - thread = start_listener( &info ); - test_WsAcceptChannel( &info ); - WaitForSingleObject( thread, 3000 ); - CloseHandle(thread); + info.port = 7533; + info.wait = CreateEventW( NULL, 0, 0, NULL ); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + info.binding = tests[i].binding; + info.type = tests[i].type; + info.server_func = tests[i].server_func; + + thread = start_listener( &info ); + tests[i].client_func( &info ); + WaitForSingleObject( thread, 3000 ); + CloseHandle( thread ); + } if (firewall_enabled) set_firewall( APP_REMOVE ); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8ba34b4209..30c97e3473 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -131,7 +131,7 @@ @ stdcall WsRemoveHeader(ptr long ptr) @ stdcall WsRemoveMappedHeader(ptr ptr ptr) @ stub WsRemoveNode -@ stub WsRequestReply +@ stdcall WsRequestReply(ptr ptr ptr long ptr long ptr ptr long ptr ptr long ptr ptr) @ stub WsRequestSecurityToken @ stdcall WsResetChannel(ptr ptr) @ stdcall WsResetError(ptr) diff --git a/include/webservices.h b/include/webservices.h index 928819fc3d..6cafcc63d6 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1701,6 +1701,9 @@ HRESULT WINAPI WsRemoveCustomHeader(WS_MESSAGE*, const WS_XML_STRING*, const WS_ HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsRequestReply(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_READ_OPTION, + WS_HEAP*, void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); -- 2.11.0

1 0

[PATCH 5/6] webservices: Add support for UTF-8 encoded text in read_message_id.
by Hans Leidekker 31 Oct '18

31 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 22 +++++++++++++++++----- dlls/webservices/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 4ccf82eacc..a53fd92e2e 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -846,21 +846,33 @@ static HRESULT read_message_id( WS_XML_READER *reader, GUID *ret ) { const WS_XML_NODE *node; const WS_XML_TEXT_NODE *text; - const WS_XML_UNIQUE_ID_TEXT *id; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; if (node->nodeType != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; text = (const WS_XML_TEXT_NODE *)node; - if (text->text->textType != WS_XML_TEXT_TYPE_UNIQUE_ID) + + switch (text->text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text->text; + if (utf8->value.length != 45 || memcmp( utf8->value.bytes, "urn:uuid:", 9 )) + return WS_E_INVALID_FORMAT; + + return str_to_guid( utf8->value.bytes + 9, utf8->value.length - 9, ret ); + } + case WS_XML_TEXT_TYPE_UNIQUE_ID: { + const WS_XML_UNIQUE_ID_TEXT *id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; + *ret = id->value; + return S_OK; + } + default: FIXME( "unhandled text type %u\n", text->text->textType ); return E_NOTIMPL; } - id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; - *ret = id->value; - return S_OK; } static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a5ff59a417..8cf3f24d29 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3841,7 +3841,7 @@ static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) return S_OK; } -static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) +HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) { static const unsigned char hex[] = { diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index d981527bb2..b482b5ba20 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -71,6 +71,7 @@ HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; HRESULT text_to_text( const WS_XML_TEXT *, const WS_XML_TEXT *, ULONG *, WS_XML_TEXT ** ) DECLSPEC_HIDDEN; HRESULT text_to_utf8text( const WS_XML_TEXT *, const WS_XML_UTF8_TEXT *, ULONG *, WS_XML_UTF8_TEXT ** ) DECLSPEC_HIDDEN; +HRESULT str_to_guid( const unsigned char *, ULONG, GUID * ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 4/6] webservices: Increase the maximum size of the channel writer buffer.
by Hans Leidekker 31 Oct '18

31 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b995a86c92..de84b0e66f 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1316,9 +1316,14 @@ static HRESULT init_writer( struct channel *channel ) WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; + WS_XML_WRITER_PROPERTY prop; + ULONG max_size = (1 << 17); HRESULT hr; - if (!channel->writer && (hr = WsCreateWriter( NULL, 0, &channel->writer, NULL )) != S_OK) return hr; + prop.id = WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE; + prop.value = &max_size; + prop.valueSize = sizeof(max_size); + if (!channel->writer && (hr = WsCreateWriter( &prop, 1, &channel->writer, NULL )) != S_OK) return hr; switch (channel->encoding) { -- 2.11.0

1 0

[PATCH 3/6] webservices: Add traces.
by Hans Leidekker 31 Oct '18

31 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 91ffe5be00..b995a86c92 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -395,6 +395,11 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, for (i = 0; i < count; i++) { + TRACE( "property id %u value ptr %p size %u\n", properties[i].id, properties[i].value, + properties[i].valueSize ); + if (properties[i].valueSize == sizeof(ULONG) && properties[i].value) + TRACE( " value %08x\n", *(ULONG *)properties[i].value ); + switch (properties[i].id) { case WS_CHANNEL_PROPERTY_ENCODING: @@ -623,6 +628,8 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return E_NOTIMPL; } + TRACE( "endpoint %s\n", debugstr_wn(endpoint->url.chars, endpoint->url.length) ); + if (!(channel->addr.url.chars = heap_alloc( endpoint->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( channel->addr.url.chars, endpoint->url.chars, endpoint->url.length * sizeof(WCHAR) ); channel->addr.url.length = endpoint->url.length; -- 2.11.0

1 0

[PATCH 1/6] webservices: Also trace return values in the URL functions.
by Hans Leidekker 31 Oct '18

31 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/url.c | 67 ++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 731b74e7b4..fd8d33a8c2 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -192,22 +192,22 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS return E_NOTIMPL; } if (!(decoded = url_decode( str->chars, str->length, heap, &len_decoded )) || - !(url = ws_alloc( heap, sizeof(*url) ))) goto error; + !(url = ws_alloc( heap, sizeof(*url) ))) goto done; hr = WS_E_INVALID_FORMAT; p = q = decoded; len = len_decoded; while (len && *q != ':') { q++; len--; }; - if (*q != ':') goto error; - if ((url->url.scheme = scheme_type( p, q - p )) == ~0u) goto error; + if (*q != ':') goto done; + if ((url->url.scheme = scheme_type( p, q - p )) == ~0u) goto done; - if (!--len || *++q != '/') goto error; - if (!--len || *++q != '/') goto error; + if (!--len || *++q != '/') goto done; + if (!--len || *++q != '/') goto done; p = ++q; len--; while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; - if (q == p) goto error; + if (q == p) goto done; url->host.length = q - p; url->host.chars = p; @@ -216,7 +216,7 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS p = ++q; len--; while (len && isdigitW( *q )) { - if ((port = port * 10 + *q - '0') > 65535) goto error; + if ((port = port * 10 + *q - '0') > 65535) goto done; q++; len--; }; url->port = port; @@ -258,11 +258,15 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS else url->fragment.length = 0; *ret = (WS_URL *)url; - return S_OK; + hr = S_OK; -error: - if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); - ws_free( heap, url, sizeof(*url) ); +done: + if (hr != S_OK) + { + if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); + ws_free( heap, url, sizeof(*url) ); + } + TRACE( "returning %08x\n", hr ); return hr; } @@ -420,12 +424,12 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S WS_ERROR *error ) { static const WCHAR fmtW[] = {':','%','u',0}; - ULONG len = 0, len_scheme, len_enc, ret_size; + ULONG len = 0, len_scheme, len_enc, ret_size = 0; const WS_HTTP_URL *url = (const WS_HTTP_URL *)base; const WCHAR *scheme; - WCHAR *str, *p, *q; + WCHAR *str = NULL, *p, *q; ULONG port = 0; - HRESULT hr; + HRESULT hr = WS_E_INVALID_FORMAT; TRACE( "%p %08x %p %p %p\n", base, flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -436,28 +440,32 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S FIXME( "unimplemented flags %08x\n", flags ); return E_NOTIMPL; } - if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) return WS_E_INVALID_FORMAT; + if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) goto done; len = len_scheme + 3; /* '://' */ len += 6; /* ':65535' */ if ((hr = url_encode_size( url->host.chars, url->host.length, "", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc; if ((hr = url_encode_size( url->path.chars, url->path.length, "/", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc; if ((hr = url_encode_size( url->query.chars, url->query.length, "/?", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc + 1; /* '?' */ if ((hr = url_encode_size( url->fragment.chars, url->fragment.length, "/?", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc + 1; /* '#' */ ret_size = len * sizeof(WCHAR); - if (!(str = ws_alloc( heap, ret_size ))) return WS_E_QUOTA_EXCEEDED; + if (!(str = ws_alloc( heap, ret_size ))) + { + hr = WS_E_QUOTA_EXCEEDED; + goto done; + } memcpy( str, scheme, len_scheme * sizeof(WCHAR) ); p = str + len_scheme; @@ -466,7 +474,7 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S p += 3; if ((hr = url_encode( url->host.chars, url->host.length, p, "", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; if (url->portAsString.length) @@ -478,14 +486,14 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S if ((port = port * 10 + *q - '0') > 65535) { hr = WS_E_INVALID_FORMAT; - goto error; + goto done; } q++; len--; } if (url->port && port != url->port) { hr = E_INVALIDARG; - goto error; + goto done; } } else port = url->port; @@ -499,14 +507,14 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S } if ((hr = url_encode( url->path.chars, url->path.length, p, "/", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; if (url->query.length) { *p++ = '?'; if ((hr = url_encode( url->query.chars, url->query.length, p, "/?", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; } @@ -514,15 +522,16 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S { *p++ = '#'; if ((hr = url_encode( url->fragment.chars, url->fragment.length, p, "/?", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; } ret->length = p - str; ret->chars = str; - return S_OK; + hr = S_OK; -error: - ws_free( heap, str, ret_size ); +done: + if (hr != S_OK) ws_free( heap, str, ret_size ); + TRACE( "returning %08x\n", hr ); return hr; } -- 2.11.0

1 0

[PATCH 1/2] comctl32/edit: Add missing message macros.
by Nikolay Sivov 31 Oct '18

31 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/edit.c | 2 -- include/commctrl.h | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index aeba9f73e7..249e08b3a1 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -23,9 +23,7 @@ * * TODO: * - EDITBALLOONTIP structure - * - EM_GETCUEBANNER/Edit_GetCueBannerText * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip - * - EM_SETCUEBANNER/Edit_SetCueBannerText * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip * - EM_GETIMESTATUS, EM_SETIMESTATUS * - EN_ALIGN_LTR_EC diff --git a/include/commctrl.h b/include/commctrl.h index 77f460a99d..aed91809d6 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5259,6 +5259,13 @@ typedef struct _tagEDITBALLOONTIP #define EM_NOSETFOCUS (ECM_FIRST + 7) #define EM_TAKEFOCUS (ECM_FIRST + 8) +#define Edit_SetCueBannerText(hwnd, text) \ + (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, 0, (LPARAM)(text)) +#define Edit_SetCueBannerTextFocused(hwnd, text, drawfocused) \ + (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, (WPARAM)drawfocused, (LPARAM)text) +#define Edit_GetCueBannerText(hwnd, buff, buff_size) \ + (BOOL)SNDMSG((hwnd), EM_GETCUEBANNER, (WPARAM)(buff), (LPARAM)(buff_size)) + /************************************************************************** * Listbox control */ -- 2.19.1

1 1

[PATCH] crypt32: CryptFreeOIDFunctionAddress should not unload a registered module.
by Dmitry Timoshkov 31 Oct '18

31 Oct '18

MSDN states that hModule passed to CryptInstallOIDFunctionAddress() should be used to prevent this module to be unloaded by CryptFreeOIDFunctionAddress in case the provider's DLL uses CryptRegisterOIDFunction to add its own entries. This patch fixes a crash that is caused by exactly this scenario. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/oid.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d6c411c791..6dc894e60c 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -59,6 +59,7 @@ struct OIDFunctionSet struct OIDFunction { + HMODULE hModule; DWORD encoding; CRYPT_OID_FUNC_ENTRY entry; struct list next; @@ -271,6 +272,7 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, else func->entry.pszOID = rgFuncEntry[i].pszOID; func->entry.pvFuncAddr = rgFuncEntry[i].pvFuncAddr; + func->hModule = hModule; list_add_tail(&set->functions, &func->next); } else @@ -428,6 +430,38 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, return ret; } +static BOOL is_module_registered(HMODULE hModule) +{ + struct OIDFunctionSet *set; + BOOL ret = FALSE; + + EnterCriticalSection(&funcSetCS); + + LIST_FOR_EACH_ENTRY(set, &funcSets, struct OIDFunctionSet, next) + { + struct OIDFunction *function; + + EnterCriticalSection(&set->cs); + + LIST_FOR_EACH_ENTRY(function, &set->functions, struct OIDFunction, next) + { + if (function->hModule == hModule) + { + ret = TRUE; + break; + } + } + + LeaveCriticalSection(&set->cs); + + if (ret) break; + } + + LeaveCriticalSection(&funcSetCS); + + return ret; +} + BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr, DWORD dwFlags) { @@ -441,9 +475,12 @@ BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr, { struct FuncAddr *addr = hFuncAddr; - CryptMemFree(addr->dllList); - FreeLibrary(addr->lib); - CryptMemFree(addr); + if (!is_module_registered(addr->lib)) + { + CryptMemFree(addr->dllList); + FreeLibrary(addr->lib); + CryptMemFree(addr); + } } return TRUE; } -- 2.17.1

1 0

[PATCH] dwrite: Release file streams when building collections.
by Nikolay Sivov 31 Oct '18

31 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5fc0de733d..6666249864 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3883,6 +3883,8 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; } + + IDWriteFontFileStream_Release(stream); } LIST_FOR_EACH_ENTRY_SAFE(fileenum, fileenum2, &scannedfiles, struct fontfile_enum, entry) { -- 2.19.1

1 0

[PATCH v4 1/2] dinput/tests: Ensure the same GUID for Instance and Product
by Brendan McGrath 31 Oct '18

31 Oct '18

These tests ensure the Instance GUID and Product GUIDs are the same for keyboard and mouse. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v3: - fix test output on failure (was printing guidProduct twice) dlls/dinput/tests/dinput.c | 13 +++++++++++++ dlls/dinput8/tests/dinput.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 7e2da9ff32..6eec038a35 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -392,6 +392,19 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo { struct enum_devices_test *enum_test = context; + if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + int cmp = memcmp(&instance->guidInstance, + &instance->guidProduct, + sizeof(instance->guidInstance)); + ok(cmp == 0, "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, + wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; } diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index b093437096..4eabb58c61 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -377,6 +377,19 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo instance->wUsagePage, instance->wUsage); + if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + int cmp = memcmp(&instance->guidInstance, + &instance->guidProduct, + sizeof(instance->guidInstance)); + ok(cmp == 0, "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, + wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; } -- 2.17.1

2 4

[PATCH 5/5] wined3d: Validate format capabilities against the bind flags instead of the usage flags in resource_init().
by Henri Verbeet 31 Oct '18

31 Oct '18

Note that buffer resources don't have an inherent format, so validating bind flags against WINED3DFMT_UNKNOWN doesn't make a lot of sense. This wasn't an issue previously because d3d11 doesn't set the usage flags corresponding to the bind flags for buffer resources, and earlier versions of D3D didn't allow buffers to be used as e.g. shader resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 512546d699b..ff584567975 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -107,28 +107,33 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (base_type == WINED3D_GL_RES_TYPE_COUNT) base_type = gl_type; - if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) + if (type != WINED3D_RTYPE_BUFFER) { - WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); - continue; - } - if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && !(format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - { - WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); - continue; - } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) - { - WARN("Render target or depth stencil is not FBO attachable.\n"); - continue; - } - if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) - { - WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); - continue; + if ((bind_flags & WINED3D_BIND_RENDER_TARGET) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) + { + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); + continue; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) + { + WARN("Render target or depth stencil is not FBO attachable.\n"); + continue; + } + if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); + continue; + } } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass bind flags to wined3d_get_format().
by Henri Verbeet 31 Oct '18

31 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 14 +++++++------- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c90d820a89..020116da7f6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1354,7 +1354,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; BOOL dynamic_buffer_ok; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3446c8df9e9..9784f38c10b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2005,9 +2005,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, const struct wined3d_format *color_format; const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; + unsigned int target_bind_flags; BOOL aux_buffers = FALSE; HGLRC ctx, share_ctx; - DWORD target_usage; unsigned int i; gl_info = context->gl_info; @@ -2052,7 +2052,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, return FALSE; color_format = target->resource.format; - target_usage = target->resource.usage; + target_bind_flags = target->resource.bind_flags; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ @@ -2061,9 +2061,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, aux_buffers = TRUE; if (color_format->id == WINED3DFMT_B4G4R4X4_UNORM) - color_format = wined3d_get_format(device->adapter, WINED3DFMT_B4G4R4A4_UNORM, target_usage); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B4G4R4A4_UNORM, target_bind_flags); else if (color_format->id == WINED3DFMT_B8G8R8X8_UNORM) - color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_usage); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); } /* DirectDraw supports 8bit paletted render targets and these are used by @@ -2073,7 +2073,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, * For this reason we require a format with 8bit alpha, so request * A8R8G8B8. */ if (color_format->id == WINED3DFMT_P8_UINT) - color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_usage); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); /* When using FBOs for off-screen rendering, we only use the drawable for * presentation blits, and don't do any rendering to it. That means we @@ -2085,8 +2085,8 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, * conflicting pixel formats. */ if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) { - color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_usage); - ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3DUSAGE_DEPTHSTENCIL); + color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); + ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL); } /* Try to find a pixel format which matches our requirements. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 00bc737d3fe..a03465f8077 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -763,7 +763,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad return 0; adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(adapter, format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); @@ -817,7 +817,7 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada return WINED3DERR_INVALIDCALL; adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(adapter, format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; memset(&m, 0, sizeof(m)); @@ -1076,7 +1076,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, TRACE("mode %ux%u@%u %s %#x.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id), mode->scanline_ordering); - format = wined3d_get_format(adapter, mode->format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(adapter, mode->format_id, WINED3D_BIND_RENDER_TARGET); new_mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; new_mode.dmBitsPerPel = format->byte_count * CHAR_BIT; @@ -1318,8 +1318,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_INVALIDCALL; adapter = &wined3d->adapters[adapter_idx]; - rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3DUSAGE_RENDERTARGET); - ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3DUSAGE_DEPTHSTENCIL); + rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); + ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if ((rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET) @@ -1538,8 +1538,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_INVALIDCALL; adapter = &wined3d->adapters[adapter_idx]; - adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3DUSAGE_RENDERTARGET); - format = wined3d_get_format(adapter, check_format_id, usage); + adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); + format = wined3d_get_format(adapter, check_format_id, bind_flags); if (usage & WINED3DUSAGE_RENDERTARGET) bind_flags |= WINED3D_BIND_RENDER_TARGET; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 320d54c731d..512546d699b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -487,6 +487,6 @@ const struct wined3d_format *wined3d_resource_get_decompress_format(const struct const struct wined3d_adapter *adapter = resource->device->adapter; if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) - return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); - return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); + return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->bind_flags); + return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, resource->bind_flags); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 122c643150f..40d8974672e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1614,7 +1614,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re format = texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - format = wined3d_get_format(device->adapter, conversion->dst_format, texture->resource.usage); + format = wined3d_get_format(device->adapter, conversion->dst_format, texture->resource.bind_flags); /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 91f96a47a03..4ab1594f063 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -669,7 +669,7 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s adapter = swapchain->device->adapter; gl_info = &adapter->gl_info; - if (!(format = wined3d_get_format(adapter, format_id, WINED3DUSAGE_RENDERTARGET))) + if (!(format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET))) return; if ((t = min(wined3d_settings.sample_count, gl_info->limits.samples))) @@ -726,7 +726,7 @@ static void wined3d_swapchain_cs_init(void *object) * request a depth/stencil buffer in the likely case it's needed later. */ for (i = 0; i < ARRAY_SIZE(formats); ++i) { - swapchain->ds_format = wined3d_get_format(adapter, formats[i], WINED3DUSAGE_DEPTHSTENCIL); + swapchain->ds_format = wined3d_get_format(adapter, formats[i], WINED3D_BIND_DEPTH_STENCIL); if ((swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) break; TRACE("Depth stencil format %s is not supported, trying next format.\n", debug_d3dformat(formats[i])); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a98c0af231b..45de4a10d1a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1575,7 +1575,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT device = texture->resource.device; gl_info = &device->adapter->gl_info; d3d_info = &device->adapter->d3d_info; - format = wined3d_get_format(device->adapter, format_id, texture->resource.usage); + format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); if (!resource_size) @@ -1774,7 +1774,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) { texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_get_format(device->adapter, conversion->dst_format, resource->usage); + format = wined3d_get_format(device->adapter, conversion->dst_format, resource->bind_flags); TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); } format_gl = wined3d_format_gl(format); @@ -2896,7 +2896,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc WARN("Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n"); return WINED3DERR_INVALIDCALL; } - format = wined3d_get_format(device->adapter, desc->format, desc->usage); + format = wined3d_get_format(device->adapter, desc->format, desc->bind_flags); if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) || desc->usage & WINED3DUSAGE_SCRATCH)) @@ -3645,7 +3645,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct if (desc->multisample_type != WINED3D_MULTISAMPLE_NONE) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, desc->format, desc->usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, desc->format, desc->bind_flags); if (desc->multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE && desc->multisample_quality >= wined3d_popcount(format->multisample_types)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0bc4a37df45..73e8cf25f78 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4060,7 +4060,7 @@ fail: } const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, - enum wined3d_format_id format_id, unsigned int resource_usage) + enum wined3d_format_id format_id, unsigned int bind_flags) { const struct wined3d_format *format; int idx = get_format_idx(format_id); @@ -4075,7 +4075,7 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad format = get_format_by_idx(adapter, idx); - if (resource_usage & WINED3DUSAGE_DEPTHSTENCIL && wined3d_format_is_typeless(format)) + if (bind_flags & WINED3D_BIND_DEPTH_STENCIL && wined3d_format_is_typeless(format)) { for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 59a30eadf53..1e0f49ffd07 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -87,7 +87,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ const struct wined3d_adapter *adapter = resource->device->adapter; const struct wined3d_format *format; - format = wined3d_get_format(adapter, desc->format_id, resource->usage); + format = wined3d_get_format(adapter, desc->format_id, resource->bind_flags); if (resource->type == WINED3D_RTYPE_BUFFER && (desc->flags & WINED3D_VIEW_BUFFER_RAW)) { if (format->id != WINED3DFMT_R32_TYPELESS) @@ -96,7 +96,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ return NULL; } - format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); + format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->bind_flags); } if (wined3d_format_is_typeless(format)) @@ -118,7 +118,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ return NULL; } - format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); + format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->bind_flags); element_size = buffer->structure_byte_stride; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9a01ed29ff9..5b7ddfce10d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4425,7 +4425,7 @@ struct wined3d_format }; const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, - enum wined3d_format_id format_id, unsigned int resource_usage) DECLSPEC_HIDDEN; + enum wined3d_format_id format_id, unsigned int bind_flags) DECLSPEC_HIDDEN; void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigned int alignment, unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass bind flags to wined3d_check_device_format().
by Henri Verbeet 31 Oct '18

31 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 12 ++++----- dlls/d3d8/directx.c | 8 +++--- dlls/d3d9/directx.c | 8 +++--- dlls/d3d9/texture.c | 5 ++-- dlls/ddraw/ddraw.c | 8 +++--- dlls/ddraw/device.c | 10 ++++---- dlls/ddraw/surface.c | 16 ++++++++---- dlls/wined3d/directx.c | 65 ++++++++++++++++++++++++++++++----------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 10 files changed, 83 insertions(+), 53 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8c40cf8b475..df754de1309 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3297,15 +3297,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * static const struct { enum wined3d_resource_type rtype; - unsigned int usage; + unsigned int bind_flags; D3D11_FORMAT_SUPPORT flag; } flag_mapping[] = { - {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_TEXTURE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, - {WINED3D_RTYPE_TEXTURE_3D, WINED3DUSAGE_TEXTURE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, - {WINED3D_RTYPE_NONE, WINED3DUSAGE_RENDERTARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, - {WINED3D_RTYPE_NONE, WINED3DUSAGE_DEPTHSTENCIL, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, + {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, }; HRESULT hr; @@ -3327,7 +3327,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) { hr = wined3d_check_device_format(wined3d, params.adapter_idx, params.device_type, - WINED3DFMT_UNKNOWN, flag_mapping[i].usage, flag_mapping[i].rtype, wined3d_format); + WINED3DFMT_UNKNOWN, 0, flag_mapping[i].bind_flags, flag_mapping[i].rtype, wined3d_format); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DOK_NOMIPGEN) continue; if (hr != WINED3D_OK) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 499e488b061..df5e7d61214 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -236,6 +236,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); enum wined3d_resource_type wined3d_rtype; + unsigned int bind_flags; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", @@ -247,20 +248,21 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 return D3DERR_INVALIDCALL; } + bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); usage = usage & (WINED3DUSAGE_MASK | WINED3DUSAGE_QUERY_MASK); switch (resource_type) { case D3DRTYPE_CUBETEXTURE: usage |= WINED3DUSAGE_LEGACY_CUBEMAP; case D3DRTYPE_TEXTURE: - usage |= WINED3DUSAGE_TEXTURE; + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; case D3DRTYPE_SURFACE: wined3d_rtype = WINED3D_RTYPE_TEXTURE_2D; break; case D3DRTYPE_VOLUMETEXTURE: case D3DRTYPE_VOLUME: - usage |= WINED3DUSAGE_TEXTURE; + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break; @@ -276,7 +278,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 wined3d_mutex_lock(); hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, wined3d_rtype, wined3dformat_from_d3dformat(format)); + usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 49da816564e..dd6e0bd8eb8 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -249,6 +249,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); enum wined3d_resource_type wined3d_rtype; + unsigned int bind_flags; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", @@ -260,20 +261,21 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, return D3DERR_INVALIDCALL; } + bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); usage = usage & (WINED3DUSAGE_MASK | WINED3DUSAGE_QUERY_MASK); switch (resource_type) { case D3DRTYPE_CUBETEXTURE: usage |= WINED3DUSAGE_LEGACY_CUBEMAP; case D3DRTYPE_TEXTURE: - usage |= WINED3DUSAGE_TEXTURE; + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; case D3DRTYPE_SURFACE: wined3d_rtype = WINED3D_RTYPE_TEXTURE_2D; break; case D3DRTYPE_VOLUMETEXTURE: case D3DRTYPE_VOLUME: - usage |= WINED3DUSAGE_TEXTURE; + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break; @@ -289,7 +291,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, wined3d_mutex_lock(); hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, wined3d_rtype, wined3dformat_from_d3dformat(format)); + usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index a87bef45025..70d35fc50c1 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1341,8 +1341,9 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); - hr = wined3d_check_device_format(device->d3d_parent->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, WINED3DFMT_B8G8R8A8_UNORM, - WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_GENMIPMAP, WINED3D_RTYPE_TEXTURE_2D, wined3dformat_from_d3dformat(format)); + hr = wined3d_check_device_format(device->d3d_parent->wined3d, WINED3DADAPTER_DEFAULT, + WINED3D_DEVICE_TYPE_HAL, WINED3DFMT_B8G8R8A8_UNORM, WINED3DUSAGE_QUERY_GENMIPMAP, + WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); if (hr == D3D_OK) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e0aba7bd11a..9a40bc971b2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1743,7 +1743,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) + mode.format_id, 0, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) { if (count < outsize) Codes[count] = formats[i]; @@ -4437,8 +4437,8 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device for (i = 0; i < ARRAY_SIZE(formats); ++i) { - if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, - WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) + if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, + mode.format_id, 0, WINED3D_BIND_DEPTH_STENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) { DDPIXELFORMAT pformat; @@ -4462,7 +4462,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * pixel format, so we use dwZBufferBitDepth=32. Some games expect 24. Windows Vista and * newer enumerate both versions, so we do the same(bug 22434) */ if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, - WINED3DUSAGE_DEPTHSTENCIL, WINED3D_RTYPE_TEXTURE_2D, WINED3DFMT_X8D24_UNORM))) + 0, WINED3D_BIND_DEPTH_STENCIL, WINED3D_RTYPE_TEXTURE_2D, WINED3DFMT_X8D24_UNORM))) { DDPIXELFORMAT x8d24 = { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7866c281465..0d48c7d704e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1089,7 +1089,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) + mode.format_id, 0, WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) { DDPIXELFORMAT pformat; @@ -1111,8 +1111,8 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < ARRAY_SIZE(BumpFormatList); ++i) { if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, - WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_LEGACYBUMPMAP, - WINED3D_RTYPE_TEXTURE_2D, BumpFormatList[i]) == D3D_OK) + WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_QUERY_LEGACYBUMPMAP, + WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, BumpFormatList[i]) == D3D_OK) { DDPIXELFORMAT pformat; @@ -1216,8 +1216,8 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { - if (wined3d_check_device_format(device->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, WINED3DUSAGE_TEXTURE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) + if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, + mode.format_id, 0, WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) { DDSURFACEDESC sdesc; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0afc9ab4beb..5ce1d85b3ed 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6119,21 +6119,27 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { if (!(desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) { + unsigned int bind_flags = 0; DWORD usage = 0; if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; + { + usage |= WINED3DUSAGE_LEGACY_CUBEMAP; + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + } else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - usage |= WINED3DUSAGE_TEXTURE; + { + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + } if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - usage = WINED3DUSAGE_DEPTHSTENCIL; + bind_flags |= WINED3D_BIND_DEPTH_STENCIL; else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) - usage = WINED3DUSAGE_RENDERTARGET; + bind_flags |= WINED3D_BIND_RENDER_TARGET; if (!(ddraw->flags & DDRAW_NO3D) && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, - usage, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) + usage, bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) desc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; else desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e65db79decd..00bc737d3fe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1518,20 +1518,21 @@ static BOOL wined3d_check_surface_capability(const struct wined3d_format *format * restrict it to some should applications need that. */ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, - enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) + unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) { const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; const struct wined3d_adapter *adapter; BOOL mipmap_gen_supported = TRUE; + unsigned int allowed_bind_flags; DWORD format_flags = 0; DWORD allowed_usage; TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s, " - "resource_type %s, check_format %s.\n", + "bind_flags %s, resource_type %s, check_format %s.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), - debug_d3dusage(usage), debug_d3dusagequery(usage), debug_d3dresourcetype(resource_type), - debug_d3dformat(check_format_id)); + debug_d3dusage(usage), debug_d3dusagequery(usage), wined3d_debug_bind_flags(bind_flags), + debug_d3dresourcetype(resource_type), debug_d3dformat(check_format_id)); if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; @@ -1540,11 +1541,20 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3DUSAGE_RENDERTARGET); format = wined3d_get_format(adapter, check_format_id, usage); + if (usage & WINED3DUSAGE_RENDERTARGET) + bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (usage & WINED3DUSAGE_DEPTHSTENCIL) + bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + if (usage & WINED3DUSAGE_TEXTURE) + bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + usage &= ~(WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); + switch (resource_type) { case WINED3D_RTYPE_NONE: - allowed_usage = WINED3DUSAGE_DEPTHSTENCIL - | WINED3DUSAGE_RENDERTARGET; + allowed_usage = 0; + allowed_bind_flags = WINED3D_BIND_RENDER_TARGET + | WINED3D_BIND_DEPTH_STENCIL; gl_type = WINED3D_GL_RES_TYPE_TEX_2D; gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; @@ -1552,7 +1562,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_TEXTURE_1D: allowed_usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_SOFTWAREPROCESSING - | WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_FILTER | WINED3DUSAGE_QUERY_GENMIPMAP | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING @@ -1560,16 +1569,17 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; break; case WINED3D_RTYPE_TEXTURE_2D: - allowed_usage = WINED3DUSAGE_DEPTHSTENCIL - | WINED3DUSAGE_RENDERTARGET - | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; - if (usage & WINED3DUSAGE_RENDERTARGET) + allowed_usage = WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + if (bind_flags & WINED3D_BIND_RENDER_TARGET) allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; - if (!(usage & WINED3DUSAGE_TEXTURE)) + allowed_bind_flags = WINED3D_BIND_RENDER_TARGET + | WINED3D_BIND_DEPTH_STENCIL; + if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { if (!wined3d_check_surface_capability(format)) { @@ -1583,7 +1593,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage |= WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_SOFTWAREPROCESSING - | WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_FILTER | WINED3DUSAGE_QUERY_GENMIPMAP | WINED3DUSAGE_QUERY_LEGACYBUMPMAP @@ -1591,13 +1600,15 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + allowed_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; if (usage & WINED3DUSAGE_LEGACY_CUBEMAP) { - allowed_usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_QUERY_LEGACYBUMPMAP); + allowed_usage &= ~WINED3DUSAGE_QUERY_LEGACYBUMPMAP; + allowed_bind_flags &= ~WINED3D_BIND_DEPTH_STENCIL; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_CUBE; } - else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) + else if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) && !adapter->gl_info.supported[ARB_SHADOW]) { @@ -1609,13 +1620,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_TEXTURE_3D: allowed_usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_SOFTWAREPROCESSING - | WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_FILTER | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING | WINED3DUSAGE_QUERY_SRGBREAD | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; @@ -1631,7 +1642,15 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (usage & WINED3DUSAGE_TEXTURE) + if ((bind_flags & allowed_bind_flags) != bind_flags) + { + TRACE("Requested bind flags %s, but resource type %s only allows %s.\n", + wined3d_debug_bind_flags(bind_flags), debug_d3dresourcetype(resource_type), + wined3d_debug_bind_flags(allowed_bind_flags)); + return WINED3DERR_NOTAVAILABLE; + } + + if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) format_flags |= WINED3DFMT_FLAG_TEXTURE; if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; @@ -1661,22 +1680,22 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((usage & WINED3DUSAGE_RENDERTARGET) + if ((bind_flags & WINED3D_BIND_RENDER_TARGET) && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) { - TRACE("Requested WINED3DUSAGE_RENDERTARGET, but format %s is not supported for render targets.\n", + TRACE("Requested WINED3D_BIND_RENDER_TARGET, but format %s is not supported for render targets.\n", debug_d3dformat(check_format_id)); return WINED3DERR_NOTAVAILABLE; } /* 3D depth / stencil textures are never supported. */ - if (usage == WINED3DUSAGE_DEPTHSTENCIL && gl_type == WINED3D_GL_RES_TYPE_TEX_3D) + if (bind_flags == WINED3D_BIND_DEPTH_STENCIL && gl_type == WINED3D_GL_RES_TYPE_TEX_3D) continue; - if ((usage & WINED3DUSAGE_DEPTHSTENCIL) + if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) { - TRACE("Requested WINED3DUSAGE_DEPTHSTENCIL, but format %s is not supported for depth / stencil buffers.\n", + TRACE("Requested WINED3D_BIND_DEPTH_STENCIL, but format %s is not supported for depth/stencil buffers.\n", debug_d3dformat(check_format_id)); return WINED3DERR_NOTAVAILABLE; } @@ -1827,7 +1846,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap /* Validate that the back buffer format is usable for render targets. */ if (FAILED(wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, - WINED3DUSAGE_RENDERTARGET, WINED3D_RTYPE_TEXTURE_2D, backbuffer_format))) + 0, WINED3D_BIND_RENDER_TARGET, WINED3D_RTYPE_TEXTURE_2D, backbuffer_format))) { TRACE("Format %s not allowed for render targets.\n", debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ee70221191e..b1d3a521de7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -3,7 +3,7 @@ @ cdecl wined3d_calculate_format_pitch(ptr long long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long long) -@ cdecl wined3d_check_device_format(ptr long long long long long long) +@ cdecl wined3d_check_device_format(ptr long long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15cbf0895ff..3575f7e02ca 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2182,7 +2182,7 @@ HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d *wined3d, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id); HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, UINT adaper_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, - enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); + unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id source_format_id, enum wined3d_format_id target_format_id); -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass correct bind flags to swapchain creation functions.
by Henri Verbeet 31 Oct '18

31 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 12 ++++++------ dlls/dxgi/dxgi_private.h | 4 ++-- dlls/dxgi/swapchain.c | 6 +++--- dlls/dxgi/utils.c | 22 +++++++++++----------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 12 ++++++------ include/wine/wined3d.h | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a09a72b4051..27b32faa445 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -301,7 +301,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); - swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; + swapchain_desc->backbuffer_bind_flags = WINED3D_BIND_RENDER_TARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fd92b563356..d4f5a4352ce 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -335,7 +335,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); - swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; + swapchain_desc->backbuffer_bind_flags = WINED3D_BIND_RENDER_TARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 43bc36b80ca..e0aba7bd11a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -631,7 +631,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - swapchain_desc.backbuffer_usage = 0; + swapchain_desc.backbuffer_bind_flags = 0; swapchain_desc.backbuffer_count = 1; swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2c459ca2469..26f248800fa 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -186,12 +186,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac surface_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, &surface_desc.multisample_quality, &desc->SampleDesc); - surface_desc.usage = wined3d_usage_from_dxgi_usage(usage); - surface_desc.bind_flags = 0; - if (surface_desc.usage & WINED3DUSAGE_RENDERTARGET) - surface_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (surface_desc.usage & WINED3DUSAGE_TEXTURE) - surface_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + surface_desc.bind_flags = wined3d_bind_flags_from_dxgi_usage(usage); + surface_desc.usage = 0; + if (surface_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) + surface_desc.usage |= WINED3DUSAGE_TEXTURE; + if (surface_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) + surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; surface_desc.access = WINED3D_RESOURCE_ACCESS_GPU; surface_desc.width = desc->Width; surface_desc.height = desc->Height; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 78f188634fc..1268a9ca648 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -91,8 +91,8 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; -DXGI_USAGE dxgi_usage_from_wined3d_usage(DWORD wined3d_usage) DECLSPEC_HIDDEN; -DWORD wined3d_usage_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; +DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; +unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3eefbe50df8..0d325cf61f9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -381,7 +381,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); - desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); + desc->BufferUsage = dxgi_usage_from_wined3d_bind_flags(wined3d_desc.backbuffer_bind_flags); desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; @@ -538,7 +538,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface desc->Stereo = FALSE; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); - desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); + desc->BufferUsage = dxgi_usage_from_wined3d_bind_flags(wined3d_desc.backbuffer_bind_flags); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); @@ -858,7 +858,7 @@ HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_ wined3d_desc.backbuffer_height = swapchain_desc->Height; wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); + wined3d_desc.backbuffer_bind_flags = wined3d_bind_flags_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.device_window = window; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 73b37fda8b5..3a67cfededf 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -455,34 +455,34 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); } -DXGI_USAGE dxgi_usage_from_wined3d_usage(DWORD wined3d_usage) +DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) { DXGI_USAGE dxgi_usage = 0; - if (wined3d_usage & WINED3DUSAGE_TEXTURE) + if (wined3d_bind_flags & WINED3D_BIND_SHADER_RESOURCE) dxgi_usage |= DXGI_USAGE_SHADER_INPUT; - if (wined3d_usage & WINED3DUSAGE_RENDERTARGET) + if (wined3d_bind_flags & WINED3D_BIND_RENDER_TARGET) dxgi_usage |= DXGI_USAGE_RENDER_TARGET_OUTPUT; - wined3d_usage &= ~(WINED3DUSAGE_TEXTURE | WINED3DUSAGE_RENDERTARGET); - if (wined3d_usage) - FIXME("Unhandled wined3d usage %#x.\n", wined3d_usage); + wined3d_bind_flags &= ~(WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_RENDER_TARGET); + if (wined3d_bind_flags) + FIXME("Unhandled wined3d bind flags %#x.\n", wined3d_bind_flags); return dxgi_usage; } -DWORD wined3d_usage_from_dxgi_usage(DXGI_USAGE dxgi_usage) +unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) { - DWORD wined3d_usage = 0; + unsigned int wined3d_bind_flags = 0; if (dxgi_usage & DXGI_USAGE_SHADER_INPUT) - wined3d_usage |= WINED3DUSAGE_TEXTURE; + wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) - wined3d_usage |= WINED3DUSAGE_RENDERTARGET; + wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); - return wined3d_usage; + return wined3d_bind_flags; } #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83b8bea9696..5515b27b069 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1092,7 +1092,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } - if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_usage & WINED3DUSAGE_RENDERTARGET) + if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; struct wined3d_view_desc view_desc; @@ -4823,8 +4823,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("refresh_rate %u\n", swapchain_desc->refresh_rate); TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); - if (swapchain_desc->backbuffer_usage && swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) - FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); + if (swapchain_desc->backbuffer_bind_flags && swapchain_desc->backbuffer_bind_flags != WINED3D_BIND_RENDER_TARGET) + FIXME("Got unexpected backbuffer bind flags %#x.\n", swapchain_desc->backbuffer_bind_flags); if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL @@ -4939,7 +4939,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_rendertarget_view_decref(device->back_buffer_view); device->back_buffer_view = NULL; } - if (swapchain->desc.backbuffer_count && swapchain->desc.backbuffer_usage & WINED3DUSAGE_RENDERTARGET) + if (swapchain->desc.backbuffer_count && swapchain->desc.backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 768d27fd674..91f96a47a03 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -917,14 +917,14 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } - texture_desc.usage = swapchain->desc.backbuffer_usage; + texture_desc.bind_flags = swapchain->desc.backbuffer_bind_flags; + texture_desc.usage = 0; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; - texture_desc.bind_flags = 0; - if (texture_desc.usage & WINED3DUSAGE_RENDERTARGET) - texture_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (texture_desc.usage & WINED3DUSAGE_TEXTURE) - texture_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + if (texture_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) + texture_desc.usage |= WINED3DUSAGE_RENDERTARGET; + if (texture_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) + texture_desc.usage |= WINED3DUSAGE_TEXTURE; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7dc47e63d5a..15cbf0895ff 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1747,7 +1747,7 @@ struct wined3d_swapchain_desc unsigned int backbuffer_height; enum wined3d_format_id backbuffer_format; unsigned int backbuffer_count; - DWORD backbuffer_usage; + unsigned int backbuffer_bind_flags; enum wined3d_multisample_type multisample_type; DWORD multisample_quality; enum wined3d_swap_effect swap_effect; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass correct bind flags to texture creation functions.
by Henri Verbeet 31 Oct '18

31 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 11 ++++++++++- dlls/d3d11/device.c | 2 +- dlls/d3d11/texture.c | 3 +++ dlls/d3d11/utils.c | 15 --------------- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 21 +++++++++++++++++++-- dlls/d3d8/device.c | 1 + dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 9 ++++++--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 21 +++++++++++++++++++-- dlls/d3d9/device.c | 1 + dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 3 +++ dlls/d3d9/volume.c | 2 +- dlls/ddraw/surface.c | 10 ++++++++++ dlls/dxgi/device.c | 5 +++++ dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/device.c | 3 +++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/surface.c | 2 ++ dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/texture.c | 3 ++- include/wine/wined3d.h | 2 ++ 27 files changed, 106 insertions(+), 34 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 2221a8fdd5a..fb5b8177516 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -451,7 +451,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); - wined3d_desc.bind_flags = buffer->desc.BindFlags; + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(buffer->desc.BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(buffer->desc.Usage, buffer->desc.CPUAccessFlags); wined3d_desc.misc_flags = buffer->desc.MiscFlags; wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 787fe87b5a9..e3261a57c94 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -65,7 +65,6 @@ void d3d11_primitive_topology_from_wined3d_primitive_type(enum wined3d_primitive void wined3d_primitive_type_from_d3d11_primitive_topology(D3D11_PRIMITIVE_TOPOLOGY topology, enum wined3d_primitive_type *type, unsigned int *patch_vertex_count) DECLSPEC_HIDDEN; unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) DECLSPEC_HIDDEN; -UINT d3d11_bind_flags_from_wined3d_usage(DWORD wined3d_usage) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; @@ -93,6 +92,16 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; +static inline unsigned int wined3d_bind_flags_from_d3d11(UINT bind_flags) +{ + return bind_flags; +} + +static inline UINT d3d11_bind_flags_from_wined3d(unsigned int bind_flags) +{ + return bind_flags; +} + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4c2c80e00b..8c40cf8b475 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6070,7 +6070,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; desc.SampleDesc.Quality = wined3d_desc->multisample_quality; desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = d3d11_bind_flags_from_wined3d_usage(wined3d_desc->usage); + desc.BindFlags = d3d11_bind_flags_from_wined3d(wined3d_desc->bind_flags); desc.CPUAccessFlags = 0; desc.MiscFlags = 0; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 36d97415a25..9df8bae00c8 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -457,6 +457,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; @@ -1010,6 +1011,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; @@ -1468,6 +1470,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 8fdb00518ff..c7c682ba6c8 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -441,21 +441,6 @@ unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d return WINED3DGETDATA_FLUSH; } -UINT d3d11_bind_flags_from_wined3d_usage(DWORD wined3d_usage) -{ - UINT bind_flags = 0; - - if (wined3d_usage & WINED3DUSAGE_TEXTURE) - bind_flags |= D3D11_BIND_SHADER_RESOURCE; - if (wined3d_usage & WINED3DUSAGE_RENDERTARGET) - bind_flags |= D3D11_BIND_RENDER_TARGET; - - wined3d_usage &= ~(WINED3DUSAGE_TEXTURE | WINED3DUSAGE_RENDERTARGET); - if (wined3d_usage) - FIXME("Unhandled wined3d usage %#x.\n", wined3d_usage); - return bind_flags; -} - DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) { static const DWORD handled = D3D11_BIND_SHADER_RESOURCE diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index fb6b7bc1e92..9534c33932d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -229,7 +229,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, desc->Format = D3DFMT_VERTEXDATA; desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -527,7 +527,7 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 40a0f0a38d4..7f6049df574 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -278,9 +278,14 @@ unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDE void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; -static inline DWORD d3dusage_from_wined3dusage(unsigned int usage) +static inline DWORD d3dusage_from_wined3dusage(unsigned int wined3d_usage, unsigned int bind_flags) { - return usage & WINED3DUSAGE_MASK; + DWORD usage = wined3d_usage & WINED3DUSAGE_MASK; + if (bind_flags & WINED3D_BIND_RENDER_TARGET) + usage |= D3DUSAGE_RENDERTARGET; + if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) + usage |= D3DUSAGE_DEPTHSTENCIL; + return usage; } static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned int usage) @@ -318,4 +323,16 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int } } +static inline unsigned int wined3d_bind_flags_from_d3d8_usage(DWORD usage) +{ + unsigned int bind_flags = 0; + + if (usage & D3DUSAGE_RENDERTARGET) + bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (usage & D3DUSAGE_DEPTHSTENCIL) + bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + + return bind_flags; +} + #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 12d02538351..a09a72b4051 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1165,6 +1165,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index fff47f5ca15..eab9cb369af 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -191,7 +191,7 @@ static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_ desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f7ccdc7e34b..c952579ce61 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -253,7 +253,7 @@ static HRESULT WINAPI d3d8_texture_2d_GetLevelDesc(IDirect3DTexture8 *iface, UIN { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; @@ -600,7 +600,7 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; @@ -945,7 +945,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetLevelDesc(IDirect3DVolumeTexture8 *ifac { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; @@ -1110,6 +1110,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; @@ -1158,6 +1159,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = edge_length; @@ -1205,6 +1207,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 89aa84fdb50..29eab6a6900 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -125,7 +125,7 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 36a6ae3f902..ea98ef4242f 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -230,7 +230,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, desc->Format = D3DFMT_VERTEXDATA; desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -526,7 +526,7 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index fc6e4af6501..d6155eba60b 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -291,9 +291,14 @@ static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9E return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); } -static inline DWORD d3dusage_from_wined3dusage(unsigned int usage) +static inline DWORD d3dusage_from_wined3dusage(unsigned int wined3d_usage, unsigned int bind_flags) { - return usage & WINED3DUSAGE_MASK; + DWORD usage = wined3d_usage & WINED3DUSAGE_MASK; + if (bind_flags & WINED3D_BIND_RENDER_TARGET) + usage |= D3DUSAGE_RENDERTARGET; + if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) + usage |= D3DUSAGE_DEPTHSTENCIL; + return usage; } static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned int usage) @@ -331,6 +336,18 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int } } +static inline unsigned int wined3d_bind_flags_from_d3d9_usage(DWORD usage) +{ + unsigned int bind_flags = 0; + + if (usage & D3DUSAGE_RENDERTARGET) + bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (usage & D3DUSAGE_DEPTHSTENCIL) + bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + + return bind_flags; +} + static inline DWORD wined3dusage_from_d3dusage(unsigned int usage) { return usage & WINED3DUSAGE_MASK; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a3f410a7b97..fd92b563356 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1392,6 +1392,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 0605e7142a3..50c035d93c7 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -223,7 +223,7 @@ static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_ desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 0858be99220..a87bef45025 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1314,6 +1314,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = width; @@ -1399,6 +1400,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = edge_length; @@ -1470,6 +1472,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index f4c43bc589a..cb0485cd7f4 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -126,7 +126,7 @@ static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DES desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d201d9d4146..0afc9ab4beb 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6065,6 +6065,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = 0; + wined3d_desc.bind_flags = 0; wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; @@ -6163,11 +6164,20 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (!(ddraw->flags & DDRAW_NO3D)) { if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; + wined3d_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + } if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL; + wined3d_desc.bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + } else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + { wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; + wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; + } } if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 51773e9c005..2c459ca2469 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -187,6 +187,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, &surface_desc.multisample_quality, &desc->SampleDesc); surface_desc.usage = wined3d_usage_from_dxgi_usage(usage); + surface_desc.bind_flags = 0; + if (surface_desc.usage & WINED3DUSAGE_RENDERTARGET) + surface_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (surface_desc.usage & WINED3DUSAGE_TEXTURE) + surface_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; surface_desc.access = WINED3D_RESOURCE_ACCESS_GPU; surface_desc.width = desc->Width; surface_desc.height = desc->Height; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 62118fe0c6d..4dafb3442e6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7820,6 +7820,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl desc.multisample_type = src_texture->resource.multisample_type; desc.multisample_quality = src_texture->resource.multisample_quality; desc.usage = WINED3DUSAGE_PRIVATE; + desc.bind_flags = 0; desc.access = WINED3D_RESOURCE_ACCESS_GPU; desc.width = wined3d_texture_get_level_width(src_texture, src_level); desc.height = wined3d_texture_get_level_height(src_texture, src_level); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8b202fce0cf..83b8bea9696 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -576,6 +576,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_DYNAMIC; + desc.bind_flags = 0; desc.access = WINED3D_RESOURCE_ACCESS_GPU; desc.width = bm.bmWidth; desc.height = bm.bmHeight; @@ -4548,6 +4549,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_DYNAMIC; + desc.bind_flags = 0; desc.access = WINED3D_RESOURCE_ACCESS_GPU; desc.width = wined3d_texture_get_level_width(cursor_image, texture_level); desc.height = wined3d_texture_get_level_height(cursor_image, texture_level); @@ -4897,6 +4899,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, texture_desc.multisample_type = swapchain->desc.multisample_type; texture_desc.multisample_quality = swapchain->desc.multisample_quality; texture_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; + texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; texture_desc.width = swapchain->desc.backbuffer_width; texture_desc.height = swapchain->desc.backbuffer_height; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37d2aab20bc..545e1bff9f5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13213,6 +13213,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli desc.multisample_type = src_texture->resource.multisample_type; desc.multisample_quality = src_texture->resource.multisample_quality; desc.usage = WINED3DUSAGE_PRIVATE; + desc.bind_flags = 0; desc.access = WINED3D_RESOURCE_ACCESS_GPU; desc.width = wined3d_texture_get_level_width(src_texture, src_level); desc.height = wined3d_texture_get_level_height(src_texture, src_level); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a1b2cbd2a0f..320d54c731d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -289,6 +289,7 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->multisample_type = resource->multisample_type; desc->multisample_quality = resource->multisample_quality; desc->usage = resource->usage; + desc->bind_flags = resource->bind_flags; desc->access = resource->access; desc->width = resource->width; desc->height = resource->height; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21375dd026f..122c643150f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -634,6 +634,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_SCRATCH | WINED3DUSAGE_PRIVATE; + desc.bind_flags = 0; desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.width = wined3d_texture_get_level_width(src_texture, texture_level); desc.height = wined3d_texture_get_level_height(src_texture, texture_level); @@ -2146,6 +2147,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit desc.multisample_type = src_texture->resource.multisample_type; desc.multisample_quality = src_texture->resource.multisample_quality; desc.usage = WINED3DUSAGE_PRIVATE; + desc.bind_flags = 0; desc.access = WINED3D_RESOURCE_ACCESS_GPU; desc.width = wined3d_texture_get_level_width(src_texture, src_level); desc.height = wined3d_texture_get_level_height(src_texture, src_level); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8de88714d10..768d27fd674 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -836,6 +836,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage = 0; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; + texture_desc.bind_flags = 0; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; texture_desc.width = swapchain->desc.backbuffer_width; texture_desc.height = swapchain->desc.backbuffer_height; @@ -919,6 +920,11 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage = swapchain->desc.backbuffer_usage; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; + texture_desc.bind_flags = 0; + if (texture_desc.usage & WINED3DUSAGE_RENDERTARGET) + texture_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (texture_desc.usage & WINED3DUSAGE_TEXTURE) + texture_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); @@ -944,6 +950,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.format = swapchain->desc.auto_depth_stencil_format; texture_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; + texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, texture_flags, &ds))) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 87998d5552e..a98c0af231b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2996,7 +2996,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, - desc->multisample_type, desc->multisample_quality, desc->usage, 0, desc->access, + desc->multisample_type, desc->multisample_quality, desc->usage, desc->bind_flags, desc->access, desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) { static unsigned int once; @@ -3512,6 +3512,7 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture desc->multisample_type = resource->multisample_type; desc->multisample_quality = resource->multisample_quality; desc->usage = resource->usage; + desc->bind_flags = resource->bind_flags; desc->access = resource->access; level_idx = sub_resource_idx % texture->level_count; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1b3a46e6567..7dc47e63d5a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1767,6 +1767,7 @@ struct wined3d_resource_desc enum wined3d_multisample_type multisample_type; unsigned int multisample_quality; unsigned int usage; + unsigned int bind_flags; unsigned int access; unsigned int width; unsigned int height; @@ -1780,6 +1781,7 @@ struct wined3d_sub_resource_desc enum wined3d_multisample_type multisample_type; unsigned int multisample_quality; unsigned int usage; + unsigned int bind_flags; unsigned int access; unsigned int width; unsigned int height; -- 2.11.0

1 0

[PATCH] crypt32: Add CryptSetKeyIdentifierProperty stub.
by Dmitry Timoshkov 31 Oct '18

31 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d09d049b8b..a7a2605e6b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3681,3 +3681,11 @@ const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, return NULL; } } + +BOOL WINAPI CryptSetKeyIdentifierProperty(const CRYPT_HASH_BLOB *pKeyIdentifier, DWORD dwPropId, + DWORD dwFlags, LPCWSTR pwszComputerName, void *pvReserved, const void *pvData) +{ + FIXME("(%p, 0x%x, 0x%x, %s, %p, %p): stub\n", pKeyIdentifier, dwPropId, dwFlags, + debugstr_w(pwszComputerName), pvReserved, pvData); + return FALSE; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 64d5aa93fd..fc32570b52 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -180,6 +180,7 @@ @ stdcall CryptSIPRetrieveSubjectGuidForCatalogFile(wstr long ptr) @ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stub CryptSetAsyncParam +@ stdcall CryptSetKeyIdentifierProperty(ptr long long wstr ptr ptr) @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) @ stub CryptSetProviderU @ stdcall CryptSignAndEncodeCertificate(long long long str ptr ptr ptr ptr ptr) -- 2.17.1

1 0

[PATCH] testbot/build: Fix a typo in WineReconfig.pl.
by Francois Gouget 31 Oct '18

31 Oct '18

The build is now derived directly from the mission. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I have updated the debian9 VM already so no patch has been impacted. testbot/bin/build/WineReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 53ce319032..898f72c5b6 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -108,12 +108,12 @@ sub UpdateWinePrefixes($) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Build); + SetupWineEnvironment($Mission->{Build}); InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Build, "wait"); + my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n"; -- 2.19.1

1 0

[PATCH] mfplat: Add IMFAttributes interface to IMFByteStream
by Sven Baars 30 Oct '18

30 Oct '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch follows suggestions from Nicolay and Zebediah to first implement a separate IMFAttributes interface for IMFByteStream. I will update the rest of my patches later. I used --patience to format the patch to make it a bit easier to review. dlls/mfplat/main.c | 979 ++++++++++++++++++++++++------------- dlls/mfplat/tests/mfplat.c | 53 +- 2 files changed, 697 insertions(+), 335 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..620d5e251c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -448,339 +448,6 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } -typedef struct _mfbytestream -{ - IMFByteStream IMFByteStream_iface; - LONG ref; -} mfbytestream; - -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) -{ - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); -} - -static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFByteStream)) - { - *out = &This->IMFByteStream_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, capabilities); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, length); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, endstream); - - if(endstream) - *endstream = TRUE; - - return S_OK; -} - -static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, byte_read); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, - IMFAsyncCallback *callback, IUnknown *state) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %p\n", This, result, written); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, - DWORD flags, QWORD *current) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; -} - -static const IMFByteStreamVtbl mfbytesteam_vtbl = -{ - mfbytestream_QueryInterface, - mfbytestream_AddRef, - mfbytestream_Release, - mfbytestream_GetCapabilities, - mfbytestream_GetLength, - mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, - mfbytestream_Read, - mfbytestream_BeginRead, - mfbytestream_EndRead, - mfbytestream_Write, - mfbytestream_BeginWrite, - mfbytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close -}; - -HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) -{ - mfbytestream *object; - - TRACE("(%p, %p): stub\n", stream, bytestream); - - object = heap_alloc( sizeof(*object) ); - if(!object) - return E_OUTOFMEMORY; - - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; - - *bytestream = &object->IMFByteStream_iface; - - return S_OK; -} - -static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { - TRACE("(IID_IMFPluginControl %p)\n", ppv); - *ppv = iface; - }else { - FIXME("(%s %p)\n", debugstr_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) -{ - TRACE("\n"); - return 2; -} - -static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) -{ - TRACE("\n"); - return 1; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, CLSID *clsid) -{ - FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, - DWORD index, WCHAR **selector, CLSID *clsid) -{ - FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, - const WCHAR *selector, const CLSID *clsid) -{ - FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) -{ - FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) -{ - FIXME("(%d %d %p)\n", plugin_type, index, clsid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) -{ - FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); - return E_NOTIMPL; -} - -static const IMFPluginControlVtbl MFPluginControlVtbl = { - MFPluginControl_QueryInterface, - MFPluginControl_AddRef, - MFPluginControl_Release, - MFPluginControl_GetPreferredClsid, - MFPluginControl_GetPreferredClsidByIndex, - MFPluginControl_SetPreferredClsid, - MFPluginControl_IsDisabled, - MFPluginControl_GetDisabledByIndex, - MFPluginControl_SetDisabled -}; - -static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; - -/*********************************************************************** - * MFGetPluginControl (mfplat.@) - */ -HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) -{ - TRACE("(%p)\n", ret); - - *ret = &plugin_control; - return S_OK; -} - typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; @@ -1178,6 +845,652 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) return S_OK; } +typedef struct _mfbytestream +{ + mfattributes attributes; + IMFByteStream IMFByteStream_iface; + IMFAttributes IMFAttributes_iface; + LONG ref; + +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else if(IsEqualGUID(riid, &IID_IMFAttributes)) + { + *out = &This->IMFAttributes_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytestream_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_QueryInterface( + IMFAttributes *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else if(IsEqualGUID(riid, &IID_IMFAttributes)) + { + *out = &This->IMFAttributes_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_mfattributes_AddRef(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_mfattributes_Release(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetItem( + IMFAttributes *iface, REFGUID key, PROPVARIANT *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetItemType( + IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); +} + +static HRESULT WINAPI mfbytestream_mfattributes_CompareItem( + IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); +} + +static HRESULT WINAPI mfbytestream_mfattributes_Compare( + IMFAttributes *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetUINT32( + IMFAttributes *iface, REFGUID key, UINT32 *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetUINT64( + IMFAttributes *iface, REFGUID key, UINT64 *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetDouble( + IMFAttributes *iface, REFGUID key, double *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetGUID( + IMFAttributes *iface, REFGUID key, GUID *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetStringLength( + IMFAttributes *iface, REFGUID key, UINT32 *length) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetString( + IMFAttributes *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetAllocatedString( + IMFAttributes *iface, REFGUID key, WCHAR **value, UINT32 *length) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetBlobSize( + IMFAttributes *iface, REFGUID key, UINT32 *size) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetBlob( + IMFAttributes *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetAllocatedBlob( + IMFAttributes *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetUnknown( + IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetItem( + IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_DeleteItem( + IMFAttributes *iface, REFGUID key) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); +} + +static HRESULT WINAPI mfbytestream_mfattributes_DeleteAllItems( + IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetUINT32( + IMFAttributes *iface, REFGUID key, UINT32 value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetUINT64( + IMFAttributes *iface, REFGUID key, UINT64 value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetDouble( + IMFAttributes *iface, REFGUID key, double value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetGUID( + IMFAttributes *iface, REFGUID key, REFGUID value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetString( + IMFAttributes *iface, REFGUID key, const WCHAR *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetBlob( + IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfbytestream_mfattributes_SetUnknown( + IMFAttributes *iface, REFGUID key, IUnknown *unknown) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); +} + +static HRESULT WINAPI mfbytestream_mfattributes_LockStore(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_UnlockStore(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); +} + +static HRESULT WINAPI mfbytestream_mfattributes_GetItemByIndex( + IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); +} + +static HRESULT WINAPI mfbytestream_mfattributes_CopyAllItems( + IMFAttributes *iface, IMFAttributes *dest) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + + FIXME("%p, %p\n", This, dest); + + return E_NOTIMPL; +} + +static const IMFAttributesVtbl mfbytestream_mfattributes_vtbl = +{ + mfbytestream_mfattributes_QueryInterface, + mfbytestream_mfattributes_AddRef, + mfbytestream_mfattributes_Release, + mfbytestream_mfattributes_GetItem, + mfbytestream_mfattributes_GetItemType, + mfbytestream_mfattributes_CompareItem, + mfbytestream_mfattributes_Compare, + mfbytestream_mfattributes_GetUINT32, + mfbytestream_mfattributes_GetUINT64, + mfbytestream_mfattributes_GetDouble, + mfbytestream_mfattributes_GetGUID, + mfbytestream_mfattributes_GetStringLength, + mfbytestream_mfattributes_GetString, + mfbytestream_mfattributes_GetAllocatedString, + mfbytestream_mfattributes_GetBlobSize, + mfbytestream_mfattributes_GetBlob, + mfbytestream_mfattributes_GetAllocatedBlob, + mfbytestream_mfattributes_GetUnknown, + mfbytestream_mfattributes_SetItem, + mfbytestream_mfattributes_DeleteItem, + mfbytestream_mfattributes_DeleteAllItems, + mfbytestream_mfattributes_SetUINT32, + mfbytestream_mfattributes_SetUINT64, + mfbytestream_mfattributes_SetDouble, + mfbytestream_mfattributes_SetGUID, + mfbytestream_mfattributes_SetString, + mfbytestream_mfattributes_SetBlob, + mfbytestream_mfattributes_SetUnknown, + mfbytestream_mfattributes_LockStore, + mfbytestream_mfattributes_UnlockStore, + mfbytestream_mfattributes_GetCount, + mfbytestream_mfattributes_GetItemByIndex, + mfbytestream_mfattributes_CopyAllItems +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + init_attribute_object(&object->attributes, 0); + object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->IMFAttributes_iface.lpVtbl = &mfbytestream_mfattributes_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IMFPluginControl)) { + TRACE("(IID_IMFPluginControl %p)\n", ppv); + *ppv = iface; + }else { + FIXME("(%s %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MFPluginControl_AddRef(IMFPluginControl *iface) +{ + TRACE("\n"); + return 2; +} + +static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) +{ + TRACE("\n"); + return 1; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, CLSID *clsid) +{ + FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, + DWORD index, WCHAR **selector, CLSID *clsid) +{ + FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, + const WCHAR *selector, const CLSID *clsid) +{ + FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) +{ + FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) +{ + FIXME("(%d %d %p)\n", plugin_type, index, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) +{ + FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + return E_NOTIMPL; +} + +static const IMFPluginControlVtbl MFPluginControlVtbl = { + MFPluginControl_QueryInterface, + MFPluginControl_AddRef, + MFPluginControl_Release, + MFPluginControl_GetPreferredClsid, + MFPluginControl_GetPreferredClsidByIndex, + MFPluginControl_SetPreferredClsid, + MFPluginControl_IsDisabled, + MFPluginControl_GetDisabledByIndex, + MFPluginControl_SetDisabled +}; + +static IMFPluginControl plugin_control = { &MFPluginControlVtbl }; + +/*********************************************************************** + * MFGetPluginControl (mfplat.@) + */ +HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) +{ + TRACE("(%p)\n", ret); + + *ret = &plugin_control; + return S_OK; +} + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46579..4605e20f32 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -258,8 +258,12 @@ static void test_MFCreateAttributes(void) static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; + IMFByteStream *bytestream2; IStream *stream; + IMFAttributes *attributes = NULL; + IUnknown *unknown; HRESULT hr; + ULONG ref; if(!pMFCreateMFByteStreamOnStream) { @@ -270,11 +274,56 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - IStream_Release(stream); + hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(unknown, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + + if (hr != S_OK) + { + win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + IStream_Release(stream); + IMFByteStream_Release(bytestream); + return; + } + + ok(attributes != NULL, "got NULL\n"); + + hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 2, "got %u\n", ref); + + hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 2, "got %u\n", ref); + + IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); + IStream_Release(stream); } static void test_MFCreateMemoryBuffer(void) -- 2.17.1

1 0

[PATCH 4/6] ntdll/tests: Add more I/O blocking and completion tests.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 334 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 1 deletion(-)

2 1

[PATCH v2 1/3] shell32/iconcache: Prevent the imagelists from going out of sync by generating invalid icons from available icons
by Gabriel Ivăncescu 30 Oct '18

30 Oct '18

When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Therefore, for icons that failed to load, create them from another icon that succeeded by resizing it, favoring icons that are the closest and larger (to reduce pixelation artefacts) and with the closest aspect ratio as the source of this operation (to be as generic as possible). For example, if the icon that needs to be created must be 16x16, an 18x18 icon would get picked over either a 32x32 (it's further from 16x16) or a 15x15 (icons larger than 16x16 are favored since they're larger than the result, so smaller icons are only picked if no other available icon is larger). This also fixes a regression, because at some point, we stopped failing if one icon failed to extract (even if PrivateExtractIconsW returned success, icon handle could still be NULL), so when SIC_IconAppend called ImageList_AddIcon with a NULL icon handle, it would go out of sync and the icons would be totally screwed up until the application is restarted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Add test. dlls/shell32/iconcache.c | 72 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..5ffb293 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -345,13 +345,6 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons return ret; } -static BOOL get_imagelist_icon_size(int list, SIZE *size) -{ - if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE; - - return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); -} - /**************************************************************************** * SIC_LoadIcon [internal] * @@ -362,15 +355,68 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) { HICON hicons[ARRAY_SIZE(shell_imagelists)] = { 0 }; HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; + SIZE size[ARRAY_SIZE(shell_imagelists)]; unsigned int i; - SIZE size; - int ret; + INT ret = -1; + /* Keep track of the sizes in case any icon fails to get extracted */ for (i = 0; i < ARRAY_SIZE(hicons); i++) { - get_imagelist_icon_size( i, &size ); - if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) - WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + ImageList_GetIconSize(shell_imagelists[i], &size[i].cx, &size[i].cy); + PrivateExtractIconsW(sourcefile, index, size[i].cx, size[i].cy, &hicons[i], 0, 1, 0); + } + + /* Fill any icon handles that failed to get extracted, by resizing + another icon handle that succeeded and creating the icon from it. + Use a dumb O(n^2) algorithm since ARRAY_SIZE(hicons) is small */ + for (i = 0; i < ARRAY_SIZE(hicons); i++) + { + unsigned int k, ix, iy; + BOOL failed = TRUE; + if (hicons[i]) continue; + + for (k = 0; k < ARRAY_SIZE(hicons); k++) + { + if (hicons[k]) + { + ix = iy = k; + failed = FALSE; + break; + } + } + if (failed) goto fail; + + for (k++; k < ARRAY_SIZE(hicons); k++) + { + if (!hicons[k]) continue; + + /* Find closest-sized icon, but favor larger icons to resize from */ + if (size[k].cx >= size[i].cx) + ix = (size[ix].cx < size[i].cx || size[ix].cx > size[k].cx) ? k : ix; + else + ix = (size[ix].cx < size[i].cx && size[ix].cx < size[k].cx) ? k : ix; + + if (size[k].cy >= size[i].cy) + iy = (size[iy].cy < size[i].cy || size[iy].cy > size[k].cy) ? k : iy; + else + iy = (size[iy].cy < size[i].cy && size[iy].cy < size[k].cy) ? k : iy; + } + + /* Use the closest icon in aspect ratio if ix and iy differ */ + if (ix != iy) + { + float i_ratio, ix_ratio, iy_ratio; + i_ratio = (float)size[i].cx / (float)size[i].cy; + ix_ratio = (float)size[ix].cx / (float)size[ix].cy; + iy_ratio = (float)size[iy].cx / (float)size[iy].cy; + if (fabsf(ix_ratio - i_ratio) > fabsf(iy_ratio - i_ratio)) + ix = iy; + } + + /* If this fails, we have to abort to prevent the image lists from + becoming out of sync and completely screwing the icons up */ + hicons[i] = CopyImage(hicons[ix], IMAGE_ICON, size[i].cx, size[i].cy, 0); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +449,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret; -- 1.9.1

2 4

[PATCH 6/6] server: Use file mode flags in async_handoff to decide if request is blocking.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 22 +++++++--------------- server/async.c | 4 ++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 14 insertions(+), 22 deletions(-)

2 1

[PATCH vkd3d 7/7] vkd3d-shader: Add structure type fields to public API structures.
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 20 +++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++++++++++++ libs/vkd3d/state.c | 10 +++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index e97e185158cb..f96e5055c7cb 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -25,6 +25,15 @@ extern "C" { #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +enum vkd3d_shader_structure_type +{ + VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, + VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, + VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), +}; + enum vkd3d_result { VKD3D_OK = 0, @@ -130,6 +139,9 @@ struct vkd3d_shader_push_constant_buffer struct vkd3d_shader_interface { + enum vkd3d_shader_structure_type type; + const void *next; + const struct vkd3d_shader_resource_binding *bindings; unsigned int binding_count; @@ -160,8 +172,11 @@ enum vkd3d_shader_target struct vkd3d_shader_compile_arguments { + enum vkd3d_shader_structure_type type; + const void *next; + enum vkd3d_shader_target target; - unsigned int *output_swizzles; + const unsigned int *output_swizzles; unsigned int output_swizzle_count; }; @@ -366,6 +381,9 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc struct vkd3d_shader_scan_info { + enum vkd3d_shader_structure_type type; + void *next; + unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int sampler_comparison_mode_mask; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f81320879e8f..5e292c7eccd9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -61,6 +61,12 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ if (!compile_args) return VKD3D_OK; + if (compile_args->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS) + { + WARN("Invalid structure type %#x.\n", compile_args->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + switch (compile_args->target) { case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: @@ -88,9 +94,17 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + if (shader_interface && shader_interface->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE) + { + WARN("Invalid structure type %#x.\n", shader_interface->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) return ret; + scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + scan_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) return ret; @@ -209,6 +223,12 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, scan_info %p.\n", dxbc->code, dxbc->size, scan_info); + if (scan_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO) + { + WARN("Invalid structure type %#x.\n", scan_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) return ret; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4800ff316308..3f3de4de29be 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1439,6 +1439,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st dxbc.code = desc->CS.pShaderBytecode; dxbc.size = desc->CS.BytecodeLength; + shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + shader_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(&dxbc, &shader_info)) < 0) { WARN("Failed to scan shader bytecode, vkd3d result %d.\n", ret); @@ -1452,6 +1454,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -2027,10 +2031,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; + ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -2044,8 +2052,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); + struct vkd3d_shader_scan_info shader_info = {VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO}; const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; - struct vkd3d_shader_scan_info shader_info; if (!b->pShaderBytecode) continue; -- 2.18.1

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Require shader signature elements for shader inputs.
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4fc25ee40764..dee561ac033c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3206,6 +3206,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_idx = reg->idx[0].offset; } + if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->input_signature, + NULL, reg_idx, dst->write_mask))) + { + FIXME("No signature element for shader input, ignoring shader input.\n"); + return 0; + } + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -3217,9 +3224,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } else { - signature_element = vkd3d_find_signature_element_for_reg(compiler->input_signature, - NULL, reg_idx, dst->write_mask); - component_type = signature_element ? signature_element->component_type : VKD3D_TYPE_FLOAT; + component_type = signature_element->component_type; input_component_count = component_count; } assert(component_count <= input_component_count); @@ -4187,18 +4192,18 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_ps(struct vkd3d_dxbc_compiler *co { uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE); - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + if ((input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE))) + vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_register_semantic *semantic = &instruction->declaration.register_semantic; uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); - if (!instruction->declaration.register_semantic.sysval_semantic) + input_id = vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic); + if (input_id && !semantic->sysval_semantic) vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); } -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d-shader: Implement vkd3d_write_mask_component_count() on top of vkd3d_popcount().
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1d79c91602b8..dd3650b2d828 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -866,16 +866,8 @@ static inline unsigned int vkd3d_write_mask_get_component_idx(DWORD write_mask) static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) { - unsigned int i, count = 0; - assert(write_mask); - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) - { - if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - ++count; - } - - return count; + return vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); } static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count) -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d-shader: Add support for stores to scalar variables.
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e43f48ae027b..4fc25ee40764 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2789,19 +2789,22 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, chain_id, index[1]; + uint32_t type_id, ptr_type_id, id, index[1]; unsigned int component_idx; assert(reg->type != VKD3DSPR_IMMCONST); - type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); - component_idx = vkd3d_write_mask_get_component_idx(write_mask); - index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info->id, index, ARRAY_SIZE(index)); + id = reg_info->id; + if (vkd3d_write_mask_component_count(reg_info->write_mask) > 1) + { + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); + id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, id, index, ARRAY_SIZE(index)); + } - vkd3d_spirv_build_op_store(builder, chain_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, id, val_id, SpvMemoryAccessMaskNone); } static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compiler, -- 2.18.1

2 1

[PATCH vkd3d 3/7] vkd3d-shader: Simplify vkd3d_dxbc_compiler_emit_load_scalar().
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 234b7c82003e..e43f48ae027b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2623,12 +2623,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile } static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) + const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask, + const struct vkd3d_shader_register_info *reg_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, indexes[1], reg_id, val_id; unsigned int component_idx, reg_component_count; - struct vkd3d_shader_register_info reg_info; enum vkd3d_component_type component_type; assert(reg->type != VKD3DSPR_IMMCONST); @@ -2638,22 +2638,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); component_type = vkd3d_component_type_from_data_type(reg->data_type); - if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) - { - type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); - return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); - } - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - reg_component_count = vkd3d_write_mask_component_count(reg_info.write_mask); + reg_component_count = vkd3d_write_mask_component_count(reg_info->write_mask); if (component_idx > reg_component_count) ERR("Invalid component_idx for register %#x, %u.\n", reg->type, reg->idx[0].offset); - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, 1); - reg_id = reg_info.id; + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + reg_id = reg_info->id; if (reg_component_count != 1) { - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); reg_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, reg_id, indexes, ARRAY_SIZE(indexes)); @@ -2661,7 +2655,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); - if (component_type != reg_info.component_type) + if (component_type != reg_info->component_type) { type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); @@ -2683,9 +2677,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co return vkd3d_dxbc_compiler_emit_load_constant(compiler, reg, swizzle, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); - if (component_count == 1) - return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask); - component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) { @@ -2694,6 +2685,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + if (component_count == 1) + return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Use typed shader outputs directly.
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 56 +++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9419dc45c38c..234b7c82003e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2791,25 +2791,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src(struct vkd3d_dxbc_compiler *co } static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, DWORD write_mask, + const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, chain_id, index[1]; - struct vkd3d_shader_register_info reg_info; unsigned int component_idx; assert(reg->type != VKD3DSPR_IMMCONST); - if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) - return; - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info.id, index, ARRAY_SIZE(index)); + ptr_type_id, reg_info->id, index, ARRAY_SIZE(index)); vkd3d_spirv_build_op_store(builder, chain_id, val_id, SpvMemoryAccessMaskNone); } @@ -2818,35 +2814,39 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t reg_id, type_id, reg_val_id; + struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; + uint32_t type_id, reg_val_id; unsigned int component_count; assert(reg->type != VKD3DSPR_IMMCONST); assert(write_mask); component_count = vkd3d_write_mask_component_count(write_mask); + component_type = vkd3d_component_type_from_data_type(reg->data_type); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) + return; + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - if (reg->data_type != VKD3D_DATA_FLOAT) + if (component_type != reg_info.component_type) { - uint32_t type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, component_count); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } if (component_count == 1) - return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, val_id); - - reg_id = vkd3d_dxbc_compiler_get_register_id(compiler, reg); + return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, &reg_info, val_id); if (component_count != VKD3D_VEC4_SIZE) { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, VKD3D_VEC4_SIZE); + reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - reg_val_id, val_id, write_mask, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + reg_val_id, val_id, write_mask, reg_info.component_type, VKD3D_VEC4_SIZE); } - vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, reg_info.id, val_id, SpvMemoryAccessMaskNone); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, @@ -3275,6 +3275,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi for (i = 0; i < max(array_size, 1); ++i) { struct vkd3d_shader_register dst_reg = *reg; + dst_reg.data_type = VKD3D_DATA_FLOAT; val_id = input_id; if (array_size) @@ -3515,7 +3516,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE + use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE || (builtin && builtin->is_spirv_array); if (use_private_variable) @@ -3534,7 +3535,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -4521,22 +4522,25 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + struct vkd3d_shader_register_info dst_reg_info, src_reg_info; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t val_id, dst_val_id, type_id, dst_id, src_id; - struct vkd3d_shader_register_info reg_info; uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; component_count = vkd3d_write_mask_component_count(dst->write_mask); - memset(&reg_info, 0, sizeof(reg_info)); + vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &dst_reg_info); + memset(&src_reg_info, 0, sizeof(src_reg_info)); if (src->reg.type != VKD3DSPR_IMMCONST) - vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &reg_info); + vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &src_reg_info); if (component_count == 1 || component_count == VKD3D_VEC4_SIZE || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST - || reg_info.component_type != VKD3D_TYPE_FLOAT || reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) + || dst_reg_info.component_type != src_reg_info.component_type + || dst_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL + || src_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) { val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); @@ -4545,7 +4549,7 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, dst_reg_info.component_type, VKD3D_VEC4_SIZE); dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg); -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d-shader: Rename "output setup" function to "shader epilogue".
by Józef Kucia 30 Oct '18

30 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 09c6f9f799e4..9419dc45c38c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1883,7 +1883,7 @@ struct vkd3d_dxbc_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ - uint32_t output_setup_function_id; + uint32_t epilogue_function_id; uint32_t dummy_sampler_id; uint32_t binding_idx; @@ -3545,8 +3545,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; - if (!compiler->output_setup_function_id) - compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); + if (!compiler->epilogue_function_id) + compiler->epilogue_function_id = vkd3d_spirv_alloc_id(builder); } } @@ -4981,13 +4981,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_co return merge_block_id; } -static void vkd3d_dxbc_compiler_emit_output_setup_invocation(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_id, arguments[MAX_REG_OUTPUT]; unsigned int i, count; - if ((function_id = compiler->output_setup_function_id)) + if ((function_id = compiler->epilogue_function_id)) { void_id = vkd3d_spirv_get_op_type_void(builder); for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) @@ -5006,7 +5006,7 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); } @@ -6455,7 +6455,7 @@ static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *com return; } - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_emit_vertex(builder); } @@ -6857,7 +6857,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } } -static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; const struct vkd3d_shader_signature *signature = compiler->output_signature; @@ -6866,7 +6866,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com unsigned int i, count; DWORD variable_idx; - function_id = compiler->output_setup_function_id; + function_id = compiler->epilogue_function_id; assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); @@ -6883,7 +6883,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, function_id, "setup_output"); + vkd3d_spirv_build_op_name(builder, function_id, "epilogue"); for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { @@ -6922,8 +6922,8 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_function_end(builder); - if (compiler->output_setup_function_id) - vkd3d_dxbc_compiler_emit_output_setup_function(compiler); + if (compiler->epilogue_function_id) + vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) vkd3d_spirv_stream_clear(&builder->debug_stream); -- 2.18.1

2 1

[PATCH 5/6] server: Introduce is_fd_synchronous helper.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/fd.c | 10 ++++++++-- server/file.c | 7 +------ server/file.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-)

1 0

[PATCH 3/6] ntdll: Correctly return result of blocking NtFlushBuffersFile.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 2 +- dlls/ntdll/file.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6] kernel32: Wait on pipe handle in TransactNamedPipe if needed.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/6] kernel32: Wait on pipe handle in ConnectNamedPipe if needed.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 3/5] ntdll/tests: Add more I/O blocking and completion tests.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 340 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 339 insertions(+), 1 deletion(-)

2 2

[v2 PATCH] msvcrt: Implement __strncnt().
by Nikolay Sivov 30 Oct '18

30 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed unnecessary function pointer check in tests. .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 32 ++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 32 ++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 32 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 19 +++++++++ dlls/msvcrt/tests/string.c | 38 +++++++++++++++++ dlls/ucrtbase/tests/string.c | 42 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 204 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index d045996756..bbc247c79c 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __iscsymf(long) ucrtbase.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __strncnt +@ cdecl __strncnt(str long) ucrtbase.__strncnt @ stub __wcsncnt @ cdecl _isalnum_l(long ptr) ucrtbase._isalnum_l @ cdecl _isalpha_l(long ptr) ucrtbase._isalpha_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1579415edc..482dcbbf03 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -656,7 +656,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 594ac28072..8ac8f4ea3b 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -235,6 +235,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static char* (__cdecl *p_setlocale)(int, const char*); +static size_t (__cdecl *p___strncnt)(const char*, size_t); /* make sure we use the correct errno */ #undef errno @@ -270,6 +271,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p_setlocale, "setlocale"); + SET(p___strncnt, "__strncnt"); SET(p_Context_Id, "?Id@Context@Concurrency@@SAIXZ"); SET(p_CurrentScheduler_Detach, "?Detach@CurrentScheduler@Concurrency@@SAXXZ"); @@ -1075,6 +1077,35 @@ static void test_setlocale(void) ok(!ret, "got %p\n", ret); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr100) { if (!init()) @@ -1094,4 +1125,5 @@ START_TEST(msvcr100) test__memicmp(); test__memicmp_l(); test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 029620f72e..4ad61d4022 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1004,7 +1004,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index dcee5c1ecc..09876131f0 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -32,6 +32,7 @@ #include <locale.h> static char* (CDECL *p_setlocale)(int category, const char* locale); +static size_t (CDECL *p___strncnt)(const char *str, size_t count); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -50,6 +51,7 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); @@ -112,9 +114,39 @@ static void test_setlocale(void) p_setlocale(LC_ALL, "C"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 89002ed15b..47834e5d62 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -994,7 +994,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e926bbbf48..e5b26a4746 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -965,7 +965,7 @@ @ stub __report_gsfailure @ extern __setlc_active msvcr120.__setlc_active @ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) msvcr120.__strncnt @ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l @ cdecl __sys_errlist() msvcr120.__sys_errlist @ cdecl __sys_nerr() msvcr120.__sys_nerr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7aebe34f23..69355cc1f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -305,7 +305,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index eb70ff9153..33ec4b2df7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -289,7 +289,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 777d4fee97..0ba1f1a7b1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -134,6 +134,7 @@ static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *ha static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); +static size_t (__cdecl *p___strncnt)(const char *str, size_t count); /* make sure we use the correct errno */ #undef errno @@ -403,6 +404,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p__vsnwprintf, "_vsnwprintf"); + SET(p___strncnt, "__strncnt"); if (sizeof(void *) == 8) { @@ -1894,6 +1896,35 @@ static void test__vsnwprintf(void) ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1931,4 +1962,5 @@ START_TEST(msvcr90) #ifdef __i386__ test__fpieee_flt(); #endif + test___strncnt(); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d963f7cbd9..7faecb261e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -281,7 +281,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -# stub __strncnt(str long) +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index cbbb65b249..fc827d8093 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2060,3 +2060,22 @@ char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) { return strpbrk(str, accept); } + +/********************************************************************* + * __strncnt (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT___strncnt(const char *str, MSVCRT_size_t size) +{ + MSVCRT_size_t ret = 0; + +#if _MSVCR_VER >= 140 + while (*str++ && size--) +#else + while (size-- && *str++) +#endif + { + ret++; + } + + return ret; +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 670c7cf91f..d0988bf86c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -100,6 +100,7 @@ static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -3568,6 +3569,41 @@ static void test__tcsnicoll(void) } } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(string) { char mem[100]; @@ -3626,6 +3662,7 @@ START_TEST(string) p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -3693,4 +3730,5 @@ START_TEST(string) test__strupr(); test__tcsncoll(); test__tcsnicoll(); + test___strncnt(); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index ab86f46810..34f5a78b07 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -89,6 +89,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); static BOOL init(void) { @@ -105,6 +106,7 @@ static BOOL init(void) p_strtod = (void*)GetProcAddress(module, "strtod"); p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); return TRUE; } @@ -244,10 +246,50 @@ static void test__memicmp_l(void) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } + + +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } + + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + if (0) /* crashes */ + { + ret = p___strncnt(NULL, 0); + ret = p___strncnt(NULL, 1); + } + + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); +} + START_TEST(string) { if (!init()) return; test_strtod(); test__memicmp(); test__memicmp_l(); + test___strncnt(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 404da75f9a..142ac86913 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -164,7 +164,7 @@ @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread -- 2.19.1

2 1

[PATCH] testbot: Specify which test units to rerun with the 'test' mission option.
by Francois Gouget 30 Oct '18

30 Oct '18

If set to 'all', then any non-test patch will cause a full WineTest run. If set to 'module', then only the patched module's tests will be run. If set to 'test' or unset, then the current behavior is preserved so that only patched test units are run. If set to 'build', then only verify that the patch builds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineReconfig.pl | 8 +++-- testbot/bin/build/WineTest.pl | 43 ++++++++++++++++++++------- testbot/lib/WineTestBot/Missions.pm | 6 +++- testbot/lib/WineTestBot/PatchUtils.pm | 25 +++++++++++----- testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index f46408b469..53ce319032 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -104,13 +104,15 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving # time. Note that this requires using a different wineprefix for each build. - foreach my $Build ("win32", "wow64", "wow32") + foreach my $Mission (@{$TaskMissions->{Missions}}) { - next if (!$TaskMissions->{Builds}->{$Build}); + next if ($Mission->{test} eq "build"); + + SetupWineEnvironment($Build); + InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - SetupWineEnvironment($Build); my $ErrMessage = CreateWinePrefix($Build, "wait"); if (defined $ErrMessage) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index c74d1f6562..893a74dd59 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -122,25 +122,48 @@ sub TestPatch($$) { my ($Mission, $Impacts) = @_; + return 1 if ($Mission->{test} eq "build"); + my @TestList; - foreach my $Module (sort keys %{$Impacts->{Tests}}) + if ($Mission->{test} eq "all" and + ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules})) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - if ($TestInfo->{All}) - { - push @TestList, $Module; - } - else + push @TestList, "-m", "do.not.submit"; + } + else + { + foreach my $Module (sort keys %{$Impacts->{Tests}}) { - foreach my $Unit (sort keys %{$TestInfo->{Units}}) + my $TestInfo = $Impacts->{Tests}->{$Module}; + if ($TestInfo->{All} or + ($Mission->{test} eq "module" and $TestInfo->{PatchedModule})) { - push @TestList, "$Module:$Unit"; + # When given a module name WineTest runs all its tests. + # But make sure the module actually has tests first! + push @TestList, $Module if (%{$TestInfo->{Units}}); + } + else + { + foreach my $Unit (sort keys %{$TestInfo->{Units}}) + { + push @TestList, "$Module:$Unit"; + } } } + return 1 if (!@TestList); } - return 1 if (!@TestList); SetupTest("the tests", $Mission); + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + return 0; + } + } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 58b33403fb..80c1d97227 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -64,7 +64,11 @@ sub ParseMissionStatement($) } $Build = $1; # untaint $TaskMissions->{Builds}->{$Build} = 1; - my $Mission = { Build => $Build, Statement => $Statement }; + my $Mission = { + Build => $Build, + Statement => $Statement, + test => "test", # Set the default value + }; push @{$TaskMissions->{Missions}}, $Mission; foreach my $Option (@Options) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index fb4f88650f..0e17a70002 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -492,15 +492,26 @@ sub GetTestTimeout($$) { my ($Impacts, $TaskMissions) = @_; - my $Timeout = $SuiteTimeout; - if ($Impacts) + my $Timeout = 0; + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $UnitCount = $Impacts->{TestUnitCount}; - my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + - max(0, $UnitCount - 2) * $SingleAvgTime; - $Timeout = min($SuiteTimeout, $TestsTimeout); + if (!$Impacts or ($Mission->{test} eq "all" and + ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules}))) + { + $Timeout += $SuiteTimeout; + } + elsif ($Mission->{test} ne "build") + { + # Note: If only test units have been patched then + # ModuleUnitCount == TestUnitCount. + my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{TestUnitCount} : + $Impacts->{ModuleUnitCount}; + my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + + max(0, $UnitCount - 2) * $SingleAvgTime; + $Timeout += min($SuiteTimeout, $TestsTimeout); + } } - return @{$TaskMissions->{Missions}} * $Timeout; + return $Timeout; } 1; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 5f49c684d8..4b7799a8cf 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -78,6 +78,7 @@ sub GenerateFooter($) print "Each mission is composed of a build and options separated by commas: build,option1=value,option2,.... The value can be omitted for boolean options and defaults to true. \n"; print "The supported builds are build for build VMs; exe32 and exe64 for Windows VMs; win32, wow32 and wow64 for Wine VMs.\n"; print "On Wine VMs: \n"; + print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; -- 2.19.1

1 0

[PATCH] msvcrt: Implement __strncnt().
by Nikolay Sivov 30 Oct '18

30 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 38 +++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 32 +++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 32 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 19 ++++++++ dlls/msvcrt/tests/string.c | 38 +++++++++++++++ dlls/ucrtbase/tests/string.c | 48 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 216 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index d045996756..bbc247c79c 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __iscsymf(long) ucrtbase.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __strncnt +@ cdecl __strncnt(str long) ucrtbase.__strncnt @ stub __wcsncnt @ cdecl _isalnum_l(long ptr) ucrtbase._isalnum_l @ cdecl _isalpha_l(long ptr) ucrtbase._isalpha_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1579415edc..482dcbbf03 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -656,7 +656,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 594ac28072..9181cb88b6 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -235,6 +235,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static char* (__cdecl *p_setlocale)(int, const char*); +static size_t (__cdecl *p___strncnt)(const char*, size_t); /* make sure we use the correct errno */ #undef errno @@ -270,6 +271,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p_setlocale, "setlocale"); + SET(p___strncnt, "__strncnt"); SET(p_Context_Id, "?Id@Context@Concurrency@@SAIXZ"); SET(p_CurrentScheduler_Detach, "?Detach@CurrentScheduler@Concurrency@@SAXXZ"); @@ -1075,6 +1077,41 @@ static void test_setlocale(void) ok(!ret, "got %p\n", ret); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr100) { if (!init()) @@ -1094,4 +1131,5 @@ START_TEST(msvcr100) test__memicmp(); test__memicmp_l(); test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 029620f72e..4ad61d4022 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1004,7 +1004,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index dcee5c1ecc..09876131f0 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -32,6 +32,7 @@ #include <locale.h> static char* (CDECL *p_setlocale)(int category, const char* locale); +static size_t (CDECL *p___strncnt)(const char *str, size_t count); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -50,6 +51,7 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); @@ -112,9 +114,39 @@ static void test_setlocale(void) p_setlocale(LC_ALL, "C"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 89002ed15b..47834e5d62 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -994,7 +994,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e926bbbf48..e5b26a4746 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -965,7 +965,7 @@ @ stub __report_gsfailure @ extern __setlc_active msvcr120.__setlc_active @ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) msvcr120.__strncnt @ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l @ cdecl __sys_errlist() msvcr120.__sys_errlist @ cdecl __sys_nerr() msvcr120.__sys_nerr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7aebe34f23..69355cc1f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -305,7 +305,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index eb70ff9153..33ec4b2df7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -289,7 +289,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 777d4fee97..0ba1f1a7b1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -134,6 +134,7 @@ static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *ha static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); +static size_t (__cdecl *p___strncnt)(const char *str, size_t count); /* make sure we use the correct errno */ #undef errno @@ -403,6 +404,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p__vsnwprintf, "_vsnwprintf"); + SET(p___strncnt, "__strncnt"); if (sizeof(void *) == 8) { @@ -1894,6 +1896,35 @@ static void test__vsnwprintf(void) ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1931,4 +1962,5 @@ START_TEST(msvcr90) #ifdef __i386__ test__fpieee_flt(); #endif + test___strncnt(); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d963f7cbd9..7faecb261e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -281,7 +281,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -# stub __strncnt(str long) +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index cbbb65b249..fc827d8093 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2060,3 +2060,22 @@ char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) { return strpbrk(str, accept); } + +/********************************************************************* + * __strncnt (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT___strncnt(const char *str, MSVCRT_size_t size) +{ + MSVCRT_size_t ret = 0; + +#if _MSVCR_VER >= 140 + while (*str++ && size--) +#else + while (size-- && *str++) +#endif + { + ret++; + } + + return ret; +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 670c7cf91f..d0988bf86c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -100,6 +100,7 @@ static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -3568,6 +3569,41 @@ static void test__tcsnicoll(void) } } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(string) { char mem[100]; @@ -3626,6 +3662,7 @@ START_TEST(string) p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -3693,4 +3730,5 @@ START_TEST(string) test__strupr(); test__tcsncoll(); test__tcsnicoll(); + test___strncnt(); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index ab86f46810..b86ebd9acc 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -89,6 +89,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); static BOOL init(void) { @@ -105,6 +106,7 @@ static BOOL init(void) p_strtod = (void*)GetProcAddress(module, "strtod"); p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); return TRUE; } @@ -244,10 +246,56 @@ static void test__memicmp_l(void) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } + + +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } + + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + if (0) /* crashes */ + { + ret = p___strncnt(NULL, 0); + ret = p___strncnt(NULL, 1); + } + + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); +} + START_TEST(string) { if (!init()) return; test_strtod(); test__memicmp(); test__memicmp_l(); + test___strncnt(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 404da75f9a..142ac86913 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -164,7 +164,7 @@ @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread -- 2.19.1

2 2

[PATCH] ntdll: Use correct size when checking iosb in NtFlushBuffersFile. (coverity)
by Jacek Caban 30 Oct '18

30 Oct '18

Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 5/5] server: Use file mode flags in async_handoff to decide if request is blocking.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 22 +++++++--------------- server/async.c | 4 ++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 14 insertions(+), 22 deletions(-)

1 0

[PATCH 4/5] server: Introduce is_fd_synchronous helper.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/fd.c | 10 ++++++++-- server/file.c | 7 +------ server/file.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-)

1 0

[PATCH 2/5] kernel32: Wait on pipe handle in TransactNamedPipe if needed.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/5] kernel32: Wait on pipe handle in ConnectNamedPipe if needed.
by Jacek Caban 30 Oct '18

30 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH v3 1/6] shell32/autocomplete: Fill and display the auto-suggest listbox in a separate function
by Gabriel Ivăncescu 30 Oct '18

30 Oct '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Split the patches. dlls/shell32/autocomplete.c | 77 ++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index dfe7638..8cf0243 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -293,40 +293,11 @@ static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR * heap_free(tmp); } -static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) +static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, + HWND hwnd, enum autoappend_flag flag) { - HRESULT hr; - WCHAR *text; - UINT cpt, 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); - return; - } - - size = len + 1; - if (!(text = heap_alloc(size * sizeof(WCHAR)))) - return; - len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); - 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; - } - - /* Set txtbackup to point to text itself (which must not be released) */ - heap_free(ac->txtbackup); - ac->txtbackup = text; + /* Return FALSE if we need to hide the listbox */ + UINT cpt; if (ac->options & ACO_AUTOSUGGEST) { @@ -335,6 +306,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ } for (cpt = 0;;) { + HRESULT hr; LPOLESTR strs = NULL; ULONG fetched; @@ -379,8 +351,47 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else + return FALSE; + } + return TRUE; +} + +static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) +{ + WCHAR *text; + 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); + return; } + + size = len + 1; + if (!(text = heap_alloc(size * sizeof(WCHAR)))) + return; + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); + 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; + } + + /* Set txtbackup to point to text itself (which must not be released) */ + heap_free(ac->txtbackup); + ac->txtbackup = text; + + if (!display_matching_strs(ac, text, len, hwnd, flag)) + hide_listbox(ac, ac->hwndListBox); } static void destroy_autocomplete_object(IAutoCompleteImpl *ac) -- 1.9.1

3 13

[PATCH] ko.po: Update Korean translation.
by Byeongsik Jeon 30 Oct '18

30 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- Fix some awkward translations correctly. po/ko.po | 2007 +++++++++++++++++++++++++++--------------------------- 1 file changed, 994 insertions(+), 1013 deletions(-) diff --git a/po/ko.po b/po/ko.po index e0d4319b7a..fda886c98d 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-29 21:06+0900\n" +"PO-Revision-Date: 2018-10-30 20:17+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -15,7 +15,7 @@ msgstr "" #: appwiz.rc:58 msgid "Install/Uninstall" -msgstr "설치/삭제" +msgstr "설치/제거" #: appwiz.rc:61 msgid "" @@ -35,8 +35,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"다음 소프트웨어는 자동으로 제거될 것입니다. 프로그램을 제거하거나 설치된 구성" -"요소를 수정하려면, 목록에서 선택하고 [수정/제거]를 클릭하십시오." +"다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성요소" +"를 수정하려면, 목록에서 선택한 후 [수정/제거]를 클릭하십시오." #: appwiz.rc:67 msgid "&Support Information" @@ -75,7 +75,7 @@ msgstr "확인" #: appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "이 정보는 %s을(를) 위한 기술 지원을 받기 위해 사용될 수 있습니다:" +msgstr "이 정보는 %s을(를) 위한 기술 지원을 받는 데 사용될 수 있습니다:" #: appwiz.rc:80 msgid "Publisher:" @@ -123,13 +123,13 @@ msgid "" "href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine이 HTML 임베딩 응용프로그램을 올바르게 동작시키는 데 필요한 Gecko 패키지" -"를 찾을 수 없습니다. Wine은 Gecko 패키지를 자동으로 다운로드하고 설치할 수 있" -"습니다.\n" +"Wine이 HTML 임베딩 프로그램을 올바르게 동작시키는 데 필요한 Gecko 패키지를 찾" +"을 수 없습니다. Wine은 Gecko 패키지를 자동으로 다운로드하고 설치할 수 있습니" +"다.\n" "\n" -"노트: 배포판 패키지를 사용하는 것을 추천합니다. 자세한 내용은 <a href=" -"\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a>를 보십시" -"오." +"참고: 배포판이 제공하는 Gecko 패키지 사용을 추천합니다. 자세한 내용은 <a " +"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a>를 보" +"십시오." #: appwiz.rc:109 appwiz.rc:124 msgid "&Install" @@ -169,12 +169,13 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine이 닷넷 응용프로그램을 올바르게 동작시키는 데 필요한 wine-mono 패키지를 " -"찾을 수 없습니다. Wine은 wine-mono 패키지를 자동으로 다운로드하고 설치할 수 " -"있습니다.\n" +"Wine이 닷넷 프로그램을 올바르게 동작시키는 데 필요한 wine-mono 패키지를 찾을 " +"수 없습니다. Wine은 wine-mono 패키지를 자동으로 다운로드하고 설치할 수 있습니" +"다.\n" "\n" -"노트: 배포판 패키지를 사용하는 것을 추천합니다. 자세한 내용은 <a href=" -"\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 보십시오." +"참고: 배포판이 제공하는 wine-mono 패키지 사용을 추천합니다. 자세한 내용은 <a " +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 보십" +"시오." #: appwiz.rc:31 msgid "Add/Remove Programs" @@ -189,7 +190,7 @@ msgstr "" #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" -msgstr "응용프로그램" +msgstr "프로그램" #: appwiz.rc:35 msgid "" @@ -197,7 +198,7 @@ msgid "" "entry for this program from the registry?" msgstr "" "제거 프로그램 '%s'을(를) 실행할 수 없습니다. 레지스트리에서 이 프로그램의 제" -"거 항목을 지우시겠습니까?" +"거 항목을 제거하시겠습니까?" #: appwiz.rc:36 msgid "Not specified" @@ -393,7 +394,7 @@ msgstr "추가(&A) ->" #: comctl32.rc:108 msgid "<- &Remove" -msgstr "<- 삭제(&R)" +msgstr "<- 제거(&R)" #: comctl32.rc:109 msgid "&Toolbar buttons:" @@ -414,7 +415,7 @@ msgstr "예(&Y)" #: comctl32.rc:53 shell32.rc:311 shlwapi.rc:47 user32.rc:80 msgid "&No" -msgstr "아니오(&N)" +msgstr "아니요(&N)" #: comctl32.rc:54 user32.rc:82 msgid "&Retry" @@ -558,7 +559,7 @@ msgstr "가로(&L)" #: comdlg32.rc:240 comdlg32.rc:415 comdlg32.rc:435 wineps.rc:28 msgid "Paper" -msgstr "종이" +msgstr "용지" #: comdlg32.rc:241 msgid "Si&ze" @@ -713,7 +714,7 @@ msgstr "파일로 인쇄(&L)" #: comdlg32.rc:365 comdlg32.rc:403 ieframe.rc:42 shdoclc.rc:61 shell32.rc:108 #: clock.rc:31 wineconsole.rc:30 msgid "&Properties" -msgstr "등록 정보(&P)" +msgstr "속성(&P)" #: comdlg32.rc:366 comdlg32.rc:404 msacm32.rc:34 winefile.rc:138 msgid "&Name:" @@ -741,7 +742,7 @@ msgstr "복사본" #: comdlg32.rc:378 msgid "Number of &copies:" -msgstr "복사본 갯수(&C):" +msgstr "복사본 개수(&C):" #: comdlg32.rc:380 msgid "C&ollate" @@ -852,8 +853,8 @@ msgid "" "File does not exist.\n" "Do you want to create file?" msgstr "" -"파일이 존재하지 않습니다\n" -"파일을 만들겠습니까?" +"파일이 없습니다\n" +"파일을 새로 만드시겠습니까?" #: comdlg32.rc:35 msgid "" @@ -861,31 +862,31 @@ msgid "" "Do you want to replace it?" msgstr "" "파일은 이미 존재합니다.\n" -"덮어쓰겠습니까?" +"파일을 교체하시겠습니까?" #: comdlg32.rc:36 msgid "Invalid character(s) in path" -msgstr "경로에 올바르지 않은 문자가 있습니다h" +msgstr "경로에 올바르지 않은 문자가 들어 있습니다." #: comdlg32.rc:37 msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"파일이름에는 다음 문자만 포함될 수 있습니다:\n" -" / : < > |" +"파일 이름에 다음 문자가 들어 있으면 안됩니다.\n" +" / : < > |" #: comdlg32.rc:38 msgid "Path does not exist" -msgstr "경로가 존재하지 않습니다" +msgstr "경로가 없습니다" #: comdlg32.rc:39 msgid "File does not exist" -msgstr "파일이 존재하지 않습니다" +msgstr "파일이 없습니다" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "선택 영역이 폴더가 아닌 객체를 포함합니다" +msgstr "선택 영역에 폴더가 아닌 객체가 들어 있습니다" #: comdlg32.rc:45 msgid "Up One Level" @@ -905,7 +906,7 @@ msgstr "세부사항" #: comdlg32.rc:49 msgid "Browse to Desktop" -msgstr "데스크탑 열기" +msgstr "바탕 화면 열기" #: comdlg32.rc:113 msgid "Regular" @@ -1008,19 +1009,19 @@ msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"이 여백은 겹치거나 종이 밖으로 나갈 것입니다.\n" -"여백을 다시 입력하시오." +"여백이 겹쳐졌거나 용지 크기를 넘었습니다.\n" +"여백 크기를 다시 입력십시오." #: comdlg32.rc:64 msgid "The 'Number of copies' field cannot be empty." -msgstr "'복사본 갯수' 필드는 비어있어서는 안됩니다." +msgstr "'복사본 개수' 필드는 비어 있어서는 안됩니다." #: comdlg32.rc:66 msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"너무 많은 복사본 갯수는 프린터에서 지원하지 않습니다.\n" +"복사본 개수가 너무 많아서 프린터가 지원하지 않습니다.\n" "1과 %d 사이의 값을 입력하십시오." #: comdlg32.rc:67 @@ -1029,7 +1030,7 @@ msgstr "프린터 오류 발생." #: comdlg32.rc:68 msgid "No default printer defined." -msgstr "어떤 기본 프린터도 정의되지 않았습니다." +msgstr "기본 프린터가 정의되지 않았습니다." #: comdlg32.rc:69 msgid "Cannot find the printer." @@ -1045,19 +1046,19 @@ msgstr "오류 발생." #: comdlg32.rc:72 msgid "Unknown printer driver." -msgstr " 없는 프린터 드라이버." +msgstr "알 수 없는 프린터 드라이버." #: comdlg32.rc:75 msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"문서를 인쇄하거나 페이지 설정같은 프린터와 관련된 작업을 하기 전에, 당신" -"은 먼저 프린터를 설치하시오. 설치하고 다시 시도하시오." +"페이지 설정이나 문서 인쇄와 같은 프린터 관련 작업을 수행하려면 먼저 프린터를 " +"설치해야 합니다. 프린터를 설치하고 다시 시도하십시오." #: comdlg32.rc:141 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "%1!d! 와 %2!d! 포인트 사이에서 글꼴 크기 선택하십시오." +msgstr "%1!d!pt - %2!d!pt 사이에서 글꼴 크기를 선택하십시오." #: comdlg32.rc:142 ieframe.rc:35 msgid "&Save" @@ -1065,7 +1066,7 @@ msgstr "저장(&S)" #: comdlg32.rc:143 msgid "Save &in:" -msgstr "~에 저장(&I):" +msgstr "다음 위치에 저장(&I):" #: comdlg32.rc:144 msgid "Save" @@ -1097,7 +1098,7 @@ msgstr "오류; " #: comdlg32.rc:86 msgid "Pending deletion; " -msgstr "삭제 중; " +msgstr "제거 중; " #: comdlg32.rc:87 msgid "Paper jam; " @@ -1237,8 +1238,8 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"당신의 사용자 이름과 암호가\n" -"올바른지 확인하십시오." +"사용자 이름과 암호가 올바른지\n" +"확인하십시오." #: credui.rc:35 msgid "" @@ -1249,7 +1250,8 @@ msgid "" msgstr "" "Caps Lock이 켜져 있으면 암호가 올바르지 않게 입력될 수 있습니다.\n" "\n" -"암호를 입력하기 전에 키보드의 Caps Lock 키를 눌러서 끄시기 바랍니다." +"암호를 입력하기 전에 키보드의 Caps Lock 키를 눌러서 Caps Lock을\n" +"끄십시오." #: credui.rc:34 msgid "Caps Lock is On" @@ -1317,11 +1319,11 @@ msgstr "다음 업데이트 위치" #: crypt32.rc:45 msgid "Yes or No Trust" -msgstr "신뢰(예(Y) 나 아니오(N))" +msgstr "신뢰(예(Y) 나 아니요(N))" #: crypt32.rc:46 msgid "Email Address" -msgstr "이메일 주소" +msgstr "전자메일 주소" #: crypt32.rc:47 msgid "Unstructured Name" @@ -1357,7 +1359,7 @@ msgstr "S/MIME 능력" #: crypt32.rc:55 msgid "Prefer Signed Data" -msgstr "선호하는 사인된 데이타" +msgstr "선호하는 사인된 데이터" #: crypt32.rc:56 cryptdlg.rc:34 msgctxt "Certification Practice Statement" @@ -1482,7 +1484,7 @@ msgstr "교차 CA 버전" #: crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "연속된 서명 시리얼 넘버" +msgstr "직렬화된 서명 일련 번호" #: crypt32.rc:87 msgid "Principal Name" @@ -1490,11 +1492,11 @@ msgstr "주요한 이름" #: crypt32.rc:88 msgid "Windows Product Update" -msgstr "윈도우즈 제품 업데이트" +msgstr "Windows 제품 업데이트" #: crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "등록 이름 값의 쌍" +msgstr "등록 이름 값 쌍" #: crypt32.rc:90 msgid "OS Version" @@ -1550,7 +1552,7 @@ msgstr "프로그램 정책 제약" #: crypt32.rc:103 msgid "CMC Data" -msgstr "CMC 데이타" +msgstr "CMC 데이터" #: crypt32.rc:104 msgid "CMC Response" @@ -1574,7 +1576,7 @@ msgstr "CMC 속성" #: crypt32.rc:109 msgid "PKCS 7 Data" -msgstr "PKCS 7 데이타" +msgstr "PKCS 7 데이터" #: crypt32.rc:110 msgid "PKCS 7 Signed" @@ -1702,7 +1704,7 @@ msgstr "코드 서명" #: crypt32.rc:141 msgid "Secure Email" -msgstr "보안 이메일" +msgstr "보안 전자메일" #: crypt32.rc:142 msgid "Time Stamping" @@ -1734,27 +1736,27 @@ msgstr "암호화된 파일 시스템" #: crypt32.rc:149 cryptui.rc:133 msgid "Windows Hardware Driver Verification" -msgstr "윈도우즈 굳은모 드라이버 검증" +msgstr "Windows 하드웨어 드라이버 검증" #: crypt32.rc:150 cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "윈도우즈 시스템 구성요소 검증" +msgstr "Windows 시스템 구성요소 검증" #: crypt32.rc:151 cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM 윈도우즈 시스템 구성요소 검증" +msgstr "OEM Windows 시스템 구성요소 검증" #: crypt32.rc:152 cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "임베디드 윈도우즈 시스템 컴포넌트 확인" +msgstr "내장 Windows 시스템 컴포넌트 확인" #: crypt32.rc:153 cryptui.rc:143 msgid "Key Pack Licenses" -msgstr "키 팩 라이센스" +msgstr "키 팩 라이선스" #: crypt32.rc:154 cryptui.rc:144 msgid "License Server Verification" -msgstr "라이센스 서버 확인" +msgstr "라이선스 서버 확인" #: crypt32.rc:155 cryptui.rc:146 msgid "Smart Card Logon" @@ -1794,7 +1796,7 @@ msgstr "모든 프로그램의 방침" #: crypt32.rc:164 cryptui.rc:149 msgid "Directory Service Email Replication" -msgstr "디렉터리 서비스 이메일 응답" +msgstr "디렉터리 서비스 전자메일 응답" #: crypt32.rc:165 cryptui.rc:145 msgid "Certificate Request Agent" @@ -1850,7 +1852,7 @@ msgstr "다른 이름=" #: crypt32.rc:186 msgid "Email Address=" -msgstr "이메일 주소=" +msgstr "전자메일 주소=" #: crypt32.rc:187 msgid "DNS Name=" @@ -1878,7 +1880,7 @@ msgstr "등록된 ID=" #: crypt32.rc:193 msgid "Unknown Key Usage" -msgstr " 없는 키 사용" +msgstr "알 수 없는 키 사용" #: crypt32.rc:194 msgid "Subject Type=" @@ -1925,7 +1927,7 @@ msgstr "CA 발행자" #: crypt32.rc:204 msgid "Unknown Access Method" -msgstr " 없는 접근 방법" +msgstr "알 수 없는 접근 방법" #: crypt32.rc:205 msgid "Alternative Name" @@ -1965,7 +1967,7 @@ msgstr "CA 협정" #: crypt32.rc:214 msgid "Affiliation Changed" -msgstr "가입이 변경됨" +msgstr "소속 바꾸기" #: crypt32.rc:215 msgid "Superseded" @@ -2001,7 +2003,7 @@ msgstr "예" #: crypt32.rc:223 cryptui.rc:167 oleaut32.rc:33 wininet.rc:84 ipconfig.rc:48 msgid "No" -msgstr "아니오" +msgstr "아니요" #: crypt32.rc:224 msgid "Digital Signature" @@ -2202,7 +2204,7 @@ msgstr "사용하고자 하는 인증서 저장소를 선택하십시오:" #: cryptui.rc:274 msgid "&Show physical stores" -msgstr "물리적 저장소 보여주기(&S)" +msgstr "물리적 저장소 보기(&S)" #: cryptui.rc:280 cryptui.rc:291 cryptui.rc:308 cryptui.rc:322 cryptui.rc:71 msgid "Certificate Import Wizard" @@ -2224,14 +2226,14 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"이 마법사는 당신이 인증서,인증서 폐기 목록을 가져오는 데 도움을 주고,파일에" -"서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n" +"이 마법사는 인증서, 인증서 취소 목록 및 인증서 신뢰 목록을 파일에서 인증서 저" +"장소로 가져오는 데 도움을 줍니다.\n" "\n" -"이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메시지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " -"인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" +"인증서를 사용하여 사용자 또는 통신 중인 컴퓨터를 식별할 수 있습니다. 인증 및 " +"메시지에 서명하는 데에도 사용할 수 있습니다. 인증서 저장소는 인증서, 인증서 " +"취소 목록 및 인증서 신뢰 목록의 모음입니다.\n" "\n" -"계속하려면, [다음]을 클릭하십시오." +"계속하려면 [다음]을 클릭합니다." #: cryptui.rc:294 cryptui.rc:430 msgid "&File name:" @@ -2275,7 +2277,7 @@ msgstr "자동으로 인증서 저장소 선택(&A)" #: cryptui.rc:315 msgid "&Place all certificates in the following store:" -msgstr "다음 저장소에 모든 인증서 저장(&P):" +msgstr "다음 저장소에 모든 인증서 보관(&P):" #: cryptui.rc:325 msgid "Completing the Certificate Import Wizard" @@ -2283,11 +2285,11 @@ msgstr "인증서 가져오기 마법사 마치는 중" #: cryptui.rc:327 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "당신은 인증서 가져오기 마법사를 마치는데 성공했습니다." +msgstr "인증서 가져오기 마법사를 완료했습니다." #: cryptui.rc:329 cryptui.rc:443 msgid "You have specified the following settings:" -msgstr "당신은 다음 설정을 지정했습니다:" +msgstr "다음 설정을 지정했습니다:" #: cryptui.rc:337 cryptui.rc:122 inetcpl.rc:111 msgid "Certificates" @@ -2357,11 +2359,10 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"이 마법사는 당신이 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 " -"신뢰 목록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍" -"니다.\n" +"이 마법사는 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 신뢰 목" +"록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍니다.\n" "\n" -"이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" +"이 인증서는 유저 및 유저가 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" "다. 또한 메시지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " "인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" "\n" @@ -2372,12 +2373,12 @@ msgid "" "If you choose to export the private key, you will be prompted for a password " "to protect the private key on a later page." msgstr "" -"당신이 개인 키를 내보내기를 선택하면, 당신은 다음 페이지에서 개인 키를 보호" -"할 암호를 입력하게 될 것입니다." +"개인 키를 내보내기로 선택한 경우, 개인 키 보호 암호를 입력 받기 위한 페이지" +"가 나타납니다." #: cryptui.rc:385 msgid "Do you wish to export the private key?" -msgstr "개인 키를 내보내기를 원합니까?" +msgstr "개인 키 내보내기를 진행하시겠습니까?" #: cryptui.rc:386 msgid "&Yes, export the private key" @@ -2385,7 +2386,7 @@ msgstr "예(&Y), 개인 키 내보내기" #: cryptui.rc:388 msgid "N&o, do not export the private key" -msgstr "아니오(&O), 개인 키 안 내보내기" +msgstr "아니요(&O), 개인 키 내보내지 않기" #: cryptui.rc:399 msgid "&Confirm password:" @@ -2425,7 +2426,7 @@ msgstr "강한 암호화 가능(&E)" #: cryptui.rc:422 msgid "Delete the private &key if the export is successful" -msgstr "내보내기가 성공하면 개인 키 삭제(&K)" +msgstr "내보내기가 성공하면 개인 키 제거(&K)" #: cryptui.rc:439 msgid "Completing the Certificate Export Wizard" @@ -2433,7 +2434,7 @@ msgstr "인증서 내보내기 마법서 완료하는 중" #: cryptui.rc:441 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "당신은 인증서 내보내기 마법를 완료하는 데 성공하였습니다." +msgstr "인증서 내보내기 마법사를 완료했습니다." #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2456,8 +2457,8 @@ msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." msgstr "" -"이 루트 인증서는 신뢰할 수 없습니다. 이것을 신뢰하려면, 당신의 시스템의 신뢰" -"된루트 인증서 보관소에 추가하십시오." +"이 루트 인증서는 신뢰할 수 없습니다. 이것을 신뢰하려면 시스템의 신뢰할 수 있" +"는 루트 인증서 저장소에 추가하십시오." #: cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." @@ -2593,7 +2594,7 @@ msgstr "폼 1,2,3,4에 하나의 OID를 입력하십시오" #: cryptui.rc:68 msgid "The OID you entered already exists." -msgstr "당신이 입력한 OID는 이미 존재합니다." +msgstr "입력한 OID가 이미 존재합니다." #: cryptui.rc:70 msgid "Please select a certificate store." @@ -2604,8 +2605,7 @@ msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." msgstr "" -"이 파일은 주어진 기준에 일치하지 않는 개체를 포함합니다. 다른 파일을 선택하십" -"시오." +"이 파일에 주어진 기준에 맞지 않는 객체가 있습니다. 다른 파일을 선택하십시오." #: cryptui.rc:73 msgid "File to Import" @@ -2660,7 +2660,7 @@ msgstr "열 수 없음 " #: cryptui.rc:87 msgid "Determined by the program" -msgstr "프로그램에 의해 결정" +msgstr "프로그램이 결정" #: cryptui.rc:88 msgid "Please select a store" @@ -2672,7 +2672,7 @@ msgstr "인증서 보관소가 선택됨" #: cryptui.rc:90 msgid "Automatically determined by the program" -msgstr "자동으로 프로그램에 의해 결정" +msgstr "로그램이 자동으로 결정" #: cryptui.rc:91 shell32.rc:137 msgid "File" @@ -2736,9 +2736,8 @@ msgid "" "sign messages with it.\n" "Are you sure you want to remove this certificate?" msgstr "" -"당신은 더 이상 이 인증서를 이용해서 메시지를 해독하거나,아니면 서명할 수 없" -"을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하시겠습니까?" +"이 인증서로 메시지를 해독하거나 메시지에 서명할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:111 msgid "" @@ -2746,9 +2745,8 @@ msgid "" "sign messages with them.\n" "Are you sure you want to remove these certificates?" msgstr "" -"당신은 더 이상 이 인증서다들를 이용해서 메시지를 해독하거나,아니면 서명할 수 " -"없을 것입니다.\n" -"당신은 정말로 이 인증서들를 제거하시겠습니까??" +"이 인증서로 메시지를 해독하거나 메시지를 서명할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:112 msgid "" @@ -2756,9 +2754,8 @@ msgid "" "verify messages signed with it.\n" "Are you sure you want to remove this certificate?" msgstr "" -"당신은 더 이상 이 인증서를 이용해서 메시지를 암호하거나,아니면 서명된 것을 검" -"증할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하시겠습니까?" +"이 인증서로 메시지를 암호화하거나 서명된 메시지를 확인할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:113 msgid "" @@ -2766,9 +2763,8 @@ msgid "" "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" -"더 이상 이 인증서를 이용해서 메시지를 암호하거나,아니면 서명된 것을 검증할 " -"수 없을 것입니다.\n" -"정말로 이 인증서를 제거하시겠습니까?" +"이 인증서로 메시지를 암호화하거나 서명된 메시지를 확인할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:114 msgid "" @@ -2776,8 +2772,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"이 인증 기관이 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하시겠습니까?" +"이 인증 기관에서 발급한 인증서는 더 이상 신뢰할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:115 msgid "" @@ -2785,8 +2781,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"이 인증 기관이 발급한 인증서들를 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서들를 제거하시겠습니까?" +"이 인증 기관에서 발급한 인증서는 더 이상 신뢰할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:116 msgid "" @@ -2794,9 +2790,9 @@ msgid "" "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" -"이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 " -"수 없을 것입니다.\n" -"당신은 정말로 이 신뢰된 루트인증서를 제거하시겠습니까?" +"이 루트 인증 기관 또는 발급한 인증 기관에서 발급한 인증서는 더 이상 신뢰할 " +"수 없습니다.\n" +"이 루트 인증서를 제거할 수 있는가?" #: cryptui.rc:117 msgid "" @@ -2804,25 +2800,25 @@ msgid "" "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" -"이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 " -"수 없을 것입니다.\n" -"당신은 정말로 이 신뢰된 루트인증서들를 제거하시겠습니까?" +"이러한 루트 인증 기관 또는 발급한 인증 기관이 발급한 인증서는 더 이상 신뢰할 " +"수 없습니다.\n" +"이 루트 인증서를 제거할 수 있는가?" #: cryptui.rc:118 msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"이 발행자에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하시겠습니까?" +"이 게시자가 서명한 소프트웨어는 더 이상 신뢰할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:119 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"이 발행자에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서들를 제거하시겠습니까?" +"이 게시자가 서명한 소프트웨어는 더 이상 신뢰할 수 없습니다.\n" +"이 인증서를 제거하시겠습니까?" #: cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" @@ -2834,23 +2830,23 @@ msgstr "이 인증서를 제거하시겠습니까?" #: cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "원격 컴퓨터의 동일성 보증" +msgstr "원격 컴퓨터의 신원을 확인합니다" #: cryptui.rc:125 msgid "Proves your identity to a remote computer" -msgstr "당신의 신원을 원격컴퓨터로 인증" +msgstr "원격 컴퓨터에 대한 신원을 증명합니다" #: cryptui.rc:126 msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"소프트웨어 발행자로부터 온 소프트웨어 보증\n" -"발행된 후의 소프트웨어를 개조로부터 보호" +"소프트웨어가 소프트웨어 게시자로부터 제공되었는지 확인합니다\n" +"게시 후 변경되지 않도록 소프트웨어를 보호합니다" #: cryptui.rc:127 msgid "Protects e-mail messages" -msgstr "전자우편 메시지 보호" +msgstr "전자 메일 메시지를 보호합니다" #: cryptui.rc:128 msgid "Allows secure communication over the Internet" @@ -2858,39 +2854,39 @@ msgstr "인터넷을 통한 보안 통신 허용" #: cryptui.rc:129 msgid "Allows data to be signed with the current time" -msgstr "현재 시간에 따른 서명 허용" +msgstr "현재 시간으로 데이터 서명 허용" #: cryptui.rc:130 msgid "Allows you to digitally sign a certificate trust list" -msgstr "신뢰할 수 있는 증명서 목록에 전자 서명 허용" +msgstr "인증서 신뢰 목록에 디지털 서명 허용" #: cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "디스크에 데이타 암호화 허용" +msgstr "디스크 데이터 암호화 허용" #: cryptui.rc:147 msgid "Private Key Archival" -msgstr "사적 키 보관소" +msgstr "개인 키 보관소" #: cryptui.rc:151 msgid "Export Format" -msgstr "내보낼 형식" +msgstr "내보내기 형식" #: cryptui.rc:152 msgid "Choose the format in which the content will be saved." -msgstr "내용을 저장할 형식 선택." +msgstr "콘텐츠를 저장할 형식을 선택합니다." #: cryptui.rc:153 msgid "Export Filename" -msgstr "내보낼 파일이름" +msgstr "내보내기 파일 이름" #: cryptui.rc:154 msgid "Specify the name of the file in which the content will be saved." -msgstr "내용을 저장할 파일 이름 지정." +msgstr "콘텐츠를 저장할 파일 이름을 지정합니다." #: cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "지정된 파일은 이미 존재합니다.덮어 쓰시겠습니까?" +msgstr "지정된 파일이 이미 있습니다. 파일을 교체하시겠습니까?" #: cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -2936,7 +2932,7 @@ msgstr "내보낼 개인 키" msgid "" "The certificate contains a private key which may be exported along with the " "certificate." -msgstr "이 인증서는 인증서를 내보낼 때 같이 나갈 개인키를 포함하고 있습니다." +msgstr "인증서에 인증서와 내보내기 될지 모르는 개인 키가 들어 있습니다." #: cryptui.rc:172 msgid "Enter Password" @@ -2944,19 +2940,19 @@ msgstr "암호 입력" #: cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "이 개인키는 아마도 암호로 보호되어있는 것 같습니다." +msgstr "개인 키를 암호로 보호할 수 있습니다." #: cryptui.rc:174 msgid "The passwords do not match." -msgstr "이 암호는 맞지 않습니다." +msgstr "암호가 일치하지 않습니다." #: cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "주의: 이 인증서를 위한 개인 키를 열 수 없습니다." +msgstr "참고: 이 인증서의 개인 키를 열 수 없습니다." #: cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "주의: 이 인증서를 위한 개인 키를 내보낼 수 없습니다." +msgstr "참고: 이 인증서의 개인 키는 내보낼 수 없습니다." #: dinput.rc:43 msgid "Configure Devices" @@ -2984,7 +2980,7 @@ msgstr "매핑" #: dinput.rc:56 msgid "Show Assigned First" -msgstr "우선 할당 보기" +msgstr "첫번째 할당 보이기" #: dinput.rc:37 msgid "Action" @@ -3185,7 +3181,7 @@ msgstr "인덱스(&N)" #: hhctrl.rc:33 notepad.rc:55 msgid "&Search" -msgstr "찾기(&S)" +msgstr "검색(&S)" #: hhctrl.rc:34 msgid "Favor&ites" @@ -3201,7 +3197,7 @@ msgstr "탭 보이기(&T)" #: hhctrl.rc:42 msgid "Show" -msgstr "보여주기" +msgstr "보이기" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" @@ -3345,7 +3341,7 @@ msgstr "홈 페이지" #: inetcpl.rc:50 msgid "You can choose the address that will be used as your home page." -msgstr "당신은 홈페이지로 사용할 주소를 선택할 수 있습니다." +msgstr "홈 페이지로 사용할 주소를 선택할 수 있습니다." #: inetcpl.rc:53 msgid "&Current page" @@ -3365,11 +3361,11 @@ msgstr "방문 기록" #: inetcpl.rc:57 msgid "You can delete cached pages, cookies and other data." -msgstr "당신은 캐시된 페이지,쿠키나 다른 데이터를 지울 수 있습니다." +msgstr "캐시된 페이지, 쿠키 및 기타 데이터를 제거할 수 있습니다." #: inetcpl.rc:59 msgid "Delete &files..." -msgstr "파일 삭제(&F)..." +msgstr "파일 제거(&F)..." #: inetcpl.rc:60 msgid "&Settings..." @@ -3377,7 +3373,7 @@ msgstr "설정(&S)..." #: inetcpl.rc:68 msgid "Delete browsing history" -msgstr "방문 기록 삭제" +msgstr "방문 기록 제거" #: inetcpl.rc:71 msgid "" @@ -3394,24 +3390,24 @@ msgid "" "preferences and login information." msgstr "" "쿠키\n" -"이 파일은 웹사이트에 위해 사용자 환경설정이나 로그인 정보같은 것을 당신의 컴" -"퓨터에 저장하는데 사용됩니다. ." +"사용자 기본 설정 및 로그인 정보와 같은 항목을 저장하는 웹 사이트에서 컴퓨터" +"에 저장된 파일입니다." #: inetcpl.rc:75 msgid "" "History\n" "List of websites you have accessed." msgstr "" -"방문기록\n" -"당신이 방문한 웹사이트의 목록." +"방문 기록\n" +"액세스한 웹 사이트 목록입니다." #: inetcpl.rc:77 msgid "" "Form data\n" "Usernames and other information you have entered into forms." msgstr "" -"폼 정보\n" -"당신이 정보 폼에 입력한 사용자 이름과 다른 정보." +"양식 데이터\n" +"양식에 입력한 사용자 이름 및 기타 정보입니다." #: inetcpl.rc:79 msgid "" @@ -3419,7 +3415,7 @@ msgid "" "Saved passwords you have entered into forms." msgstr "" "암호\n" -"당신이 폼에 입력한 저장된 암호." +"양식에 입력한 저장된 암호입니다." #: inetcpl.rc:82 progman.rc:67 msgid "Delete" @@ -3433,7 +3429,7 @@ msgstr "보안" msgid "" "Certificates are used for your personal identification and to identify " "certificate authorities and publishers." -msgstr "인증서는 당신의 개인 식별과 인증기관과 게시자 식별에 사용됩니다." +msgstr "인증서는 개인 식별 및 인증 기관 및 게시자를 식별하는 데 사용됩니다." #: inetcpl.rc:114 msgid "Certificates..." @@ -3536,12 +3532,12 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" -"장치를 사용하거나 안사용하게 한 후에, 연결된 조이스틱은 애플릿을 다시 시작하" -"기까지는 작동하지 않을 것입니다." +"장치를 비활성화하거나 활성화한 후, 이 애플릿을 다시 시작할 때까지 연결된 조이" +"스틱을 업데이트하지 않습니다." #: joy.rc:50 msgid "Test Joystick" -msgstr "조이스틱 시험" +msgstr "조이스틱 테스트" #: joy.rc:54 msgid "Buttons" @@ -3549,7 +3545,7 @@ msgstr "버튼" #: joy.rc:63 msgid "Test Force Feedback" -msgstr "강제 피드백 시험" +msgstr "강제 피드백 테스트" #: joy.rc:67 msgid "Available Effects" @@ -3560,8 +3556,8 @@ msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" -"선택된 효과를 활성화시키려면 컨트롤러에서 아무 버튼이나 누르십시오.이 효과방" -"향은 컨트롤러 축으로 변경할 수 있습니다." +"컨트롤러의 아무 버튼이나 눌러 선택한 효과를 활성화합니다. 컨트롤러 축을 이용" +"하여 효과 방향을 바꿀 수 있습니다." #: joy.rc:31 msgid "Game Controllers" @@ -3653,7 +3649,7 @@ msgstr "레이블을 찾을 수 없음" #: jscript.rc:49 msgid "Expected '@end'" -msgstr "'@end'가 필요합니다." +msgstr "'@end'가 필요합니다" #: jscript.rc:50 msgid "Conditional compilation is turned off" @@ -3709,27 +3705,27 @@ msgstr "정규 표현식에 문법오류가 있음" #: jscript.rc:64 msgid "URI to be encoded contains invalid characters" -msgstr "URI가 올바르지 않은 문자를 포함해서 인코딩되었음" +msgstr "인코딩할 URI에 올바르지 않은 문자가 들어 있습니다" #: jscript.rc:63 msgid "URI to be decoded is incorrect" -msgstr "해독하는 URI가 올바르지 않음" +msgstr "디코딩할 URI가 올바르지 않습니다" #: jscript.rc:65 msgid "Number of fraction digits is out of range" -msgstr "분수 값이 범위를 벗어남" +msgstr "분수 자리수 값이 범위를 벗어났습니다" #: jscript.rc:66 msgid "Precision is out of range" -msgstr "정밀도 범위를 벗어남" +msgstr "정밀도가 범위를 벗어났습니다" #: jscript.rc:67 msgid "Array length must be a finite positive integer" -msgstr "배열 길이는 반드시 한정된 양의 정수이어야 함" +msgstr "배열 길이는 유한한 양의 정수이어야 합니다" #: jscript.rc:68 msgid "Array object expected" -msgstr "배열 객체가 필요함" +msgstr "배열 객체가 필요합니다" #: jscript.rc:69 msgid "" @@ -3740,11 +3736,11 @@ msgstr "" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "구성되지 않은 요소 '|'를 재처리할 수 없습니다." +msgstr "구성되지 않은 요소 '|'를 재처리할 수 없습니다" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "쓰기 가능하지 않은 요소 '|'를 편집할 수 없습니다." +msgstr "쓰기 가능하지 않은 요소 '|'를 편집할 수 없습니다" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" @@ -3760,75 +3756,75 @@ msgstr "Wine" #: winerror.mc:28 msgid "Success.\n" -msgstr "작업을 완료했습니다.\n" +msgstr "성공.\n" #: winerror.mc:33 msgid "Invalid function.\n" -msgstr "올바르지 않은 함수입니다.\n" +msgstr "올바르지 않은 함수.\n" #: winerror.mc:38 msgid "File not found.\n" -msgstr "지정한 파일을 찾을 수 없습니다.\n" +msgstr "파일을 찾을 수 없습니다.\n" #: winerror.mc:43 msgid "Path not found.\n" -msgstr "지정한 경로를 찾을 수 없습니다.\n" +msgstr "경로를 찾을 수 없습니다.\n" #: winerror.mc:48 msgid "Too many open files.\n" -msgstr "파일을 열 수 없습니다.\n" +msgstr "너무 많은 파일 오픈.\n" #: winerror.mc:53 msgid "Access denied.\n" -msgstr "접근이 거부되었습니다.\n" +msgstr "접근 거부.\n" #: winerror.mc:58 msgid "Invalid handle.\n" -msgstr "잘못된 핸들입니다.\n" +msgstr "올바르지 않은 핸들.\n" #: winerror.mc:63 msgid "Memory trashed.\n" -msgstr "저장 컨트롤 블록이 손상되었습니다.\n" +msgstr "메모리 손상.\n" #: winerror.mc:68 msgid "Not enough memory.\n" -msgstr "저장 공간이 부족해서 이 명령을 수행할 수 없습니다.\n" +msgstr "메모리 부족.\n" #: winerror.mc:73 msgid "Invalid block.\n" -msgstr "저장 컨트롤 블록 주소가 올바르지 않습니다.\n" +msgstr "올바르지 않은 블록.\n" #: winerror.mc:78 msgid "Bad environment.\n" -msgstr "환경이 올바르지 않습니다.\n" +msgstr "잘못된 환경.\n" #: winerror.mc:83 msgid "Bad format.\n" -msgstr "잘못된 형식의 프로그램을 로드하려고 했습니다.\n" +msgstr "잘못된 형식.\n" #: winerror.mc:88 msgid "Invalid access.\n" -msgstr "액세스 코드가 올바르지 않습니다.\n" +msgstr "올바르지 않은 접근.\n" #: winerror.mc:93 msgid "Invalid data.\n" -msgstr "데이터가 올바르지 않습니다.\n" +msgstr "올바르지 않은 데이터.\n" #: winerror.mc:98 msgid "Out of memory.\n" -msgstr "저장 공간이 부족해서 이 작업을 완료할 수 없습니다.\n" +msgstr "메모리 부족.\n" #: winerror.mc:103 msgid "Invalid drive.\n" -msgstr "지정한 드라이브를 찾을 수 없습니다.\n" +msgstr "올바르지 않은 드라이브.\n" #: winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "디렉터리를 삭제할 수 없습니다.\n" +msgstr "현재 디렉터리 제거 실패.\n" #: winerror.mc:113 msgid "Not same device.\n" -msgstr "파일을 다른 디스크 드라이브로 이동할 수 없습니다.\n" +msgstr "다른 장치.\n" #: winerror.mc:118 msgid "No more files.\n" @@ -3836,19 +3832,19 @@ msgstr "더 이상 파일이 없습니다.\n" #: winerror.mc:123 msgid "Write protected.\n" -msgstr "매체가 쓰기 금지되었습니다.\n" +msgstr "쓰기 금지.\n" #: winerror.mc:128 msgid "Bad unit.\n" -msgstr "지정한 장치를 찾을 수 없습니다.\n" +msgstr "잘못된 유닛.\n" #: winerror.mc:133 msgid "Not ready.\n" -msgstr "장치가 준비되지 않았습니다.\n" +msgstr "준비되지 않았습니다.\n" #: winerror.mc:138 msgid "Bad command.\n" -msgstr "장치가 명령을 인식하지 않습니다.\n" +msgstr "잘못된 명령.\n" #: winerror.mc:143 msgid "CRC error.\n" @@ -3856,12 +3852,11 @@ msgstr "CRC 오류.\n" #: winerror.mc:148 msgid "Bad length.\n" -msgstr "명령 길이가 올바르지 않습니다.\n" +msgstr "잘못된 길이.\n" #: winerror.mc:153 winerror.mc:528 msgid "Seek error.\n" -msgstr "" -"드라이브에서 디스트의 특정 영역이나 트랙의 위치를 지정할 수 없습니다.\n" +msgstr "이동 오류.\n" #: winerror.mc:158 msgid "Not DOS disk.\n" @@ -3869,95 +3864,91 @@ msgstr "DOS 디스크가 아닙니다.\n" #: winerror.mc:163 msgid "Sector not found.\n" -msgstr "요청한 섹터를 찾을 수 없습니다.\n" +msgstr "섹터를 찾을 수 없습니다.\n" #: winerror.mc:168 msgid "Out of paper.\n" -msgstr "프린터에 용지가 떨어졌습니다.\n" +msgstr "프린터 용지가 없습니다.\n" #: winerror.mc:173 msgid "Write fault.\n" -msgstr "지정한 장치에 쓸 수 없습니다.\n" +msgstr "쓰기 사고.\n" #: winerror.mc:178 msgid "Read fault.\n" -msgstr "지정한 장치로부터 읽을 수 없습니다.\n" +msgstr "읽기 사고.\n" #: winerror.mc:183 msgid "General failure.\n" -msgstr "시스템에 부착된 장치가 작동하지 않습니다.\n" +msgstr "일반 실패.\n" #: winerror.mc:188 msgid "Sharing violation.\n" -msgstr "" -"다른 프로세스에서 이 파일을 사용하고 있기 때문에 이 파일을 액세스할 수 없습니" -"다.\n" +msgstr "공유 위반.\n" #: winerror.mc:193 msgid "Lock violation.\n" -msgstr "" -"다른 프로세스에서 이 파일의 일부를 잠궜기 때문에 이 파일을 액세스할 수 없습니" -"다.\n" +msgstr "잠금 위반.\n" #: winerror.mc:198 msgid "Wrong disk.\n" -msgstr "드라이브에 잘못된 디스켓이 있습니다.\n" +msgstr "잘못된 디스크.\n" #: winerror.mc:203 msgid "Sharing buffer exceeded.\n" -msgstr "공유기기 위해 연 파일이 너무 많습니다.\n" +msgstr "공유 버퍼 초과.\n" #: winerror.mc:208 msgid "End of file.\n" -msgstr "파일의 끝입니다.\n" +msgstr "파일 끝.\n" #: winerror.mc:213 winerror.mc:438 msgid "Disk full.\n" -msgstr "디스크가 가득 차 있습니다.\n" +msgstr "디스크가 차 있습니다.\n" #: winerror.mc:218 msgid "Request not supported.\n" -msgstr "네트워크 요청이 지원되지 않습니다.\n" +msgstr "지원되지 않는 요청.\n" #: winerror.mc:223 msgid "Remote machine not listening.\n" -msgstr "원격 컴퓨터를 사용할 수 없습니다.\n" +msgstr "원격 머신 접속 실패.\n" #: winerror.mc:228 msgid "Duplicate network name.\n" -msgstr "네트워크에 중복된 이름이 있습니다.\n" +msgstr "중복된 네트워크 이름.\n" #: winerror.mc:233 msgid "Bad network path.\n" -msgstr "네트워크 경로를 찾을 수 없습니다.\n" +msgstr "잘못된 네트워크 경로.\n" #: winerror.mc:238 msgid "Network busy.\n" -msgstr "네트워크가 사용 중입니다.\n" +msgstr "네트워크 사용 중.\n" #: winerror.mc:243 msgid "Device does not exist.\n" -msgstr "지정한 네트워크 리소스 또는 장치를 더 이상 사용할 수 없습니다.\n" +msgstr "장치가 없습니다.\n" #: winerror.mc:248 msgid "Too many commands.\n" -msgstr "네트워크 명령 한계에 도달했습니다.\n" +msgstr "너무 많은 명령.\n" #: winerror.mc:253 msgid "Adapter hardware error.\n" -msgstr "네트워크 어댑터 하드웨어 오류가 발생했습니다.\n" +msgstr "어댑터 하드웨어 오류.\n" #: winerror.mc:258 msgid "Bad network response.\n" -msgstr "지정한 서버에서 요청한 작업을 수행할 수 없습니다.\n" +msgstr "잘못된 네트워크 응답.\n" #: winerror.mc:263 msgid "Unexpected network error.\n" -msgstr "예기치 않은 네트워크 오류가 발생했습니다.\n" +msgstr "예기치 않은 네트워크 오류.\n" #: winerror.mc:268 msgid "Bad remote adapter.\n" -msgstr "원격 어댑터가 호환되지 않습니다.\n" +msgstr "잘못된 원격 어댑터.\n" #: winerror.mc:273 msgid "Print queue full.\n" @@ -3965,47 +3956,47 @@ msgstr "프린터 대기열이 가득 찼습니다.\n" #: winerror.mc:278 msgid "No spool space.\n" -msgstr "인쇄 대기 중인 파일을 저장할만한 공각이 없습니다.\n" +msgstr "스풀 공간 부족.\n" #: winerror.mc:283 msgid "Print canceled.\n" -msgstr "인쇄 대기 중인 파일이 삭제되었습니다.\n" +msgstr "인쇄가 취소되었습니다.\n" #: winerror.mc:288 msgid "Network name deleted.\n" -msgstr "지정한 네트워크 이름을 더 이상 사용할 수 없습니다\n" +msgstr "네트워크 이름을 제거했습니다.\n" #: winerror.mc:293 msgid "Network access denied.\n" -msgstr "네트워크 접근이 거부되었습니다.\n" +msgstr "네트워크 접근 거부.\n" #: winerror.mc:298 msgid "Bad device type.\n" -msgstr "네트워크 리소스의 종류가 올바르지 않습니다.\n" +msgstr "잘못된 장치 유형.\n" #: winerror.mc:303 msgid "Bad network name.\n" -msgstr "네트워크 이름을 찾을 수 없습니다.\n" +msgstr "잘못된 네트워크 이름.\n" #: winerror.mc:308 msgid "Too many network names.\n" -msgstr "네트워크 이름 한계를 초과했습니다.\n" +msgstr "네트워크 이름 한계 초과.\n" #: winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "네트워크 세션 한계를 초과했습니다.\n" +msgstr "네트워크 세션 한계 초과.\n" #: winerror.mc:318 msgid "Sharing paused.\n" -msgstr "공유가 중지되었습니다.\n" +msgstr "공유 중지.\n" #: winerror.mc:323 msgid "Request not accepted.\n" -msgstr "요청을 수용할 수 없습니다.\n" +msgstr "수용되지 않는 요청.\n" #: winerror.mc:328 msgid "Redirector paused.\n" -msgstr "장치가 중지되었습니다.\n" +msgstr "리디렉터 중지.\n" #: winerror.mc:333 msgid "File exists.\n" @@ -4013,7 +4004,7 @@ msgstr "파일이 존재합니다.\n" #: winerror.mc:338 msgid "Cannot create.\n" -msgstr "디렉터리나 파일을 작성할 수 없습니다.\n" +msgstr "만들 수 없습니다.\n" #: winerror.mc:343 msgid "Int24 failure.\n" @@ -4021,23 +4012,23 @@ msgstr "INT24 오류.\n" #: winerror.mc:348 msgid "Out of structures.\n" -msgstr "이 요청을 처리할만한 저장 공간이 없습니다\n" +msgstr "구성에 필요한 공간 부족.\n" #: winerror.mc:353 msgid "Already assigned.\n" -msgstr "이름이 이미 사용 중입니다.\n" +msgstr "이미 할당되어 있습니다.\n" #: winerror.mc:358 winerror.mc:1713 msgid "Invalid password.\n" -msgstr "암호가 올바르지 않습니다.\n" +msgstr "올바르지 않은 암호.\n" #: winerror.mc:363 msgid "Invalid parameter.\n" -msgstr "매개변수가 올바르지 않습니다.\n" +msgstr "올바르지 않은 매개변수.\n" #: winerror.mc:368 msgid "Net write fault.\n" -msgstr "네트워크 쓰기 오류가 발생했습니다.\n" +msgstr "네트워크 쓰기 오류.\n" #: winerror.mc:373 msgid "No process slots.\n" @@ -4045,11 +4036,11 @@ msgstr "프로세스 슬롯이 없습니다.\n" #: winerror.mc:378 msgid "Too many semaphores.\n" -msgstr "세마포어 작성 한계를 초과했습니다.\n" +msgstr "세마포어 한계 초과.\n" #: winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "단독 세마포어를 다른 프로세스가 소유하고 있습니다.\n" +msgstr "이미 소유된 배타적 세마포어.\n" #: winerror.mc:388 msgid "Semaphore is set.\n" @@ -4057,15 +4048,15 @@ msgstr "세마포어가 설정되어 있습니다.\n" #: winerror.mc:393 msgid "Too many semaphore requests.\n" -msgstr "세마포어를 다시 설정할 수 없습니다.\n" +msgstr "너무 많은 세마포어 요청.\n" #: winerror.mc:398 msgid "Invalid at interrupt time.\n" -msgstr "인터럽트 시간에 단독 세마포어를 요청할 수 없습니다.\n" +msgstr "올바르지 않은 인터럽트 시간.\n" #: winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "세마포어의 이전 소유권이 끝났습니다.\n" +msgstr "세마포어 소유권 해제.\n" #: winerror.mc:408 msgid "Semaphore user limit.\n" @@ -4085,7 +4076,7 @@ msgstr "파이프가 종료되었습니다.\n" #: winerror.mc:428 msgid "Open failed.\n" -msgstr "지정한 장치가 파일을 열 수 없습니다.\n" +msgstr "열기 실패.\n" #: winerror.mc:433 msgid "Buffer overflow.\n" @@ -4097,43 +4088,43 @@ msgstr "핸들을 더이상 찾을 수 없습니다.\n" #: winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "목표 핸들이 올바르지 않습니다.\n" +msgstr "올바르지 않은 목표 핸들.\n" #: winerror.mc:453 msgid "Invalid IOCTL.\n" -msgstr "IOCTL 호출이 올바르지 않습니다.\n" +msgstr "올바르지 않은 IOCTL.\n" #: winerror.mc:458 msgid "Invalid verify switch.\n" -msgstr "확인 스위치가 올바르지 않습니다.\n" +msgstr "올바르지 않은 검증 스위치.\n" #: winerror.mc:463 msgid "Bad driver level.\n" -msgstr "드라이버 레벨이 잘못되었습니다.\n" +msgstr "잘못된 드라이버 레벨.\n" #: winerror.mc:468 msgid "Call not implemented.\n" -msgstr "지원하지 않는 요청입니다.\n" +msgstr "지원하지 않는 요청.\n" #: winerror.mc:473 msgid "Semaphore timeout.\n" -msgstr "세마포어 시간이 만료되었습니다.\n" +msgstr "세마포어 시간 만료.\n" #: winerror.mc:478 msgid "Insufficient buffer.\n" -msgstr "버퍼가 너무 작습니다.\n" +msgstr "충분하지 않은 버퍼.\n" #: winerror.mc:483 msgid "Invalid name.\n" -msgstr "이름이 올바르지 않습니다.\n" +msgstr "올바르지 않은 이름.\n" #: winerror.mc:488 msgid "Invalid level.\n" -msgstr "수준이 올바르지 않습니다.\n" +msgstr "올바르지 않은 레벨.\n" #: winerror.mc:493 msgid "No volume label.\n" -msgstr "디스크 이름이 없습니다.\n" +msgstr "볼륨 레이블이 없습니다.\n" #: winerror.mc:498 msgid "Module not found.\n" @@ -4157,7 +4148,7 @@ msgstr "직접 접근할 수 없는 핸들입니다.\n" #: winerror.mc:523 msgid "Negative seek.\n" -msgstr ".\n" +msgstr "반대로 이동.\n" #: winerror.mc:533 msgid "Drive is a JOIN target.\n" @@ -4165,43 +4156,43 @@ msgstr "드라이브가 JOIN 타겟입니다.\n" #: winerror.mc:538 msgid "Drive is already JOINed.\n" -msgstr "드라이브가 이미 JOIN되어 있습니다.\n" +msgstr "드라이브가 이미 JOIN 되어 있습니다.\n" #: winerror.mc:543 msgid "Drive is already SUBSTed.\n" -msgstr "드라이브가 이미 SUBST되어 있습니다.\n" +msgstr "드라이브가 이미 SUBST 되어 있습니다.\n" #: winerror.mc:548 msgid "Drive is not JOINed.\n" -msgstr "드라이브가 JOIN되지 않습니다.\n" +msgstr "드라이브가 JOIN 되지 않습니다.\n" #: winerror.mc:553 msgid "Drive is not SUBSTed.\n" -msgstr "드라이브가 SUBST되지 않습니다.\n" +msgstr "드라이브가 SUBST 되지 않습니다.\n" #: winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "JOIN된 드라이브에 JOIN을 시도했습니다.\n" +msgstr "JOIN 된 드라이브에 JOIN 시도했습니다.\n" #: winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "SUBST된 드라이브에 SUBST를 시도했습니다.\n" +msgstr "SUBST 된 드라이브에 SUBST 시도했습니다.\n" #: winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "SUBST된 드라이브에 JOIN을 시도했습니다.\n" +msgstr "SUBST 된 드라이브에 JOIN 시도했습니다.\n" #: winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "JOIN된 드라이브에 SUBST를 시도했습니다.\n" +msgstr "JOIN 된 드라이브에 SUBST 시도했습니다.\n" #: winerror.mc:578 msgid "Drive is busy.\n" -msgstr "지정한 드라이브를 지금 사용할 수 없습니다.\n" +msgstr "드라이브 사용 중.\n" #: winerror.mc:583 msgid "Same drive.\n" -msgstr "같은 드라이브입니다.\n" +msgstr "같은 드라이브.\n" #: winerror.mc:588 msgid "Not top-level directory.\n" @@ -4213,7 +4204,7 @@ msgstr "디렉터리가 비워 있지 않습니다.\n" #: winerror.mc:598 msgid "Path is in use as a SUBST.\n" -msgstr "지정한 경로가 SUBST 용으로 사용 중입니다.\n" +msgstr "경로가 SUBST 용으로 사용 중입니다.\n" #: winerror.mc:603 msgid "Path is in use as a JOIN.\n" @@ -4221,7 +4212,7 @@ msgstr "지정한 경로가 JOIN 용으로 사용 중입니다.\n" #: winerror.mc:608 msgid "Path is busy.\n" -msgstr "지정한 경로를 지금 사용할 수 없습니다.\n" +msgstr "경로 사용 중.\n" #: winerror.mc:613 msgid "Already a SUBST target.\n" @@ -4229,7 +4220,7 @@ msgstr "이미 SUBST 타겟입니다.\n" #: winerror.mc:618 msgid "System trace not specified or disallowed.\n" -msgstr "시스템 추적이 명시되지 않았거나 허용되지 않습니다.\n" +msgstr "시스템 추적이 지정되지 않았거나 허용되지 않습니다.\n" #: winerror.mc:623 msgid "Event count for DosMuxSemWait incorrect.\n" @@ -4257,7 +4248,7 @@ msgstr "시그널이 거부되었습니다.\n" #: winerror.mc:653 msgid "Segment discarded.\n" -msgstr "세그맨트가 삭제되었습니다.\n" +msgstr "세그맨트가 폐기되었습니다.\n" #: winerror.mc:658 msgid "Segment not locked.\n" @@ -4265,19 +4256,19 @@ msgstr "세그멘트를 잠글 수 없습니다.\n" #: winerror.mc:663 msgid "Bad thread ID address.\n" -msgstr "쓰레드 ID 주소가 올바르지 않습니다.\n" +msgstr "잘못된 스레드 ID 주소.\n" #: winerror.mc:668 msgid "Bad arguments to DosExecPgm.\n" -msgstr "DosExecPgm에 전달된 인수가 올바르지 않습니다.\n" +msgstr "잘못된 DosExecPgm 인수.\n" #: winerror.mc:673 msgid "Path is invalid.\n" -msgstr "지정한 경로가 올바르지 않습니다.\n" +msgstr "올바르지 않은 경로.\n" #: winerror.mc:678 msgid "Signal pending.\n" -msgstr "시그널이 대기 중입니다.\n" +msgstr "시그널 대기 중.\n" #: winerror.mc:683 msgid "Max system-wide thread count reached.\n" @@ -4285,35 +4276,35 @@ msgstr "시스템 스레드 작성 한계에 도달했습니다.\n" #: winerror.mc:688 msgid "Lock failed.\n" -msgstr "잠글 수 없습니다.\n" +msgstr "잠금 실패.\n" #: winerror.mc:693 msgid "Resource in use.\n" -msgstr "리소스가 사용 중입니다.\n" +msgstr "리소스 사용 중.\n" #: winerror.mc:698 msgid "Cancel violation.\n" -msgstr "취소 위반입니다.\n" +msgstr "취소 위반.\n" #: winerror.mc:703 msgid "Atomic locks not supported.\n" -msgstr "원자적 잠금을 지원하지 않습니다.\n" +msgstr "원자적 잠금 미지원.\n" #: winerror.mc:708 msgid "Invalid segment number.\n" -msgstr "올바르지 않은 세그멘트 번호입니다.\n" +msgstr "올바르지 않은 세그멘트 번호.\n" #: winerror.mc:713 msgid "Invalid ordinal for %1.\n" -msgstr "올바르지 않은 %1 번호입니다.\n" +msgstr "올바르지 않은 %1 번호.\n" #: winerror.mc:718 msgid "File already exists.\n" -msgstr "파일은 이미 존재합니다.\n" +msgstr "파일이 이미 존재합니다.\n" #: winerror.mc:723 msgid "Invalid flag number.\n" -msgstr "플래그 번호가 올바르지 않습니다.\n" +msgstr "올바르지 않은 플래그.\n" #: winerror.mc:728 msgid "Semaphore name not found.\n" @@ -4321,27 +4312,27 @@ msgstr "세마포어 이름을 찾을 수 없습니다.\n" #: winerror.mc:733 msgid "Invalid starting code segment for %1.\n" -msgstr "%1 코드 세그멘트를 시작할 수 없습니다.\n" +msgstr "올바르지 않은 %1 시작 코드 세그멘트.\n" #: winerror.mc:738 msgid "Invalid starting stack segment for %1.\n" -msgstr "%1 스택 세그먼트를 시작할 수 없습니다.\n" +msgstr "올바르지 않은 %1 시작 스택 세그먼트.\n" #: winerror.mc:743 msgid "Invalid module type for %1.\n" -msgstr "%1 모듈 형식이 잘못되었습니다.\n" +msgstr "올바르지 않은 %1 모듈 유형.\n" #: winerror.mc:748 msgid "Invalid EXE signature in %1.\n" -msgstr "%1 실행 서명이 잘못되었습니다.\n" +msgstr "올바르지 않은 %1 실행 서명.\n" #: winerror.mc:753 msgid "EXE %1 is marked invalid.\n" -msgstr "%1 실행이 올바르지 않다고 표시되어 있습니다.\n" +msgstr "올바르지 않다고 표신된 EXE %1.\n" #: winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "%1 실행 형식이 잘못되어 있습니다.\n" +msgstr "잘못된 %1 실행 형식.\n" #: winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" @@ -4353,19 +4344,19 @@ msgstr "%1 최소 할당 크기가 잘못되었습니다.\n" #: winerror.mc:773 msgid "Dynlink from invalid ring.\n" -msgstr "잘못된 링에서의 동적 링크입니다.\n" +msgstr "올바르지 않은 링에서의 동적 링크.\n" #: winerror.mc:778 msgid "IOPL not enabled.\n" -msgstr "IOPL이 가능하지 않습니다.\n" +msgstr "불가능한 IOPL.\n" #: winerror.mc:783 msgid "Invalid SEGDPL in %1.\n" -msgstr "%1 SEGDPL이 올바르지 않습니다.\n" +msgstr "올바르지 않은 %1 SEGDPL.\n" #: winerror.mc:788 msgid "Auto data segment exceeds 64k.\n" -msgstr "자동 데이타 세그멘트가 64k를 초과했습니다.\n" +msgstr "자동 데이터 세그멘트가 64k를 초과했습니다.\n" #: winerror.mc:793 msgid "Ring 2 segment must be movable.\n" @@ -4385,51 +4376,51 @@ msgstr "환경변수를 찾을 수 없습니다.\n" #: winerror.mc:813 msgid "No signal sent.\n" -msgstr "시그널이 전송되지 않았습니다.\n" +msgstr "시그널 전송 실패.\n" #: winerror.mc:818 msgid "File name is too long.\n" -msgstr "파일명이 너무 깁니다.\n" +msgstr "너무 긴 파일 이름.\n" #: winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "Ring 2 스택이 사용 중입니다.\n" +msgstr "Ring 2 스택 사용 중.\n" #: winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "파일명 와일드카드 사용 오류입니다.\n" +msgstr "파일 이름 와일드카드 사용 오류.\n" #: winerror.mc:833 msgid "Invalid signal number.\n" -msgstr "시그널 번호가 올바르지 않습니다.\n" +msgstr "올바르지 않은 시그널 번호.\n" #: winerror.mc:838 msgid "Error setting signal handler.\n" -msgstr "시그널 핸들러를 설정할 수 없습니다.\n" +msgstr "시그널 핸들러 설정 오류.\n" #: winerror.mc:843 msgid "Segment locked.\n" -msgstr "세그멘트가 잠겼습니다.\n" +msgstr "세그멘트 잠김.\n" #: winerror.mc:848 msgid "Too many modules.\n" -msgstr "모듈이 너무 많습니다.\n" +msgstr "너무 많은 모듈.\n" #: winerror.mc:853 msgid "Nesting LoadModule calls not allowed.\n" -msgstr "LoadModule 호출은 중첩할 수 없습니다.\n" +msgstr "허락된지 않는 LoadModule 호출 중첩.\n" #: winerror.mc:858 msgid "Machine type mismatch.\n" -msgstr "머신 형식이 맞지 않습니다.\n" +msgstr "머신 형식 불일치.\n" #: winerror.mc:863 msgid "Bad pipe.\n" -msgstr "파이프가 올바르지 않습니다.\n" +msgstr "잘못된 파이프.\n" #: winerror.mc:868 msgid "Pipe busy.\n" -msgstr "파이프가 사용 중입니다.\n" +msgstr "파이프 사용 중.\n" #: winerror.mc:873 msgid "Pipe closed.\n" @@ -4437,7 +4428,7 @@ msgstr "파이프가 닫혔습니다.\n" #: winerror.mc:878 msgid "Pipe not connected.\n" -msgstr "파이프가 연결되지 않았습니다.\n" +msgstr "파이프가 연결되지 않습니다.\n" #: winerror.mc:883 msgid "More data available.\n" @@ -4445,15 +4436,15 @@ msgstr "사용 가능한 데이터가 더 있습니다.\n" #: winerror.mc:888 msgid "Session canceled.\n" -msgstr "세션이 취소되었습니다.\n" +msgstr "세션 취소.\n" #: winerror.mc:893 msgid "Invalid extended attribute name.\n" -msgstr "확장 속성 이름이 올바르지 않습니다.\n" +msgstr "올바르지 않은 확장 속성 이름.\n" #: winerror.mc:898 msgid "Extended attribute list inconsistent.\n" -msgstr "확장 속성 목록에 일관성이 없습니다.\n" +msgstr "일관성 없는 확장 속성 목록.\n" #: winerror.mc:903 msgid "No more data available.\n" @@ -4465,7 +4456,7 @@ msgstr "복사 API를 사용할 수 없습니다.\n" #: winerror.mc:913 msgid "Directory name invalid.\n" -msgstr "디렉터리 이름이 올바르지 않습니다.\n" +msgstr "올바르지 않은 디렉터리 이름.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" @@ -4473,7 +4464,7 @@ msgstr "확장 속성이 버퍼에 맞지 않습니다.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" -msgstr "확장 속성 파일이 손상되었습니다.\n" +msgstr "확장 속성 파일 손상.\n" #: winerror.mc:928 msgid "Extended attribute table full.\n" @@ -4481,43 +4472,43 @@ msgstr "확장 속성 테이블이 가득 찾습니다.\n" #: winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "확장 속성 핸들이 올바르지 않습니다.\n" +msgstr "올바르지 않은 확장 속성 핸들.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "확장 속성을 지원하지 않습니다.\n" +msgstr "지원되지 않는 확장 속성.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" -msgstr "호출자가 소유하지 않은 mutex입니다.\n" +msgstr "호출자가 소유하지 않은 mutex.\n" #: winerror.mc:948 msgid "Too many posts to semaphore.\n" -msgstr "세마포어에 너무 많이 통지했습니다.\n" +msgstr "너무 많은 세마포어 통지.\n" #: winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" -msgstr "Read/WriteProcessMemory 요청의 일부만 완료되었습니다.\n" +msgstr "일부 Read/WriteProcessMemory 요청 완료.\n" #: winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "이 oplock이 승인되지 않았습니다.\n" +msgstr "승인되지 않은 oplock.\n" #: winerror.mc:963 msgid "Invalid oplock message received.\n" -msgstr "잘못된 oplock 메시지가 수신되었습니다.\n" +msgstr "올바르지 않은 oplock 메시지 수신.\n" #: winerror.mc:968 msgid "Message 0x%1 not found in file %2.\n" -msgstr "파일 %2에서 번호 %1의 메시지를 찾을 수 없습니다.\n" +msgstr "파일 %2에 메시지 0x%1이(가) 없습니다.\n" #: winerror.mc:973 msgid "Invalid address.\n" -msgstr "잘못된 주소입니다.\n" +msgstr "올바르지 않은 주소.\n" #: winerror.mc:978 msgid "Arithmetic overflow.\n" -msgstr "수치 연산 오버플로우입니다.\n" +msgstr "수치 연산 오버플로우.\n" #: winerror.mc:983 msgid "Pipe connected.\n" @@ -4545,7 +4536,7 @@ msgstr "중첩된 I/O 연산이 진행 중입니다.\n" #: winerror.mc:1013 msgid "No access to memory location.\n" -msgstr "메모리 위치의 접근이 올바르지 않습니다.\n" +msgstr "메모리 위치 접근이 없습니다.\n" #: winerror.mc:1018 msgid "Swap error.\n" @@ -4557,23 +4548,23 @@ msgstr "스택 오버플로우.\n" #: winerror.mc:1028 msgid "Invalid message.\n" -msgstr "잘못된 메시지입니다.\n" +msgstr "올바르지 않은 메시지.\n" #: winerror.mc:1033 msgid "Cannot complete.\n" -msgstr "완료되지 않았습니다.\n" +msgstr "완료할 수 없습니다.\n" #: winerror.mc:1038 msgid "Invalid flags.\n" -msgstr "잘못된 플래그입니다.\n" +msgstr "올바르지 않은 플래그.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "볼륨이 인식되지 않습니다.\n" +msgstr "인식되지 않는 볼륨.\n" #: winerror.mc:1048 msgid "File invalid.\n" -msgstr "파일이 유효하지 않습니다.\n" +msgstr "올바르지 않는 파일.\n" #: winerror.mc:1053 msgid "Cannot run full-screen.\n" @@ -4581,11 +4572,11 @@ msgstr "전체화면에서 실행할 수 없습니다.\n" #: winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "존재하지 않는 토큰입니다.\n" +msgstr "토큰이 없습니다.\n" #: winerror.mc:1063 msgid "Registry corrupt.\n" -msgstr "레지스트리가 손상되었습니다.\n" +msgstr "레지스트리 손상.\n" #: winerror.mc:1068 msgid "Invalid key.\n" @@ -4609,27 +4600,27 @@ msgstr "레지스트리는 복구되었습니다.\n" #: winerror.mc:1093 msgid "Registry is corrupt.\n" -msgstr "레지스트리는 손상되었습니다.\n" +msgstr "레지스트리 손상.\n" #: winerror.mc:1098 msgid "I/O to registry failed.\n" -msgstr "레지스트리 I/O가 실패했습니다.\n" +msgstr "레지스트리 I/O 실패.\n" #: winerror.mc:1103 msgid "Not registry file.\n" -msgstr "레지스트리 파일 형식이 아닙니다.\n" +msgstr "레지스트리 파일이 아닙니다.\n" #: winerror.mc:1108 msgid "Key deleted.\n" -msgstr "삭제된 키입니다.\n" +msgstr "키가 제거되었습니다.\n" #: winerror.mc:1113 msgid "No registry log space.\n" -msgstr "레지스트리 기록에 필요한 공간을 할당할 수 없습니다.\n" +msgstr "레지스트리 기록 공간 부족.\n" #: winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "레지스트리 키가 서브키를 갖고 있습니다.\n" +msgstr "레지스트리 키가 서브키를 가지고 있습니다.\n" #: winerror.mc:1123 msgid "Subkey must be volatile.\n" @@ -4637,39 +4628,39 @@ msgstr "하위키는 휘발성이어야 합니다.\n" #: winerror.mc:1128 msgid "Notify change request in progress.\n" -msgstr "통지 변경 요청이 수행 중입니다.\n" +msgstr "진행 중인 요청 변화를 알립니다.\n" #: winerror.mc:1133 msgid "Dependent services are running.\n" -msgstr "의존하는 서비스가 실행 중입니다.\n" +msgstr "의존 서비스 실행 중.\n" #: winerror.mc:1138 msgid "Invalid service control.\n" -msgstr "컨트롤이 서비스에 유효하지 않습니다.\n" +msgstr "올바르지 않은 서비스 컨트롤.\n" #: winerror.mc:1143 msgid "Service request timeout.\n" -msgstr "서비스 요청이 시간초과했습니다.\n" +msgstr "서비스 요청 시간초과.\n" #: winerror.mc:1148 msgid "Cannot create service thread.\n" -msgstr "서비스 쓰레드를 만들 수 없습니다.\n" +msgstr "서비스 스레드 만들기 실패.\n" #: winerror.mc:1153 msgid "Service database locked.\n" -msgstr "서비스 데이터베이스가 잠겼습니다.\n" +msgstr "서비스 데이터베이스 잠.\n" #: winerror.mc:1158 msgid "Service already running.\n" -msgstr "서비스가 이미 실행 증입니다.\n" +msgstr "서비스 실행 증.\n" #: winerror.mc:1163 msgid "Invalid service account.\n" -msgstr "서비스 계정이 올바르지 않습니다.\n" +msgstr "올바르지 않은 서비스 계정.\n" #: winerror.mc:1168 msgid "Service is disabled.\n" -msgstr "서비스가 실행 불능 상태입니다.\n" +msgstr "서비스 실행 불능.\n" #: winerror.mc:1173 msgid "Circular dependency.\n" @@ -4677,39 +4668,39 @@ msgstr "원형 서비스 종속성.\n" #: winerror.mc:1178 msgid "Service does not exist.\n" -msgstr "서비스가 존재하지 않습니다.\n" +msgstr "서비스가 없습니다.\n" #: winerror.mc:1183 msgid "Service cannot accept control message.\n" -msgstr "서비스가 컨트롤 메시지를 받아들일 수 없습니다.\n" +msgstr "받아들일 수 없는 서비스 컨트롤 메시지.\n" #: winerror.mc:1188 msgid "Service not active.\n" -msgstr "서비스가 시작되지 않았습니다.\n" +msgstr "활성화도지 않은 서비스.\n" #: winerror.mc:1193 msgid "Service controller connect failed.\n" -msgstr "서비스 컨트롤러에 연결할 수 없습니다.\n" +msgstr "서비스 컨트롤러 연결 실패.\n" #: winerror.mc:1198 msgid "Exception in service.\n" -msgstr "서비스에 오류가 발생했습니다.\n" +msgstr "서비스에 예외 발생.\n" #: winerror.mc:1203 msgid "Database does not exist.\n" -msgstr "데이터베이스가 존재하지 않습니다.\n" +msgstr "데이터베이스가 없습니다.\n" #: winerror.mc:1208 msgid "Service-specific error.\n" -msgstr "서비스 고유의 오류.\n" +msgstr "서비스 고유 오류.\n" #: winerror.mc:1213 msgid "Process aborted.\n" -msgstr "프로세스가 예기치 않게 종료되었습니다.\n" +msgstr "예기치 않은 프로세스 종료.\n" #: winerror.mc:1218 msgid "Service dependency failed.\n" -msgstr "서비스 종속성이 실패했습니다.\n" +msgstr "서비스 종속성 실패.\n" #: winerror.mc:1223 msgid "Service login failed.\n" @@ -4717,15 +4708,15 @@ msgstr "서비스 로그인 실패.\n" #: winerror.mc:1228 msgid "Service start-hang.\n" -msgstr "서비스 시작 후 대기 상태.\n" +msgstr "서비스 start-hang.\n" #: winerror.mc:1233 msgid "Invalid service lock.\n" -msgstr "서비스 잠금이 올바르지 않습니다.\n" +msgstr "올바르지 않은 서비스 잠금.\n" #: winerror.mc:1238 msgid "Service marked for delete.\n" -msgstr "서비스가 삭제 표시되었습니다.\n" +msgstr "서비스가 제거로 표시.\n" #: winerror.mc:1243 msgid "Service exists.\n" @@ -4737,11 +4728,11 @@ msgstr "시스템이 마지막으로 알려진 좋은 구성으로 실행중입 #: winerror.mc:1253 msgid "Service dependency deleted.\n" -msgstr "서비스 종속성이 삭제되었습니다.\n" +msgstr "서비스 종속성이 제거되었습니다.\n" #: winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "이미 시동이 마지막으로 인식된 양호한 설정으로 받아들여졌습니다.\n" +msgstr "시동이 이미 최종 양호 설정으로 받아들여졌습니다.\n" #: winerror.mc:1263 msgid "Service not started since last boot.\n" @@ -4749,11 +4740,11 @@ msgstr "서비스가 마지막 시동 이후로 시작되지 않았습니다.\n" #: winerror.mc:1268 msgid "Duplicate service name.\n" -msgstr "중복된 서비스 이름입니다.\n" +msgstr "중복된 서비스 이름.\n" #: winerror.mc:1273 msgid "Different service account.\n" -msgstr "다른 서비스 계정입니다.\n" +msgstr "다른 서비스 계정.\n" #: winerror.mc:1278 msgid "Driver failure cannot be detected.\n" @@ -4761,15 +4752,15 @@ msgstr "드라이버 오류를 발견할 수 없습니다.\n" #: winerror.mc:1283 msgid "Process abort cannot be detected.\n" -msgstr "프로세스 중지를 발견할 수 없습니다.\n" +msgstr "프로세스 중단을 발견할 수 없습니다.\n" #: winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "서비스를 복구할 수 없습니다.\n" +msgstr "서비스를 복구 프로그램이 없습니다.\n" #: winerror.mc:1293 msgid "Service not implemented by exe.\n" -msgstr "서비스가 EXE로 구현되지 않았습니.\n" +msgstr "서비스가 EXE로 구현되지 않았습니다.\n" #: winerror.mc:1298 msgid "End of media.\n" @@ -4789,7 +4780,7 @@ msgstr "세트 표시를 발견했습니다.\n" #: winerror.mc:1318 msgid "No data detected.\n" -msgstr "데이터가 없습니다.\n" +msgstr "감지된 데이터가 없습니다.\n" #: winerror.mc:1323 msgid "Partition failure.\n" @@ -4797,27 +4788,27 @@ msgstr "파티션 실패.\n" #: winerror.mc:1328 msgid "Invalid block length.\n" -msgstr "블럭 길이가 올바르지 않습니다.\n" +msgstr "올바르지 않은 블럭 길이.\n" #: winerror.mc:1333 msgid "Device not partitioned.\n" -msgstr "장치에 파티션이 없습니다.\n" +msgstr "장치에 파티션이 업습니다.\n" #: winerror.mc:1338 msgid "Unable to lock media.\n" -msgstr "미디어를 잠글 수 없습니다.\n" +msgstr "미디어 잠금 불가능.\n" #: winerror.mc:1343 msgid "Unable to unload media.\n" -msgstr "미디어 적재를 해제할 수 없습니다.\n" +msgstr "미디어를 적재 해제 불가능.\n" #: winerror.mc:1348 msgid "Media changed.\n" -msgstr "미디어가 변경되었습니다.\n" +msgstr "미디어가 바뀌었습니다.\n" #: winerror.mc:1353 msgid "I/O bus reset.\n" -msgstr "I/O 버스가 재설정되었습니다.\n" +msgstr "I/O 버스 재설정.\n" #: winerror.mc:1358 msgid "No media in drive.\n" @@ -4829,11 +4820,11 @@ msgstr "유니코드 매핑이 없습니다.\n" #: winerror.mc:1368 msgid "DLL initialization failed.\n" -msgstr "DLL 초기화가 실패했습니다.\n" +msgstr "DLL 초기화 실패.\n" #: winerror.mc:1373 msgid "Shutdown in progress.\n" -msgstr "시스템 종료 중입니다.\n" +msgstr "시스템 종료 중.\n" #: winerror.mc:1378 msgid "No shutdown in progress.\n" @@ -4845,39 +4836,39 @@ msgstr "I/O 장치 오류.\n" #: winerror.mc:1388 msgid "No serial devices found.\n" -msgstr "시리얼 장치를 발견할 수 없습니다.\n" +msgstr "시리얼 장치 발견 실패.\n" #: winerror.mc:1393 msgid "Shared IRQ busy.\n" -msgstr "공유된 IRQ가 사용중입니다.\n" +msgstr "공유된 IRQ 사용 중.\n" #: winerror.mc:1398 msgid "Serial I/O completed.\n" -msgstr "시리얼 I/O가 완료되었습니다.\n" +msgstr "시리얼 I/O 완료.\n" #: winerror.mc:1403 msgid "Serial I/O counter timeout.\n" -msgstr "시리얼 I/O 카운터 시간초과.\n" +msgstr "시리얼 I/O 카운터 시간 초과.\n" #: winerror.mc:1408 msgid "Floppy ID address mark not found.\n" -msgstr "플로피 ID 주소 표시를 찾을 수 없습니다.\n" +msgstr "플로피 ID 주소 표시 찾기 실패.\n" #: winerror.mc:1413 msgid "Floppy reports wrong cylinder.\n" -msgstr "플로피가 잘못된 실린더 값을 보고했습니다.\n" +msgstr "잘못된 플로피 실린더 값 보고.\n" #: winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "알려지지 않은 플로피 오류.\n" +msgstr "알 수 없는 플로피 오류.\n" #: winerror.mc:1423 msgid "Floppy registers inconsistent.\n" -msgstr "플로피 등록값에 일관성이 없습니다\n" +msgstr "일관성 없는 플로피 등록값.\n" #: winerror.mc:1428 msgid "Hard disk recalibrate failed.\n" -msgstr "하드디스크 재조성 실패.\n" +msgstr "하드디스크 재조정 실패.\n" #: winerror.mc:1433 msgid "Hard disk operation failed.\n" @@ -4893,31 +4884,31 @@ msgstr "테이프 미디어 끝.\n" #: winerror.mc:1448 msgid "Not enough server memory.\n" -msgstr "서버 메모리가 부족합니다.\n" +msgstr "서버 메모리 부족.\n" #: winerror.mc:1453 msgid "Possible deadlock.\n" -msgstr "데드락이 가능함.\n" +msgstr "데드락 가능성.\n" #: winerror.mc:1458 msgid "Incorrect alignment.\n" -msgstr "올바르지 않은 정렬.\n" +msgstr "잘못된 정렬.\n" #: winerror.mc:1463 msgid "Set-power-state vetoed.\n" -msgstr "파워-상태-설정이 거부됨.\n" +msgstr "파워 상태 설정 거부.\n" #: winerror.mc:1468 msgid "Set-power-state failed.\n" -msgstr "파워-상태-설정이 실패함.\n" +msgstr "파워 상태 설정 실패.\n" #: winerror.mc:1473 msgid "Too many links.\n" -msgstr "너무 많은 링크가 있습니다.\n" +msgstr "너무 많은 링크.\n" #: winerror.mc:1478 msgid "Newer windows version needed.\n" -msgstr "더 최신의 윈도우즈 버전을 필요로 합니다.\n" +msgstr "더 최신의 Windows 버전이 필요합니다.\n" #: winerror.mc:1483 msgid "Wrong operating system.\n" @@ -4925,7 +4916,7 @@ msgstr "잘못된 운영체제.\n" #: winerror.mc:1488 msgid "Single-instance application.\n" -msgstr "단일 인스턴트 프로그램 .\n" +msgstr "단일 인스턴트 프로그램.\n" #: winerror.mc:1493 msgid "Real-mode application.\n" @@ -4933,7 +4924,7 @@ msgstr "리얼 모드 프로그램.\n" #: winerror.mc:1498 msgid "Invalid DLL.\n" -msgstr "올바르지 않은DLL.\n" +msgstr "올바르지 않은 DLL.\n" #: winerror.mc:1503 msgid "No associated application.\n" @@ -4949,11 +4940,11 @@ msgstr "DLL을 찾을 수 없습니다.\n" #: winerror.mc:1518 msgid "Out of user handles.\n" -msgstr "사용자 핸들 밖임.\n" +msgstr "사용자 핸들 부족.\n" #: winerror.mc:1523 msgid "Message can only be used in synchronous calls.\n" -msgstr "메시지는 오직 동기 호출에만 사용할 수 있음.\n" +msgstr "메시지는 오직 동기 호출에만 사용할 수 있습니다.\n" #: winerror.mc:1528 msgid "The source element is empty.\n" @@ -4961,19 +4952,19 @@ msgstr "소스 요소가 비어 있습니다.\n" #: winerror.mc:1533 msgid "The destination element is full.\n" -msgstr "대상 요소가 가득참.\n" +msgstr "대상 요소가 가능 차 있습니다.\n" #: winerror.mc:1538 msgid "The element address is invalid.\n" -msgstr "요소의 주소가 잘못되었습니다.\n" +msgstr "올바르지 않은 요소 주소.\n" #: winerror.mc:1543 msgid "The magazine is not present.\n" -msgstr "매거진은 존재하지 않음.\n" +msgstr "Magazine이 없습니다.\n" #: winerror.mc:1548 msgid "The device needs reinitialization.\n" -msgstr "이 장치는 다시 초기화가 필요함.\n" +msgstr "이 장치는 초기화가 다시 필요합니다.\n" #: winerror.mc:1553 msgid "The device requires cleaning.\n" @@ -4993,11 +4984,11 @@ msgstr "요소를 찾을 수 없습니다.\n" #: winerror.mc:1573 msgid "No match found.\n" -msgstr "일치하는 것을 찾을 수 없음.\n" +msgstr "일치하는 것이 없습니다.\n" #: winerror.mc:1578 msgid "Property set not found.\n" -msgstr "속성 세트를 찾을 수 없습니다.\n" +msgstr "속성 집합을 찾을 수 없습니다.\n" #: winerror.mc:1583 msgid "Point not found.\n" @@ -5013,15 +5004,15 @@ msgstr "볼륨 아이디가 없음.\n" #: winerror.mc:1598 msgid "Unable to remove the file to be replaced.\n" -msgstr "바꿀 파일을 지울 수 없음.\n" +msgstr "교체하려는 파일을 지울 수 없습니다.\n" #: winerror.mc:1603 msgid "Unable to move the replacement file into place.\n" -msgstr "대체 파일을 이 장소로 이동할 수 없음.\n" +msgstr "교체 파일을 제자리로 이동할 수 없습니다.\n" #: winerror.mc:1608 msgid "Moving the replacement file failed.\n" -msgstr "바꿀 파일 이동 작업 실패.\n" +msgstr "교체 파일 이동 실패.\n" #: winerror.mc:1613 msgid "The journal is being deleted.\n" @@ -5033,7 +5024,7 @@ msgstr "저널이 활성화되지 않았습니다.\n" #: winerror.mc:1623 msgid "Potential matching file found.\n" -msgstr "잠재 일치하는 파일을 찾을 수 없음.\n" +msgstr "일치할 가능성이 있는 파일이 없습니다.\n" #: winerror.mc:1628 msgid "The journal entry was deleted.\n" @@ -5045,7 +5036,7 @@ msgstr "올바르지 않은 장치 이름.\n" #: winerror.mc:1638 msgid "Connection unavailable.\n" -msgstr "연결이 불가능합니다.\n" +msgstr "불가능한 연결.\n" #: winerror.mc:1643 msgid "Device already remembered.\n" @@ -5053,7 +5044,7 @@ msgstr "장치는 이미 기억됨.\n" #: winerror.mc:1648 msgid "No network or bad path.\n" -msgstr "네트워크가 없거나 경로가 잘못됨.\n" +msgstr "네트워크가 없거나 잘못된 경로.\n" #: winerror.mc:1653 msgid "Invalid network provider name.\n" @@ -5069,7 +5060,7 @@ msgstr "망가진 네트워크 연결 프로필.\n" #: winerror.mc:1668 msgid "Not a container.\n" -msgstr "컨테이너가 아님.\n" +msgstr "컨테이너가 아닙니다.\n" #: winerror.mc:1673 msgid "Extended error.\n" @@ -5081,7 +5072,7 @@ msgstr "올바르지 않은 그룹 이름.\n" #: winerror.mc:1683 msgid "Invalid computer name.\n" -msgstr "잘못된 컴퓨터 이름.\n" +msgstr "올바르지 않은 컴퓨터 이름.\n" #: winerror.mc:1688 msgid "Invalid event name.\n" @@ -5109,19 +5100,19 @@ msgstr "올바르지 않은 메시지 이름.\n" #: winerror.mc:1723 msgid "Invalid message destination.\n" -msgstr "올바르지 않은 메시지 방향.\n" +msgstr "올바르지 않은 메시지 대상.\n" #: winerror.mc:1728 msgid "Session credential conflict.\n" -msgstr "세션 자격 수여 충돌.\n" +msgstr "세션 자격 증명 충돌.\n" #: winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "원격 세션 제한 도달.\n" +msgstr "원격 세션 제한 초과.\n" #: winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" -msgstr "도메인이나 작업 그룸 이름이 중복됨.\n" +msgstr "도메인 또는 작업그룹 이름 중복.\n" #: winerror.mc:1743 msgid "No network.\n" @@ -5133,15 +5124,15 @@ msgstr "작업이 사용자에 위해 취소됨.\n" #: winerror.mc:1753 msgid "File has a user-mapped section.\n" -msgstr "파일은 사용자-배치 섹션을 가지고 있음.\n" +msgstr "파일에 사용자 매핑 섹션이 있습니다.\n" #: winerror.mc:1758 winerror.mc:3753 msgid "Connection refused.\n" -msgstr "연결이 거부됨.\n" +msgstr "연결 거부.\n" #: winerror.mc:1763 msgid "Connection gracefully closed.\n" -msgstr "연결이 정상적으로 종료됨.\n" +msgstr "정상적으로 연결 종료.\n" #: winerror.mc:1768 msgid "Address already associated with transport endpoint.\n" @@ -5149,7 +5140,7 @@ msgstr "주소는 이미 전송 끝점과 관련되어 있음.\n" #: winerror.mc:1773 msgid "Address not associated with transport endpoint.\n" -msgstr "주소는 이미 전송 끝점과 관련되어 있지 않음.\n" +msgstr "주소가 전송 끝점과 연관되지 않았습니다.\n" #: winerror.mc:1778 msgid "Connection invalid.\n" @@ -5157,7 +5148,7 @@ msgstr "올바르지 않은 연결.\n" #: winerror.mc:1783 msgid "Connection is active.\n" -msgstr "연결이 활성화됨.\n" +msgstr "연결 활성화.\n" #: winerror.mc:1788 msgid "Network unreachable.\n" @@ -5177,11 +5168,11 @@ msgstr "접근할 수 없는 포트.\n" #: winerror.mc:1808 msgid "Request aborted.\n" -msgstr "요청이 중단됨.\n" +msgstr "요청 중단.\n" #: winerror.mc:1813 msgid "Connection aborted.\n" -msgstr "연결이 취소됨.\n" +msgstr "연결 중단.\n" #: winerror.mc:1818 msgid "Please retry operation.\n" @@ -5189,7 +5180,7 @@ msgstr "작업을 다시 시도하십시오.\n" #: winerror.mc:1823 msgid "Connection count limit reached.\n" -msgstr "도달 연결 개수 제한에 도달함.\n" +msgstr "연결 개수 제한에 도달했습니다.\n" #: winerror.mc:1828 msgid "Login time restriction.\n" @@ -5197,7 +5188,7 @@ msgstr "로그인 시간 제한.\n" #: winerror.mc:1833 msgid "Login workstation restriction.\n" -msgstr "로그인 워크 스테이션 제한.\n" +msgstr "로그인 워크스테이션 제한.\n" #: winerror.mc:1838 msgid "Incorrect network address.\n" @@ -5205,7 +5196,7 @@ msgstr "잘못된 네트워크 주소.\n" #: winerror.mc:1843 msgid "Service already registered.\n" -msgstr "서비스는 이미 등록되어 있습니다.\n" +msgstr "서비스가 이미 등록되어 있습니다.\n" #: winerror.mc:1848 msgid "Service not found.\n" @@ -5213,79 +5204,79 @@ msgstr "서비스를 찾을 수 없습니다.\n" #: winerror.mc:1853 msgid "User not authenticated.\n" -msgstr "사용자가 인증되지 않음.\n" +msgstr "인증되지 않은 사용자.\n" #: winerror.mc:1858 msgid "User not logged on.\n" -msgstr "사용자가 로그인되어있지 않음.\n" +msgstr "로그온되지 않은 사용자.\n" #: winerror.mc:1863 msgid "Continue work in progress.\n" -msgstr "계속 진행중인 작업.\n" +msgstr "진행중인 작업을 계속합니다.\n" #: winerror.mc:1868 msgid "Already initialized.\n" -msgstr "이미 초기화됨.\n" +msgstr "이미 초기화되었습니다.\n" #: winerror.mc:1873 msgid "No more local devices.\n" -msgstr "더 이상의 지역 장치가 없음.\n" +msgstr "지역 장치가 더 이상 없습니다.\n" #: winerror.mc:1878 msgid "The site does not exist.\n" -msgstr "사이트가 존재하지 않습니다.\n" +msgstr "사이트가 없습니다.\n" #: winerror.mc:1883 msgid "The domain controller already exists.\n" -msgstr "도메인 제어기는 이미 존재합니다.\n" +msgstr "도메인 제어기가 이미 존재합니다.\n" #: winerror.mc:1888 msgid "Supported only when connected.\n" -msgstr "오직 연결될 때만 지원됨.\n" +msgstr "연결되었을 때만 지원됩니다.\n" #: winerror.mc:1893 msgid "Perform operation even when nothing changed.\n" -msgstr "작업 수행할 때 아무것도 변경된 것이 없음.\n" +msgstr "바뀐 것이 없는 경우에도 작업을 수행합니다.\n" #: winerror.mc:1898 msgid "The user profile is invalid.\n" -msgstr "사용자 프로파일이 적합하지 않음.\n" +msgstr "사용자 프로파일이 잘못되었습니다.\n" #: winerror.mc:1903 msgid "Not supported on Small Business Server.\n" -msgstr "Small Business Server는 지원하지 않음.\n" +msgstr "Small Business Server는 지원하지 않습니다.\n" #: winerror.mc:1908 msgid "Not all privileges assigned.\n" -msgstr "할당되지 않은 모든 권한.\n" +msgstr "모든 권한을 할당되지는 않습니다.\n" #: winerror.mc:1913 msgid "Some security IDs not mapped.\n" -msgstr "어떤 보안 아이디는 매칭되어 잇지 않음.\n" +msgstr "일부 보안 ID가 매핑되지 않았습니다.\n" #: winerror.mc:1918 msgid "No quotas for account.\n" -msgstr "계정에 할당된 쿼터가 없음.\n" +msgstr "계정에 할당량이 없습니다.\n" #: winerror.mc:1923 msgid "Local user session key.\n" -msgstr "로컬 사용자 세션 키.\n" +msgstr "지역 사용자 세션 키.\n" #: winerror.mc:1928 msgid "Password too complex for LM.\n" -msgstr "LM을 위한 암호가 너무 복잡함.\n" +msgstr "LM 용으로는 너무 복잡한 암호.\n" #: winerror.mc:1933 msgid "Unknown revision.\n" -msgstr " 없는 개정.\n" +msgstr "알 수 없는 리비전.\n" #: winerror.mc:1938 msgid "Incompatible revision levels.\n" -msgstr "호환되지 않는 개정 레벨.\n" +msgstr "호환되지 않는 리비전 레벨.\n" #: winerror.mc:1943 msgid "Invalid owner.\n" -msgstr "잘못된 소유자.\n" +msgstr "올바르지 않은 소유자.\n" #: winerror.mc:1948 msgid "Invalid primary group.\n" @@ -5293,19 +5284,19 @@ msgstr "올바르지 않은 기본 그룹.\n" #: winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "흉내내는 토큰이 없음.\n" +msgstr "가장(위장) 토큰이 없습니다.\n" #: winerror.mc:1958 msgid "Can't disable mandatory group.\n" -msgstr "그룹에 권한을 줄 수 없음.\n" +msgstr "필수 그룹을 비활성화할 수 없습니다.\n" #: winerror.mc:1963 msgid "No logon servers available.\n" -msgstr "가능한 로그온 서버가 없습니다.\n" +msgstr "로그온 서버를 이용할 수 없습니다.\n" #: winerror.mc:1968 msgid "No such logon session.\n" -msgstr "어떤 로그인 세션도 없음.\n" +msgstr "로그온 세션이 없습니다.\n" #: winerror.mc:1973 msgid "No such privilege.\n" @@ -5377,7 +5368,7 @@ msgstr "올바르지 않은 워크스테이션.\n" #: winerror.mc:2058 msgid "Password expired.\n" -msgstr "비밀 번호 만료.\n" +msgstr "암호 유효 기간 만료.\n" #: winerror.mc:2063 msgid "Account disabled.\n" @@ -5509,7 +5500,7 @@ msgstr "로그온 세션 아이디가 존재함.\n" #: winerror.mc:2223 msgid "Unknown authentication package.\n" -msgstr " 없는 인증 패키지.\n" +msgstr "알 수 없는 인증 패키지.\n" #: winerror.mc:2228 msgid "Bad logon session state.\n" @@ -5525,11 +5516,11 @@ msgstr "올바르지 않은 로그온 타입.\n" #: winerror.mc:2243 msgid "Cannot impersonate.\n" -msgstr "흉내낼 수 없음.\n" +msgstr "사칭할 수 없습니다.\n" #: winerror.mc:2248 msgid "Invalid transaction state.\n" -msgstr "올바르지 않은 처리 상태.\n" +msgstr "트랜잭션 상태가 올바르지 않습니다.\n" #: winerror.mc:2253 msgid "Security DB commit failure.\n" @@ -5629,7 +5620,7 @@ msgstr "사용자 세션 키가 없음.\n" #: winerror.mc:2378 msgid "License quota exceeded.\n" -msgstr "라이센스의 할당량을 초과했습니다.\n" +msgstr "라이선스의 할당량을 초과했습니다.\n" #: winerror.mc:2383 msgid "Wrong target name.\n" @@ -5677,11 +5668,11 @@ msgstr "창 클래스를 찾을 수 없습니다.\n" #: winerror.mc:2438 msgid "Window owned by another thread.\n" -msgstr "창은 다른 쓰레드가 가지고 있습니다.\n" +msgstr "창은 다른 스레드가 가지고 있습니다.\n" #: winerror.mc:2443 msgid "Hotkey already registered.\n" -msgstr "단축키는 이미 등록되었습니다.\n" +msgstr "바로 가기는 이미 등록되었습니다.\n" #: winerror.mc:2448 msgid "Class already exists.\n" @@ -5689,7 +5680,7 @@ msgstr "클래스는 이미 존재합니다.\n" #: winerror.mc:2453 msgid "Class does not exist.\n" -msgstr "클래스가 존재하지 않습니다.\n" +msgstr "클래스가 없습니다.\n" #: winerror.mc:2458 msgid "Class has open windows.\n" @@ -5721,7 +5712,7 @@ msgstr "클립보드를 열 수 없습니다.\n" #: winerror.mc:2493 msgid "Hotkey not registered.\n" -msgstr "단축키가 등록되지 않았습니다.\n" +msgstr "바로 가기가 등록되지 않았습니다.\n" #: winerror.mc:2498 msgid "Not a dialog window.\n" @@ -5821,7 +5812,7 @@ msgstr "올바르지 않은 GW 명령.\n" #: winerror.mc:2618 msgid "Invalid thread ID.\n" -msgstr "올바르지 않은 쓰레드 ID.\n" +msgstr "올바르지 않은 스레드 ID.\n" #: winerror.mc:2623 msgid "Not an MDI child window.\n" @@ -5869,7 +5860,7 @@ msgstr "헌신 한도 초과.\n" #: winerror.mc:2678 msgid "Menu item not found.\n" -msgstr "메뉴 아이템을 찾을 수 없습니다.\n" +msgstr "메뉴 항목을 찾을 수 없습니다.\n" #: winerror.mc:2683 msgid "Invalid keyboard handle.\n" @@ -5881,7 +5872,7 @@ msgstr "허용되지 않은 훅 형식.\n" #: winerror.mc:2693 msgid "Interactive window station required.\n" -msgstr "대화형 윈도우 스테이션이 요구됨.\n" +msgstr "대화형 Windows 스테이션이 요구됨.\n" #: winerror.mc:2698 msgid "Timeout.\n" @@ -5905,7 +5896,7 @@ msgstr "이벤트 로그 파일이 가득 참.\n" #: winerror.mc:2723 msgid "Event log file changed.\n" -msgstr "이벤트 로그 파일이 변경됨.\n" +msgstr "이벤트 로그 파일이 바뀌었습니다.\n" #: winerror.mc:2728 msgid "Installer service failed.\n" @@ -5925,19 +5916,19 @@ msgstr "설치가 일시 중지됨.\n" #: winerror.mc:2748 msgid "Unknown product.\n" -msgstr " 없는 제품.\n" +msgstr "알 수 없는 제품.\n" #: winerror.mc:2753 msgid "Unknown feature.\n" -msgstr " 없는 특징.\n" +msgstr "알 수 없는 특징.\n" #: winerror.mc:2758 msgid "Unknown component.\n" -msgstr " 없는 컴포넌트.\n" +msgstr "알 수 없는 컴포넌트.\n" #: winerror.mc:2763 msgid "Unknown property.\n" -msgstr " 없는 속성.\n" +msgstr "알 수 없는 속성.\n" #: winerror.mc:2768 msgid "Invalid handle state.\n" @@ -6021,7 +6012,7 @@ msgstr "올바르지 않은 테이블.\n" #: winerror.mc:2868 msgid "Data type mismatch.\n" -msgstr "데이타 형식이 맞지 않습니다.\n" +msgstr "데이터 형식이 맞지 않습니다.\n" #: winerror.mc:2873 winerror.mc:3083 msgid "Unsupported type.\n" @@ -6137,11 +6128,11 @@ msgstr "RPC 서버는 응답이 없습니다.\n" #: winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr " 없는 매니저 형식.\n" +msgstr "알 수 없는 관리자 유형.\n" #: winerror.mc:3018 msgid "Unknown interface.\n" -msgstr " 없는 인터페이스.\n" +msgstr "알 수 없는 인터페이스.\n" #: winerror.mc:3023 msgid "No bindings.\n" @@ -6157,7 +6148,7 @@ msgstr "엔드포인트를 만들 수 없습니다.\n" #: winerror.mc:3038 msgid "Out of resources.\n" -msgstr "리소스 범위 밖.\n" +msgstr "리소스가 부족합니다.\n" #: winerror.mc:3043 msgid "RPC server unavailable.\n" @@ -6221,7 +6212,7 @@ msgstr "중복된 끝나는 점.\n" #: winerror.mc:3123 msgid "Unknown authentication type.\n" -msgstr " 없는 인증 형식.\n" +msgstr "알 수 없는 인증 형식.\n" #: winerror.mc:3128 msgid "Maximum calls too low.\n" @@ -6245,11 +6236,11 @@ msgstr "바인딩은 어떤 인증 정보도 가지고 있지 않습니다.\n" #: winerror.mc:3153 msgid "Unknown authentication service.\n" -msgstr " 없는 인증 서비스.\n" +msgstr "알 수 없는 인증 서비스.\n" #: winerror.mc:3158 msgid "Unknown authentication level.\n" -msgstr " 없는 인증 레벨.\n" +msgstr "알 수 없는 인증 레벨.\n" #: winerror.mc:3163 msgid "Invalid authentication identity.\n" @@ -6257,7 +6248,7 @@ msgstr "올바르지 않은 인증 증명서.\n" #: winerror.mc:3168 msgid "Unknown authorization service.\n" -msgstr " 없는 허가 서비스.\n" +msgstr "알 수 없는 인증 서비스.\n" #: winerror.mc:3173 msgid "Invalid entry.\n" @@ -6437,15 +6428,15 @@ msgstr "프린터 드라이버는 이미 설치되어 있습니다.\n" #: winerror.mc:3393 msgid "Unknown port.\n" -msgstr " 없는 포트.\n" +msgstr "알 수 없는 포트.\n" #: winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr " 없는 프린터 드라이버.\n" +msgstr "알 수 없는 프린터 드라이버.\n" #: winerror.mc:3403 msgid "Unknown print processor.\n" -msgstr " 없는 프린터 프로세서.\n" +msgstr "알 수 없는 프린터 프로세서.\n" #: winerror.mc:3408 msgid "Invalid separator file.\n" @@ -6469,7 +6460,7 @@ msgstr "올바르지 않은 프린터 명령.\n" #: winerror.mc:3433 msgid "Invalid data type.\n" -msgstr "올바르지 않은 데이타 형식.\n" +msgstr "올바르지 않은 데이터 형식.\n" #: winerror.mc:3438 msgid "Invalid environment.\n" @@ -6501,7 +6492,7 @@ msgstr "서버가 핸들을 열었습니다.\n" #: winerror.mc:3473 msgid "Resource data not found.\n" -msgstr "리소스 데이타를 찾을 수 없습니다.\n" +msgstr "리소스 데이터를 찾을 수 없습니다.\n" #: winerror.mc:3478 msgid "Resource type not found.\n" @@ -6557,7 +6548,7 @@ msgstr "보안 패키지 오류.\n" #: winerror.mc:3543 msgid "Thread not canceled.\n" -msgstr "쓰레드는 취소되지 않았습니다.\n" +msgstr "스레드는 취소되지 않았습니다.\n" #: winerror.mc:3548 msgid "Invalid handle operation.\n" @@ -6665,7 +6656,7 @@ msgstr "RPC 파이프에 대한 규율 오류.\n" #: winerror.mc:3678 msgid "No data on RPC pipe.\n" -msgstr "RPC 파이프에 어떠한 데이타도 없음.\n" +msgstr "RPC 파이프에 어떠한 데이터도 없음.\n" #: winerror.mc:3683 msgid "No site name available.\n" @@ -6717,11 +6708,11 @@ msgstr "사용자 이름을 찾을 수 없습니다.\n" #: winerror.mc:3743 msgid "This network connection does not exist.\n" -msgstr "이 네트워크 연결은 존재하지 않습니다.\n" +msgstr "네트워크 연결이 없습니다.\n" #: winerror.mc:3748 msgid "Connection reset by peer.\n" -msgstr "피어가 연결을 초기화 했습니다..\n" +msgstr "피어가 연결을 초기화 했습니다.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n" @@ -6781,7 +6772,7 @@ msgstr "네트워크 암호 입력" #: mpr.rc:38 wininet.rc:40 wininet.rc:60 msgid "Please enter your username and password:" -msgstr "당신의 사용자이름과 암호를 입력하시오:" +msgstr "사용자 이름과 암호를 입력하십시오:" #: mpr.rc:39 wininet.rc:41 msgid "Proxy" @@ -6797,7 +6788,7 @@ msgstr "암호" #: mpr.rc:47 wininet.rc:49 wininet.rc:69 msgid "&Save this password (insecure)" -msgstr "암호 저장(&S)(안전하지 못함)" +msgstr "암호를 저장(&S) (안전하지 않음)" #: mpr.rc:30 msgid "Entire Network" @@ -6894,7 +6885,7 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"윈도우즈 설치 프로그램 %s\n" +"Windows 설치 프로그램 %s\n" "\n" "사용법:\n" "msiexec 명령 {필수 매개변수} [선택적 매개변수]\n" @@ -6954,7 +6945,7 @@ msgstr "레지스트리 공간 할당" #: msi.rc:92 msgid "Searching for installed applications" -msgstr "설치된 응용 소프트웨어 찾기" +msgstr "설치된 프로그램 검색" #: msi.rc:93 msgid "Binding executables" @@ -6974,7 +6965,7 @@ msgstr "새 폴더" #: msi.rc:98 msgid "Creating shortcuts" -msgstr "바로가기 만들기" +msgstr "바로 가기 만들기" #: msi.rc:99 msgid "Deleting services" @@ -6986,7 +6977,7 @@ msgstr "사본 만들기" #: msi.rc:102 msgid "Searching for related applications" -msgstr "연결된 응용 소프트웨어 찾는 중" +msgstr "관련된 프로그램 검색 중" #: msi.rc:103 msgid "Copying network install files" @@ -7018,7 +7009,7 @@ msgstr "실행 조건 평가" #: msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "관련 응용 소프트웨어의 기능 상태 가져오기" +msgstr "관련된 프로그램의 특성 상태를 마이그레이션하는 중" #: msi.rc:111 msgid "Moving files" @@ -7058,7 +7049,7 @@ msgstr "클래스 서버 등록" #: msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "COM+ 응용 소프트웨어와 요소 등록" +msgstr "COM+ 프로그램 및 구성요소 등록" #: msi.rc:121 msgid "Registering extension servers" @@ -7098,19 +7089,19 @@ msgstr "환경 문자열 갱신" #: msi.rc:130 msgid "Removing applications" -msgstr "응용프로그램 제거" +msgstr "프로그램 제거" #: msi.rc:131 msgid "Removing files" -msgstr "파일 삭제" +msgstr "파일 제거" #: msi.rc:132 msgid "Removing folders" -msgstr "폴더 삭제" +msgstr "폴더 제거" #: msi.rc:133 msgid "Removing INI files entries" -msgstr "설정 파일 목록 삭제" +msgstr "설정 파일 목록 제거" #: msi.rc:134 msgid "Removing ODBC components" @@ -7122,7 +7113,7 @@ msgstr "시스템 레지스트리 값 제거 중" #: msi.rc:136 msgid "Removing shortcuts" -msgstr "단축키 제거" +msgstr "바로 가기 제거" #: msi.rc:138 msgid "Registering modules" @@ -7162,7 +7153,7 @@ msgstr "클래스 서버 등록 취소" #: msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "COM+ 응용프로그램 및 구성요소 등록 해제" +msgstr "COM+ 프로그램 및 구성요소 등록 해제" #: msi.rc:148 msgid "Unregistering extension servers" @@ -7210,7 +7201,7 @@ msgstr "폴더: [1]" #: msi.rc:165 msi.rc:194 msgid "Shortcut: [1]" -msgstr "바로가기: [1]" +msgstr "바로 가기: [1]" #: msi.rc:166 msi.rc:197 msi.rc:198 msgid "Service: [1]" @@ -7218,15 +7209,15 @@ msgstr "서비스: [1]" #: msi.rc:167 msi.rc:170 msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "파일: [1], 디렉터리: [9], 크기: [6]" +msgstr "파일: [1], 디렉터리: [9], 크기: [6]" #: msi.rc:168 msgid "Found application: [1]" -msgstr "응용 소프트웨어 찾음: [1]" +msgstr "프로그램 발견: [1]" #: msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "파일: [1], 디렉터리: [9], 크기: [6]" +msgstr "파일: [1], 디렉터리: [9], 크기: [6]" #: msi.rc:171 msgid "Service: [2]" @@ -7234,19 +7225,19 @@ msgstr "서비스: [2]" #: msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "파일: [1], 참조 또는 의존: [2]" +msgstr "파일: [1], 참조 또는 의존: [2]" #: msi.rc:173 msgid "Application: [1]" -msgstr "응용 소프트웨어: [1]" +msgstr "프로그램: [1]" #: msi.rc:175 msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "응용 프로그램 구성 요소 : [1], 어셈블리 이름 : [2]" +msgstr "프로그램 구성요소: [1], 어셈블리 이름 : [2]" #: msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "파일: [1], 디렉터리: [2], 크기: [3]" +msgstr "파일: [1], 디렉터리: [2], 크기: [3]" #: msi.rc:178 msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" @@ -7294,11 +7285,11 @@ msgstr "이름: [1], 값: [2], 작동 [3]" #: msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "응용프로그램: [1], 명령줄: [2]" +msgstr "프로그램: [1], 명령줄: [2]" #: msi.rc:192 msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "파일: [1], 부분: [2], 키: [3], 값: [4]" +msgstr "파일: [1], 부분: [2], 키: [3], 값: [4]" #: msi.rc:193 msgid "Key: [1], Name: [2]" @@ -7360,7 +7351,7 @@ msgstr "=== 기록 시작: [Date] [Time] ===" #: msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "동작 시작 [Time]: [1]" +msgstr "동작 시작 [Time]: [1]." #: msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." @@ -7416,7 +7407,7 @@ msgstr "모든 키 프레임(&K)" #: msvfw32.rc:53 msgid "&Data Rate" -msgstr "데이타 전송율(&D)" +msgstr "데이터 전송율(&D)" #: msvfw32.rc:55 msgid "kB/s" @@ -7432,7 +7423,7 @@ msgstr "Wine 비디오 1 비디오 코덱" #: oleacc.rc:31 msgid "unknown object" -msgstr " 없는 객체" +msgstr "알 수 없는 객체" #: oleacc.rc:32 msgid "title bar" @@ -7480,7 +7471,7 @@ msgstr "팝업 메뉴" #: oleacc.rc:43 msgid "menu item" -msgstr "메뉴 아이템" +msgstr "메뉴 항목" #: oleacc.rc:44 msgid "tool tip" @@ -7568,7 +7559,7 @@ msgstr "목록" #: oleacc.rc:65 msgid "list item" -msgstr "목록 아이템" +msgstr "목록 항목" #: oleacc.rc:66 msgid "outline" @@ -7576,7 +7567,7 @@ msgstr "외곽선" #: oleacc.rc:67 msgid "outline item" -msgstr "외곽선 아이템" +msgstr "외곽선 항목" #: oleacc.rc:68 msgid "page tab" @@ -7632,7 +7623,7 @@ msgstr "다이얼" #: oleacc.rc:81 msgid "hot key field" -msgstr "단축키 모음" +msgstr "바로 가기 모음" #: oleacc.rc:82 msgid "slider" @@ -7900,7 +7891,7 @@ msgstr "아이콘으로 보기" #: oledlg.rc:75 setupapi.rc:61 msgid "Browse..." -msgstr "찾기..." +msgstr "찾아보기..." #: oledlg.rc:76 msgid "File:" @@ -7937,31 +7928,30 @@ msgstr "아이콘 바꾸기(&I)..." #: oledlg.rc:28 msgid "Insert a new %s object into your document" -msgstr "새 %s 객체를 문서에 삽입" +msgstr "새 %s 객체를 문서에 삽입" #: oledlg.rc:29 msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"당신이 그것을 만든 프로그램을 사용하여 활성화할 수 있도록문서에 개체로 파일" -"의 내용을 넣습니다." +"파일 내용을 문서에 객체로 삽입합니다. 파일을 만든 프로그램을 사용하여 활성화" +"합니다." #: oledlg.rc:30 shell32.rc:197 msgid "Browse" -msgstr "찾기" +msgstr "찾아보기" #: oledlg.rc:31 msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." msgstr "" -"이 파일은 올바른 OLE모듈이 아닌것으로 보입니다. OLE컨트롤을 등록할 수 없습니" -"다." +"파일이 유효한 OLE 모듈로 보이지 않습니다. OLE 컨트롤을 등록할 수 없습니다." #: oledlg.rc:32 msgid "Add Control" -msgstr "컨트롤 더하기" +msgstr "컨트롤 추가" #: oledlg.rc:35 msgid "&Convert..." @@ -7981,23 +7971,22 @@ msgstr "객체(&O)" #: oledlg.rc:41 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "당신의 문서 %s에 클립보드의 내용 삽입하기." +msgstr "클립보드의 내용을 %s(으)로 문서에 삽입합니다." #: oledlg.rc:42 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." msgstr "" -"당신의 문서에 클립보드의 내용들을 첨부하면 %s을(를) 사용해서 이것을 실행할 " -"수 있습니다." +"클립보드의 내용을 문서에 삽입합니다. %s을(를) 사용하여 활성화할 수 있습니다." #: oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"당신의 문서에 클립보드의 내용들을 첨부하면 %s을(를) 사용해서 이것을 활성화" -"할 수 있습니다. 이것은 아이콘으로 나타내질 겁니다." +"클립보드의 내용을 문서에 삽입합니다. %s을(를) 사용하여 활성화할 수 있습니다. " +"아이콘으로 표시됩니다." #: oledlg.rc:44 msgid "" @@ -8005,8 +7994,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"당신의 문서 %s에 클립보드의 내용을 삽입합니다. 이 데이터는 원본 파일에 연결되" -"어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다." +"클립보드의 내용을 %s(으)로 문서에 삽입합니다. 데이터가 원본 파일에 연결되어 " +"있어서 파일을 바꾸면 문서에도 반영됩니다." #: oledlg.rc:45 msgid "" @@ -8014,8 +8003,8 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"당신의 문서에 클립보드에 있는 그림을 집어넣습니다. 이 그림은 원본 파일에 연결" -"되어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다." +"클립보드 내용에서 그림을 문서에 삽입합니다. 그림은 원본 파일에 연결되어 있어" +"서 파일을 바꾸면 문서에도 반영됩니다." #: oledlg.rc:46 msgid "" @@ -8023,32 +8012,32 @@ msgid "" "The shortcut is linked to the source file so that changes to the file will " "be reflected in your document." msgstr "" -"당신의 문서에 클립보드에 있는 단축아이콘을 집어넣습니다. 이 단축아이콘은 원" -"본 파일에 연결되어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다." +"클립보드 내용 위치를 가리키는 링크를 삽입합니다. 링크는 원본 파일에 연결되어 " +"있어서 파일을 바꾸면 문서에도 반영됩니다." #: oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." -msgstr "당신의 문서에 클립보드의 내용 삽입하기." +msgstr "클립보드의 내용을 문서에 삽입합니다." #: oledlg.rc:48 regedit.rc:430 msgid "Unknown Type" -msgstr " 없는 형식" +msgstr "알 수 없는 형식" #: oledlg.rc:49 msgid "Unknown Source" -msgstr " 없는 원본" +msgstr "알 수 없는 원본" #: oledlg.rc:50 msgid "the program which created it" -msgstr "내가 만든 프로그램" +msgstr "객체를 만든 프로그램" #: sane.rc:41 msgid "Scanning" -msgstr "스캐닝중" +msgstr "스캔 중" #: sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "스캐닝중... 기다리십시오" +msgstr "스캔 중... 기다려 주십시오" #: sane.rc:31 msgctxt "unit: pixels" @@ -8093,7 +8082,7 @@ msgstr "흐름 제어" #: serialui.rc:37 msgid "Data Bits" -msgstr "데이타 비트" +msgstr "데이터 비트" #: serialui.rc:39 msgid "Stop Bits" @@ -8116,7 +8105,8 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"제작사의 설치 디스크를 삽입하고, 아래의 선택된 드라이브가 올바른지 확인하시오" +"제작사의 설치 디스크를 삽입하고,\n" +"아래의 선택된 드라이브가 올바른지 확인하시오" #: setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -8156,11 +8146,11 @@ msgstr "배경으로 복사(&C)" #: shdoclc.rc:47 msgid "Set as &Desktop Item" -msgstr "데스크탑 아이템으로 설정(&D)" +msgstr "바탕 화면 항목으로 설정(&D)" #: shdoclc.rc:52 msgid "Create Shor&tcut" -msgstr "바로가기 만들기(&T)" +msgstr "바로 가기 만들기(&T)" #: shdoclc.rc:53 shdoclc.rc:84 shdoclc.rc:137 shdoclc.rc:164 shdoclc.rc:188 msgid "Add to &Favorites..." @@ -8200,7 +8190,7 @@ msgstr "다른 이름으로 그림 저장(&S)..." #: shdoclc.rc:73 msgid "&E-mail Picture..." -msgstr "그림을 이메일로(&E)..." +msgstr "그림을 전자메일로(&E)..." #: shdoclc.rc:74 msgid "Pr&int Picture..." @@ -8216,7 +8206,7 @@ msgstr "배경으로 설정(&G)" #: shdoclc.rc:77 shdoclc.rc:157 shdoclc.rc:181 msgid "Set as &Desktop Item..." -msgstr "데스크탑 아이템으로 설정(&D)..." +msgstr "바탕 화면 항목으로 설정(&D)..." #: shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 msgid "Copy Shor&tcut" @@ -8232,7 +8222,7 @@ msgstr "되돌리기(&U)" #: shdoclc.rc:96 shell32.rc:105 user32.rc:63 msgid "&Delete" -msgstr "삭제(&D)" +msgstr "제거(&D)" #: shdoclc.rc:103 shell32.rc:97 msgid "&Select" @@ -8296,11 +8286,11 @@ msgstr "추적 정보 덤프" #: shdoclc.rc:202 msgid "Debug Break" -msgstr "디버그 브레이크" +msgstr "디버깅 중지" #: shdoclc.rc:203 msgid "Debug View" -msgstr "디버그 보기" +msgstr "디버깅 정보 보기" #: shdoclc.rc:204 msgid "Dump Tree" @@ -8476,7 +8466,7 @@ msgstr "복원(&R)" #: shell32.rc:86 msgid "&Erase" -msgstr "삭제(&E)" +msgstr "제거(&E)" #: shell32.rc:98 msgid "E&xplore" @@ -8529,7 +8519,7 @@ msgstr "%s 정보" #: shell32.rc:323 msgid "Wine &license" -msgstr "Wine 라이센스(&L)" +msgstr "Wine 라이선스(&L)" #: shell32.rc:328 msgid "Running on %s" @@ -8557,7 +8547,7 @@ msgstr "열기(&O):" #: shell32.rc:343 progman.rc:182 progman.rc:201 progman.rc:218 winecfg.rc:243 #: winefile.rc:130 msgid "&Browse..." -msgstr "찾기(&B)..." +msgstr "찾아보기(&B)..." #: shell32.rc:355 shell32.rc:384 msgid "File type:" @@ -8646,7 +8636,7 @@ msgstr "지워진 날짜" #: shell32.rc:156 winecfg.rc:101 winefile.rc:100 msgctxt "display name" msgid "Desktop" -msgstr "바탕화면" +msgstr "바탕 화면" #: shell32.rc:157 regedit.rc:238 msgid "My Computer" @@ -8666,19 +8656,19 @@ msgstr "다시 시작" #: shell32.rc:190 msgid "Do you want to simulate a Windows reboot?" -msgstr "당신은 윈도우즈 재부팅을 재현하겠습니까?" +msgstr "Windows 재부팅을 시뮬레이션하시겠습니까?" #: shell32.rc:191 msgid "Shutdown" -msgstr "끄기" +msgstr "종료" #: shell32.rc:192 msgid "Do you want to shutdown your Wine session?" -msgstr "당신은 Wine 세션을 끄겠습니까?" +msgstr "Wine 세션을 종료하시겠습니까?" #: shell32.rc:203 progman.rc:83 msgid "Programs" -msgstr "응용프로그램" +msgstr "프로그램" #: shell32.rc:204 msgid "My Documents" @@ -8707,7 +8697,7 @@ msgstr "내 비디오" #: shell32.rc:210 msgctxt "directory" msgid "Desktop" -msgstr "바탕화면" +msgstr "Desktop" #: shell32.rc:211 msgid "NetHood" @@ -8811,7 +8801,7 @@ msgstr "저장된 게임" #: shell32.rc:233 msgid "Searches" -msgstr "찾기" +msgstr "검색" #: shell32.rc:234 msgid "Users" @@ -8831,19 +8821,19 @@ msgstr "새 폴더를 만드는 과정에서 오류발생" #: shell32.rc:171 msgid "Confirm file deletion" -msgstr "파일 삭제 확인" +msgstr "파일 제거 확인" #: shell32.rc:172 msgid "Confirm folder deletion" -msgstr "폴더 삭제 확인" +msgstr "폴더 제거 확인" #: shell32.rc:173 msgid "Are you sure you want to delete '%1'?" -msgstr "'%1'을(를) 삭제하시겠습니까?" +msgstr "'%1'을(를) 제거하시겠습니까?" #: shell32.rc:174 msgid "Are you sure you want to delete these %1 items?" -msgstr "%1 아이템을 삭제하시겠습니까?" +msgstr "%1 항목을 제거하시겠습니까?" #: shell32.rc:181 msgid "Confirm file overwrite" @@ -8855,13 +8845,13 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"이 폴더는 이미 '%1' 파일을 가지고 있습니다.\n" +"이 폴더에 이미 '%1' 파일이 들어 있습니다.\n" "\n" -"바꾸시겠습니까?" +"파일을 교체하시겠습니까?" #: shell32.rc:175 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "선택한 아이템을 지우시겠습니까?" +msgstr "선택한 항목을 지우시겠습니까?" #: shell32.rc:177 msgid "" @@ -8874,11 +8864,11 @@ msgstr "'%1'을(를) 휴지통으로 보내시겠습니까?" #: shell32.rc:178 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "'%1' 아이템을 휴지통으로 보내시겠습니까?" +msgstr "'%1' 항목을 휴지통으로 보내시겠습니까?" #: shell32.rc:179 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "아이템'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신에 지우시겠습니까?" +msgstr "항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신에 지우시겠습니까?" #: shell32.rc:186 msgid "" @@ -8888,11 +8878,10 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"이 폴더는 이미 '%1'이란 이름을 가진 폴더를 포함하고 있습니다.\n" +"이 폴더에는 이미 '%1'(이)라는 이름의 폴더가 있습니다.\n" "\n" -"만약 당신이 같은 이름으로 대상 폴더를 지정한다면 선택된 폴더는 대체될 것입니" -"다.\n" -"당신은 이 폴더를 이동시키거나 복사하겠습니까?" +"대상 폴더의 파일이 선택한 폴더의 파일과 같을 경우 교체합니다.\n" +"폴더를 이동 또는 복사하시겠습니까?" #: shell32.rc:240 msgid "Wine Control Panel" @@ -8904,7 +8893,7 @@ msgstr "실행 대화 상자를 표시할 수 없습니다 (내부 오류)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" -msgstr "찾기 대화 상자를 표시할 수 없습니다 (내부 오류)" +msgstr "찾아보기 대화 상자를 표시할 수 없습니다 (내부 오류)" #: shell32.rc:198 msgid "Executable files (*.exe)" @@ -8912,19 +8901,19 @@ msgstr "실행 파일 (*.exe)" #: shell32.rc:244 msgid "There is no Windows program configured to open this type of file." -msgstr "이 형식의 파일을 도록 구성된 윈도우 프로그램이 없습니다." +msgstr "이 형식의 파일을 도록 구성된 Windows 프로그램이 없습니다." #: shell32.rc:246 msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "'%1'을(를) 완전히 삭제하시겠습니까?" +msgstr "'%1'을(를) 완전히 제거하시겠습니까?" #: shell32.rc:247 msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "%1 아이템을 완전히 삭제하시겠습니까?" +msgstr "%1 항목을 완전히 제거하시겠습니까?" #: shell32.rc:248 msgid "Confirm deletion" -msgstr "삭제 확인" +msgstr "제거 확인" #: shell32.rc:249 msgid "" @@ -8934,7 +8923,7 @@ msgid "" msgstr "" "경로 %1에 파일이 이미 존재합니다.\n" "\n" -"바꾸시겠습니까?" +"파일을 교체하시겠습니까?" #: shell32.rc:250 msgid "" @@ -8944,13 +8933,13 @@ msgid "" msgstr "" "경로 %1에 폴더가 이미 존재합니다.\n" "\n" -"바꾸시겠습니까?" +"폴더를 교체하시겠습니까?" #: shell32.rc:251 msgid "Confirm overwrite" msgstr "덮어쓰기 확인" -# 라이센스 문구는 번역하지 않습니다. +# 라이선스 문구는 번역하지 않습니다. #: shell32.rc:268 msgid "" "Wine is free software; you can redistribute it and/or modify it under the " @@ -8983,7 +8972,7 @@ msgstr "" #: shell32.rc:256 msgid "Wine License" -msgstr "Wine 라이센스" +msgstr "Wine 라이선스" #: shell32.rc:158 msgid "Trash" @@ -9037,8 +9026,8 @@ msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"설치했을 때, ActiveX 구성요소는 당신의 컴퓨터에 대한 완전한 접근권한을 가집니" -"다. 위 소스를 완전히 신뢰하지 않는다면 [설치]를 클릭하지 마십시오." +"설치할 때, ActiveX 구성 요소는 컴퓨터에 대한 완전한 액세스 권한을 가집니다. " +"위의 소스에 대한 절대적인 신뢰가 없는 경우 [설치]를 클릭하지 마십시오." #: urlmon.rc:51 msgid "Installation of component failed: %08x" @@ -9115,23 +9104,23 @@ msgstr "더 많은 창(&M)..." #: winemac.rc:33 msgid "Hide %@" -msgstr "숨기 %@" +msgstr "%@ 숨기기" #: winemac.rc:35 msgid "Hide Others" -msgstr "다른 것 숨김" +msgstr "다른 것 숨기기" #: winemac.rc:36 msgid "Show All" -msgstr "모두 표시" +msgstr "모두 보이기" #: winemac.rc:37 msgid "Quit %@" -msgstr "끝내기 %@" +msgstr "%@ 끝내기" #: winemac.rc:38 msgid "Quit" -msgstr "나가기" +msgstr "끝내기" #: winemac.rc:40 msgid "Window" @@ -9191,8 +9180,7 @@ msgstr "랜 연결" #: wininet.rc:29 msgid "The certificate is issued by an unknown or untrusted publisher." -msgstr "" -"인증서가 알려지지 않았거나 신뢰할 수 없는 게시자에 의해 발행되었습니다." +msgstr "알려지지 않았거나 신뢰할 수 없는 게시자가 발행한 인증서입니다." #: wininet.rc:30 msgid "The date on the certificate is invalid." @@ -9291,7 +9279,7 @@ msgstr "지정된 장치 핸들은 적합하지 않습니다." #: winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "당신의 시스템에는 어떤 드라이버도 설치되어 있지 않습니다!" +msgstr "시스템에 드라이버가 설치되어 있지 않습니다!" #: winmm.rc:39 winmm.rc:65 msgid "" @@ -9306,8 +9294,8 @@ msgid "" "This function is not supported. Use the Capabilities function to determine " "which functions and messages the driver supports." msgstr "" -"이 기능은 지원되지 않습니다. 드라이버가 지원하는 메시지와 함수들을 결정할 수 " -"있는 함수를 사용하십시오." +"이 함수는 지원되지 않습니다. 기능(Capability) 함수를 사용하여 드라이버가 지원" +"하는 함수와 메시지를 결정합니다." #: winmm.rc:41 msgid "An error number was specified that is not defined in the system." @@ -9334,16 +9322,16 @@ msgid "" "Cannot perform this operation while media data is still playing. Reset the " "device, or wait until the data is finished playing." msgstr "" -"미디어 데이타가 재생되는 동안 이 작업을 실행할 수 없습니다. 장치를 리셋하거" -"나, 데이타 재생이 끝날때까지 기다리십시오." +"미디어 데이터가 재생되는 동안 이 작업을 실행할 수 없습니다. 장치를 리셋하거" +"나, 데이터 재생이 끝날때까지 기다리십시오." #: winmm.rc:48 msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"웨이브 헤더는 준비되지 않았습니다. 헤더를 준비하기 위해 준비된 함수를 사용하" -"십시오, 그리고 다시 시도하십시오." +"웨이브 헤더가 준비되어 있지 않습니다. 준비 함수를 사용하여 헤더를 준비한 후" +"에 다시 시도하십시오." #: winmm.rc:49 msgid "" @@ -9358,8 +9346,8 @@ msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"MIDI 헤더는 준비되지 않았습니다. 헤더를 준비시키기 위해 준비 함수를 사용하십" -"시오, 그리고 다시 시도하십시오n." +"MIDI 헤더는 준비되지 않았습니다. 헤더를 준비하려면 준비 함수를 사용하십시오, " +"그리고 다시 시도하십시오n." #: winmm.rc:54 msgid "" @@ -9374,7 +9362,7 @@ msgid "" "The port is transmitting data to the device. Wait until the data has been " "transmitted, and then try again." msgstr "" -"이 포트는 장치로 데이타를 옮기는 중입니다. 데이타가 다 옮겨질 때까지 기다리십" +"이 포트는 장치로 데이터를 옮기는 중입니다. 데이터가 다 옮겨질 때까지 기다리십" "시오,그리고 다시 시도하십시오." #: winmm.rc:56 winmm.rc:129 @@ -9388,8 +9376,8 @@ msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"현재 MIDI 설정은 손상되었습니다. 본래 MIDIMAP.CFG 파일을 윈도우즈 SYSTEM 디" -"렉토리에 복사하고, 다시 시도하십시오." +"현재 MIDI 설정은 손상되었습니다. 본래 MIDIMAP.CFG 파일을 Windows SYSTEM 디" +"렉터리에 복사하고, 다시 시도하십시오." #: winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." @@ -9408,25 +9396,25 @@ msgid "" "There is a problem with your media device. Make sure it is working correctly " "or contact the device manufacturer." msgstr "" -"이것은 당신의 미디어 장치 문제입니다. 반드시 올바르게 작동한다고 확신한다면 " -"장치 제조자에게 연락하십시오." +"미디어 장치에 문제가 있습니다. 제대로 작동하는지 확인하거나 장치 제조업체에 " +"문의하십시오." #: winmm.rc:64 msgid "The specified device is not open or is not recognized by MCI." -msgstr "지정된 장치는 열 수 없거나 MCI에서 인식할 수 없습니다." +msgstr "지정한 장치가 열려 있지 않거나 MCI에서 인식되지 않습니다." #: winmm.rc:66 msgid "" "The device name is already being used as an alias by this application. Use a " "unique alias." msgstr "" -"이 장치 이름은 이미 다른 프로그램에서 별명으로 사용중입니다. 유일한 별명을 사" +"이 프로그램에서 장치 이름을 이미 별칭으로 사용하고 있습니다. 고유한 별칭을 사" "용하십시오." #: winmm.rc:67 msgid "" "There is an undetectable problem in loading the specified device driver." -msgstr "이 지정된 장치 드라이버를 불러오는 중에 감지되지 않은 오류가 있습니다." +msgstr "지정한 장치 드라이버를 로드하는 데 탐지할 수 없는 문제가 있습니다." #: winmm.rc:68 msgid "No command was specified." @@ -9471,13 +9459,13 @@ msgstr "지정된 명령은 매개변수를 요구합니다. 매개변수를 추 #: winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "당신이 사용한 MCI 장치는 지정된 명령을 지원하지 않습니다." +msgstr "사용 중인 MCI 장치가 지정된 명령을 지원하지 않습니다." #: winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." msgstr "" -"지정된 파일을 찾을 수 없습니다.경로와 파일이름이 올바른지 확인하십시오." +"지정된 파일을 찾을 수 없습니다.경로와 파일 이름이 올바른지 확인하십시오." #: winmm.rc:77 msgid "The device driver is not ready." @@ -9485,7 +9473,8 @@ msgstr "장치 드라이버는 준비되지 않았습니다." #: winmm.rc:78 msgid "A problem occurred in initializing MCI. Try restarting Windows." -msgstr "MCI 초기화시 문제가 발생했습니다. 윈도우를 재시작하고 시도해보세요." +msgstr "" +"MCI 초기화시 문제가 발생했습니다. Windows를 다시 시작하고 시도해보세요." #: winmm.rc:79 msgid "" @@ -9546,7 +9535,7 @@ msgid "" "The specified alias is already being used in this application. Use a unique " "alias." msgstr "" -"지정된 별명은 이미 프로그램에 의해 사용중입니다. 중복되지 않는 별명을 사용하" +"지정된 별칭은 이미 이 프로그램이 사용하고 있습니다. 다른 유일한 별칭을 사용하" "십시오." #: winmm.rc:89 @@ -9613,14 +9602,14 @@ msgstr "'notify' 플래그는 자동으로 열린 장치에 사용할 수 없습 #: winmm.rc:100 msgid "Cannot use a filename with the specified device." -msgstr "지정된 장치하고 파일이름은 같이 사용할 수 없습니다." +msgstr "지정된 장치하고 파일 이름은 같이 사용할 수 없습니다." #: winmm.rc:101 msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"명령을 지정된 순서대로 보낼 수 없습니다. 명령 순서를 고치고 다시 시도하십시" +"명령을 지정된 순서대로 보낼 수 없습니다. 명령 순서를 수정하여 다시 시도하십시" "오." #: winmm.rc:102 @@ -9636,7 +9625,7 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"이 파일이름은 올바르지 않습니다. 파일이름이 점과 확장자를 더해서 8자보다 길" +"이 파일 이름은 올바르지 않습니다. 파일 이름이 점과 확장자를 더해서 8자보다 길" "지 않은지 확인하십시오." #: winmm.rc:104 @@ -9658,7 +9647,7 @@ msgid "" "restarting your computer." msgstr "" "지정된 파일이나 MCI 장치에 접근할 수 없습니다. 디렉터리를 바꾸거나 컴퓨터를 " -"재시작하십시오." +"다시 시작하십시오." #: winmm.rc:107 msgid "" @@ -9741,7 +9730,7 @@ msgstr "" msgid "" "The device you are trying to play to cannot recognize the current file " "format." -msgstr "당신이 재생하려는 장치는 현재 파일 형식을 인식할 수 없습니다." +msgstr "재생하려는 장치는 현재 파일 형식을 인식할 수 없습니다." #: winmm.rc:120 msgid "" @@ -9755,15 +9744,15 @@ msgstr "" msgid "" "The device you are trying to record from cannot recognize the current file " "format." -msgstr "당신이 녹음하려는 장치는 현재 파일 형식을 인식할 수 없습니다." +msgstr "녹음하려는 장치는 현재 파일 형식을 인식할 수 없습니다." #: winmm.rc:126 msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"\"song pointer\"와 SMPTE의 시간 형식이 서로 배타적입니다. 함께 사용할 수 없습" -"니다." +"\"sont pointer\"와 SMPTE의 시간 형식은 상호 배타적입니다. 함께 쓸 수 없습니" +"다." #: winmm.rc:128 msgid "" @@ -9790,8 +9779,8 @@ msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications; then, try again." msgstr "" -"모든 멀티미디어 타이머는 다른 프로그램에 의해 사용중입니다. 최소한 하나의 풀" -"그림을 끝내고 다시 시도하십시오." +"모든 멀티미디어 타이머를 다른 프로그램이 사용하고 있습니다. 최소한 하나의 프" +"로그램을 끝내고 다시 시도하십시오." #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -9802,8 +9791,8 @@ msgid "" "The system has no installed MIDI devices. Use the Drivers option from the " "Control Panel to install a MIDI driver." msgstr "" -"이 시스템에는 설치된 MIDI 장치가 없습니다. 제어판의 장치 옵션에서MIDI 드라이" -"버를 설치하십시오." +"시스템에 설치된 MIDI 장치가 없습니다. 제어판의 드라이버 옵션을 사용하여 MIDI " +"드라이버를 설치하십시오." #: winmm.rc:122 msgid "There is no display window." @@ -9818,20 +9807,20 @@ msgid "" "Cannot read the specified file. Make sure the file is still present, or " "check your disk or network connection." msgstr "" -"지정된 파일을 읽을 수 없습니다. 파일이 존재하는지 확인하거나,당신의 디스크나 " -"네트워트 연결를 체크해보십시오." +"지정한 파일을 읽을 수 없습니다. 파일이 아직 있는지 확인하거나 디스크 또는 네" +"트워크 연결을 확인하십시오." #: winmm.rc:125 msgid "" "Cannot write to the specified file. Make sure you have enough disk space or " "are still connected to the network." msgstr "" -"지정된 파일에 기록할 수 없습니다. 디스크 공간이 충분한지 확인하거나. 네트워크" -"에 연결중인지 확인하십시오." +"지정된 파일에 쓸 수 없습니다. 디스크 공간이 충분한지 확인하거나 네트워크에 연" +"결되어 있는지 확인하십시오." #: winmm.rc:136 msgid "Wine Sound Mapper" -msgstr "와인 음향 맵퍼" +msgstr "Wine 사운드 매퍼" #: winmm.rc:137 msgid "Volume" @@ -10055,7 +10044,7 @@ msgstr "시간 초과" #: wldap32.rc:118 msgid "Auth Unknown" -msgstr " 없는 인증" +msgstr "알 수 없는 인증" #: wldap32.rc:119 msgid "Filter Error" @@ -10087,7 +10076,7 @@ msgstr "지정된 제어는 메시지에서 발견할 수 없습니다" #: wldap32.rc:126 msgid "No result present in message" -msgstr "어떤 결과도 메시지에 존재하지 않습니다" +msgstr "메시지에 결과가 없습니다" #: wldap32.rc:127 msgid "More results returned" @@ -10137,18 +10126,18 @@ msgstr "" "ATTRIB - 파일 속성을 바꾸거나 표시합니다.\n" "\n" "문법:\n" -"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [드라이브:][경로][파일이름]\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [drive:][path][filename]\n" " [/S [/D]]\n" "\n" -"Where:\n" +"옵션:\n" "\n" " + 속성을 설정합니다.\n" -" - 속성을 삭제합니다.\n" +" - 속성을 제거합니다.\n" " R 읽기 전용 속성를 설정합니다.\n" " A 압축 파일 속성을 설정합니다.\n" " S 시스템 파일 속성을 설정합니다.\n" " H 숨은 파일 속성을 설정합니다.\n" -" [드라이브:][경로][파일이름]\n" +" [drive:][path][filename]\n" " 속성 작업을 할 하나 또는 복수의 파일을 지정합니다.\n" " /S 현재 폴더와 모든 하위 폴더에서 일치하는 파일을 처리합니다.\n" " /D 폴더를 함께 처리합니다.\n" @@ -10167,7 +10156,7 @@ msgstr "글꼴(&F)..." #: clock.rc:37 msgid "&Without Titlebar" -msgstr "제목 표시 안함 (&W)" +msgstr "제목 표시줄 숨기기(&W)" #: clock.rc:39 msgid "&Seconds" @@ -10179,7 +10168,7 @@ msgstr "날짜(&D)" #: clock.rc:42 taskmgr.rc:43 taskmgr.rc:141 msgid "&Always on Top" -msgstr "항상 앞에 (&A)" +msgstr "항상 위(&A)" #: clock.rc:45 msgid "&About Clock" @@ -10199,21 +10188,21 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"<배치파일 이름>을 호출(CALL)하는 것은 실행한 배치 파일에서 다른 배치 파일" -"의\n" -"명령을 사용하는 것입니다. 배치 파일이 종료되면 , 제어권은 호출된 배치 파일" -"을 호출한\n" -"파일한테 돌아갑니다. CALL 명령은 호출하는 과정에서 매개변수를 가집니다.\n" +"<배치파일 이름>을 호출하는 것은 배치 파일 안에서 다른 배치 파일의\n" +"명령을 실행하는 것입니다. 배치 파일이 끝나면, 제어권은 배치 파일을\n" +"호출한 배치 파일로 돌아갑니다. CALL 명령은 매개변수를 지원합니다.\n" +"\n" +"\n" +"기본 디렉터리, 환경 변수 등을 바꾸는 것은 호출자에게 상속됩니다.\n" "\n" -"기본 디렉터리나 환경변수 등을 바꾸는 것은 호출자에 의해 상속되어서 호출된\n" -"과정에만 적용됩니다.\n" #: cmd.rc:44 msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <디렉터리> 는 CHDIR의 단축 버전입니다. 현재 작업 디렉터리를 바꿉니다.\n" +"CD <디렉터리> 는 CHDIR의 단축 버전입니다.\n" +"현재 작업 디렉터리를 바꿉니다.\n" #: cmd.rc:47 msgid "CHDIR <directory> changes the current default directory.\n" @@ -10225,7 +10214,7 @@ msgstr "CLS는 콘솔 화면을 깨끗하게 합니다.\n" #: cmd.rc:53 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <파일이름> 은 파일을 복사합니다.\n" +msgstr "COPY <파일 이름> 은 파일을 복사합니다.\n" #: cmd.rc:56 msgid "CTTY changes the input/output device.\n" @@ -10237,7 +10226,7 @@ msgstr "DATE는 시스템 날짜를 보여주거나 바꿉니다.\n" #: cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <파일이름>은 하나의 파일이나 여러 파일을 지웁니다.\n" +msgstr "DEL <파일 이름>은 하나의 파일이나 여러 파일을 지웁니다.\n" #: cmd.rc:65 msgid "DIR lists the contents of a directory.\n" @@ -10256,15 +10245,16 @@ msgid "" msgstr "" "ECHO <문자열>은 <문자열>을 현재 터미널 장치에 표시합니다.\n" "\n" -"ECHO ON는 배치파일 안의 모든 이후 명령어를 터미널 장치에 실행하기 전에 표시합" -"니다.\n" +"ECHO ON는 배치파일 안의 모든 이후 명령어를 터미널 장치에 실행하기 전에\n" +"표시합니다.\n" "\n" -"ECHO OFF는 ECHO ON과 반대 효과가 있습니다(ECHO OFF가 기본값).\n" -"ECHO OFF 명령은 @ 부호처럼 처리 중 명령어가 표시되는 것을 막습니다.\n" +"ECHO OFF는 ECHO ON과 반대 효과가 있습니다(기본값은 ECHO OFF입니다).\n" +"ECHO OFF 명령은 @ 부호처럼 처리 중 명령어가 표시되는 것을 막습니다\n" +"(@ 부호가 첫번째 문자인 라인은 ECHO OFF인 효과가 있습니다).\n" #: cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <파일이름>은 하나의 파일이냐 여러 파일을 지웁니다.\n" +msgstr "ERASE <파일 이름>은 하나의 파일이냐 여러 파일을 지웁니다.\n" #: cmd.rc:85 msgid "" @@ -10295,13 +10285,11 @@ msgid "" msgstr "" "GOTO는 배치 파일 안에서 다른 구문으로 실행을 전환합니다.\n" "\n" -"GOTO의 타겟인 레이블은 255자까지 가능합니다만, 공백은 포함하지 않을 수도 있습" -"니다\n" -"(운영체제에 따라서 다를 수도 있습니다). 만약 배치 파일 안에 2개나 그 이상의 " -"동일한\n" -"레이블이 존재할 경우 첫번째 것이 실행됩니다. 존재하지 않는 레이블로 GOTO를 시" -"도한다면\n" -"배치파일 실행은 중단됩니다.\n" +"GOTO의 타겟인 레이블은 255자까지 가능합니다만, 공백은 포함하지 않을 수도\n" +"있습니다(운영체제에 따라서 다를 수도 있습니다).\n" +"만약 배치 파일 안에 2개나 그 이상의 동일한 레이블이 존재할 경우 첫번째\n" +"것이 실행됩니다. 파일에 없는 레이블로 GOTO를 시도한다면 배치파일 실행은\n" +"중단됩니다.\n" "\n" "GOTO는 대화식으로 사용할 경우 어떤 효과도 없습니다.\n" @@ -10326,7 +10314,7 @@ msgid "" msgstr "" "IF는 명령을 선택적으로 실행 할 때 사용한다.\n" "\n" -"문법: IF [NOT] EXIST 파일이름 명령\n" +"문법: IF [NOT] EXIST 파일 이름 명령\n" " IF [NOT] string1==string2 명령\n" " IF [NOT] ERRORLEVEL 숫자 명령\n" "\n" @@ -10341,11 +10329,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL은 디스크 볼륨 레이블을 설정할 때 사용.\n" +"LABEL은 디스크 볼륨 레이블을 설정하는 데 사용됩니다.\n" "\n" -"Syntax: LABEL [드라이브:]\n" -"이 명령은 당신이 주어진 드라이브에 새 볼륨 레이블울 넣을수 있도록 할것이다.\n" -"VOL 명령으로 디스크 볼륨 레이블을 볼 수 있다.\n" +"구문: LABEL [드라이브:]\n" +"지정한 드라이브에 대한 새 볼륨 레이블을 입력하라는 메시지가 나타납니다.\n" +"VOL 명령어로 디스크 볼륨 레이블을 표시할 수 있습니다.\n" #: cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -10367,8 +10355,8 @@ msgid "" msgstr "" "MOVE는 파일이나 디렉터리를 파일시스템 안에 있는 새로운 곳으로 재배치합니다.\n" "\n" -"만약 옮겨지는 아이템이 하나의 디렉터리라면 디렉터리 아래 모든 파일과\n" -"서브디렉터리도 이동될 것입니다.\n" +"만약 옮겨지는 항목이 하나의 디렉터리라면 디렉터리 아래 모든 파일과\n" +"서브디렉터리도 이동합니다.\n" "\n" "MOVE는 원본과 대상의 위치가 다른 DOS 드라이브 문자를 가지고 있다면 실패합니" "다.\n" @@ -10387,11 +10375,12 @@ msgid "" msgstr "" "PATH는 실행 파일의 검색 경로를 보여주거나 바꿉니다.\n" "\n" -"PATH 입력은 현재 PATH 설정을 보여줄 것입니다 (기본적으로 레지스트리로부터\n" -"가져옴). 설정을 바꾸기 위해서는 PATH 이후에 새로운 값을 지정합니다.\n" -"\n" -"PATH 환경변수를 사용해서 PATH를 수정하는 것도 가능합니다. 예를 들어\n" +"PATH 입력은 현재 PATH 설정을 보여줍니다\n" +"(기본적으로 레지스트리로부터 가져옴).\n" +"설정을 바꾸려면 PATH 이후에 새로운 값을 지정합니다.\n" "\n" +"PATH 환경변수를 사용해서 PATH를 수정하는 것도 가능합니다.\n" +"예를 들어:\n" "PATH %PATH%;c:\\temp\n" #: cmd.rc:148 @@ -10401,11 +10390,10 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE는 사용자에게 아무 키나 누르라는 메시지를 화면에 표시합니다.\n" +"PAUSE는 아무 키나 누르라는 메시지를 화면에 표시합니다.\n" "\n" -"사용자가 이전 명령의 결과가 스크롤 되지 건에 읽을 수 있도록 하기 위해 배치파" -"일에서\n" -"주로 유용하게 사용합니다.\n" +"사용자가 이전 명령의 결과가 화면에서 사라지기 전에 읽을 수 있도록 하기\n" +"위해 배치파일에서 주로 유용하게 사용합니다.\n" #: cmd.rc:169 msgid "" @@ -10431,9 +10419,8 @@ msgid "" msgstr "" "PROMPT은 명령 라인 프로프트를 설정합니다.\n" "\n" -"PROMPT 명령어 이후의 문자열(과 바로 이후의 공백)은 cmd가 입력을 기다리고 있" -"을 때\n" -"명령 라인의 시작에 나타납니다.\n" +"PROMPT 명령어 이후의 문자열(과 바로 이후의 공백)은 cmd가 입력을 기다리고\n" +"있을 때 명령 라인의 시작에 나타납니다.\n" "\n" "아래 소개하는 문자열은 특별한 의미를 가집니다:\n" "\n" @@ -10442,13 +10429,12 @@ msgstr "" "$l < 기호 $n 현재 드라이브 $p 현재 경로\n" "$q 등호 기호 $t 현재 시간 $v cmd 버전\n" "\n" -"ROMPT 명령을 뒤따르는 문자열 없이 실행하면 프롬프트가 기본값으로 리셋됩니" -"다.\n" -"기본값은 (드라이브 문자를 포함하는) 현재 디렉터리와 이어지는 > 기호입니다\n" +"ROMPT 명령을 뒤에 문자열 없이 실행하면 프롬프트가 기본값으로 리셋됩니다.\n" +"기본값은 현재 디렉터리(드라이브 문자 포함)와 이어지는 > 기호입니다.\n" "(이것은 PROMPT $p$g 명령과 같습니다).\n" "\n" -"프롬프트는 또한 PRPOMPT 환경 변수를 써서 변경할 수 있습니다. 그래서\n" -"'SET PROMPT=test'는 'PROMPT test'와 같은 효과가 있습니다.\n" +"프롬프트는 또한 PRPOMPT 환경 변수를 써서 값을 바꿀 수 있습니다.\n" +"그래서 'SET PROMPT=test'는 'PROMPT test'와 같은 효과가 있습니다.\n" #: cmd.rc:173 msgid "" @@ -10462,20 +10448,20 @@ msgstr "" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "" -"REN <파일이름> 은 REANME의 단축 버전입니다.이것은 파일 이름을 바꿉니다.\n" +"REN <파일 이름> 은 REANME의 단축 버전입니다.이것은 파일 이름을 바꿉니다.\n" #: cmd.rc:178 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <파일이름> 은 파일의 이름을 바꿈.\n" +msgstr "RENAME <파일 이름> 은 파일의 이름을 바꿈.\n" #: cmd.rc:181 msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "" -"RD <디렉터리> 는 RMDIR의 단축 버전입니다. 이것은 디렉터리를 삭제합니다.\n" +"RD <디렉터리> 는 RMDIR의 단축 버전입니다. 이것은 디렉터리를 제거합니다.\n" #: cmd.rc:183 msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <디렉터리>는 디렉터리를 삭제합니다.\n" +msgstr "RMDIR <디렉터리>는 디렉터리를 제거합니다.\n" #: cmd.rc:229 msgid "" @@ -10499,16 +10485,17 @@ msgstr "" "\n" "매개변수가 없는 SET은 현재 환경변수를 모두 표시합니다.\n" "\n" -"환경 변수를 생성하거나 수정할 때 사용하는 문법:\n" +"환경 변수를 만들거나 수정할 때 사용하는 문법:\n" "\n" "SET <변수>=<값>\n" "\n" -"<변수> 와 <값>은 문자열입니다. 반드시 등호(=) 기호 앞에 어떤\n" +"<변수>와 <값>은 문자열입니다. 반드시 등호(=) 기호 앞에 어떤\n" "공백도 있어선 안되고, 변수 이름 내부에 공백을 가져서도 안됩니다.\n" "\n" -"Wine 아래, 다시 말해 Win32환경이 포함된 운영 체제 아래의 환경에서는\n" -"네이티브 Win32 구현보다 더 많은 값을 포함합니다. Cmd 안에서 운영체제\n" -"환경 보수에 영향을 미치는 것이 가능하지 않다는 것에 주목하십시오\n" +"Wine 아래의 Win32 환경 변수에는 기반 운영체제의 환경 변수도 들어 있기\n" +"때문에 일반적으로 네이티브 Win32 구현보다 더 많은 값이 들어 있습니다.\n" +"cmd에서 운영체제 환경 변수에 영향을 미치는 것이 가능하지 않다는 것에\n" +"주목하십시오.\n" #: cmd.rc:234 msgid "" @@ -10516,7 +10503,7 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"SHIFT는 배치 파일 안에서 매개 변수 리스트의 처음 하나를 삭제 위해서\n" +"SHIFT는 배치 파일 안에서 매개 변수 리스트의 처음 하나를 제거 위해서\n" "사용합니다. 매개변수 2가 매개변수 1이 되는 식입니다. 이것은 명령 라인에서\n" "사용했을 경우에는 아무 영향이 없습니다.\n" @@ -10552,31 +10539,30 @@ msgid "" msgstr "" "프로그램을 시작하거나, 파일 확장자와 연관된 프로그램으로 문서를 엽니다.\n" "사용법:\n" -"start [옵션] 프로그램_파일이름 [...]\n" -"start [옵션] 문서_파일이름\n" +"start [옵션] 프로그램_파일 이름 [...]\n" +"start [옵션] 문서_파일 이름\n" "\n" "옵션:\n" -"\"제목\" 자식 창의 제목 지정합니다.\n" -"/d 디렉터리 지정한 디렉터리에서 프로그램을 실행합니다.\n" -"/b 프로그램을 위해 새 콘솔을 만들지 않습니다.\n" -"/i 깨끗한 환경 변수로 프로그램을 시작합니다.\n" -"/min 프로그램을 최소화된 상태로 시작합니다.\n" -"/max 프로그램을 최대화된 상태로 시작합니다.\n" -"/low 프로그램을 낮은 우선 순위 클래스로 시작합니다.\n" -"/normal 프로그램을 보통 우선 순위 클래스로 시작합니다.\n" -"/high 프로그램을 높은 우선 순위 클래스로 시작합니다.\n" -"/realtime 프로그램을 실시간 우선 순위 클래스로 시작합니다.\n" -"/abovenormal 프로그램을 보통이상 우선 순위 클래스로 시작합니다.\n" -"/belownormal 프로그램을 보통이하 우선 순위 클래스로 시작합니다.\n" -"/node n 지정한 NUMA 노드로 프로그램을 시작합니다.\n" -"/affinity 마스크 지정한 친화도 마스크로 프로그램을 시작합니다.\n" -"/wait 시작된 프로그램이 끝나기를 기다리고,프로그램이 끝났을때 종료코" -"드\n" -" 로 끝납니다.\n" -"/unix 유닉스 파일이름을 사용하고, 윈도우즈 탐색기같이 파일을 시작합니" -"다.\n" -"/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" -"/? 도움말을 보여주고 끝냅니다.\n" +"\"제목\" 자식 창 표시줄에 나타날 제목을 지정합니다.\n" +"/d 디렉터리 지정한 디렉터리에서 프로그램을 시작합니다.\n" +"/b 새 콘솔을 만들지 않고 프로그램을 시작합니다.\n" +"/i 기본 환경 변수에서 프로그램을 시작합니다.\n" +"/min 프로그램을 최소화된 상태에서 시작합니다.\n" +"/max 프로그램을 최대화된 상태에서 시작합니다.\n" +"/low 프로그램을 LOW 우선 순위 클래스에서 시작합니다.\n" +"/normal 프로그램을 NORMAL 우선 순위 클래스에서 시작합니다.\n" +"/high 프로그램을 HIGH 우선 순위 클래스에서 시작합니다.\n" +"/realtime 프로그램을 REALTIME 우선 순위 클래스에서 시작합니다.\n" +"/abovenormal 프로그램을 ABOVENORMAL 우선 순위 클래스에서 시작합니다.\n" +"/belownormal 프로그램을 BELOWNORMAL 우선 순위 클래스에서 시작합니다.\n" +"/node n 지정한 NUMA 노드에서 프로그램을 시작합니다.\n" +"/affinity mask 지정한 프로세서 친화도 마스크에서 프로그램을 시작합니다.\n" +"/wait 시작한 프로그램이 끝날 때까지 기다립니다.\n" +" 이 명령의 반환값은 실행했던 프로그램의 반환 코드입니다.\n" +"/unix 유닉스 파일 이름을 사용하고, Windows 탐색기처럼 파일을\n" +" 시작합니다.\n" +"/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" +"/? 도움말을 보여주고 끝냅니다.\n" #: cmd.rc:237 msgid "TIME sets or shows the current system time.\n" @@ -10591,10 +10577,8 @@ msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <파일이름> <파일 이름>을 콘솔 장치로 복사합니다 (또는 리다이렉트된다" -"면\n" -"어디에나 보낼 수 있습니다). 파일이 읽기 가능한 텍스트로 만들어졌는지\n" -"체크하지 않습니다.\n" +"TYPE <filename> <filename>을 콘솔 장치로 복사합니다(또는 어디에나\n" +"다이렉트). 파일이 읽기 가능한 텍스트인지 체크하지 않습니다.\n" #: cmd.rc:253 msgid "" @@ -10628,8 +10612,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL은 배치 파일 안에서 SELLOCAL에 의해 시작된 환경 변경의 지역화를\n" -"끝냅니다.\n" +"ENDLOCAL은 배치 파일 안에서 SELLOCAL이 시작한 환경 변화의\n" +"지역화를 끝냅니다.\n" #: cmd.rc:271 msgid "" @@ -10640,9 +10624,9 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" -"SETLOCAL은 배치 파일 안에서 환경 변경의 지역화를 시작합니다.\n" +"SETLOCAL은 배치 파일 안에서 환경 변화 지역화를 시작합니다.\n" "\n" -"SETLOCAL 이후의 환경 변경은 배치파일 안에서 지역화됩니다. 그리고 다음\n" +"SETLOCAL 이후의 환경 변화는 배치파일 안에서 지역화됩니다. 그리고 다음\n" "ENDLOCAL이 나타날 때까지 유지됩니다(또는 파일의 끝. 어느 것이던지 먼저\n" "나오는 것). 그 지점에서 이전 환경 설정이 복원됩니다.\n" @@ -10675,7 +10659,8 @@ msgstr "" "\n" "매개변수 없는 ASSOC는 현재 파일 연결을 표시합니다\n" "만약 파일 확장자만 사용된다면, 현재 연결 상태를 표시합니다.\n" -"등호(=) 부호 다음에 파일 유형이 지정되지 않으면 현재 연결을 제거합니다.\n" +"등호(=) 부호 다음에 파일 유형이 지정되지 않으면 현재 연결을\n" +"제거합니다.\n" #: cmd.rc:300 msgid "" @@ -10694,9 +10679,10 @@ msgstr "" "\n" "구문: FTYPE [파일형식[=[열기명령]]]\n" "\n" -"매개변수가 없으면, 현재 정의된 열기 명령 문자열을 가진 파일 형식을 표시합니" -"다.\n" -"만약 파일 형식만 사용한다면, 연결된 열기 명령 문자열을 표시합니다.\n" +"매개변수가 없으면, 현재 정의된 열기 명령 문자열을 가진 파일 형식을\n" +"표시합니다.\n" +"만약 파일 형식만 사용한다면, 연결된 열기 명령 문자열을 표시합니다\n" +"(연결이 있다면).\n" "등호(=) 부호 다음에 열기 명령이 지정되지 않으면 지정된 파일 형식에 연결된\n" "명령어 문자열을 제거합니다.\n" @@ -10727,14 +10713,14 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" -"심볼릭 링크를 생성합니다.\n" +"심볼릭 링크를 만듭니다.\n" "\n" "구문: MKLINK [options] 링크_이름 대상\n" "\n" "옵션:\n" -"/d 디렉터리 심볼릭 링크를 생성합니다.\n" -"/h 하드 링크를 생성합니다.\n" -"/j 디렉터리 교차점을 생성합니다.\n" +"/d 디렉터리 심볼릭 링크를 만듭니다.\n" +"/h 하드 링크를 만듭니다.\n" +"/j 디렉터리 JUNCTION을 만듭니다.\n" "'링크_이름'은 새 심볼릭 링크의 이름입니다.\n" "'대상'은 '링크_이름'이 가리키는 경로입니다.\n" @@ -10788,59 +10774,59 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 내부 명령들:\n" -"ASSOC\t\t파일 확장명 연결을 보여주거나 고치기\n" -"ATTRIB\t\t도스 파일 속성 보여주거나 바꾸기\n" -"CALL\t\t배치 파일 안에서 다른 파일 불러오기\n" -"CD (CHDIR)\t현재 기본 디렉터리 바꾸기\n" -"CHOICE\t\t선택가능한 목록에서 키를 선택할 때까지 기다림\n" -"CLS\t\t콘솔 화면 깨끗하게 하기\n" -"COPY\t\t파일 복사\n" -"CTTY\t\t입/출력 장치 바꾸기\n" -"DATE\t\t시스템 날짜 보여주거나 바꾸기\n" -"DEL (ERASE)\t하나의 파일이나 여러 파일을 삭제\n" -"DIR\t\t디렉터리 내용 보여주기\n" -"ECHO\t\t문자를 바로 화면 출력으로 복사\n" -"ENDLOCAL\t배치파일에서 환경변수의 지역화의 끝을 알려줌\n" -"FTYPE\t\t파일 형식과 관련된 열기 명령어를 표시 또는 고치기\n" -"HELP\t\t 목차의 짤막한 도움말 항목 보여줌\n" -"MD (MKDIR)\t하위 디렉터리 만들기\n" -"MKLINK\t상징 연결 만들기\n" -"MORE\t\t페이지 출력 보여주기\n" -"MOVE\t\t파일 이나 여러 파일,그리고 디렉터리 구조 이동\n" -"PATH\t\t탐색 경로 보여주거나 설정하기\n" -"PAUSE\t\t배치 파일에서 실행을 정지시킴\n" -"POPD\t\tPUSHD로 마지막으로 저장했던 디렉터리로 돌아가기\n" -"PROMPT\t\t명령줄 해석기 바꾸기\n" -"PUSHD\t\t현재 디렉터리를 저장하고, 새 디렉터리로 바꾸기\n" -"REN (RENAME)\t파일 이름 바꾸기\n" -"RD (RMDIR)\t하위 디렉터리 삭제\n" -"SET\t\t환경 변수 보여주거나 바꾸기\n" -"SETLOCAL\t배치 파일에서 환경변수의 지역화 시작을 알려줌\n" -"START\t\t프로그램을 실행시키거나,연결된 프로그램으로 문서 열기\n" -"TIME\t\t시스템 날짜 바꾸거나 보여주기\n" -"TITLE\t\tCMD 세션의 창 제목 설정\n" -"TYPE\t\t텍스트 파일의 내용 보여주기\n" -"VER\t\tCMD 현재 버전 보여주기\n" -"VOL\t\t디스크 장치의 불륨 레이블 보여주기\n" -"XCOPY\t\t원본 파일이나 디렉터리 구조를 대상으로 복사함\n" -"EXIT\t\tCMD 닫기\n" +"CMD 내부 명령:\n" +"ASSOC 파일 확장명 연결을 보여주거나 수정\n" +"ATTRIB 도스 파일 속성을 보여주거나 바꾸기\n" +"CALL 배치 파일 안에서 다른 파일 호출하기\n" +"CD (CHDIR) 현재 기본 디렉터리 바꾸기\n" +"CHOICE 선택가능한 목록에서 키를 선택할 때까지 기다림\n" +"CLS 콘솔 화면 깨끗하게 하기\n" +"COPY 파일 복사\n" +"CTTY 입/출력 장치 바꾸기\n" +"DATE 시스템 날짜 보여주거나 바꾸기\n" +"DEL (ERASE) 하나의 파일이나 여러 파일을 제거\n" +"DIR 디렉터리 내용 보기\n" +"ECHO 문자를 바로 화면 출력으로 복사\n" +"ENDLOCAL 배치파일에서 환경변수의 지역화의 끝을 알려줌\n" +"FTYPE 파일 형식과 관련된 열기 명령어 보기 또는 수정\n" +"HELP 목차의 짤막한 도움말 항목 보여줌\n" +"MD (MKDIR) 하위 디렉터리 만들기\n" +"MKLINK 심볼릭 링크 만들기\n" +"MORE 페이지 출력 보기\n" +"MOVE 파일 이나 여러 파일,그리고 디렉터리 구조 이동\n" +"PATH 탐색 경로 보여주거나 설정하기\n" +"PAUSE 배치 파일에서 실행을 정지시킴\n" +"POPD PUSHD로 마지막으로 저장했던 디렉터리로 돌아가기\n" +"PROMPT 명령줄 해석기 바꾸기\n" +"PUSHD 현재 디렉터리를 저장하고, 새 디렉터리로 바꾸기\n" +"REN (RENAME) 파일 이름 바꾸기\n" +"RD (RMDIR) 하위 디렉터리 제거\n" +"SET 환경 변수 보여주거나 바꾸기\n" +"SETLOCAL 배치 파일에서 환경변수의 지역화 시작을 알려줌\n" +"START 프로그램을 실행시키거나,연결된 프로그램으로 문서 열기\n" +"TIME 시스템 날짜 변경 및 보기\n" +"TITLE CMD 세션의 창 제목 설정\n" +"TYPE 텍스트 파일의 내용 보기\n" +"VER CMD 현재 버전 보기\n" +"VOL 디스크 장치의 불륨 레이블 보기\n" +"XCOPY 원본 파일이나 디렉터리 구조를 대상으로 복사함\n" +"EXIT CMD 닫기\n" "\n" "HELP <명령>을 치면 그 명령의 상세한 정보를 표시합니다.\n" #: cmd.rc:365 msgid "Are you sure?" -msgstr "당신은 확신합니까?" +msgstr "확실합니까?" #: cmd.rc:366 reg.rc:50 xcopy.rc:43 msgctxt "Yes key" msgid "Y" -msgstr "예" +msgstr "Y" #: cmd.rc:367 reg.rc:51 xcopy.rc:44 msgctxt "No key" msgid "N" -msgstr "아니오" +msgstr "N" #: cmd.rc:368 msgid "File association missing for extension %1\n" @@ -10852,11 +10838,11 @@ msgstr "이 파일 형식 '%1'과 연결된 어떠한 명령도 없습니다'\n" #: cmd.rc:370 msgid "Overwrite %1?" -msgstr "%1을(를) 덮어쓰겠습니까?" +msgstr "%1을(를) 덮어쓰시겠습니까?" #: cmd.rc:371 msgid "More..." -msgstr "더 많이..." +msgstr "더..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" @@ -10872,19 +10858,19 @@ msgstr "문법 오류\n" #: cmd.rc:377 msgid "No help available for %1\n" -msgstr "%1를 위한 어떠한 도움말도 찾을 수 없습니다\n" +msgstr "%1을(를) 위한 도움말을 찾을 수 없습니다\n" #: cmd.rc:378 msgid "Target to GOTO not found\n" -msgstr "GOTO 타겟을 찾을 수 없습니다\n" +msgstr "GOTO 대상을 찾을 수 없습니다\n" #: cmd.rc:379 msgid "Current Date is %1\n" -msgstr "현재 날짜는 %1임\n" +msgstr "현재 날짜: %1\n" #: cmd.rc:380 msgid "Current Time is %1\n" -msgstr "현재 시간은 %1임\n" +msgstr "현재 시간: %1\n" #: cmd.rc:381 msgid "Enter new date: " @@ -10913,19 +10899,19 @@ msgstr "A" #: cmd.rc:387 msgid "Delete %1?" -msgstr "%1을(를) 지우겠습니까?" +msgstr "%1을(를) 지우시겠습니까?" #: cmd.rc:388 msgid "Echo is %1\n" -msgstr "에코(Echo)는 %1임\n" +msgstr "Echo: %1\n" #: cmd.rc:389 msgid "Verify is %1\n" -msgstr "검증(Verify)은 %1임\n" +msgstr "Verify: %1\n" #: cmd.rc:390 msgid "Verify must be ON or OFF\n" -msgstr "검증(Verify)은 반드시 ON 이나 OFF가 되어야 합니다\n" +msgstr "Verify는 ON 또는 OFF 여야 합니다\n" #: cmd.rc:391 msgid "Parameter error\n" @@ -10936,12 +10922,12 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"볼륨 시리얼 번호는 %1!04x!-%2!04x!임\n" +"볼륨 시리얼 번호: %1!04x!-%2!04x!\n" "\n" #: cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "볼륨 레이블 (11 글자, ENTER는 없음과 같음)?" +msgstr "볼륨 레이블 (11 문자, <ENTER>키는 없음과 같음)?" #: cmd.rc:394 msgid "PATH not found\n" @@ -10949,7 +10935,7 @@ msgstr "PATH를 찾을 수 없습니다\n" #: cmd.rc:395 msgid "Press any key to continue... " -msgstr "아무 키나 누르면 진행함... " +msgstr "계속하려면 아무 키나 누르십시오... " #: cmd.rc:396 msgid "Wine Command Prompt" @@ -10957,7 +10943,7 @@ msgstr "Wine 명령 프롬프트" #: cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "마이크로소프트 윈도우 %1!S!\n" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:398 msgid "More? " @@ -10969,7 +10955,7 @@ msgstr "입력 라인이 너무 깁니다.\n" #: cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "드라이브 %1!c!의 볼륨은 %2입니다\n" +msgstr "드라이브 %1!c! 볼륨: %2\n" #: cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" @@ -10977,11 +10963,11 @@ msgstr "드라이브 %1!c!는 레이블을 가지고 있지 않습니다.\n" #: cmd.rc:402 reg.rc:49 msgid " (Yes|No)" -msgstr " (예|아니오)" +msgstr " (예|아니요)" #: cmd.rc:403 msgid " (Yes|No|All)" -msgstr " (예|아니오|모두)" +msgstr " (예|아니요|모두)" #: cmd.rc:404 msgid "" @@ -11019,7 +11005,7 @@ msgstr "DirectX 진단 도구" #: dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "사용법: dxdiag [/whql:off | /whql:on] [/t 파일이름 | /x 파일이름]" +msgstr "사용법: dxdiag [/whql:off | /whql:on] [/t 파일 이름 | /x 파일 이름]" #: explorer.rc:31 msgid "Wine Explorer" @@ -11308,7 +11294,7 @@ msgstr "오류" #: netstat.rc:43 msgid "Unknown protocols" -msgstr " 없는 프로토콜" +msgstr "알 수 없는 프로토콜" #: netstat.rc:44 msgid "TCP Statistics for IPv4" @@ -11413,7 +11399,7 @@ msgstr "붙여넣기(&P)\tCtrl+V" #: notepad.rc:47 progman.rc:37 regedit.rc:56 regedit.rc:109 regedit.rc:136 #: winefile.rc:32 msgid "&Delete\tDel" -msgstr "삭제(&D)\tDel" +msgstr "제거(&D)\tDel" #: notepad.rc:49 msgid "Select &all\tCtrl+A" @@ -11429,11 +11415,11 @@ msgstr "자동 줄 바꿈(&W)" #: notepad.rc:56 msgid "&Search...\tCtrl+F" -msgstr "찾기(&S)...\tCtrl+F" +msgstr "검색(&S)...\tCtrl+F" #: notepad.rc:57 msgid "&Search next\tF3" -msgstr "다음 찾기(&S)\tF3" +msgstr "다음 검색(&S)\tF3" #: notepad.rc:58 wordpad.rc:55 msgid "&Replace...\tCtrl+H" @@ -11566,9 +11552,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"'%s' 파일이 변경되었습니다.\n" +"파일 '%s'이(가) 바뀌었습니다.\n" "\n" -"변경 내용을 저장하시겠습니까?" +"변결 내용을 저장하시겠습니까?" #: notepad.rc:83 msgid "'%s' could not be found." @@ -11596,10 +11582,10 @@ msgid "" "Continue?" msgstr "" "%1\n" -"유니코드 문자를 포함하고 있는 이 파일은 만약 당신이 %2 인코딩으로\n" -"파일을 저장하면 문자의 손실이 있을 것입니다.\n" -"이 문자를 보존하려면 [취소]를 클릭하고, 인코딩 드롭다운목록의 유니코드\n" -"옵션 중의 하나를 선택하십시오t.\n" +"파일이 %2 인코딩으로 저장하면 손실되는 유니코드 문자를 포합하고\n" +"있습니다.\n" +"손실을 피하려면 [취소]를 클릭한 다음, 인코딩 드롭다운 목록에서\n" +"유니코드 옵션 중 하나를 선택하십시오.\n" "계속하시겠습니까?" #: oleview.rc:32 @@ -11837,7 +11823,7 @@ msgstr "모든 목록 새로 고침" #: oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "프로그램 정보, 버전, 저작권 보여주기" +msgstr "프로그램 정보, 버전, 저작권 보기" #: oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" @@ -11877,7 +11863,7 @@ msgstr "모든 객체" #: oleview.rc:135 msgid "Application IDs" -msgstr "응용프로그램 IDs" +msgstr "프로그램 IDs" #: oleview.rc:136 msgid "Type Libraries" @@ -11909,7 +11895,7 @@ msgstr "CoGetClassObject 실패." #: oleview.rc:145 msgid "Unknown error" -msgstr " 없는 오류" +msgstr "알 수 없는 오류" #: oleview.rc:148 msgid "bytes" @@ -11961,7 +11947,7 @@ msgstr "실행(&E)..." #: progman.rc:42 msgid "E&xit Windows" -msgstr "창 종료(&X)" +msgstr "창 나가기(&X)" #: progman.rc:44 taskmgr.rc:41 winefile.rc:62 winhlp32.rc:47 msgid "&Options" @@ -12053,7 +12039,7 @@ msgstr "작업 디렉터리(&W):" #: progman.rc:176 msgid "&Key combination:" -msgstr "단축키 지정(&K):" +msgstr "키 조합(&K):" #: progman.rc:179 progman.rc:215 msgid "&Minimize at launch" @@ -12069,7 +12055,7 @@ msgstr "아이콘 바꾸기" #: progman.rc:194 msgid "&Filename:" -msgstr "파일이름(&F):" +msgstr "파일 이름(&F):" #: progman.rc:196 msgid "Current &icon:" @@ -12093,15 +12079,15 @@ msgstr "정보" #: progman.rc:68 msgid "Delete group `%s'?" -msgstr "그룹 `%s'을 지우겠습니까?" +msgstr "그룹 `%s'을(를) 지우시겠습니까?" #: progman.rc:69 msgid "Delete program `%s'?" -msgstr "프로그램 `%s'을 지우겠습니까?" +msgstr "프로그램 `%s'을(를) 지우시겠습니까?" #: progman.rc:70 msgid "Not implemented" -msgstr "구현되지 않았음" +msgstr "구현되지 않음" #: progman.rc:71 msgid "Error reading `%s'." @@ -12117,7 +12103,7 @@ msgid "" "Should it be tried further on?" msgstr "" "그룹 파일 `%s'을 열 수 없습니다.\n" -"다시 시도하겠습니까?" +"다시 시도하시겠습니까?" #: progman.rc:77 msgid "Help not available." @@ -12133,7 +12119,7 @@ msgstr "파일 '%s'이(가) 존재합니다. 덮어 쓸 수 없습니다." #: progman.rc:80 msgid "Save group as `%s to prevent overwriting original files." -msgstr "Save group as `%s to prevent overwriting original files." +msgstr "원본 파일을 덮어쓰는 것을 패해서 '%s'로 저장합니다." #: progman.rc:84 msgid "Libraries (*.dll)" @@ -12173,7 +12159,7 @@ msgstr "" msgid "" "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" "f]\n" -msgstr "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n" +msgstr "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이터] [/f]\n" #: reg.rc:37 msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" @@ -12206,15 +12192,15 @@ msgstr "reg: 시스템에서 지정된 레지스트리 키 또는 값을 찾을 #: reg.rc:44 msgid "reg: Unsupported registry data type [%1]\n" -msgstr "reg : 지원되지 않는 레지스트리 데이터 유형 [% 1]\n" +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" @@ -12222,11 +12208,11 @@ msgstr "reg: 처리되지 않는 레지스트리 데이터 유형 [/t 0x%1!x!, / #: reg.rc:48 msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "레지스트리 값 '%1'(이)가 이미 존재합니다. 덮어 쓰시겠습니까?" +msgstr "레지스트리 값 '%1'(이)가 이미 존재합니다. 덮어쓰시겠습니까?" #: reg.rc:52 msgid "The registry operation was cancelled\n" -msgstr "레지스트리 작업이 취소되었습니다.\n" +msgstr "레지스트리 작업이 취소되었습니다\n" #: reg.rc:53 regedit.rc:239 msgid "(Default)" @@ -12234,26 +12220,26 @@ msgstr "(기본)" #: reg.rc:54 msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "레지스트리 값 '%1'을(를) 삭제하시겠습니까?" +msgstr "레지스트리 값 '%1'을(를) 제거하시겠습니까?" #: reg.rc:55 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "'%1'의 모든 레지스트리 값을 삭제하시겠습니까?" +msgstr "'%1'의 모든 레지스트리 값을 제거하시겠습니까?" #: reg.rc:56 msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "레지스트리 키 '%1'을 삭제하시겠습니까?" +msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" #: reg.rc:57 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg : 옵션 [/ d] 다음에 유효한 문자열이 있어야 합니다.\n" +msgstr "reg : 옵션 [/d] 다음에 유효한 문자열이 있어야 합니다.\n" #: reg.rc:58 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" -"reg: '%1'의 모든 레지스트리 값을 삭제할 수 없습니다. 예기치 않은 오류가 발생" +"reg: '%1'의 모든 레지스트리 값을 제거할 수 없습니다. 예기치 않은 오류가 발생" "했습니다.\n" #: reg.rc:59 @@ -12289,7 +12275,7 @@ msgstr "(값이 설정되지 않음)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG IMPORT 파일.reg\n" #: reg.rc:67 msgid "reg: The file '%1' was not found.\n" @@ -12305,7 +12291,7 @@ msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: reg.rc:70 msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG EXPORT key_name file.reg [/y]\n" +msgstr "REG EXPORT 키_이름 파일.reg [/y]\n" #: reg.rc:71 msgid "reg: Invalid system key [%1]\n" @@ -12389,7 +12375,7 @@ msgstr "확장" #: regedit.rc:134 regedit.rc:233 msgid "Modify &Binary Data..." -msgstr "이진값 고치기...(&B)" +msgstr "이진값(&B) 수정..." #: regedit.rc:267 msgid "Export registry" @@ -12397,7 +12383,7 @@ msgstr "레지스트리 불러오기" #: regedit.rc:269 msgid "S&elected branch:" -msgstr "선택된 부분만(&E):" +msgstr "선택한(&E) 분기:" #: regedit.rc:278 msgid "Find:" @@ -12611,20 +12597,20 @@ msgstr "" " regedit [옵션] [filename] [reg_key]\n" "\n" "옵션:\n" -" [no option] 이 프로그램의 GUI 버전을 실행합니다.\n" +" 옵션없이 실행 이 프로그램의 GUI 버전을 실행합니다.\n" " /L:system.dat 수정할 system.dat 파일의 위치입니다.\n" " Compatible with any other switch. Ignored.\n" " /R:user.dat 수정할 user.dat 파일의 위치입니다.\n" " Compatible with any other switch. Ignored.\n" " /C 레지스트리 파일의 내용을 가져옵니다.\n" -" /D 지정된 레지스트리 키를 삭제합니다.\n" +" /D 지정된 레지스트리 키를 제거합니다.\n" " /E 지정된 레지스트리 키의 내용을 파일로 내보냅니다.\n" " 키가 지정되지 않은 경우 전체 레지스트리를 내보냅니다.\n" -" /S 메시지가 표시되지 않습니다.\n" -" /V GUI를 고급 모드로 실행합니다. Ignored. \n" -" /? 이 정보를 표시하고 종료합니다.\n" +" /S 메시지를 출력하지 않습니다.\n" +" /V GUI를 고급 모드로 실행합니다. Ignored.\n" +" /? 이 정보를 출력하고 끝냅니다.\n" " [filename] 가져올 레지스트리 정보가 들어 있는 파일의 위치입니다.\n" -" [/E]와 함께 사용할 때, 이 옵션은 레지스트리 정보를 내보낼\n" +" [/E]를 사용할 때, 이 옵션은 레지스트리 정보를 내보낼\n" " 파일 위치를 지정합니다.\n" " [reg_key] 수정할 레지스트리 키입니다.\n" "\n" @@ -12635,7 +12621,7 @@ msgstr "" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "레지스트리 편집기: [%1](은)는 유효하지 않은 또는 없는 스위치입니다.\n" +msgstr "regedit: [%1](은)는 유효하지 않은 또는 없는 스위치입니다\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -12643,93 +12629,89 @@ msgstr "\"regedit /?\"를 입력해 도움말을 볼 수 있습니다.\n" #: regedit.rc:411 msgid "regedit: No filename was specified.\n" -msgstr "레지스트리 편집기: 파일 이름이 지정되지 않았습니다.\n" +msgstr "regedit: 파일 이름이 지정되지 않았습니다.\n" #: regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "레지스트리 편집기: 제거 할 레지스트리 키가 지정되지 않았습니다.\n" +msgstr "regedit: 제거 할 레지스트리 키가 지정되지 않았습니다.\n" #: regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "레지스트리 편집기: 파일 '%1'(을)를 찾을 수 없습니다.\n" +msgstr "regedit: 파일 '%1'(을)를 찾을 수 없습니다.\n" #: regedit.rc:414 msgid "regedit: Unable to open the file '%1'.\n" -msgstr "레지스트리 편집기: '%1'(을)를 열 수 없습니다.\n" +msgstr "regedit: '%1'(을)를 열 수 없습니다.\n" #: regedit.rc:415 msgid "regedit: Unhandled action.\n" -msgstr "레지스트리 편집기: 올바르지 않은 핸들 작업.\n" +msgstr "regedit: 올바르지 않은 핸들 작업.\n" #: regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "레지스트리 편집기: 메모리 초과! (%2!u!번째 줄, %1!S!, )\n" +msgstr "regedit: 메모리 초과! (%2!u!번째 줄, %1!S!, )\n" #: regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" -msgstr "레지스트리 편집기: 올바르지 않은 16진수 값\n" +msgstr "regedit: 올바르지 않은 16진수 값.\n" #: regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" -"레지스트리 편집기: 16진수 값을 변환할 수 없습니다. '%1'(이)가 올바르지 않습니" -"다.\n" +"regedit: 16진수 값을 변환할 수 없습니다. '%1'(이)가 올바르지 않습니다.\n" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "레지스트리 편집기: [\\%1!c!](은)는 없는 제어 문자입니다.\n" +msgstr "regedit: [\\%1!c!](은)는 없는 제어 문자입니다\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "" -"레지스트리 편집기: [0x%1!x!](은)는 지원하지 않는 레지스트리 형태입니다.\n" +msgstr "regedit: [0x%1!x!](은)는 지원하지 않는 레지스트리 형태입니다\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "레지스트리 편집기: '%1'(은)는 예상치 못한 마지막 문자입니다.\n" +msgstr "regedit: '%1'(은)는 예상치 못한 마지막 문자입니다.\n" #: regedit.rc:422 msgid "regedit: The line '%1' was not recognized.\n" -msgstr "레지스트리 편집기: 명령줄 '%1'(을)를 인식할 수 없습니다.\n" +msgstr "regedit: 명령줄 '%1'(을)를 인식할 수 없습니다.\n" #: regedit.rc:423 msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "레지스트리 편집기: 레지스트리 값 '%1'(을)를 '%2'에 더할 수 없습니다.\n" +msgstr "regedit: 레지스트리 값 '%1'(을)를 '%2'에 더할 수 없습니다.\n" #: regedit.rc:424 msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "레지스트리 편집기: 레지스트리 키 '%1'를 열 수 없습니다.\n" +msgstr "regedit: 레지스트리 키 '%1'를 열 수 없습니다.\n" #: regedit.rc:425 msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"레지스트리 편집기: '%2'의 형태는 [0x%1!x!](으)로 지원하지 않는 정보 형태입니" -"다..\n" +"regedit: '%2'의 형태는 [0x%1!x!](으)로 지원하지 않는 정보 형태입니다.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "레지스트리 편집기: 레지스트리 값 '%1'(이)가 이진 정보로 출력됩니다.\n" +msgstr "regedit: 레지스트리 값 '%1'(이)가 이진 정보로 출력됩니다.\n" #: regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "레지스트리 편집기: 올바르지 않은 시스템 키\n" +msgstr "regedit: 올바르지 않은 시스템 키 [%1]\n" #: regedit.rc:428 msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "" -"레지스트리 편집기: '%1\"(을)를 내보낼 수 없습니다. 키를 찾을 수 없습니다.\n" +msgstr "regedit: '%1'을(를) 내보낼 수 없습니다. 키를 찾을 수 없습니다.\n" #: regedit.rc:429 msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "레지스트리 편집기: 레지스트리 '%1'를 지울 수 없습니다.\n" +msgstr "regedit: 레지스트리 '%1'을(를) 지울 수 없습니다.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" -msgstr "레지스트리 편집기: 명령에 유효하지 않은 구문이 있습니다.\n" +msgstr "regedit: 명령에 유효하지 않은 구문이 있습니다.\n" #: regedit.rc:187 msgid "Quits the Registry Editor" @@ -12737,19 +12719,19 @@ msgstr "레지스트리 편집기 나가기" #: regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "즐겨 찾기 목록에 키 더하기" +msgstr "즐겨 찾기 목록에 키 추가" #: regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "즐겨 찾기 목록에 키 삭제" +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" -msgstr "두 틀을 나누는 위치 바꾸기" +msgstr "두 틀을 나누는 지점을 바꿉니다" #: regedit.rc:192 msgid "Refreshes the window" @@ -12757,7 +12739,7 @@ msgstr "창 다시 읽기" #: regedit.rc:193 msgid "Deletes the selection" -msgstr "이 섹션 삭제" +msgstr "이 섹션 제거" #: regedit.rc:194 msgid "Renames the selection" @@ -12765,19 +12747,19 @@ msgstr "이 섹션 이름바꾸기" #: regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "선택된 키의 이름을 클립보드에 복사" +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" -msgstr "이전 찾기에서 지정된 문자열로 다시 찾기" +msgstr "이전 검색에서 지정한 텍스트의 다음 위치를 찾습니다" #: regedit.rc:169 msgid "Modifies the value's data" -msgstr "값 데이타 고치기" +msgstr "값 데이터 수정" #: regedit.rc:171 msgid "Adds a new key" @@ -12793,11 +12775,11 @@ msgstr "새 바이너리 값 더하기" #: regedit.rc:174 msgid "Adds a new 32-bit value" -msgstr "새 32두값 값 더하기" +msgstr "새 32비트 값 추가" #: regedit.rc:177 msgid "Imports a text file into the registry" -msgstr "텍스트 파일을 레지스트리에 끼워넣기" +msgstr "텍스트 파일을 레지스트리로 가져옵니다" #: regedit.rc:179 msgid "Exports all or part of the registry to a text file" @@ -12813,7 +12795,7 @@ 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'." @@ -12825,15 +12807,15 @@ msgstr "이 형식(%1!u!)의 값을 편집할 수 없습니다." #: regedit.rc:208 msgid "The value is too big (%1!u!)." -msgstr "값이 너무 큽니다 (%1!u!)" +msgstr "값이 너무 큽니다 (%1!u!)." #: regedit.rc:209 msgid "Confirm Value Delete" -msgstr "값 삭제 확인" +msgstr "값 제거 확인" #: regedit.rc:210 msgid "Are you sure you want to delete the selected registry value?" -msgstr "선택한 레지스트리 값을 삭제하시겠습니까?" +msgstr "선택한 레지스트리 값을 제거하시겠습니까?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -12841,7 +12823,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" @@ -12873,12 +12855,12 @@ msgstr "새 확장 가능한 문자열 값을 추가합니다" #: regedit.rc:212 msgid "Confirm Key Delete" -msgstr "키 삭제 확인" +msgstr "키 제거 확인" #: regedit.rc:213 msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "이 레지스트리 키와 모든 하위 키를 삭제하시겠습니까?" +msgstr "이 레지스트리 키와 모든 하위 키를 제거하시겠습니까?" #: regedit.rc:199 msgid "Expands or collapses the selected node" @@ -12895,7 +12877,7 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" -"와인 DLL 등록 도구\n" +"Wine DLL 등록 도구\n" "\n" "DLL 등록 서비스를 제공합니다.\n" "\n" @@ -12913,16 +12895,16 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" -"문법:\n" -" regsvr32 [/u] [/s] [/n] [/i[:명령줄]] DLL 이름\n" +"사용법:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" "\n" -"변수:\n" -" [/u] 서버 등록 취소.\n" -" [/s] 조용히 (어떤 진행 상황도 표시되지 않음).\n" -" [/i] DllInstall을 부르면, [명령줄]을 무시합니다.\n" -"\t[/u] 변수와 함께 쓰이면, 제거 소프트웨어가 됍니다.\n" -" [/n] DllRegisterServer를 부르지 마십시오. 이 변수는 반드시 [/i]와 함께 쓰" -"여야 합니다.\n" +"옵션:\n" +" [/u] 서버 등록 해제.\n" +" [/s] 침묵 모드. 메시지를 표시하지 않습니다.\n" +" [/i] DllInstall을 호출합니다. 선택적으로 [cmdline]을 전달합니다.\n" +" [/u] 옵션을 함께 쓰면, 제거 모드에서 DllInstall을 호출합니다.\n" +" [/n] DllRegisterServer를 호출하지 않습니다. 이 옵션은 [/i]를 함께\n" +" 사용해야 합니다.\n" "\n" #: regsvr32.rc:41 @@ -12930,7 +12912,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: 유효하지 않거나 인식 불가능한 스위치 [%1]\n" +"regsvr32: [%1]은(는) 잘못된 스위치입니다\n" "\n" #: regsvr32.rc:42 @@ -12984,7 +12966,7 @@ msgstr "" #: start.rc:60 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "지정된 Unix 파일명을 DOS 파일명으로 바꿀 수 없습니다." +msgstr "지정된 Unix 파일 이름을 DOS 파일 이름으로 바꿀 수 없습니다." #: taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" @@ -13063,7 +13045,7 @@ msgstr "최소화 상태일 때 숨기기(&H)" #: taskmgr.rc:49 taskmgr.rc:257 msgid "&Show 16-bit tasks" -msgstr "16-bit 작업 보여주기(&S)" +msgstr "16-bit 작업 보기(&S)" #: taskmgr.rc:54 msgid "&Refresh Now" @@ -13107,7 +13089,7 @@ msgstr "CPU 당 하나의 그래프(&P)" #: taskmgr.rc:76 taskmgr.rc:261 msgid "&Show Kernel Times" -msgstr "커널 시간 보이기(&S)" +msgstr "커널 시간 보기(&S)" #: taskmgr.rc:80 taskmgr.rc:96 taskmgr.rc:123 winefile.rc:76 msgid "Tile &Horizontally" @@ -13155,7 +13137,7 @@ msgstr "작업 트리 끝(&T)" #: taskmgr.rc:152 winedbg.rc:32 msgid "&Debug" -msgstr "디버그(&D)" +msgstr "디버깅(&D)" #: taskmgr.rc:154 msgid "Set &Priority" @@ -13179,7 +13161,7 @@ msgstr "선호도 설정(&A)..." #: taskmgr.rc:170 msgid "Edit Debug &Channels..." -msgstr "디버그 채널 편집(&C)..." +msgstr "디버깅 채널 편집(&C)..." #: taskmgr.rc:338 taskmgr.rc:180 taskmgr.rc:181 msgid "Task Manager" @@ -13191,7 +13173,7 @@ msgstr "새 작업(&N)..." #: taskmgr.rc:364 msgid "&Show processes from all users" -msgstr "모든 사용자의 작업 보여주기(&S)" +msgstr "모든 사용자의 작업 보기(&S)" #: taskmgr.rc:372 msgid "CPU usage" @@ -13223,7 +13205,7 @@ msgstr "핸들" #: taskmgr.rc:379 taskmgr.rc:291 msgid "Threads" -msgstr "쓰레드" +msgstr "스레드" #: taskmgr.rc:380 taskmgr.rc:263 msgid "Processes" @@ -13263,7 +13245,7 @@ msgstr "메모리 사용 현황" #: taskmgr.rc:428 taskmgr.rc:327 msgid "Debug Channels" -msgstr "디버그 채널" +msgstr "디버깅 채널" #: taskmgr.rc:439 msgid "Processor Affinity" @@ -13490,7 +13472,7 @@ msgstr "핸들 카운트(&H)" #: taskmgr.rc:559 msgid "&Thread Count" -msgstr "쓰레드 카운트(&T)" +msgstr "스레드 카운트(&T)" #: taskmgr.rc:561 taskmgr.rc:292 msgid "GDI Objects" @@ -13562,15 +13544,15 @@ msgstr "4초마다 디스플레이 새로 고침" #: taskmgr.rc:203 msgid "Does not automatically update" -msgstr "자동으로 업데이트할 수 없습니다" +msgstr "자동 업데이트할 수 없습니다" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" -msgstr "데스크탑에 창 가로 바둑판 정렬" +msgstr "수평 바둑판식으로 창 배열" #: taskmgr.rc:206 msgid "Tiles the windows vertically on the desktop" -msgstr "데스크탑에 창 세로 바둑판 정렬" +msgstr "수직 바둑판식으로 창 배열" #: taskmgr.rc:207 msgid "Minimizes the windows" @@ -13582,19 +13564,19 @@ msgstr "창 최대화" #: taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" -msgstr "데스크탑에 창 대각선으로 정렬" +msgstr "계단식으로 창 배열" #: taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" -msgstr "차을 앞으로 옮기나, 전환하지는 않음" +msgstr "포커스 전환 없이, 창을 앞으로 가져옵니다" #: taskmgr.rc:211 msgid "Displays Task Manager help topics" -msgstr "작엄 관리자 도움물 목차 보여주기" +msgstr "작업 관리자 도움물 목차 보기" #: taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "프로그램 정보,버전 그리고 저작권 보여주기" +msgstr "프로그램 정보,버전 그리고 저작권 보기" #: taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -13602,7 +13584,7 @@ msgstr "작업 관리자 프로그램 나가기" #: taskmgr.rc:215 msgid "Shows 16-bit tasks under the associated ntvdm.exe" -msgstr "NTVDM.EXE와 연관된 16비트 작업 표시" +msgstr "NTVDM.EXE와 연관된 16비트 작업 보기" #: taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" @@ -13610,19 +13592,19 @@ msgstr "세로줄 선택은 작업페이지의 보여주게 될 것입니다" #: taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" -msgstr "성능 그래프의 커널 타입 보여주기" +msgstr "성능 그래프의 커널 타입 보기" #: taskmgr.rc:219 msgid "A single history graph shows total CPU usage" -msgstr "모든 CPU 사용을 하나의 기록 그래프로 보여주기" +msgstr "모든 CPU 사용을 하나의 기록 그래프로 보기" #: taskmgr.rc:220 msgid "Each CPU has its own history graph" -msgstr "각각 CPU를 각자의 기록 그래프로 보여주기" +msgstr "각각 CPU를 각자의 기록 그래프로 보기" #: taskmgr.rc:222 msgid "Brings a task to the foreground, switch focus to that task" -msgstr "작업을 앞으로 가져오고, 초점을 그 작업으로 이동" +msgstr "작업을 앞으로 가져오고, 그 작업으로 포커스 이동" #: taskmgr.rc:227 msgid "Tells the selected tasks to close" @@ -13630,7 +13612,7 @@ msgstr "선택한 작업을 닫으라고 말하기" #: taskmgr.rc:228 msgid "Switches the focus to the process of the selected task" -msgstr "선택된 태스크의 작업으로 초점 전환" +msgstr "선택된 태스크의 작업으로 포커스 이동" #: taskmgr.rc:229 msgid "Restores the Task Manager from its hidden state" @@ -13650,7 +13632,7 @@ msgstr "프로세스에 디버거 부착" #: taskmgr.rc:235 msgid "Controls which processors the process will be allowed to run on" -msgstr "각각의 프로세서를 제어하는 것은 작업이 실행되도록 허용할 것입니다" +msgstr "프로세스를 실행할 수 있는 포로세서를 제어합니다" #: taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" @@ -13678,7 +13660,7 @@ msgstr "작업을 낮은 순위 클래스로 설정" #: taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "디버그 채널 제어" +msgstr "디버깅 채널 제어" #: taskmgr.rc:264 msgid "Performance" @@ -13770,9 +13752,9 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"경고: 프로세스의 우선 순위 클래그를 변경하는 것은\n" -"시스템 불안정을 포함해서 바람직하지 않은 결과를 가져 올 수 있습니다. 당신은\n" -"우선 순위 수준을 변경하시겠습니까?" +"경고: 이 프로세스의 우선 순위 등급을 바꾸면 시스템 불안정과\n" +"같은 원하지 않는 결과가 발생할 수 있습니다.\n" +"우선 순위 등급을 바꾸시겠습니까?" #: taskmgr.rc:305 msgid "Unable to Change Priority" @@ -13786,11 +13768,9 @@ 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" @@ -13801,12 +13781,12 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"경고: 프로세스를 디버그하는 것은 데이터의 손실을 가져올 수 있습니다.\n" -"디버거를 사용하시겠습니까?" +"경고: 이 프로세스를 디버깅하면 데이터가 손실될 수 있습니다.\n" +"디버거를 시작하시겠습니까?" #: taskmgr.rc:314 msgid "Unable to Debug Process" -msgstr "프로세스를 디버그할 수 없습니다" +msgstr "프로세스를 디버깅할 수 없습니다" #: taskmgr.rc:315 msgid "The process must have affinity with at least one processor" @@ -13838,7 +13818,7 @@ msgstr "작업" #: uninstaller.rc:29 msgid "Wine Application Uninstaller" -msgstr "Wine 응용프로그램 제거기" +msgstr "Wine Application Uninstaller" #: uninstaller.rc:30 msgid "" @@ -13846,22 +13826,21 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"언인스톨 명령 '%s' 실행 실패, 실행파일이 없는 것 같습니다.\n" -"당신은 레지스트리에서 언인스톨 등록키를 제거하겠습니까?" +"실행 파일이 누락되어 있어서, 제거 명령 '%s'을(를) 실행하지 못했습니다.\n" +"레지스트리에서 해당 제거 정보 제거하시겠습니까?" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "삭제: 전역 고유 식별자 '%1'(을)를 찾을 수 없습니다.\n" +msgstr "uninstaller: GUID '%1'인 프로그램을 찾을 수 없습니다\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" -"삭제: '--remove' 변수 뒤에는 반드시 전역 고유 식별자가 따라와야 합니다.\n" +msgstr "uninstaller: '--remove' 옵션 뒤에는 프로그램 GUID가 있어야 합니다\n" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "삭제: 올바르지 않은 변수 [%1].\n" +msgstr "uninstaller: 올바르지 않은 옵션 [%1]\n" #: uninstaller.rc:35 msgid "" @@ -13870,9 +13849,9 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" -"와인 응용 소프트웨어 제거자\n" +"Wine Application Uninstaller\n" "\n" -"현재 와인 선가상저장소에서 응용 소프트웨어를 제거합니다.\n" +"현재 실행한 Wine에 설치된 프로그램을 제거합니다.\n" "\n" #: uninstaller.rc:43 @@ -13888,22 +13867,22 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" -"문법:\n" -" uninstaller [변수]\n" +"사용법:\n" +" uninstaller [옵션]\n" "\n" -"변수:\n" -" --help\t 도움말을 출력합니다.\n" -" --list\t 이 선가상저장소에 설치된 모든 응용 소프트웨어의 목록을 출력합니" -"다.\n" -" --remove {전역 고유 식별자} 특정 응용 소프트웨어를 제거합니다.\n" -"\t\t '--list'를 사용해 개별 응용 소프트웨어의 전역 고유 식별자를 알아낼 " -"수 있습니다.\n" -" [설정 안함] 그림 사이틀을 엽니다.\n" +"옵션:\n" +" --help 지금 보고 있는 정보를 출력합니다.\n" +" --list 현재 실행한 Wine에 설치된 모든 프로그램의 목록을 출력합니다.\n" +" --remove {GUID}\n" +" 지정한 프로그램을 제거합니다. 프로그램의 GUID를 알아 내기\n" +" 위해서는 '--list' 옵션을 사용하십시오.\n" +"\n" +" 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" "\n" #: view.rc:36 msgid "&Pan" -msgstr "회전(&P)" +msgstr "이동(&P)" #: view.rc:38 msgid "&Scale to Window" @@ -13936,17 +13915,16 @@ msgid "" "\n" "If you terminate the process you may lose all unsaved data." msgstr "" -"이 프로세스에 로그 오프나 종료를 시도했으나, 이 프로그램은 아무런 반응이 없습" -"니다.\n" +"시뮬레이션된 로그오프 또는 종료가 진행 중이지만 이 프로그램은 응답하지 않습니" +"다.\n" "\n" -"만약 당신이 이 프로세스를 끝낸다면 저장 하지 않은 모든 데이터를 잃어버릴 것입" -"니다." +"프로세스를 종료하면 저장되지 않은 모든 데이터가 손실될 수 있습니다." #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "%s의 Wine 설정을 업데이트하고 있습니다. 잠시만 기다려주십시오..." +msgstr "%s 안의 Wine 설정을 업데이트하고 있습니다. 잠시만 기다려주십시오..." -# 라이센스 문구는 번역하지 않습니다. +# 라이선스 문구는 번역하지 않습니다. #: winecfg.rc:141 msgid "" "This program is free software; you can redistribute it and/or modify it " @@ -13961,7 +13939,7 @@ msgstr "" #: winecfg.rc:143 msgid "Windows registration information" -msgstr "윈도우즈 등록 정보" +msgstr "Windows 등록 정보" #: winecfg.rc:144 msgid "&Owner:" @@ -13973,7 +13951,7 @@ msgstr "조직(&Z):" #: winecfg.rc:154 msgid "Application settings" -msgstr "응용프로그램 설정" +msgstr "프로그램 설정" #: winecfg.rc:155 msgid "" @@ -13981,21 +13959,21 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine은 각각의 응용프로그램을 위해 다른 버전의 Windows를 흉내낼 수 있습니다. " -"이 탭은 라이브러리 및 그래픽 탭과 연계해서 시스템 전체 또는 응용프로그램별 설" -"정을 변경할 수 있습니다." +"Wine은 각각의 프로그램에 대해 다른 Windows 버전을 흉내낼 수 있습니다. 이 탭" +"은 라이브러리 및 그래픽 탭과 연결되어 해당 탭의 시스템 전체 또는 프로그램 별 " +"설정을 바꿀 수 있습니다." #: winecfg.rc:159 msgid "Add appli&cation..." -msgstr "응용프로그램 추가(&C)..." +msgstr "프로그램 추가(&C)..." #: winecfg.rc:160 msgid "&Remove application" -msgstr "응용프로그램 제거(&R)" +msgstr "프로그램 제거(&R)" #: winecfg.rc:161 msgid "&Windows Version:" -msgstr "윈도우즈 버전(&W):" +msgstr "Windows 버전(&W):" #: winecfg.rc:169 msgid "Window settings" @@ -14007,19 +13985,19 @@ msgstr "전체 화면 창에서 자동으로 마우스 잡기(&M)" #: winecfg.rc:171 msgid "Allow the window manager to &decorate the windows" -msgstr "창관리자가 Wine창을 꾸미도록 함(&D)" +msgstr "창관리자가 Wine 창을 꾸미도록 합니다(&D)" #: winecfg.rc:172 msgid "Allow the &window manager to control the windows" -msgstr "창관리자가 Wine창을 관리하도록 함(&W)" +msgstr "창관리자가 Wine 창을 관리하도록 합니다(&W)" #: winecfg.rc:173 msgid "&Emulate a virtual desktop" -msgstr "바탕화면 흉내내기(&E)" +msgstr "하나의 창 안에서 가상 데스트톱 흉내내기(&E)" #: winecfg.rc:175 msgid "Desktop &size:" -msgstr "데스크탑 크기(&S):" +msgstr "데스크톱 크기(&S):" #: winecfg.rc:180 msgid "Screen resolution" @@ -14027,7 +14005,7 @@ msgstr "화면 해상도" #: winecfg.rc:184 msgid "This is a sample text using 10 point Tahoma" -msgstr "10pt 글꼴을 사용한 텍스트 예시입니다" +msgstr "10pt 크기의 Tahoma 및 연결된 글꼴을 사용하는 텍스트 예제입니다" #: winecfg.rc:191 msgid "DLL overrides" @@ -14039,12 +14017,12 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"동적 링크 라이브러리는 개별적으로 내장(Wine이 제공)이나 네이티브(윈도우즈나 " -"응용프로그램이 제공)로 지정할 수 있습니다." +"각각의 동적 링크 라이브러리는 내장(Wine이 제공) 또는 네이티브(Windows나 프로" +"그램이 제공)로 지정할 수 있습니다." #: winecfg.rc:194 msgid "&New override for library:" -msgstr "새 라이브러리 재정의(&N):" +msgstr "새로 재정의할 라이브러리(&N):" #: winecfg.rc:196 msgid "A&dd" @@ -14052,7 +14030,7 @@ msgstr "추가(&D)" #: winecfg.rc:197 msgid "Existing &overrides:" -msgstr "현재 재정의 목록(&O):" +msgstr "현재 재정의 DLL 목록(&O):" #: winecfg.rc:199 msgid "&Edit..." @@ -14103,7 +14081,7 @@ msgstr "추가(&D)..." #: winecfg.rc:238 msgid "Aut&odetect" -msgstr "자동찾기(&O)" +msgstr "자동으로 구성(&O)" #: winecfg.rc:241 msgid "&Path:" @@ -14111,7 +14089,7 @@ msgstr "경로(&P):" #: winecfg.rc:248 winecfg.rc:38 msgid "Show Advan&ced" -msgstr "추가옵션 보이기(&C)" +msgstr "추가 옵션(&C) 보이기" #: winecfg.rc:249 msgid "De&vice:" @@ -14131,7 +14109,7 @@ msgstr "시리얼(&E):" #: winecfg.rc:258 msgid "&Show dot files" -msgstr "숨김 파일(dot file) 보이기(&S)" +msgstr "숨김 파일(dot 파일) 보기(&S)" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -14195,7 +14173,7 @@ msgstr "MIME 형식" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "Wine에서 호스트 시스템의 MIME 정보 관리(&A)" +msgstr "Wine이 호스트 시스템의 파일 연결을 수정합니다(&A)" #: winecfg.rc:308 msgid "Folders" @@ -14203,7 +14181,7 @@ msgstr "폴더" #: winecfg.rc:311 msgid "&Link to:" -msgstr "연결 위치(&L):" +msgstr "연결 대상(&L):" #: winecfg.rc:34 msgid "Libraries" @@ -14219,11 +14197,11 @@ msgstr "유닉스 목적 폴더를 선택하십시오." #: winecfg.rc:37 msgid "Hide Advan&ced" -msgstr "추가옵션 숨기기(&C)" +msgstr "추가 옵션 숨기기(&C)" #: winecfg.rc:39 msgid "(No Theme)" -msgstr "(테마 지정 않기)" +msgstr "(테마 선택하지 않음)" #: winecfg.rc:40 msgid "Graphics" @@ -14231,7 +14209,7 @@ msgstr "그래픽" #: winecfg.rc:41 msgid "Desktop Integration" -msgstr "데스크탑 설정" +msgstr "데스크톱" #: winecfg.rc:42 msgid "Audio" @@ -14302,8 +14280,8 @@ msgid "" "Changing the load order of this library is not recommended.\n" "Are you sure you want to do this?" msgstr "" -"이 라이브러리의 로드 순서를 바꾸는 것을 추천하지 않습니다.\n" -"정말로 바꾸시겠습니까?" +"이 라이브러리의 로드 순서를 변경하는 것을 권장하지 않습니다.\n" +"계속하시겠습니까?" #: winecfg.rc:55 msgid "Warning: system library" @@ -14387,10 +14365,11 @@ msgid "" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed remember to recreate it!" msgstr "" -"드라이브 C를 지우시겠습니까?\n" +"드라이브 C 항목을 제거하시겠습니까?\n" "\n" -"대부분의 윈도우 응용프로그램은 C 드라이브가 있다고 예상하고, 없으면 지저분하" -"게 종료될 것입니다. 계속 진행하신다면 반드시 C 드라이브를 다시 생성하십시오!" +"대부분의 Windows 프로그램은 C 드라이브가 있다고 예상합니다. C 드라이브가 없다" +"면 비정상적인 방법으로 종료합입니다. 계속 진행한다면 반드시 C 드라이브를 다" +"시 만드십시오!" #: winecfg.rc:77 msgctxt "Drive letter" @@ -14407,7 +14386,7 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"드라이브 C가 존재하지 않습니다. 이것은 그리 좋지 않습니다.\n" +"드라이브 C가 없습니다. 좋은 구성이 아닙니다.\n" "\n" "드라이브 탭에서 [추가]를 클릭해서 만드는 것을 잊지 마십시오!\n" @@ -14433,7 +14412,7 @@ msgstr "스크롤바" #: winecfg.rc:105 msgid "Selection Background" -msgstr "셀렉 영역 배경" +msgstr "선택 영역 배경" #: winecfg.rc:106 msgid "Selection Text" @@ -14477,7 +14456,7 @@ msgstr "메시지 상자 문자" #: winecfg.rc:116 msgid "Application Workspace" -msgstr "응용프로그램 작업공간" +msgstr "프로그램 작업공간" #: winecfg.rc:117 msgid "Window Frame" @@ -14505,19 +14484,19 @@ msgstr "컨트롤 하이라이트" #: winecfg.rc:123 msgid "Controls Dark Shadow" -msgstr "컨트롤 어두운 그림자" +msgstr "컨트롤 그림자 2" #: winecfg.rc:124 msgid "Controls Light" -msgstr "컨트롤 밝음" +msgstr "컨트롤 밝은 부분" #: winecfg.rc:125 msgid "Controls Alternate Background" -msgstr "컨트롤 대체 배경" +msgstr "컨트롤 배경 2" #: winecfg.rc:126 msgid "Hot Tracked Item" -msgstr "집중 추적 아이템" +msgstr "집중 추적 항목" #: winecfg.rc:127 msgid "Active Title Bar Gradient" @@ -14553,7 +14532,7 @@ msgstr "크게(&L)" #: wineconsole.rc:68 msgid "Command history" -msgstr "명령 히스토리" +msgstr "명령 기록" #: wineconsole.rc:69 msgid "&Buffer size:" @@ -14665,7 +14644,7 @@ msgstr "스크롤(&R)" #: wineconsole.rc:36 msgid "S&earch" -msgstr "찾기(&E)" +msgstr "검색(&E)" #: wineconsole.rc:39 msgid "Setup - Default settings" @@ -14683,7 +14662,7 @@ msgstr "설정 오류" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "스크린 버퍼 크기는 윈도우 크기보다 크거나 같아야 합니다." +msgstr "스크린 버퍼 크기는 Windows 크기보다 크거나 같아야 합니다." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" @@ -14778,13 +14757,13 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"이 문제는 프로그램의 문제나 Wine의 결함으로 인해 발생할 수 있습니다. 당신은 " -"실행한 프로그램에 대하여 <a href=\"https://appdb.winehq.org\">Application " -"Database</a> 에서 관련 팁을 살펴 볼 수 있습니다." +"이것은 프로그램의 문제나 Wine의 결함으로 인해 발생할 수 있습니다. 프로그램 실" +"행에 대한 팁을 얻으려면 <a href=\"https://appdb.winehq.org\">Application " +"Database</a>를 살펴보십시오." #: winedbg.rc:62 msgid "Show &Details" -msgstr "자세히 보여주기(&D)" +msgstr "자세히(&D) 보이기" #: winedbg.rc:67 msgid "Program Error Details" @@ -14797,18 +14776,18 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"이 문제가 Windows에는 존재하지 않고 아직 보고되지 않았다면, \"다른 이름으로 " +"이 문제가 Windows에는 나타나지 않고 아직 보고되지 않았다면, \"다른 이름으로 " "저장\" 버튼을 사용해서 자세한 정보를 파일로 저장한 후, <a href=\"https://" -"wiki.winehq.org/Bugs\">file a but report</a>에서 이 파일을 첨부해서 보고해 주" -"시기 바랍니다." +"wiki.winehq.org/Bugs\">file a but report</a>에서 이 파일을 첨부해서 보고할 " +"수 있습니다." #: winedbg.rc:40 msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" -"시스템의 프로그램이 중단되었지만, WineDbg는 백트레이스를 얻기 위해 프로세스" -"에 연결할 수 없습니다." +"시스템에서 프로그램이 중단되었지만, WineDbg는 프로세스에 연결할 수 없어서 백" +"트레이스를 획득할 수 없습니다." #: winedbg.rc:41 msgid "(unidentified)" @@ -14932,7 +14911,7 @@ msgstr "다른 파일(&O)" #: winefile.rc:149 msgid "Show Hidden/&System Files" -msgstr "숨김/시스템 파일 보여주기(&S)" +msgstr "숨김/시스템 파일 보이기(&S)" #: winefile.rc:160 msgid "&File Name:" @@ -14997,7 +14976,7 @@ msgstr "구현되지 않음" #: winefile.rc:109 msgid "Creation date" -msgstr "생성 날짜" +msgstr "만든 날짜" #: winefile.rc:110 msgid "Access date" @@ -15081,11 +15060,11 @@ msgstr "축하합니다!" #: winemine.rc:82 msgid "Please enter your name" -msgstr "당신의 이름을 적어주세요" +msgstr "이름을 입력해 주세요" #: winemine.rc:90 msgid "Custom Game" -msgstr "게임 사용자 정의" +msgstr "사용자 지정 게임" #: winemine.rc:92 msgid "Rows" @@ -15101,7 +15080,7 @@ msgstr "지뢰" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "모든 결과를 잃습니다. 계속 진행할까요?" +msgstr "모든 결과를 잃습니다. 계속 진행하시겠습니까?" #: winemine.rc:30 msgid "WineMine" @@ -15197,7 +15176,7 @@ msgstr "도움말 파일 (*.hlp)" #: winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾겠습니까?" +msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾겠시겠습니까?" #: winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" @@ -15233,7 +15212,7 @@ msgstr "다시 실행(&E)\tCtrl+Y" #: wordpad.rc:50 msgid "&Clear\tDel" -msgstr "삭제(&C)\tDel" +msgstr "지우기(&C)\tDel" #: wordpad.rc:51 msgid "&Select all\tCtrl+A" @@ -15559,7 +15538,7 @@ msgstr "문서" #: wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "'%s'의 바뀐 것을 저장하겠습니까?" +msgstr "'%s'에 바뀐 사항을 저장하시겠습니까?" #: wordpad.rc:193 msgid "Finished searching the document." @@ -15574,8 +15553,8 @@ msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" msgstr "" -"당신은 보통 텍스트 형식으로 저장하기를 선택했습니다, 이것은 포맷팅을 없엘 것" -"입니다. 정말로 저장하시겠습니까?" +"일반 텍스트 형식으로 저장하도록 선택했습니다. 이로 인해 모든 형식이 손실됩니" +"다. 계속하시겠습니까?" #: wordpad.rc:198 msgid "Invalid number format." @@ -15615,19 +15594,21 @@ msgstr "워드패드 시작 실패함" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "올바르지 않은 매개변수의 갯수 - xcopy /?로 도움말을 보시오\n" +msgstr "" +"올바르지 않은 매개변수의 개수 - 도움말을 보려면 'xcopy /?'를 사용하십시오\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "올바르지 않은 매개변수 '%1' - xcopy /?로 도움말을 보시오\n" +msgstr "" +"올바르지 않은 매개변수 '%1' - 도움말을 보려면 'xcopy /?'를 사용하십시오\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n" -msgstr "<enter> 를 누르면 복사가 시작될 것입니다\n" +msgstr "<enter> 를 누르면 복사를 시작합니다\n" #: xcopy.rc:33 msgid "%1!d! file(s) would be copied\n" -msgstr "%1!d! 파일이 복사될 것입니다\n" +msgstr "%1!d! 파일을 복사합니다\n" #: xcopy.rc:34 msgid "%1!d! file(s) copied\n" @@ -15639,21 +15620,21 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"'%1'이 복사할 파일이나 디렉터리\n" -"입니까?\n" +"'%1'은(는) 파일입니까? 또는\n" +"디렉터리입니까?\n" "(F - 파일, D - 디렉터리)\n" #: xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1? (예(Y)|아니오(N))\n" +msgstr "%1? (예(Y)|아니요(N))\n" #: xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%1를 덮어쓰겠습니까? (예(Y)|아니오(N)|모두(A))\n" +msgstr "%1를 덮어쓰시겠습니까? (예(Y)|아니요(N)|모두(A))\n" #: xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "'%1'을(를) '%2'(으)로 복사하는 데 실패했습니다. error code %3!d!\n" +msgstr "'%1'을(를) '%2'(으)로 복사하는 데 실패했습니다. 오류 코드 %3!d!\n" #: xcopy.rc:42 msgid "Failed during reading of '%1'\n" @@ -15713,13 +15694,13 @@ msgstr "" "\n" "매개변수:\n" "\n" -"[/I] 대상이 존재하지 않고 둘 또는 그 이상의 파일을 복사한다면 대상을\n" -" 디렉터리로 가정합니다.\n" +"[/I] 지정한 대상이 없고 둘 또는 그 이상의 파일을 복사한다면\n" +" 대상을 디렉터리로 가정합니다.\n" "[/S] 디렉터리와 하위 디렉터리를 복사합니다.\n" -"[/E] 비어있는 경우를 포함해서 디렉터리와 하위 디렉터리를 복사합니다.\n" -"[/Q] 복사하는 동안 복사 목록을 표시하지 않습니다.\n" -"[/F] 복사하는 동안 원본과 대상 전부를 표시합니다.\n" -"[/L] 가상 동작. 복사할 목록을 표시합니다.\n" +"[/E] 디렉터리와 하위 디렉터리를 복사합니다. 비어있는 원본도 복사합니다.\n" +"[/Q] 복사하는 동안 복사 목록을 출력하지 않습니다.\n" +"[/F] 복사하는 동안 원본과 대상 전부를 출력합니다.\n" +"[/L] 가상 동작. 복사할 목록을 출력합니다.\n" "[/W] 복사를 시작하기 전에 확인합니다.\n" "[/T] 파일은 복사하지 않고 빈 디렉터리 구조만 복사합니다.\n" "[/Y] 파일을 덮어 쓸 때 확인하지 않습니다.\n" @@ -15728,12 +15709,12 @@ msgstr "" "[/N] 짧은 이름을 사용해서 복사합니다.\n" "[/U] 이미 대상이 존재하는 파일만 복사합니다.\n" "[/R] 읽기 전용 파일을 덮어 씁니다.\n" -"[/H] 숨은 파일이나 시스템 파일을 포함해서 복사합니다.\n" +"[/H] 숨은 파일 및 시스템 파일도 복사합니다.\n" "[/C] 복사하는 동안에 오류가 발생해도 계속 진행합니다.\n" "[/A] 보관 속성이 설정되어있는 파일만 복사합니다.\n" "[/M] 보관 속성이 설정되어 있는 파일만 복사하며, 보관 속성을 지웁니다.\n" -"[/K] 파일 속성을 유지하면서 복사합니다. 이 옵션이 없으면 유지하지 않습니" -"다.\n" +"[/K] 파일 속성을 유지하면서 복사합니다.\n" +" 이 옵션이 없으면 속성을 유지하지 않습니다.\n" "[/D | /D:m-d-y]\n" " 지정된 날짜 후에 수정되거나 새로운 파일을 복사합니다.\n" " 날짜를 지정하지 않으면, 원본보다 대상이 오래된 것만 복사합니다.\n" -- 2.19.1

1 0

[PATCH] user32: Don't draw a close button if it doesn't exist.
by Zhiyi Zhang 30 Oct '18

30 Oct '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/nonclient.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 4444a2c91e..eec4d2abed 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -892,10 +892,12 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, hSysMenu = GetSystemMenu(hwnd, FALSE); state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); - /* Draw a grayed close button if disabled or if SC_CLOSE is not there */ - NC_DrawCloseButton (hwnd, hdc, FALSE, - (state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF)); - r.right -= GetSystemMetrics(SM_CYCAPTION) - 1; + /* Draw a grayed close button if disabled */ + if (state != 0xFFFFFFFF) + { + NC_DrawCloseButton (hwnd, hdc, FALSE, state & (MF_DISABLED | MF_GRAYED)); + r.right -= GetSystemMetrics(SM_CYCAPTION) - 1; + } if ((style & WS_MAXIMIZEBOX) || (style & WS_MINIMIZEBOX)) { -- 2.19.1

2 2

[PATCH 5/5] wined3d: Store resource bind flags in the wined3d_resource structure.
by Henri Verbeet 30 Oct '18

30 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/resource.c | 5 +++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8c7a23fd461..4c90d820a89 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -155,11 +155,11 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu * rarely. */ if (resource->bind_count) { - if (buffer_gl->b.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (buffer_gl->b.bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); - if (buffer_gl->b.bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + if (resource->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) { device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL)); @@ -168,7 +168,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } - if (buffer_gl->b.bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); if (context->transform_feedback_active) @@ -1379,13 +1379,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->access, desc->byte_width, 1, 1, - desc->byte_width, parent, parent_ops, &buffer_resource_ops))) + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->bind_flags = desc->bind_flags; buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 9df0a0923b2..a1b2cbd2a0f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -56,8 +56,8 @@ static void resource_check_usage(DWORD usage) HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, - unsigned int usage, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { @@ -183,6 +183,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_type = multisample_type; resource->multisample_quality = multisample_quality; resource->usage = usage; + resource->bind_flags = bind_flags; resource->access = access; resource->width = width; resource->height = height; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 907ede7010f..87998d5552e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2996,7 +2996,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, - desc->multisample_type, desc->multisample_quality, desc->usage, desc->access, + desc->multisample_type, desc->multisample_quality, desc->usage, 0, desc->access, desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) { static unsigned int once; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 87541aa545e..9a01ed29ff9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3113,6 +3113,7 @@ struct wined3d_resource enum wined3d_multisample_type multisample_type; UINT multisample_quality; DWORD usage; + unsigned int bind_flags; unsigned int access; WORD draw_binding; WORD map_binding; @@ -3153,8 +3154,8 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource) void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, - unsigned int usage, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -3772,7 +3773,6 @@ struct wined3d_buffer { struct wined3d_resource resource; - unsigned int bind_flags; unsigned int structure_byte_stride; DWORD flags; DWORD locations; -- 2.11.0

2 1

[PATCH 4/5] wined3d: Get rid of the "desc" field in struct wined3d_buffer.
by Henri Verbeet 30 Oct '18

30 Oct '18

Most of the information in "desc" is already stored in the wined3d_resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 58e56857b4c..8c7a23fd461 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1302,7 +1302,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc offset = size = 0; } - map_desc->row_pitch = map_desc->slice_pitch = buffer_gl->b.desc.byte_width; + map_desc->row_pitch = map_desc->slice_pitch = resource->size; return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); } @@ -1385,8 +1385,8 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->desc = *desc; buffer->bind_flags = desc->bind_flags; + buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 004611eb2c7..59a30eadf53 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -110,7 +110,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ struct wined3d_buffer *buffer = buffer_from_resource(resource); unsigned int buffer_size, element_size; - if (buffer->desc.structure_byte_stride) + if (buffer->structure_byte_stride) { if (desc->format_id != WINED3DFMT_UNKNOWN) { @@ -119,7 +119,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ } format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; + element_size = buffer->structure_byte_stride; } else { @@ -293,8 +293,8 @@ static void get_buffer_view_range(const struct wined3d_buffer *buffer, { if (desc->format_id == WINED3DFMT_UNKNOWN) { - *offset = desc->u.buffer.start_idx * buffer->desc.structure_byte_stride; - *size = desc->u.buffer.count * buffer->desc.structure_byte_stride; + *offset = desc->u.buffer.start_idx * buffer->structure_byte_stride; + *size = desc->u.buffer.count * buffer->structure_byte_stride; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84bf14d51f4..87541aa545e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3772,9 +3772,8 @@ struct wined3d_buffer { struct wined3d_resource resource; - struct wined3d_buffer_desc desc; - unsigned int bind_flags; + unsigned int structure_byte_stride; DWORD flags; DWORD locations; void *map_ptr; -- 2.11.0

2 1

[PATCH 3/5] wined3d: Validate required OpenGL extensions in wined3d_texture_gl_init() instead of wined3d_texture_init().
by Henri Verbeet 30 Oct '18

30 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9b9e825f4fb..907ede7010f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2881,26 +2881,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (!desc->width || !desc->height || !desc->depth) return WINED3DERR_INVALIDCALL; - if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) + if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D && layer_count != 1) { - if (layer_count != 1) - { - ERR("Invalid layer count for volume texture.\n"); - return E_INVALIDARG; - } - - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("OpenGL implementation does not support 3D textures.\n"); - return WINED3DERR_INVALIDCALL; - } - } - - if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 - && !gl_info->supported[EXT_TEXTURE_ARRAY]) - { - WARN("OpenGL implementation does not support array textures.\n"); - return WINED3DERR_INVALIDCALL; + ERR("Invalid layer count for volume texture.\n"); + return E_INVALIDARG; } texture->sub_resources = sub_resources; @@ -3562,6 +3546,13 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st texture_gl, device, desc, layer_count, level_count, flags, parent, parent_ops, sub_resources); + if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 + && !gl_info->supported[EXT_TEXTURE_ARRAY]) + { + WARN("OpenGL implementation does not support array textures.\n"); + return WINED3DERR_INVALIDCALL; + } + switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_1D: @@ -3595,6 +3586,11 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st break; case WINED3D_RTYPE_TEXTURE_3D: + if (!gl_info->supported[EXT_TEXTURE3D]) + { + WARN("OpenGL implementation does not support 3D textures.\n"); + return WINED3DERR_INVALIDCALL; + } texture_ops = &texture3d_ops; texture_gl->target = GL_TEXTURE_3D; break; -- 2.11.0

2 1

[PATCH 2/5] wined3d: Move the "target" field from struct wined3d_texture to struct wined3d_texture_gl.
by Henri Verbeet 30 Oct '18

30 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 29 +++--- dlls/wined3d/context.c | 6 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/glsl_shader.c | 25 +++--- dlls/wined3d/nvidia_texture_shader.c | 7 +- dlls/wined3d/sampler.c | 2 +- dlls/wined3d/shader.c | 8 +- dlls/wined3d/state.c | 30 ++++--- dlls/wined3d/surface.c | 64 +++++++------ dlls/wined3d/texture.c | 169 +++++++++++++++++------------------ dlls/wined3d/utils.c | 10 +-- dlls/wined3d/view.c | 28 +++--- dlls/wined3d/wined3d_private.h | 43 ++++----- 13 files changed, 213 insertions(+), 210 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 24f7e045fc5..62118fe0c6d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7542,7 +7542,7 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons /* Context activation is done by the caller. */ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context *context, - const struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const struct wined3d_color_key *color_key) { enum complex_fixup fixup; @@ -7555,18 +7555,18 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine unsigned int level; GLuint shader; - level = sub_resource_idx % texture->level_count; - size.x = wined3d_texture_get_level_pow2_width(texture, level); - size.y = wined3d_texture_get_level_pow2_height(texture, level); + level = sub_resource_idx % texture_gl->t.level_count; + size.x = wined3d_texture_get_level_pow2_width(&texture_gl->t, level); + size.y = wined3d_texture_get_level_pow2_height(&texture_gl->t, level); size.z = 1.0f; size.w = 1.0f; - if (is_complex_fixup(texture->resource.format->color_fixup)) - fixup = get_complex_fixup(texture->resource.format->color_fixup); + if (is_complex_fixup(texture_gl->t.resource.format->color_fixup)) + fixup = get_complex_fixup(texture_gl->t.resource.format->color_fixup); else fixup = COMPLEX_FIXUP_NONE; - switch (texture->target) + switch (texture_gl->target) { case GL_TEXTURE_1D: type.res_type = WINED3D_GL_RES_TYPE_TEX_1D; @@ -7589,7 +7589,7 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine break; default: - ERR("Unexpected GL texture type %#x.\n", texture->target); + ERR("Unexpected GL texture type %#x.\n", texture_gl->target); type.res_type = WINED3D_GL_RES_TYPE_TEX_2D; } type.fixup = fixup; @@ -7606,7 +7606,7 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine switch (fixup) { case COMPLEX_FIXUP_NONE: - if (!is_identity_fixup(texture->resource.format->color_fixup)) + if (!is_identity_fixup(texture_gl->t.resource.format->color_fixup)) FIXME("Implement support for sign or swizzle fixups.\n"); shader = arbfp_gen_plain_shader(gl_info, &type); break; @@ -7648,7 +7648,7 @@ err_out: } if (fixup == COMPLEX_FIXUP_P8) - upload_palette(blitter, texture, context); + upload_palette(blitter, &texture_gl->t, context); gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); @@ -7658,7 +7658,7 @@ err_out: checkGLcall("glProgramLocalParameter4fvARB"); if (type.use_color_key) { - wined3d_format_get_float_color_key(texture->resource.format, color_key, float_color_key); + wined3d_format_get_float_color_key(texture_gl->t.resource.format, color_key, float_color_key); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_COLOR_KEY_LOW, &float_color_key[0].r)); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, @@ -7775,6 +7775,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { + struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); struct wined3d_device *device = dst_texture->resource.device; struct wined3d_texture *staging_texture = NULL; struct wined3d_arbfp_blitter *arbfp_blitter; @@ -7850,7 +7851,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl * flip in the blitter, we don't actually need that flip anyway. So we * use the surface's texture as scratch texture, and flip the source * rectangle instead. */ - texture2d_load_fb_texture(src_texture, src_sub_resource_idx, FALSE, context); + texture2d_load_fb_texture(src_texture_gl, src_sub_resource_idx, FALSE, context); s = *src_rect; src_level = src_sub_resource_idx % src_texture->level_count; @@ -7901,10 +7902,10 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl color_key = &alpha_test_key; } - arbfp_blit_set(arbfp_blitter, context, src_texture, src_sub_resource_idx, color_key); + arbfp_blit_set(arbfp_blitter, context, src_texture_gl, src_sub_resource_idx, color_key); /* Draw a textured quad */ - context_draw_textured_quad(context, wined3d_texture_gl(src_texture), + context_draw_textured_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fbe3d941de8..3446c8df9e9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -462,7 +462,7 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co return; } - key->objects[idx].target = wined3d_texture_get_sub_resource_target(&texture_gl->t, sub_resource_idx); + key->objects[idx].target = wined3d_texture_gl_get_sub_resource_target(texture_gl, sub_resource_idx); key->objects[idx].level = sub_resource_idx % texture_gl->t.level_count; key->objects[idx].layer = sub_resource_idx / texture_gl->t.level_count; @@ -5596,7 +5596,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te } quad[4]; - texture2d_get_blt_info(&texture_gl->t, sub_resource_idx, src_rect, &info); + texture2d_get_blt_info(texture_gl, sub_resource_idx, src_rect, &info); level = sub_resource_idx % texture_gl->t.level_count; context_bind_texture(context, info.bind_target, texture_gl->texture_rgb.name); @@ -5674,7 +5674,7 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ struct wined3d_blt_info info; unsigned int level; - texture2d_get_blt_info(&texture_gl->t, sub_resource_idx, src_rect, &info); + texture2d_get_blt_info(texture_gl, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9114f0344ab..ffa4951c0ca 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1351,7 +1351,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (InterlockedIncrement(&op->texture->resource.bind_count) == 1) op->texture->sampler = op->stage; - if (!prev || op->texture->target != prev->target + if (!prev || wined3d_texture_gl(op->texture)->target != wined3d_texture_gl(prev)->target || (!is_same_fixup(new_format->color_fixup, old_format->color_fixup) && !(can_use_texture_swizzle(gl_info, new_format) && can_use_texture_swizzle(gl_info, old_format))) || (new_fmt_flags & WINED3DFMT_FLAG_SHADOW) != (old_fmt_flags & WINED3DFMT_FLAG_SHADOW)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc9730f64b9..37d2aab20bc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13063,7 +13063,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, /* Context activation is done by the caller. */ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture *texture) + struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl) { const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_blitter_program *program; @@ -13071,8 +13071,8 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl struct wine_rb_entry *entry; memset(&args, 0, sizeof(args)); - args.texture_type = texture->target; - args.fixup = texture->resource.format->color_fixup; + args.texture_type = texture_gl->target; + args.fixup = texture_gl->t.resource.format->color_fixup; if ((entry = wine_rb_get(&blitter->programs, &args))) return WINE_RB_ENTRY_VALUE(entry, struct glsl_blitter_program, entry); @@ -13103,11 +13103,11 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl } static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, - const struct wined3d_texture *src_texture, DWORD src_location, - const struct wined3d_texture *dst_texture, DWORD dst_location) + const struct wined3d_texture_gl *src_texture, DWORD src_location, + const struct wined3d_texture_gl *dst_texture, DWORD dst_location) { - const struct wined3d_resource *src_resource = &src_texture->resource; - const struct wined3d_resource *dst_resource = &dst_texture->resource; + const struct wined3d_resource *src_resource = &src_texture->t.resource; + const struct wined3d_resource *dst_resource = &dst_texture->t.resource; const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; BOOL decompress; @@ -13166,6 +13166,8 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *colour_key, enum wined3d_texture_filter_type filter) { + struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); + struct wined3d_texture_gl *dst_texture_gl = wined3d_texture_gl(dst_texture); struct wined3d_device *device = dst_texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *staging_texture = NULL; @@ -13182,7 +13184,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect), colour_key, debug_d3dtexturefiltertype(filter)); - if (!glsl_blitter_supported(op, context, src_texture, src_location, dst_texture, dst_location)) + if (!glsl_blitter_supported(op, context, src_texture_gl, src_location, dst_texture_gl, dst_location)) { if (!(next = blitter->next)) { @@ -13242,7 +13244,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli * flip in the blitter, we don't actually need that flip anyway. So we * use the surface's texture as scratch texture, and flip the source * rectangle instead. */ - texture2d_load_fb_texture(src_texture, src_sub_resource_idx, FALSE, context); + texture2d_load_fb_texture(src_texture_gl, src_sub_resource_idx, FALSE, context); s = *src_rect; src_level = src_sub_resource_idx % src_texture->level_count; @@ -13285,7 +13287,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli context_invalidate_state(context, STATE_FRAMEBUFFER); } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture))) + if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl))) { ERR("Failed to get blitter program.\n"); return dst_location; @@ -13310,8 +13312,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } - context_draw_shaded_quad(context, wined3d_texture_gl(src_texture), - src_sub_resource_idx, src_rect, dst_rect, filter); + context_draw_shaded_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 20db62739b5..e05df20bfda 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD stage, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_texture *texture; BOOL bumpmap = FALSE; if (stage > 0 @@ -47,9 +48,9 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st context->texShaderBumpMap &= ~(1u << stage); } - if (state->textures[stage]) + if ((texture = state->textures[stage])) { - switch (state->textures[stage]->target) + switch (wined3d_texture_gl(texture)->target) { case GL_TEXTURE_2D: gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, @@ -70,7 +71,7 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_CUBE_MAP_ARB)"); break; default: - FIXME("Unhandled target %#x.\n", state->textures[stage]->target); + FIXME("Unhandled target %#x.\n", wined3d_texture_gl(texture)->target); break; } } diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 458a330774f..6e45f0e4b4e 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -175,7 +175,7 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); gl_tex->base_level = base_level; } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ce45298b539..e11a37cf078 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3847,7 +3847,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 { const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_texture *texture; + struct wined3d_texture *texture; unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ @@ -3922,18 +3922,16 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 { for (i = 0; i < shader->limits->sampler; ++i) { - const struct wined3d_texture *texture = state->textures[i]; - if (!shader->reg_maps.resource_info[i].type) continue; /* Treat unbound textures as 2D. The dummy texture will provide * the proper sample value. The tex_types bitmap defaults to * 2D because of the memset. */ - if (!texture) + if (!(texture = state->textures[i])) continue; - switch (texture->target) + switch (wined3d_texture_gl(texture)->target) { /* RECT textures are distinguished from 2D textures via np2_fixup */ default: diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7f3961b7465..42c109da57b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3213,12 +3213,13 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st if (state->render_states[WINED3D_RS_COLORKEYENABLE] && !stage && state->textures[0]) { - struct wined3d_texture *texture = state->textures[0]; - GLenum texture_dimensions = texture->target; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[0]); + GLenum texture_dimensions = texture_gl->target; if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) { - if (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT && !texture->resource.format->alpha_size) + if (texture_gl->t.async.color_key_flags & WINED3D_CKEY_SRC_BLT + && !texture_gl->t.resource.format->alpha_size) { /* Color keying needs to pass alpha values from the texture through to have the alpha test work * properly. On the other hand applications can still use texture combiners apparently. This code @@ -3516,7 +3517,7 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine } } -static enum wined3d_texture_address wined3d_texture_address_mode(const struct wined3d_texture *texture, +static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct wined3d_texture_gl *texture_gl, enum wined3d_texture_address t) { if (t < WINED3D_TADDRESS_WRAP || t > WINED3D_TADDRESS_MIRROR_ONCE) @@ -3526,7 +3527,7 @@ static enum wined3d_texture_address wined3d_texture_address_mode(const struct wi } /* Cubemaps are always set to clamp, regardless of the sampler state. */ - if (texture->target == GL_TEXTURE_CUBE_MAP_ARB || ((texture->flags & WINED3D_TEXTURE_COND_NP2) + if (texture_gl->target == GL_TEXTURE_CUBE_MAP_ARB || ((texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) && t == WINED3D_TADDRESS_WRAP)) return WINED3D_TADDRESS_CLAMP; @@ -3534,7 +3535,8 @@ static enum wined3d_texture_address wined3d_texture_address_mode(const struct wi } static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc, - const struct wined3d_context *context, const DWORD *sampler_states, const struct wined3d_texture *texture) + const struct wined3d_context *context, const DWORD *sampler_states, + const struct wined3d_texture_gl *texture_gl) { union { @@ -3542,9 +3544,9 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc DWORD d; } lod_bias; - desc->address_u = wined3d_texture_address_mode(texture, sampler_states[WINED3D_SAMP_ADDRESS_U]); - desc->address_v = wined3d_texture_address_mode(texture, sampler_states[WINED3D_SAMP_ADDRESS_V]); - desc->address_w = wined3d_texture_address_mode(texture, sampler_states[WINED3D_SAMP_ADDRESS_W]); + desc->address_u = wined3d_texture_gl_address_mode(texture_gl, sampler_states[WINED3D_SAMP_ADDRESS_U]); + desc->address_v = wined3d_texture_gl_address_mode(texture_gl, sampler_states[WINED3D_SAMP_ADDRESS_V]); + desc->address_w = wined3d_texture_gl_address_mode(texture_gl, sampler_states[WINED3D_SAMP_ADDRESS_W]); wined3d_color_from_d3dcolor((struct wined3d_color *)desc->border_color, sampler_states[WINED3D_SAMP_BORDER_COLOR]); if (sampler_states[WINED3D_SAMP_MAG_FILTER] > WINED3D_TEXF_ANISOTROPIC) @@ -3568,20 +3570,20 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIP_FILTER] != WINED3D_TEXF_ANISOTROPIC) - || (texture->flags & WINED3D_TEXTURE_COND_NP2)) + || (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2)) desc->max_anisotropy = 1; - desc->compare = texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW; + desc->compare = texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_SHADOW; desc->comparison_func = WINED3D_CMP_LESSEQUAL; desc->srgb_decode = sampler_states[WINED3D_SAMP_SRGB_TEXTURE]; - if (!(texture->resource.format_flags & WINED3DFMT_FLAG_FILTERING)) + if (!(texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_FILTERING)) { desc->mag_filter = WINED3D_TEXF_POINT; desc->min_filter = WINED3D_TEXF_POINT; desc->mip_filter = WINED3D_TEXF_NONE; } - if (texture->flags & WINED3D_TEXTURE_COND_NP2) + if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) { desc->mip_filter = WINED3D_TEXF_NONE; if (context->gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) @@ -3620,7 +3622,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, &texture_gl->t); + wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture_gl); wined3d_texture_gl_bind(texture_gl, context, srgb); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02cd2c376c1..21375dd026f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -137,13 +137,13 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct checkGLcall("glBlitFramebuffer()"); } -static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) +static BOOL is_multisample_location(const struct wined3d_texture_gl *texture_gl, DWORD location) { if (location == WINED3D_LOCATION_RB_MULTISAMPLE) return TRUE; if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) return FALSE; - return texture->target == GL_TEXTURE_2D_MULTISAMPLE || texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; + return texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; } /* Blit between surface locations. Onscreen on different swapchains is not supported. @@ -183,7 +183,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 } /* Resolve the source surface first if needed. */ - if (is_multisample_location(src_texture, src_location) + if (is_multisample_location(wined3d_texture_gl(src_texture), src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) @@ -835,41 +835,44 @@ error: * * Context activation is done by the caller. This function may temporarily * switch to a different context and restore the original one before return. */ -void texture2d_load_fb_texture(struct wined3d_texture *texture, +void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) { - struct wined3d_device *device = texture->resource.device; struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; + struct wined3d_resource *resource; unsigned int restore_idx, level; + struct wined3d_device *device; GLenum target; + resource = &texture_gl->t.resource; + device = resource->device; restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) - context = context_acquire(device, texture, sub_resource_idx); + if (restore_texture != &texture_gl->t || restore_idx != sub_resource_idx) + context = context_acquire(device, &texture_gl->t, sub_resource_idx); else restore_texture = NULL; gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); - wined3d_texture_prepare_texture(texture, context, srgb); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, srgb); + wined3d_texture_prepare_texture(&texture_gl->t, context, srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context, srgb); - TRACE("Reading back offscreen render target %p, %u.\n", texture, sub_resource_idx); + TRACE("Reading back offscreen render target %p, %u.\n", texture_gl, sub_resource_idx); - if (wined3d_resource_is_offscreen(&texture->resource)) + if (wined3d_resource_is_offscreen(resource)) gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); else - gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(&texture_gl->t)); checkGLcall("glReadBuffer"); - level = sub_resource_idx % texture->level_count; - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture_gl->t.level_count; + target = wined3d_texture_gl_get_sub_resource_target(texture_gl, sub_resource_idx); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, level, 0, 0, 0, 0, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level)); + wined3d_texture_get_level_width(&texture_gl->t, level), + wined3d_texture_get_level_height(&texture_gl->t, level)); checkGLcall("glCopyTexSubImage2D"); if (restore_texture) @@ -907,7 +910,7 @@ static void fb_copy_to_texture_direct(struct wined3d_texture_gl *dst_texture, un wined3d_texture_load(&dst_texture->t, context, FALSE); /* Bind the target texture */ - context_bind_texture(context, dst_texture->t.target, dst_texture->texture_rgb.name); + context_bind_texture(context, dst_texture->target, dst_texture->texture_rgb.name); if (wined3d_resource_is_offscreen(&src_texture->t.resource)) { TRACE("Reading from an offscreen target\n"); @@ -940,7 +943,7 @@ static void fb_copy_to_texture_direct(struct wined3d_texture_gl *dst_texture, un dst_level = dst_sub_resource_idx % dst_texture->t.level_count; src_height = wined3d_texture_get_level_height(&src_texture->t, src_level); - dst_target = wined3d_texture_get_sub_resource_target(&dst_texture->t, dst_sub_resource_idx); + dst_target = wined3d_texture_gl_get_sub_resource_target(dst_texture, dst_sub_resource_idx); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) @@ -1015,8 +1018,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, TRACE("Using hwstretch blit\n"); - src_target = wined3d_texture_get_sub_resource_target(&src_texture->t, src_sub_resource_idx); - dst_target = wined3d_texture_get_sub_resource_target(&dst_texture->t, dst_sub_resource_idx); + src_target = wined3d_texture_gl_get_sub_resource_target(src_texture, src_sub_resource_idx); + dst_target = wined3d_texture_gl_get_sub_resource_target(dst_texture, dst_sub_resource_idx); /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(device, &src_texture->t, src_sub_resource_idx); @@ -1423,7 +1426,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); /* We cannot download data from multisample textures directly. */ - if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) + if (is_multisample_location(wined3d_texture_gl(texture), WINED3D_LOCATION_TEXTURE_RGB)) { wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); texture2d_read_from_framebuffer(texture, sub_resource_idx, context, @@ -1528,7 +1531,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - texture2d_load_fb_texture(texture, sub_resource_idx, srgb, context); + texture2d_load_fb_texture(wined3d_texture_gl(texture), sub_resource_idx, srgb, context); return TRUE; } @@ -1840,6 +1843,8 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *colour_key, enum wined3d_texture_filter_type filter) { + struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); + struct wined3d_texture_gl *dst_texture_gl = wined3d_texture_gl(dst_texture); const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; @@ -1879,7 +1884,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); - src_name = wined3d_texture_gl_get_texture_name(wined3d_texture_gl(src_texture), + src_name = wined3d_texture_gl_get_texture_name(src_texture_gl, context, location == WINED3D_LOCATION_TEXTURE_SRGB); location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); @@ -1896,11 +1901,11 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } - dst_name = wined3d_texture_gl_get_texture_name(wined3d_texture_gl(dst_texture), + dst_name = wined3d_texture_gl_get_texture_name(dst_texture_gl, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_level, - src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_level, + GL_EXTCALL(glCopyImageSubData(src_name, src_texture_gl->target, src_level, + src_rect->left, src_rect->top, src_layer, dst_name, dst_texture_gl->target, dst_level, dst_rect->left, dst_rect->top, dst_layer, src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); checkGLcall("copy image data"); @@ -2098,6 +2103,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { + struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_resource *src_resource, *dst_resource; struct wined3d_texture *staging_texture = NULL; @@ -2198,7 +2204,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit context_invalidate_state(context, STATE_FRAMEBUFFER); } - gl_info->gl_ops.gl.p_glEnable(src_texture->target); + gl_info->gl_ops.gl.p_glEnable(src_texture_gl->target); checkGLcall("glEnable(target)"); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) @@ -2220,7 +2226,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glAlphaFunc"); } - context_draw_textured_quad(context, wined3d_texture_gl(src_texture), + context_draw_textured_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) @@ -3276,7 +3282,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because of format conversion.\n"); else if (src_texture->resource.format->conv_byte_count) TRACE("Not doing download because the source format needs conversion.\n"); - else if (is_multisample_location(src_texture, WINED3D_LOCATION_TEXTURE_RGB)) + else if (is_multisample_location(wined3d_texture_gl(src_texture), WINED3D_LOCATION_TEXTURE_RGB)) TRACE("Not doing download because of multisample source.\n"); else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f1a2498f777..9b9e825f4fb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -153,7 +153,7 @@ static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct wined f->b = ((r->bottom * 2.0f) / h) - 1.0f; } -void texture2d_get_blt_info(const struct wined3d_texture *texture, +void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) { struct wined3d_vec3 *coords = info->texcoords; @@ -162,10 +162,10 @@ void texture2d_get_blt_info(const struct wined3d_texture *texture, GLenum target; GLsizei w, h; - level = sub_resource_idx % texture->level_count; - w = wined3d_texture_get_level_pow2_width(texture, level); - h = wined3d_texture_get_level_pow2_height(texture, level); - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture_gl->t.level_count; + w = wined3d_texture_get_level_pow2_width(&texture_gl->t, level); + h = wined3d_texture_get_level_pow2_height(&texture_gl->t, level); + target = wined3d_texture_gl_get_sub_resource_target(texture_gl, sub_resource_idx); switch (target) { @@ -564,7 +564,7 @@ static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_tex /* Context activation is done by the caller. */ /* The caller is responsible for binding the correct texture. */ -static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture *texture, +static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_gl *texture_gl, GLenum gl_internal_format, const struct wined3d_format_gl *format, const struct wined3d_gl_info *gl_info) { @@ -572,34 +572,34 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLsizei width, height, depth; GLenum target; - level_count = texture->level_count; - if (texture->target == GL_TEXTURE_1D_ARRAY || texture->target == GL_TEXTURE_2D_ARRAY) + level_count = texture_gl->t.level_count; + if (texture_gl->target == GL_TEXTURE_1D_ARRAY || texture_gl->target == GL_TEXTURE_2D_ARRAY) layer_count = 1; else - layer_count = texture->layer_count; + layer_count = texture_gl->t.layer_count; for (layer = 0; layer < layer_count; ++layer) { - target = wined3d_texture_get_sub_resource_target(texture, layer * level_count); + target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count); for (level = 0; level < level_count; ++level) { - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); - if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + width = wined3d_texture_get_level_pow2_width(&texture_gl->t, level); + height = wined3d_texture_get_level_pow2_height(&texture_gl->t, level); + if (texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->f.height_scale.numerator; height /= format->f.height_scale.denominator; } - TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", - texture, layer, level, target, width, height); + TRACE("texture_gl %p, layer %u, level %u, target %#x, width %u, height %u.\n", + texture_gl, layer, level, target, width, height); if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY) { - depth = wined3d_texture_get_level_depth(texture, level); + depth = wined3d_texture_get_level_depth(&texture_gl->t, level); GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - target == GL_TEXTURE_2D_ARRAY ? texture->layer_count : depth, 0, + target == GL_TEXTURE_2D_ARRAY ? texture_gl->t.layer_count : depth, 0, format->format, format->type, NULL)); checkGLcall("glTexImage3D"); } @@ -611,7 +611,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * else { gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, width, - target == GL_TEXTURE_1D_ARRAY ? texture->layer_count : height, 0, + target == GL_TEXTURE_1D_ARRAY ? texture_gl->t.layer_count : height, 0, format->format, format->type, NULL); checkGLcall("glTexImage2D"); } @@ -621,42 +621,42 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * /* Context activation is done by the caller. */ /* The caller is responsible for binding the correct texture. */ -static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture *texture, +static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture_gl *texture_gl, GLenum gl_internal_format, const struct wined3d_gl_info *gl_info) { - unsigned int samples = wined3d_texture_get_gl_sample_count(texture); - GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); - GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); - GLboolean standard_pattern = texture->resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE - && texture->resource.multisample_quality == WINED3D_STANDARD_MULTISAMPLE_PATTERN; + unsigned int samples = wined3d_texture_get_gl_sample_count(&texture_gl->t); + GLsizei height = wined3d_texture_get_level_pow2_height(&texture_gl->t, 0); + GLsizei width = wined3d_texture_get_level_pow2_width(&texture_gl->t, 0); + GLboolean standard_pattern = texture_gl->t.resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE + && texture_gl->t.resource.multisample_quality == WINED3D_STANDARD_MULTISAMPLE_PATTERN; - switch (texture->target) + switch (texture_gl->target) { case GL_TEXTURE_3D: - GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, - gl_internal_format, width, height, wined3d_texture_get_level_depth(texture, 0))); + GL_EXTCALL(glTexStorage3D(texture_gl->target, texture_gl->t.level_count, + gl_internal_format, width, height, wined3d_texture_get_level_depth(&texture_gl->t, 0))); break; case GL_TEXTURE_2D_ARRAY: - GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, - gl_internal_format, width, height, texture->layer_count)); + GL_EXTCALL(glTexStorage3D(texture_gl->target, texture_gl->t.level_count, + gl_internal_format, width, height, texture_gl->t.layer_count)); break; case GL_TEXTURE_2D_MULTISAMPLE: - GL_EXTCALL(glTexStorage2DMultisample(texture->target, samples, + GL_EXTCALL(glTexStorage2DMultisample(texture_gl->target, samples, gl_internal_format, width, height, standard_pattern)); break; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: - GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, - gl_internal_format, width, height, texture->layer_count, standard_pattern)); + GL_EXTCALL(glTexStorage3DMultisample(texture_gl->target, samples, + gl_internal_format, width, height, texture_gl->t.layer_count, standard_pattern)); break; case GL_TEXTURE_1D_ARRAY: - GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, - gl_internal_format, width, texture->layer_count)); + GL_EXTCALL(glTexStorage2D(texture_gl->target, texture_gl->t.level_count, + gl_internal_format, width, texture_gl->t.layer_count)); break; case GL_TEXTURE_1D: - GL_EXTCALL(glTexStorage1D(texture->target, texture->level_count, gl_internal_format, width)); + GL_EXTCALL(glTexStorage1D(texture_gl->target, texture_gl->t.level_count, gl_internal_format, width)); break; default: - GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, + GL_EXTCALL(glTexStorage2D(texture_gl->target, texture_gl->t.level_count, gl_internal_format, width, height)); break; } @@ -978,7 +978,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, texture_gl->t.flags &= ~WINED3D_TEXTURE_IS_SRGB; gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); - target = texture_gl->t.target; + target = texture_gl->target; if (gl_tex->name) { @@ -1112,7 +1112,7 @@ void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum target = texture_gl->t.target; + GLenum target = texture_gl->target; struct gl_texture *gl_tex; DWORD state; @@ -1645,9 +1645,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT sub_resource->locations = WINED3D_LOCATION_DISCARDED; if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - texture->target = GL_TEXTURE_2D_MULTISAMPLE; + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; else - texture->target = GL_TEXTURE_2D; + wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot && !d3d_info->texture_npot_conditional) @@ -1794,9 +1794,9 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win TRACE("internal %#x, format %#x, type %#x.\n", internal, format_gl->format, format_gl->type); if (wined3d_texture_use_immutable_storage(texture, gl_info)) - wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); + wined3d_texture_gl_allocate_immutable_storage(wined3d_texture_gl(texture), internal, gl_info); else - wined3d_texture_allocate_gl_mutable_storage(texture, internal, format_gl, gl_info); + wined3d_texture_gl_allocate_mutable_storage(wined3d_texture_gl(texture), internal, format_gl, gl_info); texture->flags |= alloc_flag; } @@ -1959,7 +1959,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s update_h /= format->height_scale.denominator; } - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); level = sub_resource_idx % texture->level_count; switch (target) @@ -2183,7 +2183,7 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in } sub_resource = &texture->sub_resources[sub_resource_idx]; - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); level = sub_resource_idx % texture->level_count; if (target == GL_TEXTURE_2D_ARRAY) @@ -2398,7 +2398,7 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int GLenum target; format_gl = wined3d_format_gl(texture->resource.format); - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); level = sub_resource_idx % texture->level_count; if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D @@ -3052,53 +3052,12 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - switch (desc->resource_type) - { - case WINED3D_RTYPE_TEXTURE_1D: - if (layer_count > 1) - texture->target = GL_TEXTURE_1D_ARRAY; - else - texture->target = GL_TEXTURE_1D; - break; - - case WINED3D_RTYPE_TEXTURE_2D: - if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) - { - texture->target = GL_TEXTURE_CUBE_MAP_ARB; - } - else if (desc->multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - { - if (layer_count > 1) - texture->target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; - else - texture->target = GL_TEXTURE_2D_MULTISAMPLE; - } - else - { - if (layer_count > 1) - texture->target = GL_TEXTURE_2D_ARRAY; - else - texture->target = GL_TEXTURE_2D; - } - break; - - case WINED3D_RTYPE_TEXTURE_3D: - texture->target = GL_TEXTURE_3D; - break; - - default: - ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); - wined3d_texture_cleanup_sync(texture); - return WINED3DERR_INVALIDCALL; - } - /* Precalculated scaling for 'faked' non power of two texture coords. */ if (texture->resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) { texture->pow2_matrix[0] = (float)desc->width; texture->pow2_matrix[5] = (float)desc->height; texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); - texture->target = GL_TEXTURE_RECTANGLE_ARB; } else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { @@ -3594,7 +3553,9 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_texture_ops *texture_ops; + HRESULT hr; TRACE("texture_gl %p, device %p, desc %p, layer_count %u, level_count %u, " "flags %#x, parent %p, parent_ops %p, sub_resources %p.\n", @@ -3605,13 +3566,39 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st { case WINED3D_RTYPE_TEXTURE_1D: texture_ops = &texture1d_ops; + if (layer_count > 1) + texture_gl->target = GL_TEXTURE_1D_ARRAY; + else + texture_gl->target = GL_TEXTURE_1D; break; + case WINED3D_RTYPE_TEXTURE_2D: texture_ops = &texture2d_ops; + if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + { + texture_gl->target = GL_TEXTURE_CUBE_MAP_ARB; + } + else if (desc->multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + if (layer_count > 1) + texture_gl->target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; + else + texture_gl->target = GL_TEXTURE_2D_MULTISAMPLE; + } + else + { + if (layer_count > 1) + texture_gl->target = GL_TEXTURE_2D_ARRAY; + else + texture_gl->target = GL_TEXTURE_2D; + } break; + case WINED3D_RTYPE_TEXTURE_3D: texture_ops = &texture3d_ops; + texture_gl->target = GL_TEXTURE_3D; break; + default: ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); return WINED3DERR_INVALIDCALL; @@ -3619,8 +3606,14 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st list_init(&texture_gl->renderbuffers); - return wined3d_texture_init(&texture_gl->t, desc, layer_count, level_count, - flags, device, parent, parent_ops, sub_resources, texture_ops); + if (FAILED(hr = wined3d_texture_init(&texture_gl->t, desc, layer_count, level_count, + flags, device, parent, parent_ops, sub_resources, texture_ops))) + return hr; + + if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) + texture_gl->target = GL_TEXTURE_RECTANGLE_ARB; + + return WINED3D_OK; } HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6e60c5ae3db..0bc4a37df45 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5767,7 +5767,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d for (i = 0; i < d3d_info->limits.ffp_blend_stages; ++i) { - const struct wined3d_texture *texture; + struct wined3d_texture *texture; settings->op[i].padding = 0; if (state->texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE) @@ -5796,7 +5796,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } else { - switch (texture->target) + switch (wined3d_texture_gl(texture)->target) { case GL_TEXTURE_1D: settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; @@ -5857,7 +5857,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d GLenum texture_dimensions; texture = state->textures[0]; - texture_dimensions = texture->target; + texture_dimensions = wined3d_texture_gl(texture)->target; if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) { @@ -6063,11 +6063,11 @@ void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *des * not care for the colorop or correct gl texture unit (when using nvrc). * Requires the caller to activate the correct unit. */ /* Context activation is done by the caller (state handler). */ -void texture_activate_dimensions(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) +void texture_activate_dimensions(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { if (texture) { - switch (texture->target) + switch (wined3d_texture_gl(texture)->target) { case GL_TEXTURE_2D: gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 3b579a25f0f..004611eb2c7 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -33,7 +33,7 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) } static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, - const struct wined3d_view_desc *desc, const struct wined3d_texture *texture) + const struct wined3d_view_desc *desc, const struct wined3d_texture_gl *texture_gl) { static const struct { @@ -69,7 +69,7 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, for (i = 0; i < ARRAY_SIZE(view_types); ++i) { - if (view_types[i].texture_target != texture->target || view_types[i].view_flags != desc->flags) + if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != desc->flags) continue; if (gl_info->supported[view_types[i].extension]) return view_types[i].view_target; @@ -77,8 +77,8 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, FIXME("Extension %#x not supported.\n", view_types[i].extension); } - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); - return texture->target; + FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture_gl->target); + return texture_gl->target; } static const struct wined3d_format *validate_resource_view(const struct wined3d_view_desc *desc, @@ -564,7 +564,7 @@ static void wined3d_render_target_view_cs_init(void *object) return; } - create_texture_view(&view->gl_view, texture_gl->t.target, desc, texture_gl, view->format); + create_texture_view(&view->gl_view, texture_gl->target, desc, texture_gl, view->format); } } } @@ -747,9 +747,9 @@ static void wined3d_shader_resource_view_cs_init(void *object) resource_class = wined3d_format_gl(resource->format)->view_class; view_class = wined3d_format_gl(view_format)->view_class; - view_target = get_texture_view_target(gl_info, desc, &texture_gl->t); + view_target = get_texture_view_target(gl_info, desc, texture_gl); - if (resource->format->id == view_format->id && texture_gl->t.target == view_target + if (resource->format->id == view_format->id && texture_gl->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture_gl->t.level_count && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture_gl->t.layer_count && !is_stencil_view_format(view_format)) @@ -898,8 +898,8 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * else { wined3d_texture_gl_bind_and_dirtify(texture_gl, context, srgb); - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_MAX_LEVEL, max_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -907,12 +907,12 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); if (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) { - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_SRGB_DECODE_EXT, - GL_SKIP_DECODE_EXT); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, + GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); gl_tex->sampler_desc.srgb_decode = FALSE; } - gl_info->fbo_ops.glGenerateMipmap(texture_gl->t.target); + gl_info->fbo_ops.glGenerateMipmap(texture_gl->target); checkGLcall("glGenerateMipMap()"); for (i = 0; i < layer_count; ++i) @@ -927,7 +927,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * if (!view->gl_view.name) { gl_tex->base_level = base_level; - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); } @@ -1141,7 +1141,7 @@ static void wined3d_unordered_access_view_cs_init(void *object) if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, &texture_gl->t), + create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture_gl), desc, texture_gl, view->format); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 861c6475420..84bf14d51f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3217,7 +3217,6 @@ struct wined3d_texture UINT lod; DWORD sampler; DWORD flags; - GLenum target; DWORD update_map_binding; void *user_memory; @@ -3273,23 +3272,6 @@ static inline struct wined3d_texture *texture_from_resource(struct wined3d_resou return CONTAINING_RECORD(resource, struct wined3d_texture, resource); } -static inline GLenum wined3d_texture_get_sub_resource_target(const struct wined3d_texture *texture, - unsigned int sub_resource_idx) -{ - static const GLenum cube_targets[] = - { - GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB, - }; - - return texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP - ? cube_targets[sub_resource_idx / texture->level_count] : texture->target; -} - static inline unsigned int wined3d_texture_get_level_width(const struct wined3d_texture *texture, unsigned int level) { @@ -3333,11 +3315,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void texture2d_get_blt_info(const struct wined3d_texture *texture, unsigned int sub_resource_idx, +void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) DECLSPEC_HIDDEN; -void texture2d_load_fb_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, +void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; @@ -3395,6 +3377,8 @@ struct wined3d_texture_gl struct gl_texture texture_rgb, texture_srgb; + GLenum target; + GLuint rb_multisample; GLuint rb_resolved; @@ -3413,6 +3397,23 @@ static inline struct gl_texture *wined3d_texture_gl_get_gl_texture(struct wined3 return srgb ? &texture_gl->texture_srgb : &texture_gl->texture_rgb; } +static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx) +{ + static const GLenum cube_targets[] = + { + GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB, + }; + + return texture_gl->t.resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP + ? cube_targets[sub_resource_idx / texture_gl->t.level_count] : texture_gl->target; +} + void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, @@ -3986,7 +3987,7 @@ BOOL is_invalid_op(const struct wined3d_state *state, int stage, void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; -void texture_activate_dimensions(const struct wined3d_texture *texture, +void texture_activate_dimensions(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void sampler_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -- 2.11.0

2 1

[PATCH 1/5] wined3d: Move the OpenGL textures from struct wined3d_texture to struct wined3d_texture_gl.
by Henri Verbeet 30 Oct '18

30 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/context.c | 48 ++++++++--------- dlls/wined3d/cs.c | 4 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/sampler.c | 22 ++++---- dlls/wined3d/state.c | 10 ++-- dlls/wined3d/surface.c | 93 +++++++++++++++++---------------- dlls/wined3d/swapchain.c | 6 +-- dlls/wined3d/texture.c | 106 +++++++++++++++++++------------------- dlls/wined3d/view.c | 80 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 67 ++++++++++++------------ 11 files changed, 227 insertions(+), 215 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 67fd193a7bb..24f7e045fc5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7904,7 +7904,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blit_set(arbfp_blitter, context, src_texture, src_sub_resource_idx, color_key); /* Draw a textured quad */ - context_draw_textured_quad(context, src_texture, src_sub_resource_idx, src_rect, dst_rect, filter); + context_draw_textured_quad(context, wined3d_texture_gl(src_texture), + src_sub_resource_idx, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9027e94ed09..fbe3d941de8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -472,11 +472,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_get_texture_name(&texture_gl->t, context, FALSE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_get_texture_name(&texture_gl->t, context, TRUE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: @@ -1089,7 +1089,7 @@ void context_gl_resource_released(struct wined3d_device *device, context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); } -void context_texture_update(struct wined3d_context *context, const struct wined3d_texture *texture) +void context_texture_update(struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl) { const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry = context->current_fbo; @@ -1099,10 +1099,10 @@ void context_texture_update(struct wined3d_context *context, const struct wined3 for (i = 0; i < gl_info->limits.buffers + 1; ++i) { - if (texture->texture_rgb.name == entry->key.objects[i].object - || texture->texture_srgb.name == entry->key.objects[i].object) + if (texture_gl->texture_rgb.name == entry->key.objects[i].object + || texture_gl->texture_srgb.name == entry->key.objects[i].object) { - TRACE("Updated texture %p is bound as attachment %u to the current FBO.\n", texture, i); + TRACE("Updated texture %p is bound as attachment %u to the current FBO.\n", texture_gl, i); context->rebind_fbo = TRUE; return; } @@ -3896,8 +3896,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, } else if (view->resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_texture *texture = texture_from_resource(view->resource); - texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view->resource)); + texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); level = view->desc.u.texture.level_idx; } else @@ -4195,14 +4195,14 @@ static void context_setup_target(struct wined3d_context *context, && old_render_offscreen && (context->current_rt.texture != texture || context->current_rt.sub_resource_idx != sub_resource_idx)) { + struct wined3d_texture_gl *prev_texture = wined3d_texture_gl(context->current_rt.texture); unsigned int prev_sub_resource_idx = context->current_rt.sub_resource_idx; - struct wined3d_texture *prev_texture = context->current_rt.texture; /* Read the back buffer of the old drawable into the destination texture. */ if (prev_texture->texture_srgb.name) - wined3d_texture_load(prev_texture, context, TRUE); - wined3d_texture_load(prev_texture, context, FALSE); - wined3d_texture_invalidate_location(prev_texture, prev_sub_resource_idx, WINED3D_LOCATION_DRAWABLE); + wined3d_texture_load(&prev_texture->t, context, TRUE); + wined3d_texture_load(&prev_texture->t, context, FALSE); + wined3d_texture_invalidate_location(&prev_texture->t, prev_sub_resource_idx, WINED3D_LOCATION_DRAWABLE); } } @@ -5581,7 +5581,7 @@ static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, stru } /* Context activation is done by the caller. */ -void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture *texture, +void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { @@ -5596,11 +5596,11 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te } quad[4]; - texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); + texture2d_get_blt_info(&texture_gl->t, sub_resource_idx, src_rect, &info); - level = sub_resource_idx % texture->level_count; - context_bind_texture(context, info.bind_target, texture->texture_rgb.name); - apply_texture_blit_state(gl_info, &texture->texture_rgb, info.bind_target, level, filter); + level = sub_resource_idx % texture_gl->t.level_count; + context_bind_texture(context, info.bind_target, texture_gl->texture_rgb.name); + apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); context_get_rt_size(context, &dst_size); @@ -5661,12 +5661,12 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te } checkGLcall("draw"); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); context_bind_texture(context, info.bind_target, 0); } /* Context activation is done by the caller. */ -void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture *texture, +void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { @@ -5674,14 +5674,14 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ struct wined3d_blt_info info; unsigned int level; - texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); + texture2d_get_blt_info(&texture_gl->t, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); - level = sub_resource_idx % texture->level_count; - context_bind_texture(context, info.bind_target, texture->texture_rgb.name); - apply_texture_blit_state(gl_info, &texture->texture_rgb, info.bind_target, level, filter); + level = sub_resource_idx % texture_gl->t.level_count; + context_bind_texture(context, info.bind_target, texture_gl->texture_rgb.name); + apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -5701,6 +5701,6 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->bottom); gl_info->gl_ops.gl.p_glEnd(); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); context_bind_texture(context, info.bind_target, 0); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fc3e47e3298..9114f0344ab 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2227,7 +2227,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, &row_pitch, &slice_pitch); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), context, FALSE); wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); @@ -2325,7 +2325,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_prepare_texture(texture, context, FALSE); else wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_bind_and_dirtify(texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 32f82d6c3d0..fc9730f64b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13310,7 +13310,8 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } - context_draw_shaded_quad(context, src_texture, src_sub_resource_idx, src_rect, dst_rect, filter); + context_draw_shaded_quad(context, wined3d_texture_gl(src_texture), + src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 82fbe2c3be7..458a330774f 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -155,34 +155,34 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } -static void texture_apply_base_level(struct wined3d_texture *texture, +static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *desc, const struct wined3d_gl_info *gl_info) { struct gl_texture *gl_tex; unsigned int base_level; - if (texture->flags & WINED3D_TEXTURE_COND_NP2) + if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) base_level = 0; else if (desc->mip_filter == WINED3D_TEXF_NONE) - base_level = texture->lod; + base_level = texture_gl->t.lod; else - base_level = min(max(desc->mip_base_level, texture->lod), texture->level_count - 1); + base_level = min(max(desc->mip_base_level, texture_gl->t.lod), texture_gl->t.level_count - 1); - gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); + gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); if (base_level != gl_tex->base_level) { /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_BASE_LEVEL, base_level); gl_tex->base_level = base_level; } } /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture *texture, const struct wined3d_context *context) + struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -191,15 +191,15 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, GL_EXTCALL(glBindSampler(unit, sampler->name)); checkGLcall("bind sampler"); } - else if (texture) + else if (texture_gl) { - wined3d_texture_apply_sampler_desc(texture, &sampler->desc, context); + wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler->desc, context); } else { ERR("Could not apply sampler state.\n"); } - if (texture) - texture_apply_base_level(texture, &sampler->desc, gl_info); + if (texture_gl) + texture_gl_apply_base_level(texture_gl, &sampler->desc, gl_info); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ab67c578901..7f3961b7465 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3612,17 +3612,17 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[sampler_idx]); BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; - struct wined3d_texture *texture = state->textures[sampler_idx]; struct wined3d_device *device = context->device; struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); + wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, &texture_gl->t); - wined3d_texture_bind(texture, context, srgb); + wined3d_texture_gl_bind(texture_gl, context, srgb); if ((entry = wine_rb_get(&device->samplers, &desc))) { @@ -3643,10 +3643,10 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } } - wined3d_sampler_bind(sampler, mapped_stage, texture, context); + wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ - if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) context->constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP; } else diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 746599e58f5..02cd2c376c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -687,7 +687,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr TRACE("Using upload conversion.\n"); wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), context, FALSE); wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); @@ -855,7 +855,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, device_invalidate_state(device, STATE_FRAMEBUFFER); wined3d_texture_prepare_texture(texture, context, srgb); - wined3d_texture_bind_and_dirtify(texture, context, srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, srgb); TRACE("Reading back offscreen render target %p, %u.\n", texture, sub_resource_idx); @@ -878,11 +878,11 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, /* Does a direct frame buffer -> texture copy. Stretching is done with single * pixel copy calls. */ -static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, +static void fb_copy_to_texture_direct(struct wined3d_texture_gl *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture_gl *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, enum wined3d_texture_filter_type filter) { - struct wined3d_device *device = dst_texture->resource.device; + struct wined3d_device *device = dst_texture->t.resource.device; unsigned int src_height, src_level, dst_level; const struct wined3d_gl_info *gl_info; float xrel, yrel; @@ -901,14 +901,14 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig upsidedown = TRUE; } - context = context_acquire(device, src_texture, src_sub_resource_idx); + context = context_acquire(device, &src_texture->t, src_sub_resource_idx); gl_info = context->gl_info; context_apply_blit_state(context, device); - wined3d_texture_load(dst_texture, context, FALSE); + wined3d_texture_load(&dst_texture->t, context, FALSE); /* Bind the target texture */ - context_bind_texture(context, dst_texture->target, dst_texture->texture_rgb.name); - if (wined3d_resource_is_offscreen(&src_texture->resource)) + context_bind_texture(context, dst_texture->t.target, dst_texture->texture_rgb.name); + if (wined3d_resource_is_offscreen(&src_texture->t.resource)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; @@ -916,7 +916,7 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig } else { - gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(src_texture)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(&src_texture->t)); } checkGLcall("glReadBuffer"); @@ -936,11 +936,11 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig ERR("Texture filtering not supported in direct blit\n"); } - src_level = src_sub_resource_idx % src_texture->level_count; - dst_level = dst_sub_resource_idx % dst_texture->level_count; + src_level = src_sub_resource_idx % src_texture->t.level_count; + dst_level = dst_sub_resource_idx % dst_texture->t.level_count; - src_height = wined3d_texture_get_level_height(src_texture, src_level); - dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); + src_height = wined3d_texture_get_level_height(&src_texture->t, src_level); + dst_target = wined3d_texture_get_sub_resource_target(&dst_texture->t, dst_sub_resource_idx); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) @@ -990,17 +990,17 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig /* The texture is now most up to date - If the surface is a render target * and has a drawable, this path is never entered. */ - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_validate_location(&dst_texture->t, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&dst_texture->t, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } /* Uses the hardware to stretch and flip the image */ -static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, +static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture_gl *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, enum wined3d_texture_filter_type filter) { unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; - struct wined3d_device *device = dst_texture->resource.device; + struct wined3d_device *device = dst_texture->t.resource.device; GLenum src_target, dst_target, texture_target; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ @@ -1015,28 +1015,28 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un TRACE("Using hwstretch blit\n"); - src_target = wined3d_texture_get_sub_resource_target(src_texture, src_sub_resource_idx); - dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); + src_target = wined3d_texture_get_sub_resource_target(&src_texture->t, src_sub_resource_idx); + dst_target = wined3d_texture_get_sub_resource_target(&dst_texture->t, dst_sub_resource_idx); /* Activate the Proper context for reading from the source surface, set it up for blitting */ - context = context_acquire(device, src_texture, src_sub_resource_idx); + context = context_acquire(device, &src_texture->t, src_sub_resource_idx); gl_info = context->gl_info; context_apply_ffp_blit_state(context, device); - wined3d_texture_load(dst_texture, context, FALSE); + wined3d_texture_load(&dst_texture->t, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); - src_level = src_sub_resource_idx % src_texture->level_count; - src_width = wined3d_texture_get_level_width(src_texture, src_level); - src_height = wined3d_texture_get_level_height(src_texture, src_level); - src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_level); - src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_level); + src_level = src_sub_resource_idx % src_texture->t.level_count; + src_width = wined3d_texture_get_level_width(&src_texture->t, src_level); + src_height = wined3d_texture_get_level_height(&src_texture->t, src_level); + src_pow2_width = wined3d_texture_get_level_pow2_width(&src_texture->t, src_level); + src_pow2_height = wined3d_texture_get_level_pow2_height(&src_texture->t, src_level); - src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); + src_offscreen = wined3d_resource_is_offscreen(&src_texture->t.resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_texture->texture_rgb.name) { /* Get it a description */ - wined3d_texture_load(src_texture, context, FALSE); + wined3d_texture_load(&src_texture->t, context, FALSE); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -1071,7 +1071,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un checkGLcall("glEnable(texture_target)"); /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */ - src_texture->sub_resources[src_sub_resource_idx].locations &= ~WINED3D_LOCATION_TEXTURE_RGB; + src_texture->t.sub_resources[src_sub_resource_idx].locations &= ~WINED3D_LOCATION_TEXTURE_RGB; } /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -1092,7 +1092,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un } else { - gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(src_texture)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(&src_texture->t)); } /* TODO: Only back up the part that will be overwritten */ @@ -1107,7 +1107,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); checkGLcall("glTexParameteri"); - if (!src_texture->swapchain || src_texture == src_texture->swapchain->back_buffers[0]) + if (!src_texture->t.swapchain || &src_texture->t == src_texture->t.swapchain->back_buffers[0]) { src = backup ? backup : src_texture->texture_rgb.name; } @@ -1159,7 +1159,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un bottom = src_height - src_rect->top; } - if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) + if (src_texture->t.flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { left /= src_pow2_width; right /= src_pow2_width; @@ -1271,8 +1271,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un /* The texture is now most up to date - If the surface is a render target * and has a drawable, this path is never entered. */ - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_validate_location(&dst_texture->t, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&dst_texture->t, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -1395,14 +1395,14 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); - fb_copy_to_texture_direct(dst_texture, dst_sub_resource_idx, dst_rect, - src_texture, src_sub_resource_idx, src_rect, filter); + fb_copy_to_texture_direct(wined3d_texture_gl(dst_texture), dst_sub_resource_idx, dst_rect, + wined3d_texture_gl(src_texture), src_sub_resource_idx, src_rect, filter); } else { TRACE("Using hardware stretching to flip / stretch the texture.\n"); - fb_copy_to_texture_hwstretch(dst_texture, dst_sub_resource_idx, dst_rect, - src_texture, src_sub_resource_idx, src_rect, filter); + fb_copy_to_texture_hwstretch(wined3d_texture_gl(dst_texture), dst_sub_resource_idx, dst_rect, + wined3d_texture_gl(src_texture), src_sub_resource_idx, src_rect, filter); } return WINED3D_OK; @@ -1438,7 +1438,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { struct wined3d_bo_address data; - wined3d_texture_bind_and_dirtify(texture, context, + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); @@ -1605,7 +1605,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re } wined3d_texture_prepare_texture(texture, context, srgb); - wined3d_texture_bind_and_dirtify(texture, context, srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, srgb); wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); format = texture->resource.format; @@ -1879,7 +1879,8 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); - src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + src_name = wined3d_texture_gl_get_texture_name(wined3d_texture_gl(src_texture), + context, location == WINED3D_LOCATION_TEXTURE_SRGB); location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -1895,7 +1896,8 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } - dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_name = wined3d_texture_gl_get_texture_name(wined3d_texture_gl(dst_texture), + context, location == WINED3D_LOCATION_TEXTURE_SRGB); GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_level, src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_level, @@ -2218,7 +2220,8 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glAlphaFunc"); } - context_draw_textured_quad(context, src_texture, src_sub_resource_idx, src_rect, dst_rect, filter); + context_draw_textured_quad(context, wined3d_texture_gl(src_texture), + src_sub_resource_idx, src_rect, dst_rect, filter); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1f0fd108362..8de88714d10 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -356,7 +356,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str texture_prev = wined3d_texture_gl(swapchain->back_buffers[0]); /* Back buffer 0 is already in the draw binding. */ - tex0 = texture_prev->t.texture_rgb; + tex0 = texture_prev->texture_rgb; rb0 = texture_prev->rb_multisample; locations0 = texture_prev->t.sub_resources[0].locations; @@ -368,7 +368,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str if (!(sub_resource->locations & supported_locations)) wined3d_texture_load_location(&texture->t, 0, context, texture->t.resource.draw_binding); - texture_prev->t.texture_rgb = texture->t.texture_rgb; + texture_prev->texture_rgb = texture->texture_rgb; texture_prev->rb_multisample = texture->rb_multisample; wined3d_texture_validate_location(&texture_prev->t, 0, sub_resource->locations & supported_locations); @@ -377,7 +377,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str texture_prev = texture; } - texture_prev->t.texture_rgb = tex0; + texture_prev->texture_rgb = tex0; texture_prev->rb_multisample = rb0; wined3d_texture_validate_location(&texture_prev->t, 0, locations0 & supported_locations); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 42bae136a53..f1a2498f777 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -670,18 +670,18 @@ static void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; - if (texture_gl->t.texture_rgb.name || texture_gl->t.texture_srgb.name + if (texture_gl->texture_rgb.name || texture_gl->texture_srgb.name || texture_gl->rb_multisample || texture_gl->rb_resolved) { context = context_acquire(device, NULL, 0); gl_info = context->gl_info; } - if (texture_gl->t.texture_rgb.name) - gltexture_delete(device, context->gl_info, &texture_gl->t.texture_rgb); + if (texture_gl->texture_rgb.name) + gltexture_delete(device, context->gl_info, &texture_gl->texture_rgb); - if (texture_gl->t.texture_srgb.name) - gltexture_delete(device, context->gl_info, &texture_gl->t.texture_srgb); + if (texture_gl->texture_srgb.name) + gltexture_delete(device, context->gl_info, &texture_gl->texture_srgb); if (texture_gl->rb_multisample) { @@ -957,28 +957,28 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_ } /* Context activation is done by the caller. */ -void wined3d_texture_bind(struct wined3d_texture *texture, +void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, BOOL srgb) { - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = texture->resource.format; + const struct wined3d_format *format = texture_gl->t.resource.format; const struct color_fixup_desc fixup = format->color_fixup; + const struct wined3d_gl_info *gl_info = context->gl_info; struct gl_texture *gl_tex; GLenum target; - TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); + TRACE("texture_gl %p, context %p, srgb %#x.\n", texture_gl, context, srgb); - if (!needs_separate_srgb_gl_texture(context, texture)) + if (!needs_separate_srgb_gl_texture(context, &texture_gl->t)) srgb = FALSE; /* sRGB mode cache for preload() calls outside drawprim. */ if (srgb) - texture->flags |= WINED3D_TEXTURE_IS_SRGB; + texture_gl->t.flags |= WINED3D_TEXTURE_IS_SRGB; else - texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; + texture_gl->t.flags &= ~WINED3D_TEXTURE_IS_SRGB; - gl_tex = wined3d_texture_get_gl_texture(texture, srgb); - target = texture->target; + gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); + target = texture_gl->t.target; if (gl_tex->name) { @@ -1016,7 +1016,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, else gl_tex->sampler_desc.srgb_decode = srgb; gl_tex->base_level = 0; - wined3d_texture_set_dirty(texture); + wined3d_texture_set_dirty(&texture_gl->t); context_bind_texture(context, target, gl_tex->name); @@ -1028,8 +1028,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, * GL_TEXTURE_RECTANGLE_ARB.) */ if (target != GL_TEXTURE_RECTANGLE_ARB) { - TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture_gl->t.level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); } @@ -1041,7 +1041,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); } - if (texture->flags & WINED3D_TEXTURE_COND_NP2) + if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) { /* Conditinal non power of two textures use a different clamping * default. If we're using the GL_WINE_normalized_texrect partial @@ -1080,7 +1080,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, } /* Context activation is done by the caller. */ -void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, +void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, BOOL srgb) { /* We don't need a specific texture unit, but after binding the texture @@ -1103,22 +1103,22 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - wined3d_texture_bind(texture, context, srgb); + wined3d_texture_gl_bind(texture_gl, context, srgb); } /* Context activation is done by the caller (state handler). */ /* This function relies on the correct texture being bound and loaded. */ -void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, +void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum target = texture->target; + GLenum target = texture_gl->t.target; struct gl_texture *gl_tex; DWORD state; - TRACE("texture %p, sampler_desc %p, context %p.\n", texture, sampler_desc, context); + TRACE("texture_gl %p, sampler_desc %p, context %p.\n", texture_gl, sampler_desc, context); - gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); + gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); state = sampler_desc->address_u; if (state != gl_tex->sampler_desc.address_u) @@ -1402,16 +1402,18 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) { + struct wined3d_resource *resource; DWORD old = texture->lod; TRACE("texture %p, lod %u.\n", texture, lod); /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ - if (!wined3d_resource_access_is_managed(texture->resource.access)) + resource = &texture->resource; + if (!wined3d_resource_access_is_managed(resource->access)) { TRACE("Ignoring LOD on texture with resource access %s.\n", - wined3d_debug_resource_access(texture->resource.access)); + wined3d_debug_resource_access(resource->access)); return 0; } @@ -1420,14 +1422,14 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) if (texture->lod != lod) { - struct wined3d_device *device = texture->resource.device; + struct wined3d_device *device = resource->device; - wined3d_resource_wait_idle(&texture->resource); + wined3d_resource_wait_idle(resource); texture->lod = lod; - texture->texture_rgb.base_level = ~0u; - texture->texture_srgb.base_level = ~0u; - if (texture->resource.bind_count) + wined3d_texture_gl(texture)->texture_rgb.base_level = ~0u; + wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u; + if (resource->bind_count) wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, device->state.sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } @@ -1777,7 +1779,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win } format_gl = wined3d_format_gl(format); - wined3d_texture_bind_and_dirtify(texture, context, srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, srgb); if (srgb) internal = format_gl->srgb_internal; @@ -2152,7 +2154,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s for (i = 0; i < device->context_count; ++i) { - context_texture_update(device->contexts[i], texture); + context_texture_update(device->contexts[i], wined3d_texture_gl(texture)); } } } @@ -2773,8 +2775,8 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_bind_and_dirtify(texture, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), + context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -2785,7 +2787,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_bind_and_dirtify(texture, context, + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); @@ -2806,9 +2808,9 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_bind_and_dirtify(texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); else - wined3d_texture_bind_and_dirtify(texture, context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; @@ -2827,9 +2829,9 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_bind_and_dirtify(texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); else - wined3d_texture_bind_and_dirtify(texture, context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); } @@ -3214,9 +3216,9 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, !dest_is_srgb); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, dest_is_srgb); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); @@ -3243,8 +3245,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_bind_and_dirtify(texture, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), + context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3255,8 +3257,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_bind_and_dirtify(texture, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), + context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3284,9 +3286,9 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_bind_and_dirtify(texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); else - wined3d_texture_bind_and_dirtify(texture, context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; @@ -3305,9 +3307,9 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_bind_and_dirtify(texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); else - wined3d_texture_bind_and_dirtify(texture, context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); } @@ -3843,7 +3845,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_prepare_texture(dst_texture, context, FALSE); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), context, FALSE); src_level = src_sub_resource_idx % src_texture->level_count; wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, @@ -3871,7 +3873,7 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); - wined3d_texture_bind_and_dirtify(src_texture, context, + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), context, !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 618b7454ed1..3b579a25f0f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -166,7 +166,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ } static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, - const struct wined3d_view_desc *desc, struct wined3d_texture *texture, + const struct wined3d_view_desc *desc, struct wined3d_texture_gl *texture_gl, const struct wined3d_format *view_format) { const struct wined3d_format_gl *view_format_gl; @@ -178,7 +178,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target view_format_gl = wined3d_format_gl(view_format); view->target = view_target; - context = context_acquire(texture->resource.device, NULL, 0); + context = context_acquire(texture_gl->t.resource.device, NULL, 0); gl_info = context->gl_info; if (!gl_info->supported[ARB_TEXTURE_VIEW]) @@ -188,15 +188,15 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target return; } - wined3d_texture_prepare_texture(texture, context, FALSE); - texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); + wined3d_texture_prepare_texture(&texture_gl->t, context, FALSE); + texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); level_idx = desc->u.texture.level_idx; layer_idx = desc->u.texture.layer_idx; layer_count = desc->u.texture.layer_count; if (view_target == GL_TEXTURE_3D) { - if (layer_idx || layer_count != wined3d_texture_get_level_depth(texture, level_idx)) + if (layer_idx || layer_count != wined3d_texture_get_level_depth(&texture_gl->t, level_idx)) FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); layer_idx = 0; layer_count = 1; @@ -537,13 +537,13 @@ static void wined3d_render_target_view_cs_init(void *object) } else { - struct wined3d_texture *texture = texture_from_resource(resource); + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(resource)); unsigned int depth_or_layer_count; if (resource->type == WINED3D_RTYPE_TEXTURE_3D) - depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + depth_or_layer_count = wined3d_texture_get_level_depth(&texture_gl->t, desc->u.texture.level_idx); else - depth_or_layer_count = texture->layer_count; + depth_or_layer_count = texture_gl->t.layer_count; if (resource->format->id != view->format->id || (view->layer_count != 1 && view->layer_count != depth_or_layer_count)) @@ -558,13 +558,13 @@ static void wined3d_render_target_view_cs_init(void *object) debug_d3dformat(resource->format->id), debug_d3dformat(view->format->id)); return; } - if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + if (texture_gl->t.swapchain && texture_gl->t.swapchain->desc.backbuffer_count > 1) { FIXME("Swapchain views not supported.\n"); return; } - create_texture_view(&view->gl_view, texture->target, desc, texture, view->format); + create_texture_view(&view->gl_view, texture_gl->t.target, desc, texture_gl, view->format); } } } @@ -742,32 +742,32 @@ static void wined3d_shader_resource_view_cs_init(void *object) } else { - struct wined3d_texture *texture = texture_from_resource(resource); + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(resource)); GLenum resource_class, view_class; resource_class = wined3d_format_gl(resource->format)->view_class; view_class = wined3d_format_gl(view_format)->view_class; - view_target = get_texture_view_target(gl_info, desc, texture); + view_target = get_texture_view_target(gl_info, desc, &texture_gl->t); - if (resource->format->id == view_format->id && texture->target == view_target - && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + if (resource->format->id == view_format->id && texture_gl->t.target == view_target + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture_gl->t.level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture_gl->t.layer_count && !is_stencil_view_format(view_format)) { TRACE("Creating identity shader resource view.\n"); } - else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + else if (texture_gl->t.swapchain && texture_gl->t.swapchain->desc.backbuffer_count > 1) { FIXME("Swapchain shader resource views not supported.\n"); } else if (resource->format->typeless_id == view_format->typeless_id && resource_class == view_class) { - create_texture_view(&view->gl_view, view_target, desc, texture, view_format); + create_texture_view(&view->gl_view, view_target, desc, texture_gl, view_format); } else if (wined3d_format_is_depth_view(resource->format->id, view_format->id)) { - create_texture_view(&view->gl_view, view_target, desc, texture, resource->format); + create_texture_view(&view->gl_view, view_target, desc, texture_gl, resource->format); } else { @@ -826,7 +826,7 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture; + struct wined3d_texture_gl *texture_gl; context_active_texture(context, gl_info, unit); @@ -843,9 +843,9 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view return; } - texture = wined3d_texture_from_resource(view->resource); - wined3d_texture_bind(texture, context, FALSE); - wined3d_sampler_bind(sampler, unit, texture, context); + texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view->resource)); + wined3d_texture_gl_bind(texture_gl, context, FALSE); + wined3d_sampler_bind(sampler, unit, texture_gl, context); } /* Context activation is done by the caller. */ @@ -868,9 +868,9 @@ static void shader_resource_view_bind_and_dirtify(struct wined3d_shader_resource void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) { - struct wined3d_texture *texture = texture_from_resource(view->resource); unsigned int i, j, layer_count, level_count, base_level, max_level; const struct wined3d_gl_info *gl_info; + struct wined3d_texture_gl *texture_gl; struct wined3d_context *context; struct gl_texture *gl_tex; DWORD location; @@ -885,10 +885,11 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * base_level = view->desc.u.texture.level_idx; max_level = base_level + level_count - 1; - srgb = !!(texture->flags & WINED3D_TEXTURE_IS_SRGB); + texture_gl = wined3d_texture_gl(texture_from_resource(view->resource)); + srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) - wined3d_texture_load_location(texture, i * level_count + base_level, context, location); + wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, context, location); if (view->gl_view.name) { @@ -896,37 +897,38 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } else { - wined3d_texture_bind_and_dirtify(texture, context, srgb); - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, max_level); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context, srgb); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_MAX_LEVEL, max_level); } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(context->active_texture, 0)); - gl_tex = wined3d_texture_get_gl_texture(texture, srgb); + gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); if (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) { - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_SRGB_DECODE_EXT, + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); gl_tex->sampler_desc.srgb_decode = FALSE; } - gl_info->fbo_ops.glGenerateMipmap(texture->target); + gl_info->fbo_ops.glGenerateMipmap(texture_gl->t.target); checkGLcall("glGenerateMipMap()"); for (i = 0; i < layer_count; ++i) { for (j = base_level + 1; j <= max_level; ++j) { - wined3d_texture_validate_location(texture, i * level_count + j, location); - wined3d_texture_invalidate_location(texture, i * level_count + j, ~location); + wined3d_texture_validate_location(&texture_gl->t, i * level_count + j, location); + wined3d_texture_invalidate_location(&texture_gl->t, i * level_count + j, ~location); } } if (!view->gl_view.name) { gl_tex->base_level = base_level; - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->t.target, + GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); } context_release(context); @@ -1129,18 +1131,18 @@ static void wined3d_unordered_access_view_cs_init(void *object) } else { - struct wined3d_texture *texture = texture_from_resource(resource); + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(resource)); unsigned int depth_or_layer_count; if (resource->type == WINED3D_RTYPE_TEXTURE_3D) - depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + depth_or_layer_count = wined3d_texture_get_level_depth(&texture_gl->t, desc->u.texture.level_idx); else - depth_or_layer_count = texture->layer_count; + depth_or_layer_count = texture_gl->t.layer_count; if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), - desc, texture, view->format); + create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, &texture_gl->t), + desc, texture_gl, view->format); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e4cd7d39984..861c6475420 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -72,6 +72,12 @@ #define WINED3D_QUIRK_LIMITED_TEX_FILTERING 0x00000100 #define WINED3D_QUIRK_BROKEN_ARB_FOG 0x00000200 +struct fragment_pipeline; +struct wined3d_context; +struct wined3d_state; +struct wined3d_texture_gl; +struct wined3d_vertex_pipe_ops; + enum wined3d_ffp_idx { WINED3D_FFP_POSITION = 0, @@ -1392,11 +1398,6 @@ struct gs_compile_args DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; -struct wined3d_context; -struct wined3d_state; -struct fragment_pipeline; -struct wined3d_vertex_pipe_ops; - struct wined3d_shader_backend_ops { void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); @@ -2166,10 +2167,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture *texture, +void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture *texture, +void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; @@ -2202,7 +2203,8 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_texture_update(struct wined3d_context *context, const struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void context_texture_update(struct wined3d_context *context, + const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void context_unload_tex_coords(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; @@ -3169,13 +3171,6 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC #define RESOURCE_ALIGNMENT 16 #define WINED3D_CONSTANT_BUFFER_ALIGNMENT 16 -struct gl_texture -{ - struct wined3d_sampler_desc sampler_desc; - unsigned int base_level; - GLuint name; -}; - struct wined3d_blt_info { GLenum bind_target; @@ -3211,7 +3206,6 @@ struct wined3d_texture { struct wined3d_resource resource; const struct wined3d_texture_ops *texture_ops; - struct gl_texture texture_rgb, texture_srgb; struct wined3d_swapchain *swapchain; unsigned int pow2_width; unsigned int pow2_height; @@ -3296,12 +3290,6 @@ static inline GLenum wined3d_texture_get_sub_resource_target(const struct wined3 ? cube_targets[sub_resource_idx / texture->level_count] : texture->target; } -static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_texture *texture, - BOOL srgb) -{ - return srgb ? &texture->texture_srgb : &texture->texture_rgb; -} - static inline unsigned int wined3d_texture_get_level_width(const struct wined3d_texture *texture, unsigned int level) { @@ -3358,12 +3346,6 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_texture_bind(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3400,10 +3382,19 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; +struct gl_texture +{ + struct wined3d_sampler_desc sampler_desc; + unsigned int base_level; + GLuint name; +}; + struct wined3d_texture_gl { struct wined3d_texture t; + struct gl_texture texture_rgb, texture_srgb; + GLuint rb_multisample; GLuint rb_resolved; @@ -3416,6 +3407,18 @@ static inline struct wined3d_texture_gl *wined3d_texture_gl(struct wined3d_textu return CONTAINING_RECORD(texture, struct wined3d_texture_gl, t); } +static inline struct gl_texture *wined3d_texture_gl_get_gl_texture(struct wined3d_texture_gl *texture_gl, + BOOL srgb) +{ + return srgb ? &texture_gl->texture_srgb : &texture_gl->texture_rgb; +} + +void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; @@ -3476,7 +3479,7 @@ struct wined3d_sampler }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture *texture, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration_element { @@ -4506,11 +4509,11 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } -static inline GLuint wined3d_texture_get_texture_name(const struct wined3d_texture *texture, +static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context, BOOL srgb) { - return srgb && needs_separate_srgb_gl_texture(context, texture) - ? texture->texture_srgb.name : texture->texture_rgb.name; + return srgb && needs_separate_srgb_gl_texture(context, &texture_gl->t) + ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; } static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) -- 2.11.0

2 1

[PATCH v6] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 30 Oct '18

30 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 67 ++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 78 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..aeba9f73e7 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + WCHAR *cue_banner_text; /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED)) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,57 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +{ + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + if (focus) + FIXME("cue banner for focused control not implemented.\n"); + + heap_free(es->cue_banner_text); + es->cue_banner_text = heap_strdupW(cue_text); + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (es->style & ES_MULTILINE) + return FALSE; + + if (!es->cue_banner_text) + { + if (buf && size) + *buf = 0; + return FALSE; + } + else + { + if (buf) + lstrcpynW(buf, es->cue_banner_text, size); + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4547,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); + heap_free(es->cue_banner_text); heap_free(es); return 0; @@ -4703,6 +4762,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (BOOL)wParam, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1cbb..bc44d0c240 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,83 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR getcuetestW[5] = {'T',0}; + static const WCHAR testcmp1W[] = {'T','e','s','t',0}; + static const WCHAR testcmp2W[] = {'T','e','s',0}; + static const WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + if (lstrcmpW(getcuetestW, emptyW) != 0) + { + win_skip("skipping for Win XP and 2003 Server.\n"); + DestroyWindow(hwnd_edit); + return; + } + ok(lstrcmpW(getcuetestW, emptyW) == 0, "First char is %c\n", getcuetestW[0]); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 0); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testcmp1W); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(getcuetestW, testcmp2W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3215,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses(); -- 2.17.1

3 2

[PATCH 3/3] comctl32/taskdialog: Handle button clicks better.
by Zhiyi Zhang 30 Oct '18

30 Oct '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 34 +++++++++----- dlls/comctl32/tests/taskdialog.c | 77 ++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 0adfb2f32c..5645d53f79 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -95,7 +95,8 @@ struct button_layout_info LONG line; }; -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); +static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam); +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd, WORD id); static void taskdialog_layout(struct taskdialog_info *dialog_info); static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) @@ -209,9 +210,7 @@ static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) { - HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); - if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); - if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); + if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, id, 0) == S_OK) EndDialog(dialog_info->hwnd, id); } static void taskdialog_button_set_shield(const struct taskdialog_info *dialog_info, INT id, BOOL elevate) @@ -303,19 +302,22 @@ static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_inf } } -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd, WORD id) { - INT command_id = GetWindowLongW(hwnd, GWLP_ID); - HWND radio_button; + INT command_id; + HWND button, radio_button; + + /* Prefer the id from hwnd because the id from WM_COMMAND is truncated to WORD */ + command_id = hwnd ? GetWindowLongW(hwnd, GWLP_ID) : id; - if (hwnd == dialog_info->expando_button) + if (hwnd && hwnd == dialog_info->expando_button) { taskdialog_toggle_expando_control(dialog_info); taskdialog_notify(dialog_info, TDN_EXPANDO_BUTTON_CLICKED, dialog_info->expanded, 0); return; } - if (hwnd == dialog_info->verification_box) + if (hwnd && hwnd == dialog_info->verification_box) { dialog_info->verification_checked = !dialog_info->verification_checked; taskdialog_notify(dialog_info, TDN_VERIFICATION_CLICKED, dialog_info->verification_checked, 0); @@ -330,7 +332,15 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND return; } - if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) + button = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, command_id); + if (!button) button = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, command_id); + if (!button && command_id == IDOK) + { + button = dialog_info->command_link_count > 0 ? dialog_info->command_links[0] : dialog_info->buttons[0]; + command_id = GetWindowLongW(button, GWLP_ID); + } + + if (button && taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) EndDialog(dialog_info->hwnd, command_id); } @@ -582,7 +592,7 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo if (default_button) { SendMessageW(default_button, BM_SETCHECK, BST_CHECKED, 0); - taskdialog_on_button_click(dialog_info, default_button); + taskdialog_on_button_click(dialog_info, default_button, 0); } } @@ -1332,7 +1342,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - taskdialog_on_button_click(dialog_info, (HWND)lParam); + taskdialog_on_button_click(dialog_info, (HWND)lParam, LOWORD(wParam)); break; } return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8f4c97b750..d25c67f7bc 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -229,6 +229,66 @@ static const struct message_info msg_return_press_negative_id_radio_button[] = { 0 } }; +static const struct message_info msg_send_all_common_button_click[] = +{ + { TDM_CLICK_BUTTON, IDOK, 0 }, + { TDM_CLICK_BUTTON, IDYES, 0 }, + { TDM_CLICK_BUTTON, IDNO, 0 }, + { TDM_CLICK_BUTTON, IDCANCEL, 0 }, + { TDM_CLICK_BUTTON, IDRETRY, 0 }, + { TDM_CLICK_BUTTON, IDCLOSE, 0 }, + { TDM_CLICK_BUTTON, ID_START_BUTTON + 99, 0 }, + { 0 } +}; + +static const struct message_info msg_press_nonexistent_buttons[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_all_common_button_click }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDYES, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDNO, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDCANCEL, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDRETRY, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, IDCLOSE, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, ID_START_BUTTON + 99, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_send_all_common_button_click_with_command[] = +{ + { WM_COMMAND, MAKEWORD(IDOK, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDYES, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDNO, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDCANCEL, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDRETRY, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDCLOSE, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(ID_START_BUTTON + 99, BN_CLICKED), 0 }, + { WM_COMMAND, MAKEWORD(IDOK, BN_CLICKED), 0 }, + { 0 } +}; + +static const struct message_info msg_press_nonexistent_buttons_with_command[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_all_common_button_click_with_command }, + { TDN_BUTTON_CLICKED, ID_START_BUTTON, 0, S_FALSE, NULL }, + { TDN_BUTTON_CLICKED, ID_START_BUTTON, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_send_nonexistent_radio_button_click[] = +{ + { TDM_CLICK_RADIO_BUTTON, ID_START_RADIO_BUTTON + 99, 0 }, + { TDM_CLICK_BUTTON, IDOK, 0 }, + { 0 } +}; + +static const struct message_info msg_press_nonexistent_radio_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_nonexistent_radio_button_click }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static const struct message_info msg_return_default_verification_unchecked[] = { { TDN_CREATED, 0, 0, S_OK, msg_send_click_ok }, @@ -568,6 +628,23 @@ static void test_buttons(void) info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; run_test(&info, IDOK, -2, FALSE, msg_return_press_negative_id_radio_button, "radio button: manually click radio button with negative id"); + + /* Test sending clicks to non-existent buttons. Notification of non-existent buttons will be sent */ + info.cButtons = TEST_NUM_BUTTONS; + info.pButtons = custom_buttons; + info.cRadioButtons = TEST_NUM_RADIO_BUTTONS; + info.pRadioButtons = radio_buttons; + info.dwCommonButtons = 0; + info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; + run_test(&info, ID_START_BUTTON + 99, 0, FALSE, msg_press_nonexistent_buttons, "sends click to non-existent buttons"); + + /* Non-existent button clicks sent by WM_COMMAND won't generate TDN_BUTTON_CLICKED except IDOK. + * And will get the first existent button identifier instead of IDOK */ + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_press_nonexistent_buttons_with_command, + "sends click to non-existent buttons with WM_COMMAND"); + + /* Non-existent radio button won't get notifications */ + run_test(&info, IDOK, 0, FALSE, msg_press_nonexistent_radio_button, "sends click to non-existent radio buttons"); } static void test_help(void) -- 2.19.1

2 1

[PATCH 2/3] comctl32/taskdialog: Add support for TDF_ALLOW_DIALOG_CANCELLATION.
by Zhiyi Zhang 30 Oct '18

30 Oct '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 17 +++++++++++ dlls/comctl32/tests/taskdialog.c | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 9bfdef939e..0adfb2f32c 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -84,6 +84,7 @@ struct taskdialog_info INT selected_radio_id; BOOL verification_checked; BOOL expanded; + BOOL has_cancel; WCHAR *expanded_text; WCHAR *collapsed_text; }; @@ -1197,6 +1198,13 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) id = GetWindowLongW(dialog_info->default_button, GWLP_ID); SendMessageW(dialog_info->hwnd, DM_SETDEFID, id, 0); + dialog_info->has_cancel = + (taskconfig->dwFlags & TDF_ALLOW_DIALOG_CANCELLATION) + || taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, IDCANCEL) + || taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, IDCANCEL); + + if (!dialog_info->has_cancel) DeleteMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); + taskdialog_layout(dialog_info); } @@ -1369,6 +1377,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR RemovePropW(hwnd, taskdialog_info_propnameW); taskdialog_destroy(dialog_info); break; + case WM_CLOSE: + if (dialog_info->has_cancel) + { + if(taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, IDCANCEL, 0) == S_OK) + EndDialog(hwnd, IDCANCEL); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); + break; + } + return FALSE; default: return FALSE; } diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 093671c30f..8f4c97b750 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -290,6 +290,34 @@ static const struct message_info msg_return_navigated_page[] = { 0 } }; +static const struct message_info msg_send_close[] = +{ + { WM_CLOSE, 0, 0, 0}, + { 0 } +}; + +static const struct message_info msg_handle_wm_close[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_close }, + { TDN_BUTTON_CLICKED, IDCANCEL, 0, S_FALSE, msg_send_close }, + { TDN_BUTTON_CLICKED, IDCANCEL, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_send_close_then_ok[] = +{ + { WM_CLOSE, 0, 0, 0}, + { TDM_CLICK_BUTTON, IDOK, 0 }, + { 0 } +}; + +static const struct message_info msg_handle_wm_close_without_cancel_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_close_then_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -739,6 +767,26 @@ static void test_navigate_page(void) run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: invalid taskconfig cbSize"); } +static void test_wm_close(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + + /* WM_CLOSE can end the dialog only when a cancel button is present or dwFlags has TDF_ALLOW_DIALOG_CANCELLATION */ + info.dwCommonButtons = TDCBF_OK_BUTTON; + run_test(&info, IDOK, 0, FALSE, msg_handle_wm_close_without_cancel_button, "send WM_CLOSE without cancel button"); + + info.dwFlags = TDF_ALLOW_DIALOG_CANCELLATION; + run_test(&info, IDCANCEL, 0, FALSE, msg_handle_wm_close, "send WM_CLOSE with TDF_ALLOW_DIALOG_CANCELLATION"); + + info.dwFlags = 0; + info.dwCommonButtons = TDCBF_CANCEL_BUTTON; + run_test(&info, IDCANCEL, 0, FALSE, msg_handle_wm_close, "send WM_CLOSE with a cancel button"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -780,6 +828,7 @@ START_TEST(taskdialog) test_progress_bar(); test_verification_box(); test_navigate_page(); + test_wm_close(); unload_v6_module(ctx_cookie, hCtx); } -- 2.19.1

2 1

[PATCH 1/3] comctl32/taskdialog: Fix id casting.
by Zhiyi Zhang 30 Oct '18

30 Oct '18

This fix tests on 64bit because id is a signed int. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1d91e1d55d..9bfdef939e 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -666,7 +666,7 @@ static void taskdialog_add_radio_buttons(struct taskdialog_info *dialog_info) textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pRadioButtons[i].pszButtonText); dialog_info->radio_buttons[i] = CreateWindowW(WC_BUTTONW, textW, i == 0 ? style | WS_GROUP : style, 0, 0, 0, 0, dialog_info->hwnd, - ULongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); + LongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->radio_buttons[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW); } @@ -692,7 +692,7 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) style = is_default ? default_style | BS_DEFCOMMANDLINK : default_style | BS_COMMANDLINK; textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pButtons[i].pszButtonText); dialog_info->command_links[i] = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, - ULongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); + LongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->command_links[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW); -- 2.19.1

2 1

[PATCH] kernel32: Implement FindStringOrdinal.
by Zhiyi Zhang 30 Oct '18

30 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46035 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-libraryloader-l1-1-0.spec | 2 +- .../api-ms-win-core-libraryloader-l1-1-1.spec | 2 +- .../api-ms-win-core-libraryloader-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 49 +++++++++++++ dlls/kernel32/tests/locale.c | 70 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/libloaderapi.h | 1 + 8 files changed, 125 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec b/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec index 7d1fcac9e2..a011bee54f 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-1-0/api-ms-win-core-libraryloader-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub EnumResourceTypesExA @ stub EnumResourceTypesExW @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW -@ stub FindStringOrdinal +@ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal @ stdcall FreeLibrary(long) kernel32.FreeLibrary @ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread @ stdcall FreeResource(long) kernel32.FreeResource diff --git a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec index 9c0bed10f6..eea8f235c8 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-1-1/api-ms-win-core-libraryloader-l1-1-1.spec @@ -7,7 +7,7 @@ @ stub EnumResourceTypesExA @ stub EnumResourceTypesExW @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW -@ stub FindStringOrdinal +@ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal @ stdcall FreeLibrary(long) kernel32.FreeLibrary @ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread @ stdcall FreeResource(long) kernel32.FreeResource diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec index 7d1fcac9e2..a011bee54f 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec @@ -7,7 +7,7 @@ @ stub EnumResourceTypesExA @ stub EnumResourceTypesExW @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW -@ stub FindStringOrdinal +@ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal @ stdcall FreeLibrary(long) kernel32.FreeLibrary @ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread @ stdcall FreeResource(long) kernel32.FreeResource diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c38b8f81f5..74af2a4570 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -511,7 +511,7 @@ @ stdcall FindResourceExA(long str str long) @ stdcall FindResourceExW(long wstr wstr long) @ stdcall FindResourceW(long wstr wstr) -# @ stub FindStringOrdinal +@ stdcall FindStringOrdinal(long wstr long wstr long long) @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) @ stdcall FlsAlloc(ptr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4d1eac6ebe..e62b849d09 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5999,3 +5999,52 @@ INT WINAPI FindNLSStringEx(const WCHAR *localename, DWORD flags, const WCHAR *sr return -1; } + +/****************************************************************************** + * FindStringOrdinal (KERNEL32.@) + */ + +INT WINAPI FindStringOrdinal(DWORD flag, const WCHAR *src, INT src_size, const WCHAR *val, INT val_size, + BOOL ignore_case) +{ + INT offset, inc, count; + TRACE("%#x %s %d %s %d %d\n", flag, wine_dbgstr_w(src), src_size, wine_dbgstr_w(val), val_size, ignore_case); + + if (!src || !val) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + + if (flag != FIND_FROMSTART && flag != FIND_FROMEND && flag != FIND_STARTSWITH && flag != FIND_ENDSWITH) + { + SetLastError(ERROR_INVALID_FLAGS); + return -1; + } + + if (src_size == -1) src_size = strlenW(src); + if (val_size == -1) val_size = strlenW(val); + + src_size -= val_size; + if (src_size < 0) + { + SetLastError(NO_ERROR); + return -1; + } + + count = flag & (FIND_FROMSTART | FIND_FROMEND) ? src_size + 1 : 1; + offset = flag & (FIND_FROMSTART | FIND_STARTSWITH) ? 0 : src_size; + inc = flag & (FIND_FROMSTART | FIND_STARTSWITH) ? 1 : -1; + while (count--) + { + if (CompareStringOrdinal(src + offset, val_size, val, val_size, ignore_case) == CSTR_EQUAL) + { + SetLastError(NO_ERROR); + return offset; + } + offset += inc; + } + + SetLastError(NO_ERROR); + return -1; +} diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d3eb2ecf15..3357d0db9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -107,6 +107,7 @@ static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); +static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); static void InitFunctionPointers(void) { @@ -143,6 +144,7 @@ static void InitFunctionPointers(void) X(SetThreadUILanguage); X(GetThreadUILanguage); X(NormalizeString); + X(FindStringOrdinal); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5496,6 +5498,73 @@ static void test_FindNLSStringEx(void) } } +static void test_FindStringOrdinal(void) +{ + static const WCHAR abc123aBcW[] = {'a', 'b', 'c', '1', '2', '3', 'a', 'B', 'c', 0}; + static const WCHAR abcW[] = {'a', 'b', 'c', 0}; + static const WCHAR aBcW[] = {'a', 'B', 'c', 0}; + static const WCHAR aaaW[] = {'a', 'a', 'a', 0}; + static const struct + { + DWORD flag; + const WCHAR *src; + INT src_size; + const WCHAR *val; + INT val_size; + BOOL ignore_case; + INT ret; + DWORD err; + } + tests[] = + { + /* Invalid */ + {1, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, -1, ERROR_INVALID_FLAGS}, + {FIND_FROMSTART, NULL, ARRAY_SIZE(abc123aBcW) - 1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, -1, + ERROR_INVALID_PARAMETER}, + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, NULL, ARRAY_SIZE(abcW) - 1, FALSE, -1, + ERROR_INVALID_PARAMETER}, + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, NULL, 0, FALSE, -1, ERROR_INVALID_PARAMETER}, + {FIND_FROMSTART, NULL, 0, abcW, ARRAY_SIZE(abcW) - 1, FALSE, -1, ERROR_INVALID_PARAMETER}, + {FIND_FROMSTART, NULL, 0, NULL, 0, FALSE, -1, ERROR_INVALID_PARAMETER}, + /* Case-insensitive */ + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, 0, NO_ERROR}, + {FIND_FROMEND, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, 0, NO_ERROR}, + {FIND_STARTSWITH, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, 0, NO_ERROR}, + {FIND_ENDSWITH, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, -1, NO_ERROR}, + /* Case-sensitive */ + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, aBcW, ARRAY_SIZE(aBcW) - 1, TRUE, 0, NO_ERROR}, + {FIND_FROMEND, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, aBcW, ARRAY_SIZE(aBcW) - 1, TRUE, 6, NO_ERROR}, + {FIND_STARTSWITH, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, aBcW, ARRAY_SIZE(aBcW) - 1, TRUE, 0, NO_ERROR}, + {FIND_ENDSWITH, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, aBcW, ARRAY_SIZE(aBcW) - 1, TRUE, 6, NO_ERROR}, + /* Other */ + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, aaaW, ARRAY_SIZE(aaaW) - 1, FALSE, -1, NO_ERROR}, + {FIND_FROMSTART, abc123aBcW, -1, abcW, ARRAY_SIZE(abcW) - 1, FALSE, 0, NO_ERROR}, + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, -1, FALSE, 0, NO_ERROR}, + {FIND_FROMSTART, abc123aBcW, 0, abcW, ARRAY_SIZE(abcW) - 1, FALSE, -1, NO_ERROR}, + {FIND_FROMSTART, abc123aBcW, ARRAY_SIZE(abc123aBcW) - 1, abcW, 0, FALSE, 0, NO_ERROR}, + {FIND_FROMSTART, abc123aBcW, 0, abcW, 0, FALSE, 0, NO_ERROR}, + }; + INT ret; + DWORD err; + INT i; + + if (!pFindStringOrdinal) + { + win_skip("FindStringOrdinal is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + SetLastError(0xdeadbeef); + ret = pFindStringOrdinal(tests[i].flag, tests[i].src, tests[i].src_size, tests[i].val, tests[i].val_size, + tests[i].ignore_case); + err = GetLastError(); + ok(ret == tests[i].ret, "Item %d expected %d, got %d\n", i, tests[i].ret, ret); + ok(err == tests[i].err, "Item %d expected %#x, got %#x\n", i, tests[i].err, err); + } +} + static void test_SetThreadUILanguage(void) { LANGID res; @@ -5746,6 +5815,7 @@ START_TEST(locale) test_GetThreadPreferredUILanguages(); test_GetUserPreferredUILanguages(); test_FindNLSStringEx(); + test_FindStringOrdinal(); test_SetThreadUILanguage(); test_NormalizeString(); /* this requires collation table patch to make it MS compatible */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9e51ae44e0..f3b4fd131f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -373,7 +373,7 @@ # @ stub FindPackagesByPackageFamily @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW @ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW -@ stub FindStringOrdinal +@ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal @ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose @ stdcall FlsAlloc(ptr) kernel32.FlsAlloc @ stdcall FlsFree(long) kernel32.FlsFree diff --git a/include/libloaderapi.h b/include/libloaderapi.h index 8f112a7d60..abb848f6e9 100644 --- a/include/libloaderapi.h +++ b/include/libloaderapi.h @@ -28,6 +28,7 @@ typedef void *DLL_DIRECTORY_COOKIE, **PDLL_DIRECTORY_COOKIE; WINBASEAPI DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory(const WCHAR *); WINBASEAPI BOOL WINAPI RemoveDllDirectory(DLL_DIRECTORY_COOKIE); WINBASEAPI BOOL WINAPI SetDefaultDllDirectories(DWORD); +WINBASEAPI INT WINAPI FindStringOrdinal(DWORD, const WCHAR *, INT, const WCHAR *, INT, BOOL); #ifdef __cplusplus } -- 2.19.1

2 1

[PATCH v2] dinput: Use the same GUID for Instance and Product
by Brendan McGrath 30 Oct '18

30 Oct '18

This matches the behaviour of DirectInput8 native and appears to be required for some games to recognise the mouse and keyboard as a mouse and keyboard. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v1: a) Added the signed-off tag; and b) Changed the Unicode equivalent to match the ASCII version This resulted in no more uses of those GUIDs, so I also cleaned up any reference to them dlls/dinput/device_private.h | 3 --- dlls/dinput/dinput_main.c | 6 ++---- dlls/dinput/keyboard.c | 11 +++-------- dlls/dinput/mouse.c | 11 +++-------- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 52bbec4490..d9e2997eaa 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -114,9 +114,6 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -extern const GUID DInput_Wine_Keyboard_GUID DECLSPEC_HIDDEN; -extern const GUID DInput_Wine_Mouse_GUID DECLSPEC_HIDDEN; - /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 28e192af4e..6ed764e748 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1747,12 +1747,10 @@ static DWORD WINAPI hook_thread_proc(void *param) { if (!dev->acquired || !dev->event_proc) continue; - if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard ) || - IsEqualGUID( &dev->guid, &DInput_Wine_Keyboard_GUID )) + if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) kbd_cnt++; else - if (IsEqualGUID( &dev->guid, &GUID_SysMouse ) || - IsEqualGUID( &dev->guid, &DInput_Wine_Mouse_GUID )) + if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) mice_cnt++; } LeaveCriticalSection( &dinput->crit ); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a64c59c603..642d0c0beb 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -145,10 +145,6 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ - 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} -}; - static DWORD get_keyboard_subtype(void) { DWORD kbd_type, kbd_subtype, dev_subtype; @@ -179,7 +175,7 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else @@ -203,7 +199,7 @@ static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else @@ -308,8 +304,7 @@ static HRESULT keyboarddev_create_device(IDirectInputImpl *dinput, REFGUID rguid TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); *pdev = NULL; - if (IsEqualGUID(&GUID_SysKeyboard, rguid) || /* Generic Keyboard */ - IsEqualGUID(&DInput_Wine_Keyboard_GUID, rguid)) /* Wine Keyboard */ + if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ { SysKeyboardImpl *This; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6d3eff5d52..7133359351 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -93,10 +93,6 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); -const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ - 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} -}; - static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i; @@ -121,7 +117,7 @@ static void fill_mouse_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else @@ -145,7 +141,7 @@ static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else @@ -257,8 +253,7 @@ static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, R TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); *pdev = NULL; - if (IsEqualGUID(&GUID_SysMouse, rguid) || /* Generic Mouse */ - IsEqualGUID(&DInput_Wine_Mouse_GUID, rguid)) /* Wine Mouse */ + if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ { SysMouseImpl *This; -- 2.17.1

3 5

[PATCH v3 1/6] oleaut32/tests: Abort earlier if we fail to create a proxy.
by Zebediah Figura 30 Oct '18

30 Oct '18

We are not testing anything meaningful in this case. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 51 +++++++++++++--------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 68547f7e98..aab8f2cd34 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -35,12 +35,6 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) -#ifdef __i386__ -static const int tmarshal_todo = 0; -#else -static const int tmarshal_todo = 1; -#endif - /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) @@ -1436,9 +1430,16 @@ static void test_typelibmarshal(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW); - todo_wine_if(tmarshal_todo) +#ifndef __i386__ + todo_wine +#endif ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); + if (FAILED(hr)) + { + end_host_object(tid, thread); + return; + } hr = IKindaEnumWidget_Next(pKEW, &pWidget); ok_ole_success(hr, IKindaEnumWidget_Next); @@ -1463,7 +1464,6 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1483,7 +1483,6 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1615,7 +1614,6 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONEDISPATCH, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1633,7 +1631,6 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONECOCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1650,7 +1647,6 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); todo_wine ok_ole_success(hr, IDispatch_Invoke); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1670,7 +1666,6 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1726,9 +1721,9 @@ static void test_typelibmarshal(void) V_I4(&vararg[1]) = 2; hr = IWidget_VariantCArray(pWidget, 2, vararg); ok_ole_success(hr, IWidget_VariantCArray); - todo_wine_if(!tmarshal_todo) +todo_wine ok(V_VT(&vararg[0]) == VT_I4 && V_I4(&vararg[0]) == 2, "vararg[0] = %d[%d]\n", V_VT(&vararg[0]), V_I4(&vararg[0])); - todo_wine_if(!tmarshal_todo) +todo_wine ok(V_VT(&vararg[1]) == VT_I4 && V_I4(&vararg[1]) == 3, "vararg[1] = %d[%d]\n", V_VT(&vararg[1]), V_I4(&vararg[1])); /* call VarArg */ @@ -1799,7 +1794,6 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_ERROR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "IDispatch_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1826,7 +1820,6 @@ static void test_typelibmarshal(void) hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult)); - todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -2140,8 +2133,16 @@ static void test_external_connection(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); - todo_wine_if(tmarshal_todo) +#ifndef __i386__ + todo_wine +#endif ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); + if (FAILED(hres)) + { + end_host_object(tid, thread); + IStream_Release(stream); + return; + } ok(external_connections == 1, "external_connections = %d\n", external_connections); IStream_Release(stream); @@ -2149,19 +2150,16 @@ static void test_external_connection(void) /* Creating a stub for new iface causes new external connection. */ hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second); - todo_wine_if(tmarshal_todo) ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres); todo_wine ok(external_connections == 2, "external_connections = %d\n", external_connections); - if (hres == S_OK) - ITestSecondDisp_Release(second); + ITestSecondDisp_Release(second); todo_wine ok(external_connections == 2, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; ItestDual_Release(iface); - todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); end_host_object(tid, thread); @@ -2173,14 +2171,12 @@ static void test_external_connection(void) expect_last_release_closes = FALSE; hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); /* Two separated marshal data are still one external connection. */ @@ -2191,25 +2187,21 @@ static void test_external_connection(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); hres = CoMarshalInterface(stream2, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream2); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Release(stream); @@ -2221,20 +2213,17 @@ static void test_external_connection(void) hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); ItestDual_Release(iface); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); - todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Release(stream); -- 2.19.1

2 11

[PATCH] version: Simplify null check in VerQueryValueW
by Alex Henrie 30 Oct '18

30 Oct '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/version/version.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 5299ecd32f..bd03b2be80 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1054,7 +1054,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { - static const WCHAR nullW[] = { 0 }; static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -1067,7 +1066,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, if (!pBlock) return FALSE; - if (lpSubBlock == NULL || lpSubBlock[0] == nullW[0]) + if (!lpSubBlock || !lpSubBlock[0]) lpSubBlock = rootW; if ( VersionInfoIs16( info ) ) -- 2.19.1

2 1

[PATCH] include: Correct include order
by Alistair Leslie-Hughes 30 Oct '18

30 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index 65d5d0e..e6d554b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -13,8 +13,8 @@ SOURCES = \ amaudio.h \ amstream.idl \ amvideo.idl \ - appcompatapi.h \ apiset.h \ + appcompatapi.h \ appmgmt.h \ appmodel.h \ asptlb.idl \ -- 1.9.1

2 1

[PATCH] testbot: Build the list of test units impacted by module patches.
by Francois Gouget 30 Oct '18

30 Oct '18

A patch to a dll or program is likely to impact its test units. This makes it possible to know which tests units to rerun. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 444ffaf491..fb4f88650f 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -216,6 +216,7 @@ sub _HandleFile($$$) my $Module = _CreateTestInfo($Impacts, $Root, $Dir); $Impacts->{PatchedModules} = 1; + $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -407,20 +408,23 @@ sub GetPatchImpacts($) $TestInfo->{Units} = {}; foreach my $File (keys %{$TestInfo->{Files}}) { - # Skip unmodified files - next if (!$TestInfo->{All} and !$TestInfo->{Files}->{$File}); - my $Base = $File; # Non-C files are not test units next if ($Base !~ s/(?:\.c|\.spec)$//); # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); + # Don't try running a deleted test unit obviously + next if ($TestInfo->{Files}->{$File} eq "rm"); - if (($TestInfo->{All} or $TestInfo->{Files}->{$File}) and - $TestInfo->{Files}->{$File} ne "rm") + if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) { - # Only new/modified test units are impacted $TestInfo->{Units}->{$Base} = 1; + $Impacts->{ModuleUnitCount}++; + } + elsif ($TestInfo->{PatchedModule}) + { + # The module has been patched so this test unit is impacted indirectly. + $Impacts->{ModuleUnitCount}++; } } -- 2.19.1

1 0

[PATCH] testbot/WineRunWineTest: Remove support for the build Step type.
by Francois Gouget 30 Oct '18

30 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 75 ++++++++++++++++------------------ 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 5b6eb33e20..3784ef0657 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -383,7 +383,7 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } -if ($Step->Type ne "build" and $Step->Type ne "suite" and $Step->Type ne "single") +if ($Step->Type ne "suite" and $Step->Type ne "single") { FatalError("Unexpected step type '". $Step->Type ."' found\n"); } @@ -497,7 +497,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } else { - $PossibleCrash = 1 if ($Step->Type ne "build"); + $PossibleCrash = 1; $TAError = "An error occurred while waiting for the task to complete: $ErrMessage"; $ErrMessage = undef; } @@ -549,49 +549,46 @@ elsif (!defined $TAError) # Grab the test reports if any # -if ($Step->Type ne "build") +foreach my $Build (keys %{$TaskMissions->{Builds}}) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + my $RptFileName = "$Build.report"; + Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); + if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { - my $RptFileName = "$Build.report"; - Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); - if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) - { - chmod 0664, "$TaskDir/$RptFileName"; + chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) - { - # Could not open the file - $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); - } - else - { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) - { - # Save the extra errors detected by ParseWineTestReport() in - # $RptFileName.err: - # - This keep the .report file clean. - # - Each .err file can be matched to its corresponding .report, even - # if there are multiple .report files in the directory. - # - The .err file can be moved to the latest directory next to the - # reference report. - print $Log "$_\n" for (@$LogErrors); - close($Log); - } - } - } - elsif (!defined $TAError and - $TA->GetLastError() !~ /: No such file or directory/) + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); + if (!defined $LogFailures and @$LogErrors == 1) { - $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); + # Could not open the file $NewStatus = 'boterror'; + Error "Unable to open '$RptFileName' for reading: $!\n"; + LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); } + else + { + # $LogFailures can legitimately be undefined in case of a timeout + $TaskFailures += $LogFailures || 0; + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + { + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err: + # - This keep the .report file clean. + # - Each .err file can be matched to its corresponding .report, even + # if there are multiple .report files in the directory. + # - The .err file can be moved to the latest directory next to the + # reference report. + print $Log "$_\n" for (@$LogErrors); + close($Log); + } + } + } + elsif (!defined $TAError and + $TA->GetLastError() !~ /: No such file or directory/) + { + $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); + $NewStatus = 'boterror'; } } -- 2.19.1

1 0

[PATCH] testbot/testagentd: Fix the SetTime() RPC on Unix.
by Francois Gouget 30 Oct '18

30 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/platform_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 7a3a8f8e0a..560d1210ee 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -231,7 +231,7 @@ int platform_settime(uint64_t epoch, uint32_t leeway) tv.tv_sec = epoch; tv.tv_usec = 0; - if (!settimeofday(&tv, NULL)) + if (settimeofday(&tv, NULL)) { set_status(ST_ERROR, "failed to set the time: %s", strerror(errno)); return 0; -- 2.19.1

1 0

[PATCH 1/5] mfplat: Add MFCreateFile stub
by Sven Baars 30 Oct '18

30 Oct '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch series stops Disgaea 5 from crashing. This is the first time I send any functional patches, so feel free to correct me. dlls/mfplat/main.c | 30 +++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/Makefile.in | 2 + dlls/mfplat/tests/mfplat.c | 98 +++++++++++++++++++++++++++++++++- dlls/mfplat/tests/resource.rc | 24 +++++++++ dlls/mfplat/tests/test.mp4 | Bin 0 -> 1554 bytes include/mfapi.h | 2 + 7 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 dlls/mfplat/tests/resource.rc create mode 100644 dlls/mfplat/tests/test.mp4 diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..e7e7e30b3d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -452,6 +452,8 @@ typedef struct _mfbytestream { IMFByteStream IMFByteStream_iface; LONG ref; + + IMFAttributes *attributes; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -470,6 +472,10 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r { *out = &This->IMFByteStream_iface; } + else if(IsEqualGUID(riid, &IID_IMFAttributes) && This->attributes) + { + *out = This->attributes; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -500,6 +506,8 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + if (This->attributes) + IUnknown_Release((IUnknown*)This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -681,12 +689,34 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt object->ref = 1; object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + MFCreateAttributes(&object->attributes, 0); + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + LPCWSTR url, IMFByteStream **bytestream) +{ + mfbytestream *object; + + FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + MFCreateAttributes(&object->attributes, 0); *bytestream = &object->IMFByteStream_iface; return S_OK; } + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 3e42d2fd70..4533eeb71c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -43,7 +43,7 @@ @ stub MFCreateAudioMediaType @ stub MFCreateCollection @ stdcall MFCreateEventQueue(ptr) -@ stub MFCreateFile +@ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index a5553a5af3..07cf328ad2 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -3,3 +3,5 @@ IMPORTS = ole32 mfplat C_SRCS = \ mfplat.c + +RC_SRCS = resource.rc diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46579..97fca67be6 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -49,6 +49,36 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), + &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), + "couldn't write resource\n" ); + CloseHandle(file); + + return pathW; +} + static BOOL check_clsid(CLSID *clsids, UINT32 count) { int i; @@ -170,6 +200,9 @@ static void test_source_resolver(void) { IMFSourceResolver *resolver, *resolver2; HRESULT hr; + WCHAR *filename; + + static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; if (!pMFCreateSourceResolver) { @@ -177,6 +210,12 @@ static void test_source_resolver(void) return; } + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pMFCreateSourceResolver(NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -258,7 +297,9 @@ static void test_MFCreateAttributes(void) static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; + IMFByteStream *bytestream2; IStream *stream; + IMFAttributes *attributes; HRESULT hr; if(!pMFCreateMFByteStreamOnStream) @@ -270,13 +311,67 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + ok((void *)attributes != (void *)bytestream, "got %p\n", bytestream); + + if (hr == S_OK) + IMFAttributes_Release(attributes); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFByteStream, + (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream == bytestream2, "got %p\n", bytestream2); IStream_Release(stream); IMFByteStream_Release(bytestream); } +static void test_MFCreateFile(void) +{ + IMFByteStream *bytestream; + IMFByteStream *bytestream2; + IMFAttributes *attributes; + HRESULT hr; + WCHAR *filename; + + filename = load_resource(mp4file); + + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)attributes != (void *)bytestream, "got %p\n", bytestream); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream == bytestream2, "got %p\n", bytestream2); + + IMFAttributes_Release(attributes); + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + MFShutdown(); + + DeleteFileW(filename); +} + static void test_MFCreateMemoryBuffer(void) { IMFMediaBuffer *buffer; @@ -390,6 +485,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFSample(); + test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); diff --git a/dlls/mfplat/tests/resource.rc b/dlls/mfplat/tests/resource.rc new file mode 100644 index 0000000000..e9bf920c31 --- /dev/null +++ b/dlls/mfplat/tests/resource.rc @@ -0,0 +1,24 @@ +/* + * Resources for mfplat test suite. + * + * Copyright 2018 Sven Baars + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: test.mp4 */ +test.mp4 RCDATA test.mp4 diff --git a/dlls/mfplat/tests/test.mp4 b/dlls/mfplat/tests/test.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a5bbca6bbf7692eab047050b79b8ccc83516e6b4 GIT binary patch literal 1554 zcmZuxeN0nV6u<3bttg}g3M<<3v4A5C7=;cYskS&=aH+Gw(TQ=|2k#+BpKbac6$q26 zgvfMZE^O--6L1NclR1flh8QLw4%rM5#eGC{R2Jv(j|s9(8MANazOwnmo#gk<x#yhw zyZ4@R-$e*%%DGx+CF@`ik|L}DS&UP!LkKM^chNNX_cIj9Atd<{DdnJiN*lZEK&*TH zLUnilE|&Pi#`t<(V2JeCh0xUFbE~$JpP!3QD)e^to@B05Kdu~jt~KuYz}1=h$wy;^ z-(P&iYuL#r*6qMlmYD;w&8gboiuVmim)E`@VY(w}d_`I2ihOP3>WzsJPV$oN<)LWX zeE-6+iWMz`xA<B45szMa^nqwQ5w>wzrc-v;{3ns3&Hgygab@co_v%sWh^~kxZdgv1 zG$e27=y&X0FwfM)&vJ1wQfF>hX5`>p!|hca@<xwAt#6-gnD>;lG>BPmWrt3nUp`73 z+Yr|+TbnzS=UsV1v;C6gviW|rw)-!S-=bHn;0v1+QGDC}Ia|1D&?ob%jF`h$Wc#Ew zV;vf3`obS*$vM<kEDwCQ`|#nw>4L6xr#4wnKY06wGT*}wdIn7LW=}zVn#?n%4mVMz zS*QG<-xMcs%$)a1n<6jX{=IjfF~joa!xMeyYRwY|Cr0Vm>*3w%uu#*`=0;_WapAn$ zU<`El@AbuA79AjpWMkq|c1;#tZJ#~+J(2cx>Nm%BvdmP*5AP|wGW~$TESZLVhn6a1 ztO^C+GL%><v}DW7eXsQJ-HUG|I!ZcwqEv0#Ya@m<t5KG7N5rlo$2IYtr*eGsbj8h0 z?c@jJ8?GH6PW~!_$shUIcJraKf^47ff8>qKKRQs;^7r5rKP{`hCoZsRD*LTIOV>}^ zv}Z#0Dsy%(f4!(s5zT+wRX-W1@{bU&DxT$gcYNB95Wz4GhZ`=WopD!CphZIb3Y&Tt zN#HB;J~@EE6G4Pb;@qcgDO~ywITu+4q3v9iuqGi&TV#WEm&%fL{&(FFn1q2)5>0U| zXbo*=;Rh207#4X2E~$c{DoKbWFx1ksXMtOViZ2NB(km#tOR(VMuB70{eJoZOI||7? zl%2*olCw<Zo^mi$Zbl##Z##(!#x#_R#yMDUJgnMfPYBwQI+iQ7gFVc0?7t1cIX-wf zaHFt@IfI@MICdeJ7+9Xp2>Ks?)jSUa8_iO<Oo;G!Jey%!2<ZHT2<$>SD4dRa20SkU zV;68rdYYqx<dOt*;hjTh6eXe7GH{(SlkT#Yax=1Y8M;ip4CY9n)kw{9LK`q0-qUjY z7J{U}>4bH`mH}`KUjy7ccnDD_0CJHA@_=3toU_OwXamIR7Gqf9{35_wfE7@%h&<3n zKs;bQARC}!xiSZ6ESNJ5P+CoKB<O7nEod-NqPX>NU0kHoiM#Wkq*n&-SMq0^0~2cD TJ;x-N6hTeOp(eUDP!ruh^$B~# literal 0 HcmV?d00001 diff --git a/include/mfapi.h b/include/mfapi.h index bc832bf95f..0230a08471 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,8 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + LPCWSTR url, IMFByteStream **bytestream); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); -- 2.17.1

4 7

[PATCH resend] winex11.drv: handle missing thread data in X11DRV_get_ic
by Enrico Horn 29 Oct '18

29 Oct '18

From: Enrico Horn <farmboy0+winehq(a)googlemail.com> Hi, This patch fixes a crash in winex11.drv when loading IME. This happens in Final Fantasy XI when using Ashita or Windower 3rd party applications. There has been no bug reported I just fixed the bug for myself. Here is the crash record: Unhandled exception: page fault on write access to 0x00000014 in 32-bit code (0x7d85a94b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7d85a94b ESP:0836fd10 EBP:0836fd38 EFLAGS:00010212( R- -- I -A- - ) EAX:00000000 EBX:0015abe8 ECX:00010050 EDX:00000000 ESI:00000000 EDI:7d894000 Stack dump: 0x0836fd10: 001e60c8 00000158 0836fdb8 00010050 0x0836fd20: 00000000 7d894000 7d85a90b 7d894000 0x0836fd30: 001e60cc 001e60c8 0836fd58 7d86560b 0x0836fd40: 00010050 00000035 7d827a09 7d8655fa 0x0836fd50: 7d894000 001e60cc 0836fd98 7d83c0ef 0x0836fd60: 00010050 7d894000 0836fd98 7d83bfb0 Backtrace: =>0 0x7d85a94b X11DRV_get_ic+0x4b(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11 (0x0836fd38) 1 0x7d86560b X11DRV_ForceXIMReset+0x1a(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/xim.c:255] in winex11 (0x0836fd58) 2 0x7d83c0ef NotifyIME+0x17e(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/winex11.drv/ime.c:764] in winex11 (0x0836fd98) 3 0x7dc80793 ImmNotifyIME+0x62(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/imm32/imm.c:2189] in imm32 (0x0836fde8) 0x7d85a94b X11DRV_get_ic+0x4b [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11: movl %ecx,0x14(%eax) 2040 x11drv_thread_data()->last_xic_hwnd = hwnd; Signed-off-by: Enrico Horn <farmboy0+winehq(a)googlemail.com> --- dlls/winex11.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19a..7dce6816ad7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2034,6 +2034,11 @@ XIC X11DRV_get_ic( HWND hwnd ) XIM xim; XIC ret = 0; + if (!x11drv_thread_data()) + { + release_win_data( data ); + return NULL; + } if (data) { x11drv_thread_data()->last_xic_hwnd = hwnd; -- 2.19.1

1 0

[PATCH] setupapi: Fix broken control definition
by Alistair Leslie-Hughes 29 Oct '18

29 Oct '18

Based on patch by Mark Jansen from reactos. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/setupapi/setupapi.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index c03f01f..f5da61f 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -43,7 +43,7 @@ BEGIN LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", PROGRESSORD, "setupx_progress", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 63, 194, 13 END IDPROMPTFORDISK DIALOG 0, 0, 260, 120 -- 1.9.1

1 0

[PATCH] winecfg: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 29 Oct '18

29 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/driveui.c | 2 +- programs/winecfg/theme.c | 12 +++++------- programs/winecfg/winecfg.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index c25e71df52..36ae88c832 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -440,7 +440,7 @@ static void update_controls(HWND dialog) type = current_drive->type; SendDlgItemMessageW(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0); - for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++) + for (i = 0; i < ARRAY_SIZE(type_pairs); i++) { WCHAR driveDesc[64]; LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc)); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 5304f7240c..78d89a5ea8 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog) ofn.nFilterIndex = 0; ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); + ofn.nMaxFile = ARRAY_SIZE(file); ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); @@ -729,8 +729,6 @@ static struct ShellFolderInfo asfiInfo[] = { static struct ShellFolderInfo *psfiSelected = NULL; -#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) - static void init_shell_folder_listview_headers(HWND dialog) { LVCOLUMNW listColumn; RECT viewRect; @@ -763,8 +761,8 @@ static void read_shell_folder_link_targets(void) { WCHAR wszPath[MAX_PATH]; HRESULT hr; int i; - - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { asfiInfo[i].szLinkTarget[0] = '\0'; hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, SHGFP_TYPE_CURRENT, wszPath); @@ -790,7 +788,7 @@ static void update_shell_folder_listview(HWND dialog) { SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { WCHAR buffer[MAX_PATH]; HRESULT hr; LPITEMIDLIST pidlCurrent; @@ -905,7 +903,7 @@ static void apply_shell_folder_changes(void) { struct stat statPath; HRESULT hr; - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { /* Ignore nonexistent link targets */ if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath)) continue; diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index be04ba2a77..c4c05bd186 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -623,7 +623,7 @@ static void process_setting(struct setting *s) static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; HKEY key; BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && - !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + !strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW))); if (s->value) { -- 2.14.5

1 0

[PATCH] cmd: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 29 Oct '18

29 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/wcmdmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5ef4a2bf34..1c99661b44 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,9 +2419,9 @@ int wmain (int argc, WCHAR *argvW[]) OSVERSIONINFOW osv; char osver[50]; - if (!GetEnvironmentVariableW(comspecW, comspec, sizeof(comspec)/sizeof(WCHAR))) + if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { - GetSystemDirectoryW(comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR)); + GetSystemDirectoryW(comspec, ARRAY_SIZE(comspec) - ARRAY_SIZE(cmdW)); strcatW(comspec, cmdW); SetEnvironmentVariableW(comspecW, comspec); } -- 2.14.5

1 0

[PATCH] d2d1/tests: Test command list resource reference.
by Nikolay Sivov 29 Oct '18

29 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 274 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3b824709f2..b7d3bfa09c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7652,6 +7652,279 @@ static void test_skew_matrix(void) } } +static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, ID3D10Device1 *d3d_device) +{ + ID2D1DeviceContext *device_context; + IDXGIDevice *dxgi_device; + ID2D1Device *device; + HRESULT hr; + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + ID2D1Device_Release(device); + + return device_context; +} + +static void test_command_list(void) +{ + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + }; + static const D2D1_GRADIENT_STOP stops[] = + { + {0.0f, {1.0f, 0.0f, 0.0f, 1.0f}}, + {0.5f, {0.0f, 1.0f, 0.0f, 1.0f}}, + {1.0f, {0.0f, 0.0f, 1.0f, 1.0f}}, + }; + D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES radial_gradient_properties; + D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES linear_gradient_properties; + ID2D1DeviceContext *device_context, *device_context2; + D2D1_STROKE_STYLE_PROPERTIES stroke_desc; + ID2D1GradientStopCollection *gradient; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1StrokeStyle *stroke_style; + ID2D1CommandList *command_list; + ID3D10Device1 *d3d_device; + ID2D1Geometry *geometry; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + D2D1_POINT_2F p0, p1; + ID2D1Bitmap *bitmap; + ID2D1Image *target; + D2D1_COLOR_F color; + ID2D1Brush *brush; + D2D1_RECT_F rect; + D2D_SIZE_U size; + ULONG refcount; + HRESULT hr; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + device_context = create_device_context(factory, d3d_device); + ok(device_context != NULL, "Failed to create device context.\n"); + + hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); +todo_wine + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + if (FAILED(hr)) + { + ID2D1DeviceContext_Release(device_context); + ID2D1Factory1_Release(factory); + return; + } + + ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)command_list); + ID2D1DeviceContext_BeginDraw(device_context); + + hr = ID2D1DeviceContext_QueryInterface(device_context, &IID_ID2D1RenderTarget, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get rt interface, hr %#x.\n", hr); + + /* Test how resources are referenced by the list. */ + + /* Bitmap. */ + set_size_u(&size, 4, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Solid color brush. */ + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 16.0f, 16.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, brush); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + /* Bitmap brush. */ + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, (ID2D1BitmapBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 16.0f, 16.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, brush); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Linear gradient brush. */ + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), + D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); + ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); + + set_point(&linear_gradient_properties.startPoint, 320.0f, 0.0f); + set_point(&linear_gradient_properties.endPoint, 0.0f, 960.0f); + hr = ID2D1RenderTarget_CreateLinearGradientBrush(rt, &linear_gradient_properties, NULL, gradient, + (ID2D1LinearGradientBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Geometry_Release(geometry); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1GradientStopCollection_Release(gradient); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Radial gradient brush. */ + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), + D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); + ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); + + set_point(&radial_gradient_properties.center, 160.0f, 480.0f); + set_point(&radial_gradient_properties.gradientOriginOffset, 40.0f, -120.0f); + radial_gradient_properties.radiusX = 160.0f; + radial_gradient_properties.radiusY = 480.0f; + hr = ID2D1RenderTarget_CreateRadialGradientBrush(rt, &radial_gradient_properties, NULL, gradient, + (ID2D1RadialGradientBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Geometry_Release(geometry); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1GradientStopCollection_Release(gradient); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Geometry. */ + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + + ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Geometry_Release(geometry); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Stroke style. */ + stroke_desc.startCap = D2D1_CAP_STYLE_SQUARE; + stroke_desc.endCap = D2D1_CAP_STYLE_ROUND; + stroke_desc.dashCap = D2D1_CAP_STYLE_TRIANGLE; + stroke_desc.lineJoin = D2D1_LINE_JOIN_BEVEL; + stroke_desc.miterLimit = 1.5f; + stroke_desc.dashStyle = D2D1_DASH_STYLE_DOT; + stroke_desc.dashOffset = -1.0f; + + hr = ID2D1Factory_CreateStrokeStyle((ID2D1Factory *)factory, &stroke_desc, NULL, 0, &stroke_style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + + set_point(&p0, 100.0f, 160.0f); + set_point(&p1, 140.0f, 160.0f); + ID2D1RenderTarget_DrawLine(rt, p0, p1, brush, 1.0f, stroke_style); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1StrokeStyle_Release(stroke_style); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Close on attached list. */ + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == (ID2D1Image *)command_list, "Unexpected context target.\n"); + ID2D1Image_Release(target); + + hr = ID2D1CommandList_Close(command_list); + ok(SUCCEEDED(hr), "Failed to close a list, hr %#x.\n", hr); + + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == NULL, "Unexpected context target.\n"); + + hr = ID2D1CommandList_Close(command_list); + ok(hr == D2DERR_WRONG_STATE, "Unexpected hr %#x.\n", hr); + + ID2D1CommandList_Release(command_list); + + /* Close empty list. */ + hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + hr = ID2D1CommandList_Close(command_list); + ok(SUCCEEDED(hr), "Failed to close a list, hr %#x.\n", hr); + + ID2D1CommandList_Release(command_list); + + /* List created with different context. */ + device_context2 = create_device_context(factory, d3d_device); + ok(device_context2 != NULL, "Failed to create device context.\n"); + + hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + ID2D1DeviceContext_SetTarget(device_context2, (ID2D1Image *)command_list); + ID2D1DeviceContext_GetTarget(device_context2, &target); + ok(target == NULL, "Unexpected target.\n"); + + ID2D1CommandList_Release(command_list); + ID2D1DeviceContext_Release(device_context2); + + ID2D1RenderTarget_Release(rt); + ID2D1DeviceContext_Release(device_context); + refcount = ID2D1Factory1_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7695,6 +7968,7 @@ START_TEST(d2d1) queue_test(test_device_context); queue_test(test_invert_matrix); queue_test(test_skew_matrix); + queue_test(test_command_list); run_queued_tests(); } -- 2.19.1

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Introduce VKD3D_SHADER_VISIBILITY_COMPUTE.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- It should be useful when vkd3d-shader is used outside D3D12. --- include/private/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index d55ed9f89825..bb137baba95b 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -55,6 +55,8 @@ enum vkd3d_shader_visibility VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, VKD3D_SHADER_VISIBILITY_PIXEL = 5, + VKD3D_SHADER_VISIBILITY_COMPUTE = 1000000000, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 79af890a2353..09c6f9f799e4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2000,6 +2000,8 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; case VKD3D_SHADER_VISIBILITY_PIXEL: return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL; + case VKD3D_SHADER_VISIBILITY_COMPUTE: + return compiler->shader_type == VKD3D_SHADER_TYPE_COMPUTE; default: ERR("Invalid shader visibility %#x.\n", visibility); return false; -- 2.18.1

3 5

[PATCH vkd3d 4/6] vkd3d-shader: Introduce vkd3d_shader_binding_flags.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 13 ++++++++++--- libs/vkd3d-shader/spirv.c | 23 ++++++++++++++++------- libs/vkd3d/state.c | 17 +++++++++-------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index b9472a2432e5..d55ed9f89825 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,7 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include <stdbool.h> #include <stdint.h> #ifdef __cplusplus @@ -82,12 +81,20 @@ struct vkd3d_shader_descriptor_binding uint32_t binding; }; +enum vkd3d_shader_binding_flag +{ + VKD3D_SHADER_BINDING_FLAG_BUFFER = 0x00000001, + VKD3D_SHADER_BINDING_FLAG_IMAGE = 0x00000002, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_BINDING_FLAG), +}; + struct vkd3d_shader_resource_binding { enum vkd3d_shader_descriptor_type type; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; - bool is_buffer; + unsigned int flags; /* vkd3d_shader_binding_flags */ struct vkd3d_shader_descriptor_binding binding; }; @@ -99,7 +106,7 @@ struct vkd3d_shader_combined_resource_sampler unsigned int resource_index; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; - bool is_buffer; + unsigned int flags; /* vkd3d_shader_binding_flags */ struct vkd3d_shader_descriptor_binding binding; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d281d2524d0a..79af890a2353 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2057,9 +2057,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; + enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; unsigned int reg_idx = reg->idx[0].offset; - bool is_buffer_resource; unsigned int i; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; @@ -2074,7 +2074,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor else FIXME("Unhandled register type %#x.\n", reg->type); - is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + if (is_uav_counter) { assert(descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV); @@ -2098,11 +2100,13 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_resource_binding *current = &shader_interface->bindings[i]; + if (!(current->flags & resource_type_flag)) + continue; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) continue; - if (current->type == descriptor_type && current->register_index == reg_idx - && current->is_buffer == is_buffer_resource) + if (current->type == descriptor_type && current->register_index == reg_idx) return current->binding; } if (shader_interface->binding_count) @@ -3908,17 +3912,22 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ const struct vkd3d_shader_combined_resource_sampler *current; const unsigned int resource_index = resource->idx[0].offset; uint32_t image_type_id, type_id, ptr_type_id, var_id; - bool is_buffer_resource, depth; + enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_symbol symbol; unsigned int i; + bool depth; - is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; for (i = 0; i < shader_interface->combined_sampler_count; ++i) { current = &shader_interface->combined_samplers[i]; - if (current->resource_index != resource_index || current->is_buffer != is_buffer_resource) + if (current->resource_index != resource_index) + continue; + + if (!(current->flags & resource_type_flag)) continue; if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7e0b1eeea553..4800ff316308 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -607,14 +607,15 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { - unsigned int i = context->descriptor_index++; - - root_signature->descriptor_mapping[i].type = descriptor_type; - root_signature->descriptor_mapping[i].register_index = register_idx; - root_signature->descriptor_mapping[i].shader_visibility = shader_visibility; - root_signature->descriptor_mapping[i].is_buffer = buffer_descriptor; - root_signature->descriptor_mapping[i].binding.set = context->set_index; - root_signature->descriptor_mapping[i].binding.binding = context->descriptor_binding++; + struct vkd3d_shader_resource_binding *mapping + = &root_signature->descriptor_mapping[context->descriptor_index++]; + + mapping->type = descriptor_type; + mapping->register_index = register_idx; + mapping->shader_visibility = shader_visibility; + mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + mapping->binding.set = context->set_index; + mapping->binding.binding = context->descriptor_binding++; } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, -- 2.18.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Avoid uint32_t in public interface.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index bb137baba95b..e97e185158cb 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -79,8 +77,8 @@ enum vkd3d_shader_descriptor_type struct vkd3d_shader_descriptor_binding { - uint32_t set; - uint32_t binding; + unsigned int set; + unsigned int binding; }; enum vkd3d_shader_binding_flag @@ -168,7 +166,7 @@ struct vkd3d_shader_compile_arguments }; int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); @@ -370,7 +368,7 @@ struct vkd3d_shader_scan_info { unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - uint32_t sampler_comparison_mode_mask; + unsigned int sampler_comparison_mode_mask; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 71410f1d10cb..f81320879e8f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -75,7 +75,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ } int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args) { diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5fe4540ca17c..b36343524cd2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -107,7 +107,7 @@ struct options { const char *filename; const char *output_filename; - uint32_t compiler_options; + unsigned int compiler_options; }; static bool parse_command_line(int argc, char **argv, struct options *options) -- 2.18.1

3 2

[PATCH vkd3d 1/6] vkd3d: Avoid division by zero in GetResourceAllocationInfo() (Coverity).
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4f5cdd6904aa..e41a309a21a5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2072,7 +2072,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } } - if (desc->Alignment % info->Alignment) + if (valid && desc->Alignment % info->Alignment) { WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", desc->Alignment, info->Alignment); -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Use typed shader inputs directly.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> ... instead of copying them to a private floating-point variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 13631a07fd1b..d281d2524d0a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3238,7 +3238,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } - use_private_var = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE; + use_private_var = component_count != VKD3D_VEC4_SIZE || (builtin && builtin->fixup_pfn); vkd3d_symbol_make_register(&reg_symbol, reg); @@ -3256,7 +3256,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); -- 2.18.1

2 1

[PATCH v2 vkd3d 2/6] build: Check VK_HEADER_VERSION.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Use AC_LINK_IFELSE() instead of AC_RUN_IFELSE(). --- configure.ac | 2 ++ m4/vulkan.m4 | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 m4/vulkan.m4 diff --git a/configure.ac b/configure.ac index 58672c510ab9..8c82741a9bae 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,8 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/m4/vulkan.m4 b/m4/vulkan.m4 new file mode 100644 index 000000000000..6ef5818c8fd6 --- /dev/null +++ b/m4/vulkan.m4 @@ -0,0 +1,18 @@ +dnl VKD3D_CHECK_VULKAN_HEADER_VERSION +AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION], + +[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version_[[$1]]) + +AC_CACHE_CHECK([whether VK_HEADER_VERSION >= [$1]], vkd3d_vk_version, + [AC_LINK_IFELSE( + [AC_LANG_SOURCE([#include <vulkan/vulkan.h> + #if VK_HEADER_VERSION < $1 + #error "Vulkan headers are too old" + #endif + int main(void) { return 0; }])], + [AS_VAR_SET([vkd3d_vk_version], [yes])], + [AS_VAR_SET([vkd3d_vk_version], [no])])]) + +AS_IF([test "x$vkd3d_vk_version" != "xyes"], [$2]) + +AS_VAR_POPDEF([vkd3d_vk_version])]) -- 2.18.1

3 2

[PATCH 3/3] server: Use a separated object for each opened named pipe device file.
by Jacek Caban 29 Oct '18

29 Oct '18

Allows using proper options for ioctl pseudo fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 2 +- server/named_pipe.c | 118 +++++++++++++++++++++++++++++----------- 2 files changed, 87 insertions(+), 33 deletions(-)

1 0

[PATCH 2/3] server: Use requested options for device pseudo fd.
by Jacek Caban 29 Oct '18

29 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 2 +- server/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] server: Add FileModeInformation implementation.
by Jacek Caban 29 Oct '18

29 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45749 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 96 ++++++++++++++++++++++++++++++++++++++++- server/fd.c | 16 +++++++ 3 files changed, 112 insertions(+), 2 deletions(-)

1 0

[PATCH v3 1/2] gdi32: Remove the code that doesn't work as intended around FcFontList().
by Byeongsik Jeon 29 Oct '18

29 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v3: remove the various ObjectSet* functions from the (MAKE|LOAD)_FUNCPTR macros. dlls/gdi32/freetype.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6393e273fb..27032e6774 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -176,9 +176,6 @@ MAKE_FUNCPTR(FcConfigSubstitute); MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontSetDestroy); MAKE_FUNCPTR(FcInit); -MAKE_FUNCPTR(FcObjectSetAdd); -MAKE_FUNCPTR(FcObjectSetCreate); -MAKE_FUNCPTR(FcObjectSetDestroy); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); @@ -2796,9 +2793,6 @@ static void init_fontconfig(void) LOAD_FUNCPTR(FcFontList); LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcInit); - LOAD_FUNCPTR(FcObjectSetAdd); - LOAD_FUNCPTR(FcObjectSetCreate); - LOAD_FUNCPTR(FcObjectSetDestroy); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternGetBool); @@ -2829,7 +2823,6 @@ static void init_fontconfig(void) static void load_fontconfig_fonts(void) { FcPattern *pat; - FcObjectSet *os; FcFontSet *fontset; int i, len; char *file; @@ -2838,13 +2831,15 @@ static void load_fontconfig_fonts(void) if (!fontconfig_enabled) return; pat = pFcPatternCreate(); - os = pFcObjectSetCreate(); - pFcObjectSetAdd(os, FC_FILE); - pFcObjectSetAdd(os, FC_SCALABLE); - pFcObjectSetAdd(os, FC_ANTIALIAS); - pFcObjectSetAdd(os, FC_RGBA); - fontset = pFcFontList(NULL, pat, os); - if(!fontset) return; + if (!pat) return; + + fontset = pFcFontList(NULL, pat, NULL); + if (!fontset) + { + pFcPatternDestroy(pat); + return; + } + for(i = 0; i < fontset->nfont; i++) { FcBool scalable; DWORD aa_flags; @@ -2875,7 +2870,6 @@ static void load_fontconfig_fonts(void) ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); } pFcFontSetDestroy(fontset); - pFcObjectSetDestroy(os); pFcPatternDestroy(pat); } -- 2.19.1

2 3

[PATCH] ko.po: Update Korean translation.
by Byeongsik Jeon 29 Oct '18

29 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46050 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- wine-bugs #46050, fuzzy, and more translation fix. po/ko.po | 2644 +++++++++++++++++++++++++----------------------------- 1 file changed, 1207 insertions(+), 1437 deletions(-) diff --git a/po/ko.po b/po/ko.po index e169e3452d..e0d4319b7a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,14 +5,13 @@ 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-05-28 23:02+0900\n" -"Last-Translator: Kim Geonwoo <rlarjsdn122(a)naver.com>\n" +"PO-Revision-Date: 2018-10-29 21:06+0900\n" +"Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -23,8 +22,8 @@ msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." msgstr "" -"플로피 디스크나 시디롬이나 ,하드디스크에서 새 풀그림을 설치하려면 [설치]를 " -"클릭하십시오." +"플로피 디스크, 시디롬 드라이브, 또는 하드디스크 드라이브에서 새 프로그램을 설" +"치하려면 [설치]를 클릭하십시오." #: appwiz.rc:62 msgid "&Install..." @@ -36,8 +35,8 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"다음 무른모는 자동으로 제거될 것입니다.풀그림을 제거하거나 설치된 구성요소를 " -"변경하려면,목록에서 선택하고 고치기/제거를 클릭하십시오." +"다음 소프트웨어는 자동으로 제거될 것입니다. 프로그램을 제거하거나 설치된 구성" +"요소를 수정하려면, 목록에서 선택하고 [수정/제거]를 클릭하십시오." #: appwiz.rc:67 msgid "&Support Information" @@ -45,7 +44,7 @@ msgstr "지원 정보(&S)" #: appwiz.rc:68 regedit.rc:133 regedit.rc:232 msgid "&Modify..." -msgstr "고치기(&M)..." +msgstr "수정(&M)..." #: appwiz.rc:69 appwiz.rc:45 cryptui.rc:346 msacm32.rc:40 winecfg.rc:200 #: winecfg.rc:237 wordpad.rc:256 @@ -76,7 +75,7 @@ msgstr "확인" #: appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "이 정보는 %s: 에서 기술 지원을 받기 위해 사용됨:" +msgstr "이 정보는 %s을(를) 위한 기술 지원을 받기 위해 사용될 수 있습니다:" #: appwiz.rc:80 msgid "Publisher:" @@ -84,7 +83,7 @@ msgstr "제작사:" #: appwiz.rc:81 winefile.rc:166 msgid "Version:" -msgstr "버젼:" +msgstr "버전:" #: appwiz.rc:82 msgid "Contact:" @@ -124,13 +123,13 @@ msgid "" "href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 풀그림이 정상적으로 작동하기 위해서 필요로 하는 Gecko 패키" -"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" -"다.\n" +"Wine이 HTML 임베딩 응용프로그램을 올바르게 동작시키는 데 필요한 Gecko 패키지" +"를 찾을 수 없습니다. Wine은 Gecko 패키지를 자동으로 다운로드하고 설치할 수 있" +"습니다.\n" "\n" -"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " -"href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> 보십" -"시오." +"노트: 배포판 패키지를 사용하는 것을 추천합니다. 자세한 내용은 <a href=" +"\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a>를 보십시" +"오." #: appwiz.rc:109 appwiz.rc:124 msgid "&Install" @@ -170,37 +169,35 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine은 닷넷 응용풀그림을 제대로 실행시키기 위해 필요한 wine-mono 패키지를 찾" -"을 수없습니다. Wine은 당신을 위해서 자동으로 다운로드하고 설치할 것입니다.\n" +"Wine이 닷넷 응용프로그램을 올바르게 동작시키는 데 필요한 wine-mono 패키지를 " +"찾을 수 없습니다. Wine은 wine-mono 패키지를 자동으로 다운로드하고 설치할 수 " +"있습니다.\n" "\n" -"Note: it is recommended to use your distribution's packages instead. See <a " -"주의:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다.자세한 것은<a " -"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> 을 보" -"십시오." +"노트: 배포판 패키지를 사용하는 것을 추천합니다. 자세한 내용은 <a href=" +"\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 보십시오." #: appwiz.rc:31 msgid "Add/Remove Programs" -msgstr "풀그림 추가/삭제" +msgstr "프로그램 추가/제거" #: appwiz.rc:32 msgid "" "Allows you to install new software, or remove existing software from your " "computer." msgstr "" -"새 무른모를 설치하거나,이미 설치된 무른모를 당신의 컴퓨터에서 삭제 할 수 있습" -"니다." +"새 소프트웨어를 설치하거나 설치된 소프트웨어를 컴퓨터에서 제거할 수 있습니다." #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" -msgstr "응용풀그림" +msgstr "응용프로그램" #: appwiz.rc:35 msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" msgstr "" -"언인스톨러를 실행할 수 없습니다, '%s'. 당신은 이 풀그림의 언인스톨 정보를 레" -"지스트리에서 지우겠습니까?" +"제거 프로그램 '%s'을(를) 실행할 수 없습니다. 레지스트리에서 이 프로그램의 제" +"거 항목을 지우시겠습니까?" #: appwiz.rc:36 msgid "Not specified" @@ -216,15 +213,15 @@ msgstr "제작사" #: appwiz.rc:40 cryptui.rc:54 msgid "Version" -msgstr "버젼" +msgstr "버전" #: appwiz.rc:41 msgid "Installation programs" -msgstr "설치 풀그림" +msgstr "설치 프로그램" #: appwiz.rc:42 msgid "Programs (*.exe)" -msgstr "풀그림 (*.exe)" +msgstr "프로그램 (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 @@ -233,23 +230,23 @@ msgstr "모든 파일 (*.*)" #: appwiz.rc:46 msgid "&Modify/Remove" -msgstr "고치기(&M)/제거" +msgstr "수정(&M)/제거" #: appwiz.rc:51 msgid "Downloading..." -msgstr "다운로드중..." +msgstr "다운로드 중..." #: appwiz.rc:52 msgid "Installing..." -msgstr "설치하는 중..." +msgstr "설치 중..." #: appwiz.rc:53 msgid "" "Unexpected checksum of downloaded file. Aborting installation of corrupted " "file." msgstr "" -"다운로드한 파일의 체크섬에 문제가 있습니다..망가진 파일의 설치를 취소하는 중" -"입니다." +"다운로드한 파일의 체크섬에 문제가 있습니다. 망가진 파일 설치를 취소하는 중입" +"니다." #: avifil32.rc:42 msgid "Compress options" @@ -301,7 +298,7 @@ msgstr "Wine AVI-기본-파일핸들러" #: avifil32.rc:37 msgid "uncompressed" -msgstr "압축안됨" +msgstr "압축되지 않음" #: browseui.rc:28 msgid "Canceling..." @@ -309,25 +306,23 @@ msgstr "취소하는 중..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 남음" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 and %3!u! %4 남음" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "초(&S)" +msgstr "초" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "분" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "시" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -359,7 +354,7 @@ msgstr "종료" #: comctl32.rc:97 msgid "Customize Toolbar" -msgstr "도구바 사용자 정의" +msgstr "도구 모음 사용자 정의" #: comctl32.rc:100 comctl32.rc:57 cryptui.rc:351 ieframe.rc:43 oleview.rc:83 #: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 @@ -394,19 +389,19 @@ msgstr "사용 가능한 버튼(&V):" #: comctl32.rc:107 msgid "&Add ->" -msgstr "더하기(&A) ->" +msgstr "추가(&A) ->" #: comctl32.rc:108 msgid "<- &Remove" -msgstr "<-지우기(&R)" +msgstr "<- 삭제(&R)" #: comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "도구바 버튼(&T):" +msgstr "도구 모음 버튼(&T):" #: comctl32.rc:42 msgid "Separator" -msgstr "분리자" +msgstr "구분 기호" #: comctl32.rc:47 progman.rc:81 msgctxt "hotkey" @@ -426,16 +421,12 @@ msgid "&Retry" msgstr "재시도(&R)" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "탭 숨기기(&T)" +msgstr "세부 사항 숨기기" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "세부사항" +msgstr "세부 사항 보기" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -461,7 +452,7 @@ msgstr "파일 이름(&N):" #: comdlg32.rc:163 comdlg32.rc:185 msgid "&Directories:" -msgstr "디렉토리(&D):" +msgstr "디렉터리(&D):" #: comdlg32.rc:166 comdlg32.rc:188 msgid "List Files of &Type:" @@ -531,7 +522,7 @@ msgstr "파일로 인쇄(&L)" #: comdlg32.rc:218 msgid "Condensed" -msgstr "폭이 좁게" +msgstr "좁게" #: comdlg32.rc:224 comdlg32.rc:395 msgid "Print Setup" @@ -657,7 +648,7 @@ msgstr "채도(&S):" #: comdlg32.rc:298 msgctxt "Luminance" msgid "&Lum:" -msgstr "명도(&L):" +msgstr "휘도(&L):" #: comdlg32.rc:308 msgid "&Add to Custom Colors" @@ -894,7 +885,7 @@ msgstr "파일이 존재하지 않습니다" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "선택한 대상에 폴더에 있지않은 파일이 있습니다." +msgstr "선택 영역이 폴더가 아닌 객체를 포함합니다" #: comdlg32.rc:45 msgid "Up One Level" @@ -938,7 +929,7 @@ msgstr "검정" #: comdlg32.rc:122 wordpad.rc:126 msgid "Maroon" -msgstr "밤색" +msgstr "적갈색" #: comdlg32.rc:123 wordpad.rc:127 msgid "Green" @@ -946,19 +937,19 @@ msgstr "녹색" #: comdlg32.rc:124 wordpad.rc:128 msgid "Olive" -msgstr "올리브색" +msgstr "올리브" #: comdlg32.rc:125 wordpad.rc:129 msgid "Navy" -msgstr "짙은 남색" +msgstr "짙은 파랑" #: comdlg32.rc:126 wordpad.rc:130 msgid "Purple" -msgstr "심홍색" +msgstr "자주" #: comdlg32.rc:127 wordpad.rc:131 msgid "Teal" -msgstr "검은 물오리색" +msgstr "청록" #: comdlg32.rc:128 wordpad.rc:132 msgid "Gray" @@ -974,7 +965,7 @@ msgstr "빨강" #: comdlg32.rc:131 wordpad.rc:135 msgid "Lime" -msgstr "라임색" +msgstr "라임" #: comdlg32.rc:132 wordpad.rc:136 msgid "Yellow" @@ -986,19 +977,19 @@ msgstr "파랑" #: comdlg32.rc:134 wordpad.rc:138 msgid "Fuchsia" -msgstr "자홍색" +msgstr "밝은 자홍" #: comdlg32.rc:135 wordpad.rc:139 msgid "Aqua" -msgstr "물색" +msgstr "바다색" #: comdlg32.rc:136 wordpad.rc:140 msgid "White" -msgstr "하양" +msgstr "흰색" #: comdlg32.rc:56 msgid "Unreadable Entry" -msgstr "입력을 읽을 수 없습니다" +msgstr "읽을 수 없는 항목입니다" #: comdlg32.rc:58 msgid "" @@ -1010,7 +1001,7 @@ msgstr "" #: comdlg32.rc:60 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "'여기로부터'엔트리는 여기까지'엔트리에 도달 할 수 없습니다." +msgstr "'시작' 엔트리는 '끝' 엔트리를 초과할 수 없습니다." #: comdlg32.rc:62 msgid "" @@ -1022,15 +1013,15 @@ msgstr "" #: comdlg32.rc:64 msgid "The 'Number of copies' field cannot be empty." -msgstr "'복사본 수'의 숫자값은 빈 값이 올 수 없습니다." +msgstr "'복사본 갯수' 필드는 비어있어서는 안됩니다." #: comdlg32.rc:66 msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"이 복사본의 많은 수는 당신의 프린터에서 지원하지 않습니다.\n" -"1 과 %d사이의 값을 입력하십시오." +"너무 많은 복사본 갯수는 프린터에서 지원하지 않습니다.\n" +"1과 %d 사이의 값을 입력하십시오." #: comdlg32.rc:67 msgid "A printer error occurred." @@ -1054,7 +1045,7 @@ msgstr "오류 발생." #: comdlg32.rc:72 msgid "Unknown printer driver." -msgstr "알 수 없는 프린터 드라이버." +msgstr " 없는 프린터 드라이버." #: comdlg32.rc:75 msgid "" @@ -1150,19 +1141,19 @@ msgstr "가능하지 않음; " #: comdlg32.rc:97 msgid "Waiting; " -msgstr "대기중; " +msgstr "대기 중; " #: comdlg32.rc:98 msgid "Processing; " -msgstr "작업중; " +msgstr "작업 중; " #: comdlg32.rc:99 msgid "Initializing; " -msgstr "초기화중; " +msgstr "초기화 중; " #: comdlg32.rc:100 msgid "Warming up; " -msgstr "준비 중;" +msgstr "준비 중; " #: comdlg32.rc:101 msgid "Toner low; " @@ -1190,7 +1181,7 @@ msgstr "프린터 문이 열려있습니다; " #: comdlg32.rc:107 msgid "Print server unknown; " -msgstr "알수 없는 프린트 서버; " +msgstr "프린트 서버 상태 알 수 없음; " #: comdlg32.rc:108 msgid "Power save mode; " @@ -1256,14 +1247,13 @@ msgid "" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." msgstr "" -"Caps Lock 이 커져 있으면 암호가 잘못 입력될 수 있습니다.\n" +"Caps Lock이 켜져 있으면 암호가 올바르지 않게 입력될 수 있습니다.\n" "\n" -"암호를 입력하기 전에\n" -"키보드의 Caps Lock 키를 끄시기 바랍니다." +"암호를 입력하기 전에 키보드의 Caps Lock 키를 눌러서 끄시기 바랍니다." #: credui.rc:34 msgid "Caps Lock is On" -msgstr "Caps Lock 커짐" +msgstr "Caps Lock 켜짐" #: crypt32.rc:30 msgid "Authority Key Identifier" @@ -1484,11 +1474,11 @@ msgstr "시리얼 번호" #: crypt32.rc:84 msgid "CA Version" -msgstr "CA 버젼" +msgstr "CA 버전" #: crypt32.rc:85 msgid "Cross CA Version" -msgstr "교차 CA 버젼" +msgstr "교차 CA 버전" #: crypt32.rc:86 msgid "Serialized Signature Serial Number" @@ -1508,7 +1498,7 @@ msgstr "등록 이름 값의 쌍" #: crypt32.rc:90 msgid "OS Version" -msgstr "OS 버젼" +msgstr "OS 버전" #: crypt32.rc:91 msgid "Enrollment CSP" @@ -1548,15 +1538,15 @@ msgstr "상호 인증 분배 위치" #: crypt32.rc:100 msgid "Application Policies" -msgstr "풀그림 방침" +msgstr "프로그램 방침" #: crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "풀그림 정책 대응" +msgstr "프로그램 정책 대응" #: crypt32.rc:102 msgid "Application Policy Constraints" -msgstr "풀그림 정책 제약" +msgstr "프로그램 정책 제약" #: crypt32.rc:103 msgid "CMC Data" @@ -1800,11 +1790,11 @@ msgstr "루트 목록 서명자" #: crypt32.rc:163 msgid "All application policies" -msgstr "모든 풀그림의 방침" +msgstr "모든 프로그램의 방침" #: crypt32.rc:164 cryptui.rc:149 msgid "Directory Service Email Replication" -msgstr "디렉토리 서비스 이메일 응답" +msgstr "디렉터리 서비스 이메일 응답" #: crypt32.rc:165 cryptui.rc:145 msgid "Certificate Request Agent" @@ -1820,7 +1810,7 @@ msgstr "모든 배포 방침" #: crypt32.rc:172 msgid "Trusted Root Certification Authorities" -msgstr "신회 할 수 있는 루트 검증기관" +msgstr "신뢰할 수 있는 루트 인증 기관" #: crypt32.rc:173 msgid "Personal" @@ -1828,7 +1818,7 @@ msgstr "개인" #: crypt32.rc:174 msgid "Intermediate Certification Authorities" -msgstr "중개 검증 기관" +msgstr "중간 인증 기관" #: crypt32.rc:175 msgid "Other People" @@ -1840,7 +1830,7 @@ msgstr "신뢰할 수 있는 발행자" #: crypt32.rc:177 msgid "Untrusted Certificates" -msgstr "신뢰 할 수 없는 인증서" +msgstr "신뢰할 수 없는 인증서" #: crypt32.rc:182 msgid "KeyID=" @@ -1868,7 +1858,7 @@ msgstr "DNS 이름=" #: crypt32.rc:188 msgid "Directory Address" -msgstr "디렉토리 주소" +msgstr "디렉터리 주소" #: crypt32.rc:189 msgid "URL=" @@ -1888,7 +1878,7 @@ msgstr "등록된 ID=" #: crypt32.rc:193 msgid "Unknown Key Usage" -msgstr "알수 없는 키 사용" +msgstr " 없는 키 사용" #: crypt32.rc:194 msgid "Subject Type=" @@ -1910,7 +1900,7 @@ msgstr "제한된 경로 길이 =" #: crypt32.rc:198 msgctxt "path length" msgid "None" -msgstr "없음" +msgstr "None" #: crypt32.rc:199 msgid "Information Not Available" @@ -1935,7 +1925,7 @@ msgstr "CA 발행자" #: crypt32.rc:204 msgid "Unknown Access Method" -msgstr "알 수 없는 접근 방법" +msgstr " 없는 접근 방법" #: crypt32.rc:205 msgid "Alternative Name" @@ -2191,7 +2181,7 @@ msgstr "인증서를 오직 다음의 용도로만 사용(&O):" #: cryptui.rc:253 msgid "Add &Purpose..." -msgstr "용도 추가(&)..." +msgstr "용도 추가(&P)..." #: cryptui.rc:257 msgid "Add Purpose" @@ -2238,10 +2228,10 @@ msgstr "" "서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n" "\n" "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " +"다. 또한 메시지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " "인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" "\n" -"계속하려면,다음을 클릭하십시오." +"계속하려면, [다음]을 클릭하십시오." #: cryptui.rc:294 cryptui.rc:430 msgid "&File name:" @@ -2261,7 +2251,7 @@ msgstr "" #: cryptui.rc:299 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "암호화 메세지 문법 표준/PKCS #7 메시지 (*.p7b)" +msgstr "암호화 메시지 문법 표준/PKCS #7 메시지 (*.p7b)" #: cryptui.rc:301 msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" @@ -2372,10 +2362,10 @@ msgstr "" "니다.\n" "\n" "이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니" -"다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " +"다. 또한 메시지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, " "인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n" "\n" -"계속 하려면, 다음을 클릭하십시오." +"계속 하려면, [다음]을 클릭하십시오." #: cryptui.rc:384 msgid "" @@ -2407,11 +2397,11 @@ msgstr "사용할 파일 형식 선택:" #: cryptui.rc:408 msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-암호화된 X.509 (*.cer)" +msgstr "DER(&D) 부호화 X.509 (*.cer)" #: cryptui.rc:410 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-암호화된 X.509 (*.cer):" +msgstr "Base64(&S) 부호화 X.509 (*.cer):" #: cryptui.rc:412 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2435,7 +2425,7 @@ msgstr "강한 암호화 가능(&E)" #: cryptui.rc:422 msgid "Delete the private &key if the export is successful" -msgstr "내보내기가 성공하면 개인 키 지우기(&K)" +msgstr "내보내기가 성공하면 개인 키 삭제(&K)" #: cryptui.rc:439 msgid "Completing the Certificate Export Wizard" @@ -2466,7 +2456,7 @@ msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." msgstr "" -"이 루트 인증서는 신뢰 할 수 없습니다. 이것을 신뢰하려면, 당신의 시스템의 신뢰" +"이 루트 인증서는 신뢰할 수 없습니다. 이것을 신뢰하려면, 당신의 시스템의 신뢰" "된루트 인증서 보관소에 추가하십시오." #: cryptui.rc:34 @@ -2535,7 +2525,7 @@ msgstr "<모두>" #: cryptui.rc:50 msgid "Version 1 Fields Only" -msgstr "오직 버젼 1 필드만" +msgstr "오직 버전 1 필드만" #: cryptui.rc:51 msgid "Extensions Only" @@ -2654,7 +2644,7 @@ msgstr "인증서 신뢰 목록 (*.stl)" #: cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" -msgstr "CMS/PKCS #7 메세지 (*.spc; *.p7b)" +msgstr "CMS/PKCS #7 메시지 (*.spc; *.p7b)" #: cryptui.rc:84 msgid "Please select a file." @@ -2666,11 +2656,11 @@ msgstr "이 파일 형식을 이해할 수 없습니다. 다른 파일을 선택 #: cryptui.rc:86 msgid "Could not open " -msgstr "열수 없음 " +msgstr "열 수 없음 " #: cryptui.rc:87 msgid "Determined by the program" -msgstr "풀그림에 의해 결정" +msgstr "프로그램에 의해 결정" #: cryptui.rc:88 msgid "Please select a store" @@ -2682,7 +2672,7 @@ msgstr "인증서 보관소가 선택됨" #: cryptui.rc:90 msgid "Automatically determined by the program" -msgstr "자동으로 풀그림에 의해 결정" +msgstr "자동으로 프로그램에 의해 결정" #: cryptui.rc:91 shell32.rc:137 msgid "File" @@ -2698,7 +2688,7 @@ msgstr "인증서 파기 목록" #: cryptui.rc:96 msgid "CMS/PKCS #7 Message" -msgstr "CMS/PKCS #7 메세지" +msgstr "CMS/PKCS #7 메시지" #: cryptui.rc:97 msgid "Personal Information Exchange" @@ -2746,9 +2736,9 @@ msgid "" "sign messages with it.\n" "Are you sure you want to remove this certificate?" msgstr "" -"당신은 더 이상 이 인증서를 이용해서 메세지를 해독하거나,아니면 서명을 할 수 " -"없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하기를 원합니까?" +"당신은 더 이상 이 인증서를 이용해서 메시지를 해독하거나,아니면 서명할 수 없" +"을 것입니다.\n" +"당신은 정말로 이 인증서를 제거하시겠습니까?" #: cryptui.rc:111 msgid "" @@ -2756,9 +2746,9 @@ msgid "" "sign messages with them.\n" "Are you sure you want to remove these certificates?" msgstr "" -"당신은 더 이상 이 인증서다들를 이용해서 메세지를 해독하거나,아니면 서명을 할 " -"수 없을 것입니다.\n" -"당신은 정말로 이 인증서들를 제거하기를 원합니까??" +"당신은 더 이상 이 인증서다들를 이용해서 메시지를 해독하거나,아니면 서명할 수 " +"없을 것입니다.\n" +"당신은 정말로 이 인증서들를 제거하시겠습니까??" #: cryptui.rc:112 msgid "" @@ -2766,9 +2756,9 @@ msgid "" "verify messages signed with it.\n" "Are you sure you want to remove this certificate?" msgstr "" -"당신은 더 이상 이 인증서를 이용해서 메세지를 암호하거나,아니면 서명된 것을 검" +"당신은 더 이상 이 인증서를 이용해서 메시지를 암호하거나,아니면 서명된 것을 검" "증할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하기를 원합니까?" +"당신은 정말로 이 인증서를 제거하시겠습니까?" #: cryptui.rc:113 msgid "" @@ -2776,9 +2766,9 @@ msgid "" "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" -"더 이상 이 인증서를 이용해서 메세지를 암호하거나,아니면 서명된 것을 검증할 " +"더 이상 이 인증서를 이용해서 메시지를 암호하거나,아니면 서명된 것을 검증할 " "수 없을 것입니다.\n" -"정말로 이 인증서를 제거하기를 원합니까?" +"정말로 이 인증서를 제거하시겠습니까?" #: cryptui.rc:114 msgid "" @@ -2787,7 +2777,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "이 인증 기관이 발급한 인증서를 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하기를 원합니까?" +"당신은 정말로 이 인증서를 제거하시겠습니까?" #: cryptui.rc:115 msgid "" @@ -2796,7 +2786,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "이 인증 기관이 발급한 인증서들를 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서들를 제거하기를 원합니까?" +"당신은 정말로 이 인증서들를 제거하시겠습니까?" #: cryptui.rc:116 msgid "" @@ -2806,7 +2796,7 @@ msgid "" msgstr "" "이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 " "수 없을 것입니다.\n" -"당신은 정말로 이 신뢰된 루트인증서를 제거하기를 원합니까?" +"당신은 정말로 이 신뢰된 루트인증서를 제거하시겠습니까?" #: cryptui.rc:117 msgid "" @@ -2816,31 +2806,31 @@ msgid "" msgstr "" "이 루트인증 기관이나 다른 어떤 인증기관에에서 발급한 인증서를 더 이상 신뢰할 " "수 없을 것입니다.\n" -"당신은 정말로 이 신뢰된 루트인증서들를 제거하기를 원합니까?" +"당신은 정말로 이 신뢰된 루트인증서들를 제거하시겠습니까?" #: cryptui.rc:118 msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"이 발행자에 의해 서명된 무른모는 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서를 제거하기를 원합니까?" +"이 발행자에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n" +"당신은 정말로 이 인증서를 제거하시겠습니까?" #: cryptui.rc:119 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"이 발행자들에 의해 서명된 무른모는 더 이상 신뢰할 수 없을 것입니다.\n" -"당신은 정말로 이 인증서들를 제거하기를 원합니까?" +"이 발행자에 의해 서명된 소프트웨어는 더 이상 신뢰할 수 없을 것입니다.\n" +"당신은 정말로 이 인증서들를 제거하시겠습니까?" #: cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "이 인증거를 제거하기를 원합니까?" +msgstr "이 인증서를 제거하시겠습니까?" #: cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "이 인증서를 제거하기를 원합니까?" +msgstr "이 인증서를 제거하시겠습니까?" #: cryptui.rc:124 msgid "Ensures the identity of a remote computer" @@ -2855,8 +2845,8 @@ msgid "" "Ensures software came from software publisher\n" "Protects software from alteration after publication" msgstr "" -"무른모 발행자로부터 온 무른모 보증\n" -"발행된 후의 무른모를 개조로부터 보호" +"소프트웨어 발행자로부터 온 소프트웨어 보증\n" +"발행된 후의 소프트웨어를 개조로부터 보호" #: cryptui.rc:127 msgid "Protects e-mail messages" @@ -2912,7 +2902,7 @@ msgstr "Base64-암호화된 X.509 (*.cer)" #: cryptui.rc:160 msgid "CMS/PKCS #7 Messages (*.p7b)" -msgstr "CMS/PKCS #7 메세지 (*.p7b)" +msgstr "CMS/PKCS #7 메시지 (*.p7b)" #: cryptui.rc:161 msgid "Personal Information Exchange (*.pfx)" @@ -3134,7 +3124,7 @@ msgstr "뒤로(&B)" #: hhctrl.rc:61 hhctrl.rc:74 msgid "&Forward" -msgstr "앞으로" +msgstr "앞으로(&F)" #: hhctrl.rc:62 msgctxt "table of contents" @@ -3379,7 +3369,7 @@ msgstr "당신은 캐시된 페이지,쿠키나 다른 데이터를 지울 수 #: inetcpl.rc:59 msgid "Delete &files..." -msgstr "파일들 지우기(&F)..." +msgstr "파일 삭제(&F)..." #: inetcpl.rc:60 msgid "&Settings..." @@ -3387,7 +3377,7 @@ msgstr "설정(&S)..." #: inetcpl.rc:68 msgid "Delete browsing history" -msgstr "방문 기록 지우기" +msgstr "방문 기록 삭제" #: inetcpl.rc:71 msgid "" @@ -3433,7 +3423,7 @@ msgstr "" #: inetcpl.rc:82 progman.rc:67 msgid "Delete" -msgstr "지우기" +msgstr "삭제" #: inetcpl.rc:90 winefile.rc:115 msgid "Security" @@ -3454,46 +3444,36 @@ msgid "Publishers..." msgstr "발행자..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "랜 연결" +msgstr "연결" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 설정" +msgstr "자동 설정" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "웹 프록시 자동 검색 (WPAD) 사용" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "프록시 자동 설정 (PAC) 스크립트 사용" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "주소" +msgstr "주소:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "지역 서버(&L)" +msgstr "프록시 서버" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "프록시 서버 사용" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "포트가 없음" +msgstr "포트:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3625,23 +3605,23 @@ msgstr "문법 오류" #: jscript.rc:37 msgid "Expected ';'" -msgstr "';' 가 필요합니다" +msgstr "';' 필요" #: jscript.rc:38 msgid "Expected '('" -msgstr "'(' 가 필요합니다" +msgstr "'(' 필요" #: jscript.rc:39 msgid "Expected ')'" -msgstr "')' 가 필요합니다" +msgstr "')' 필요" #: jscript.rc:40 msgid "Expected identifier" -msgstr "예상된 식별자" +msgstr "필요한 식별자" #: jscript.rc:41 msgid "Expected '='" -msgstr "'='가 필요합니다." +msgstr "'=' 필요" #: jscript.rc:42 msgid "Invalid character" @@ -3665,11 +3645,11 @@ msgstr "루프 바깥에는 'continue'를 사용할 수 없음" #: jscript.rc:47 msgid "Label redefined" -msgstr "라벨이 중복정의됨" +msgstr "레이블이 중복정의됨" #: jscript.rc:48 msgid "Label not found" -msgstr "라벨을 찾을 수 없음" +msgstr "레이블을 찾을 수 없음" #: jscript.rc:49 msgid "Expected '@end'" @@ -3693,7 +3673,7 @@ msgstr "함수가 필요합니다" #: jscript.rc:53 msgid "'[object]' is not a date object" -msgstr "'[객체]' 는 날짜 객체가 아님" +msgstr "'[object]'가 날짜 객체가 아닙니다" #: jscript.rc:55 msgid "Object expected" @@ -3705,7 +3685,7 @@ msgstr "잘못된 할당" #: jscript.rc:57 msgid "'|' is undefined" -msgstr "'|' 는 정의되지 않았음" +msgstr "'|'가 정의도지 않았습니다" #: jscript.rc:58 msgid "Boolean object expected" @@ -3729,7 +3709,7 @@ msgstr "정규 표현식에 문법오류가 있음" #: jscript.rc:64 msgid "URI to be encoded contains invalid characters" -msgstr "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음" +msgstr "URI가 올바르지 않은 문자를 포함해서 인코딩되었음" #: jscript.rc:63 msgid "URI to be decoded is incorrect" @@ -3755,7 +3735,8 @@ msgstr "배열 객체가 필요함" msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" -msgstr "이 대상을 쓰기 가능하게 할 수 없습니다." +msgstr "" +"속성 설명자의 'writable' 특성은 이 개체에서 'true'로 설정할 수 없습니다" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" @@ -3767,11 +3748,11 @@ msgstr "쓰기 가능하지 않은 요소 '|'를 편집할 수 없습니다." #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "속성은 접근자와 값을 모두 가질 수 없습니다" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "와인 주요 동적 연결 자료관" +msgstr "Wine 커널 DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -3779,75 +3760,75 @@ msgstr "Wine" #: winerror.mc:28 msgid "Success.\n" -msgstr "성공.\n" +msgstr "작업을 완료했습니다.\n" #: winerror.mc:33 msgid "Invalid function.\n" -msgstr "잘못된 기능(함수).\n" +msgstr "올바르지 않은 함수입니다.\n" #: winerror.mc:38 msgid "File not found.\n" -msgstr "파일을 찾을 수 없습니다.\n" +msgstr "지정한 파일을 찾을 수 없습니다.\n" #: winerror.mc:43 msgid "Path not found.\n" -msgstr "경로를 찾을 수 없습니다.\n" +msgstr "지정한 경로를 찾을 수 없습니다.\n" #: winerror.mc:48 msgid "Too many open files.\n" -msgstr "너무 많은 파일이 열려 있습니다.\n" +msgstr "파일을 열 수 없습니다.\n" #: winerror.mc:53 msgid "Access denied.\n" -msgstr "접근이 금지되었습니다.\n" +msgstr "접근이 거부되었습니다.\n" #: winerror.mc:58 msgid "Invalid handle.\n" -msgstr "잘못된 핸들(handle).\n" +msgstr "잘못된 핸들입니다.\n" #: winerror.mc:63 msgid "Memory trashed.\n" -msgstr "메모리가 버려짐.\n" +msgstr "저장 컨트롤 블록이 손상되었습니다.\n" #: winerror.mc:68 msgid "Not enough memory.\n" -msgstr "메모리가 부족합니다.\n" +msgstr "저장 공간이 부족해서 이 명령을 수행할 수 없습니다.\n" #: winerror.mc:73 msgid "Invalid block.\n" -msgstr "잘못된 블록.\n" +msgstr "저장 컨트롤 블록 주소가 올바르지 않습니다.\n" #: winerror.mc:78 msgid "Bad environment.\n" -msgstr "잘못된 환경.\n" +msgstr "환경이 올바르지 않습니다.\n" #: winerror.mc:83 msgid "Bad format.\n" -msgstr "잘못된 형식.\n" +msgstr "잘못된 형식의 프로그램을 로드하려고 했습니다.\n" #: winerror.mc:88 msgid "Invalid access.\n" -msgstr "잘못된 접근.\n" +msgstr "액세스 코드가 올바르지 않습니다.\n" #: winerror.mc:93 msgid "Invalid data.\n" -msgstr "잘못된 데이터.\n" +msgstr "데이터가 올바르지 않습니다.\n" #: winerror.mc:98 msgid "Out of memory.\n" -msgstr "메모리가 부족합니다.\n" +msgstr "저장 공간이 부족해서 이 작업을 완료할 수 없습니다.\n" #: winerror.mc:103 msgid "Invalid drive.\n" -msgstr "잘못된 드라이브.\n" +msgstr "지정한 드라이브를 찾을 수 없습니다.\n" #: winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "현재 디렉토리를 지울 수 없습니다.\n" +msgstr "디렉터리를 삭제할 수 없습니다.\n" #: winerror.mc:113 msgid "Not same device.\n" -msgstr "같은 장치가 아닙니다.\n" +msgstr "파일을 다른 디스크 드라이브로 이동할 수 없습니다.\n" #: winerror.mc:118 msgid "No more files.\n" @@ -3855,19 +3836,19 @@ msgstr "더 이상 파일이 없습니다.\n" #: winerror.mc:123 msgid "Write protected.\n" -msgstr "쓰기 보호됨.\n" +msgstr "매체가 쓰기 금지되었습니다.\n" #: winerror.mc:128 msgid "Bad unit.\n" -msgstr "잘못된 유닛.\n" +msgstr "지정한 장치를 찾을 수 없습니다.\n" #: winerror.mc:133 msgid "Not ready.\n" -msgstr "준비가 안 되었습니다.\n" +msgstr "장치가 준비되지 않았습니다.\n" #: winerror.mc:138 msgid "Bad command.\n" -msgstr "잘못된 명령.\n" +msgstr "장치가 명령을 인식하지 않습니다.\n" #: winerror.mc:143 msgid "CRC error.\n" @@ -3875,11 +3856,12 @@ msgstr "CRC 오류.\n" #: winerror.mc:148 msgid "Bad length.\n" -msgstr "나쁜 길이.\n" +msgstr "명령 길이가 올바르지 않습니다.\n" #: winerror.mc:153 winerror.mc:528 msgid "Seek error.\n" -msgstr "찾기 오류.\n" +msgstr "" +"드라이브에서 디스트의 특정 영역이나 트랙의 위치를 지정할 수 없습니다.\n" #: winerror.mc:158 msgid "Not DOS disk.\n" @@ -3887,139 +3869,143 @@ msgstr "DOS 디스크가 아닙니다.\n" #: winerror.mc:163 msgid "Sector not found.\n" -msgstr "섹터를 찾을 수 없습니다.\n" +msgstr "요청한 섹터를 찾을 수 없습니다.\n" #: winerror.mc:168 msgid "Out of paper.\n" -msgstr "용지 범위 밖임.\n" +msgstr "프린터에 용지가 떨어졌습니다.\n" #: winerror.mc:173 msgid "Write fault.\n" -msgstr "쓰기 오류.\n" +msgstr "지정한 장치에 쓸 수 없습니다.\n" #: winerror.mc:178 msgid "Read fault.\n" -msgstr "읽기 오류.\n" +msgstr "지정한 장치로부터 읽을 수 없습니다.\n" #: winerror.mc:183 msgid "General failure.\n" -msgstr "일반적인 실패.\n" +msgstr "시스템에 부착된 장치가 작동하지 않습니다.\n" #: winerror.mc:188 msgid "Sharing violation.\n" -msgstr "공유 위반.\n" +msgstr "" +"다른 프로세스에서 이 파일을 사용하고 있기 때문에 이 파일을 액세스할 수 없습니" +"다.\n" #: winerror.mc:193 msgid "Lock violation.\n" -msgstr "잠구기 위반.\n" +msgstr "" +"다른 프로세스에서 이 파일의 일부를 잠궜기 때문에 이 파일을 액세스할 수 없습니" +"다.\n" #: winerror.mc:198 msgid "Wrong disk.\n" -msgstr "잘못된 디스크.\n" +msgstr "드라이브에 잘못된 디스켓이 있습니다.\n" #: winerror.mc:203 msgid "Sharing buffer exceeded.\n" -msgstr "공유 버퍼가 한계를 넘었습니다.\n" +msgstr "공유기기 위해 연 파일이 너무 많습니다.\n" #: winerror.mc:208 msgid "End of file.\n" -msgstr "파일의 끝.\n" +msgstr "파일의 끝입니다.\n" #: winerror.mc:213 winerror.mc:438 msgid "Disk full.\n" -msgstr "디스크가 꽉 찼습니다.\n" +msgstr "디스크가 가득 차 있습니다.\n" #: winerror.mc:218 msgid "Request not supported.\n" -msgstr "이 요청은 지원하지 않습니다.\n" +msgstr "네트워크 요청이 지원되지 않습니다.\n" #: winerror.mc:223 msgid "Remote machine not listening.\n" -msgstr "원격 머신이 응답하지 않습니다.\n" +msgstr "원격 컴퓨터를 사용할 수 없습니다.\n" #: winerror.mc:228 msgid "Duplicate network name.\n" -msgstr "중복된 네트워크 이름.\n" +msgstr "네트워크에 중복된 이름이 있습니다.\n" #: winerror.mc:233 msgid "Bad network path.\n" -msgstr "나쁜 네트워크 경로.\n" +msgstr "네트워크 경로를 찾을 수 없습니다.\n" #: winerror.mc:238 msgid "Network busy.\n" -msgstr "네트워크가 바쁩니다.\n" +msgstr "네트워크가 사용 중입니다.\n" #: winerror.mc:243 msgid "Device does not exist.\n" -msgstr "장치가 존재하지 않습니다.\n" +msgstr "지정한 네트워크 리소스 또는 장치를 더 이상 사용할 수 없습니다.\n" #: winerror.mc:248 msgid "Too many commands.\n" -msgstr "명령이 너무 많습니다.\n" +msgstr "네트워크 명령 한계에 도달했습니다.\n" #: winerror.mc:253 msgid "Adapter hardware error.\n" -msgstr "어댑터 굳은모 오류.\n" +msgstr "네트워크 어댑터 하드웨어 오류가 발생했습니다.\n" #: winerror.mc:258 msgid "Bad network response.\n" -msgstr "나쁜 네트워크 반응.\n" +msgstr "지정한 서버에서 요청한 작업을 수행할 수 없습니다.\n" #: winerror.mc:263 msgid "Unexpected network error.\n" -msgstr "예기치 않은 네트워크 오류.\n" +msgstr "예기치 않은 네트워크 오류가 발생했습니다.\n" #: winerror.mc:268 msgid "Bad remote adapter.\n" -msgstr "나쁜 원격 어댑터.\n" +msgstr "원격 어댑터가 호환되지 않습니다.\n" #: winerror.mc:273 msgid "Print queue full.\n" -msgstr "프린터 재기열이 꽉 참.\n" +msgstr "프린터 대기열이 가득 찼습니다.\n" #: winerror.mc:278 msgid "No spool space.\n" -msgstr "스풀 공간이 없습니디.\n" +msgstr "인쇄 대기 중인 파일을 저장할만한 공각이 없습니다.\n" #: winerror.mc:283 msgid "Print canceled.\n" -msgstr "인쇄가 취소되었습니다.\n" +msgstr "인쇄 대기 중인 파일이 삭제되었습니다.\n" #: winerror.mc:288 msgid "Network name deleted.\n" -msgstr "네트워크 이름이 지워졌습니다.\n" +msgstr "지정한 네트워크 이름을 더 이상 사용할 수 없습니다\n" #: winerror.mc:293 msgid "Network access denied.\n" -msgstr "네트워크 접근이 차단되었습니다.\n" +msgstr "네트워크 접근이 거부되었습니다.\n" #: winerror.mc:298 msgid "Bad device type.\n" -msgstr "나쁜 장치 타입.\n" +msgstr "네트워크 리소스의 종류가 올바르지 않습니다.\n" #: winerror.mc:303 msgid "Bad network name.\n" -msgstr "나쁜 네트워크 이름.\n" +msgstr "네트워크 이름을 찾을 수 없습니다.\n" #: winerror.mc:308 msgid "Too many network names.\n" -msgstr "너무 많은 네트워크 이름이 있습니다.\n" +msgstr "네트워크 이름 한계를 초과했습니다.\n" #: winerror.mc:313 msgid "Too many network sessions.\n" -msgstr "너무 많은 네트워크 셰션이 있습니다.\n" +msgstr "네트워크 세션 한계를 초과했습니다.\n" #: winerror.mc:318 msgid "Sharing paused.\n" -msgstr "공유가 정지되었습니다.\n" +msgstr "공유가 중지되었습니다.\n" #: winerror.mc:323 msgid "Request not accepted.\n" -msgstr "이 요청은 허용되지 않습니다.\n" +msgstr "요청을 수용할 수 없습니다.\n" #: winerror.mc:328 msgid "Redirector paused.\n" -msgstr "리다이렉터(Redirector)가 정지됨.\n" +msgstr "장치가 중지되었습니다.\n" #: winerror.mc:333 msgid "File exists.\n" @@ -4027,59 +4013,59 @@ msgstr "파일이 존재합니다.\n" #: winerror.mc:338 msgid "Cannot create.\n" -msgstr "만들수 없습니다.\n" +msgstr "디렉터리나 파일을 작성할 수 없습니다.\n" #: winerror.mc:343 msgid "Int24 failure.\n" -msgstr "Int24 실패.\n" +msgstr "INT24 오류.\n" #: winerror.mc:348 msgid "Out of structures.\n" -msgstr "구조의 범위를 벗어남.\n" +msgstr "이 요청을 처리할만한 저장 공간이 없습니다\n" #: winerror.mc:353 msgid "Already assigned.\n" -msgstr "이미 할당됨.\n" +msgstr "이름이 이미 사용 중입니다.\n" #: winerror.mc:358 winerror.mc:1713 msgid "Invalid password.\n" -msgstr "잘못된 암호.\n" +msgstr "암호가 올바르지 않습니다.\n" #: winerror.mc:363 msgid "Invalid parameter.\n" -msgstr "잘못된 매개변수.\n" +msgstr "매개변수가 올바르지 않습니다.\n" #: winerror.mc:368 msgid "Net write fault.\n" -msgstr "네트워크 쓰기 잘못.\n" +msgstr "네트워크 쓰기 오류가 발생했습니다.\n" #: winerror.mc:373 msgid "No process slots.\n" -msgstr "어떤 작업 슬롯도 없습니다.\n" +msgstr "프로세스 슬롯이 없습니다.\n" #: winerror.mc:378 msgid "Too many semaphores.\n" -msgstr "세마포어가 너무 많습니다.\n" +msgstr "세마포어 작성 한계를 초과했습니다.\n" #: winerror.mc:383 msgid "Exclusive semaphore already owned.\n" -msgstr "배타적 세마포어가 이미 소유되었습니다.\n" +msgstr "단독 세마포어를 다른 프로세스가 소유하고 있습니다.\n" #: winerror.mc:388 msgid "Semaphore is set.\n" -msgstr "세마포어가 설정되었습니다.\n" +msgstr "세마포어가 설정되어 있습니다.\n" #: winerror.mc:393 msgid "Too many semaphore requests.\n" -msgstr "세마포어 요청이 너무 많습니다.\n" +msgstr "세마포어를 다시 설정할 수 없습니다.\n" #: winerror.mc:398 msgid "Invalid at interrupt time.\n" -msgstr "올바르지 않은 인터럽트 시간.\n" +msgstr "인터럽트 시간에 단독 세마포어를 요청할 수 없습니다.\n" #: winerror.mc:403 msgid "Semaphore owner died.\n" -msgstr "세마포어 소유자가 죽었습니다.\n" +msgstr "세마포어의 이전 소유권이 끝났습니다.\n" #: winerror.mc:408 msgid "Semaphore user limit.\n" @@ -4087,19 +4073,19 @@ msgstr "세마포어 사용자 제한.\n" #: winerror.mc:413 msgid "Insert disk for drive %1.\n" -msgstr "드라이브 %1에 디스크를 삽입하십시오.\n" +msgstr "드라이브 %1에 디스크를 넣으십시오.\n" #: winerror.mc:418 msgid "Drive locked.\n" -msgstr "드라이브가 잠겼습니다.\n" +msgstr "드라이브가 잠겨 있습니다.\n" #: winerror.mc:423 msgid "Broken pipe.\n" -msgstr "깨진 파이프.\n" +msgstr "파이프가 종료되었습니다.\n" #: winerror.mc:428 msgid "Open failed.\n" -msgstr "열기 실패하였습니다.\n" +msgstr "지정한 장치가 파일을 열 수 없습니다.\n" #: winerror.mc:433 msgid "Buffer overflow.\n" @@ -4107,47 +4093,47 @@ msgstr "버퍼 오버플로우.\n" #: winerror.mc:443 msgid "No more search handles.\n" -msgstr "더 이상 찾기 핸들이 없습니다.\n" +msgstr "핸들을 더이상 찾을 수 없습니다.\n" #: winerror.mc:448 msgid "Invalid target handle.\n" -msgstr "올바르지 않은 타겟 핸들.\n" +msgstr "목표 핸들이 올바르지 않습니다.\n" #: winerror.mc:453 msgid "Invalid IOCTL.\n" -msgstr "올바르지 않은 IOCTL.\n" +msgstr "IOCTL 호출이 올바르지 않습니다.\n" #: winerror.mc:458 msgid "Invalid verify switch.\n" -msgstr "올바르지 않은 검사 스위치.\n" +msgstr "확인 스위치가 올바르지 않습니다.\n" #: winerror.mc:463 msgid "Bad driver level.\n" -msgstr "나쁜 드라이버 레밸.\n" +msgstr "드라이버 레벨이 잘못되었습니다.\n" #: winerror.mc:468 msgid "Call not implemented.\n" -msgstr "이 요구는 구현되지 않았습니다.\n" +msgstr "지원하지 않는 요청입니다.\n" #: winerror.mc:473 msgid "Semaphore timeout.\n" -msgstr "세마포어 시간 초과.\n" +msgstr "세마포어 시간이 만료되었습니다.\n" #: winerror.mc:478 msgid "Insufficient buffer.\n" -msgstr "충분하지 않은 버퍼.\n" +msgstr "버퍼가 너무 작습니다.\n" #: winerror.mc:483 msgid "Invalid name.\n" -msgstr "올바르지 않은 이름.\n" +msgstr "이름이 올바르지 않습니다.\n" #: winerror.mc:488 msgid "Invalid level.\n" -msgstr "올바르지 않은 레벨.\n" +msgstr "수준이 올바르지 않습니다.\n" #: winerror.mc:493 msgid "No volume label.\n" -msgstr "불륨 라벨이 없습니다.\n" +msgstr "디스크 이름이 없습니다.\n" #: winerror.mc:498 msgid "Module not found.\n" @@ -4155,11 +4141,11 @@ msgstr "모듈을 찾을 수 없습니다.\n" #: winerror.mc:503 msgid "Procedure not found.\n" -msgstr "처리절차를 찾을 수 없습니다.\n" +msgstr "프로시져를 찾을 수 없습니다.\n" #: winerror.mc:508 msgid "No children to wait for.\n" -msgstr "~에 대해 대기하는 자식 프로세스가 없음.\n" +msgstr "대기중인 자식 프로세스가 없습니다.\n" #: winerror.mc:513 msgid "Child process has not completed.\n" @@ -4167,75 +4153,75 @@ msgstr "자식 프로세스가 완료되지 않았습니다.\n" #: winerror.mc:518 msgid "Invalid use of direct access handle.\n" -msgstr "올바르지 않은 직접 접근 핸들의 사용.\n" +msgstr "직접 접근할 수 없는 핸들입니다.\n" #: winerror.mc:523 msgid "Negative seek.\n" -msgstr "부정적 탐색.\n" +msgstr ".\n" #: winerror.mc:533 msgid "Drive is a JOIN target.\n" -msgstr "이 드라이브는 JOIN 타겟입니다.\n" +msgstr "드라이브가 JOIN 타겟입니다.\n" #: winerror.mc:538 msgid "Drive is already JOINed.\n" -msgstr "이 드라이브는 이미 JOIN이 되었습니다.\n" +msgstr "드라이브가 이미 JOIN되어 있습니다.\n" #: winerror.mc:543 msgid "Drive is already SUBSTed.\n" -msgstr "이 드라이브는 이미 SUBST되었습니다.\n" +msgstr "드라이브가 이미 SUBST되어 있습니다.\n" #: winerror.mc:548 msgid "Drive is not JOINed.\n" -msgstr "이 드라이브는 JOIN되지 않았습니다.\n" +msgstr "드라이브가 JOIN되지 않습니다.\n" #: winerror.mc:553 msgid "Drive is not SUBSTed.\n" -msgstr "이 드라이브는 SUBST되지 않았습니다.\n" +msgstr "드라이브가 SUBST되지 않습니다.\n" #: winerror.mc:558 msgid "Attempt to JOIN onto a JOINed drive.\n" -msgstr "JOIN된 드,라이브에 JOIN 시도함.\n" +msgstr "JOIN된 드라이브에 JOIN을 시도했습니다.\n" #: winerror.mc:563 msgid "Attempt to SUBST onto a SUBSTed drive.\n" -msgstr "SUBST된 드라이브에 SUBST시도함.\n" +msgstr "SUBST된 드라이브에 SUBST를 시도했습니다.\n" #: winerror.mc:568 msgid "Attempt to JOIN to a SUBSTed drive.\n" -msgstr "SUBST된 드라이브에 JOIN시도함.\n" +msgstr "SUBST된 드라이브에 JOIN을 시도했습니다.\n" #: winerror.mc:573 msgid "Attempt to SUBST to a JOINed drive.\n" -msgstr "JOIN된 드라이브에 SUBST시도함.\n" +msgstr "JOIN된 드라이브에 SUBST를 시도했습니다.\n" #: winerror.mc:578 msgid "Drive is busy.\n" -msgstr "드라이브는 바쁩니다.\n" +msgstr "지정한 드라이브를 지금 사용할 수 없습니다.\n" #: winerror.mc:583 msgid "Same drive.\n" -msgstr "같은 드라이브.\n" +msgstr "같은 드라이브입니다.\n" #: winerror.mc:588 msgid "Not top-level directory.\n" -msgstr "최상위 디렉토리가 아닙니다.\n" +msgstr "루트 디렉터리의 하위 디렉터리가 아닙니다.\n" #: winerror.mc:593 msgid "Directory is not empty.\n" -msgstr "디렉토리가 비워 있지 않습니다.\n" +msgstr "디렉터리가 비워 있지 않습니다.\n" #: winerror.mc:598 msgid "Path is in use as a SUBST.\n" -msgstr "이 경로는 SUBST에서 사용하고 있습니다.\n" +msgstr "지정한 경로가 SUBST 용으로 사용 중입니다.\n" #: winerror.mc:603 msgid "Path is in use as a JOIN.\n" -msgstr "이 경로는 JOIN에서 사용하고 있습니다.\n" +msgstr "지정한 경로가 JOIN 용으로 사용 중입니다.\n" #: winerror.mc:608 msgid "Path is busy.\n" -msgstr "이 경로는 바쁩니다.\n" +msgstr "지정한 경로를 지금 사용할 수 없습니다.\n" #: winerror.mc:613 msgid "Already a SUBST target.\n" @@ -4243,15 +4229,15 @@ msgstr "이미 SUBST 타겟입니다.\n" #: winerror.mc:618 msgid "System trace not specified or disallowed.\n" -msgstr "시스템 추적은 명시되지 않았거나 허용되지 않음.\n" +msgstr "시스템 추적이 명시되지 않았거나 허용되지 않습니다.\n" #: winerror.mc:623 msgid "Event count for DosMuxSemWait incorrect.\n" -msgstr "DosMuxSemWait의 이벤트 카운터가 올바르지 않습니다.\n" +msgstr "DosMuxSemWait 용 이벤트 개수가 올바르지 않습니다.\n" #: winerror.mc:628 msgid "Too many waiters for DosMuxSemWait.\n" -msgstr "DosMuxSemWait에 너무 많은 대기자가 있습니다.\n" +msgstr "DosMuxSemWait 용 대기자가 너무 많습니다.\n" #: winerror.mc:633 msgid "DosSemMuxWait list invalid.\n" @@ -4259,67 +4245,67 @@ msgstr "DosSemMuxWait 목록이 올바르지 않습니다.\n" #: winerror.mc:638 msgid "Volume label too long.\n" -msgstr "볼륨 라벨이 너무 깁니다.\n" +msgstr "볼륨 레이블이 너무 깁니다.\n" #: winerror.mc:643 msgid "Too many TCBs.\n" -msgstr "TCBs가 너무 많습니다.\n" +msgstr "TCB 한계를 초과했습니다.\n" #: winerror.mc:648 msgid "Signal refused.\n" -msgstr "시그널 거부됨.\n" +msgstr "시그널이 거부되었습니다.\n" #: winerror.mc:653 msgid "Segment discarded.\n" -msgstr "세그맨트 버려짐.\n" +msgstr "세그맨트가 삭제되었습니다.\n" #: winerror.mc:658 msgid "Segment not locked.\n" -msgstr "세그멘트가 잠겨있지 않습니다.\n" +msgstr "세그멘트를 잠글 수 없습니다.\n" #: winerror.mc:663 msgid "Bad thread ID address.\n" -msgstr "나쁜 쓰레드 ID 주소.\n" +msgstr "쓰레드 ID 주소가 올바르지 않습니다.\n" #: winerror.mc:668 msgid "Bad arguments to DosExecPgm.\n" -msgstr "DosExecPgm의 나쁜 주장.\n" +msgstr "DosExecPgm에 전달된 인수가 올바르지 않습니다.\n" #: winerror.mc:673 msgid "Path is invalid.\n" -msgstr "경로가 올바르지 않습니다.\n" +msgstr "지정한 경로가 올바르지 않습니다.\n" #: winerror.mc:678 msgid "Signal pending.\n" -msgstr "시그널 대기중.\n" +msgstr "시그널이 대기 중입니다.\n" #: winerror.mc:683 msgid "Max system-wide thread count reached.\n" -msgstr "최대 시스템 전역 쓰레드 카운트 도달.\n" +msgstr "시스템 스레드 작성 한계에 도달했습니다.\n" #: winerror.mc:688 msgid "Lock failed.\n" -msgstr "잠그기가 실패했습니다.\n" +msgstr "잠글 수 없습니다.\n" #: winerror.mc:693 msgid "Resource in use.\n" -msgstr "리소스가 사용중입니다.\n" +msgstr "리소스가 사용 중입니다.\n" #: winerror.mc:698 msgid "Cancel violation.\n" -msgstr "취소 위반.\n" +msgstr "취소 위반입니다.\n" #: winerror.mc:703 msgid "Atomic locks not supported.\n" -msgstr "막대한 잠금은 지원하지 않습니다.\n" +msgstr "원자적 잠금을 지원하지 않습니다.\n" #: winerror.mc:708 msgid "Invalid segment number.\n" -msgstr "올바르지 않은 세그멘트 번호.\n" +msgstr "올바르지 않은 세그멘트 번호입니다.\n" #: winerror.mc:713 msgid "Invalid ordinal for %1.\n" -msgstr "올바르지 않은 %1 오디널.\n" +msgstr "올바르지 않은 %1 번호입니다.\n" #: winerror.mc:718 msgid "File already exists.\n" @@ -4327,7 +4313,7 @@ msgstr "파일은 이미 존재합니다.\n" #: winerror.mc:723 msgid "Invalid flag number.\n" -msgstr "올바르지 않은 플래그 숫자.\n" +msgstr "플래그 번호가 올바르지 않습니다.\n" #: winerror.mc:728 msgid "Semaphore name not found.\n" @@ -4335,63 +4321,63 @@ msgstr "세마포어 이름을 찾을 수 없습니다.\n" #: winerror.mc:733 msgid "Invalid starting code segment for %1.\n" -msgstr "올바르지 않은 %1 시작 코드 세그멘트.\n" +msgstr "%1 코드 세그멘트를 시작할 수 없습니다.\n" #: winerror.mc:738 msgid "Invalid starting stack segment for %1.\n" -msgstr "올바르지 않은 %1 스택 세그먼트 시작.\n" +msgstr "%1 스택 세그먼트를 시작할 수 없습니다.\n" #: winerror.mc:743 msgid "Invalid module type for %1.\n" -msgstr "%1의 올바르지 않은 모듈 형식.\n" +msgstr "%1 모듈 형식이 잘못되었습니다.\n" #: winerror.mc:748 msgid "Invalid EXE signature in %1.\n" -msgstr "%1 의 올바르지 않은 EXE 서명.\n" +msgstr "%1 실행 서명이 잘못되었습니다.\n" #: winerror.mc:753 msgid "EXE %1 is marked invalid.\n" -msgstr "EXE %1 는 올바르지 않다고 표시되어 있습니다.\n" +msgstr "%1 실행이 올바르지 않다고 표시되어 있습니다.\n" #: winerror.mc:758 msgid "Bad EXE format for %1.\n" -msgstr "%1의 나쁜 EXE 형식.\n" +msgstr "%1 실행 형식이 잘못되어 있습니다.\n" #: winerror.mc:763 msgid "Iterated data exceeds 64k in %1.\n" -msgstr "%1의 반복 데이타가 64k를 넘음.\n" +msgstr "%1에 통합된 데이터가 64k를 초과했습니다.\n" #: winerror.mc:768 msgid "Invalid MinAllocSize in %1.\n" -msgstr "%1의 올바르지 않은 MinAllocSize.\n" +msgstr "%1 최소 할당 크기가 잘못되었습니다.\n" #: winerror.mc:773 msgid "Dynlink from invalid ring.\n" -msgstr "올바르지 않은 링으로부터 온 Dynlink.\n" +msgstr "잘못된 링에서의 동적 링크입니다.\n" #: winerror.mc:778 msgid "IOPL not enabled.\n" -msgstr "IOPL는 가능하지 않습니다.\n" +msgstr "IOPL이 가능하지 않습니다.\n" #: winerror.mc:783 msgid "Invalid SEGDPL in %1.\n" -msgstr "%1의 올바르지 않은 SEGDPL.\n" +msgstr "%1 SEGDPL이 올바르지 않습니다.\n" #: winerror.mc:788 msgid "Auto data segment exceeds 64k.\n" -msgstr "자동 데이타 세그멘트가 64k를 넘었습니다.\n" +msgstr "자동 데이타 세그멘트가 64k를 초과했습니다.\n" #: winerror.mc:793 msgid "Ring 2 segment must be movable.\n" -msgstr "링 2 세그멘트는 반드시 이동이 가능해야 합니다.\n" +msgstr "링 2 세그멘트는 이동 가능해야 합니다.\n" #: winerror.mc:798 msgid "Relocation chain exceeds segment limit in %1.\n" -msgstr "재배치 체인이 %1의 세그맨트 제한 도달.\n" +msgstr "재배치 체인이 %1 세그먼트 제한을 초과했습니다.\n" #: winerror.mc:803 msgid "Infinite loop in relocation chain in %1.\n" -msgstr "%1에 재배치 체인의 무한 루프.\n" +msgstr "%1 안 재배치 체인에 무한 루프가 있습니다.\n" #: winerror.mc:808 msgid "Environment variable not found.\n" @@ -4399,31 +4385,31 @@ msgstr "환경변수를 찾을 수 없습니다.\n" #: winerror.mc:813 msgid "No signal sent.\n" -msgstr "어떤 시그널도 보내지지 않음.\n" +msgstr "시그널이 전송되지 않았습니다.\n" #: winerror.mc:818 msgid "File name is too long.\n" -msgstr "파일 이름이 너무 깁니다.\n" +msgstr "파일명이 너무 깁니다.\n" #: winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "Ring 2 스택은 이미 사용중입니다.\n" +msgstr "Ring 2 스택이 사용 중입니다.\n" #: winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "파일이름의 와일드카드 사용 오류.\n" +msgstr "파일명 와일드카드 사용 오류입니다.\n" #: winerror.mc:833 msgid "Invalid signal number.\n" -msgstr "올바르지 않은 시그널 번호.\n" +msgstr "시그널 번호가 올바르지 않습니다.\n" #: winerror.mc:838 msgid "Error setting signal handler.\n" -msgstr "시그널 핸들러 설정 오류.\n" +msgstr "시그널 핸들러를 설정할 수 없습니다.\n" #: winerror.mc:843 msgid "Segment locked.\n" -msgstr "세그멘트가 잠김.\n" +msgstr "세그멘트가 잠겼습니다.\n" #: winerror.mc:848 msgid "Too many modules.\n" @@ -4431,7 +4417,7 @@ msgstr "모듈이 너무 많습니다.\n" #: winerror.mc:853 msgid "Nesting LoadModule calls not allowed.\n" -msgstr "LoadModule 네스팅 호출은 허용되지 않음.\n" +msgstr "LoadModule 호출은 중첩할 수 없습니다.\n" #: winerror.mc:858 msgid "Machine type mismatch.\n" @@ -4439,15 +4425,15 @@ msgstr "머신 형식이 맞지 않습니다.\n" #: winerror.mc:863 msgid "Bad pipe.\n" -msgstr "나쁜 파이프.\n" +msgstr "파이프가 올바르지 않습니다.\n" #: winerror.mc:868 msgid "Pipe busy.\n" -msgstr "파이프가 바쁨.\n" +msgstr "파이프가 사용 중입니다.\n" #: winerror.mc:873 msgid "Pipe closed.\n" -msgstr "파이프가 닫힘.\n" +msgstr "파이프가 닫혔습니다.\n" #: winerror.mc:878 msgid "Pipe not connected.\n" @@ -4455,111 +4441,111 @@ msgstr "파이프가 연결되지 않았습니다.\n" #: winerror.mc:883 msgid "More data available.\n" -msgstr "더 많은 데이타가 가능합니다.\n" +msgstr "사용 가능한 데이터가 더 있습니다.\n" #: winerror.mc:888 msgid "Session canceled.\n" -msgstr "세션이 취소됨.\n" +msgstr "세션이 취소되었습니다.\n" #: winerror.mc:893 msgid "Invalid extended attribute name.\n" -msgstr "올바르지 않은 확장된 속성 이름.\n" +msgstr "확장 속성 이름이 올바르지 않습니다.\n" #: winerror.mc:898 msgid "Extended attribute list inconsistent.\n" -msgstr "확장 속성 목록이 불일치함.\n" +msgstr "확장 속성 목록에 일관성이 없습니다.\n" #: winerror.mc:903 msgid "No more data available.\n" -msgstr "더 많은 데이타는 가능하지 않습니다.\n" +msgstr "사용 가능한 데이터가 더 이상 없습니다.\n" #: winerror.mc:908 msgid "Cannot use Copy API.\n" -msgstr "Copy API를 사용할 수 없습니다.\n" +msgstr "복사 API를 사용할 수 없습니다.\n" #: winerror.mc:913 msgid "Directory name invalid.\n" -msgstr "디렉토리 이름이 올바르지 않습니다.\n" +msgstr "디렉터리 이름이 올바르지 않습니다.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" -msgstr "확장 속성이 맞지 않음.\n" +msgstr "확장 속성이 버퍼에 맞지 않습니다.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" -msgstr "확장 속성 파일에 오류가 있음.\n" +msgstr "확장 속성 파일이 손상되었습니다.\n" #: winerror.mc:928 msgid "Extended attribute table full.\n" -msgstr "확장 속성 테이블이 가득참.\n" +msgstr "확장 속성 테이블이 가득 찾습니다.\n" #: winerror.mc:933 msgid "Invalid extended attribute handle.\n" -msgstr "올바르지 않은 확장된 속성 핸들.\n" +msgstr "확장 속성 핸들이 올바르지 않습니다.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "확장 속성은 지원하지 않음.\n" +msgstr "확장 속성을 지원하지 않습니다.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" -msgstr "뮤택스는 부른 사람이 소유하고 있지 않습니다.\n" +msgstr "호출자가 소유하지 않은 mutex입니다.\n" #: winerror.mc:948 msgid "Too many posts to semaphore.\n" -msgstr "세마포어에 너무 많은 푯말이 있음.\n" +msgstr "세마포어에 너무 많이 통지했습니다.\n" #: winerror.mc:953 msgid "Read/WriteProcessMemory partially completed.\n" -msgstr "ProcessMemory의 읽기/쓰기가 부분적으로 완료됨.\n" +msgstr "Read/WriteProcessMemory 요청의 일부만 완료되었습니다.\n" #: winerror.mc:958 msgid "The oplock wasn't granted.\n" -msgstr "oplock이 부여되지 않았음.\n" +msgstr "이 oplock이 승인되지 않았습니다.\n" #: winerror.mc:963 msgid "Invalid oplock message received.\n" -msgstr "잘못된 oplock 메시지가 수신.\n" +msgstr "잘못된 oplock 메시지가 수신되었습니다.\n" #: winerror.mc:968 msgid "Message 0x%1 not found in file %2.\n" -msgstr "메세지 0x%1 를 파일 %2에서 찾을 수 없습니다.\n" +msgstr "파일 %2에서 번호 %1의 메시지를 찾을 수 없습니다.\n" #: winerror.mc:973 msgid "Invalid address.\n" -msgstr "올바르지 않은 주소.\n" +msgstr "잘못된 주소입니다.\n" #: winerror.mc:978 msgid "Arithmetic overflow.\n" -msgstr "연산 오버플로우.\n" +msgstr "수치 연산 오버플로우입니다.\n" #: winerror.mc:983 msgid "Pipe connected.\n" -msgstr "파이프 연결됨.\n" +msgstr "파이프가 연결되었습니다.\n" #: winerror.mc:988 msgid "Pipe listening.\n" -msgstr "파이프 리스닝.\n" +msgstr "파이프가 연결을 기다리고 있습니다.\n" #: winerror.mc:993 msgid "Extended attribute access denied.\n" -msgstr "확장 속성 접근 거부됨.\n" +msgstr "확장 속성의 접근이 거부되었습니다.\n" #: winerror.mc:998 msgid "I/O operation aborted.\n" -msgstr "I/O 작업 취소됨.\n" +msgstr "I/O 연산이 취소되었습니다.\n" #: winerror.mc:1003 msgid "Overlapped I/O incomplete.\n" -msgstr "겹쳐진 입출력 명령이 완료되지 않음.\n" +msgstr "중첩된 I/O 연산이 완료되지 않았습니다.\n" #: winerror.mc:1008 msgid "Overlapped I/O pending.\n" -msgstr "겹쳐진 입출력 명령이 대기중임.\n" +msgstr "중첩된 I/O 연산이 진행 중입니다.\n" #: winerror.mc:1013 msgid "No access to memory location.\n" -msgstr "메모리 위치에 접근할 수 없습니다.\n" +msgstr "메모리 위치의 접근이 올바르지 않습니다.\n" #: winerror.mc:1018 msgid "Swap error.\n" @@ -4571,7 +4557,7 @@ msgstr "스택 오버플로우.\n" #: winerror.mc:1028 msgid "Invalid message.\n" -msgstr "올바르지 않은 메세지.\n" +msgstr "잘못된 메시지입니다.\n" #: winerror.mc:1033 msgid "Cannot complete.\n" @@ -4579,15 +4565,15 @@ msgstr "완료되지 않았습니다.\n" #: winerror.mc:1038 msgid "Invalid flags.\n" -msgstr "올바르지 않은 플래그.\n" +msgstr "잘못된 플래그입니다.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "이해할 수 없는 볼륨.\n" +msgstr "볼륨이 인식되지 않습니다.\n" #: winerror.mc:1048 msgid "File invalid.\n" -msgstr "파일이 올바르지 않습니다.\n" +msgstr "파일이 유효하지 않습니다.\n" #: winerror.mc:1053 msgid "Cannot run full-screen.\n" @@ -4595,7 +4581,7 @@ msgstr "전체화면에서 실행할 수 없습니다.\n" #: winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "존재하지 않는 토큰.\n" +msgstr "존재하지 않는 토큰입니다.\n" #: winerror.mc:1063 msgid "Registry corrupt.\n" @@ -4627,43 +4613,43 @@ msgstr "레지스트리는 손상되었습니다.\n" #: winerror.mc:1098 msgid "I/O to registry failed.\n" -msgstr "레지스트리 입출력 실패함.\n" +msgstr "레지스트리 I/O가 실패했습니다.\n" #: winerror.mc:1103 msgid "Not registry file.\n" -msgstr "레지스트리 파일이 아님.\n" +msgstr "레지스트리 파일 형식이 아닙니다.\n" #: winerror.mc:1108 msgid "Key deleted.\n" -msgstr "키는 지워졌습니다.\n" +msgstr "삭제된 키입니다.\n" #: winerror.mc:1113 msgid "No registry log space.\n" -msgstr "레지스트리 로그 공간이 없습니다.\n" +msgstr "레지스트리 기록에 필요한 공간을 할당할 수 없습니다.\n" #: winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "레지스트리 키는 하위 키를 가지고 있습니다.\n" +msgstr "레지스트리 키가 서브키를 갖고 있습니다.\n" #: winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "하위키는 반드시 휘발성이어야 함.\n" +msgstr "하위키는 휘발성이어야 합니다.\n" #: winerror.mc:1128 msgid "Notify change request in progress.\n" -msgstr "변화 통보 요구가 진행중임.\n" +msgstr "통지 변경 요청이 수행 중입니다.\n" #: winerror.mc:1133 msgid "Dependent services are running.\n" -msgstr "의존하고 있는 서비스가 실행중입니다.\n" +msgstr "의존하는 서비스가 실행 중입니다.\n" #: winerror.mc:1138 msgid "Invalid service control.\n" -msgstr "올바르지 않은 서비스 제어.\n" +msgstr "컨트롤이 서비스에 유효하지 않습니다.\n" #: winerror.mc:1143 msgid "Service request timeout.\n" -msgstr "서비스 요구 시간초과.\n" +msgstr "서비스 요청이 시간초과했습니다.\n" #: winerror.mc:1148 msgid "Cannot create service thread.\n" @@ -4671,23 +4657,23 @@ msgstr "서비스 쓰레드를 만들 수 없습니다.\n" #: winerror.mc:1153 msgid "Service database locked.\n" -msgstr "서비스 데이터베이스가 잠겨있습니다.\n" +msgstr "서비스 데이터베이스가 잠겼습니다.\n" #: winerror.mc:1158 msgid "Service already running.\n" -msgstr "서비스는 이미 실행증입니다.\n" +msgstr "서비스가 이미 실행 증입니다.\n" #: winerror.mc:1163 msgid "Invalid service account.\n" -msgstr "올바르지 않은 서비스 계정.\n" +msgstr "서비스 계정이 올바르지 않습니다.\n" #: winerror.mc:1168 msgid "Service is disabled.\n" -msgstr "서비스가 가능하지 않습니다.\n" +msgstr "서비스가 실행 불능 상태입니다.\n" #: winerror.mc:1173 msgid "Circular dependency.\n" -msgstr "의존성의 순환.\n" +msgstr "원형 서비스 종속성.\n" #: winerror.mc:1178 msgid "Service does not exist.\n" @@ -4695,19 +4681,19 @@ msgstr "서비스가 존재하지 않습니다.\n" #: winerror.mc:1183 msgid "Service cannot accept control message.\n" -msgstr "서비스는 제어 메세지에 동의할 수 없습니다.\n" +msgstr "서비스가 컨트롤 메시지를 받아들일 수 없습니다.\n" #: winerror.mc:1188 msgid "Service not active.\n" -msgstr "서비스가 활성화되지 않았습니다.\n" +msgstr "서비스가 시작되지 않았습니다.\n" #: winerror.mc:1193 msgid "Service controller connect failed.\n" -msgstr "서비스 제어기 연결 실패.\n" +msgstr "서비스 컨트롤러에 연결할 수 없습니다.\n" #: winerror.mc:1198 msgid "Exception in service.\n" -msgstr "서비스의 예외.\n" +msgstr "서비스에 오류가 발생했습니다.\n" #: winerror.mc:1203 msgid "Database does not exist.\n" @@ -4715,15 +4701,15 @@ msgstr "데이터베이스가 존재하지 않습니다.\n" #: winerror.mc:1208 msgid "Service-specific error.\n" -msgstr "서비스-의존적인 오류.\n" +msgstr "서비스 고유의 오류.\n" #: winerror.mc:1213 msgid "Process aborted.\n" -msgstr "프로세스가 취소되었습니다.\n" +msgstr "프로세스가 예기치 않게 종료되었습니다.\n" #: winerror.mc:1218 msgid "Service dependency failed.\n" -msgstr "서비스 의존성 실패함.\n" +msgstr "서비스 종속성이 실패했습니다.\n" #: winerror.mc:1223 msgid "Service login failed.\n" @@ -4731,15 +4717,15 @@ msgstr "서비스 로그인 실패.\n" #: winerror.mc:1228 msgid "Service start-hang.\n" -msgstr "서비스 시작-늘어짐.\n" +msgstr "서비스 시작 후 대기 상태.\n" #: winerror.mc:1233 msgid "Invalid service lock.\n" -msgstr "올바르지 않은 서비스 잠금.\n" +msgstr "서비스 잠금이 올바르지 않습니다.\n" #: winerror.mc:1238 msgid "Service marked for delete.\n" -msgstr "서비스가 삭제로 예약됨.\n" +msgstr "서비스가 삭제 표시되었습니다.\n" #: winerror.mc:1243 msgid "Service exists.\n" @@ -4747,43 +4733,43 @@ msgstr "서비스가 존재합니다.\n" #: winerror.mc:1248 msgid "System running last-known-good config.\n" -msgstr "서비스가 마지막으로 알려진 좋은 설정을 실행중임.\n" +msgstr "시스템이 마지막으로 알려진 좋은 구성으로 실행중입니다.\n" #: winerror.mc:1253 msgid "Service dependency deleted.\n" -msgstr "서비스 의존성이 지워졌습니다.\n" +msgstr "서비스 종속성이 삭제되었습니다.\n" #: winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "이미 일반적을 알려진 마지막으로 성공한 설정으로 부팅됨.\n" +msgstr "이미 시동이 마지막으로 인식된 양호한 설정으로 받아들여졌습니다.\n" #: winerror.mc:1263 msgid "Service not started since last boot.\n" -msgstr "서비스는 마지막 부팅 이후로 시작되지 않았습니다.\n" +msgstr "서비스가 마지막 시동 이후로 시작되지 않았습니다.\n" #: winerror.mc:1268 msgid "Duplicate service name.\n" -msgstr "중복된 서비스 이름.\n" +msgstr "중복된 서비스 이름입니다.\n" #: winerror.mc:1273 msgid "Different service account.\n" -msgstr "다른 서비스 계정.\n" +msgstr "다른 서비스 계정입니다.\n" #: winerror.mc:1278 msgid "Driver failure cannot be detected.\n" -msgstr "드라이버 오류를 발견 할 수 없음.\n" +msgstr "드라이버 오류를 발견할 수 없습니다.\n" #: winerror.mc:1283 msgid "Process abort cannot be detected.\n" -msgstr "프로세스 중지를 발견할 수 없음.\n" +msgstr "프로세스 중지를 발견할 수 없습니다.\n" #: winerror.mc:1288 msgid "No recovery program for service.\n" -msgstr "복구한 풀그림이나 서비스가 없음.\n" +msgstr "서비스를 복구할 수 없습니다.\n" #: winerror.mc:1293 msgid "Service not implemented by exe.\n" -msgstr "서비스는 EXE 파일에 의해 구현되지 않았음.\n" +msgstr "서비스가 EXE로 구현되지 않았습니.\n" #: winerror.mc:1298 msgid "End of media.\n" @@ -4791,7 +4777,7 @@ msgstr "미디어 끝.\n" #: winerror.mc:1303 msgid "Filemark detected.\n" -msgstr "파일마크 발견됨.\n" +msgstr "파일 표시를 발견했습니다.\n" #: winerror.mc:1308 msgid "Beginning of media.\n" @@ -4799,31 +4785,31 @@ msgstr "미디어 시작.\n" #: winerror.mc:1313 msgid "Setmark detected.\n" -msgstr "셋마크 발견됨.\n" +msgstr "세트 표시를 발견했습니다.\n" #: winerror.mc:1318 msgid "No data detected.\n" -msgstr "어떤 데이타도 발견되지 않았습니다.\n" +msgstr "데이터가 없습니다.\n" #: winerror.mc:1323 msgid "Partition failure.\n" -msgstr "분할 실패.\n" +msgstr "파티션 실패.\n" #: winerror.mc:1328 msgid "Invalid block length.\n" -msgstr "올바르지 않은 블럭 길이.\n" +msgstr "블럭 길이가 올바르지 않습니다.\n" #: winerror.mc:1333 msgid "Device not partitioned.\n" -msgstr "장치가 분할되지 않았습니다.\n" +msgstr "장치에 파티션이 없습니다.\n" #: winerror.mc:1338 msgid "Unable to lock media.\n" -msgstr "미디어를 잠글 수 업습니다.\n" +msgstr "미디어를 잠글 수 없습니다.\n" #: winerror.mc:1343 msgid "Unable to unload media.\n" -msgstr "미디어를 떼어낼 수 없습니다.\n" +msgstr "미디어 적재를 해제할 수 없습니다.\n" #: winerror.mc:1348 msgid "Media changed.\n" @@ -4831,65 +4817,63 @@ msgstr "미디어가 변경되었습니다.\n" #: winerror.mc:1353 msgid "I/O bus reset.\n" -msgstr "입출력 버스 제설정.\n" +msgstr "I/O 버스가 재설정되었습니다.\n" #: winerror.mc:1358 msgid "No media in drive.\n" -msgstr "이 드라이브에는 어떠한 미디어도 없습니다.\n" +msgstr "드라이브에 미디어가 없습니다.\n" #: winerror.mc:1363 msgid "No Unicode translation.\n" -msgstr "유니코드 변역 불가.\n" +msgstr "유니코드 매핑이 없습니다.\n" #: winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "DLL 초기화 실패.\n" +msgstr "DLL 초기화가 실패했습니다.\n" #: winerror.mc:1373 msgid "Shutdown in progress.\n" -msgstr "이 작업을 종료.\n" +msgstr "시스템 종료 중입니다.\n" #: winerror.mc:1378 msgid "No shutdown in progress.\n" -msgstr "이 작업을 종료하지 않음.\n" +msgstr "시스템 종료 중이 아닙니다.\n" #: winerror.mc:1383 msgid "I/O device error.\n" -msgstr "입출력 장치 오류.\n" +msgstr "I/O 장치 오류.\n" #: winerror.mc:1388 msgid "No serial devices found.\n" -msgstr "어떤 시리얼 장치도 발견할 수 없습니다.\n" +msgstr "시리얼 장치를 발견할 수 없습니다.\n" #: winerror.mc:1393 msgid "Shared IRQ busy.\n" -msgstr "공유 IRQ 바쁨.\n" +msgstr "공유된 IRQ가 사용중입니다.\n" #: winerror.mc:1398 msgid "Serial I/O completed.\n" -msgstr "시리얼 입출력 완료.\n" +msgstr "시리얼 I/O가 완료되었습니다.\n" #: winerror.mc:1403 msgid "Serial I/O counter timeout.\n" -msgstr "시리얼 입출력 카운터 시간초과.\n" +msgstr "시리얼 I/O 카운터 시간초과.\n" #: winerror.mc:1408 msgid "Floppy ID address mark not found.\n" -msgstr "플로피 ID 주소 마크를 찾을 수 없음.\n" +msgstr "플로피 ID 주소 표시를 찾을 수 없습니다.\n" #: winerror.mc:1413 msgid "Floppy reports wrong cylinder.\n" -msgstr "플로피가 잘몫된 실린더를 보고함.\n" +msgstr "플로피가 잘못된 실린더 값을 보고했습니다.\n" #: winerror.mc:1418 msgid "Unknown floppy error.\n" -msgstr "알 수 없는 플로피 오류.\n" +msgstr "알려지지 않은 플로피 오류.\n" #: winerror.mc:1423 msgid "Floppy registers inconsistent.\n" -msgstr "플로피 등록이 일치하지 않음.\n" +msgstr "플로피 등록값에 일관성이 없습니다\n" #: winerror.mc:1428 msgid "Hard disk recalibrate failed.\n" @@ -4933,7 +4917,7 @@ msgstr "너무 많은 링크가 있습니다.\n" #: winerror.mc:1478 msgid "Newer windows version needed.\n" -msgstr "더 최신의 윈도우즈 버젼을 필요로 합니다.\n" +msgstr "더 최신의 윈도우즈 버전을 필요로 합니다.\n" #: winerror.mc:1483 msgid "Wrong operating system.\n" @@ -4941,11 +4925,11 @@ msgstr "잘못된 운영체제.\n" #: winerror.mc:1488 msgid "Single-instance application.\n" -msgstr "단일 인스턴트 풀그림 .\n" +msgstr "단일 인스턴트 프로그램 .\n" #: winerror.mc:1493 msgid "Real-mode application.\n" -msgstr "리얼 모드 풀그림.\n" +msgstr "리얼 모드 프로그램.\n" #: winerror.mc:1498 msgid "Invalid DLL.\n" @@ -4953,7 +4937,7 @@ msgstr "올바르지 않은DLL.\n" #: winerror.mc:1503 msgid "No associated application.\n" -msgstr "연결된 풀그림이 없습니다.\n" +msgstr "연결된 프로그램이 없습니다.\n" #: winerror.mc:1508 msgid "DDE failure.\n" @@ -4961,7 +4945,7 @@ msgstr "DDE 실패.\n" #: winerror.mc:1513 msgid "DLL not found.\n" -msgstr "DLL 을 찾을 수 업습니다.\n" +msgstr "DLL을 찾을 수 없습니다.\n" #: winerror.mc:1518 msgid "Out of user handles.\n" @@ -4969,7 +4953,7 @@ msgstr "사용자 핸들 밖임.\n" #: winerror.mc:1523 msgid "Message can only be used in synchronous calls.\n" -msgstr "메시지는 오직 동기 호출에만 사용할 수있음.\n" +msgstr "메시지는 오직 동기 호출에만 사용할 수 있음.\n" #: winerror.mc:1528 msgid "The source element is empty.\n" @@ -5121,11 +5105,11 @@ msgstr "올바르지 않은 공유 이름.\n" #: winerror.mc:1718 msgid "Invalid message name.\n" -msgstr "올바르지 않은 메세지 이름.\n" +msgstr "올바르지 않은 메시지 이름.\n" #: winerror.mc:1723 msgid "Invalid message destination.\n" -msgstr "올바르지 않은 메세지 방향.\n" +msgstr "올바르지 않은 메시지 방향.\n" #: winerror.mc:1728 msgid "Session credential conflict.\n" @@ -5293,7 +5277,7 @@ msgstr "LM을 위한 암호가 너무 복잡함.\n" #: winerror.mc:1933 msgid "Unknown revision.\n" -msgstr "알수없는 개정.\n" +msgstr " 없는 개정.\n" #: winerror.mc:1938 msgid "Incompatible revision levels.\n" @@ -5525,7 +5509,7 @@ msgstr "로그온 세션 아이디가 존재함.\n" #: winerror.mc:2223 msgid "Unknown authentication package.\n" -msgstr "알 수없는 인증 패키지.\n" +msgstr " 없는 인증 패키지.\n" #: winerror.mc:2228 msgid "Bad logon session state.\n" @@ -5633,7 +5617,7 @@ msgstr "상속가능한 구성요소가 없음.\n" #: winerror.mc:2363 msgid "File or directory corrupt.\n" -msgstr "파일이나 디렉토리가 망가졌습니다.\n" +msgstr "파일이나 디렉터리가 망가졌습니다.\n" #: winerror.mc:2368 msgid "Disk is corrupt.\n" @@ -5709,7 +5693,7 @@ msgstr "클래스가 존재하지 않습니다.\n" #: winerror.mc:2458 msgid "Class has open windows.\n" -msgstr "클래스는 연 상태의 창들을 가지고 있습니다.\n" +msgstr "클래스는 연 상태의 창을 가지고 있습니다.\n" #: winerror.mc:2463 msgid "Invalid index.\n" @@ -5749,7 +5733,7 @@ msgstr "컨트롤 아이디를 찾을 수 없음.\n" #: winerror.mc:2508 msgid "Invalid combo box message.\n" -msgstr "올바르지 않은 콤보 박스 메세지입니다.\n" +msgstr "올바르지 않은 콤보 박스 메시지입니다.\n" #: winerror.mc:2513 msgid "Not a combo box window.\n" @@ -5789,7 +5773,7 @@ msgstr "설치되어 있지 않은 후크 프로 시저.\n" #: winerror.mc:2558 msgid "Invalid list box message.\n" -msgstr "올바르지 않은 목록상자 메세지.\n" +msgstr "올바르지 않은 목록상자 메시지.\n" #: winerror.mc:2563 msgid "Invalid LB_SETCOUNT sent.\n" @@ -5813,7 +5797,7 @@ msgstr "창은 시스템 메뉴를 가지고 있지 않습니다.\n" #: winerror.mc:2588 msgid "Invalid message box style.\n" -msgstr "올바르지 않은 메세지 박스 스타일.\n" +msgstr "올바르지 않은 메시지 박스 스타일.\n" #: winerror.mc:2593 msgid "Invalid SPI parameter.\n" @@ -5941,19 +5925,19 @@ msgstr "설치가 일시 중지됨.\n" #: winerror.mc:2748 msgid "Unknown product.\n" -msgstr "알 수 없는 제품.\n" +msgstr " 없는 제품.\n" #: winerror.mc:2753 msgid "Unknown feature.\n" -msgstr "알수 없는 특징.\n" +msgstr " 없는 특징.\n" #: winerror.mc:2758 msgid "Unknown component.\n" -msgstr "알 수 없는 컴포넌트.\n" +msgstr " 없는 컴포넌트.\n" #: winerror.mc:2763 msgid "Unknown property.\n" -msgstr "알 수 없는 속성.\n" +msgstr " 없는 속성.\n" #: winerror.mc:2768 msgid "Invalid handle state.\n" @@ -5973,7 +5957,7 @@ msgstr "설치 원본이 빠짐.\n" #: winerror.mc:2788 msgid "Wrong installation package version.\n" -msgstr "잘못된 설치 패키지 버젼.\n" +msgstr "잘못된 설치 패키지 버전.\n" #: winerror.mc:2793 msgid "Product uninstalled.\n" @@ -6005,7 +5989,7 @@ msgstr "설치 패키지가 올바르지 않음.\n" #: winerror.mc:2828 msgid "Installer user interface failed.\n" -msgstr "설치 풀그림 사용자 인터페이스 실패.\n" +msgstr "설치 프로그램 사용자 인터페이스 실패.\n" #: winerror.mc:2833 msgid "Failed to open installation log file.\n" @@ -6025,7 +6009,7 @@ msgstr "설치 패키지기 거부됨.\n" #: winerror.mc:2853 msgid "Function could not be called.\n" -msgstr "함수를 호출 할 수 없음.\n" +msgstr "함수를 호출할 수 없음.\n" #: winerror.mc:2858 msgid "Function failed.\n" @@ -6049,7 +6033,7 @@ msgstr "만들기 실패함.\n" #: winerror.mc:2883 msgid "Temporary directory not writable.\n" -msgstr "임시 디렉토리에 기록할 수 없음.\n" +msgstr "임시 디렉터리에 기록할 수 없음.\n" #: winerror.mc:2888 msgid "Installation platform not supported.\n" @@ -6057,7 +6041,7 @@ msgstr "설치 플랫폼을 지원하지 않음.\n" #: winerror.mc:2893 msgid "Installer not used.\n" -msgstr "설치 풀그림이 사용되지 않음.\n" +msgstr "설치 프로그램이 사용되지 않음.\n" #: winerror.mc:2898 msgid "Failed to open the patch package.\n" @@ -6073,7 +6057,7 @@ msgstr "지원하지 않는 패치 패키지.\n" #: winerror.mc:2913 msgid "Another version is installed.\n" -msgstr "다른 버젼이 설치되어 있음.\n" +msgstr "다른 버전이 설치되어 있음.\n" #: winerror.mc:2918 msgid "Invalid command line.\n" @@ -6153,11 +6137,11 @@ msgstr "RPC 서버는 응답이 없습니다.\n" #: winerror.mc:3013 msgid "Unknown manager type.\n" -msgstr "알수 없는 매니저 형식.\n" +msgstr " 없는 매니저 형식.\n" #: winerror.mc:3018 msgid "Unknown interface.\n" -msgstr "알수 없는 인터페이스.\n" +msgstr " 없는 인터페이스.\n" #: winerror.mc:3023 msgid "No bindings.\n" @@ -6237,7 +6221,7 @@ msgstr "중복된 끝나는 점.\n" #: winerror.mc:3123 msgid "Unknown authentication type.\n" -msgstr "알수 없는 인증 형식.\n" +msgstr " 없는 인증 형식.\n" #: winerror.mc:3128 msgid "Maximum calls too low.\n" @@ -6261,11 +6245,11 @@ msgstr "바인딩은 어떤 인증 정보도 가지고 있지 않습니다.\n" #: winerror.mc:3153 msgid "Unknown authentication service.\n" -msgstr "알수 없는 인증 서비스.\n" +msgstr " 없는 인증 서비스.\n" #: winerror.mc:3158 msgid "Unknown authentication level.\n" -msgstr "알수 없는 인증 레벨.\n" +msgstr " 없는 인증 레벨.\n" #: winerror.mc:3163 msgid "Invalid authentication identity.\n" @@ -6273,7 +6257,7 @@ msgstr "올바르지 않은 인증 증명서.\n" #: winerror.mc:3168 msgid "Unknown authorization service.\n" -msgstr "알 수 없는 허가 서비스.\n" +msgstr " 없는 허가 서비스.\n" #: winerror.mc:3173 msgid "Invalid entry.\n" @@ -6297,7 +6281,7 @@ msgstr "완성되지 않은 이름.\n" #: winerror.mc:3198 msgid "Invalid version option.\n" -msgstr "올바르지 않은 버젼 옵션.\n" +msgstr "올바르지 않은 버전 옵션.\n" #: winerror.mc:3203 msgid "No more members.\n" @@ -6421,7 +6405,7 @@ msgstr "어떤 신뢰 SAM 계정이 없습니다.\n" #: winerror.mc:3353 msgid "Trusted domain failure.\n" -msgstr "신뢰할수 있는 도메인 실패.\n" +msgstr "신뢰할 수 있는 도메인 실패.\n" #: winerror.mc:3358 msgid "Trusted relationship failure.\n" @@ -6437,7 +6421,7 @@ msgstr "RPC 요구는 이미 작업중입니다.\n" #: winerror.mc:3373 msgid "NETLOGON is not started.\n" -msgstr "NETLOGON 는 시작되어 있지 않습니다.\n" +msgstr "NETLOGON이 시작되지 않았습니다.\n" #: winerror.mc:3378 msgid "Account expired.\n" @@ -6453,19 +6437,19 @@ msgstr "프린터 드라이버는 이미 설치되어 있습니다.\n" #: winerror.mc:3393 msgid "Unknown port.\n" -msgstr "알 수 없는 포트.\n" +msgstr " 없는 포트.\n" #: winerror.mc:3398 msgid "Unknown printer driver.\n" -msgstr "알 수 없는 프린터 드라이버.\n" +msgstr " 없는 프린터 드라이버.\n" #: winerror.mc:3403 msgid "Unknown print processor.\n" -msgstr "알 수 없는 프린터 프로세서.\n" +msgstr " 없는 프린터 프로세서.\n" #: winerror.mc:3408 msgid "Invalid separator file.\n" -msgstr "올바르지 않은 파일 분리자.\n" +msgstr "올바르지 않은 파일 구분 기호.\n" #: winerror.mc:3413 msgid "Invalid priority.\n" @@ -6501,7 +6485,7 @@ msgstr "내부 도메인의 신뢰된 계정에 로그온할 수 없습니다.\n #: winerror.mc:3453 msgid "Can't log on with workstation trust account.\n" -msgstr "워크스테이션의 신뢰된 계정에 로그온 할 수 없습니다.\n" +msgstr "워크스테이션의 신뢰된 계정에 로그온할 수 없습니다.\n" #: winerror.mc:3458 msgid "Can't log on with server trust account.\n" @@ -6581,7 +6565,7 @@ msgstr "올바르지 않은 핸들 작업.\n" #: winerror.mc:3553 msgid "Wrong serializing package version.\n" -msgstr "잘못된 연속 패키지 버젼.\n" +msgstr "잘못된 연속 패키지 버전.\n" #: winerror.mc:3558 msgid "Wrong stub version.\n" @@ -6597,7 +6581,7 @@ msgstr "잘못된 파이프 순서.\n" #: winerror.mc:3573 msgid "Wrong pipe version.\n" -msgstr "잘못된 파이프 버젼.\n" +msgstr "잘못된 파이프 버전.\n" #: winerror.mc:3578 msgid "Group member not found.\n" @@ -6693,7 +6677,7 @@ msgstr "이 파일은 접근할 수 없습니다.\n" #: winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "파일 이름을 확인 할 수 없음.\n" +msgstr "파일 이름을 확인할 수 없음.\n" #: winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -6773,11 +6757,11 @@ msgstr "재 전송 횟수(&T):" #: localui.rc:32 msgid "'%s' is not a valid port name" -msgstr "'%s'는 올바른 포트 이름이 아닙니다" +msgstr "'%s'은(는) 올바른 포트 이름이 아닙니다" #: localui.rc:33 msgid "Port %s already exists" -msgstr "포트 %s는 이미 존재합니다" +msgstr "포트 %s은(는) 이미 존재합니다" #: localui.rc:34 msgid "This port has no options to configure" @@ -6872,7 +6856,7 @@ msgstr "" #: msi.rc:32 msgid "path %s not found" -msgstr "%s 경로를 찾을수 없습니다" +msgstr "%s 경로를 찾을 수 없습니다" #: msi.rc:33 msgid "insert disk %s" @@ -6910,7 +6894,7 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"윈도우즈 설치 풀그림 %s\n" +"윈도우즈 설치 프로그램 %s\n" "\n" "사용법:\n" "msiexec 명령 {필수 매개변수} [선택적 매개변수]\n" @@ -6942,7 +6926,7 @@ msgstr "" #: msi.rc:61 msgid "enter which folder contains %s" -msgstr "%s를 포함하는 폴더를 입력하세여" +msgstr "%s을(를) 포함하는 폴더를 입력하세여" #: msi.rc:62 msgid "install source for feature missing" @@ -6958,7 +6942,7 @@ msgstr "부분(feature)에서:" #: msi.rc:65 msgid "choose which folder contains %s" -msgstr "%s를 포함하는 폴더 선택" +msgstr "%s을(를) 포함하는 폴더 선택" #: msi.rc:66 shell32.rc:238 msgid "New Folder" @@ -6970,7 +6954,7 @@ msgstr "레지스트리 공간 할당" #: msi.rc:92 msgid "Searching for installed applications" -msgstr "설치된 응용 무른모 찾기" +msgstr "설치된 응용 소프트웨어 찾기" #: msi.rc:93 msgid "Binding executables" @@ -7002,7 +6986,7 @@ msgstr "사본 만들기" #: msi.rc:102 msgid "Searching for related applications" -msgstr "연결된 응용 무른모 찾는 중" +msgstr "연결된 응용 소프트웨어 찾는 중" #: msi.rc:103 msgid "Copying network install files" @@ -7010,7 +6994,7 @@ msgstr "네트워크 설치 파일 복사" #: msi.rc:104 msgid "Copying new files" -msgstr "새 파일 복사 중..." +msgstr "새 파일 복사 중" #: msi.rc:105 msgid "Installing ODBC components" @@ -7034,7 +7018,7 @@ msgstr "실행 조건 평가" #: msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "관련 응용 무른모의 기능 상태 가져오기" +msgstr "관련 응용 소프트웨어의 기능 상태 가져오기" #: msi.rc:111 msgid "Moving files" @@ -7074,7 +7058,7 @@ msgstr "클래스 서버 등록" #: msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "COM+ 응용 무른모와 요소 등록" +msgstr "COM+ 응용 소프트웨어와 요소 등록" #: msi.rc:121 msgid "Registering extension servers" @@ -7094,11 +7078,11 @@ msgstr "제품 등록" #: msi.rc:125 msgid "Registering program identifiers" -msgstr "무른모 식별자 등록" +msgstr "프로그램 식별자 등록" #: msi.rc:126 msgid "Registering type libraries" -msgstr "형식 자료관 등록" +msgstr "라이브러리 형식 등록" #: msi.rc:127 msgid "Registering user" @@ -7106,7 +7090,7 @@ msgstr "사용자 등록 중" #: msi.rc:128 msgid "Removing duplicated files" -msgstr "두번 제거" +msgstr "중복된 파일 제거" #: msi.rc:129 msi.rc:153 msgid "Updating environment strings" @@ -7114,7 +7098,7 @@ msgstr "환경 문자열 갱신" #: msi.rc:130 msgid "Removing applications" -msgstr "응용 무른모 제거" +msgstr "응용프로그램 제거" #: msi.rc:131 msgid "Removing files" @@ -7150,7 +7134,7 @@ msgstr "구성 요소 등록 취소" #: msi.rc:140 msgid "Initializing ODBC directories" -msgstr "ODBC 디렉토리 초기화 중" +msgstr "ODBC 디렉터리 초기화 중" #: msi.rc:141 msgid "Starting services" @@ -7162,11 +7146,11 @@ msgstr "서비스 정지" #: msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "공인된 구성요소에 대한 게시 취소" #: msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "제품 특성 게시 취소" #: msi.rc:145 msgid "Unpublishing product information" @@ -7174,47 +7158,47 @@ msgstr "제품 정보 게시 취소" #: msi.rc:146 msgid "Unregister Class servers" -msgstr "" +msgstr "클래스 서버 등록 취소" #: msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "COM+ 응용프로그램 및 구성요소 등록 해제" #: msi.rc:148 msgid "Unregistering extension servers" -msgstr "등록되지 않은 확장 서버" +msgstr "확장 서버 등록 취소" #: msi.rc:149 msgid "Unregistering fonts" -msgstr "등록되지 않은 글꼴" +msgstr "글꼴 등록 취소" #: msi.rc:150 msgid "Unregistering MIME info" -msgstr "" +msgstr "MIME 정보 등록 취소" #: msi.rc:151 msgid "Unregistering program identifiers" -msgstr "등록되지 않은 풀그림 식별자" +msgstr "프로그램 식별자 등록 취소" #: msi.rc:152 msgid "Unregistering type libraries" -msgstr "등록되지 않은 형식 자료관" +msgstr "형식 라이브러리 등록 취소" #: msi.rc:154 msgid "Writing INI files values" -msgstr "와인 설정 파일 값" +msgstr "INI 파일 값 쓰기" #: msi.rc:155 msgid "Writing system registry values" -msgstr "시스템 레지스트리 값 쓰는 중" +msgstr "시스템 레지스트리 값 쓰기" #: msi.rc:161 msgid "Free space: [1]" -msgstr "빈 공간: [1]" +msgstr "여유 공간: [1]" #: msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "속성 : [1], 서명 : [2]" #: msi.rc:163 msgid "File: [1]" @@ -7234,15 +7218,15 @@ msgstr "서비스: [1]" #: msi.rc:167 msi.rc:170 msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "파일: [1], 디렉토리: [9], 크기: [6]" +msgstr "파일: [1], 디렉터리: [9], 크기: [6]" #: msi.rc:168 msgid "Found application: [1]" -msgstr "응용 무른모 찾음: [1]" +msgstr "응용 소프트웨어 찾음: [1]" #: msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "파일: [1], 디렉토리: [9], 크기: [6]" +msgstr "파일: [1], 디렉터리: [9], 크기: [6]" #: msi.rc:171 msgid "Service: [2]" @@ -7254,19 +7238,19 @@ msgstr "파일: [1], 참조 또는 의존: [2]" #: msi.rc:173 msgid "Application: [1]" -msgstr "응용 무른모: [1]" +msgstr "응용 소프트웨어: [1]" #: msi.rc:175 msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "응용 프로그램 구성 요소 : [1], 어셈블리 이름 : [2]" #: msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "파일: [1], 디렉토리: [2], 크기: [3]" +msgstr "파일: [1], 디렉터리: [2], 크기: [3]" #: msi.rc:178 msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "구성 요소 ID : [1], 한정자 : [2]" #: msi.rc:179 msi.rc:200 msgid "Feature: [1]" @@ -7274,11 +7258,11 @@ msgstr "기능: [1]" #: msi.rc:180 msi.rc:201 msgid "Class Id: [1]" -msgstr "클래스 번호 : [1]" +msgstr "클래스 ID : [1]" #: msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" #: msi.rc:182 msi.rc:203 msgid "Extension: [1]" @@ -7290,19 +7274,19 @@ msgstr "글꼴: [1]" #: msi.rc:184 msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME 콘텐츠 유형 : [1], 확장 : [2]" #: msi.rc:185 msi.rc:206 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:186 msi.rc:207 msgid "LibID: [1]" -msgstr "자료관 번호: [1]" +msgstr "LibID: [1]" #: msi.rc:187 msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "파일: [1], 위치: [9]" +msgstr "파일: [1], 디렉터리: [9]" #: msi.rc:188 msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" @@ -7310,7 +7294,7 @@ msgstr "이름: [1], 값: [2], 작동 [3]" #: msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "응용 무른모: [1], 명령줄: [2]" +msgstr "응용프로그램: [1], 명령줄: [2]" #: msi.rc:192 msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" @@ -7326,7 +7310,7 @@ msgstr "폴더: [2], 파일: [1]" #: msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" @@ -7354,6 +7338,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"설치 프로그램에서 이 패키지를 설치하는 동안 예기치 않은 오류가 발생했습니다. " +"이 패키지에 문제가 있음을 나타낼 수 있습니다. 오류 코드는 [1]입니다. {{인" +"수 : [2], [3], [4]}}" #: msi.rc:77 msgid "{{Disk full: }}" @@ -7361,11 +7348,11 @@ msgstr "{{디스크가 꽉 찼습니다: }}" #: msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "작동 [Time]: [1]. [2]" +msgstr "동작 [Time]: [1]. [2]" #: msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "메시지 유형 : [1], 인수 : [2], [3]" #: msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" @@ -7373,21 +7360,23 @@ msgstr "=== 기록 시작: [Date] [Time] ===" #: msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "시작 [Time]: [1]" +msgstr "동작 시작 [Time]: [1]" #: msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "종료 [Time]: [1]. [2] 반환함." +msgstr "동작 종료 [Time]: [1]. 반환 값 [2]." #: msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "디스크를 삽입해 주세요. [2]" +msgstr "디스크를 삽입해 주십시오. [2]" #: msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"소스 파일을 찾을 수 없습니다 {{(cabinet)}}: [2]. 파일이 존재 여부와 액세스 가" +"능 여부를 확인하십시오." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -7443,7 +7432,7 @@ msgstr "Wine 비디오 1 비디오 코덱" #: oleacc.rc:31 msgid "unknown object" -msgstr "알 수 없는 객체" +msgstr " 없는 객체" #: oleacc.rc:32 msgid "title bar" @@ -7499,7 +7488,7 @@ msgstr "도구 팁" #: oleacc.rc:45 msgid "application" -msgstr "풀그림" +msgstr "프로그램" #: oleacc.rc:46 msgid "document" @@ -7527,15 +7516,15 @@ msgstr "집단화" #: oleacc.rc:52 msgid "separator" -msgstr "분리자" +msgstr "구분 기호" #: oleacc.rc:53 msgid "tool bar" -msgstr "도구바" +msgstr "도구 모음" #: oleacc.rc:54 msgid "status bar" -msgstr "상태바" +msgstr "상태 표시줄" #: oleacc.rc:55 msgid "table" @@ -7704,41 +7693,37 @@ msgstr "외곽선 단추" #: oleacc.rc:97 msgctxt "object state" msgid "normal" -msgstr "보통" +msgstr "normal" #: oleacc.rc:98 msgctxt "object state" msgid "unavailable" -msgstr "불가능" +msgstr "unavailable" #: oleacc.rc:99 msgctxt "object state" msgid "selected" -msgstr "선택됨" +msgstr "selected" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "정지됨" +msgstr "focused" #: oleacc.rc:101 msgctxt "object state" msgid "pressed" -msgstr "압축" +msgstr "pressed" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "확인" +msgstr "checked" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "혼합" +msgstr "mixed" #: oleacc.rc:104 msgctxt "object state" @@ -7746,136 +7731,124 @@ msgid "read only" msgstr "읽기 전용" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "핫 트랙된 아이템" +msgstr "hot tracked" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "기본" +msgstr "default" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "확장됨" +msgstr "expanded" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "collapsed" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "바쁨" +msgstr "busy" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "floating" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "가장 중요" +msgstr "marqueed" #: oleacc.rc:112 msgctxt "object state" msgid "animated" -msgstr "애니매이션됨" +msgstr "animated" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "보이지 않음" +msgstr "invisible" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "화면 끄기" +msgstr "offscreen" #: oleacc.rc:115 msgctxt "object state" msgid "sizeable" -msgstr "크기 수정 가능" +msgstr "sizeable" #: oleacc.rc:116 msgctxt "object state" msgid "moveable" -msgstr "이동 가능" +msgstr "moveable" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "self voicing" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "정지됨" +msgstr "focusable" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "테이블" +msgstr "selectable" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "링크" +msgstr "linked" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "가로지름" +msgstr "traversed" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "테이블" +msgstr "multi selectable" #: oleacc.rc:123 msgctxt "object state" msgid "extended selectable" -msgstr "추가로 선택 가능" +msgstr "extended selectable" #: oleacc.rc:124 msgctxt "object state" msgid "alert low" -msgstr "저위험 경고" +msgstr "alert low" #: oleacc.rc:125 msgctxt "object state" msgid "alert medium" -msgstr "중위험 경고" +msgstr "alert medium" #: oleacc.rc:126 msgctxt "object state" msgid "alert high" -msgstr "고위험 경고" +msgstr "alert high" #: oleacc.rc:127 msgctxt "object state" msgid "protected" -msgstr "쓰기 보호됨." +msgstr "protected" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "팝업 뜸" +msgstr "has popup" #: oleaut32.rc:30 oleview.rc:146 msgid "True" @@ -7971,8 +7944,8 @@ msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"당신이 그것을 만든 풀그림을 사용하여 활성화할 수 있도록문서에 개체로 파일의 " -"내용을 넣습니다." +"당신이 그것을 만든 프로그램을 사용하여 활성화할 수 있도록문서에 개체로 파일" +"의 내용을 넣습니다." #: oledlg.rc:30 shell32.rc:197 msgid "Browse" @@ -7983,7 +7956,7 @@ msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." msgstr "" -"이 파일은 올바른 OLE모듈이 아닌것으로 보입니다. OLE컨트롤을 등록할수 없습니" +"이 파일은 올바른 OLE모듈이 아닌것으로 보입니다. OLE컨트롤을 등록할 수 없습니" "다." #: oledlg.rc:32 @@ -7992,7 +7965,7 @@ msgstr "컨트롤 더하기" #: oledlg.rc:35 msgid "&Convert..." -msgstr "&변환..." +msgstr "변환(&C)..." #: oledlg.rc:36 msgid "%1 %2 &Object" @@ -8015,16 +7988,16 @@ msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." msgstr "" -"당신의 문서에 클립보드의 내용들을 첨부하면 %s를 사용해서 이것을 실행할 수 있" -"습니다." +"당신의 문서에 클립보드의 내용들을 첨부하면 %s을(를) 사용해서 이것을 실행할 " +"수 있습니다." #: oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"당신의 문서에 클립보드의 내용들을 첨부하면 %s를 사용해서 이것을 활성화할 수 " -"있습니다. 이것은 아이콘으로 나타내질 겁니다." +"당신의 문서에 클립보드의 내용들을 첨부하면 %s을(를) 사용해서 이것을 활성화" +"할 수 있습니다. 이것은 아이콘으로 나타내질 겁니다." #: oledlg.rc:44 msgid "" @@ -8059,15 +8032,15 @@ msgstr "당신의 문서에 클립보드의 내용 삽입하기." #: oledlg.rc:48 regedit.rc:430 msgid "Unknown Type" -msgstr "알수 없는 형식" +msgstr " 없는 형식" #: oledlg.rc:49 msgid "Unknown Source" -msgstr "알수 없는 원본" +msgstr " 없는 원본" #: oledlg.rc:50 msgid "the program which created it" -msgstr "내가 만든 풀그림" +msgstr "내가 만든 프로그램" #: sane.rc:41 msgid "Scanning" @@ -8080,7 +8053,7 @@ msgstr "스캐닝중... 기다리십시오" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "픽셀" +msgstr "px" #: sane.rc:32 msgctxt "unit: bits" @@ -8100,7 +8073,7 @@ msgstr "%" #: sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "마이크로초" +msgstr "us" #: serialui.rc:28 msgid "Settings for %s" @@ -8136,7 +8109,7 @@ msgstr "목적지:" #: setupapi.rc:52 msgid "Files Needed" -msgstr "필요한 파일들" +msgstr "필요한 파일" #: setupapi.rc:55 msgid "" @@ -8151,11 +8124,11 @@ msgstr "제작사의 파일이 복사할 곳:" #: setupapi.rc:31 msgid "The file '%1' on %2 is needed" -msgstr "이 파일 '%1' 은 %2에서 필요로 합니다" +msgstr "%2의 '%1' 파일이 필요합니다" #: setupapi.rc:32 ipconfig.rc:34 msgid "Unknown" -msgstr "알수 없음" +msgstr " 없음" #: setupapi.rc:33 msgid "Copy files from:" @@ -8163,7 +8136,7 @@ msgstr "복사할 파일이 위치한 곳:" #: setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "파일이 위치한 경로를 입력하고, 확인을 클릭하십시오." +msgstr "파일이 위치한 경로를 입력하고, [확인]을 클릭하십시오." #: shdoclc.rc:42 msgid "F&orward" @@ -8259,7 +8232,7 @@ msgstr "되돌리기(&U)" #: shdoclc.rc:96 shell32.rc:105 user32.rc:63 msgid "&Delete" -msgstr "지우기(&D)" +msgstr "삭제(&D)" #: shdoclc.rc:103 shell32.rc:97 msgid "&Select" @@ -8323,11 +8296,11 @@ msgstr "추적 정보 덤프" #: shdoclc.rc:202 msgid "Debug Break" -msgstr "디벌레 브레이크" +msgstr "디버그 브레이크" #: shdoclc.rc:203 msgid "Debug View" -msgstr "디벌레 보기" +msgstr "디버그 보기" #: shdoclc.rc:204 msgid "Dump Tree" @@ -8503,7 +8476,7 @@ msgstr "복원(&R)" #: shell32.rc:86 msgid "&Erase" -msgstr "지우기(&E)" +msgstr "삭제(&E)" #: shell32.rc:98 msgid "E&xplore" @@ -8556,7 +8529,7 @@ msgstr "%s 정보" #: shell32.rc:323 msgid "Wine &license" -msgstr "Wine 라이센스(&l)" +msgstr "Wine 라이센스(&L)" #: shell32.rc:328 msgid "Running on %s" @@ -8575,7 +8548,7 @@ msgid "" "Type the name of a program, folder, document, or Internet resource, and Wine " "will open it for you." msgstr "" -"풀그림,폴더,문서나 인터넷 자원, 그리고 Wine이 열 것의 이름을 적어주세요." +"프로그램,폴더,문서나 인터넷 자원, 그리고 Wine이 열 것의 이름을 적어주세요." #: shell32.rc:339 msgid "&Open:" @@ -8705,7 +8678,7 @@ msgstr "당신은 Wine 세션을 끄겠습니까?" #: shell32.rc:203 progman.rc:83 msgid "Programs" -msgstr "응용풀그림" +msgstr "응용프로그램" #: shell32.rc:204 msgid "My Documents" @@ -8717,7 +8690,7 @@ msgstr "즐겨찾기" #: shell32.rc:206 msgid "StartUp" -msgstr "시작 풀그림" +msgstr "시작 프로그램" #: shell32.rc:207 msgid "Start Menu" @@ -8858,19 +8831,19 @@ msgstr "새 폴더를 만드는 과정에서 오류발생" #: shell32.rc:171 msgid "Confirm file deletion" -msgstr "파일 지우기 확인" +msgstr "파일 삭제 확인" #: shell32.rc:172 msgid "Confirm folder deletion" -msgstr "폴더 지우기 확인" +msgstr "폴더 삭제 확인" #: shell32.rc:173 msgid "Are you sure you want to delete '%1'?" -msgstr "당신은 '%1'을 지우기를 바랍니까?" +msgstr "'%1'을(를) 삭제하시겠습니까?" #: shell32.rc:174 msgid "Are you sure you want to delete these %1 items?" -msgstr "당신은 %1 아이템(들)을 지우기를 바랍니까?" +msgstr "%1 아이템을 삭제하시겠습니까?" #: shell32.rc:181 msgid "Confirm file overwrite" @@ -8884,28 +8857,28 @@ msgid "" msgstr "" "이 폴더는 이미 '%1' 파일을 가지고 있습니다.\n" "\n" -"바꾸겠습니까?" +"바꾸시겠습니까?" #: shell32.rc:175 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "당신은 선택된 아이템(들)을 지우기를 바랍니까?" +msgstr "선택한 아이템을 지우시겠습니까?" #: shell32.rc:177 msgid "" "Are you sure that you want to send '%1' and all its content to the Trash?" -msgstr "당신은 '%1' 과 그 안의 내용을 휴지통으로 보내기를 바랍니까?" +msgstr "'%1'와(과) 그 컨텐츠를 휴지통으로 보내시겠습니까?" #: shell32.rc:176 msgid "Are you sure that you want to send '%1' to the Trash?" -msgstr "당신은 '%1' 을(를) 휴지통으로 보내기를 바랍니까?" +msgstr "'%1'을(를) 휴지통으로 보내시겠습니까?" #: shell32.rc:178 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "당신은 '%1' 들을(를) 휴지통으로 보내기를 바랍니까?" +msgstr "'%1' 아이템을 휴지통으로 보내시겠습니까?" #: shell32.rc:179 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "이 아이템'%1'을 휴지통으로 보낼 수 없습니다. 대신 지우겠습니까?" +msgstr "아이템'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신에 지우시겠습니까?" #: shell32.rc:186 msgid "" @@ -8926,14 +8899,12 @@ msgid "Wine Control Panel" msgstr "Wine 제어판" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "파일 실행 대화 상자를 보여줄수 없습니다(내부 오류)" +msgstr "실행 대화 상자를 표시할 수 없습니다 (내부 오류)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" -msgstr "찾기 대화 상자를 보여 줄 수 없습니다(내부 오류)" +msgstr "찾기 대화 상자를 표시할 수 없습니다 (내부 오류)" #: shell32.rc:198 msgid "Executable files (*.exe)" @@ -8941,15 +8912,15 @@ msgstr "실행 파일 (*.exe)" #: shell32.rc:244 msgid "There is no Windows program configured to open this type of file." -msgstr "이 형식의 파일을 도록 구성된 윈도우 풀그림이 없습니다." +msgstr "이 형식의 파일을 도록 구성된 윈도우 프로그램이 없습니다." #: shell32.rc:246 msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "당신은 '%1'을 완전히 지우기를 바랍니까?" +msgstr "'%1'을(를) 완전히 삭제하시겠습니까?" #: shell32.rc:247 msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "당신은 %1 아이템(들)을 완전히 지우기를 바랍니까?" +msgstr "%1 아이템을 완전히 삭제하시겠습니까?" #: shell32.rc:248 msgid "Confirm deletion" @@ -8961,9 +8932,9 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"경로 %1에 파일은 이미 존재합니다.\n" +"경로 %1에 파일이 이미 존재합니다.\n" "\n" -"바꾸기를 원합니까?" +"바꾸시겠습니까?" #: shell32.rc:250 msgid "" @@ -8971,14 +8942,15 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"경로 %1에 폴더 이미 존재합니다.\n" +"경로 %1에 폴더가 이미 존재합니다.\n" "\n" -"바꾸기를 원합니까?" +"바꾸시겠습니까?" #: shell32.rc:251 msgid "Confirm overwrite" msgstr "덮어쓰기 확인" +# 라이센스 문구는 번역하지 않습니다. #: shell32.rc:268 msgid "" "Wine is free software; you can redistribute it and/or modify it under the " @@ -8995,17 +8967,19 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine은 자유 무른모입니다; 당신은 이것을 자유 무른모 재단에 위해 발표된 GNU 약" -"소 일반 공중 사용 허가서의 조건에 따라 수정이나 배포를 할 수 있습니다;버젼 " -"2.1의 라이센스나,(당신의 선택에 따라)무엇이든 최신 버젼을 사용합니다.\n" +"Wine is free software; you can redistribute it and/or modify it under the " +"terms of the GNU Lesser General Public License as published by the Free " +"Software Foundation; either version 2.1 of the License, or (at your option) " +"any later version.\n" "\n" -"Wine은 '어떠한 보증도 없이' 유용하게 사용될 것이라는 희망으로 배포됩니다; 심" -"지어 '특정 목적에 대한 적합성'및 '상품성'의 묵시적 보증도 없습니다. 자세한 내" -"용은 GNU 약소 일반 공중 사용 허가서를 참고하십시오.\n" +"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more " +"details.\n" "\n" -"당신은 Wine에 포함되어 있는 GNU 약소 공중 사용 허가서의 사본을 받으셨을 것입" -"니다; 그렇지 않으면 자유 무른모 재단 주식회사 , 51 Franklin St, Fifth Floor, " -"Boston, MA 02110-1301, USA에 편지를 보내십시오." +"You should have received a copy of the GNU Lesser General Public License " +"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " +"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:256 msgid "Wine License" @@ -9021,7 +8995,7 @@ msgstr "오류" #: shlwapi.rc:43 msgid "Don't show me th&is message again" -msgstr "이 메세지를 다시는 보여주지 마십시시오(&I)" +msgstr "이 메시지 다시 표시하지 않기(&I)" #: shlwapi.rc:30 msgid "%d bytes" @@ -9030,21 +9004,21 @@ msgstr "%d 바이트" #: shlwapi.rc:31 msgctxt "time unit: hours" msgid " hr" -msgstr "시" +msgstr " 시" #: shlwapi.rc:32 msgctxt "time unit: minutes" msgid " min" -msgstr "분" +msgstr " 분" #: shlwapi.rc:33 msgctxt "time unit: seconds" msgid " sec" -msgstr "초" +msgstr " 초" #: twain.rc:29 msgid "Select Source" -msgstr "원본 선택" +msgstr "소스 선택" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -9052,27 +9026,27 @@ msgstr "보안 경고" #: urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "이 무른모를 설치하기를 원합니까?" +msgstr "이 소프트웨어를 설치하시겠습니까?" #: urlmon.rc:39 msgid "Don't install" -msgstr "설치 안 함" +msgstr "설치하지 않음" #: urlmon.rc:43 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"설치할 때,ActiveX 구성요소는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니" -"다. 당신이이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." +"설치했을 때, ActiveX 구성요소는 당신의 컴퓨터에 대한 완전한 접근권한을 가집니" +"다. 위 소스를 완전히 신뢰하지 않는다면 [설치]를 클릭하지 마십시오." #: urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "구성요소 설치가 실패함: %08x" +msgstr "구성요소 설치 실패: %08x" #: urlmon.rc:52 msgid "Install (%d)" -msgstr "설치 (%d)" +msgstr "설치 (%D)" #: urlmon.rc:53 msgid "Install" @@ -9097,7 +9071,7 @@ msgstr "최소화(&N)" #: user32.rc:34 user32.rc:47 taskmgr.rc:83 taskmgr.rc:99 taskmgr.rc:126 msgid "Ma&ximize" -msgstr "최대화(&x)" +msgstr "최대화(&X)" #: user32.rc:36 msgid "&Close\tAlt+F4" @@ -9105,7 +9079,7 @@ msgstr "닫기(&C)\tAlt+F4" #: user32.rc:38 msgid "&About Wine" -msgstr "WINE 정보(&A)" +msgstr "Wine 정보(&A)" #: user32.rc:49 msgid "&Close\tCtrl+F4" @@ -9137,45 +9111,37 @@ msgstr "창 선택" #: user32.rc:72 msgid "&More Windows..." -msgstr "더 많은 창들(&M)..." +msgstr "더 많은 창(&M)..." #: winemac.rc:33 msgid "Hide %@" -msgstr "%@ 숨기기" +msgstr "숨기 %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "다른 문제" +msgstr "다른 것 숨김" #: winemac.rc:36 msgid "Show All" -msgstr "모두 보여주기" +msgstr "모두 표시" #: winemac.rc:37 msgid "Quit %@" -msgstr "%@에서 나가기" +msgstr "끝내기 %@" #: winemac.rc:38 msgid "Quit" msgstr "나가기" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "창(&W)" +msgstr "창" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "최소화(&M)" +msgstr "최소화" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" msgstr "확대" @@ -9189,11 +9155,11 @@ msgstr "모두 앞으로 가져오기" #: wineps.rc:31 msgid "Paper Si&ze:" -msgstr "종이 크기(&Z):" +msgstr "용지 크기(&Z):" #: wineps.rc:39 msgid "Duplex:" -msgstr "양방향 통신:" +msgstr "양면:" #: wineps.rc:50 msgid "Setup" @@ -9213,11 +9179,11 @@ msgstr "서버" #: wininet.rc:80 msgid "There is a problem with the certificate for this site." -msgstr "이 사이트의 인증서에 문제가 있습니다." +msgstr "사이트 인증서에 문제가 있습니다." #: wininet.rc:82 msgid "Do you want to continue anyway?" -msgstr "그래도 계속 진행하겠습니까?" +msgstr "계속 진행하시겠습니까?" #: wininet.rc:28 msgid "LAN Connection" @@ -9225,92 +9191,92 @@ msgstr "랜 연결" #: wininet.rc:29 msgid "The certificate is issued by an unknown or untrusted publisher." -msgstr "이 인증서는 알 수 없거나 신뢰할 수없는 게시자에 의해 발행되었습니다." +msgstr "" +"인증서가 알려지지 않았거나 신뢰할 수 없는 게시자에 의해 발행되었습니다." #: wininet.rc:30 msgid "The date on the certificate is invalid." -msgstr "이 인증서의 날짜는 올바르지 않습니다." +msgstr "인증서 날짜가 올바르지 않습니다." #: wininet.rc:31 msgid "The name on the certificate does not match the site." -msgstr "이 인증서의 이름이 사이트하고 일치 하지 않습니다." +msgstr "인증서 이름이 사이트와 일치하지 않습니다." #: wininet.rc:32 msgid "" "There is at least one unspecified security problem with this certificate." -msgstr "이 인증서에는 최소한 하나의 지정되지 않은 보안 문제가 있습니다." +msgstr "인증서에 최소한 하나의 지정되지 않은 보안 문제가 있습니다." #: winineterror.mc:26 msgid "The request has timed out.\n" -msgstr "요구 시간초과.\n" +msgstr "요청 시간 초과.\n" #: winineterror.mc:31 msgid "An internal error has occurred.\n" msgstr "내부 오류 발생.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "경로가 올바르지 않습니다.\n" +msgstr "URL이 올바르지 않습니다.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL 스키마가 인식되지 않거나 지원되지 않습니다.\n" #: winineterror.mc:46 msgid "The server name could not be resolved.\n" -msgstr "서버명을 찾을 수 없습니다.\n" +msgstr "서버 이름을 확인할 수 없습니다.\n" #: winineterror.mc:51 msgid "The requested operation is invalid.\n" -msgstr "명령이 유효하지 않음.\n" +msgstr "요청한 작업이 올바르지 않습니다.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"작업이 완료되기 전에 요청이 작동하는 핸들이 닫혀 있기 때문에 작업이 취소되었" +"습니다.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "프로필을 추가할 수 없습니다.\n" +msgstr "요청한 항목을 찾을 수 없습니다.\n" #: winineterror.mc:66 msgid "The attempt to connect to the server failed.\n" -msgstr "서버에 연결할수 없습니다.\n" +msgstr "서버에 연결하지 못했습니다.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "서버와의 연결이 종료되었습니다.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"서버에서 수신한 SSL 인증서 날짜가 잘못되었습니다. 인증서가 만료되었습니다.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 인증서 공통 이름(호스트 이름 필드)이 잘못되었습니다.\n" #: winmm.rc:32 msgid "The specified command was carried out." -msgstr "지정된 명령이 실행되었습니다." +msgstr "지정한 명령이 수행되었습니다." #: winmm.rc:33 msgid "Undefined external error." -msgstr "알수 없는 외부 오류." +msgstr "정의되지 않은 외부 오류입니다." #: winmm.rc:34 msgid "A device ID has been used that is out of range for your system." -msgstr "이 장치ID는 당신의 시스템 범위 밖에서 사용되고 있습니다." +msgstr "시스템의 범위를 벗어난 장치 ID가 사용되었습니다." #: winmm.rc:35 msgid "The driver was not enabled." -msgstr "이 드라이버는 가능하지 않습니다." +msgstr "드라이버를 사용할 수 없습니다." #: winmm.rc:36 msgid "" @@ -9332,15 +9298,15 @@ msgid "" "Not enough memory available for this task. Quit one or more applications to " "increase available memory, and then try again." msgstr "" -"이 작업을 위한 충분한 메모리가 없습니다.하나나더 많은 풀그림을 끝내아서 메모" -"리를 늘리고 다시 시도하십시오." +"이 작업을 위한 충분한 메모리가 없습니다.하나나더 많은 프로그램을 끝내아서 메" +"모리를 늘리고 다시 시도하십시오." #: winmm.rc:40 msgid "" "This function is not supported. Use the Capabilities function to determine " "which functions and messages the driver supports." msgstr "" -"이 기능은 지원되지 않습니다. 드라이버가 지원하는 메세지와 함수들을 결정할 수 " +"이 기능은 지원되지 않습니다. 드라이버가 지원하는 메시지와 함수들을 결정할 수 " "있는 함수를 사용하십시오." #: winmm.rc:41 @@ -9368,7 +9334,7 @@ msgid "" "Cannot perform this operation while media data is still playing. Reset the " "device, or wait until the data is finished playing." msgstr "" -"미디어 데이타가 재생되는 동안 이 작업을 실행 할 수 없습니다. 장치를 리셋하거" +"미디어 데이타가 재생되는 동안 이 작업을 실행할 수 없습니다. 장치를 리셋하거" "나, 데이타 재생이 끝날때까지 기다리십시오." #: winmm.rc:48 @@ -9412,16 +9378,10 @@ msgstr "" "시오,그리고 다시 시도하십시오." #: winmm.rc:56 winmm.rc:129 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." -msgstr "" -"MIDI 장치를 지원하는 MIDI Mapper 설정은 시스템에 설치되어 있지 않습니다. " -"MIDI Mapper 를 사용해서 설정을 고치십시오." +msgstr "현재 미디 맵퍼 설정은 시스템에 설치되지 않은 미디 장치를 참조합니다." #: winmm.rc:57 msgid "" @@ -9453,15 +9413,15 @@ msgstr "" #: winmm.rc:64 msgid "The specified device is not open or is not recognized by MCI." -msgstr "지정된 장치는 열수 없거나 MCI에서 인식 할 수 없습니다." +msgstr "지정된 장치는 열 수 없거나 MCI에서 인식할 수 없습니다." #: winmm.rc:66 msgid "" "The device name is already being used as an alias by this application. Use a " "unique alias." msgstr "" -"이 장치 이름은 이미 다른 풀그림에서 별명으로 사용중입니다. 유일한 별명을 사용" -"하십시오." +"이 장치 이름은 이미 다른 프로그램에서 별명으로 사용중입니다. 유일한 별명을 사" +"용하십시오." #: winmm.rc:67 msgid "" @@ -9495,14 +9455,14 @@ msgid "" "manufacturer about obtaining a new driver." msgstr "" "이 장치 드라이버는 잘못된 반환 값을 반환하였습니다. 장치 제조자에게서 새 드라" -"이버를 얻을수 있는지 체크하십시오." +"이버를 얻을 수 있는지 체크하십시오." #: winmm.rc:73 msgid "" "There is a problem with the device driver. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"이것은 장치 드라이버 문제입니다. 장치 제조자에게서 새 드라이버를 얻을수 있는" +"이것은 장치 드라이버 문제입니다. 장치 제조자에게서 새 드라이버를 얻을 수 있는" "지 체크하십시오." #: winmm.rc:74 @@ -9532,8 +9492,8 @@ msgid "" "There is a problem with the device driver. The driver has closed. Cannot " "access error." msgstr "" -"이것은 장치 드라이버 문제입니다. 드라이버가 닫혔습니다. 오류에 접근 할 수 없" -"습니다." +"이것은 장치 드라이버 문제입니다. 드라이버가 닫혔습니다. 오류에 접근할 수 없습" +"니다." #: winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." @@ -9544,7 +9504,7 @@ msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" -"하나나 더 많은 장치에서 오류 발생. 장치가 발생시키는 오류를 처리 할수 있도록 " +"하나나 더 많은 장치에서 오류 발생. 장치가 발생시키는 오류를 처리할 수 있도록 " "각가의 장치에 명령을 지정하십시오." #: winmm.rc:82 @@ -9568,16 +9528,12 @@ msgstr "" "연결되어있는지 확인하세요." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"지정된 장치를 찾을 수 없습니다.이것이 설치된게 확실하다면 장치이름이 올바른" -"지 확인하십시오." +"지정한 장치를 찾을 수 없습니다. 장치가 설치되어 있는지, 장치 이름이 올바른지 " +"확인하기 바랍니다." #: winmm.rc:87 msgid "" @@ -9590,8 +9546,8 @@ msgid "" "The specified alias is already being used in this application. Use a unique " "alias." msgstr "" -"지정된 별명은 이미 풀그림에 의해 사용중입니다. 중복되지 않는 별명을 사용하십" -"시오." +"지정된 별명은 이미 프로그램에 의해 사용중입니다. 중복되지 않는 별명을 사용하" +"십시오." #: winmm.rc:89 msgid "The specified parameter is invalid for this command." @@ -9636,8 +9592,8 @@ msgid "" "The specified file cannot be played on the specified MCI device. The file " "may be corrupt, or not in the correct format." msgstr "" -"이 지정된 파일은 지정된 MCI장치에서 재생 할 수 없습니다. 이 파일이 깨졌거나 " -"올바르지 않은 형식입니다." +"이 지정된 파일은 지정된 MCI장치에서 재생할 수 없습니다. 이 파일이 깨졌거나 올" +"바르지 않은 형식입니다." #: winmm.rc:96 msgid "A null parameter block was passed to MCI." @@ -9686,7 +9642,7 @@ msgstr "" #: winmm.rc:104 msgid "" "Cannot specify extra characters after a string enclosed in quotation marks." -msgstr "인용부호로 둘러 싼 문자 뒤에 추가 문자를 지정 할 수 없습니다." +msgstr "인용부호로 둘러 싼 문자 뒤에 추가 문자를 지정할 수 없습니다." #: winmm.rc:105 msgid "" @@ -9701,7 +9657,7 @@ msgid "" "Cannot access the specified file or MCI device. Try changing directories or " "restarting your computer." msgstr "" -"지정된 파일이나 MCI 장치에 접근할 수 없습니다. 디렉토리를 바꾸거나 컴퓨터를 " +"지정된 파일이나 MCI 장치에 접근할 수 없습니다. 디렉터리를 바꾸거나 컴퓨터를 " "재시작하십시오." #: winmm.rc:107 @@ -9709,16 +9665,16 @@ msgid "" "Cannot access the specified file or MCI device because the application " "cannot change directories." msgstr "" -"풀그림이 디렉토리를 바꿀 수 없기 때문에 지정된 특정한 파일이나 MCI장치에 접근" -"할 수 없습니다." +"프로그램이 디렉터리를 바꿀 수 없기 때문에 지정된 특정한 파일이나 MCI장치에 접" +"근할 수 없습니다." #: winmm.rc:108 msgid "" "Cannot access specified file or MCI device because the application cannot " "change drives." msgstr "" -"풀그림이 디렉토리를 바꿀 수 없기 때문에 지정한 파일이나 MCI장치에 접근할 수 " -"없습니다." +"프로그램이 디렉터리를 바꿀 수 없기 때문에 지정한 파일이나 MCI장치에 접근할 " +"수 없습니다." #: winmm.rc:109 msgid "Specify a device or driver name that is less than 79 characters." @@ -9746,8 +9702,8 @@ msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"사용중이므로 현재 웨이브 장치를 플레이 백으로 설정 할 수 없습니다. 장치가 자" -"유롭게 될때까지 기다리고, 다시 시도하십시오." +"사용중이므로 현재 웨이브 장치를 플레이 백으로 설정할 수 없습니다. 장치가 자유" +"롭게 될때까지 기다리고, 다시 시도하십시오." #: winmm.rc:114 msgid "" @@ -9762,8 +9718,8 @@ msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"사용중이므로 현재 웨이브 장치를 녹음으로 설정 할 수 없습니다. 장치가 자유롭" -"게 될때까지 기다리고, 다시 시도하십시오." +"사용중이므로 현재 웨이브 장치를 녹음으로 설정할 수 없습니다. 장치가 자유롭게 " +"될때까지 기다리고, 다시 시도하십시오." #: winmm.rc:116 msgid "Any compatible waveform playback device may be used." @@ -9785,7 +9741,7 @@ msgstr "" msgid "" "The device you are trying to play to cannot recognize the current file " "format." -msgstr "당신이 재생하려는 장치는 현재 파일 형식을 인식 할 수 없습니다." +msgstr "당신이 재생하려는 장치는 현재 파일 형식을 인식할 수 없습니다." #: winmm.rc:120 msgid "" @@ -9806,16 +9762,16 @@ msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"\"song pointer\"의 시간 형식하고 SMPTE 는 서로 배타적입니다. 이것들을 같이 " -"사용할 수 없습니다." +"\"song pointer\"와 SMPTE의 시간 형식이 서로 배타적입니다. 함께 사용할 수 없습" +"니다." #: winmm.rc:128 msgid "" "The specified MIDI port is already in use. Wait until it is free; then try " "again." msgstr "" -"지정된 MIDI 포트는 이미 사용중입니다.자유롭게 될 때까지 기다리고 다시 시도하" -"십시오." +"지정된 MIDI 포트는 이미 사용중입니다. 자유롭게 될 때까지 기다리고 다시 시도" +"하십시오." #: winmm.rc:131 msgid "" @@ -9834,8 +9790,8 @@ msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications; then, try again." msgstr "" -"모든 멀티미디어 타이머는 다른 풀그림에 의해 사용중입니다. 최소한 하나의 풀그" -"림을 끝내고 다시 시도하십시오." +"모든 멀티미디어 타이머는 다른 프로그램에 의해 사용중입니다. 최소한 하나의 풀" +"그림을 끝내고 다시 시도하십시오." #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -9899,11 +9855,11 @@ msgstr "출력 파일 이름(&O):" #: winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." -msgstr "출력 파일은 존재합니다. '확인'을 클릭하면 덮어쓰여질겁니다." +msgstr "출력 파일이 이미 존재합니다. 덮어 쓰려면 [확인]을 클릭하십시오." #: winspool.rc:32 msgid "Unable to create the output file." -msgstr "출력 파일을 만들수 없습니다." +msgstr "출력 파일을 만들 수 없습니다." #: wldap32.rc:32 msgid "Success" @@ -9935,11 +9891,11 @@ msgstr "잘된 비교" #: wldap32.rc:39 msgid "Authentication Method Not Supported" -msgstr "인증방법은 지원하지 않습니다" +msgstr "인증 방법을 지원하지 않습니다" #: wldap32.rc:40 msgid "Strong Authentication Required" -msgstr "강력한 인증이 요구됩니다" +msgstr "강력한 인증이 필요합니다" #: wldap32.rc:41 msgid "Referral (v2)" @@ -9951,11 +9907,11 @@ msgstr "추천" #: wldap32.rc:43 msgid "Administration Limit Exceeded" -msgstr "관리 한도를 넘었습니다" +msgstr "관리 제한을 넘었습니다" #: wldap32.rc:44 msgid "Unavailable Critical Extension" -msgstr "치명적 확장은 가능하지 않습니다" +msgstr "가능하지 않은 치명적 확장" #: wldap32.rc:45 msgid "Confidentiality Required" @@ -10003,11 +9959,11 @@ msgstr "잘못된 DN 문법" #: wldap32.rc:67 msgid "Is Leaf" -msgstr "이즈(IS) 리프(Leaf)" +msgstr "Is Leaf" #: wldap32.rc:68 msgid "Alias Dereference Problem" -msgstr "Alias 디레퍼런스 문제" +msgstr "Alias 역참조 문제" #: wldap32.rc:80 msgid "Inappropriate Authentication" @@ -10075,11 +10031,11 @@ msgstr "결과가 너무 큽니다" #: wldap32.rc:103 msgid "Affects Multiple DSAs" -msgstr "다양한 DSAs이 작용합니다" +msgstr "다중 DSA를 적용합니다" #: wldap32.rc:113 msgid "Server Down" -msgstr "서바 다운" +msgstr "서버 다운" #: wldap32.rc:114 msgid "Local Error" @@ -10099,7 +10055,7 @@ msgstr "시간 초과" #: wldap32.rc:118 msgid "Auth Unknown" -msgstr "알수 없는 인증" +msgstr " 없는 인증" #: wldap32.rc:119 msgid "Filter Error" @@ -10119,19 +10075,19 @@ msgstr "메모리 없음" #: wldap32.rc:123 msgid "Can't connect to the LDAP server" -msgstr "LDAP 서버에 연결할수 없습니다" +msgstr "LDAP 서버에 연결할 수 없습니다" #: wldap32.rc:124 msgid "Operation not supported by this version of the LDAP protocol" -msgstr "LDAP 프로토콜의 이 버젼은 그 작업을 지원하지 않습니다" +msgstr "LDAP 프로토콜의 이 버전은 그 작업을 지원하지 않습니다" #: wldap32.rc:125 msgid "Specified control was not found in message" -msgstr "지정된 제어는 메세지에서 발견할 수 없습니다" +msgstr "지정된 제어는 메시지에서 발견할 수 없습니다" #: wldap32.rc:126 msgid "No result present in message" -msgstr "어떤 결과도 메세지에 존재하지 않습니다" +msgstr "어떤 결과도 메시지에 존재하지 않습니다" #: wldap32.rc:127 msgid "More results returned" @@ -10178,7 +10134,7 @@ msgid "" " /S Processes matching files in the current folder and all subfolders.\n" " /D Processes folders as well.\n" msgstr "" -"ATTRIB - 파일 속성을 바꾸거나 보여줍니다.\n" +"ATTRIB - 파일 속성을 바꾸거나 표시합니다.\n" "\n" "문법:\n" "ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [드라이브:][경로][파일이름]\n" @@ -10186,15 +10142,15 @@ msgstr "" "\n" "Where:\n" "\n" -" + 속성을 설정합니다.\n" -" - 속성을 지웁니다.\n" -" R 읽기-전용 속성를 설정합니다.\n" +" + 속성을 설정합니다.\n" +" - 속성을 삭제합니다.\n" +" R 읽기 전용 속성를 설정합니다.\n" " A 압축 파일 속성을 설정합니다.\n" " S 시스템 파일 속성을 설정합니다.\n" " H 숨은 파일 속성을 설정합니다.\n" " [드라이브:][경로][파일이름]\n" -" 속성 작업을 할 파일이나 파일들을 지정합니다.\n" -" /S 현재 폴더와 모든 하위 폴더에서 일치하는 파일들을 처리합니다.\n" +" 속성 작업을 할 하나 또는 복수의 파일을 지정합니다.\n" +" /S 현재 폴더와 모든 하위 폴더에서 일치하는 파일을 처리합니다.\n" " /D 폴더를 함께 처리합니다.\n" #: clock.rc:32 @@ -10249,26 +10205,19 @@ msgstr "" "을 호출한\n" "파일한테 돌아갑니다. CALL 명령은 호출하는 과정에서 매개변수를 가집니다.\n" "\n" -"기본 디렉토리나 환경변수 등을 바꾸는 것은 호출자에 의해 상속되어서 호출된\n" +"기본 디렉터리나 환경변수 등을 바꾸는 것은 호출자에 의해 상속되어서 호출된\n" "과정에만 적용됩니다.\n" #: cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <디렉토리> 는 CHDIR의 단축버젼입니다. 현재 기본 디렉토리를\n" -"바꿉니다.\n" +"CD <디렉터리> 는 CHDIR의 단축 버전입니다. 현재 작업 디렉터리를 바꿉니다.\n" #: cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <디렉토리> 는 현재 기본 디렉토리를 바꿉니다.\n" +msgstr "CHDIR <디렉터리> 는 현재 작업 디렉터리를 바꿉니다.\n" #: cmd.rc:50 msgid "CLS clears the console screen.\n" @@ -10280,31 +10229,21 @@ msgstr "COPY <파일이름> 은 파일을 복사합니다.\n" #: cmd.rc:56 msgid "CTTY changes the input/output device.\n" -msgstr "CTTY 는 입력/출력 장치를 바꿉니다.\n" +msgstr "CTTY는 입력/출력 장치를 바꿉니다.\n" #: cmd.rc:59 msgid "DATE shows or changes the system date.\n" -msgstr "DATE 는 시스템 날짜를 보여주거나 바꿉니다.\n" +msgstr "DATE는 시스템 날짜를 보여주거나 바꿉니다.\n" #: cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <파일이름> 은 하나의 파일이나 여러 파일을 지웁니다.\n" +msgstr "DEL <파일이름>은 하나의 파일이나 여러 파일을 지웁니다.\n" #: cmd.rc:65 msgid "DIR lists the contents of a directory.\n" -msgstr "DIR 는 디렉토리의 내용을 보여줍니다.\n" +msgstr "DIR은 디렉터리의 내용을 표시합니다.\n" #: cmd.rc:75 -#, fuzzy -#| msgid "" -#| "ECHO <string> displays <string> on the current terminal device.\n" -#| "\n" -#| "ECHO ON causes all subsequent commands in a batch file to be displayed\n" -#| "on the terminal device before they are executed.\n" -#| "\n" -#| "ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" -#| "default). The ECHO OFF command can be prevented from displaying by\n" -#| "preceding it with an @ sign.\n" msgid "" "ECHO <string> displays <string> on the current terminal device.\n" "\n" @@ -10315,24 +10254,19 @@ msgid "" "default). The ECHO OFF command can be prevented from displaying by\n" "preceding it with an @ sign.\n" msgstr "" -"ECHO <문자열>은 <문자열>을 현재 명령줄 해석기에 보여줍니다.\n" +"ECHO <문자열>은 <문자열>을 현재 터미널 장치에 표시합니다.\n" "\n" -"ECHO ON는 배치파일에서 다음에 오는 모든 명령을 실행괴기 전에 명령줄 해석기에 " -"보여줍니다\n" +"ECHO ON는 배치파일 안의 모든 이후 명령어를 터미널 장치에 실행하기 전에 표시합" +"니다.\n" "\n" -"ECHO OFF 는 ECHO ON과 반대의 일을 합니다. (ECHO 는 OFF가 기본)\n" -"ECHO OFF 명령은 신호가 진행되는 걸 보여주는걸 막습니다.\n" +"ECHO OFF는 ECHO ON과 반대 효과가 있습니다(ECHO OFF가 기본값).\n" +"ECHO OFF 명령은 @ 부호처럼 처리 중 명령어가 표시되는 것을 막습니다.\n" #: cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <파일이름>은 하나의 파일이냐 여러 파일을 지웁니다.\n" #: cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -10340,23 +10274,13 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"FOR 명령은 파일 모음에서 각각의 명령을 실행시킬 때 사용.\n" +"FOR는 파일 집합에 포함된 각각의 파일에 대해 명령어를 실행할 때 쓰입니다.\n" "\n" -"문법: FOR 변수 IN (set) DO 명령\n" +"사용법: FOR %변수 IN (set) DO 명령\n" +"\n" +"% 부호는 배치 파일 안에서 FOR를 사용할 때는 중첩(%%)되어야 합니다.\n" #: cmd.rc:97 -#, fuzzy -#| msgid "" -#| "The GOTO command transfers execution to another statement within a\n" -#| "batch file.\n" -#| "\n" -#| "The label which is the target of a GOTO may be up to 255 characters\n" -#| "long but may not include spaces (this is different from other operating\n" -#| "systems). If two or more identical labels exist in a batch file the\n" -#| "first one will always be executed. Attempting to GOTO a nonexistent\n" -#| "label terminates the batch file execution.\n" -#| "\n" -#| "GOTO has no effect when used interactively.\n" msgid "" "The GOTO command transfers execution to another statement within a batch\n" "file.\n" @@ -10369,15 +10293,17 @@ msgid "" "\n" "GOTO has no effect when used interactively.\n" msgstr "" -"The GOTO 명령은 배치파일 안에서 다른 부분으로 실행흐름을 바꿉니다.\n" +"GOTO는 배치 파일 안에서 다른 구문으로 실행을 전환합니다.\n" "\n" -"GOTO의 타겟인 라벨은 공백을 포함해서 255자까지 가능합니다\n" -"(다른 운영체제에서는 다를 수도 있습니다).\n" -"만약 2개나 더 많은 동일한 라벨이 존재할 경우 배치파일은 첫번째 것만\n" -"실행시킬 것입니다. 존재하지 않는 라벨로 GOTO를 시도한다면 배치파일 실행은\n" -"중단됩니다.\n" +"GOTO의 타겟인 레이블은 255자까지 가능합니다만, 공백은 포함하지 않을 수도 있습" +"니다\n" +"(운영체제에 따라서 다를 수도 있습니다). 만약 배치 파일 안에 2개나 그 이상의 " +"동일한\n" +"레이블이 존재할 경우 첫번째 것이 실행됩니다. 존재하지 않는 레이블로 GOTO를 시" +"도한다면\n" +"배치파일 실행은 중단됩니다.\n" "\n" -"GOTO는 대화식으로 사용될 경우 아무 일도 안합니다.\n" +"GOTO는 대화식으로 사용할 경우 어떤 효과도 없습니다.\n" #: cmd.rc:101 msgid "" @@ -10385,7 +10311,7 @@ msgid "" "HELP without an argument shows all CMD built-in commands.\n" msgstr "" "HELP <명령>은 주제의 간단한 도움말 정보를 보여줍니 다.\n" -"아무 매개변수가 없는 HELP눈 CMD의 모든 내장 명령을 보여줍니다.\n" +"아무 매개변수가 없는 HELP눈 CMD의 모든 내장 명령을 표시합니다.\n" #: cmd.rc:111 msgid "" @@ -10404,7 +10330,7 @@ msgstr "" " IF [NOT] string1==string2 명령\n" " IF [NOT] ERRORLEVEL 숫자 명령\n" "\n" -"명령의 두번째 형식에서, string1 과 string2는 반드시 2개의 따옴표로\n" +"명령의 두번째 형식에서, string1과 string2는 반드시 2개의 따옴표로\n" "둘려놓아야 합니다.이 비교는 대소문자를 구분하지 않습니다.\n" #: cmd.rc:118 @@ -10415,33 +10341,22 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL은 디스크 볼륨 라벨을 설정할 때 사용.\n" +"LABEL은 디스크 볼륨 레이블을 설정할 때 사용.\n" "\n" "Syntax: LABEL [드라이브:]\n" -"이 명령은 당신이 주어진 드라이브에 새 볼륨 라벨울 넣을수 있도록 할것이다.\n" -"VOL 명령으로 디스크 볼륨 라벨을 볼 수 있다.\n" +"이 명령은 당신이 주어진 드라이브에 새 볼륨 레이블울 넣을수 있도록 할것이다.\n" +"VOL 명령으로 디스크 볼륨 레이블을 볼 수 있다.\n" #: cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "" -"MD <아름> 운 MKDIR의 단축 버젼입니다. 이것은 하위 디렉토리를 만듭니다 .\n" +"MD <아름> 운 MKDIR의 단축 버전입니다. 이것은 하위 디렉터리를 만듭니다 .\n" #: cmd.rc:123 msgid "MKDIR <name> creates a subdirectory.\n" -msgstr "MKDIR <명령> 운 하위 디렉토리를 만듭니다.\n" +msgstr "MKDIR <명령> 운 하위 디렉터리를 만듭니다.\n" #: cmd.rc:131 -#, fuzzy -#| msgid "" -#| "MOVE relocates a file or directory to a new point within the file " -#| "system.\n" -#| "\n" -#| "If the item being moved is a directory then all the files and " -#| "subdirectories\n" -#| "below the item are moved as well.\n" -#| "\n" -#| "MOVE fails if the old and new locations are on different DOS drive " -#| "letters.\n" msgid "" "MOVE relocates a file or directory to a new point within the file system.\n" "\n" @@ -10450,25 +10365,15 @@ msgid "" "\n" "MOVE fails if the old and new locations are on different DOS drive letters.\n" msgstr "" -"MOVE는 파일이나 디렉토리를 파일시스템 안에 있는 새로운 곳으로 재배치함.\n" +"MOVE는 파일이나 디렉터리를 파일시스템 안에 있는 새로운 곳으로 재배치합니다.\n" +"\n" +"만약 옮겨지는 아이템이 하나의 디렉터리라면 디렉터리 아래 모든 파일과\n" +"서브디렉터리도 이동될 것입니다.\n" "\n" -"만약 옮겨지는 아이템이 하나의 디렉토리라면 모든 파일과 하위 디렉토리 밑에\n" -"있는 파일도 이동될 것이다.\n" -"MOVE는 만약 오래되고 새로운 파일이 다른 도스 드라이브 문자를 가지고 있다면\n" -"실패합니다.\n" +"MOVE는 원본과 대상의 위치가 다른 DOS 드라이브 문자를 가지고 있다면 실패합니" +"다.\n" #: cmd.rc:142 -#, fuzzy -#| msgid "" -#| "PATH displays or changes the cmd search path.\n" -#| "\n" -#| "Entering PATH will display the current PATH setting (initially taken\n" -#| "from the registry). To change the setting follow the\n" -#| "PATH command with the new value.\n" -#| "\n" -#| "It is also possible to modify the PATH by using the PATH environment\n" -#| "variable, for example:\n" -#| "PATH %PATH%;c:\\temp\n" msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -10480,59 +10385,29 @@ msgid "" "variable, for example:\n" "PATH %PATH%;c:\\temp\n" msgstr "" -"PATH는 cmd 찾기 경로를 보여주거나 바꿉니다.\n" +"PATH는 실행 파일의 검색 경로를 보여주거나 바꿉니다.\n" "\n" -"PATH 입력은 현재 PATH 설정을 보여줄 것입니다 (처음에는\n" -"레지스트리로부터 가져옴). PATH 명령과 함께 새로운 값을 주면\n" -"설정을 바쑬 수 있습니다.\n" +"PATH 입력은 현재 PATH 설정을 보여줄 것입니다 (기본적으로 레지스트리로부터\n" +"가져옴). 설정을 바꾸기 위해서는 PATH 이후에 새로운 값을 지정합니다.\n" +"\n" +"PATH 환경변수를 사용해서 PATH를 수정하는 것도 가능합니다. 예를 들어\n" "\n" -"PATH 환경변수를 사용해서 PATH를 고치는 것도 가능합니다\n" -",예를 들어:\n" "PATH %PATH%;c:\\temp\n" #: cmd.rc:148 -#, fuzzy -#| msgid "" -#| "PAUSE displays a message on the screen asking the user to press a key.\n" -#| "\n" -#| "It is mainly useful in batch files to allow the user to read the output\n" -#| "of a previous command before it scrolls off the screen.\n" msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE 는 사용자가 아무 키나 누르라는 메세지를 화면에 보여줍니다.\n" +"PAUSE는 사용자에게 아무 키나 누르라는 메시지를 화면에 표시합니다.\n" "\n" -"사용자가 화면에서 스크롤 하기 전에 이전 명령의 결과를 읽을 수 있도록\n" -"배치파일에서 주로 유용하게 사용합니다.\n" +"사용자가 이전 명령의 결과가 스크롤 되지 건에 읽을 수 있도록 하기 위해 배치파" +"일에서\n" +"주로 유용하게 사용합니다.\n" #: cmd.rc:169 -#, fuzzy -#| msgid "" -#| "PROMPT sets the command-line prompt.\n" -#| "\n" -#| "The string following the PROMPT command (and the space immediately " -#| "after)\n" -#| "appears at the beginning of the line when cmd is waiting for input.\n" -#| "\n" -#| "The following character strings have the special meaning shown:\n" -#| "\n" -#| "$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" -#| "$d Current date $e Escape $g > sign\n" -#| "$l < sign $n Current drive $p Current path\n" -#| "$q Equal sign $t Current time $v cmd version\n" -#| "\n" -#| "Note that entering the PROMPT command without a prompt-string resets the\n" -#| "prompt to the default, which is the current directory (which includes " -#| "the\n" -#| "current drive letter) followed by a greater-than (>) sign.\n" -#| "(like a command PROMPT $p$g).\n" -#| "\n" -#| "The prompt can also be changed by altering the PROMPT environment " -#| "variable,\n" -#| "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -10554,80 +10429,55 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT 명령-라인 프롬프트 설정.\n" +"PROMPT은 명령 라인 프로프트를 설정합니다.\n" "\n" -"이 문자는 cmd가 입력을 기다리고 있을 때 시작 줄에 나타나는 PROMPT\n" -"명령(그리고 스페이스 다음에)에 뒤따른다.\n" +"PROMPT 명령어 이후의 문자열(과 바로 이후의 공백)은 cmd가 입력을 기다리고 있" +"을 때\n" +"명령 라인의 시작에 나타납니다.\n" "\n" -"뒤의 문자의 문자열의 특별한 의미 설명:\n" +"아래 소개하는 문자열은 특별한 의미를 가집니다:\n" "\n" -"$$ 달러 기호 $_ 라인피드 $b 파이프 기호 (|)\n" -"$d 현재 날짜 $e 이스케이프 $g > 기호\n" -"$l < 기호 $n 현재 드라이브 $p 현재 경로\n" -"$q 등호 기호 $t 현재 시간 $v cmd 버젼\n" +"$$ 달러 기호 $_ 라인피드 $b 파이프 기호 (|)\n" +"$d 현재 날짜 $e 이스케이프 $g > 기호\n" +"$l < 기호 $n 현재 드라이브 $p 현재 경로\n" +"$q 등호 기호 $t 현재 시간 $v cmd 버전\n" "\n" -"프롬프트가 기본상태인 채로 프롬프트문자를 재설정하지 않고 PROMPT 명령을\n" -"사용했을 때 ,이것은 현재 디렉토리 (포함해서현재 드라이브 문자) 에 \"보다 큰" -"(>)\"\n" -"기호가 뒤따른다는 걸 주의하시오. (명령 PROMPT $p$g롸 같이).\n" +"ROMPT 명령을 뒤따르는 문자열 없이 실행하면 프롬프트가 기본값으로 리셋됩니" +"다.\n" +"기본값은 (드라이브 문자를 포함하는) 현재 디렉터리와 이어지는 > 기호입니다\n" +"(이것은 PROMPT $p$g 명령과 같습니다).\n" "\n" -"이 프롬프트는 PROMPT 환경 변수 값의 변경에 의해 바뀔 수 있습니다,\n" -"그래서 명령 'SET PROMPT=텍스트'는 'PROMPT 텍스트와 같은 일을 합니다.\n" +"프롬프트는 또한 PRPOMPT 환경 변수를 써서 변경할 수 있습니다. 그래서\n" +"'SET PROMPT=test'는 'PROMPT test'와 같은 효과가 있습니다.\n" #: cmd.rc:173 -#, fuzzy -#| msgid "" -#| "A command line beginning with REM (followed by a space) performs no\n" -#| "action, and can therefore be used as a comment in a batch file.\n" msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"REM으로 시작하는 명령 라인 (공백뒤에 오는) 은 아무일도 안합니다\n" -", 그러므로 배치 파일에서 주석으로 사용됩니다.\n" +"REM으로 시작하(고 뒤에 공백이 뒤따르)는 명령 라인은 어떤 동작도 하지 않습니" +"다.\n" +"그러므로 배치 파일에서 주석으로 사용할 수 있습니다.\n" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "" -"REN <파일이름> 은 REANME의 단축 버젼입니다.이것은 파일의 이름을 바꿉니" -"다.\n" +"REN <파일이름> 은 REANME의 단축 버전입니다.이것은 파일 이름을 바꿉니다.\n" #: cmd.rc:178 msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <파일이름> 은 파일의 이름을 바꿈.\n" #: cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "" -"RD <디렉토리> 는 RMDIR의 단축버젼입니다. 이것은 하위 디렉토리를 지웁니다.\n" +"RD <디렉터리> 는 RMDIR의 단축 버전입니다. 이것은 디렉터리를 삭제합니다.\n" #: cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <디렉토리>는 하위 디렉토리를 지움.\n" +msgstr "RMDIR <디렉터리>는 디렉터리를 삭제합니다.\n" #: cmd.rc:229 -#, fuzzy -#| msgid "" -#| "SET displays or changes the cmd environment variables.\n" -#| "\n" -#| "SET without parameters shows all of the current environment.\n" -#| "\n" -#| "To create or modify an environment variable the syntax is:\n" -#| "\n" -#| "SET <variable>=<value>\n" -#| "\n" -#| "where <variable> and <value> are character strings. There must be no\n" -#| "space before the equals sign, nor can the variable name\n" -#| "have embedded spaces.\n" -#| "\n" -#| "Under Wine, the environment of the underlying operating system is\n" -#| "included into the Win32 environment, there will generally therefore be\n" -#| "many more values than in a native Win32 implementation. Note that it is\n" -#| "not possible to affect the operating system environment from within cmd.\n" msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -10645,67 +10495,32 @@ msgid "" "values than in a native Win32 implementation. Note that it is not possible\n" "to affect the operating system environment from within cmd.\n" msgstr "" -"SET은 cmd 환경 변수 보여주거나 바꿉니다.\n" +"SET은 cmd 환경변수를 표시하거나 바꿉니다.\n" "\n" -"아무 매개변수가 없는 SET은 모든 현재 환경변수를 보여줍니다.\n" +"매개변수가 없는 SET은 현재 환경변수를 모두 표시합니다.\n" "\n" -"환경 변수를 만들거나 고칠때 사용하는 문법:\n" +"환경 변수를 생성하거나 수정할 때 사용하는 문법:\n" "\n" "SET <변수>=<값>\n" "\n" -"<변수> 와 <값>은 캐릭터-문자열 이다. 반드시 등호(=)기호 앞에 어떤\n" -"공백도 있어선 안되고, 변수 이름에 내부 공백도 있을 수 없다.\n" +"<변수> 와 <값>은 문자열입니다. 반드시 등호(=) 기호 앞에 어떤\n" +"공백도 있어선 안되고, 변수 이름 내부에 공백을 가져서도 안됩니다.\n" "\n" -"Wine 아래에서, 운영체제 밑의 환경은 Win32 환경에 포함됩니다, 그것은\n" -"일반적으로 네이티브 Win32 구현에는 더 많은 값이 있어야 된 다는 것을\n" -"의미합니다. 이것은 cmd안에서 운영체제 환경의 영향을 미치는 것은\n" -"가능하지 않다는 것을 기억하시오.\n" +"Wine 아래, 다시 말해 Win32환경이 포함된 운영 체제 아래의 환경에서는\n" +"네이티브 Win32 구현보다 더 많은 값을 포함합니다. Cmd 안에서 운영체제\n" +"환경 보수에 영향을 미치는 것이 가능하지 않다는 것에 주목하십시오\n" #: cmd.rc:234 -#, fuzzy -#| msgid "" -#| "SHIFT is used in a batch file to remove one parameter from the head of\n" -#| "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" -#| "if called from the command line.\n" msgid "" "SHIFT is used in a batch file to remove one parameter from the head of the\n" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"SHIFT 는 배치파일에서 매개변수의 첫번째 것을 지우는데 사용한다,\n" -"그래서 매개변수 2가 매개변수 1이 된다. 이것은 명령 라인에서 사용했을\n" -"경우 아무 일도 안 합니다.\n" +"SHIFT는 배치 파일 안에서 매개 변수 리스트의 처음 하나를 삭제 위해서\n" +"사용합니다. 매개변수 2가 매개변수 1이 되는 식입니다. 이것은 명령 라인에서\n" +"사용했을 경우에는 아무 영향이 없습니다.\n" #: cmd.rc:212 start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -10735,28 +10550,29 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"풀그림을 시작하거나, 파일 확장자에서 보통 사용하는 풀그림으로 문서를 엽니다\n" +"프로그램을 시작하거나, 파일 확장자와 연관된 프로그램으로 문서를 엽니다.\n" "사용법:\n" -"start [옵션] 풀그림_파일이름 [...]\n" +"start [옵션] 프로그램_파일이름 [...]\n" "start [옵션] 문서_파일이름\n" "\n" "옵션:\n" -"\"제목\" 자식 창의 제목 지정합니다.\n" -"/d 디렉토리 지정한 디렉토리에서 풀그림을 실행합니다.\n" -"/b 풀그림을 위해 새 콘솔을 만들지 않습니다.\n" -"/i 깨끗한 환경 변수로 풀그림을 시작합니다.\n" -"/min 풀그림을 최소화된 상태로 시작합니다.\n" -"/max 풀그림을 최대화된 상태로 시작합니다.\n" -"/low 풀그림을 낮은 우선 순위 클래스로 시작합니다.\n" -"/normal 풀그림을 보통 우선 순위 클래스로 시작합니다.\n" -"/high 풀그림을 높은 우선 순위 클래스로 시작합니다.\n" -"/realtime 풀그림을 실시간 우선 순위 클래스로 시작합니다.\n" -"/abovenormal 풀그림을 보통이상 우선 순위 클래스로 시작합니다.\n" -"/belownormal 풀그림을 보통이하 우선 순위 클래스로 시작합니다.\n" -"/node n 지정한 NUMA 노드로 풀그림을 시작합니다.\n" -"/affinity 마스크 지정한 친화도 마스크로 풀그림을 시작합니다.\n" -"/wait 시작된 풀그림이 끝나기를 기다리고,풀그림이 끝났을때 종료코드로 " -"끝납니다.\n" +"\"제목\" 자식 창의 제목 지정합니다.\n" +"/d 디렉터리 지정한 디렉터리에서 프로그램을 실행합니다.\n" +"/b 프로그램을 위해 새 콘솔을 만들지 않습니다.\n" +"/i 깨끗한 환경 변수로 프로그램을 시작합니다.\n" +"/min 프로그램을 최소화된 상태로 시작합니다.\n" +"/max 프로그램을 최대화된 상태로 시작합니다.\n" +"/low 프로그램을 낮은 우선 순위 클래스로 시작합니다.\n" +"/normal 프로그램을 보통 우선 순위 클래스로 시작합니다.\n" +"/high 프로그램을 높은 우선 순위 클래스로 시작합니다.\n" +"/realtime 프로그램을 실시간 우선 순위 클래스로 시작합니다.\n" +"/abovenormal 프로그램을 보통이상 우선 순위 클래스로 시작합니다.\n" +"/belownormal 프로그램을 보통이하 우선 순위 클래스로 시작합니다.\n" +"/node n 지정한 NUMA 노드로 프로그램을 시작합니다.\n" +"/affinity 마스크 지정한 친화도 마스크로 프로그램을 시작합니다.\n" +"/wait 시작된 프로그램이 끝나기를 기다리고,프로그램이 끝났을때 종료코" +"드\n" +" 로 끝납니다.\n" "/unix 유닉스 파일이름을 사용하고, 윈도우즈 탐색기같이 파일을 시작합니" "다.\n" "/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" @@ -10764,23 +10580,21 @@ msgstr "" #: cmd.rc:237 msgid "TIME sets or shows the current system time.\n" -msgstr "TIME 은 현재 시스템 시간을 보여 줍니다.\n" +msgstr "TIME - 현재 시스템 시간을 보여 줍니다.\n" #: cmd.rc:240 msgid "TITLE <string> sets the window title for the cmd window.\n" -msgstr "TITLE <문자열>은 cmd창의 창 제목을 설정합니다.\n" +msgstr "TITLE <문자열> - cmd 창의 창 제목을 설정합니다.\n" #: cmd.rc:244 -#, fuzzy -#| msgid "" -#| "TYPE <filename> copies <filename> to the console device (or elsewhere\n" -#| "if redirected). No check is made that the file is readable text.\n" msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <파일이름> <파일 이름>를 콘솔 장치로 복사 (만약 방향이 재정의 된다면\n" -"어디나). 아무 오류가 없으면 그 파일을 읽을 수 있는 텍스트입니다.\n" +"TYPE <파일이름> <파일 이름>을 콘솔 장치로 복사합니다 (또는 리다이렉트된다" +"면\n" +"어디에나 보낼 수 있습니다). 파일이 읽기 가능한 텍스트로 만들어졌는지\n" +"체크하지 않습니다.\n" #: cmd.rc:253 msgid "" @@ -10803,23 +10617,19 @@ msgstr "" #: cmd.rc:256 msgid "VER displays the version of cmd you are running.\n" -msgstr "VER 당신이 실행시킨 cmd 버젼 보여줌.\n" +msgstr "VER - 실행중인 cmd 버전을 표시합니다.\n" #: cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 은 디스크 장치의 볼륨 라벨을 보여줍니다.\n" +msgstr "VOL - 디스크 장치의 볼륨 레이블을 표시합니다.\n" #: cmd.rc:263 -#, fuzzy -#| msgid "" -#| "ENDLOCAL ends localization of environment changes in a batch file\n" -#| "which were introduced by a preceding SETLOCAL.\n" msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL은 배치파일에서 바꾼 지역 환경변수를 끝냅니다\n" -"이것은 이전의 SETLOCAL로 시작되었습니다.\n" +"ENDLOCAL은 배치 파일 안에서 SELLOCAL에 의해 시작된 환경 변경의 지역화를\n" +"끝냅니다.\n" #: cmd.rc:271 msgid "" @@ -10830,39 +10640,25 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" -"ENDLOCAL은 배치파일에서 바꾼 지역 환경변수를 끝냅니다\n" +"SETLOCAL은 배치 파일 안에서 환경 변경의 지역화를 시작합니다.\n" "\n" -"SETLOCAL이후의 바뀐 환경 변수는 패치 파일안에서만 적용됩니다. 그리고\n" -"다음 ENDLOCAL이 나올 때까지만 보존되고(아니면 파일의 끝이든지,\n" -"어느 똑이든 먼저 오는 지점이),이전의 환경 설정이 복원되는 지정입니다.\n" +"SETLOCAL 이후의 환경 변경은 배치파일 안에서 지역화됩니다. 그리고 다음\n" +"ENDLOCAL이 나타날 때까지 유지됩니다(또는 파일의 끝. 어느 것이던지 먼저\n" +"나오는 것). 그 지점에서 이전 환경 설정이 복원됩니다.\n" #: cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <디렉토리 이름> 은 현재 디렉토리를 스택에 저장한다.\n" -"그리고 현재 디렉토리를 요청한 디렉토리로 바꾼다.\n" +"PUSHD <디렉터리> 는 현재 디렉터리를 스택에 저장합니다.\n" +"그리고 현재 디렉터리를 요청한 디렉터리로 바꿉니다.\n" #: cmd.rc:278 msgid "POPD changes current directory to the last one saved with PUSHD.\n" -msgstr "POPD는 현재 디렉토리를 PUSH로 마지막으로 저장했던 것으로 바꿉니다.\n" +msgstr "POPD는 현재 디렉터리를 PUSH로 저장했던 마지막 디렉터리로 바꿉니다.\n" #: cmd.rc:288 -#, fuzzy -#| msgid "" -#| "ASSOC shows or modifies file extension associations.\n" -#| "\n" -#| "Syntax: ASSOC [.ext[=[fileType]]]\n" -#| "\n" -#| "ASSOC without parameters displays current file associations.\n" -#| "If used with only a file extension, displays the current association.\n" -#| "Specifying no file type after the equal sign removes the current " -#| "association, if any.\n" msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -10873,28 +10669,15 @@ msgid "" "Specifying no file type after the equal sign removes the current\n" "association, if any.\n" msgstr "" -"ASSOC는 파일 확장자 연결을 보여주거나 고칩니다.\n" +"ASSOC는 파일 확장자 연결을 표시하거나 수정합니다.\n" "\n" -"형식:ASSOC[.파일확장자[=[파일종류]]]\n" +"구문: ASSOC [.확장자[=[파일 유형]]]\n" "\n" -"매개변수가 없으면, 현재 파일 연결을 보여줍니다\n" -"만약 파일 확장자만 사용된다면, 현재 연결 상태를 보여줍니다.\n" -"등호(=) 다음에 파일 종류가 지정되지 않으면 현재 연결상태에 가능한 것을 제거합" -"니다.\n" +"매개변수 없는 ASSOC는 현재 파일 연결을 표시합니다\n" +"만약 파일 확장자만 사용된다면, 현재 연결 상태를 표시합니다.\n" +"등호(=) 부호 다음에 파일 유형이 지정되지 않으면 현재 연결을 제거합니다.\n" #: cmd.rc:300 -#, fuzzy -#| msgid "" -#| "FTYPE shows or modifies open commands associated with file types.\n" -#| "\n" -#| "Syntax: FTYPE [fileType[=[openCommand]]]\n" -#| "\n" -#| "Without parameters, shows the file types for which open command strings " -#| "are currently defined.\n" -#| "If used with only a file type, displays the associated open command " -#| "string, if any.\n" -#| "Specifying no open command after the equal sign removes the command " -#| "string associated to the specified file type.\n" msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -10907,35 +10690,29 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE은 파일 형식과 관련한 열기 명령을 보여주거나 고침\n" +"FTYPE은 파일 형식과 관련한 열기 명령을 표시하거나 수정합니다.\n" "\n" -"형식:FTYPE[파일형식[=[열기명령]]]\n" +"구문: FTYPE [파일형식[=[열기명령]]]\n" "\n" -"매개변수가 없으면, 열기 명령 문자열에 현재 정의된 파일 형식을 보여 줍니다\n" -"만약 파일 형식만 사용된다면, 열기 명령 문자열에 연결된 것을 보여줍니다,가능" -"한 것을.\n" -"등호(=) 다음에 열기 명령이 지정되지 않으면 지정된 파일 형식에 연결된 명령어 " -"문자열을 제거 합니다.\n" +"매개변수가 없으면, 현재 정의된 열기 명령 문자열을 가진 파일 형식을 표시합니" +"다.\n" +"만약 파일 형식만 사용한다면, 연결된 열기 명령 문자열을 표시합니다.\n" +"등호(=) 부호 다음에 열기 명령이 지정되지 않으면 지정된 파일 형식에 연결된\n" +"명령어 문자열을 제거합니다.\n" #: cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" -msgstr "" -"MORE는 파일 출력을 보여주거나 페이지의 파이프로도 된 입력을 보여준다.\n" +msgstr "MORE는 파일 또는 파이프 입력의 출력의 한 화면씩 표시합니다.\n" #: cmd.rc:308 -#, fuzzy -#| msgid "" -#| "CHOICE displays a text and waits, until the User\n" -#| "presses an allowed Key from a selectable list.\n" -#| "CHOICE is mainly used to build a menu selection in a batch file.\n" msgid "" "CHOICE displays a text and waits, until the User presses an allowed Key\n" "from a selectable list.\n" "CHOICE is mainly used to build a menu selection in a batch file.\n" msgstr "" -"CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서\n" -"허용하는 키를 누를 때까지 기다립니다.\n" -"CHOICE는 주로 배치 파일에서 메뉴 선택을 넣는 데 사용됩니다.\n" +"CHOICE는 텍스트를 표시하고, 사용자가 선책 가능한 목록에서 허용하는 키를\n" +"누를 때까지 기다립니다.\n" +"CHOICE는 주로 배치 파일에서 메뉴 선택을 구성하는 데 사용합니다.\n" #: cmd.rc:324 msgid "" @@ -10950,6 +10727,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"심볼릭 링크를 생성합니다.\n" +"\n" +"구문: MKLINK [options] 링크_이름 대상\n" +"\n" +"옵션:\n" +"/d 디렉터리 심볼릭 링크를 생성합니다.\n" +"/h 하드 링크를 생성합니다.\n" +"/j 디렉터리 교차점을 생성합니다.\n" +"'링크_이름'은 새 심볼릭 링크의 이름입니다.\n" +"'대상'은 '링크_이름'이 가리키는 경로입니다.\n" #: cmd.rc:312 msgid "" @@ -11004,42 +10791,42 @@ msgstr "" "CMD 내부 명령들:\n" "ASSOC\t\t파일 확장명 연결을 보여주거나 고치기\n" "ATTRIB\t\t도스 파일 속성 보여주거나 바꾸기\n" -"CALL\t\tI배치 파일 안에서 다른 파일 불러오기\n" -"CD (CHDIR)\t현재 기본 디렉토리 바꾸기\n" +"CALL\t\t배치 파일 안에서 다른 파일 불러오기\n" +"CD (CHDIR)\t현재 기본 디렉터리 바꾸기\n" "CHOICE\t\t선택가능한 목록에서 키를 선택할 때까지 기다림\n" "CLS\t\t콘솔 화면 깨끗하게 하기\n" "COPY\t\t파일 복사\n" "CTTY\t\t입/출력 장치 바꾸기\n" "DATE\t\t시스템 날짜 보여주거나 바꾸기\n" -"DEL (ERASE)\t하나의 파일이나 여러 파일을 지우기\n" -"DIR\t\t디렉토리 내용 보여주기\n" +"DEL (ERASE)\t하나의 파일이나 여러 파일을 삭제\n" +"DIR\t\t디렉터리 내용 보여주기\n" "ECHO\t\t문자를 바로 화면 출력으로 복사\n" "ENDLOCAL\t배치파일에서 환경변수의 지역화의 끝을 알려줌\n" "FTYPE\t\t파일 형식과 관련된 열기 명령어를 표시 또는 고치기\n" "HELP\t\t 목차의 짤막한 도움말 항목 보여줌\n" -"MD (MKDIR)\t하위 디렉토리 만들기\n" +"MD (MKDIR)\t하위 디렉터리 만들기\n" "MKLINK\t상징 연결 만들기\n" "MORE\t\t페이지 출력 보여주기\n" -"MOVE\t\t파일 이나 여러 파일,그리고 디렉토리 구조 이동\n" +"MOVE\t\t파일 이나 여러 파일,그리고 디렉터리 구조 이동\n" "PATH\t\t탐색 경로 보여주거나 설정하기\n" "PAUSE\t\t배치 파일에서 실행을 정지시킴\n" -"POPD\t\tPUSHD로 마지막으로 저장했던 디렉토리로 돌아가기\n" +"POPD\t\tPUSHD로 마지막으로 저장했던 디렉터리로 돌아가기\n" "PROMPT\t\t명령줄 해석기 바꾸기\n" -"PUSHD\t\t현재 디렉토리를 저장하고, 새 디렉토리로 바꾸기\n" +"PUSHD\t\t현재 디렉터리를 저장하고, 새 디렉터리로 바꾸기\n" "REN (RENAME)\t파일 이름 바꾸기\n" -"RD (RMDIR)\t하위 디렉토리 지우기\n" +"RD (RMDIR)\t하위 디렉터리 삭제\n" "SET\t\t환경 변수 보여주거나 바꾸기\n" "SETLOCAL\t배치 파일에서 환경변수의 지역화 시작을 알려줌\n" -"START\t\t풀그림을 실행시키거나,연결된 풀그림으로 문서 열기\n" +"START\t\t프로그램을 실행시키거나,연결된 프로그램으로 문서 열기\n" "TIME\t\t시스템 날짜 바꾸거나 보여주기\n" "TITLE\t\tCMD 세션의 창 제목 설정\n" "TYPE\t\t텍스트 파일의 내용 보여주기\n" -"VER\t\tCMD 현재 버젼 보여주기\n" -"VOL\t\t디스크 장치의 불륨 라벨 보여주기\n" -"XCOPY\t\t원본 파일이나 디렉토리 구조를 대상으로 복사함\n" +"VER\t\tCMD 현재 버전 보여주기\n" +"VOL\t\t디스크 장치의 불륨 레이블 보여주기\n" +"XCOPY\t\t원본 파일이나 디렉터리 구조를 대상으로 복사함\n" "EXIT\t\tCMD 닫기\n" "\n" -"HELP <명령>을 치면 그 명령의 상세한 정보를 보여줍니다.\n" +"HELP <명령>을 치면 그 명령의 상세한 정보를 표시합니다.\n" #: cmd.rc:365 msgid "Are you sure?" @@ -11057,7 +10844,7 @@ msgstr "아니오" #: cmd.rc:368 msgid "File association missing for extension %1\n" -msgstr "이 파일확장자 %1에 연결된 풀그림이 없습니다\n" +msgstr "이 파일확장자 %1에 연결된 프로그램이 없습니다\n" #: cmd.rc:369 msgid "No open command associated with file type '%1'\n" @@ -11109,7 +10896,7 @@ msgstr "새 시간 입력: " #: cmd.rc:383 msgid "Environment variable %1 not defined\n" -msgstr "환경 변수 %1 는 정의되지 않았습니다\n" +msgstr "환경 변수 %1은(는) 정의되지 않았습니다\n" #: cmd.rc:384 xcopy.rc:41 msgid "Failed to open '%1'\n" @@ -11117,12 +10904,12 @@ msgstr "'%1' 열기 실패\n" #: cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "배치 스크립트 밖의 배치 라벨은 불러올수 없습니다\n" +msgstr "배치 스크립트 밖의 배치 레이블은 불러올 수 없습니다\n" #: cmd.rc:386 xcopy.rc:45 msgctxt "All key" msgid "A" -msgstr "모두" +msgstr "A" #: cmd.rc:387 msgid "Delete %1?" @@ -11154,7 +10941,7 @@ msgstr "" #: cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "볼륨 라벨 (11 글자, ENTER는 없음과 같음)?" +msgstr "볼륨 레이블 (11 글자, ENTER는 없음과 같음)?" #: cmd.rc:394 msgid "PATH not found\n" @@ -11178,40 +10965,41 @@ msgstr "더? " #: cmd.rc:399 msgid "The input line is too long.\n" -msgstr "이 출력 줄은 너무 깁니다.\n" +msgstr "입력 라인이 너무 깁니다.\n" #: cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "드라이브 %1!c!의 볼륨은 %2임\n" +msgstr "드라이브 %1!c!의 볼륨은 %2입니다\n" #: cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" -msgstr "드라이브 %1!c!는 라벨을 가지고 있지 않습니다.\n" +msgstr "드라이브 %1!c!는 레이블을 가지고 있지 않습니다.\n" #: cmd.rc:402 reg.rc:49 msgid " (Yes|No)" -msgstr "(예(Y)|아니오(N))" +msgstr " (예|아니오)" #: cmd.rc:403 msgid " (Yes|No|All)" -msgstr "(예(Y)|아니오(N)|모두(A))" +msgstr " (예|아니오|모두)" #: cmd.rc:404 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "'%1'을 내부나 외부 명령어,나 배치 스크립트로 인식할 수 없습니다.\n" +msgstr "" +"'%1'을(를) 내부, 외부 명령어, 또는 배치 스크립트로 인식할 수 없습니다.\n" #: cmd.rc:405 msgid "Division by zero error.\n" -msgstr "0으로 나눈 오류가 발생했습니다.\n" +msgstr "0으로 나누기 오류가 발생했습니다.\n" #: cmd.rc:406 msgid "Expected an operand.\n" -msgstr "피연산자가 요구됩니다.\n" +msgstr "피연산자가 필요합니다.\n" #: cmd.rc:407 msgid "Expected an operator.\n" -msgstr "연산자가 요구됩니다.\n" +msgstr "연산자가 필요합니다.\n" #: cmd.rc:408 msgid "Mismatch in parentheses.\n" @@ -11227,7 +11015,7 @@ msgstr "" #: dxdiag.rc:30 msgid "DirectX Diagnostic Tool" -msgstr "다이렉트엑스 진단 도구" +msgstr "DirectX 진단 도구" #: dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" @@ -11254,17 +11042,15 @@ msgid "Error: Invalid option '%c'.\n" msgstr "오류: 올바르지 않은 옵션 '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "오류: 프로세스 \"%1\"를 찾을 수 없습니다.\n" +msgstr "오류: 호스트네임 %u을(를) 얻을 수 없습니다.\n" #: hostname.rc:33 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" -"오류: hostname유틸리티를 사용해서 시스템 호스트이름을 설정할 수 없습니다.\n" +"오류: hostname 유틸리티를 사용해서 시스템 호스트네임을 설정할 수 없습니다.\n" #: ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" @@ -11272,7 +11058,7 @@ msgstr "사용법: ipconfig [ /? | /all ]\n" #: ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "오류: 알수 없거나 올바르지 않은 명령어 라인 매개변수가 지정됨\n" +msgstr "오류: 없거나 올바르지 않은 명령어 라인 매개변수가 지정됨\n" #: ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -11369,7 +11155,7 @@ msgstr "" "\n" "NET START [서비스]\n" "\n" -"'서비스'가 생략하는 경우 실행 중인 서비스 목록을 표시합니다. 그렇지 않으면 " +"'서비스'가 생략하는 경우 실행 중인 서비스 목록을 표시합니다. 그렇지 않으면 " "'서비스'는 시작할 서비스의 이름입니다.\n" #: net.rc:32 @@ -11388,11 +11174,11 @@ msgstr "" #: net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "종속된 서비스 정지중: %1\n" +msgstr "종속된 서비스 중지 중: %1\n" #: net.rc:34 msgid "Could not stop service %1\n" -msgstr "%1 서비스를 정지할 수 없음\n" +msgstr "%1 서비스를 중지할 수 없음\n" #: net.rc:35 msgid "Could not get handle to service control manager.\n" @@ -11522,7 +11308,7 @@ msgstr "오류" #: netstat.rc:43 msgid "Unknown protocols" -msgstr "알 수 없는 프로토콜" +msgstr " 없는 프로토콜" #: netstat.rc:44 msgid "TCP Statistics for IPv4" @@ -11627,7 +11413,7 @@ msgstr "붙여넣기(&P)\tCtrl+V" #: notepad.rc:47 progman.rc:37 regedit.rc:56 regedit.rc:109 regedit.rc:136 #: winefile.rc:32 msgid "&Delete\tDel" -msgstr "지우기(&D)\tDel" +msgstr "삭제(&D)\tDel" #: notepad.rc:49 msgid "Select &all\tCtrl+A" @@ -11647,7 +11433,7 @@ msgstr "찾기(&S)...\tCtrl+F" #: notepad.rc:57 msgid "&Search next\tF3" -msgstr "다음 찾기(&N)\tF3" +msgstr "다음 찾기(&S)\tF3" #: notepad.rc:58 wordpad.rc:55 msgid "&Replace...\tCtrl+H" @@ -11754,7 +11540,7 @@ msgstr "메모장" #: notepad.rc:72 progman.rc:64 winhlp32.rc:82 msgid "ERROR" -msgstr "오류!!" +msgstr "오류" #: notepad.rc:74 msgid "Untitled" @@ -11780,13 +11566,13 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"%s 파일 내용이 변경되었습니다.\n" +"'%s' 파일이 변경되었습니다.\n" "\n" "변경 내용을 저장하시겠습니까?" #: notepad.rc:83 msgid "'%s' could not be found." -msgstr "%s 문자열을 찾을 수 없습니다." +msgstr "'%s' 문자열을 찾을 수 없습니다." #: notepad.rc:85 msgid "Unicode (UTF-16)" @@ -11794,7 +11580,7 @@ msgstr "유니코드 (UTF-16)" #: notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "유니코드 (UTF-16 빅-엔디언)" +msgstr "유니코드 (UTF-16 BE)" #: notepad.rc:87 msgid "Unicode (UTF-8)" @@ -11812,7 +11598,7 @@ msgstr "" "%1\n" "유니코드 문자를 포함하고 있는 이 파일은 만약 당신이 %2 인코딩으로\n" "파일을 저장하면 문자의 손실이 있을 것입니다.\n" -"이 문자를 보존하려면 취소를 클릭하고, 인코딩 드롭다운목록의 유니코드\n" +"이 문자를 보존하려면 [취소]를 클릭하고, 인코딩 드롭다운목록의 유니코드\n" "옵션 중의 하나를 선택하십시오t.\n" "계속하시겠습니까?" @@ -11822,7 +11608,7 @@ msgstr "파일에 연결(&B)..." #: oleview.rc:33 msgid "&View TypeLib..." -msgstr "타입 자료관 보기(&V)..." +msgstr "TypeLib 보기(&V)..." #: oleview.rc:35 msgid "&System Configuration" @@ -11862,7 +11648,7 @@ msgstr "인스턴스 만들기(&I)" #: oleview.rc:53 msgid "Create Instance &On..." -msgstr "인스턴트 온 만들기..." +msgstr "인스턴트 온 만들기(&O)..." #: oleview.rc:54 msgid "&Release Instance" @@ -11890,7 +11676,7 @@ msgstr "도구바(&T)" #: oleview.rc:68 oleview.rc:90 winefile.rc:67 wordpad.rc:74 wordpad.rc:275 msgid "&Status Bar" -msgstr "상태바(&S)" +msgstr "상태 표시줄(&S)" #: oleview.rc:70 regedit.rc:70 winefile.rc:79 msgid "&Refresh\tF5" @@ -11986,7 +11772,7 @@ msgstr "OleView - OLE/COM 객체 뷰어" #: oleview.rc:102 msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib 파일들 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib 파일 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" #: oleview.rc:105 msgid "Bind to file via a File Moniker" @@ -11994,7 +11780,7 @@ msgstr "파일 별명으로 파일 연결" #: oleview.rc:106 msgid "Open a TypeLib file and view the contents" -msgstr "타입 자료관 파일을 열고 내용 보기" +msgstr "TypeLib 파일 열고 내용 보기" #: oleview.rc:107 msgid "Change machine wide Distributed COM settings" @@ -12006,7 +11792,7 @@ msgstr "Wine 레지스트리 편집기 실행" #: oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "바뀐 것을 저장할지 물어보고 풀그림 끝내기" +msgstr "바뀐 것을 저장할지 물어보고 프로그램 끝내기" #: oleview.rc:110 msgid "Create an instance of the selected object" @@ -12039,11 +11825,11 @@ msgstr "컴포넌트 목록 보기(보이지 않더라도)" #: oleview.rc:121 msgid "Show or hide the toolbar" -msgstr "도구바 보기/숨기기" +msgstr "도구 모음 보기/숨기기" #: oleview.rc:122 msgid "Show or hide the status bar" -msgstr "상태바 보기/숨기기" +msgstr "상태 표시줄 보기/숨기기" #: oleview.rc:123 msgid "Refresh all lists" @@ -12051,15 +11837,15 @@ msgstr "모든 목록 새로 고침" #: oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "풀그림 정보, 버젼, 저작권 보여주기" +msgstr "프로그램 정보, 버전, 저작권 보여주기" #: oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "CoGetClassObject을 호출 할때 인-프로세스 서버에 묻기" +msgstr "CoGetClassObject을 호출할 때 인-프로세스 서버에 묻기" #: oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "CoGetClassObject을 호출 할때 인-프로세스 핸들러에 묻기" +msgstr "CoGetClassObject을 호출할 때 인-프로세스 핸들러에 묻기" #: oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" @@ -12083,7 +11869,7 @@ msgstr "OLE 1.0 객체" #: oleview.rc:133 msgid "COM Library Objects" -msgstr "COM 자료관 객체" +msgstr "COM 라이브러리 객체" #: oleview.rc:134 msgid "All Objects" @@ -12091,15 +11877,15 @@ msgstr "모든 객체" #: oleview.rc:135 msgid "Application IDs" -msgstr "응용풀그림 IDs" +msgstr "응용프로그램 IDs" #: oleview.rc:136 msgid "Type Libraries" -msgstr "타입 자료관" +msgstr "라이브러리 형식" #: oleview.rc:137 msgid "ver." -msgstr "버젼." +msgstr "버전." #: oleview.rc:138 msgid "Interfaces" @@ -12123,7 +11909,7 @@ msgstr "CoGetClassObject 실패." #: oleview.rc:145 msgid "Unknown error" -msgstr "알수 없는 오류" +msgstr " 없는 오류" #: oleview.rc:148 msgid "bytes" @@ -12191,7 +11977,7 @@ msgstr "실행시 최소화(&M)" #: progman.rc:47 winefile.rc:70 msgid "&Save settings on exit" -msgstr "나갈때 설정 저장(&S)" +msgstr "끝내면서 설정 저장(&S)" #: progman.rc:49 taskmgr.rc:78 taskmgr.rc:255 msgid "&Windows" @@ -12211,23 +11997,23 @@ msgstr "아이콘 정렬(&A)" #: progman.rc:57 msgid "&About Program Manager" -msgstr "풀그림 관리자 정보(&A)" +msgstr "프로그램 관리자 정보(&A)" #: progman.rc:103 msgid "Program &group" -msgstr "풀그림 그룹(&G)" +msgstr "프로그램 그룹(&G)" #: progman.rc:105 msgid "&Program" -msgstr "풀그림(&P)" +msgstr "프로그램(&P)" #: progman.rc:116 msgid "Move Program" -msgstr "풀그림 이동" +msgstr "프로그램 이동" #: progman.rc:118 msgid "Move program:" -msgstr "풀그림 이동:" +msgstr "프로그램 이동:" #: progman.rc:120 progman.rc:138 msgid "From group:" @@ -12239,15 +12025,15 @@ msgstr "목적 그룹(&T):" #: progman.rc:134 msgid "Copy Program" -msgstr "풀그림 복사" +msgstr "프로그램 복사" #: progman.rc:136 msgid "Copy program:" -msgstr "풀그림 복사:" +msgstr "프로그램 복사:" #: progman.rc:152 msgid "Program Group Attributes" -msgstr "풀그림 그룹 속성" +msgstr "프로그램 그룹 속성" #: progman.rc:156 msgid "&Group file:" @@ -12255,7 +12041,7 @@ msgstr "그룹 파일(&G):" #: progman.rc:168 msgid "Program Attributes" -msgstr "풀그림 속성" +msgstr "프로그램 속성" #: progman.rc:172 progman.rc:212 msgid "&Command line:" @@ -12263,7 +12049,7 @@ msgstr "명령 라인(&C):" #: progman.rc:174 msgid "&Working directory:" -msgstr "작업 디렉토리(&W):" +msgstr "작업 디렉터리(&W):" #: progman.rc:176 msgid "&Key combination:" @@ -12291,11 +12077,11 @@ msgstr "현재 아이콘(&I):" #: progman.rc:210 msgid "Execute Program" -msgstr "풀그림 실행" +msgstr "프로그램 실행" #: progman.rc:63 msgid "Program Manager" -msgstr "풀그림 관리자" +msgstr "프로그램 관리자" #: progman.rc:65 winhlp32.rc:83 msgid "WARNING" @@ -12311,7 +12097,7 @@ msgstr "그룹 `%s'을 지우겠습니까?" #: progman.rc:69 msgid "Delete program `%s'?" -msgstr "풀그림 `%s'을 지우겠습니까?" +msgstr "프로그램 `%s'을 지우겠습니까?" #: progman.rc:70 msgid "Not implemented" @@ -12339,20 +12125,19 @@ msgstr "도움말은 가능하지않습니다." #: progman.rc:78 msgid "Unknown feature in %s" -msgstr "%s의 알수 없는 특징" +msgstr "%s의 없는 특징" #: progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "파일 %s' 는 존재하므로, 덮어 쓸 수 없습니다." +msgstr "파일 '%s'이(가) 존재합니다. 덮어 쓸 수 없습니다." #: progman.rc:80 msgid "Save group as `%s to prevent overwriting original files." -msgstr "" -"`%s를 다른 이름으로 저장해야 원래 파일을 덮어 쓰는 걸 막을 수 있습니다." +msgstr "Save group as `%s to prevent overwriting original files." #: progman.rc:84 msgid "Libraries (*.dll)" -msgstr "자료관 파일(*.dll)" +msgstr "라이브러리 (*.dll)" #: progman.rc:85 msgid "Icon files" @@ -12404,134 +12189,131 @@ msgstr "작업이 성공적으로 끝났습니다\n" #: reg.rc:40 msgid "reg: Invalid key name\n" -msgstr "레지스트리: 올바르지 않은 키 이름\n" +msgstr "reg: 키 이름이 잘못되었습니다\n" #: reg.rc:41 msgid "reg: Invalid command line parameters\n" -msgstr "레지스트리: 올바르지 않은 명령라인 매개변수\n" +msgstr "reg: 명령줄 매개변수가 올바르지 않습니다\n" #: reg.rc:42 msgid "reg: Unable to access remote machine\n" -msgstr "레지스트리: 가상 전산기에 접근할 수 없습니다.\n" +msgstr "reg: 원격 컴퓨터에 액세스할 수 없습니다\n" #: reg.rc:43 msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "" -"레지스트리: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다.\n" +msgstr "reg: 시스템에서 지정된 레지스트리 키 또는 값을 찾을 수 없습니다\n" #: reg.rc:44 msgid "reg: Unsupported registry data type [%1]\n" -msgstr "레지스트리: [%1](은)는 지원하지 않는 형식입니다.\n" +msgstr "reg : 지원되지 않는 레지스트리 데이터 유형 [% 1]\n" #: reg.rc:45 msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "레지스트리: 변수 [/d]는 반드시 유효한 정수 값이 따라와야 합니다.\n" +msgstr "reg : 옵션 [/ d] 다음에 유효한 정수가 있어야 합니다.\n" #: reg.rc:46 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "레지스트리: 변수 [/d]는 반드시 유효한 16진수 값이 따라와야 합니다.\n" +msgstr "reg : 옵션 [/ d] 다음에 유효한 16 진수 값이 있어야 합니다.\n" #: reg.rc:47 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "레지스트리: 참조되지 않은 레지스트리 정보 형태 [/t 0x%1!x!, /d %2]\n" +msgstr "reg: 처리되지 않는 레지스트리 데이터 유형 [/t 0x%1!x!, /d %2]\n" #: reg.rc:48 msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "레지스트리 값 '%1'(이)가 이미 있습니다. 덮어 쓰시겠습니까?" +msgstr "레지스트리 값 '%1'(이)가 이미 존재합니다. 덮어 쓰시겠습니까?" #: reg.rc:52 msgid "The registry operation was cancelled\n" -msgstr "레지스트리 명령이 취소되었습니다.\n" +msgstr "레지스트리 작업이 취소되었습니다.\n" #: reg.rc:53 regedit.rc:239 msgid "(Default)" msgstr "(기본)" #: reg.rc:54 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "이 값들을 정말로 지우겠습니까?" +msgstr "레지스트리 값 '%1'을(를) 삭제하시겠습니까?" #: reg.rc:55 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "정말로 '%s' 안에 있는 모든 레지스트리 값을 지우겠습니까?" +msgstr "'%1'의 모든 레지스트리 값을 삭제하시겠습니까?" #: reg.rc:56 msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "정말로 레지스트리 키 '%1'(을)를 지우시겠습니까?" +msgstr "레지스트리 키 '%1'을 삭제하시겠습니까?" #: reg.rc:57 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "레지스트리: [/d] 변수에는 반드시 유효한 문자열이 따라와야 합니다.\n" +msgstr "reg : 옵션 [/ d] 다음에 유효한 문자열이 있어야 합니다.\n" #: reg.rc:58 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" -"레지스트리: '%1' 안에 있는 모든 레지스트리 값을 삭제할 수 없습니다. 알 수 없" -"는 오류가 발생했습니다.\n" +"reg: '%1'의 모든 레지스트리 값을 삭제할 수 없습니다. 예기치 않은 오류가 발생" +"했습니다.\n" #: reg.rc:59 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"레지스트리: 명령을 완료할 수 없습니다. 알 수 없는 오류가 발생했습니다.\n" +"reg: 지정된 작업을 완료할 수 없습니다. 예기치 않은 오류가 발생했습니다.\n" #: 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. " -msgstr "레지스트리: 올바르지 않은 구문" +msgstr "reg: 올바르지 않은 구문. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "레지스트리: 올바르지 않은 변수 [%1]." +msgstr "reg: 올바르지 않은 옵션 [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "\"REG /?\"를 입력해 도움말을 볼 수 있습니다.\n" +msgstr "도움말을 보려면 \"REG /?\"를 입력하십시오.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "\"REG %1 /?\"를 입력해 도움말을 볼 수 있습니다.\n" +msgstr "도움말을 보려면 \"REG %1 /?\"를 입력하십시오.\n" #: reg.rc:65 regedit.rc:240 msgid "(value not set)" -msgstr "(값이 정해지지 않음)" +msgstr "(값이 설정되지 않음)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "REG IMPORT 파일.reg\n" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 msgid "reg: The file '%1' was not found.\n" -msgstr "레지스트리: 파일 '%1'(을)를 찾을 수 없습니다.\n" +msgstr "reg: 파일 '%1'을(를) 찾을 수 없습니다.\n" #: reg.rc:68 msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "레지스트리: 키 '%1'(을)를 열 수 없습니다.\n" +msgstr "레지스트리 키 '%1'을(를) 열 수 없습니다.\n" #: reg.rc:69 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "레지스트리: 알 수 없는 제어 문자 [\\%1!c!]\n" +msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: reg.rc:70 msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY 키_이름.reg [/y]\n" +msgstr "REG EXPORT key_name file.reg [/y]\n" #: reg.rc:71 msgid "reg: Invalid system key [%1]\n" -msgstr "레지스트리: 올바르지 않은 키 [%1]\n" +msgstr "reg: 올바르지 않은 시스템 키 [%1]\n" #: reg.rc:72 msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "'%1'(은)는 이미 존재합니다. 덮어 쓰시겠습니까?" +msgstr "'%1' 파일이 이미 존재합니다. 덮어쓰시겠습니까?" #: regedit.rc:34 msgid "&Registry" @@ -12583,7 +12365,7 @@ msgstr "찾기(&F)...\tCtrl+F" #: regedit.rc:62 msgid "Find Ne&xt\tF3" -msgstr "다음 찾기(&x)\tF3" +msgstr "다음 찾기(&X)\tF3" #: regedit.rc:66 msgid "Status &Bar" @@ -12744,7 +12526,7 @@ msgstr "(값을 보여 줄수 없음)" #: regedit.rc:242 msgid "(unknown %d)" -msgstr "(알 수 없는 %d)" +msgstr "( 없는 %d)" #: regedit.rc:247 msgid "Unable to modify the selected registry value." @@ -12825,11 +12607,35 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"사용법:\n" +" regedit [옵션] [filename] [reg_key]\n" +"\n" +"옵션:\n" +" [no option] 이 프로그램의 GUI 버전을 실행합니다.\n" +" /L:system.dat 수정할 system.dat 파일의 위치입니다.\n" +" Compatible with any other switch. Ignored.\n" +" /R:user.dat 수정할 user.dat 파일의 위치입니다.\n" +" Compatible with any other switch. Ignored.\n" +" /C 레지스트리 파일의 내용을 가져옵니다.\n" +" /D 지정된 레지스트리 키를 삭제합니다.\n" +" /E 지정된 레지스트리 키의 내용을 파일로 내보냅니다.\n" +" 키가 지정되지 않은 경우 전체 레지스트리를 내보냅니다.\n" +" /S 메시지가 표시되지 않습니다.\n" +" /V GUI를 고급 모드로 실행합니다. Ignored. \n" +" /? 이 정보를 표시하고 종료합니다.\n" +" [filename] 가져올 레지스트리 정보가 들어 있는 파일의 위치입니다.\n" +" [/E]와 함께 사용할 때, 이 옵션은 레지스트리 정보를 내보낼\n" +" 파일 위치를 지정합니다.\n" +" [reg_key] 수정할 레지스트리 키입니다.\n" +"\n" +"사용 예:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"레지스트리 편집기: [%1](은)는 유효하지 않은 또는 알 수 없는 여닫개 입니다.\n" +msgstr "레지스트리 편집기: [%1](은)는 유효하지 않은 또는 없는 스위치입니다.\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -12868,12 +12674,12 @@ msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" -"레지스트리 편집기: 16진수 값을 변환 할 수 없습니다. '%1'(이)가 올바르지 않습" -"니다.\n" +"레지스트리 편집기: 16진수 값을 변환할 수 없습니다. '%1'(이)가 올바르지 않습니" +"다.\n" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "레지스트리 편집기: [\\%1!c!](은)는 알 수 없는 제어 문자입니다.\n" +msgstr "레지스트리 편집기: [\\%1!c!](은)는 없는 제어 문자입니다.\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -12935,11 +12741,11 @@ msgstr "즐겨 찾기 목록에 키 더하기" #: regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "즐겨 찾기 목록에 키 지우기" +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" @@ -12951,7 +12757,7 @@ msgstr "창 다시 읽기" #: regedit.rc:193 msgid "Deletes the selection" -msgstr "이 섹션 지우기" +msgstr "이 섹션 삭제" #: regedit.rc:194 msgid "Renames the selection" @@ -13007,7 +12813,7 @@ 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'." @@ -13023,23 +12829,19 @@ msgstr "값이 너무 큽니다 (%1!u!)" #: regedit.rc:209 msgid "Confirm Value Delete" -msgstr "값 지우기 확인" +msgstr "값 삭제 확인" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "이 값들을 정말로 지우겠습니까?" +msgstr "선택한 레지스트리 값을 삭제하시겠습니까?" #: regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "검색 완료. '%1'(을)를 찾을 수 없습니다" +msgstr "검색이 완료되었습니다. '%1' 문자열을 찾을 수 없습니다." #: regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "이 값들을 정말로 지우겠습니까?" +msgstr "이 값을 지우시겠습니까?" #: regedit.rc:214 msgid "New Key #%d" @@ -13051,36 +12853,36 @@ 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" -msgstr "새 문자열 값 더하기" +msgstr "새 확장 가능한 문자열 값을 추가합니다" #: regedit.rc:212 msgid "Confirm Key Delete" -msgstr "값 지우기 확인" +msgstr "키 삭제 확인" #: regedit.rc:213 msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "이 레지스트리 값과 하위 값을 정말 모두 지우시겠습니까?" +msgstr "이 레지스트리 키와 모든 하위 키를 삭제하시겠습니까?" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "선택한 노드를 확장하거나 축소합니다." +msgstr "선택한 노드를 확장하거나 축소" #: regedit.rc:231 msgid "Collapse" @@ -13093,9 +12895,9 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" -"와인 동적 연결 자료관 등록 도구\n" +"와인 DLL 등록 도구\n" "\n" -"동적 연결 자료관 서비스를 제공합니다.\n" +"DLL 등록 서비스를 제공합니다.\n" "\n" #: regsvr32.rc:40 @@ -13112,13 +12914,13 @@ msgid "" "\n" msgstr "" "문법:\n" -" regsvr32 [/u] [/s] [/n] [/i[:명령줄]] 동적 연결 자료관 이름\n" +" regsvr32 [/u] [/s] [/n] [/i[:명령줄]] DLL 이름\n" "\n" "변수:\n" " [/u] 서버 등록 취소.\n" " [/s] 조용히 (어떤 진행 상황도 표시되지 않음).\n" " [/i] DllInstall을 부르면, [명령줄]을 무시합니다.\n" -"\t[/u] 변수와 함께 쓰이면, 제거 무른모가 됍니다.\n" +"\t[/u] 변수와 함께 쓰이면, 제거 소프트웨어가 됍니다.\n" " [/n] DllRegisterServer를 부르지 마십시오. 이 변수는 반드시 [/i]와 함께 쓰" "여야 합니다.\n" "\n" @@ -13128,16 +12930,16 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: 유효하지 않거나 인식 불가능한 여닫개 [%1]\n" +"regsvr32: 유효하지 않거나 인식 불가능한 스위치 [%1]\n" "\n" #: regsvr32.rc:42 msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "regsvr32: 동적 연결 자료관 '%1' 열기 실패\n" +msgstr "regsvr32: '%1' 로드 실패\n" #: regsvr32.rc:43 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "regsvr32: '%2'에서 '%1!S!' 함수를 찾을 수 없습니다.\n" +msgstr "regsvr32: '%1!S!'이 '%2'에 구현되어 있지 않습니다\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" @@ -13177,7 +12979,7 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"풀그림을 실행할 수 없거나, 지정된 파일에 연결된 풀그림이 없습니다.\n" +"프로그램을 실행할 수 없거나, 지정된 파일에 연결된 프로그램이 없습니다.\n" "ShellExecuteEx 실패" #: start.rc:60 @@ -13190,7 +12992,7 @@ msgstr "사용법: taskkill [/?] [/f] [/im 프로세스이름 | /pid 프로세 #: taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "오류: 알수 없거나 올바르지 않은 명령라인 옵션이 지정되었습니다.\n" +msgstr "오류: 없거나 올바르지 않은 명령라인 옵션이 지정되었습니다.\n" #: taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" @@ -13202,21 +13004,22 @@ msgstr "오류: /im 니 /pid 옵션중의 하나는 반드시 지정되어야 #: taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "오류: 옵션 %1 는 하나의 명령어라인 매개변수가 올것으로 예상합니다.\n" +msgstr "" +"오류: 옵션 %1은(는) 하나의 명령어라인 매개변수가 올것으로 예상합니다.\n" #: taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "오류: /im 와 /pid 옵션은 같이 사용할 수 없습니다.\n" +msgstr "오류: 옵션 /im과 /pid는 함께 사용할 수 없습니다.\n" #: taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" -msgstr "PID %1!u! 의 프로세스의 최상위 창에 닫는 메세지 보냈습니다.\n" +msgstr "PID %1!u! 의 프로세스의 최상위 창에 닫는 메시지 보냈습니다.\n" #: taskkill.rc:37 msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"PID %2!u! 의 프로세스 \"%1\"의 최상위 창에 닫으라는 메세지를 보냈습니다.\n" +"PID %2!u! 의 프로세스 \"%1\"의 최상위 창에 닫으라는 메시지를 보냈습니다.\n" #: taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" @@ -13224,15 +13027,15 @@ msgstr "PID %1!u! 의 프로세스는 강제로 종료되었습니다.\n" #: taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "PID %2!u! 의 프로세스 \"%1\" 는 강제로 종료되엇습니다.\n" +msgstr "PID %2!u!인 프로세스 \"%1\"은(는) 강제로 종료되엇습니다.\n" #: taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "오류: 프로세스 \"%1\"를 찾을 수 없습니다.\n" +msgstr "오류: 프로세스 \"%1\"을(를) 찾을 수 없습니다.\n" #: taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "오류: 프로세스 목록을 열거 할 수 없습니다.\n" +msgstr "오류: 프로세스 목록을 열거할 수 없습니다.\n" #: taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" @@ -13248,7 +13051,7 @@ msgstr "새 작업(&N)( 실행...)" #: taskmgr.rc:39 msgid "E&xit Task Manager" -msgstr "작업 관리자 나가기(&x)" +msgstr "작업 관리자 나가기(&X)" #: taskmgr.rc:45 msgid "&Minimize On Use" @@ -13268,7 +13071,7 @@ msgstr "지금 새로 읽기(&R)" #: taskmgr.rc:55 msgid "&Update Speed" -msgstr "속도 업데이트(&U)" +msgstr "업데이트 속도(&U)" #: taskmgr.rc:57 taskmgr.rc:158 msgid "&High" @@ -13296,11 +13099,11 @@ msgstr "&CPU 기록" #: taskmgr.rc:71 taskmgr.rc:259 msgid "&One Graph, All CPUs" -msgstr "모든 CPU에 하나의 그래프" +msgstr "모든 CPU에 하나의 그래프(&O)" #: taskmgr.rc:73 taskmgr.rc:260 msgid "One Graph &Per CPU" -msgstr "각각의 CPU마마다 하나의 그래프 보여주기(&P)" +msgstr "CPU 당 하나의 그래프(&P)" #: taskmgr.rc:76 taskmgr.rc:261 msgid "&Show Kernel Times" @@ -13352,7 +13155,7 @@ msgstr "작업 트리 끝(&T)" #: taskmgr.rc:152 winedbg.rc:32 msgid "&Debug" -msgstr "디벌레(&D)" +msgstr "디버그(&D)" #: taskmgr.rc:154 msgid "Set &Priority" @@ -13376,7 +13179,7 @@ msgstr "선호도 설정(&A)..." #: taskmgr.rc:170 msgid "Edit Debug &Channels..." -msgstr "디벌레 채널 편집(&C)..." +msgstr "디버그 채널 편집(&C)..." #: taskmgr.rc:338 taskmgr.rc:180 taskmgr.rc:181 msgid "Task Manager" @@ -13460,7 +13263,7 @@ msgstr "메모리 사용 현황" #: taskmgr.rc:428 taskmgr.rc:327 msgid "Debug Channels" -msgstr "디벌레 채널" +msgstr "디버그 채널" #: taskmgr.rc:439 msgid "Processor Affinity" @@ -13623,7 +13426,7 @@ msgstr "&CPU 사용" #: taskmgr.rc:527 msgid "CPU Tim&e" -msgstr "CPU 시간(&e)" +msgstr "CPU 시간(&E)" #: taskmgr.rc:529 msgid "&Memory Usage" @@ -13635,7 +13438,7 @@ msgstr "메모리 사용 델타(&D)" #: taskmgr.rc:533 msgid "Pea&k Memory Usage" -msgstr "피크 메모리 사용(&k)" +msgstr "피크 메모리 사용(&K)" #: taskmgr.rc:535 msgid "Page &Faults" @@ -13663,7 +13466,7 @@ msgstr "사용자 이름(&N)" #: taskmgr.rc:547 msgid "Page F&aults Delta" -msgstr "페이지 실패 델타(&a)" +msgstr "페이지 실패 델타(&A)" #: taskmgr.rc:549 msgid "&Virtual Memory Size" @@ -13671,15 +13474,15 @@ msgstr "가상 메모리 크기(&V)" #: taskmgr.rc:551 msgid "Pa&ged Pool" -msgstr "페이지 풀(&g)" +msgstr "페이지된 풀(&G)" #: taskmgr.rc:553 msgid "N&on-paged Pool" -msgstr "비 페이지 풀(&o)" +msgstr "페이지되지 않은 풀(&O)" #: taskmgr.rc:555 msgid "Base P&riority" -msgstr "기본 우선권(&r)" +msgstr "기본 우선권(&R)" #: taskmgr.rc:557 msgid "&Handle Count" @@ -13715,7 +13518,7 @@ msgstr "새 작업 만들기" #: taskmgr.rc:187 msgid "Runs a new program" -msgstr "새 풀그림 실행" +msgstr "새 프로그램 실행" #: taskmgr.rc:188 msgid "Task Manager remains in front of all other windows unless minimized" @@ -13759,7 +13562,7 @@ msgstr "4초마다 디스플레이 새로 고침" #: taskmgr.rc:203 msgid "Does not automatically update" -msgstr "자동으로 업데이트 할 수 없습니다" +msgstr "자동으로 업데이트할 수 없습니다" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" @@ -13791,15 +13594,15 @@ msgstr "작엄 관리자 도움물 목차 보여주기" #: taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "풀그림 정보,버젼 그리고 저작권 보여주기" +msgstr "프로그램 정보,버전 그리고 저작권 보여주기" #: taskmgr.rc:213 msgid "Exits the Task Manager application" -msgstr "작업 관리자 풀그림 나가기" +msgstr "작업 관리자 프로그램 나가기" #: taskmgr.rc:215 msgid "Shows 16-bit tasks under the associated ntvdm.exe" -msgstr "ntvdm.exe 연결 밑의 16비트 작업 보여주기" +msgstr "NTVDM.EXE와 연관된 16비트 작업 표시" #: taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" @@ -13875,7 +13678,7 @@ msgstr "작업을 낮은 순위 클래스로 설정" #: taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "디벌레 채널 제어" +msgstr "디버그 채널 제어" #: taskmgr.rc:264 msgid "Performance" @@ -13998,16 +13801,16 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"경고: 프로세스를 디벌레 하는 것은 데이터의 손실을 가져올 수 있습니다.\n" +"경고: 프로세스를 디버그하는 것은 데이터의 손실을 가져올 수 있습니다.\n" "디버거를 사용하시겠습니까?" #: taskmgr.rc:314 msgid "Unable to Debug Process" -msgstr "프로세스를 디벌레 할 수 없습니다" +msgstr "프로세스를 디버그할 수 없습니다" #: taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "\t이 과정은 적어도 하나의 프로세서와 동질성이 있어야합니다" +msgstr "프로세스는 최소 하나 이상의 프로세서와 선호도를 가져야 합니다" #: taskmgr.rc:316 msgid "Invalid Option" @@ -14015,7 +13818,7 @@ msgstr "올바르지 않은 옵션" #: taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "접근할수 없거나 프로세스 동질성을 설정할수 없습니다" +msgstr "프로세스 선호도에 접근하거나 설정할 수 없습니다" #: taskmgr.rc:322 msgid "System Idle Process" @@ -14023,19 +13826,19 @@ msgstr "시스템 유휴 작업" #: taskmgr.rc:323 msgid "Not Responding" -msgstr "반응이 없음" +msgstr "반응 없음" #: taskmgr.rc:324 msgid "Running" -msgstr "실행중" +msgstr "실행 중" #: taskmgr.rc:325 msgid "Task" -msgstr "작" +msgstr "작업" #: uninstaller.rc:29 msgid "Wine Application Uninstaller" -msgstr "Wine 응용풀그림 제거하기" +msgstr "Wine 응용프로그램 제거기" #: uninstaller.rc:30 msgid "" @@ -14067,9 +13870,9 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" -"와인 응용 무른모 제거자\n" +"와인 응용 소프트웨어 제거자\n" "\n" -"현재 와인 선가상저장소에서 응용 무른모를 제거합니다.\n" +"현재 와인 선가상저장소에서 응용 소프트웨어를 제거합니다.\n" "\n" #: uninstaller.rc:43 @@ -14090,11 +13893,11 @@ msgstr "" "\n" "변수:\n" " --help\t 도움말을 출력합니다.\n" -" --list\t 이 선가상저장소에 설치된 모든 응용 무른모의 목록을 출력합니" +" --list\t 이 선가상저장소에 설치된 모든 응용 소프트웨어의 목록을 출력합니" "다.\n" -" --remove {전역 고유 식별자} 특정 응용 무른모를 제거합니다.\n" -"\t\t '--list'를 사용해 개별 응용 무른모의 전역 고유 식별자를 알아낼 수 있" -"습니다.\n" +" --remove {전역 고유 식별자} 특정 응용 소프트웨어를 제거합니다.\n" +"\t\t '--list'를 사용해 개별 응용 소프트웨어의 전역 고유 식별자를 알아낼 " +"수 있습니다.\n" " [설정 안함] 그림 사이틀을 엽니다.\n" "\n" @@ -14120,7 +13923,7 @@ msgstr "정규 메타파일 보기" #: wineboot.rc:31 msgid "Waiting for Program" -msgstr "풀그림 대기중" +msgstr "프로그램 대기중" #: wineboot.rc:35 msgid "Terminate Process" @@ -14133,17 +13936,17 @@ msgid "" "\n" "If you terminate the process you may lose all unsaved data." msgstr "" -"이 프로세스에 로그 오프나 종료를 시도했으나, 이 풀그림은 아무런 반응이 없습니" -"다.\n" +"이 프로세스에 로그 오프나 종료를 시도했으나, 이 프로그램은 아무런 반응이 없습" +"니다.\n" "\n" "만약 당신이 이 프로세스를 끝낸다면 저장 하지 않은 모든 데이터를 잃어버릴 것입" "니다." #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "" -"Wine 설정 %s 이 업데이트되는 중입니다, 잠시만 기다려주시기 바랍니다..." +msgstr "%s의 Wine 설정을 업데이트하고 있습니다. 잠시만 기다려주십시오..." +# 라이센스 문구는 번역하지 않습니다. #: winecfg.rc:141 msgid "" "This program is free software; you can redistribute it and/or modify it " @@ -14151,10 +13954,10 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"이 자료관는 자유 무른모입니다. 당신은 자유 무른모 재단(Free Software " -"Foundation)에서 만든 GNU LGPL(Lesser General Public License) 아래에서 이 풀그" -"림을 재배포 또는 수정할 수 있습니다. 라이센스의 버전은 2.1 또는 (선택적으로) " -"그 이후 버전을 따르면 됩니다." +"This program is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." #: winecfg.rc:143 msgid "Windows registration information" @@ -14166,11 +13969,11 @@ msgstr "소유자(&O):" #: winecfg.rc:146 msgid "Organi&zation:" -msgstr "단체(&Z):" +msgstr "조직(&Z):" #: winecfg.rc:154 msgid "Application settings" -msgstr "응용풀그림 설정" +msgstr "응용프로그램 설정" #: winecfg.rc:155 msgid "" @@ -14178,21 +13981,21 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine은 각 응용 풀그림에 대한 서로 다른 Windows 버전을 모방할 수 있습니다.이 " -"탭은 시스템 전체뿐만 아니라 해당 탭의 각각의 응용풀그림 설정을 변경할 수 있도" -"록 자료관 및 그래픽 탭에 연결되어 있습니다." +"Wine은 각각의 응용프로그램을 위해 다른 버전의 Windows를 흉내낼 수 있습니다. " +"이 탭은 라이브러리 및 그래픽 탭과 연계해서 시스템 전체 또는 응용프로그램별 설" +"정을 변경할 수 있습니다." #: winecfg.rc:159 msgid "Add appli&cation..." -msgstr "응용풀그림 추가(&C)..." +msgstr "응용프로그램 추가(&C)..." #: winecfg.rc:160 msgid "&Remove application" -msgstr "응용풀그림 제거(&R)" +msgstr "응용프로그램 제거(&R)" #: winecfg.rc:161 msgid "&Windows Version:" -msgstr "윈도우즈 버젼(&W):" +msgstr "윈도우즈 버전(&W):" #: winecfg.rc:169 msgid "Window settings" @@ -14224,11 +14027,11 @@ msgstr "화면 해상도" #: winecfg.rc:184 msgid "This is a sample text using 10 point Tahoma" -msgstr "10크기 타호마 글꼴 예시" +msgstr "10pt 글꼴을 사용한 텍스트 예시입니다" #: winecfg.rc:191 msgid "DLL overrides" -msgstr "DLL 덮어쓰기" +msgstr "DLL 재정의" #: winecfg.rc:192 msgid "" @@ -14236,48 +14039,48 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"동적 링크 자료관는 개별적으로 내장(Wine에 의해 제공)이나 네이티브(윈도우즈나 " -"풀그림에 의해 제공)으로 지정될수 있습니다." +"동적 링크 라이브러리는 개별적으로 내장(Wine이 제공)이나 네이티브(윈도우즈나 " +"응용프로그램이 제공)로 지정할 수 있습니다." #: winecfg.rc:194 msgid "&New override for library:" -msgstr "새로 덮어쓸 자료관(&N):" +msgstr "새 라이브러리 재정의(&N):" #: winecfg.rc:196 msgid "A&dd" -msgstr "더하기(&D)" +msgstr "추가(&D)" #: winecfg.rc:197 msgid "Existing &overrides:" -msgstr "현재 덮어쓰기 목록(&O):" +msgstr "현재 재정의 목록(&O):" #: winecfg.rc:199 msgid "&Edit..." -msgstr "고치기(&E)..." +msgstr "편집(&E)..." #: winecfg.rc:205 msgid "Edit Override" -msgstr "덮어쓰기 고치기" +msgstr "재정의 편집" #: winecfg.rc:208 msgid "Load order" -msgstr "불러오기 순서" +msgstr "로드 순서" #: winecfg.rc:209 msgid "&Builtin (Wine)" -msgstr "내장(&B)(Wine)" +msgstr "내장(&B) (Wine)" #: winecfg.rc:210 msgid "&Native (Windows)" -msgstr "네이티브(&N)(Win)" +msgstr "네이티브(&N) (Windows)" #: winecfg.rc:211 msgid "Buil&tin then Native" -msgstr "내장, 네이티브(&T)" +msgstr "내장, 네이티브 (&T)" #: winecfg.rc:212 msgid "Nati&ve then Builtin" -msgstr "네이티브, 내장(&V)" +msgstr "네이티브, 내장 (&V)" #: winecfg.rc:220 msgid "Select Drive Letter" @@ -14285,14 +14088,14 @@ msgstr "드라이브 문자 선택" #: winecfg.rc:232 msgid "Drive configuration" -msgstr "저장소 구성" +msgstr "드라이브 구성" #: winecfg.rc:233 msgid "" "Failed to connect to the mount manager, the drive configuration cannot be " "edited." msgstr "" -"연결 관리자가 연결하는 데 실패함, 이 드라이브 설정을 수정될 수 없습니다." +"마운트 관리자에 연결할 수 없습니다. 드라이브 구성을 편집할 수 없습니다." #: winecfg.rc:236 msgid "A&dd..." @@ -14320,7 +14123,7 @@ msgstr "찾아보기(&W)..." #: winecfg.rc:253 msgid "&Label:" -msgstr "라벨(&L):" +msgstr "레이블(&L):" #: winecfg.rc:255 msgid "S&erial:" @@ -14328,7 +14131,7 @@ msgstr "시리얼(&E):" #: winecfg.rc:258 msgid "&Show dot files" -msgstr "숨은 파일 보이기(&S)" +msgstr "숨김 파일(dot file) 보이기(&S)" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -14360,15 +14163,15 @@ msgstr "소리 테스트(&T)" #: winecfg.rc:277 winecfg.rc:90 msgid "Speaker configuration" -msgstr "확성기 설정" +msgstr "스피커 설정" #: winecfg.rc:280 msgid "Speakers:" -msgstr "확성기:" +msgstr "스피커:" #: winecfg.rc:288 msgid "Appearance" -msgstr "외양" +msgstr "모양새" #: winecfg.rc:289 msgid "&Theme:" @@ -14388,11 +14191,11 @@ msgstr "색상(&O):" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME 형식" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Wine에서 호스트 시스템의 MIME 정보 관리(&A)" #: winecfg.rc:308 msgid "Folders" @@ -14404,7 +14207,7 @@ msgstr "연결 위치(&L):" #: winecfg.rc:34 msgid "Libraries" -msgstr "자료관" +msgstr "라이브러리" #: winecfg.rc:35 msgid "Drives" @@ -14420,7 +14223,7 @@ msgstr "추가옵션 숨기기(&C)" #: winecfg.rc:39 msgid "(No Theme)" -msgstr "(테마 없음)" +msgstr "(테마 지정 않기)" #: winecfg.rc:40 msgid "Graphics" @@ -14460,7 +14263,7 @@ msgstr "연결 위치" #: winecfg.rc:45 msgid "Wine configuration for %s" -msgstr "%s를 위한 Wine 설정" +msgstr "%s에 대한 Wine 설정" #: winecfg.rc:84 msgid "Selected driver: %s" @@ -14480,31 +14283,31 @@ msgstr "(시스템 기본)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "5.1 전방향 경로" +msgstr "5.1 써라운드" #: winecfg.rc:92 msgid "Quadraphonic" -msgstr "4 경로" +msgstr "4 채널" #: winecfg.rc:93 msgid "Stereo" -msgstr "2 경로" +msgstr "스테레오" #: winecfg.rc:94 msgid "Mono" -msgstr "부호 개방형 유사 닷넷" +msgstr "모노" #: winecfg.rc:54 msgid "" "Changing the load order of this library is not recommended.\n" "Are you sure you want to do this?" msgstr "" -"이 자료관의 로드 순서를 바꾸는 것을 추천하지 않습니다..\n" +"이 라이브러리의 로드 순서를 바꾸는 것을 추천하지 않습니다.\n" "정말로 바꾸시겠습니까?" #: winecfg.rc:55 msgid "Warning: system library" -msgstr "경고: 시스템 자료관" +msgstr "경고: 시스템 라이브러리" #: winecfg.rc:56 msgid "native" @@ -14532,11 +14335,11 @@ msgstr "기본 설정" #: winecfg.rc:62 msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine 풀그림들 (*.exe,*.exe.so)" +msgstr "Wine 프로그램 (*.exe,*.exe.so)" #: winecfg.rc:63 msgid "Use global settings" -msgstr "전체 설정 사용" +msgstr "전역 설정 사용" #: winecfg.rc:64 msgid "Select an executable file" @@ -14548,7 +14351,7 @@ msgstr "자동으로 찾기" #: winecfg.rc:70 msgid "Local hard disk" -msgstr "연결된 하드 디스크" +msgstr "로컬 하드 디스크" #: winecfg.rc:71 msgid "Network share" @@ -14568,10 +14371,10 @@ msgid "" "\n" "Each drive must have a letter, from A to Z, so you cannot have more than 26." msgstr "" -"당신은 더 이상 드라이브를 추가할 수 없습니다.\n" +"더 이상 드라이브를 추가할 수 없습니다.\n" "\n" -"각 드라이브는 반드시 A~Z까지의 문자를 가집니다, 그래서 당신은 26개보다 더 많" -"이 추가할 수 없습니다." +"각각의 드라이브는 A에서 Z까지의 문자를 가지기 때문에, 26개보다 더 많은 드라이" +"브를 추가할 수 없습니다." #: winecfg.rc:75 msgid "System drive" @@ -14584,10 +14387,10 @@ msgid "" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed remember to recreate it!" msgstr "" -"당신은 하드 드라이브 C를 지우기를 원합니까?\n" +"드라이브 C를 지우시겠습니까?\n" "\n" -"대부분의 윈도우 풀그림은 C드라이브가 있다고 예상하고, 없으면 다운될것입니다. " -"만약 당신이 계속 진행하기를 원한다면 반드시 다시 만드십시오!" +"대부분의 윈도우 응용프로그램은 C 드라이브가 있다고 예상하고, 없으면 지저분하" +"게 종료될 것입니다. 계속 진행하신다면 반드시 C 드라이브를 다시 생성하십시오!" #: winecfg.rc:77 msgctxt "Drive letter" @@ -14604,9 +14407,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"당신은 C드라이브를 가지고 있지 않습니다. 이것은 좋은 일이 아닙니다.\n" +"드라이브 C가 존재하지 않습니다. 이것은 그리 좋지 않습니다.\n" "\n" -"드라이브 탭에서 '추가'를 클릭해서 만드는 것을 잊지 마십시오!\n" +"드라이브 탭에서 [추가]를 클릭해서 만드는 것을 잊지 마십시오!\n" #: winecfg.rc:99 msgid "Controls Background" @@ -14626,15 +14429,15 @@ msgstr "메뉴 문자" #: winecfg.rc:104 msgid "Scrollbar" -msgstr "목록바" +msgstr "스크롤바" #: winecfg.rc:105 msgid "Selection Background" -msgstr "선택된 배경" +msgstr "셀렉 영역 배경" #: winecfg.rc:106 msgid "Selection Text" -msgstr "선택된 문자" +msgstr "선택 영역 문자" #: winecfg.rc:107 msgid "Tooltip Background" @@ -14654,27 +14457,27 @@ msgstr "창 문자" #: winecfg.rc:111 msgid "Active Title Bar" -msgstr "활성된 제목 막대" +msgstr "활성 제목 표시줄" #: winecfg.rc:112 msgid "Active Title Text" -msgstr "활성된 제목 문자" +msgstr "활성 제목 표시줄 문자" #: winecfg.rc:113 msgid "Inactive Title Bar" -msgstr "비활성된 제목 막대" +msgstr "비활성 제목 표시줄" #: winecfg.rc:114 msgid "Inactive Title Text" -msgstr "비활성된 제목 문자" +msgstr "비활성 제목 표시줄 문자" #: winecfg.rc:115 msgid "Message Box Text" -msgstr "메세지 상자 텍스트" +msgstr "메시지 상자 문자" #: winecfg.rc:116 msgid "Application Workspace" -msgstr "어플리케이션 작업공간" +msgstr "응용프로그램 작업공간" #: winecfg.rc:117 msgid "Window Frame" @@ -14682,15 +14485,15 @@ msgstr "창 프레임" #: winecfg.rc:118 msgid "Active Border" -msgstr "활성화된 창틀" +msgstr "활성 테두리" #: winecfg.rc:119 msgid "Inactive Border" -msgstr "비 활성화된 창틀" +msgstr "비활성 테두리" #: winecfg.rc:120 msgid "Controls Shadow" -msgstr "컨트롤 그함지" +msgstr "컨트롤 그림자" #: winecfg.rc:121 msgid "Gray Text" @@ -14710,19 +14513,19 @@ msgstr "컨트롤 밝음" #: winecfg.rc:125 msgid "Controls Alternate Background" -msgstr "컨트롤 바뀔때 배경" +msgstr "컨트롤 대체 배경" #: winecfg.rc:126 msgid "Hot Tracked Item" -msgstr "핫 트랙된 아이템" +msgstr "집중 추적 아이템" #: winecfg.rc:127 msgid "Active Title Bar Gradient" -msgstr "활성화된 제목 바 색깔 변화" +msgstr "활성 제목 표시줄 그라데이션" #: winecfg.rc:128 msgid "Inactive Title Bar Gradient" -msgstr "비활성화된 제목바 색깔 변화" +msgstr "비활성 제목 표시줄 그라데이션" #: winecfg.rc:129 msgid "Menu Highlight" @@ -14754,11 +14557,11 @@ msgstr "명령 히스토리" #: wineconsole.rc:69 msgid "&Buffer size:" -msgstr "사이간 구역" +msgstr "버퍼 크기(&B):" #: wineconsole.rc:72 msgid "&Remove duplicates" -msgstr "사본 제거(&R)" +msgstr "중복 제거(&R)" #: wineconsole.rc:74 msgid "Popup menu" @@ -14774,15 +14577,15 @@ msgstr "쉬프트(&H)" #: wineconsole.rc:78 msgid "Console" -msgstr "조종간" +msgstr "콘솔" #: wineconsole.rc:79 msgid "&Quick Edit mode" -msgstr "빠른 편집" +msgstr "빠른 편집 모드(&Q)" #: wineconsole.rc:80 msgid "&Insert mode" -msgstr "삽입 형식(&E)" +msgstr "삽입 모드(&I)" #: wineconsole.rc:88 msgid "&Font" @@ -14822,7 +14625,7 @@ msgstr "높이(&E) :" #: wineconsole.rc:120 msgid "End of program" -msgstr "풀그림의 끝" +msgstr "프로그램의 끝" #: wineconsole.rc:121 msgid "&Close console" @@ -14880,7 +14683,7 @@ msgstr "설정 오류" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "모니터 사이칸 크기는 반드시 창보다 같거나 커야합니다" +msgstr "스크린 버퍼 크기는 윈도우 크기보다 크거나 같아야 합니다." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" @@ -14900,18 +14703,18 @@ msgstr "wineconsole: 올바르지 않은 백엔드\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: 이해할수 없는 명령 라인 옵션\n" +msgstr "wineconsole: 이해할 수 없는 명령 라인 옵션\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" -msgstr "Wine 콘솔에서 풀그림 시작\n" +msgstr "Wine 콘솔에서 프로그램 시작\n" #: wineconsole.rc:48 msgid "" "wineconsole: Starting program %s failed.\n" "The command is invalid.\n" msgstr "" -"wineconsole: 풀그림 %s 시작 실패.\n" +"wineconsole: 프로그램 %s 시작 실패.\n" "이 명령은 올바르지 않습니다.\n" #: wineconsole.rc:50 @@ -14941,7 +14744,7 @@ msgstr "" #: wineconsole.rc:53 msgid " <command> The Wine program to launch in the console.\n" -msgstr " <명령> The Wine 풀그림은 콘솔을 통해서 시작됨.\n" +msgstr " <명령> The Wine 프로그램은 콘솔을 통해서 시작됨.\n" #: wineconsole.rc:54 msgid "" @@ -14959,15 +14762,15 @@ msgstr "" #: winedbg.rc:50 winedbg.rc:38 msgid "Program Error" -msgstr "풀그림 오류" +msgstr "프로그램 오류" #: winedbg.rc:55 msgid "" "The program %s has encountered a serious problem and needs to close. We are " "sorry for the inconvenience." msgstr "" -"이 풀그림 %s 은 심각한 문제에 직면해서 종료를 필요로 합니다. 우리는 불편을 " -"끼쳐드린 거에 대하여 유감을 표함니다." +"프로그램 %s은(는) 심각한 문제에 직면해서 종료합니다.불편을 끼쳐드려 죄송합니" +"다." #: winedbg.rc:59 msgid "" @@ -14975,8 +14778,8 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"이 문제는 풀그림의 문제나 Wine의 결함으로 인해 발생할 수 있습니다. 당신은 실" -"행한 풀그림에 대하여 <a href=\"https://appdb.winehq.org\">Application " +"이 문제는 프로그램의 문제나 Wine의 결함으로 인해 발생할 수 있습니다. 당신은 " +"실행한 프로그램에 대하여 <a href=\"https://appdb.winehq.org\">Application " "Database</a> 에서 관련 팁을 살펴 볼 수 있습니다." #: winedbg.rc:62 @@ -14985,7 +14788,7 @@ msgstr "자세히 보여주기(&D)" #: winedbg.rc:67 msgid "Program Error Details" -msgstr "자세한 풀그림 오류" +msgstr "자세한 프로그램 오류" #: winedbg.rc:74 msgid "" @@ -14994,24 +14797,26 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"만약 이 문제가 윈도우즈에는 존재하지 않고 아직 보고되지 않았다면,당신은 \"다" -"른 이름으로 저장\" 버튼을 사용해서 자세한 정보를 파일로 저장해서, <a href=" -"\"https://wiki.winehq.org/Bugs\">벌레 보고 파일</a>로 가서보고서에 파일을 같" -"이 올리수 있습니다." +"이 문제가 Windows에는 존재하지 않고 아직 보고되지 않았다면, \"다른 이름으로 " +"저장\" 버튼을 사용해서 자세한 정보를 파일로 저장한 후, <a href=\"https://" +"wiki.winehq.org/Bugs\">file a but report</a>에서 이 파일을 첨부해서 보고해 주" +"시기 바랍니다." #: winedbg.rc:40 msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"시스템의 프로그램이 중단되었지만, WineDbg는 백트레이스를 얻기 위해 프로세스" +"에 연결할 수 없습니다." #: winedbg.rc:41 msgid "(unidentified)" -msgstr "(알수 없음)" +msgstr "(미확인)" #: winedbg.rc:44 msgid "Saving failed" -msgstr "저장 실패함" +msgstr "저장 실패" #: winedbg.rc:45 msgid "Loading detailed information, please wait..." @@ -15031,7 +14836,7 @@ msgstr "속성(&I)\tAlt+Enter" #: winefile.rc:38 msgid "Cr&eate Directory..." -msgstr "디렉토리 만들기(&E)..." +msgstr "디렉터리 만들기(&E)..." #: winefile.rc:43 msgid "&Disk" @@ -15059,11 +14864,11 @@ msgstr "이름으로 정렬(&S)" #: winefile.rc:55 msgid "Sort &by Type" -msgstr "타입으로 정렬(&b)" +msgstr "타입으로 정렬(&B)" #: winefile.rc:56 msgid "Sort by Si&ze" -msgstr "크기로 정렬(&z)" +msgstr "크기로 정렬(&Z)" #: winefile.rc:57 msgid "Sort by &Date" @@ -15079,7 +14884,7 @@ msgstr "드라이브 바(&D)" #: winefile.rc:68 msgid "F&ull Screen\tCtrl+Shift+S" -msgstr "전체 화면(&u)\tCtrl+Shift+S" +msgstr "전체 화면(&U)\tCtrl+Shift+S" #: winefile.rc:74 msgid "New &Window" @@ -15111,11 +14916,11 @@ msgstr "파일 타입" #: winefile.rc:141 msgid "&Directories" -msgstr "디렉토리(&D)" +msgstr "디렉터리(&D)" #: winefile.rc:143 msgid "&Programs" -msgstr "풀그림(&P)" +msgstr "프로그램(&P)" #: winefile.rc:145 msgid "Docu&ments" @@ -15155,7 +14960,7 @@ msgstr "압축(&C)" #: winefile.rc:178 msgid "Version information" -msgstr "버젼 정보" +msgstr "버전 정보" #: winefile.rc:194 msgctxt "accelerator Fullscreen" @@ -15176,31 +14981,31 @@ msgstr "Wine 파일 관리자" #: winefile.rc:98 msgid "root fs" -msgstr "루트 파일시스템" +msgstr "rootfs" #: winefile.rc:99 msgid "unixfs" -msgstr "유닉스 파일시스템" +msgstr "unixfs" #: winefile.rc:101 msgid "Shell" -msgstr "셀" +msgstr "쉘" #: winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" -msgstr "아직 구현안됨" +msgstr "구현되지 않음" #: winefile.rc:109 msgid "Creation date" -msgstr "만든 날짜" +msgstr "생성 날짜" #: winefile.rc:110 msgid "Access date" -msgstr "접근한 날짜" +msgstr "접근 날짜" #: winefile.rc:111 msgid "Modification date" -msgstr "고친 날짜" +msgstr "수정 날짜" #: winefile.rc:112 msgid "Index/Inode" @@ -15208,7 +15013,7 @@ msgstr "인덱스/아이노드" #: winefile.rc:117 msgid "%1 of %2 free" -msgstr "%2 의 %1 사용가능" +msgstr "%1 / %2 사용가능" #: winemine.rc:39 msgid "&Game" @@ -15368,7 +15173,7 @@ msgstr "인덱스" #: winhlp32.rc:108 msgid "Search" -msgstr "찾기" +msgstr "검색" #: winhlp32.rc:81 msgid "Wine Help" @@ -15384,7 +15189,7 @@ msgstr "요약" #: winhlp32.rc:87 msgid "&Index" -msgstr "목차(&C)" +msgstr "목차(&I)" #: winhlp32.rc:91 msgid "Help files (*.hlp)" @@ -15392,11 +15197,11 @@ msgstr "도움말 파일 (*.hlp)" #: winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "%s을 찾을 수 없습니다'. 이 파일을 직접 찾겠습니까?" +msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾겠습니까?" #: winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "richedit 구현을 찾을수 없습니다... 취소중" +msgstr "Richedit 구현을 찾을 수 없습니다... 취소중" #: winhlp32.rc:94 msgid "Help topics: " @@ -15428,7 +15233,7 @@ msgstr "다시 실행(&E)\tCtrl+Y" #: wordpad.rc:50 msgid "&Clear\tDel" -msgstr "지우기(&C)\tDel" +msgstr "삭제(&C)\tDel" #: wordpad.rc:51 msgid "&Select all\tCtrl+A" @@ -15496,7 +15301,7 @@ msgstr "목록(&L)" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" -msgstr "강조 점(&U)" +msgstr "강조 점(&B)" #: wordpad.rc:88 msgid "Numbers" @@ -15528,7 +15333,7 @@ msgstr "탭(&T)..." #: wordpad.rc:96 msgid "Backgroun&d" -msgstr "배경(&B)" +msgstr "배경(&D)" #: wordpad.rc:98 msgid "&System\tCtrl+1" @@ -15596,27 +15401,27 @@ msgstr "더하기(&A)" #: wordpad.rc:259 msgid "Remove al&l" -msgstr "모두 지우기(&L)" +msgstr "모두 제거(&L)" #: wordpad.rc:267 msgid "Line wrapping" -msgstr "줄 넘기기" +msgstr "줄 바꿈" #: wordpad.rc:268 msgid "&No line wrapping" -msgstr "줄넘기지 않음" +msgstr "줄 바꿈 하지 않기(&N)" #: wordpad.rc:269 msgid "Wrap text by the &window border" -msgstr "창 가장자리서 글 넘기기(&W)" +msgstr "창에 맞춰 줄 바꿈(&W)" #: wordpad.rc:270 msgid "Wrap text by the &margin" -msgstr "가장자리에서 줄 넘기기(&M)" +msgstr "여백에 맞춰 줄 바꿈(&M)" #: wordpad.rc:271 msgid "Toolbars" -msgstr "도구바" +msgstr "도구 모음" #: wordpad.rc:284 msgctxt "accelerator Align Left" @@ -15683,7 +15488,7 @@ msgstr "유니코드 텍스트 문서" #: wordpad.rc:154 msgid "Printer files (*.prn)" -msgstr "프린터 파일들 (*.prn)" +msgstr "프린터 파일 (*.prn)" #: wordpad.rc:161 msgid "Center" @@ -15695,7 +15500,7 @@ msgstr "텍스트" #: wordpad.rc:168 msgid "Rich text" -msgstr "리치 텍스트" +msgstr "서식있는 텍스트" #: wordpad.rc:174 msgid "Next page" @@ -15732,21 +15537,21 @@ msgstr "페이지들" #: wordpad.rc:183 msgctxt "unit: centimeter" msgid "cm" -msgstr "센치미터" +msgstr "cm" #: wordpad.rc:184 msgctxt "unit: inch" msgid "in" -msgstr "인치" +msgstr "inch" #: wordpad.rc:185 msgid "inch" -msgstr "인치" +msgstr "inch" #: wordpad.rc:186 msgctxt "unit: point" msgid "pt" -msgstr "포인트" +msgstr "pt" #: wordpad.rc:191 msgid "Document" @@ -15758,11 +15563,11 @@ msgstr "'%s'의 바뀐 것을 저장하겠습니까?" #: wordpad.rc:193 msgid "Finished searching the document." -msgstr "문서에서 찾기 끝." +msgstr "문서 검색이 끝났습니다." #: wordpad.rc:194 msgid "Failed to load the RichEdit library." -msgstr "리치텍스트 자료관 불러오기 실패." +msgstr "RichEdit 라이브러리 불러오기 실패." #: wordpad.rc:195 msgid "" @@ -15770,7 +15575,7 @@ msgid "" "formatting to be lost. Are you sure that you wish to do this?" msgstr "" "당신은 보통 텍스트 형식으로 저장하기를 선택했습니다, 이것은 포맷팅을 없엘 것" -"입니다. 당신은 정말로 저장하기를 원합니까?" +"입니다. 정말로 저장하시겠습니까?" #: wordpad.rc:198 msgid "Invalid number format." @@ -15802,7 +15607,7 @@ msgstr "인쇄는 지원되지 않습니다." #: wordpad.rc:205 msgid "Cannot add more than 32 tab stops." -msgstr "탭중지는 32개 이상 추가 할 수 없습니다." +msgstr "탭중지는 32개 이상 추가할 수 없습니다." #: write.rc:30 msgid "Starting Wordpad failed" @@ -15834,9 +15639,9 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"'%1'이 복사할 파일이나 디렉토리\n" +"'%1'이 복사할 파일이나 디렉터리\n" "입니까?\n" -"(F - 파일, D - 디렉토리)\n" +"(F - 파일, D - 디렉터리)\n" #: xcopy.rc:38 msgid "%1? (Yes|No)\n" @@ -15848,7 +15653,7 @@ msgstr "%1를 덮어쓰겠습니까? (예(Y)|아니오(N)|모두(A))\n" #: xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패\n" +msgstr "'%1'을(를) '%2'(으)로 복사하는 데 실패했습니다. error code %3!d!\n" #: xcopy.rc:42 msgid "Failed during reading of '%1'\n" @@ -15865,41 +15670,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15935,36 +15705,36 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" -"XCOPY - 원본 파일이나 디렉토리 구조를 목적지로 복사\n" +"XCOPY - 파일이나 디렉터리 트리를 목적지로 복사합니다.\n" "\n" -"문법:\n" +"구문:\n" "XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"Where:\n" -"\n" -"[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일" -"을\n" -"\t복사\n" -"[/S] 디렉토리하고 하위 디렉토리 복사\n" -"[/E] 빈 디렉토리를 포함해서 디렉토리와 하위 디렉토리 복사\n" -"[/Q] 조용하게 복사되는 파일이나 디렉토리를 표시하지 않고 복사.\n" -"[/F] 복사하는 동안 완전한 원본과 대상 보여주기\n" -"[/L] 복사될 것을 보여주면서 가상으로 작업\n" -"[/W] 복사시작 하기 전에 확인하기\n" -"[/T] 파일은 복사하지 않고 빈 디렉토리 구조만 복사\n" -"[/Y] 파일 덮어 쓸 때 확인하지 않기\n" -"[/-Y] 파일을 덮어 쓸 때 확인하기\n" -"[/P] 복사하는 동안에 각가의 원본 파일마다 확인\n" -"[/N] 짧은 이름을 사용해서 복사\n" -"[/U] 이미 대상 디렉토리에 존재하는 파일만 복사\n" -"[/R] 읽기 전용 파일도 덮어 쓰기\n" -"[/H] 숨은 파일이나 시스템 파일도 포함해서 복사\n" -"[/C] 복사하는 동안에 오류가 발생해도 계속 진행\n" -"[/A] 오직 압축 속성이 설정되어있는 파일만 복사\n" -"[/M] 오직 압축 속성을 제거하면서 압축 속성이 설정되어있는\n" -"\t파일만 복사\n" -"[/D | /D:m-d-y] 지정된 날짜 후에 수정되거나 새로운 파일 복사.\n" -"\t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다\n" -"\t\t대상이 오래된 것만 복사.\n" +"매개변수:\n" +"\n" +"[/I] 대상이 존재하지 않고 둘 또는 그 이상의 파일을 복사한다면 대상을\n" +" 디렉터리로 가정합니다.\n" +"[/S] 디렉터리와 하위 디렉터리를 복사합니다.\n" +"[/E] 비어있는 경우를 포함해서 디렉터리와 하위 디렉터리를 복사합니다.\n" +"[/Q] 복사하는 동안 복사 목록을 표시하지 않습니다.\n" +"[/F] 복사하는 동안 원본과 대상 전부를 표시합니다.\n" +"[/L] 가상 동작. 복사할 목록을 표시합니다.\n" +"[/W] 복사를 시작하기 전에 확인합니다.\n" +"[/T] 파일은 복사하지 않고 빈 디렉터리 구조만 복사합니다.\n" +"[/Y] 파일을 덮어 쓸 때 확인하지 않습니다.\n" +"[/-Y] 파일을 덮어 쓸 때 확인합니다.\n" +"[/P] 각각의 파일을 복사전에 확인합니다.\n" +"[/N] 짧은 이름을 사용해서 복사합니다.\n" +"[/U] 이미 대상이 존재하는 파일만 복사합니다.\n" +"[/R] 읽기 전용 파일을 덮어 씁니다.\n" +"[/H] 숨은 파일이나 시스템 파일을 포함해서 복사합니다.\n" +"[/C] 복사하는 동안에 오류가 발생해도 계속 진행합니다.\n" +"[/A] 보관 속성이 설정되어있는 파일만 복사합니다.\n" +"[/M] 보관 속성이 설정되어 있는 파일만 복사하며, 보관 속성을 지웁니다.\n" +"[/K] 파일 속성을 유지하면서 복사합니다. 이 옵션이 없으면 유지하지 않습니" +"다.\n" +"[/D | /D:m-d-y]\n" +" 지정된 날짜 후에 수정되거나 새로운 파일을 복사합니다.\n" +" 날짜를 지정하지 않으면, 원본보다 대상이 오래된 것만 복사합니다.\n" "\n" -- 2.19.1

1 0

[PATCH v2 1/3] gdi32: Support other settings for obtaining the default_aa_flags value.
by Byeongsik Jeon 29 Oct '18

29 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: nothing changed. [2/3] patch changed. v1: The global subpixel alignment setting are: 1. fontconfig builtin 10-sub-pixel-rgb.conf. <match target="pattern"> <edit name="rgba" mode="assign"><const>rgb</const></edit> </match> 2. Current Wine, or the recommendation of some web pages. <match target="font"> <edit name="rgba" mode="assign"><const>rgb</const></edit> </match> This patch allows both situations to return the correct value. dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b1a23bf32..7cc42b2a47 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2812,6 +2812,15 @@ static void init_fontconfig(void) pFcConfigSubstitute( NULL, pattern, FcMatchFont ); default_aa_flags = parse_aa_pattern( pattern ); pFcPatternDestroy( pattern ); + + if (!default_aa_flags) + { + FcPattern *pattern = pFcPatternCreate(); + pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); + default_aa_flags = parse_aa_pattern( pattern ); + pFcPatternDestroy( pattern ); + } + TRACE( "enabled, default flags = %x\n", default_aa_flags ); fontconfig_enabled = TRUE; } -- 2.19.1

2 4

[PATCH] include: Fix wrong argument attribute for IFileDialog::GetOptions.
by Zhiyi Zhang 29 Oct '18

29 Oct '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 73278e46f7..d459272a1d 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2889,7 +2889,7 @@ interface IFileDialog : IModalWindow [in] FILEOPENDIALOGOPTIONS fos); HRESULT GetOptions( - [in] FILEOPENDIALOGOPTIONS *pfos); + [out] FILEOPENDIALOGOPTIONS *pfos); HRESULT SetDefaultFolder( [in] IShellItem *psi); -- 2.18.0

1 0

[PATCH 5/5] wined3d: Move the multisample renderbuffers from struct wined3d_texture to struct wined3d_texture_gl.
by Henri Verbeet 29 Oct '18

29 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 +-- dlls/wined3d/swapchain.c | 30 ++++++++--------- dlls/wined3d/texture.c | 74 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d7d0ec4ed44..9027e94ed09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -480,14 +480,14 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co break; case WINED3D_LOCATION_RB_MULTISAMPLE: - key->objects[idx].object = texture_gl->t.rb_multisample; + key->objects[idx].object = texture_gl->rb_multisample; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; break; case WINED3D_LOCATION_RB_RESOLVED: - key->objects[idx].object = texture_gl->t.rb_resolved; + key->objects[idx].object = texture_gl->rb_resolved; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5cca4be9775..1f0fd108362 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -340,10 +340,10 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } /* Context activation is done by the caller. */ -static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) +static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) { struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_texture *texture, *texture_prev; + struct wined3d_texture_gl *texture, *texture_prev; struct gl_texture tex0; GLuint rb0; DWORD locations0; @@ -353,35 +353,35 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct if (swapchain->desc.backbuffer_count < 2 || !swapchain->render_to_fbo) return; - texture_prev = swapchain->back_buffers[0]; + texture_prev = wined3d_texture_gl(swapchain->back_buffers[0]); /* Back buffer 0 is already in the draw binding. */ - tex0 = texture_prev->texture_rgb; + tex0 = texture_prev->t.texture_rgb; rb0 = texture_prev->rb_multisample; - locations0 = texture_prev->sub_resources[0].locations; + locations0 = texture_prev->t.sub_resources[0].locations; for (i = 1; i < swapchain->desc.backbuffer_count; ++i) { - texture = swapchain->back_buffers[i]; - sub_resource = &texture->sub_resources[0]; + texture = wined3d_texture_gl(swapchain->back_buffers[i]); + sub_resource = &texture->t.sub_resources[0]; if (!(sub_resource->locations & supported_locations)) - wined3d_texture_load_location(texture, 0, context, texture->resource.draw_binding); + wined3d_texture_load_location(&texture->t, 0, context, texture->t.resource.draw_binding); - texture_prev->texture_rgb = texture->texture_rgb; + texture_prev->t.texture_rgb = texture->t.texture_rgb; texture_prev->rb_multisample = texture->rb_multisample; - wined3d_texture_validate_location(texture_prev, 0, sub_resource->locations & supported_locations); - wined3d_texture_invalidate_location(texture_prev, 0, ~(sub_resource->locations & supported_locations)); + wined3d_texture_validate_location(&texture_prev->t, 0, sub_resource->locations & supported_locations); + wined3d_texture_invalidate_location(&texture_prev->t, 0, ~(sub_resource->locations & supported_locations)); texture_prev = texture; } - texture_prev->texture_rgb = tex0; + texture_prev->t.texture_rgb = tex0; texture_prev->rb_multisample = rb0; - wined3d_texture_validate_location(texture_prev, 0, locations0 & supported_locations); - wined3d_texture_invalidate_location(texture_prev, 0, ~(locations0 & supported_locations)); + wined3d_texture_validate_location(&texture_prev->t, 0, locations0 & supported_locations); + wined3d_texture_invalidate_location(&texture_prev->t, 0, ~(locations0 & supported_locations)); device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); } @@ -483,7 +483,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); - wined3d_swapchain_rotate(swapchain, context); + wined3d_swapchain_gl_rotate(swapchain, context); TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 74029bfb3d8..42bae136a53 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -664,46 +664,46 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture checkGLcall("allocate immutable storage"); } -static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) +static void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) { - struct wined3d_device *device = texture->resource.device; + struct wined3d_device *device = texture_gl->t.resource.device; const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; - if (texture->texture_rgb.name || texture->texture_srgb.name - || texture->rb_multisample || texture->rb_resolved) + if (texture_gl->t.texture_rgb.name || texture_gl->t.texture_srgb.name + || texture_gl->rb_multisample || texture_gl->rb_resolved) { context = context_acquire(device, NULL, 0); gl_info = context->gl_info; } - if (texture->texture_rgb.name) - gltexture_delete(device, context->gl_info, &texture->texture_rgb); + if (texture_gl->t.texture_rgb.name) + gltexture_delete(device, context->gl_info, &texture_gl->t.texture_rgb); - if (texture->texture_srgb.name) - gltexture_delete(device, context->gl_info, &texture->texture_srgb); + if (texture_gl->t.texture_srgb.name) + gltexture_delete(device, context->gl_info, &texture_gl->t.texture_srgb); - if (texture->rb_multisample) + if (texture_gl->rb_multisample) { - TRACE("Deleting multisample renderbuffer %u.\n", texture->rb_multisample); - context_gl_resource_released(device, texture->rb_multisample, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture->rb_multisample); - texture->rb_multisample = 0; + TRACE("Deleting multisample renderbuffer %u.\n", texture_gl->rb_multisample); + context_gl_resource_released(device, texture_gl->rb_multisample, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture_gl->rb_multisample); + texture_gl->rb_multisample = 0; } - if (texture->rb_resolved) + if (texture_gl->rb_resolved) { - TRACE("Deleting resolved renderbuffer %u.\n", texture->rb_resolved); - context_gl_resource_released(device, texture->rb_resolved, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture->rb_resolved); - texture->rb_resolved = 0; + TRACE("Deleting resolved renderbuffer %u.\n", texture_gl->rb_resolved); + context_gl_resource_released(device, texture_gl->rb_resolved, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture_gl->rb_resolved); + texture_gl->rb_resolved = 0; } if (context) context_release(context); - wined3d_texture_set_dirty(texture); + wined3d_texture_set_dirty(&texture_gl->t); - resource_unload(&texture->resource); + resource_unload(&texture_gl->t.resource); } static void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) @@ -903,7 +903,6 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) } heap_free(texture->overlay_info); } - wined3d_texture_unload_gl_texture(texture); } static void wined3d_texture_gl_cleanup(struct wined3d_texture_gl *texture_gl) @@ -930,6 +929,7 @@ static void wined3d_texture_gl_cleanup(struct wined3d_texture_gl *texture_gl) } wined3d_texture_cleanup(&texture_gl->t); + wined3d_texture_gl_unload_texture(texture_gl); } void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) @@ -1798,39 +1798,39 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win texture->flags |= alloc_flag; } -static void wined3d_texture_prepare_rb(struct wined3d_texture *texture, +static void wined3d_texture_gl_prepare_rb(struct wined3d_texture_gl *texture_gl, const struct wined3d_gl_info *gl_info, BOOL multisample) { const struct wined3d_format_gl *format_gl; - format_gl = wined3d_format_gl(texture->resource.format); + format_gl = wined3d_format_gl(texture_gl->t.resource.format); if (multisample) { DWORD samples; - if (texture->rb_multisample) + if (texture_gl->rb_multisample) return; - samples = wined3d_texture_get_gl_sample_count(texture); + samples = wined3d_texture_get_gl_sample_count(&texture_gl->t); - gl_info->fbo_ops.glGenRenderbuffers(1, &texture->rb_multisample); - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture->rb_multisample); + gl_info->fbo_ops.glGenRenderbuffers(1, &texture_gl->rb_multisample); + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture_gl->rb_multisample); gl_info->fbo_ops.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, - format_gl->internal, texture->resource.width, texture->resource.height); + format_gl->internal, texture_gl->t.resource.width, texture_gl->t.resource.height); checkGLcall("glRenderbufferStorageMultisample()"); - TRACE("Created multisample rb %u.\n", texture->rb_multisample); + TRACE("Created multisample rb %u.\n", texture_gl->rb_multisample); } else { - if (texture->rb_resolved) + if (texture_gl->rb_resolved) return; - gl_info->fbo_ops.glGenRenderbuffers(1, &texture->rb_resolved); - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture->rb_resolved); + gl_info->fbo_ops.glGenRenderbuffers(1, &texture_gl->rb_resolved); + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture_gl->rb_resolved); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, format_gl->internal, - texture->resource.width, texture->resource.height); + texture_gl->t.resource.width, texture_gl->t.resource.height); checkGLcall("glRenderbufferStorage()"); - TRACE("Created resolved rb %u.\n", texture->rb_resolved); + TRACE("Created resolved rb %u.\n", texture_gl->rb_resolved); } } @@ -1872,11 +1872,11 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_RB_MULTISAMPLE: - wined3d_texture_prepare_rb(texture, context->gl_info, TRUE); + wined3d_texture_gl_prepare_rb(wined3d_texture_gl(texture), context->gl_info, TRUE); return TRUE; case WINED3D_LOCATION_RB_RESOLVED: - wined3d_texture_prepare_rb(texture, context->gl_info, FALSE); + wined3d_texture_gl_prepare_rb(wined3d_texture_gl(texture), context->gl_info, FALSE); return TRUE; default: @@ -2562,7 +2562,7 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource) context_release(context); wined3d_texture_force_reload(&texture_gl->t); - wined3d_texture_unload_gl_texture(&texture_gl->t); + wined3d_texture_gl_unload_texture(texture_gl); } static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5da3df6363..e4cd7d39984 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3226,9 +3226,6 @@ struct wined3d_texture GLenum target; DWORD update_map_binding; - GLuint rb_multisample; - GLuint rb_resolved; - void *user_memory; unsigned int row_pitch; unsigned int slice_pitch; @@ -3407,6 +3404,9 @@ struct wined3d_texture_gl { struct wined3d_texture t; + GLuint rb_multisample; + GLuint rb_resolved; + struct list renderbuffers; const struct wined3d_renderbuffer_entry *current_renderbuffer; }; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the depth renderbuffers from struct wined3d_texture to struct wined3d_texture_gl.
by Henri Verbeet 29 Oct '18

29 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 25 +++---- dlls/wined3d/texture.c | 157 ++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 12 ++-- 3 files changed, 111 insertions(+), 83 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 16cea5c7fe6..d7d0ec4ed44 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -431,7 +431,7 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co { unsigned int sub_resource_idx = render_target->sub_resource_idx; struct wined3d_resource *resource = render_target->resource; - struct wined3d_texture *texture; + struct wined3d_texture_gl *texture_gl; if (!resource || resource->format->id == WINED3DFMT_NULL || resource->type == WINED3D_RTYPE_BUFFER) { @@ -452,19 +452,19 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co return; } - texture = wined3d_texture_from_resource(resource); - if (texture->current_renderbuffer) + texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(resource)); + if (texture_gl->current_renderbuffer) { - key->objects[idx].object = texture->current_renderbuffer->id; + key->objects[idx].object = texture_gl->current_renderbuffer->id; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; return; } - key->objects[idx].target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - key->objects[idx].level = sub_resource_idx % texture->level_count; - key->objects[idx].layer = sub_resource_idx / texture->level_count; + key->objects[idx].target = wined3d_texture_get_sub_resource_target(&texture_gl->t, sub_resource_idx); + key->objects[idx].level = sub_resource_idx % texture_gl->t.level_count; + key->objects[idx].layer = sub_resource_idx / texture_gl->t.level_count; if (render_target->layer_count != 1) key->objects[idx].layer = WINED3D_ALL_LAYERS; @@ -472,22 +472,22 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_get_texture_name(texture, context, FALSE); + key->objects[idx].object = wined3d_texture_get_texture_name(&texture_gl->t, context, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_get_texture_name(texture, context, TRUE); + key->objects[idx].object = wined3d_texture_get_texture_name(&texture_gl->t, context, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: - key->objects[idx].object = texture->rb_multisample; + key->objects[idx].object = texture_gl->t.rb_multisample; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; break; case WINED3D_LOCATION_RB_RESOLVED: - key->objects[idx].object = texture->rb_resolved; + key->objects[idx].object = texture_gl->t.rb_resolved; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; @@ -608,7 +608,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - wined3d_texture_set_compatible_renderbuffer(ds_texture, context, ds_level, &render_targets[0]); + wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), + context, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fb6c07e2a5b..74029bfb3d8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -845,7 +845,6 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_device *device = texture->resource.device; - struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; struct wined3d_dc_info *dc_info; @@ -872,20 +871,6 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); } - if (!context && !list_empty(&texture->renderbuffers)) - { - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - } - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - TRACE("Deleting renderbuffer %u.\n", entry->id); - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - heap_free(entry); - } - if (context) context_release(context); @@ -921,6 +906,32 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) wined3d_texture_unload_gl_texture(texture); } +static void wined3d_texture_gl_cleanup(struct wined3d_texture_gl *texture_gl) +{ + struct wined3d_device *device = texture_gl->t.resource.device; + struct wined3d_renderbuffer_entry *entry, *entry2; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + if (!list_empty(&texture_gl->renderbuffers)) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + TRACE("Deleting renderbuffer %u.\n", entry->id); + context_gl_resource_released(device, entry->id, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + heap_free(entry); + } + + context_release(context); + } + + wined3d_texture_cleanup(&texture_gl->t); +} + void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) { texture->swapchain = swapchain; @@ -1220,10 +1231,10 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) static void wined3d_texture_destroy_object(void *object) { - struct wined3d_texture *texture = object; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(object); - wined3d_texture_cleanup(texture); - heap_free(wined3d_texture_gl(texture)); + wined3d_texture_gl_cleanup(texture_gl); + heap_free(texture_gl); } ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) @@ -1462,7 +1473,7 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ -void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, +void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1492,12 +1503,12 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture } else { - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); + width = wined3d_texture_get_level_pow2_width(&texture_gl->t, level); + height = wined3d_texture_get_level_pow2_height(&texture_gl->t, level); } - src_width = wined3d_texture_get_level_pow2_width(texture, level); - src_height = wined3d_texture_get_level_pow2_height(texture, level); + src_width = wined3d_texture_get_level_pow2_width(&texture_gl->t, level); + src_height = wined3d_texture_get_level_pow2_height(&texture_gl->t, level); /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) @@ -1506,17 +1517,17 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture /* Remove any renderbuffer set if the sizes match */ if (width == src_width && height == src_height) { - texture->current_renderbuffer = NULL; + texture_gl->current_renderbuffer = NULL; return; } /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) + LIST_FOR_EACH_ENTRY(entry, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) { if (entry->width == width && entry->height == height) { renderbuffer = entry->id; - texture->current_renderbuffer = entry; + texture_gl->current_renderbuffer = entry; break; } } @@ -1525,7 +1536,7 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture { const struct wined3d_format_gl *format_gl; - format_gl = wined3d_format_gl(texture->resource.format); + format_gl = wined3d_format_gl(texture_gl->t.resource.format); gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, format_gl->internal, width, height); @@ -1534,9 +1545,9 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture entry->width = width; entry->height = height; entry->id = renderbuffer; - list_add_head(&texture->renderbuffers, &entry->entry); + list_add_head(&texture_gl->renderbuffers, &entry->entry); - texture->current_renderbuffer = entry; + texture_gl->current_renderbuffer = entry; } checkGLcall("set compatible renderbuffer"); @@ -2497,29 +2508,29 @@ static void texture_resource_preload(struct wined3d_resource *resource) context_release(context); } -static void wined3d_texture_unload(struct wined3d_resource *resource) +static void wined3d_texture_gl_unload(struct wined3d_resource *resource) { - struct wined3d_texture *texture = texture_from_resource(resource); - UINT sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(resource)); + UINT sub_count = texture_gl->t.level_count * texture_gl->t.layer_count; struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_device *device = resource->device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; UINT i; - TRACE("texture %p.\n", texture); + TRACE("texture_gl %p.\n", texture_gl); context = context_acquire(device, NULL, 0); gl_info = context->gl_info; for (i = 0; i < sub_count; ++i) { - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; + struct wined3d_texture_sub_resource *sub_resource = &texture_gl->t.sub_resources[i]; if (resource->access & WINED3D_RESOURCE_ACCESS_CPU - && wined3d_texture_load_location(texture, i, context, resource->map_binding)) + && wined3d_texture_load_location(&texture_gl->t, i, context, resource->map_binding)) { - wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); + wined3d_texture_invalidate_location(&texture_gl->t, i, ~resource->map_binding); } else { @@ -2530,28 +2541,28 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) ERR("Discarding %s %p sub-resource %u with resource access %s.\n", debug_d3dresourcetype(resource->type), resource, i, wined3d_debug_resource_access(resource->access)); - wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); + wined3d_texture_validate_location(&texture_gl->t, i, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(&texture_gl->t, i, ~WINED3D_LOCATION_DISCARDED); } if (sub_resource->buffer_object) - wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + wined3d_texture_remove_buffer_object(&texture_gl->t, i, context->gl_info); } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) { context_gl_resource_released(device, entry->id, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); list_remove(&entry->entry); heap_free(entry); } - list_init(&texture->renderbuffers); - texture->current_renderbuffer = NULL; + list_init(&texture_gl->renderbuffers); + texture_gl->current_renderbuffer = NULL; context_release(context); - wined3d_texture_force_reload(texture); - wined3d_texture_unload_gl_texture(texture); + wined3d_texture_force_reload(&texture_gl->t); + wined3d_texture_unload_gl_texture(&texture_gl->t); } static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, @@ -2734,7 +2745,7 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_incref, texture_resource_decref, texture_resource_preload, - wined3d_texture_unload, + wined3d_texture_gl_unload, texture_resource_sub_resource_map, texture_resource_sub_resource_unmap, }; @@ -3039,8 +3050,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - list_init(&texture->renderbuffers); - switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_1D: @@ -3579,12 +3588,44 @@ static void *wined3d_texture_allocate_object_memory(SIZE_T s, SIZE_T level_count return heap_alloc_zero(s + level_count * layer_count * sizeof(*t->sub_resources)); } +static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + DWORD flags, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources) +{ + const struct wined3d_texture_ops *texture_ops; + + TRACE("texture_gl %p, device %p, desc %p, layer_count %u, level_count %u, " + "flags %#x, parent %p, parent_ops %p, sub_resources %p.\n", + texture_gl, device, desc, layer_count, level_count, + flags, parent, parent_ops, sub_resources); + + switch (desc->resource_type) + { + case WINED3D_RTYPE_TEXTURE_1D: + texture_ops = &texture1d_ops; + break; + case WINED3D_RTYPE_TEXTURE_2D: + texture_ops = &texture2d_ops; + break; + case WINED3D_RTYPE_TEXTURE_3D: + texture_ops = &texture3d_ops; + break; + default: + ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); + return WINED3DERR_INVALIDCALL; + } + + list_init(&texture_gl->renderbuffers); + + return wined3d_texture_init(&texture_gl->t, desc, layer_count, level_count, + flags, device, parent, parent_ops, sub_resources, texture_ops); +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { unsigned int sub_count = level_count * layer_count; - const struct wined3d_texture_ops *texture_ops; struct wined3d_texture_gl *object; unsigned int i; HRESULT hr; @@ -3631,22 +3672,6 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - switch (desc->resource_type) - { - case WINED3D_RTYPE_TEXTURE_1D: - texture_ops = &texture1d_ops; - break; - case WINED3D_RTYPE_TEXTURE_2D: - texture_ops = &texture2d_ops; - break; - case WINED3D_RTYPE_TEXTURE_3D: - texture_ops = &texture3d_ops; - break; - default: - ERR("Invalid resource type %s.\n", debug_d3dresourcetype(desc->resource_type)); - return WINED3DERR_INVALIDCALL; - } - if (data) { for (i = 0; i < sub_count; ++i) @@ -3662,8 +3687,8 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct if (!(object = wined3d_texture_allocate_object_memory(sizeof(*object), level_count, layer_count))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_texture_init(&object->t, desc, layer_count, - level_count, flags, device, parent, parent_ops, &object[1], texture_ops))) + if (FAILED(hr = wined3d_texture_gl_init(object, device, desc, layer_count, + level_count, flags, parent, parent_ops, &object[1]))) { WARN("Failed to initialize texture, returning %#x.\n", hr); heap_free(object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c2197685b2..e5da3df6363 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3263,9 +3263,6 @@ struct wined3d_texture HDC dc; } *dc_info; - struct list renderbuffers; - const struct wined3d_renderbuffer_entry *current_renderbuffer; - struct wined3d_texture_sub_resource { void *parent; @@ -3389,8 +3386,6 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, struct wined3d_context *context, - unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -3411,6 +3406,9 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_ struct wined3d_texture_gl { struct wined3d_texture t; + + struct list renderbuffers; + const struct wined3d_renderbuffer_entry *current_renderbuffer; }; static inline struct wined3d_texture_gl *wined3d_texture_gl(struct wined3d_texture *texture) @@ -3418,6 +3416,10 @@ static inline struct wined3d_texture_gl *wined3d_texture_gl(struct wined3d_textu return CONTAINING_RECORD(texture, struct wined3d_texture_gl, t); } +void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, + struct wined3d_context *context, unsigned int level, + const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; + #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_USER_MEMORY 0x00000004 -- 2.11.0

1 0

[PATCH 3/5] wined3d: Introduce a separate structure for OpenGL texture information.
by Henri Verbeet 29 Oct '18

29 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 45 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 12 ++++++++++- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a3d834e8f53..fb6c07e2a5b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1220,8 +1220,10 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) static void wined3d_texture_destroy_object(void *object) { - wined3d_texture_cleanup(object); - heap_free(object); + struct wined3d_texture *texture = object; + + wined3d_texture_cleanup(texture); + heap_free(wined3d_texture_gl(texture)); } ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) @@ -2844,7 +2846,8 @@ static const struct wined3d_texture_ops texture1d_ops = static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_texture_ops *texture_ops) + void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources, + const struct wined3d_texture_ops *texture_ops) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_device_parent *device_parent = device->device_parent; @@ -2856,11 +2859,11 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("texture %p, resource_type %s, format %s, multisample_type %#x, multisample_quality %#x, " "usage %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " - "flags %#x, device %p, parent %p, parent_ops %p, texture_ops %p.\n", + "flags %#x, device %p, parent %p, parent_ops %p, sub_resources %p, texture_ops %p.\n", texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), wined3d_debug_resource_access(desc->access), desc->width, desc->height, desc->depth, - layer_count, level_count, flags, device, parent, parent_ops, texture_ops); + layer_count, level_count, flags, device, parent, parent_ops, sub_resources, texture_ops); if (!desc->width || !desc->height || !desc->depth) return WINED3DERR_INVALIDCALL; @@ -2887,6 +2890,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } + texture->sub_resources = sub_resources; + /* TODO: It should only be possible to create textures for formats * that are reported as supported. */ if (WINED3DFMT_UNKNOWN >= desc->format) @@ -3564,13 +3569,23 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture return WINED3D_OK; } +static void *wined3d_texture_allocate_object_memory(SIZE_T s, SIZE_T level_count, SIZE_T layer_count) +{ + struct wined3d_texture *t; + + if (level_count > ((~(SIZE_T)0 - s) / sizeof(*t->sub_resources)) / layer_count) + return NULL; + + return heap_alloc_zero(s + level_count * layer_count * sizeof(*t->sub_resources)); +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { unsigned int sub_count = level_count * layer_count; const struct wined3d_texture_ops *texture_ops; - struct wined3d_texture *object; + struct wined3d_texture_gl *object; unsigned int i; HRESULT hr; @@ -3644,11 +3659,11 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, sub_resources[sub_count])))) + if (!(object = wined3d_texture_allocate_object_memory(sizeof(*object), level_count, layer_count))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_texture_init(object, desc, layer_count, - level_count, flags, device, parent, parent_ops, texture_ops))) + if (FAILED(hr = wined3d_texture_init(&object->t, desc, layer_count, + level_count, flags, device, parent, parent_ops, &object[1], texture_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); heap_free(object); @@ -3664,19 +3679,19 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { - level = i % object->level_count; - width = wined3d_texture_get_level_width(object, level); - height = wined3d_texture_get_level_height(object, level); - depth = wined3d_texture_get_level_depth(object, level); + level = i % object->t.level_count; + width = wined3d_texture_get_level_width(&object->t, level); + height = wined3d_texture_get_level_height(&object->t, level); + depth = wined3d_texture_get_level_depth(&object->t, level); wined3d_box_set(&box, 0, 0, width, height, 0, depth); - wined3d_cs_emit_update_sub_resource(device->cs, &object->resource, + wined3d_cs_emit_update_sub_resource(device->cs, &object->t.resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } TRACE("Created texture %p.\n", object); - *texture = object; + *texture = &object->t; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2594049afea..2c2197685b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3277,7 +3277,7 @@ struct wined3d_texture unsigned int map_count; DWORD locations; GLuint buffer_object; - } sub_resources[1]; + } *sub_resources; }; static inline struct wined3d_texture *texture_from_resource(struct wined3d_resource *resource) @@ -3408,6 +3408,16 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; +struct wined3d_texture_gl +{ + struct wined3d_texture t; +}; + +static inline struct wined3d_texture_gl *wined3d_texture_gl(struct wined3d_texture *texture) +{ + return CONTAINING_RECORD(texture, struct wined3d_texture_gl, t); +} + #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_USER_MEMORY 0x00000004 -- 2.11.0

1 0

[PATCH 2/5] wined3d: Move the "buffer_object" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Henri Verbeet 29 Oct '18

29 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++-------------------- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/state.c | 7 +++-- dlls/wined3d/view.c | 7 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 17bcb70bc34..58e56857b4c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,16 +135,17 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); + context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } /* Context activation is done by the caller. */ -static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) +static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, + struct wined3d_context *context) { + struct wined3d_resource *resource = &buffer_gl->b.resource; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_resource *resource = &buffer->resource; - if (!buffer->buffer_object) + if (!buffer_gl->buffer_object) return; /* The stream source state handler might have read the memory of the @@ -154,11 +155,11 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w * rarely. */ if (resource->bind_count) { - if (buffer->bind_flags & WINED3D_BIND_VERTEX_BUFFER) + if (buffer_gl->b.bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (buffer->bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (buffer_gl->b.bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); - if (buffer->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + if (buffer_gl->b.bind_flags & WINED3D_BIND_CONSTANT_BUFFER) { device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL)); @@ -167,7 +168,7 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } - if (buffer->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (buffer_gl->b.bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); if (context->transform_feedback_active) @@ -175,22 +176,22 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w /* We have to make sure that transform feedback is not active * when deleting a potentially bound transform feedback buffer. * This may happen when the device is being destroyed. */ - WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer); + WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); context_end_transform_feedback(context); } } } - GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); + GL_EXTCALL(glDeleteBuffers(1, &buffer_gl->buffer_object)); checkGLcall("glDeleteBuffers"); - buffer->buffer_object = 0; + buffer_gl->buffer_object = 0; - if (buffer->fence) + if (buffer_gl->b.fence) { - wined3d_fence_destroy(buffer->fence); - buffer->fence = NULL; + wined3d_fence_destroy(buffer_gl->b.fence); + buffer_gl->b.fence = NULL; } - buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; + buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -216,9 +217,9 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &buffer_gl->b.buffer_object)); + GL_EXTCALL(glGenBuffers(1, &buffer_gl->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); - if (!buffer_gl->b.buffer_object || error != GL_NO_ERROR) + if (!buffer_gl->buffer_object || error != GL_NO_ERROR) { ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; @@ -266,7 +267,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - buffer_destroy_buffer_object(&buffer_gl->b, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -622,7 +623,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - if (buffer->buffer_object) + if (wined3d_buffer_gl(buffer)->buffer_object) return TRUE; if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) @@ -719,7 +720,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, if (locations & WINED3D_LOCATION_BUFFER) { - data->buffer_object = buffer->buffer_object; + data->buffer_object = wined3d_buffer_gl(buffer)->buffer_object; data->addr = NULL; return WINED3D_LOCATION_BUFFER; } @@ -742,7 +743,7 @@ static void buffer_unload(struct wined3d_resource *resource) TRACE("buffer %p.\n", buffer); - if (buffer->buffer_object) + if (wined3d_buffer_gl(buffer)->buffer_object) { struct wined3d_context *context; @@ -750,7 +751,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - buffer_destroy_buffer_object(buffer, context); + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), context); buffer_clear_dirty_areas(buffer); context_release(context); @@ -771,22 +772,22 @@ static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) buffer_unload(&buffer->resource); } -static void wined3d_buffer_destroy_object(void *object) +static void wined3d_buffer_gl_destroy_object(void *object) { - struct wined3d_buffer *buffer = object; + struct wined3d_buffer_gl *buffer_gl = object; struct wined3d_context *context; - if (buffer->buffer_object) + if (buffer_gl->buffer_object) { - context = context_acquire(buffer->resource.device, NULL, 0); - buffer_destroy_buffer_object(buffer, context); + context = context_acquire(buffer_gl->b.resource.device, NULL, 0); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); context_release(context); - heap_free(buffer->conversion_map); + heap_free(buffer_gl->b.conversion_map); } - heap_free(buffer->maps); - heap_free(wined3d_buffer_gl(buffer)); + heap_free(buffer_gl->b.maps); + heap_free(buffer_gl); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -799,7 +800,8 @@ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); resource_cleanup(&buffer->resource); - wined3d_cs_destroy_object(buffer->resource.device->cs, wined3d_buffer_destroy_object, buffer); + wined3d_cs_destroy_object(buffer->resource.device->cs, + wined3d_buffer_gl_destroy_object, wined3d_buffer_gl(buffer)); } return refcount; @@ -1014,7 +1016,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, count = ++buffer_gl->b.resource.map_count; - if (buffer_gl->b.buffer_object) + if (buffer_gl->buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 800634e61a7..16cea5c7fe6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4354,7 +4354,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; struct wined3d_buffer *buffer = indirect->buffer; - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->buffer_object)); GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); } @@ -4745,7 +4745,7 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ return; } - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->buffer_object)); offset = (void *)(GLintptr)parameters->offset; if (idx_size) @@ -4902,7 +4902,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indexed) { struct wined3d_buffer *index_buffer = state->index_buffer; - if (!index_buffer->buffer_object || !stream_info->all_vbo) + if (!wined3d_buffer_gl(index_buffer)->buffer_object || !stream_info->all_vbo) { idx_data = index_buffer->resource.heap_memory; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fc076bb962a..ab67c578901 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4322,7 +4322,7 @@ static void indexbuffer(struct wined3d_context *context, const struct wined3d_st } else { - struct wined3d_buffer *ib = state->index_buffer; + struct wined3d_buffer_gl *ib = wined3d_buffer_gl(state->index_buffer); GL_EXTCALL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib->buffer_object)); } } @@ -4423,7 +4423,8 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state for (i = 0; i < count; ++i) { buffer = state->cb[shader_type][i]; - GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, buffer ? buffer->buffer_object : 0)); + GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, + buffer ? wined3d_buffer_gl(buffer)->buffer_object : 0)); } checkGLcall("bind constant buffers"); } @@ -4495,7 +4496,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state } size = buffer->resource.size - offset; GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, - buffer->buffer_object, offset, size)); + wined3d_buffer_gl(buffer)->buffer_object, offset, size)); } checkGLcall("bind transform feedback buffers"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 35d15e63195..618b7454ed1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -272,13 +272,14 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) { GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format_gl->internal, - buffer->buffer_object, offset, size)); + wined3d_buffer_gl(buffer)->buffer_object, offset, size)); } else { if (offset || size != buffer->resource.size) FIXME("OpenGL implementation does not support ARB_texture_buffer_range.\n"); - GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format_gl->internal, buffer->buffer_object)); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format_gl->internal, + wined3d_buffer_gl(buffer)->buffer_object)); } checkGLcall("Create buffer texture"); @@ -1054,7 +1055,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); + context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b52218972f..2594049afea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3758,7 +3758,6 @@ struct wined3d_buffer struct wined3d_buffer_desc desc; - GLuint buffer_object; unsigned int bind_flags; DWORD flags; DWORD locations; @@ -3798,6 +3797,7 @@ struct wined3d_buffer_gl { struct wined3d_buffer b; + GLuint buffer_object; GLenum buffer_object_usage; GLenum buffer_type_hint; }; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Don't bother trying to blit from discarded textures.
by Henri Verbeet 29 Oct '18

29 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71693adc589..746599e58f5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3121,6 +3121,15 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ fx->src_color_key.color_space_high_value); } + dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; + src_sub_resource = &src_texture->sub_resources[src_sub_resource_idx]; + + if (src_sub_resource->locations & WINED3D_LOCATION_DISCARDED) + { + WARN("Source sub-resource is discarded, nothing to do.\n"); + return WINED3D_OK; + } + SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); SetRect(&dst_rect, dst_box->left, dst_box->top, dst_box->right, dst_box->bottom); @@ -3202,9 +3211,6 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Colour blit.\n"); - dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; - src_sub_resource = &src_texture->sub_resources[src_sub_resource_idx]; - /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ if ((dst_sub_resource->locations & dst_texture->resource.map_binding) -- 2.11.0

1 0

[PATCH] ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken.
by Alistair Leslie-Hughes 29 Oct '18

29 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index af22e58..588a678 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -340,7 +340,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenHasRestrictions */ 0, /* TokenAccessInformation */ 0, /* TokenVirtualizationAllowed */ - 0, /* TokenVirtualizationEnabled */ + sizeof(DWORD), /* TokenVirtualizationEnabled */ sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ @@ -585,6 +585,12 @@ NTSTATUS WINAPI NtQueryInformationToken( FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; + case TokenVirtualizationEnabled: + { + *((DWORD*)tokeninfo) = 0; + TRACE("QueryInformationToken( ..., TokenVirtualizationEnabled, ...) semi-stub\n"); + } + break; case TokenIntegrityLevel: { /* report always "S-1-16-12288" (high mandatory level) for now */ -- 1.9.1

1 0

[PATCH 1/5] oleaut32/tests: Add some tests for marshalling pointers.
by Zebediah Figura 29 Oct '18

29 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 178 +++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 8 ++ 2 files changed, 186 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 68547f7e98..01df9efe3a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -376,6 +376,8 @@ static ItestDualVtbl TestDualVtbl = { static ItestDual TestDual = { &TestDualVtbl }; static ItestDual TestDualDisp = { &TestDualVtbl }; +static int testmode; + typedef struct Widget { IWidget IWidget_iface; @@ -962,6 +964,60 @@ static HRESULT WINAPI Widget_basetypes_out(IWidget *iface, signed char *c, short return S_OK; } +static HRESULT WINAPI Widget_int_ptr(IWidget *iface, int *in, int *out, int *in_out) +{ + ok(*in == 123, "Got [in] %d.\n", *in); + if (testmode == 0) /* Invoke() */ + ok(*out == 456, "Got [out] %d.\n", *out); + else if (testmode == 1) +todo_wine + ok(!*out, "Got [out] %d.\n", *out); + ok(*in_out == 789, "Got [in, out] %d.\n", *in_out); + + *in = 987; + *out = 654; + *in_out = 321; + + return S_OK; +} + +static HRESULT WINAPI Widget_int_ptr_ptr(IWidget *iface, int **in, int **out, int **in_out) +{ +todo_wine_if(testmode == 2) + ok(!*out, "Got [out] %p.\n", *out); + if (testmode == 0) + { + ok(!*in, "Got [in] %p.\n", *in); + ok(!*in_out, "Got [in, out] %p.\n", *in_out); + } + else if (testmode == 1) + { + ok(!*in, "Got [in] %p.\n", *in); + ok(!*in_out, "Got [in, out] %p.\n", *in_out); + + *out = CoTaskMemAlloc(sizeof(int)); + **out = 654; + *in_out = CoTaskMemAlloc(sizeof(int)); + **in_out = 321; + } + else if (testmode == 2) + { + ok(**in == 123, "Got [in] %d.\n", **in); + ok(**in_out == 789, "Got [in, out] %d.\n", **in_out); + + *out = CoTaskMemAlloc(sizeof(int)); + **out = 654; + **in_out = 321; + } + else if (testmode == 3) + { + ok(**in_out == 789, "Got [in, out] %d.\n", **in_out); + *in_out = NULL; + } + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1005,6 +1061,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Coclass, Widget_basetypes_in, Widget_basetypes_out, + Widget_int_ptr, + Widget_int_ptr_ptr, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1402,6 +1460,125 @@ static void test_marshal_basetypes(IWidget *widget, IDispatch *disp) ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st); } +static void test_marshal_pointer(IWidget *widget, IDispatch *disp) +{ + VARIANTARG arg[3]; + DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0}; + int in, out, in_out, *in_ptr, *out_ptr, *in_out_ptr; + HRESULT hr; + + testmode = 0; + + in = 123; + out = 456; + in_out = 789; + V_VT(&arg[2]) = VT_BYREF|VT_I4; V_I4REF(&arg[2]) = &in; + V_VT(&arg[1]) = VT_BYREF|VT_I4; V_I4REF(&arg[1]) = &out; + V_VT(&arg[0]) = VT_BYREF|VT_I4; V_I4REF(&arg[0]) = &in_out; + hr = IDispatch_Invoke(disp, DISPID_TM_INT_PTR, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in == 987, "Got [in] %d.\n", in); + ok(out == 654, "Got [out] %d.\n", out); + ok(in_out == 321, "Got [in, out] %d.\n", in_out); + + testmode = 1; + + in = 123; + out = 456; + in_out = 789; + hr = IWidget_int_ptr(widget, &in, &out, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(in == 123, "Got [in] %d.\n", in); + ok(out == 654, "Got [out] %d.\n", out); + ok(in_out == 321, "Got [in, out] %d.\n", in_out); + +if (0) { + out = in_out = -1; + hr = IWidget_int_ptr(widget, NULL, &out, &in_out); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(!out, "[out] parameter should have been cleared.\n"); + ok(in_out == -1, "[in, out] parameter should not have been cleared.\n"); + + in = in_out = -1; + hr = IWidget_int_ptr(widget, &in, NULL, &in_out); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in == -1, "[in] parameter should not have been cleared.\n"); + ok(in_out == -1, "[in, out] parameter should not have been cleared.\n"); + + in = out = -1; + hr = IWidget_int_ptr(widget, &in, &out, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in == -1, "[in] parameter should not have been cleared.\n"); + ok(!out, "[out] parameter should have been cleared.\n"); +} + + /* We can't test Invoke() with double pointers, as it is not possible to fit + * more than one level of indirection into a VARIANTARG. */ + + testmode = 0; + in_ptr = out_ptr = in_out_ptr = NULL; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x\n", hr); + ok(!in_ptr, "Got [in] %p.\n", in_ptr); + ok(!out_ptr, "Got [out] %p.\n", out_ptr); + ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr); + + testmode = 1; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x\n", hr); + ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr); + ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr); + CoTaskMemFree(out_ptr); + CoTaskMemFree(in_out_ptr); + + testmode = 2; + in = 123; + out = 456; + in_out = 789; + in_ptr = &in; + out_ptr = &out; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(out_ptr != &out, "[out] ptr should have changed.\n"); + ok(in_out_ptr == &in_out, "[in, out] ptr should not have changed.\n"); + ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr); + ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr); + + testmode = 3; + in_ptr = out_ptr = NULL; + in_out = 789; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr); + +if (0) { + out_ptr = &out; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, NULL, &out_ptr, &in_out_ptr); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(!out_ptr, "[out] parameter should have been cleared.\n"); + ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n"); + + in_ptr = &in; + in_out_ptr = &in_out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, NULL, &in_out_ptr); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in_ptr == &in, "[in] parameter should not have been cleared.\n"); + ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n"); + + in_ptr = &in; + out_ptr = &out; + hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr); + ok(in_ptr == &in, "[in] parameter should not have been cleared.\n"); + ok(!out_ptr, "[out] parameter should have been cleared.\n"); +} +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2013,6 +2190,7 @@ static void test_typelibmarshal(void) VariantClear(&varresult); test_marshal_basetypes(pWidget, pDispatch); + test_marshal_pointer(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2452f2d185..3cbad57085 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -57,6 +57,8 @@ enum IWidget_dispids DISPID_TM_BASETYPES_IN, DISPID_TM_BASETYPES_OUT, + DISPID_TM_INT_PTR, + DISPID_TM_INT_PTR_PTR, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -242,6 +244,12 @@ library TestTypelib HRESULT basetypes_out([out] signed char *c, [out] short *s, [out] int *i, [out] hyper *h, [out] unsigned char *uc, [out] unsigned short *us, [out] unsigned int *ui, [out] unsigned hyper *uh, [out] float *f, [out] double *d, [out] STATE *st); + + [id(DISPID_TM_INT_PTR)] + HRESULT int_ptr([in] int *in, [out] int *out, [in, out] int *in_out); + + [id(DISPID_TM_INT_PTR_PTR)] + HRESULT int_ptr_ptr([in] int **in, [out] int **out, [in, out] int **in_out); } [ -- 2.18.0

2 8

[PATCH] testbot: Detect if a task failed before starting the tests.
by Francois Gouget 28 Oct '18

28 Oct '18

This makes it possible to reliably report build issues as such. It also helps improve handling of build script and VM crashes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 36 +++++++++++++++-------------- testbot/bin/build/WineTest.pl | 19 +++++++++++---- testbot/lib/WineTestBot/LogUtils.pm | 7 +++--- 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 21d2e8b0a2..5a3a683fbb 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 6dd1318266..4d50a3789a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index f47a02413a..5b6eb33e20 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -490,14 +490,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) if ($ErrMessage =~ /timed out waiting for the child process/) { $ErrMessage = "The task timed out\n"; - if ($Step->Type eq "build") - { - $NewStatus = "badbuild"; - } - else - { - $TaskFailures = 1; - } + # We don't know if the timeout was caused by the build or the tests. + # Until we get the task log assume it's the tests' fault. + $TaskFailures = 1; $TaskTimedOut = 1; } else @@ -511,30 +506,37 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { - # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # We must have gotten the full log and the task completed successfully + # (with or without test failures). So clear any previous errors, including + # $TaskFailures since there was not really a timeout after all. $NewStatus = "completed"; - $TAError = $ErrMessage = undef; + $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } elsif ($Result eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; - $TAError = $ErrMessage = undef; + $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } elsif ($Result =~ s/^nolog://) { FatalError("$Result\n", "retry"); } - elsif ($Result ne "missing" or $Step->Type ne "suite") + elsif ($Type eq "build") { - # There is no build and thus no result line when running WineTest. - # Otherwise if the result line is missing we probably already have an - # error message that explains why. + # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; + $TaskFailures = $PossibleCrash = undef; + } + elsif (!$TaskTimedOut and !defined $TAError) + { + # Did WineTest.pl crash? + $NewStatus = "boterror"; + $TaskFailures = undef; + $PossibleCrash = 1; } } elsif (!defined $TAError) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index c5d38df9d4..9bb78d9102 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -75,12 +75,24 @@ sub BuildWine($$) # Test helpers # +my $InTests; + +sub SetupTest($$) +{ + my ($Test, $Mission) = @_; + + LogMsg "tests\n" if (!$InTests); + $InTests = 1; + + InfoMsg "\n$Running $Test in the $Mission->{Build} Wine\n"; + SetupWineEnvironment($Mission->{Build}); +} + sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - InfoMsg "\nRunning WineTest in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. @@ -128,8 +140,7 @@ sub TestPatch($$) } return 1 if (!@TestList); - InfoMsg "\nRunning the tests in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + SetupTest("the tests", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4751f75e53..59b2d0a0fa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -80,12 +80,13 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { my $Result; + my $Type = "build"; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - ; # Ignore it for now + $Type = "tests"; } elsif ($Line eq "Task: ok") { @@ -102,9 +103,9 @@ sub ParseTaskLog($) } } close($LogFile); - return $Result || "missing"; + return ($Result || "missing", $Type); } - return "nolog:Unable to open the task log for reading: $!"; + return ("nolog:Unable to open the task log for reading: $!", undef); } -- 2.19.1

1 0

[PATCH v5] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 28 Oct '18

28 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 61 +++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 78 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..e02ba1f8a1 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + WCHAR *cue_banner_text; /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED)) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,51 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, const WCHAR *cue_text) +{ + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + heap_free(es->cue_banner_text); + es->cue_banner_text = heap_strdupW(cue_text); + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (!es->cue_banner_text) + { + if (!(es->style & ES_MULTILINE) && buf && size) + *buf = 0; + return FALSE; + } + else + { + if (buf && size) + lstrcpynW(buf, es->cue_banner_text, size); + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4541,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); + heap_free(es->cue_banner_text); heap_free(es); return 0; @@ -4703,6 +4756,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1cbb..bc44d0c240 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,83 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR getcuetestW[5] = {'T',0}; + static const WCHAR testcmp1W[] = {'T','e','s','t',0}; + static const WCHAR testcmp2W[] = {'T','e','s',0}; + static const WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + if (lstrcmpW(getcuetestW, emptyW) != 0) + { + win_skip("skipping for Win XP and 2003 Server.\n"); + DestroyWindow(hwnd_edit); + return; + } + ok(lstrcmpW(getcuetestW, emptyW) == 0, "First char is %c\n", getcuetestW[0]); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 0); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testcmp1W); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(getcuetestW, testcmp2W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3215,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses(); -- 2.17.1

2 4

[PATCH 1/4] rpcrt4: Add comments explaining the arguments to EmbeddedPointerUnmarshall().
by Zebediah Figura 28 Oct '18

28 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b48b30099b..d1edf2ca05 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -856,9 +856,9 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, STD_OVERFLOW_CHECK(pStubMsg); } -/*********************************************************************** - * PointerUnmarshall [internal] - */ +/* pPointer is the pointer that we will unmarshal into; pSrcPointer is the + * pointer to memory which we may attempt to reuse if non-NULL. Usually these + * are the same; for the case when they aren't, see EmbeddedPointerUnmarshall(). */ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, unsigned char **pPointer, @@ -1228,9 +1228,14 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } -/*********************************************************************** - * EmbeddedPointerUnmarshall - */ +/* rpcrt4 does something bizarre with embedded pointers: instead of copying the + * struct/array/union from the buffer to memory and then unmarshalling pointers + * into it, it unmarshals pointers into the buffer itself and then copies it to + * memory. However, it will still attempt to use a user-supplied pointer where + * appropriate (i.e. one on stack). Therefore we need to pass both pointers to + * this function and to PointerUnmarshall: the pointer (to the buffer) that we + * will actually unmarshal into (pDstBuffer), and the pointer (to memory) that + * we will attempt to use for storage if possible (pSrcMemoryPtrs). */ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pDstBuffer, unsigned char *pSrcMemoryPtrs, -- 2.18.0

1 3

[PATCH v2] advapi32: add stub for RegQueryReflectionKey
by Louis Lenders 28 Oct '18

28 Oct '18

v2: I forgot to include spec file changes when i committed, now included in v2 for https://bugs.winehq.org/show_bug.cgi?id=45796 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 9 +++++++++ include/winreg.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 5845ae0878..113ee54f93 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -668,7 +668,7 @@ @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) @ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) -# @ stub RegQueryReflectionKey +@ stdcall RegQueryReflectionKey(long ptr) @ stdcall RegQueryValueA(long str ptr ptr) @ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a83341fbb4..9989097ff4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1194,6 +1194,15 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW return RtlNtStatusToDosError( status ); } +/****************************************************************************** + * RegQueryReflectionKey [ADVAPI32.@] + */ +LONG WINAPI RegQueryReflectionKey( HKEY hkey, BOOL *is_reflection_disabled ) +{ + FIXME( "%p, %p stub\n", hkey, is_reflection_disabled ); + *is_reflection_disabled = TRUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} /****************************************************************************** * RegCloseKey [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index ddbd929378..51e9f02c3a 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,7 @@ WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,L WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) +WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); WINADVAPI LSTATUS WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue) -- 2.17.1

1 0

[PATCH] ntdll: Avoid more race conditions in RtlDeregisterWaitEx.
by Stefan Dösinger 28 Oct '18

28 Oct '18

af35aada9b078f8dc71dcc85e505da8eee4571da left some issues unfixed. Instead of running the callback and returning a retval that indicates the callback is not running, we sometimes wait for it when we are not supposed to. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- WGC calls RtlDeregisterWaitEx(wait, NULL) while holding a critical section that the wait callback will try to acquire. We must not wait for the callback to finish with a NULL wait event under any circumstances, otherwise WGC will deadlock. To make matters worse, WGC manages to fairly reliably hit the racy case where the wait is signalled at the same time it is cancelled. If RtlDeregisterWaitEx thinks the callback is not running it will wait for the worker thread to finish before returning STATUS_SUCCESS. We can't return STATUS_PENDING if the callback is not running (see tests) and we must not return STATUS_SUCCESS and execute the callback. So make sure that after we decide the callback is not running the callback will not start to run. --- dlls/ntdll/threadpool.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1b0546a7816..bf7449cdfa6 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -81,7 +81,7 @@ struct wait_work_item ULONG Flags; HANDLE CompletionEvent; LONG DeleteCount; - BOOLEAN CallbackInProgress; + int CallbackInProgress; }; struct timer_queue; @@ -530,9 +530,14 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) wait_work_item->Context ); TimerOrWaitFired = TRUE; } - wait_work_item->CallbackInProgress = TRUE; + interlocked_xchg( &wait_work_item->CallbackInProgress, TRUE ); + if (wait_work_item->CompletionEvent) + { + TRACE( "Work has been canceled.\n" ); + break; + } wait_work_item->Callback( wait_work_item->Context, TimerOrWaitFired ); - wait_work_item->CallbackInProgress = FALSE; + interlocked_xchg( &wait_work_item->CallbackInProgress, FALSE ); if (wait_work_item->Flags & WT_EXECUTEONLYONCE) break; @@ -546,7 +551,8 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) { completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); - if (completion_event) NtSetEvent( completion_event, NULL ); + if (completion_event && completion_event != INVALID_HANDLE_VALUE) + NtSetEvent( completion_event, NULL ); } return 0; @@ -637,14 +643,16 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) struct wait_work_item *wait_work_item = WaitHandle; NTSTATUS status; HANDLE LocalEvent = NULL; - BOOLEAN CallbackInProgress; + int CallbackInProgress; TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, INVALID_HANDLE_VALUE ); CallbackInProgress = wait_work_item->CallbackInProgress; + TRACE( "callback in progress %u\n", CallbackInProgress ); if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); @@ -666,6 +674,7 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) } else if (LocalEvent) { + TRACE( "Waiting for completion event\n" ); NtWaitForSingleObject( LocalEvent, FALSE, NULL ); status = STATUS_SUCCESS; } -- 2.18.1

1 0

Wine staging 3.19 release
by Alistair Leslie-Hughes 28 Oct '18

28 Oct '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.19 (XXX patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * kernel32/tests: Fix compilation with PSDK. * kernel32/tests: Fix a bunch of access denied errors by using a dedicated TEMP directory. * kernel32/tests: Move the MoveFile test where it belongs. * kernel32: MoveFile(source, source) should succeed. * kernel32: MoveFile should make sure that it has the delete access to the source file. * include: Add natupnp.idl * hnetcfg: Register NATUPnP interface * hnetcfg: Support IUPnPNAT interface * hnetcfg: Linked to uuid * hnetcfg/tests: Add IUPnPNAT interface tests * shell32: Properly fail when a data object cannot be instantiated and expand environment strings in ShellExecute * kernel32/tests: Add some tests for GetLongPathName/GetShortPathName called with a wildcard. * kernel32: GetShortPathName should fail when called with a wildcard. * kernel32: GetLongPathName should fail when called with a wildcard. * browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog. * ntdll: Implement FileIoCompletionNotificationInformation info class * ntdll: Allow to query file IO completion notification mode * ws2_32/tests: Add test for completion notification flags * ntdll/tests: Add more tests for FileIoCompletionNotificationInformation * server: Skip async completion when possible Added * [45878] hid: Implement HidD_FlushQueue * [45992] xinput: Report SUCCESS from XInputSetState when FFB isn't available. * [42734] kernel32: Implement NormalizeString * [45868] shell32: Improve semi-stub SHGetStockIconInfo Updated * setupapi-SetupDiGetDeviceInterfaceDetail Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] advapi32: add stub for RegQueryReflectionKey
by Louis Lenders 28 Oct '18

28 Oct '18

for https://bugs.winehq.org/show_bug.cgi?id=45796 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/registry.c | 9 +++++++++ include/winreg.h | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a83341fbb4..9989097ff4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1194,6 +1194,15 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW return RtlNtStatusToDosError( status ); } +/****************************************************************************** + * RegQueryReflectionKey [ADVAPI32.@] + */ +LONG WINAPI RegQueryReflectionKey( HKEY hkey, BOOL *is_reflection_disabled ) +{ + FIXME( "%p, %p stub\n", hkey, is_reflection_disabled ); + *is_reflection_disabled = TRUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} /****************************************************************************** * RegCloseKey [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index ddbd929378..51e9f02c3a 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,7 @@ WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,L WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) +WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); WINADVAPI LSTATUS WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue) -- 2.17.1

1 0

[PATCH] iphlpapi: add stub for GetIpInterfaceTable
by Louis Lenders 28 Oct '18

28 Oct '18

fix https://bugs.winehq.org/show_bug.cgi?id=46015 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ include/netioapi.h | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 30d9ed7efe..b4f77beced 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -105,7 +105,7 @@ @ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry -#@ stub GetIpInterfaceTable +@ stdcall GetIpInterfaceTable( long ptr ) #@ stub GetIpNetEntry2 @ stdcall GetIpNetTable( ptr ptr long ) @ stdcall GetIpNetTable2( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6273949147..5df4cd832b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3304,3 +3304,12 @@ DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY family, PMIB_IPNET_TABLE2 *table) if (!once++) FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetIpInterfaceTable (IPHLPAPI.@) + */ +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE *table) +{ + FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index e9de7ddf14..a41bae0968 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -140,6 +140,12 @@ typedef struct _MIB_IPINTERFACE_ROW BOOLEAN DisableDefaultRoutes; } MIB_IPINTERFACE_ROW, *PMIB_IPINTERFACE_ROW; +typedef struct _MIB_IPINTERFACE_TABLE +{ + ULONG NumEntries; + MIB_IPINTERFACE_ROW Table[ANY_SIZE]; +} MIB_IPINTERFACE_TABLE, *PMIB_IPINTERFACE_TABLE; + typedef struct _MIB_UNICASTIPADDRESS_ROW { SOCKADDR_INET Address; @@ -242,6 +248,7 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); NET_IFINDEX WINAPI if_nametoindex(PCSTR); -- 2.17.1

1 0

[PATCH] dinput: Use the same GUID for Instance and Product
by Brendan McGrath 28 Oct '18

28 Oct '18

This matches the behaviour of DirectInput8 native and appears to be required for some games to recognise the mouse and keyboard as a mouse and keyboard. --- I had a game that worked correctly with dinput native but not with built-in. I wrote a simple program that ran the IDirectInput8::EnumDevices method and found that dinput8=b vs dinput8=n gave different results. One of the differences was that the Instance and Product GUID were the same in native. After applying this patch - the game started working correctly with built-in. dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a64c59c6036..fcc85a90c9c 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -179,7 +179,7 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6d3eff5d525..1d5309ee73c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -121,7 +121,7 @@ static void fill_mouse_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else -- 2.17.1

1 0

[PATCH] ws2_32/tests: Add test for completion notification flags.
by Jacek Caban 26 Oct '18

26 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)

2 1

[PATCH vkd3d 5/5] vkd3d: Accept 0xffffffff as cube count for SRVs.
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 4 +++- tests/d3d12.c | 18 +++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cb1427f94a4a..f857de2dcf0d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1667,7 +1667,9 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; - vkd3d_desc.layer_count = 6 * desc->u.TextureCubeArray.NumCubes; + vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; + if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); break; diff --git a/tests/d3d12.c b/tests/d3d12.c index 49e7a788ef02..25c2fdf80439 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10845,16 +10845,20 @@ static void test_cube_maps(void) const D3D12_SHADER_BYTECODE *ps; unsigned int miplevel_count; unsigned int array_size; + unsigned int cube_count; } ps_tests[] = { - {&ps_cube, 1, 6}, - {&ps_cube, 2, 6}, - {&ps_cube, 3, 6}, + {&ps_cube, 1, 6, 1}, + {&ps_cube, 2, 6, 1}, + {&ps_cube, 3, 6, 1}, + {&ps_cube, 3, 6, ~0u}, - {&ps_cube_array, 1, 12}, - {&ps_cube_array, 2, 12}, - {&ps_cube_array, 3, 12}, + {&ps_cube_array, 1, 12, 2}, + {&ps_cube_array, 1, 12, ~0u}, + {&ps_cube_array, 2, 12, 2}, + {&ps_cube_array, 3, 12, 2}, + {&ps_cube_array, 3, 12, ~0u}, }; memset(&desc, 0, sizeof(desc)); @@ -10913,7 +10917,7 @@ static void test_cube_maps(void) srv_desc.TextureCubeArray.MostDetailedMip = 0; srv_desc.TextureCubeArray.MipLevels = test->miplevel_count; srv_desc.TextureCubeArray.First2DArrayFace = 0; - srv_desc.TextureCubeArray.NumCubes = test->array_size / 6; + srv_desc.TextureCubeArray.NumCubes = test->cube_count; srv_desc.TextureCubeArray.ResourceMinLODClamp = 0.0f; } ID3D12Device_CreateShaderResourceView(context.device, texture, &srv_desc, cpu_handle); -- 2.18.1

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Propagate errors from vkd3d_dxbc_compiler_emit_control_flow_instruction().
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 3 +- libs/vkd3d-shader/spirv.c | 35 +++++++++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index ac163583b65a..b9472a2432e5 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -34,7 +34,8 @@ enum vkd3d_result VKD3D_ERROR = -1, /* unspecified failure */ VKD3D_ERROR_OUT_OF_MEMORY = -2, VKD3D_ERROR_INVALID_ARGUMENT = -3, - VKD3D_ERROR_NOT_IMPLEMENTED = -4, + VKD3D_ERROR_INVALID_SHADER = -4, + VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f2ed8b888dbf..13631a07fd1b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5079,7 +5079,7 @@ static struct vkd3d_control_flow_info *vkd3d_dxbc_compiler_find_innermost_breaka return NULL; } -static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, +static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { uint32_t loop_header_block_id, loop_body_block_id, continue_block_id; @@ -5095,7 +5095,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { case VKD3DSIH_IF: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, instruction->flags, 1, val_id); @@ -5149,7 +5149,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ case VKD3DSIH_LOOP: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; loop_header_block_id = vkd3d_spirv_alloc_id(builder); loop_body_block_id = vkd3d_spirv_alloc_id(builder); @@ -5190,7 +5190,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ case VKD3DSIH_SWITCH: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; merge_block_id = vkd3d_spirv_alloc_id(builder); @@ -5206,8 +5206,6 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ cf_info->u.switch_.case_blocks = NULL; cf_info->u.switch_.case_blocks_size = 0; cf_info->u.switch_.case_block_count = 0; - vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, - 10, sizeof(*cf_info->u.switch_.case_blocks)); cf_info->u.switch_.default_block_id = 0; cf_info->inside_block = false; cf_info->current_block = VKD3D_BLOCK_SWITCH; @@ -5215,6 +5213,11 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ vkd3d_spirv_build_op_name(builder, merge_block_id, "switch%u_merge", compiler->switch_id); ++compiler->switch_id; + + if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, + 10, sizeof(*cf_info->u.switch_.case_blocks))) + return VKD3D_ERROR_OUT_OF_MEMORY; + break; case VKD3DSIH_ENDSWITCH: @@ -5252,7 +5255,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, 2 * (cf_info->u.switch_.case_block_count + 1), sizeof(*cf_info->u.switch_.case_blocks))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; label_id = vkd3d_spirv_alloc_id(builder); if (cf_info->inside_block) /* fall-through */ @@ -5292,7 +5295,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(breakable_cf_info = vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct(compiler))) { FIXME("Unhandled break instruction.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } if (breakable_cf_info->current_block == VKD3D_BLOCK_LOOP) @@ -5318,7 +5321,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'breakc' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, @@ -5336,7 +5339,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continue' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } vkd3d_spirv_build_op_branch(builder, loop_cf_info->u.loop.continue_block_id); @@ -5352,7 +5355,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continuec' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, @@ -5380,6 +5383,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; } + + return VKD3D_OK; } static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compiler *compiler, @@ -6474,9 +6479,11 @@ static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx return VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT; } -void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, +int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + int ret = VKD3D_OK; + if (!is_dcl_instruction(instruction->handler_idx) && !compiler->after_declarations_section) { compiler->after_declarations_section = true; @@ -6681,7 +6688,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: case VKD3DSIH_TEXKILL: - vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); + ret = vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); break; case VKD3DSIH_DSX: case VKD3DSIH_DSX_COARSE: @@ -6774,6 +6781,8 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler default: FIXME("Unhandled instruction %#x.\n", instruction->handler_idx); } + + return ret; } static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 348fa5d6e7c6..71410f1d10cb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,10 +120,13 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, return VKD3D_ERROR_INVALID_ARGUMENT; } - vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction); + if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) + break; } - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + if (ret >= 0) + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a2747acd09b2..1d79c91602b8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -809,7 +809,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; -void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, +int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; -- 2.18.1

2 1

[PATCH vkd3d 1/5] tests: Annotate another fall-through switch case (Coverity).
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b9e4a7004837..49e7a788ef02 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15457,6 +15457,7 @@ static void test_uav_load(void) { default: trace("Unhandled format %#x.\n", test->uav_desc.Format); + /* fall-through */ case DXGI_FORMAT_R32_FLOAT: cpu_handle = rtv_float; break; -- 2.18.1

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Add asserts() to vkd3d_dxbc_compiler_emit_control_flow_instruction().
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f6e5746084e1..f2ed8b888dbf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5287,6 +5287,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *breakable_cf_info; + assert(compiler->control_flow_depth); + if (!(breakable_cf_info = vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct(compiler))) { FIXME("Unhandled break instruction.\n"); @@ -5311,6 +5313,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *loop_cf_info; + assert(compiler->control_flow_depth); + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'breakc' instruction outside loop.\n"); @@ -5327,6 +5331,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *loop_cf_info; + assert(compiler->control_flow_depth); + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continue' instruction outside loop.\n"); -- 2.18.1

2 1

[PATCH vkd3d 4/5] build: Check VK_HEADER_VERSION.
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 3 +++ m4/vulkan.m4 | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 m4/vulkan.m4 diff --git a/configure.ac b/configure.ac index 58672c510ab9..618b8c098876 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,9 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION +AS_IF([test "$vkd3d_cv_vk_header_version" -lt 84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/m4/vulkan.m4 b/m4/vulkan.m4 new file mode 100644 index 000000000000..088be7d5faae --- /dev/null +++ b/m4/vulkan.m4 @@ -0,0 +1,19 @@ +dnl VKD3D_CHECK_VULKAN_HEADER_VERSION +AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION], + +[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version) +AC_CACHE_CHECK([VK_HEADER_VERSION], vkd3d_vk_version, + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([#include <stdio.h> + #include <vulkan/vulkan.h> + int main(void) + { + FILE *f = fopen("conftest.out", "wb"); + if (!f) return 1; + fprintf(f, "%u", VK_HEADER_VERSION); + fclose(f); + return 0; + }])], + [AS_VAR_SET([vkd3d_vk_version], [`cat conftest.out`])], + [AS_VAR_SET([vkd3d_vk_version], [0])])]) +AS_VAR_POPDEF([vkd3d_vk_version])]) -- 2.18.1

2 2

[PATCH 5/5] wined3d: Move the "buffer_object_usage" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1481e9bc6f6..17bcb70bc34 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -257,7 +257,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - buffer_gl->b.buffer_object_usage = gl_usage; + buffer_gl->buffer_object_usage = gl_usage; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; @@ -827,7 +827,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, if (flags & WINED3D_MAP_DISCARD) { GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, - NULL, buffer_gl->b.buffer_object_usage)); + NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 226fdd0d3f5..2b52218972f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3759,7 +3759,6 @@ struct wined3d_buffer struct wined3d_buffer_desc desc; GLuint buffer_object; - GLenum buffer_object_usage; unsigned int bind_flags; DWORD flags; DWORD locations; @@ -3799,6 +3798,7 @@ struct wined3d_buffer_gl { struct wined3d_buffer b; + GLenum buffer_object_usage; GLenum buffer_type_hint; }; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the "buffer_type_hint" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 203 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 14 +-- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 115 insertions(+), 105 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4b66193746f..1481e9bc6f6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,9 +133,9 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { - context_bind_bo(context, buffer->buffer_type_hint, buffer->buffer_object); + context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); } /* Context activation is done by the caller. */ @@ -194,14 +194,14 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w } /* Context activation is done by the caller. */ -static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) +static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; - TRACE("Creating an OpenGL buffer object for wined3d_buffer %p with usage %s.\n", - buffer, debug_d3dusage(buffer->resource.usage)); + TRACE("Creating an OpenGL buffer object for wined3d buffer %p with usage %s.\n", + buffer_gl, debug_d3dusage(buffer_gl->b.resource.usage)); /* Make sure that the gl error is cleared. Do not use checkGLcall * here because checkGLcall just prints a fixme and continues. However, @@ -216,15 +216,15 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &buffer->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &buffer_gl->b.buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); - if (!buffer->buffer_object || error != GL_NO_ERROR) + if (!buffer_gl->b.buffer_object || error != GL_NO_ERROR) { ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -232,22 +232,24 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi goto fail; } - if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, + GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, + GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE"); - buffer->flags |= WINED3D_BUFFER_APPLESYNC; + buffer_gl->b.flags |= WINED3D_BUFFER_APPLESYNC; } /* No setup is needed here for GL_ARB_map_buffer_range. */ } - GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, gl_usage)); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -255,17 +257,17 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi goto fail; } - buffer->buffer_object_usage = gl_usage; - buffer_invalidate_bo_range(buffer, 0, 0); + buffer_gl->b.buffer_object_usage = gl_usage; + buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_destroy_buffer_object(buffer, context); - buffer_clear_dirty_areas(buffer); + buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; + buffer_destroy_buffer_object(&buffer_gl->b, context); + buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -532,18 +534,18 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, +static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, + GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("glBufferSubData"); @@ -600,7 +602,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_upload_ranges(buffer, context, data, 0, buffer->modified_areas, buffer->maps); + wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), + context, data, 0, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -627,7 +630,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); return FALSE; } - return buffer_create_buffer_object(buffer, context); + return wined3d_buffer_gl_create_buffer_object(wined3d_buffer_gl(buffer), context); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -638,6 +641,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("buffer %p, context %p, location %s.\n", @@ -672,15 +676,15 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - buffer_bind(buffer, context); - GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, + wined3d_buffer_gl_bind(buffer_gl, context); + GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); break; case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) - wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, + wined3d_buffer_gl_upload_ranges(buffer_gl, context, buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); @@ -809,7 +813,8 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) } /* The caller provides a context and binds the buffer */ -static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const struct wined3d_gl_info *gl_info) +static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, + DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_fence_result ret; HRESULT hr; @@ -821,16 +826,17 @@ static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const if (flags & WINED3D_MAP_DISCARD) { - GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, buffer->buffer_object_usage)); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, + NULL, buffer_gl->b.buffer_object_usage)); checkGLcall("glBufferData"); return; } - if (!buffer->fence) + if (!buffer_gl->b.fence) { - TRACE("Creating fence for buffer %p.\n", buffer); + TRACE("Creating fence for buffer %p.\n", buffer_gl); - if (FAILED(hr = wined3d_fence_create(buffer->resource.device, &buffer->fence))) + if (FAILED(hr = wined3d_fence_create(buffer_gl->b.resource.device, &buffer_gl->b.fence))) { if (hr == WINED3DERR_NOTAVAILABLE) FIXME("Fences not supported, dropping async buffer locks.\n"); @@ -844,8 +850,8 @@ static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const return; } - TRACE("Synchronizing buffer %p.\n", buffer); - ret = wined3d_fence_wait(buffer->fence, buffer->resource.device); + TRACE("Synchronizing buffer %p.\n", buffer_gl); + ret = wined3d_fence_wait(buffer_gl->b.fence, buffer_gl->b.resource.device); switch (ret) { case WINED3D_FENCE_NOT_STARTED: @@ -863,16 +869,16 @@ static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const } drop_fence: - if (buffer->fence) + if (buffer_gl->b.fence) { - wined3d_fence_destroy(buffer->fence); - buffer->fence = NULL; + wined3d_fence_destroy(buffer_gl->b.fence); + buffer_gl->b.fence = NULL; } gl_info->gl_ops.gl.p_glFinish(); - GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); - checkGLcall("glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); - buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); + buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } static void buffer_mark_used(struct wined3d_buffer *buffer) @@ -996,18 +1002,19 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } -static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) +static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, + unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { - struct wined3d_device *device = buffer->resource.device; + struct wined3d_device *device = buffer_gl->b.resource.device; struct wined3d_context *context; LONG count; BYTE *base; - TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); + TRACE("buffer_gl %p, offset %u, size %u, data %p, flags %#x.\n", buffer_gl, offset, size, data, flags); - count = ++buffer->resource.map_count; + count = ++buffer_gl->b.resource.map_count; - if (buffer->buffer_object) + if (buffer_gl->b.buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; @@ -1022,18 +1029,18 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + || (!(flags & WINED3D_MAP_WRITE) && (buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) + || buffer_gl->b.flags & WINED3D_BUFFER_PIN_SYSMEM) { - if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + if (!(buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) { context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); context_release(context); } if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_invalidate_range(&buffer_gl->b, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } else { @@ -1043,19 +1050,19 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); else - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); if (flags & WINED3D_MAP_WRITE) - buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + buffer_invalidate_bo_range(&buffer_gl->b, dirty_offset, dirty_size); - if ((flags & WINED3D_MAP_DISCARD) && buffer->resource.heap_memory) - wined3d_buffer_evict_sysmem(buffer); + if ((flags & WINED3D_MAP_DISCARD) && buffer_gl->b.resource.heap_memory) + wined3d_buffer_evict_sysmem(&buffer_gl->b); if (count == 1) { - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1064,49 +1071,49 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI * buffer. The r600g driver only does this when the buffer is * currently in use, while the proprietary NVIDIA driver * appears to do this unconditionally. */ - if (buffer->flags & WINED3D_BUFFER_DISCARD) + if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); - buffer->map_ptr = GL_EXTCALL(glMapBufferRange(buffer->buffer_type_hint, - 0, buffer->resource.size, mapflags)); + buffer_gl->b.map_ptr = GL_EXTCALL(glMapBufferRange(buffer_gl->buffer_type_hint, + 0, buffer_gl->b.resource.size, mapflags)); checkGLcall("glMapBufferRange"); } else { - if (buffer->flags & WINED3D_BUFFER_APPLESYNC) - buffer_sync_apple(buffer, flags, gl_info); - buffer->map_ptr = GL_EXTCALL(glMapBuffer(buffer->buffer_type_hint, + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); + buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, GL_READ_WRITE)); checkGLcall("glMapBuffer"); } - if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); - GL_EXTCALL(glUnmapBuffer(buffer->buffer_type_hint)); + GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); checkGLcall("glUnmapBuffer"); - buffer->map_ptr = NULL; + buffer_gl->b.map_ptr = NULL; - if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) { /* The extra copy is more expensive than not using VBOs at * all on the Nvidia Linux driver, which is the only driver * that returns unaligned pointers. */ TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(buffer); + wined3d_buffer_drop_bo(&buffer_gl->b); } else { TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); + buffer_gl->b.flags |= WINED3D_BUFFER_PIN_SYSMEM; } - TRACE("New pointer is %p.\n", buffer->resource.heap_memory); + TRACE("New pointer is %p.\n", buffer_gl->b.resource.heap_memory); } } @@ -1114,10 +1121,10 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } if (flags & WINED3D_MAP_DISCARD) - buffer->flags |= WINED3D_BUFFER_DISCARD; + buffer_gl->b.flags |= WINED3D_BUFFER_DISCARD; } - base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory; + base = buffer_gl->b.map_ptr ? buffer_gl->b.map_ptr : buffer_gl->b.resource.heap_memory; *data = base + offset; TRACE("Returning memory at %p (base %p, offset %u).\n", *data, base, offset); @@ -1126,64 +1133,64 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI return WINED3D_OK; } -static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) +static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { ULONG i; - TRACE("buffer %p.\n", buffer); + TRACE("buffer_gl %p.\n", buffer_gl); /* In the case that the number of Unmap calls > the * number of Map calls, d3d returns always D3D_OK. * This is also needed to prevent Map from returning garbage on * the next call (this will happen if the lock_count is < 0). */ - if (!buffer->resource.map_count) + if (!buffer_gl->b.resource.map_count) { WARN("Unmap called without a previous map call.\n"); return; } - if (--buffer->resource.map_count) + if (--buffer_gl->b.resource.map_count) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring unmap.\n"); return; } - if (buffer->map_ptr) + if (buffer_gl->b.map_ptr) { - struct wined3d_device *device = buffer->resource.device; + struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(device, NULL, 0); gl_info = context->gl_info; - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - for (i = 0; i < buffer->modified_areas; ++i) + for (i = 0; i < buffer_gl->b.modified_areas; ++i) { - GL_EXTCALL(glFlushMappedBufferRange(buffer->buffer_type_hint, - buffer->maps[i].offset, buffer->maps[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(buffer_gl->buffer_type_hint, + buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRange"); } } - else if (buffer->flags & WINED3D_BUFFER_APPLESYNC) + else if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) { - for (i = 0; i < buffer->modified_areas; ++i) + for (i = 0; i < buffer_gl->b.modified_areas; ++i) { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer->buffer_type_hint, - buffer->maps[i].offset, buffer->maps[i].size)); + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, + buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } } - GL_EXTCALL(glUnmapBuffer(buffer->buffer_type_hint)); + GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); context_release(context); - buffer_clear_dirty_areas(buffer); - buffer->map_ptr = NULL; + buffer_clear_dirty_areas(&buffer_gl->b); + buffer_gl->b.map_ptr = NULL; } } @@ -1204,8 +1211,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - context_copy_bo_address(context, &dst, dst_buffer->buffer_type_hint, - &src, src_buffer->buffer_type_hint, size); + context_copy_bo_address(context, &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, + &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); @@ -1227,7 +1234,7 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co range.size = buffer->resource.size; } - wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); + wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), context, data, range.offset, 1, &range); } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, @@ -1274,7 +1281,7 @@ static void buffer_resource_preload(struct wined3d_resource *resource) static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - struct wined3d_buffer *buffer = buffer_from_resource(resource); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); UINT offset, size; if (sub_resource_idx) @@ -1293,8 +1300,8 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc offset = size = 0; } - map_desc->row_pitch = map_desc->slice_pitch = buffer->desc.byte_width; - return wined3d_buffer_map(buffer, offset, size, (BYTE **)&map_desc->data, flags); + map_desc->row_pitch = map_desc->slice_pitch = buffer_gl->b.desc.byte_width; + return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); } static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) @@ -1305,7 +1312,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou return E_INVALIDARG; } - wined3d_buffer_unmap(buffer_from_resource(resource)); + wined3d_buffer_gl_unmap(wined3d_buffer_gl(buffer_from_resource(resource))); return WINED3D_OK; } @@ -1377,7 +1384,6 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return hr; } buffer->desc = *desc; - buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); buffer->bind_flags = desc->bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; @@ -1444,6 +1450,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_buffer_gl *object; HRESULT hr; @@ -1456,6 +1463,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + object->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7bb8b81c0db..35d15e63195 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1023,8 +1023,8 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format_gl *format; + struct wined3d_buffer_gl *buffer_gl; struct wined3d_resource *resource; - struct wined3d_buffer *buffer; unsigned int offset, size; resource = view->resource; @@ -1049,13 +1049,13 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi return; } - buffer = buffer_from_resource(resource); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - get_buffer_view_range(buffer, &view->desc, &format->f, &offset, &size); - context_bind_bo(context, buffer->buffer_type_hint, buffer->buffer_object); - GL_EXTCALL(glClearBufferSubData(buffer->buffer_type_hint, format->internal, + get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); + context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); + GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); } @@ -1092,7 +1092,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = view->counter_bo; src.addr = NULL; - context_copy_bo_address(context, &dst, buffer->buffer_type_hint, + context_copy_bo_address(context, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0402603c527..226fdd0d3f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3760,7 +3760,6 @@ struct wined3d_buffer GLuint buffer_object; GLenum buffer_object_usage; - GLenum buffer_type_hint; unsigned int bind_flags; DWORD flags; DWORD locations; @@ -3799,6 +3798,8 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co struct wined3d_buffer_gl { struct wined3d_buffer b; + + GLenum buffer_type_hint; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Introduce a separate structure for OpenGL buffer information.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5b3419d29e0..4b66193746f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -782,7 +782,7 @@ static void wined3d_buffer_destroy_object(void *object) } heap_free(buffer->maps); - heap_free(buffer); + heap_free(wined3d_buffer_gl(buffer)); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -1444,7 +1444,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { - struct wined3d_buffer *object; + struct wined3d_buffer_gl *object; HRESULT hr; TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " @@ -1456,7 +1456,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_buffer_init(object, device, desc, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); @@ -1465,7 +1465,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct TRACE("Created buffer %p.\n", object); - *buffer = object; + *buffer = &object->b; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3abe5e6154d..0402603c527 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3796,6 +3796,16 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +struct wined3d_buffer_gl +{ + struct wined3d_buffer b; +}; + +static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + struct wined3d_rendertarget_view { LONG refcount; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Introduce a separate structure for OpenGL device information.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 16 +++++++++++++--- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3d1a48321f1..800634e61a7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1745,7 +1745,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC /* Context activation is done by the caller. */ void context_bind_dummy_textures(const struct wined3d_context *context) { - const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; @@ -2286,7 +2286,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ - if (device->dummy_textures.tex_2d) + if (wined3d_device_gl(device)->dummy_textures.tex_2d) context_bind_dummy_textures(context); /* Initialise all rectangles to avoid resetting unused ones later. */ @@ -2520,7 +2520,7 @@ void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint nam void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) { - const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD unit = context->active_texture; DWORD old_texture_type = context->texture_type[unit]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17ef5d90148..8b202fce0cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -523,7 +523,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) wined3d_decref(device->wined3d); device->wined3d = NULL; - heap_free(device); + heap_free(wined3d_device_gl(device)); TRACE("Freed device %p.\n", device); } @@ -610,7 +610,7 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_dummy_textures *textures = &device->dummy_textures; + struct wined3d_dummy_textures *textures = &wined3d_device_gl(device)->dummy_textures; const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; @@ -744,7 +744,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ /* Context activation is done by the caller. */ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_dummy_textures *dummy_textures = &device->dummy_textures; + struct wined3d_dummy_textures *dummy_textures = &wined3d_device_gl(device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4aabb53917..e65db79decd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2419,7 +2419,7 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - struct wined3d_device *object; + struct wined3d_device_gl *device_gl; HRESULT hr; TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " @@ -2430,20 +2430,20 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(device_gl = heap_alloc_zero(sizeof(*device_gl)))) return E_OUTOFMEMORY; - if (FAILED(hr = device_init(object, wined3d, adapter_idx, + if (FAILED(hr = device_init(&device_gl->d, wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(object); + heap_free(device_gl); return hr; } - TRACE("Created device %p.\n", object); - *device = object; + TRACE("Created device %p.\n", device_gl); + *device = &device_gl->d; device_parent->ops->wined3d_device_created(device_parent, *device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 88dce65a15a..3abe5e6154d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3029,9 +3029,6 @@ struct wined3d_device /* The Wine logo texture */ struct wined3d_texture *logo_texture; - /* Textures for when no other textures are mapped */ - struct wined3d_dummy_textures dummy_textures; - /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ struct wined3d_sampler *default_sampler; struct wined3d_sampler *null_sampler; @@ -3059,6 +3056,19 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +struct wined3d_device_gl +{ + struct wined3d_device d; + + /* Textures for when no other textures are bound. */ + struct wined3d_dummy_textures dummy_textures; +}; + +static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_gl, d); +} + static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { DWORD idx = state / (sizeof(*context->isStateDirty) * CHAR_BIT); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Get rid of the "device" parameter to context_bind_dummy_textures().
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bdd291b74f5..3d1a48321f1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1743,7 +1743,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) +void context_bind_dummy_textures(const struct wined3d_context *context) { const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2287,7 +2287,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (device->dummy_textures.tex_2d) - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b50d6677ab2..17ef5d90148 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -738,7 +738,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("create dummy textures"); - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33d248fcfdd..88dce65a15a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2156,8 +2156,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_device *device, - const struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, -- 2.11.0

1 0

[PATCH 3/3] crypt32: CertComparePublicKeyInfo should not try to decode a non-RSA public key.
by Dmitry Timoshkov 26 Oct '18

26 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 7 +++++++ dlls/crypt32/tests/cert.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9157814d69..d09d049b8b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -28,6 +28,7 @@ #include "winternl.h" #define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" +#include "snmp.h" #include "bcrypt.h" #include "winnls.h" #include "rpc.h" @@ -1242,6 +1243,12 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pPublicKey1, pPublicKey2); + /* RSA public key data should start with ASN_SEQUENCE, + * otherwise it's not a RSA_CSP_PUBLICKEYBLOB. + */ + if (!pPublicKey1->PublicKey.cbData || pPublicKey1->PublicKey.pbData[0] != ASN_SEQUENCE) + dwCertEncodingType = 0; + switch (GET_CERT_ENCODING_TYPE(dwCertEncodingType)) { case 0: /* Seems to mean "raw binary bits" */ diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index cc7bd4c88b..f653741ea7 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3210,7 +3210,6 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); /* Different OIDs appear to compare */ @@ -3219,14 +3218,12 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info1.PublicKey.cbData = sizeof(bits1); @@ -3238,7 +3235,6 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info2.Algorithm.pszObjId = oid_rsa_rsa; @@ -3297,11 +3293,9 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info1); ok(ret, "CertComparePublicKeyInfo: as raw binary: keys should be equal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); -todo_wine ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); -todo_wine ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); /* ASN.1 encoded non-comparing case */ -- 2.17.1

1 0

[PATCH 2/3] crypt32/tests: Add more tests for CertComparePublicKeyInfo.
by Dmitry Timoshkov 26 Oct '18

26 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/tests/cert.c | 63 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d6c249c6f3..cc7bd4c88b 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3196,9 +3196,12 @@ static void testComparePublicKeyInfo(void) static BYTE bits1[] = { 1, 0 }; static BYTE bits2[] = { 0 }; static BYTE bits3[] = { 1 }; - static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; - static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; - static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; + static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits7[] = { 0x04,8, 2,1,0x81, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ + static BYTE bits8[] = { 0x04,9, 2,2,0,0x81, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ + static BYTE bits9[] = { 0x04,9, 2,2,0,0x82, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ /* crashes ret = CertComparePublicKeyInfo(0, NULL, NULL); @@ -3206,14 +3209,26 @@ static void testComparePublicKeyInfo(void) /* Empty public keys compare */ ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + /* Different OIDs appear to compare */ info1.Algorithm.pszObjId = oid_rsa_rsa; info2.Algorithm.pszObjId = oid_rsa_sha1rsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info1.PublicKey.cbData = sizeof(bits1); info1.PublicKey.pbData = bits1; info1.PublicKey.cUnusedBits = 0; @@ -3222,6 +3237,10 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_rsa_rsa; info1.PublicKey.cbData = sizeof(bits4); info1.PublicKey.pbData = bits4; @@ -3233,6 +3252,7 @@ static void testComparePublicKeyInfo(void) ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cUnusedBits = 1; info2.PublicKey.cUnusedBits = 5; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); @@ -3252,11 +3272,38 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); /* Simple (non-comparing) case */ ok(!ret, "Expected keys not to compare\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "Expected keys not to compare\n"); + info2.PublicKey.cbData = sizeof(bits1); info2.PublicKey.pbData = bits1; info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(!ret, "Expected keys not to compare\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "Expected keys not to compare\n"); + + info1.PublicKey.cbData = sizeof(bits7); + info1.PublicKey.pbData = bits7; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits8); + info2.PublicKey.pbData = bits8; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(0, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be unequal\n"); + + ret = CertComparePublicKeyInfo(0, &info1, &info1); + ok(ret, "CertComparePublicKeyInfo: as raw binary: keys should be equal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); +todo_wine + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); +todo_wine + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + /* ASN.1 encoded non-comparing case */ info1.PublicKey.cbData = sizeof(bits5); info1.PublicKey.pbData = bits5; @@ -3266,6 +3313,16 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); + + /* ASN.1 encoded non-comparing case */ + info1.PublicKey.cbData = sizeof(bits8); + info1.PublicKey.pbData = bits8; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits9); + info2.PublicKey.pbData = bits9; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); } static void testHashPublicKeyInfo(void) -- 2.17.1

1 0

[PATCH 1/3] crypt32: Trace entry contents in CryptInstallOIDFunctionAddress.
by Dmitry Timoshkov 26 Oct '18

26 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/oid.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 1eb82829d2..d6c411c791 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -250,6 +250,8 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, { struct OIDFunction *func; + TRACE("OID %s, func %p\n", debugstr_a(rgFuncEntry[i].pszOID), rgFuncEntry[i].pvFuncAddr); + if (!IS_INTOID(rgFuncEntry[i].pszOID)) func = CryptMemAlloc(sizeof(struct OIDFunction) + strlen(rgFuncEntry[i].pszOID) + 1); -- 2.17.1

1 0

[PATCH v2] ntdll: Fix overflow if running 32bit app w/ wine64
by Brendan McGrath 26 Oct '18

26 Oct '18

wine64 was using IMAGE_NT_HEADERS to access header information regardless of the execution type; hence it would use IMAGE_OPTIONAL_HEADER64 for a 32bit app. This could result in an overflow and a request to mmap for a huge amount of memory causing an out of memory error. This patch ensures IMAGE_OPTIONAL_HEADER32 is used for a 32-bit app and IMAGE_OPTIONAL_HEADER64 is used for a 64-bit app Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Fixed the formatting - sorry about that dlls/ntdll/virtual.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index af1509eae5d..a05000f2e2b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1933,9 +1933,26 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi if (!reserve_size || !commit_size) { - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); - if (!reserve_size) reserve_size = nt->OptionalHeader.SizeOfStackReserve; - if (!commit_size) commit_size = nt->OptionalHeader.SizeOfStackCommit; + struct nt + { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + union + { + IMAGE_OPTIONAL_HEADER32 hdr32; + IMAGE_OPTIONAL_HEADER64 hdr64; + } opt; + }; + + struct nt *nt = (struct nt*) RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (nt->opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { + if (!reserve_size) reserve_size = nt->opt.hdr32.SizeOfStackReserve; + if (!commit_size) commit_size = nt->opt.hdr32.SizeOfStackCommit; + } else { + if (!reserve_size) reserve_size = nt->opt.hdr64.SizeOfStackReserve; + if (!commit_size) commit_size = nt->opt.hdr64.SizeOfStackCommit; + } + TRACE("reserve_size: %lu, commit_size: %lu", reserve_size, commit_size); } size = max( reserve_size, commit_size ); -- 2.17.1

4 10

[PATCH 1/2] ntdll: Implement RtlWaitOnAddress functions.
by Daniel Lehman 26 Oct '18

26 Oct '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/ntdll.spec | 3 ++ dlls/ntdll/sync.c | 64 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 83 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++ 4 files changed, 153 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 247f05f561..818ae0090c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -978,6 +978,9 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWaitOnAddress(ptr ptr long ptr) +@ stdcall RtlWakeAddressAll(ptr) +@ stdcall RtlWakeAddressSingle(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 4ae8e36ce0..dc6f7ecf32 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1955,3 +1955,67 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RtlAcquireSRWLockExclusive( lock ); return status; } + +static HANDLE woa_event; +static RTL_RUN_ONCE init_once_woa = RTL_RUN_ONCE_INIT; +static DWORD WINAPI init_woa( RTL_RUN_ONCE *once, void *param, void **context ) +{ + NtCreateKeyedEvent( &woa_event, GENERIC_READ|GENERIC_WRITE, NULL, 0 ); + return TRUE; +} + +/*********************************************************************** + * RtlWaitOnAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + switch (size) + { + case 1: + if (*(const UCHAR *)addr != *(const UCHAR *)cmp) + return STATUS_SUCCESS; + break; + case 2: + if (*(const USHORT *)addr != *(const USHORT *)cmp) + return STATUS_SUCCESS; + break; + case 4: + if (*(const ULONG *)addr != *(const ULONG *)cmp) + return STATUS_SUCCESS; + break; + case 8: + if (*(const ULONG64 *)addr != *(const ULONG64 *)cmp) + return STATUS_SUCCESS; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + RtlRunOnceExecuteOnce( &init_once_woa, init_woa, NULL, NULL ); + return NtWaitForKeyedEvent( woa_event, addr, 0, timeout ); +} + +/*********************************************************************** + * RtlWakeAddressAll (NTDLL.@) + */ +void WINAPI RtlWakeAddressAll( const void *addr ) +{ + LARGE_INTEGER now; + + RtlRunOnceExecuteOnce( &init_once_woa, init_woa, NULL, NULL ); + NtQuerySystemTime( &now ); + while (NtReleaseKeyedEvent( woa_event, addr, 0, &now ) == STATUS_SUCCESS) {} +} + +/*********************************************************************** + * RtlWakeAddressSingle (NTDLL.@) + */ +void WINAPI RtlWakeAddressSingle( const void *addr ) +{ + LARGE_INTEGER now; + + RtlRunOnceExecuteOnce( &init_once_woa, init_woa, NULL, NULL ); + NtQuerySystemTime( &now ); + NtReleaseKeyedEvent( woa_event, addr, 0, &now ); +} diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 524085474d..b83a8fc841 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -70,6 +70,10 @@ static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); +static void (WINAPI *pRtlWakeAddressAll)( const void * ); +static void (WINAPI *pRtlWakeAddressSingle)( const void * ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2064,6 +2068,80 @@ static void test_mutant(void) NtClose( mutant ); } +static void test_wait_on_address(void) +{ + DWORD ticks; + SIZE_T size; + NTSTATUS status; + LARGE_INTEGER timeout; + LONG64 address, compare; + + if (!pRtlWaitOnAddress) + { + win_skip("RtlWaitOnAddress not supported, skipping test\n"); + return; + } + + if (0) /* crash on Windows */ + { + pRtlWaitOnAddress(&address, NULL, 8, NULL); + pRtlWaitOnAddress(NULL, &compare, 8, NULL); + pRtlWaitOnAddress(NULL, NULL, 8, NULL); + } + + /* don't crash */ + pRtlWakeAddressSingle(NULL); + pRtlWakeAddressAll(NULL); + + /* invalid values */ + address = 0; + compare = 0; + status = pRtlWaitOnAddress(&address, &compare, 5, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); + + /* values match */ + address = 0; + compare = 0; + pNtQuerySystemTime(&timeout); + timeout.QuadPart += (LONGLONG)1000*10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 1000 && ticks <= 1500, "got %u\n", ticks); + ok(address == 0, "got %ld\n", address); + ok(compare == 0, "got %ld\n", compare); + + /* different address size */ + for (size = 1; size <= 4; size <<= 1) + { + compare = ~0; + compare <<= size * 8; + + pNtQuerySystemTime(&timeout); + timeout.QuadPart += (LONGLONG)1000 * 10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, size, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 1000 && ticks <= 1500, "got %u\n", ticks); + + status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); + ok(!status, "got 0x%08x\n", status); + } + address = 0; + compare = 1; + status = pRtlWaitOnAddress(&address, &compare, 8, NULL); + ok(!status, "got 0x%08x\n", status); + + /* no waiters */ + address = 0; + pRtlWakeAddressSingle(&address); + ok(address == 0, "got %ld\n", address); + pRtlWakeAddressAll(&address); + ok(address == 0, "got %ld\n", address); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2117,6 +2195,10 @@ START_TEST(om) pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); + pNtQuerySystemTime = (void *)GetProcAddress(hntdll, "NtQuerySystemTime"); + pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); + pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); + pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); test_case_sensitive(); test_namespace_pipe(); @@ -2130,4 +2212,5 @@ START_TEST(om) test_mutant(); test_keyed_events(); test_null_device(); + test_wait_on_address(); } diff --git a/include/winternl.h b/include/winternl.h index 1cec3cfc96..9c8861334a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2865,6 +2865,9 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI NTSTATUS WINAPI RtlWaitOnAddress(const void *,const void *,SIZE_T,const LARGE_INTEGER *); +NTSYSAPI void WINAPI RtlWakeAddressAll(const void *); +NTSYSAPI void WINAPI RtlWakeAddressSingle(const void *); NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); -- 2.17.1

1 1

[v2 PATCH] d2d1: Add ID2D1Factory2 stub.
by Nikolay Sivov 26 Oct '18

26 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: restored masking for previous interface version. We can remove it when command list is implemented. dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 106 +++++++++++++++++++++------------------ dlls/uuid/d2d.c | 2 +- include/Makefile.in | 1 + include/d2d1_2.idl | 58 +++++++++++++++++++++ 5 files changed, 119 insertions(+), 50 deletions(-) create mode 100644 include/d2d1_2.idl diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0a5bc36c9a..5f451b22d9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -25,7 +25,7 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1_1.h" +#include "d2d1_2.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index dea25effa9..d48673cd85 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -32,7 +32,7 @@ struct d2d_settings d2d_settings = struct d2d_factory { - ID2D1Factory1 ID2D1Factory1_iface; + ID2D1Factory2 ID2D1Factory2_iface; LONG refcount; ID3D10Device1 *device; @@ -41,9 +41,9 @@ struct d2d_factory float dpi_y; }; -static inline struct d2d_factory *impl_from_ID2D1Factory1(ID2D1Factory1 *iface) +static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) { - return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory1_iface); + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface); } static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) @@ -64,15 +64,16 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2) + || (IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1Factory1_AddRef(iface); + ID2D1Factory2_AddRef(iface); *out = iface; return S_OK; } @@ -83,9 +84,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory2 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -93,9 +94,9 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -110,18 +111,18 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) return refcount; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory1 *iface) +static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory2 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); TRACE("iface %p.\n", iface); return d2d_factory_reload_sysmetrics(factory); } -static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory2 *iface, float *dpi_x, float *dpi_y) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -129,7 +130,7 @@ static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, fl *dpi_y = factory->dpi_y; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory2 *iface, const D2D1_RECT_F *rect, ID2D1RectangleGeometry **geometry) { struct d2d_geometry *object; @@ -153,7 +154,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory2 *iface, const D2D1_ROUNDED_RECT *rect, ID2D1RoundedRectangleGeometry **geometry) { FIXME("iface %p, rect %p, geometry %p stub!\n", iface, rect, geometry); @@ -161,7 +162,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2 *iface, const D2D1_ELLIPSE *ellipse, ID2D1EllipseGeometry **geometry) { FIXME("iface %p, ellipse %p, geometry %p stub!\n", iface, ellipse, geometry); @@ -169,7 +170,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *iface, D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", @@ -178,7 +179,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory2 *iface, ID2D1Geometry *src_geometry, const D2D1_MATRIX_3X2_F *transform, ID2D1TransformedGeometry **transformed_geometry) { @@ -198,7 +199,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *iface, ID2D1PathGeometry **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory2 *iface, ID2D1PathGeometry **geometry) { struct d2d_geometry *object; @@ -215,7 +216,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *iface, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { @@ -241,7 +242,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory2 *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { @@ -281,10 +282,10 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory2 *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_wic_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -300,7 +301,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return hr; } - if (FAILED(hr = d2d_wic_render_target_init(object, iface, device, target, desc))) + if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory1 *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -313,11 +314,11 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory2 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, ID2D1HwndRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_hwnd_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -330,7 +331,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_hwnd_render_target_init(object, iface, device, desc, hwnd_rt_desc))) + if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory1 *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -343,7 +344,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory2 *iface, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { IDXGIDevice *dxgi_device; @@ -358,7 +359,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 return hr; } - hr = ID2D1Factory1_CreateDevice(iface, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice((ID2D1Factory1 *)iface, dxgi_device, &device); IDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { @@ -371,10 +372,10 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory2 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_dc_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -387,7 +388,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_dc_render_target_init(object, iface, device, desc))) + if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory1 *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -400,7 +401,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { struct d2d_device *object; @@ -410,7 +411,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_device_init(object, iface, dxgi_device); + d2d_device_init(object, (ID2D1Factory1 *)iface, dxgi_device); TRACE("Create device %p.\n", object); *device = &object->ID2D1Device_iface; @@ -418,7 +419,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *iface, const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle1 **stroke_style) { @@ -428,14 +429,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory1 *iface, ID2D1PathGeometry1 **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory2 *iface, ID2D1PathGeometry1 **geometry) { FIXME("iface %p, geometry %p stub!\n", iface, geometry); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory2 *iface, const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock1 **state_block) { @@ -455,7 +456,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Facto return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory2 *iface, IStream *stream, ID2D1GdiMetafile **metafile) { FIXME("iface %p, stream %p, metafile %p stub!\n", iface, stream, metafile); @@ -463,7 +464,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *if return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory2 *iface, REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings, UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) { @@ -473,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory2 *iface, REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings, UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) { @@ -483,14 +484,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Facto return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) +static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory2 *iface, REFCLSID effect_id) { FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory2 *iface, CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered) { FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n", @@ -499,7 +500,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory2 *iface, REFCLSID effect_id, ID2D1Properties **props) { FIXME("iface %p, effect_id %s, props %p stub!\n", iface, debugstr_guid(effect_id), props); @@ -507,7 +508,15 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 * return E_NOTIMPL; } -static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = +static HRESULT STDMETHODCALLTYPE d2d_factory_ID2D1Factory1_CreateDevice(ID2D1Factory2 *iface, IDXGIDevice *dxgi_device, + ID2D1Device1 **device) +{ + FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + + return E_NOTIMPL; +} + +static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = { d2d_factory_QueryInterface, d2d_factory_AddRef, @@ -536,6 +545,7 @@ static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = d2d_factory_UnregisterEffect, d2d_factory_GetRegisteredEffects, d2d_factory_GetEffectProperties, + d2d_factory_ID2D1Factory1_CreateDevice, }; static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, @@ -546,7 +556,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); - factory->ID2D1Factory1_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); } @@ -567,8 +577,8 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("Created factory %p.\n", object); - hr = ID2D1Factory1_QueryInterface(&object->ID2D1Factory1_iface, iid, factory); - ID2D1Factory1_Release(&object->ID2D1Factory1_iface); + hr = ID2D1Factory2_QueryInterface(&object->ID2D1Factory2_iface, iid, factory); + ID2D1Factory2_Release(&object->ID2D1Factory2_iface); return hr; } diff --git a/dlls/uuid/d2d.c b/dlls/uuid/d2d.c index d2cf6db5fa..c74ebc9c49 100644 --- a/dlls/uuid/d2d.c +++ b/dlls/uuid/d2d.c @@ -18,4 +18,4 @@ #include "d3d10_1.h" #include "initguid.h" -#include "d2d1_1.h" +#include "d2d1_2.h" diff --git a/include/Makefile.in b/include/Makefile.in index f60f91970a..47c7b5e328 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -80,6 +80,7 @@ SOURCES = \ cvconst.h \ d2d1.idl \ d2d1_1.idl \ + d2d1_2.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl new file mode 100644 index 0000000000..3506c796cc --- /dev/null +++ b/include/d2d1_2.idl @@ -0,0 +1,58 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d2d1_1.idl"; + +interface ID2D1DeviceContext1; + +typedef enum D2D1_RENDERING_PRIORITY +{ + D2D1_RENDERING_PRIORITY_NORMAL = 0, + D2D1_RENDERING_PRIORITY_LOW = 1, + D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff, +} D2D1_RENDERING_PRIORITY; + +[ + object, + uuid(d21768e1-23a4-4823-a14b-7c3eba85d658), + local, +] +interface ID2D1Device1 : ID2D1Device +{ + D2D1_RENDERING_PRIORITY GetRenderingPriority(); + void SetRenderingPriority( + [in] D2D1_RENDERING_PRIORITY priority + ); + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext1 **device_context + ); +} + +[ + object, + uuid(94f81a73-9212-4376-9c58-b16a3a0d3992), + local, +] +interface ID2D1Factory2 : ID2D1Factory1 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device1 **device + ); +} -- 2.19.1

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 26 Oct '18

26 Oct '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index db5ed00df6..0dbeb081b9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -304,25 +304,23 @@ msgstr "Perutaan..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 jäljellä" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 ja %3!u! %4 jäljellä" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Sekunnit" +msgstr "sekuntia" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuuttia" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "tuntia" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -4586,7 +4584,7 @@ msgstr "Ei voida suorittaa koko ruudulla.\n" #: winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "Lipuketta ei ole.\n" +msgstr "Tunnusta ei ole.\n" #: winerror.mc:1063 msgid "Registry corrupt.\n" @@ -5298,7 +5296,7 @@ msgstr "Virheellinen ensisijainen ryhmä.\n" #: winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "Ei tekeytymislipuketta.\n" +msgstr "Ei tekeytymistunnusta.\n" #: winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5446,7 +5444,7 @@ msgstr "Tekeytymistaso ei kelpaa.\n" #: winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "Nimetöntä suojauslipuketta ei voida avata.\n" +msgstr "Ei voida avata nimetöntä suojaustunnusta.\n" #: winerror.mc:2143 msgid "Bad validation class.\n" @@ -5454,7 +5452,7 @@ msgstr "Vahvistusluokka ei kelpaa.\n" #: winerror.mc:2148 msgid "Bad token type.\n" -msgstr "Väärä avaintyyppi.\n" +msgstr "Väärä tunnuksen tyyppi.\n" #: winerror.mc:2153 msgid "No security on object.\n" @@ -11054,10 +11052,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Virhe: Virheellinen valinta '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Virhe: Prosessia \"%1\" ei löytynyt.\n" +msgstr "Virhe: Ei saatu haettua isäntänimeä: %u.\n" #: hostname.rc:33 msgid "" -- 2.19.1

1 0

[PATCH] wine.inf: Install oledb32,msdaps to the right location for WOW64
by Alistair Leslie-Hughes 26 Oct '18

26 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 77adb8f..f1d00fa 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2577,6 +2577,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,System\OLE DB,oledb32.dll +16427,System\OLE DB,msdaps.dll 11,,* [FakeDlls] -- 1.9.1

1 0

[PATCH vkd3d 05/10] vkd3d: Enable VK_EXT_vertex_attribute_divisor.
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 24 ++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + libs/vkd3d/vulkan_procs.h | 2 ++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 419b9042b178..fca446160db8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -64,6 +64,8 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, + offsetof(struct vkd3d_vulkan_info, EXT_vertex_attribute_divisor)}, }; static bool is_extension_disabled(const char *extension_name) @@ -993,9 +995,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; - VkPhysicalDeviceFeatures device_features; + VkPhysicalDeviceFeatures2 features2; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_count; @@ -1082,11 +1086,19 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); - VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) + memset(&vertex_divisor_features, 0, sizeof(vertex_divisor_features)); + vertex_divisor_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; + features2.pNext = &vertex_divisor_features; + if (vulkan_info->KHR_get_physical_device_properties2) + VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &features2)); + else + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); + + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2.features, &extension_count))) goto done; - device_features.shaderTessellationAndGeometryPointSize = VK_FALSE; + features2.features.shaderTessellationAndGeometryPointSize = VK_FALSE; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { @@ -1096,7 +1108,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_info.pNext = NULL; + device_info.pNext = &vertex_divisor_features; device_info.flags = 0; device_info.queueCreateInfoCount = queue_family_count; device_info.pQueueCreateInfos = queue_info; @@ -1108,7 +1120,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, NULL, 0, NULL, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; - device_info.pEnabledFeatures = &device_features; + device_info.pEnabledFeatures = &features2.features; vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); vkd3d_free(extensions); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4be160b89b9c..e4e1e118cc0a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -83,6 +83,7 @@ struct vkd3d_vulkan_info bool EXT_debug_report; /* device extensions */ bool KHR_push_descriptor; + bool EXT_vertex_attribute_divisor; VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 690a1a2b5acf..e14121c1a76b 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -46,6 +46,8 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) +/* VK_KHR_get_physical_device_properties2 */ +VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR) /* VK_EXT_debug_report */ VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT) -- 2.18.1

5 7

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 26 Oct '18

26 Oct '18

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)

1 0

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

25 Oct '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> --- v2: Merged the first 3 patches, used qsort, replaced goto that broke out of nested scope with a BOOL check, and moved the goto failure path at the end outside of any blocks. dlls/shell32/autocomplete.c | 288 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 228 insertions(+), 60 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index dfe7638..751bda0 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,160 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } +static int enumerate_strings_cmpfn(const void *a, const void *b) +{ + return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); +} + +static void enumerate_strings(IAutoCompleteImpl *ac) +{ + /* + Enumerate all of the strings and sort them in the internal list. Rough summary: + + - Enumerate the strings and place their addresses in a chain of blocks (stack-like) + - Copy the pointers from the blocks into a contiguous array/list + - Sort the contiguous array/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) + */ + struct + { + void *prev; + LPOLESTR str[1020]; + } *prevblock, *curblock; + + UINT i, cur, numstrs = 0; + LPOLESTR *strs; + + prevblock = NULL; + for (;;) + { + LONG rem; + BOOL break_enum = FALSE; + + if ((curblock = heap_alloc(sizeof(*curblock))) == NULL) + { + if (!prevblock) + return; + curblock = prevblock; + cur = ARRAY_SIZE(curblock->str); + goto fail_and_free_blocks; + } + curblock->prev = prevblock; + rem = ARRAY_SIZE(curblock->str); + + while (rem > 0) + { + ULONG n = 0; + cur = ARRAY_SIZE(curblock->str) - rem; + IEnumString_Next(ac->enumstr, rem, &curblock->str[cur], &n); + if (n == 0) + { + break_enum = TRUE; + break; + } + rem -= n; + } + if (break_enum) break; + prevblock = curblock; + numstrs += ARRAY_SIZE(curblock->str); + } + + /* Allocate even if there were zero strings enumerated, to mark it non-NULL */ + numstrs += cur; + if ((strs = heap_alloc(numstrs * sizeof(*strs)))) + { + if (numstrs == 0) + { + ac->enum_strs = strs; + ac->enum_strs_num = numstrs; + heap_free(curblock); + return; + } + + /* Copy the pointers from the chain of blocks to the contiguous list */ + i = numstrs; + do + { + i -= cur; + memcpy(&strs[i], curblock->str, cur * sizeof(*strs)); + + prevblock = curblock->prev; + heap_free(curblock); + curblock = prevblock; + cur = ARRAY_SIZE(curblock->str); + } while (curblock); + + /* Now sort the list */ + qsort(strs, numstrs, sizeof(*strs), enumerate_strings_cmpfn); + + ac->enum_strs = strs; + ac->enum_strs_num = numstrs; + return; + } + +fail_and_free_blocks: + do + { + LPOLESTR *str = curblock->str; + while (cur--) + CoTaskMemFree(str[cur]); + prevblock = curblock->prev; + heap_free(curblock); + curblock = prevblock; + cur = ARRAY_SIZE(curblock->str); + } while (curblock); +} + +static UINT find_first_matching_enum_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len) +{ + WCHAR **strs = ac->enum_strs; + UINT index = ~0, a = 0, 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; + 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) { ShowWindow(hwnd, SW_HIDE); SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); + free_enum_strs(ac); +} + +static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +{ + RECT r; + UINT width, height; + + GetWindowRect(ac->hwndEdit, &r); + SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); + + /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); + width = r.right - r.left; + + SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, width, height, SWP_SHOWWINDOW); } static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) @@ -225,7 +376,11 @@ 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]; + WCHAR c; + free_enum_strs(ac); + IEnumString_Reset(ac->enumstr); /* call before expand */ + + c = last_delim[1]; last_delim[1] = '\0'; IACList_Expand(ac->aclist, txt); last_delim[1] = c; @@ -261,6 +416,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; @@ -293,11 +451,65 @@ static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR * heap_free(tmp); } +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 */ + WCHAR **str = ac->enum_strs; + UINT cnt, a, b, i; + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (len) + { + i = find_first_matching_enum_str(ac, text, len); + if (i == ~0) + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (flag == autoappend_flag_yes) + autoappend_str(ac, text, len, str[i], hwnd); + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + + /* Find the last string that begins with text, starting the search from i, + which is guaranteed to find at least one string (if none other, then i) */ + a = i, b = ac->enum_strs_num; + do + { + UINT mid = (a + b - 1) / 2u; + if (!strncmpiW(text, str[mid], len)) + a = mid + 1; + else + b = mid; + } while (a < b); + } + else + { + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + i = 0; + a = ac->enum_strs_num; + if (a == 0) + return FALSE; + } + cnt = a - i; + + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + do + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[i]); + while (++i < a); + + 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) { - HRESULT hr; WCHAR *text; - UINT cpt, size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + BOOL expanded = FALSE; + UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); if (flag != autoappend_flag_displayempty && len == 0) { @@ -313,79 +525,35 @@ 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 (ac->options & ACO_AUTOSUGGEST) + if (!display_matching_strs(ac, text, len, hwnd, flag)) { - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + /* Hide the listbox, but do not clear the enum strs, to match Windows */ + ShowWindow(ac->hwndListBox, SW_HIDE); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); } - for (cpt = 0;;) - { - 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) - { - if (cpt) - { - RECT r; - UINT height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - /* It seems that Windows XP displays 7 lines at most - and otherwise displays a vertical scroll bar */ - SetWindowPos(ac->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, height * min(cpt + 1, 7), - SWP_SHOWWINDOW ); - SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); - } - else - hide_listbox(ac, ac->hwndListBox); - } } 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); -- 1.9.1

3 10

Re: RFC: wintab32: Qt applications crash after WTOpen
by Alex Henrie 25 Oct '18

25 Oct '18

On Wed, Oct 24, 2018 at 11:01 AM Bernhard Übelacker <bernhardu(a)mailbox.org> wrote: > > Hello Alex, > thank you for getting that bug fixed. > > There is just one thing that I remember now, that led me explore > the complicated way. Now every user without such hardware gets > such a message in the terminal: > > benutzer@debian:~/.wine/drive_c/test$ wine digitalclock.exe > 0009:err:wintab32:LoadTablet LoadTabletInfo(0x10046) failed > > I am not sure if thats an issue. If I understand correctly, practically every application that depends on the latest version of Qt is going to trigger this error message. The message (line 168 of dlls/wintab32/context.c) should probably just be deleted. Would you like to send the patch for that? -Alex

2 3

[PATCH] wintab32: Change the LoadTabletInfo failure message from ERR to TRACE
by Alex Henrie 25 Oct '18

25 Oct '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wintab32/context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 17f9a11317..2993c4707e 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -156,16 +156,15 @@ static inline BOOL LoadTablet(void) if (loaded == TI_START) { - TRACE("Initializing the tablet to hwnd %p\n",hwndDefault); - if (pLoadTabletInfo && pLoadTabletInfo(hwndDefault)) { + TRACE("Initialized the tablet to hwnd %p\n", hwndDefault); loaded = TI_OK; } else { + TRACE("Failed to initialize the tablet to hwnd %p\n", hwndDefault); loaded = TI_FAIL; - ERR("LoadTabletInfo(%p) failed\n", hwndDefault); } } -- 2.19.1

1 0

[PATCH] libs/wine: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Oct '18

25 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/wine/debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 4116b9614a..ae12356cde 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -144,7 +144,7 @@ static void parse_options( const char *str ) if (p > opt) { - for (i = 0; i < sizeof(debug_classes)/sizeof(debug_classes[0]); i++) + for (i = 0; i < ARRAY_SIZE(debug_classes); i++) { int len = strlen(debug_classes[i]); if (len != (p - opt)) continue; @@ -155,7 +155,7 @@ static void parse_options( const char *str ) break; } } - if (i == sizeof(debug_classes)/sizeof(debug_classes[0])) /* bad class name, skip it */ + if (i == ARRAY_SIZE(debug_classes)) /* bad class name, skip it */ continue; } else @@ -268,7 +268,7 @@ static char *get_temp_buffer( size_t size ) char *ret; int idx; - idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); + idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); if ((ret = realloc( list[idx], size ))) list[idx] = ret; return ret; } @@ -411,7 +411,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif - if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + if (cls < ARRAY_SIZE(debug_classes)) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format) ret += funcs.dbg_vprintf( format, args ); -- 2.14.5

1 0

[PATCH] include: Use the ARRAY_SIZE() macro in debug.h
by Michael Stefaniuc 25 Oct '18

25 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index fb0d6bb737..066873a38a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < sizeof(variant_types)/sizeof(*variant_types)) + if (vt < ARRAY_SIZE(variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB) -- 2.14.5

1 0

[PATCH 5/5] kernel32: Add SetFileCompletionNotificationModes implementation.
by Jacek Caban 25 Oct '18

25 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)

1 0

[PATCH 4/5] server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on client-side asyncs.
by Jacek Caban 25 Oct '18

25 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 4 ---- dlls/ws2_32/socket.c | 15 ++++++++------- server/fd.c | 2 +- server/protocol.def | 1 + 4 files changed, 10 insertions(+), 12 deletions(-)

1 0

[PATCH 3/5] server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on server-side asyncs.
by Jacek Caban 25 Oct '18

25 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 5 ----- server/async.c | 10 ++++++++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)

1 0

[PATCH 2/5 v2] ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests.
by Jacek Caban 25 Oct '18

25 Oct '18

Based on patch by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests on win2k3 dlls/ntdll/tests/file.c | 38 +++++++++ dlls/ntdll/tests/pipe.c | 169 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 198 insertions(+), 9 deletions(-)

1 0

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