- Wine-Devel - list.winehq.org

[PATCH 2/5] win32u: Move NtUserEnumDisplayMonitors implementation from user32.
by Jacek Caban Dec. 2, 2021

Dec. 2, 2021

2 1

[PATCH 1/5] win32u: Move GetMonitorInfo implementation from user32.
by Jacek Caban Dec. 2, 2021

Dec. 2, 2021

2 1

[PATCH 1/2] kernel32/tests: Add tests for SetCurrentConsoleFontEx
by Hugh McMaster Dec. 2, 2021

Dec. 2, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes: - Simplify tests dlls/kernel32/tests/console.c | 68 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..a39a637f6ca 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,7 +3554,7 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); @@ -3661,6 +3661,72 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + /* Request a TrueType font */ + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 0; + cfix.FontFamily = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"Lucida Console"); + + /* Try setting console font information for the current window size */ + /* Test font height 16 */ + cfix.dwFontSize.Y = 16; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected %u\n", tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test font height 20 */ + cfix.dwFontSize.Y = 20; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected %u\n", tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font height */ + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test with no font weight */ + cfix.dwFontSize.Y = 16; + cfix.FontWeight = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected %u\n", tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); -- 2.34.1

2 4

[PATCH 1/5] dwrite: Create backend font objects for faces.
by Nikolay Sivov Dec. 2, 2021

Dec. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 9 +++++++++ dlls/dwrite/font.c | 35 ++++++++++++++++++++++++++++++++-- dlls/dwrite/freetype.c | 37 ++++++++++++++++++++++++++++++++++-- 3 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7cca4c5c4f9..9735ffd2605 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -241,6 +241,10 @@ extern UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned i extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; +struct dwrite_fontface; +typedef void * font_object_handle; +typedef font_object_handle (*p_dwrite_fontface_get_font_object)(struct dwrite_fontface *fontface); + struct dwrite_fontface { IDWriteFontFace5 IDWriteFontFace5_iface; @@ -253,6 +257,9 @@ struct dwrite_fontface IDWriteFactory7 *factory; struct fontfacecached *cached; + font_object_handle font_object; + void *data_context; + p_dwrite_fontface_get_font_object get_font_object; USHORT simulations; DWRITE_FONT_FACE_TYPE type; @@ -731,6 +738,8 @@ struct font_callback_funcs struct font_backend_funcs { + font_object_handle (CDECL *create_font_object)(const void *data_ptr, UINT64 data_size, unsigned int index); + void (CDECL *release_font_object)(font_object_handle object); void (CDECL *notify_release)(void *key); int (CDECL *get_glyph_outline)(void *key, float em_size, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b7071314bb2..85868c6bfd8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -636,8 +636,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFace5_ReleaseFontTable(iface, fontface->kern.context); if (fontface->file) IDWriteFontFile_Release(fontface->file); - if (fontface->stream) - IDWriteFontFileStream_Release(fontface->stream); if (fontface->names) IDWriteLocalizedStrings_Release(fontface->names); if (fontface->family_names) @@ -652,6 +650,12 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) heap_free(fontface->glyphs[i]); font_funcs->notify_release(iface); + font_funcs->release_font_object(fontface->font_object); + if (fontface->stream) + { + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, fontface->data_context); + IDWriteFontFileStream_Release(fontface->stream); + } dwrite_cmap_release(&fontface->cmap); IDWriteFactory7_Release(fontface->factory); @@ -5013,6 +5017,32 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } +static font_object_handle dwrite_fontface_get_font_object(struct dwrite_fontface *fontface) +{ + font_object_handle font_object; + const void *data_ptr; + void *data_context; + UINT64 size; + + if (!fontface->font_object && SUCCEEDED(IDWriteFontFileStream_GetFileSize(fontface->stream, &size))) + { + if (SUCCEEDED(IDWriteFontFileStream_ReadFileFragment(fontface->stream, &data_ptr, 0, size, &data_context))) + { + if (!(font_object = font_funcs->create_font_object(data_ptr, size, fontface->index))) + { + WARN("Backend failed to create font object.\n"); + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, data_context); + return NULL; + } + + if (InterlockedCompareExchangePointer((void **)&fontface->font_object, font_object, NULL)) + font_funcs->release_font_object(font_object); + } + } + + return fontface->font_object; +} + HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list, IDWriteFontFace5 **ret) { struct file_stream_desc stream_desc; @@ -5102,6 +5132,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li release_font_data(font_data); fontface->cached = factory_cache_fontface(fontface->factory, cached_list, &fontface->IDWriteFontFace5_iface); + fontface->get_font_object = dwrite_fontface_get_font_object; *ret = &fontface->IDWriteFontFace5_iface; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 1ece99e08c9..5c32ec725f6 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -69,6 +69,7 @@ typedef struct static const struct font_callback_funcs *callback_funcs; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); MAKE_FUNCPTR(FT_Get_First_Char); @@ -143,12 +144,14 @@ static BOOL init_freetype(void) FT_Version_t FT_Version; ft_handle = dlopen(SONAME_LIBFREETYPE, RTLD_NOW); - if (!ft_handle) { + if (!ft_handle) + { WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); - return FALSE; + return FALSE; } #define LOAD_FUNCPTR(f) if((p##f = dlsym(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Done_FreeType) LOAD_FUNCPTR(FT_Done_Glyph) LOAD_FUNCPTR(FT_Get_First_Char) @@ -211,6 +214,23 @@ sym_not_found: return FALSE; } +static font_object_handle CDECL freetype_create_font_object(const void *data_ptr, UINT64 data_size, unsigned int index) +{ + FT_Face face = NULL; + FT_Error fterror; + + fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, &face); + if (fterror != FT_Err_Ok) + WARN("Failed to create a face object, error %d.\n", fterror); + + return face; +} + +static void CDECL freetype_release_font_object(font_object_handle object) +{ + pFT_Done_Face(object); +} + static void CDECL freetype_notify_release(void *key) { RtlEnterCriticalSection(&freetype_cs); @@ -777,6 +797,8 @@ static INT32 CDECL freetype_get_glyph_advance(void *key, float emSize, UINT16 in const static struct font_backend_funcs freetype_funcs = { + freetype_create_font_object, + freetype_release_font_object, freetype_notify_release, freetype_get_glyph_outline, freetype_get_glyph_count, @@ -803,6 +825,15 @@ static NTSTATUS release_freetype_lib(void) #else /* HAVE_FREETYPE */ +static font_object_handle CDECL null_create_font_object(const void *data_ptr, UINT64 data_size, unsigned int index) +{ + return NULL; +} + +static void CDECL null_release_font_object(font_object_handle object) +{ +} + static void CDECL null_notify_release(void *key) { } @@ -842,6 +873,8 @@ static void CDECL null_get_design_glyph_metrics(void *key, UINT16 upem, UINT16 a const static struct font_backend_funcs null_funcs = { + null_create_font_object, + null_release_font_object, null_notify_release, null_get_glyph_outline, null_get_glyph_count, -- 2.33.0

1 4

[PATCH] dxdiagn: Update DirectX version to the one from Windows 11.
by Aidas Jonikas Dec. 2, 2021

Dec. 2, 2021

This patch removes the DirectX 9 dialog in Roblox that prevents the game from starting and/or installing. Technically only DirectX 11 is required for fixing the issue but I want to future-proof this patch. --- dlls/dxdiagn/provider.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index aaffb5c213d..0f50fe1f65d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -614,7 +614,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200], localized_pagefile_fmt[200]; DWORD_PTR args[2]; - hr = add_ui4_property(node, L"dwDirectXVersionMajor", 9); + hr = add_ui4_property(node, L"dwDirectXVersionMajor", 12); if (FAILED(hr)) return hr; @@ -626,11 +626,11 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; - hr = add_bstr_property(node, L"szDirectXVersionEnglish", L"4.09.0000.0904"); + hr = add_bstr_property(node, L"szDirectXVersionEnglish", L"10.00.22000.1000"); if (FAILED(hr)) return hr; - hr = add_bstr_property(node, L"szDirectXVersionLongEnglish", L"= \"DirectX 9.0c (4.09.0000.0904)"); + hr = add_bstr_property(node, L"szDirectXVersionLongEnglish", L"= \"DirectX 12 (10.00.22000.1000)"); if (FAILED(hr)) return hr; -- 2.34.1

2 1

[PATCH] po: Update Korean translation.
by Byeongsik Jeon Dec. 2, 2021

Dec. 2, 2021

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 117 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 55 deletions(-) diff --git a/po/ko.po b/po/ko.po index d550e6f5ea7..635a29077fc 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: 2021-11-24 00:22+0900\n" +"PO-Revision-Date: 2021-12-02 20:37+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -56,7 +56,7 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성요소" +"다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성 요소" "를 수정하려면, 목록에서 선택한 후 [수정] 또는 [제거]를 클릭하세요." #: dlls/appwiz.cpl/appwiz.rc:67 @@ -1109,8 +1109,8 @@ msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" -"페이지 범위를 벗어나지 않아야 올바른 값입니다.\n" -"%1!d! 과 %2!d! 사이의 값을 입력하시오." +"페이지 범위 안에 있어야 하는 값입니다.\n" +"%1!d! - %2!d! 사이의 값을 입력하세요." #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -1121,20 +1121,20 @@ msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"여백이 겹쳐졌거나 용지 크기를 넘었습니다.\n" -"여백 크기를 다시 입력하세요." +"여백이 용지 경계와 겹치거나 초과했습니다.\n" +"여백을 다시 조정하세요." #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." -msgstr "'복사본 개수' 필드는 비어 있어서는 안됩니다." +msgstr "'복사본 매수' 필드는 비어 있지 않아야 합니다." #: dlls/comdlg32/comdlg32.rc:67 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 사이의 값을 입력하세요." #: dlls/comdlg32/comdlg32.rc:68 msgid "A printer error occurred." @@ -1170,7 +1170,7 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "%1!d!pt - %2!d!pt 사이에서 글꼴 크기를 선택하세요." +msgstr "글꼴 크기를 %1!d! - %2!d! pt 사이에서 선택하세요." #: dlls/comdlg32/comdlg32.rc:143 dlls/ieframe/ieframe.rc:35 msgid "&Save" @@ -1194,15 +1194,15 @@ msgstr "선택한 폴더" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "숫자는 글꼴 크기입니다." +msgstr "글꼴 크기는 숫자여야 합니다." #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" -msgstr "준비" +msgstr "준비됨" #: dlls/comdlg32/comdlg32.rc:85 msgid "Paused; " -msgstr "정지; " +msgstr "일시 중지됨; " #: dlls/comdlg32/comdlg32.rc:86 msgid "Error; " @@ -1210,23 +1210,23 @@ msgstr "오류; " #: dlls/comdlg32/comdlg32.rc:87 msgid "Pending deletion; " -msgstr "제거 중; " +msgstr "삭제 보류 중; " #: dlls/comdlg32/comdlg32.rc:88 msgid "Paper jam; " -msgstr "종이 걸림; " +msgstr "용지 걸림; " #: dlls/comdlg32/comdlg32.rc:89 msgid "Out of paper; " -msgstr "종이 초과; " +msgstr "용지 부족; " #: dlls/comdlg32/comdlg32.rc:90 msgid "Feed paper manual; " -msgstr "수동 종이 공금; " +msgstr "용지 수동 곱급; " #: dlls/comdlg32/comdlg32.rc:91 msgid "Paper problem; " -msgstr "종이 문제; " +msgstr "용지 문제; " #: dlls/comdlg32/comdlg32.rc:92 msgid "Printer offline; " @@ -1234,23 +1234,23 @@ msgstr "프린터 오프라인; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 활성; " +msgstr "입출력 활성화 됨; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "바쁨; " +msgstr "다른 작업 중; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " -msgstr "인쇄중; " +msgstr "인쇄 중; " #: dlls/comdlg32/comdlg32.rc:96 msgid "Output tray is full; " -msgstr "출력 트레이가 꽉 찼습니다; " +msgstr "출력 트레이가 가득 참; " #: dlls/comdlg32/comdlg32.rc:97 msgid "Not available; " -msgstr "가능하지 않음; " +msgstr "사용할 수 없음; " #: dlls/comdlg32/comdlg32.rc:98 msgid "Waiting; " @@ -1278,23 +1278,23 @@ msgstr "토너 없음; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "페이지 펀트; " +msgstr "페이지 포기; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " -msgstr "사용자에 의한 취소; " +msgstr "사용자가 중단함; " #: dlls/comdlg32/comdlg32.rc:106 msgid "Out of memory; " -msgstr "메모리 초과; " +msgstr "메모리 부족; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "프린터 문이 열려있습니다; " +msgstr "프린터의 문이 열려 있음; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " -msgstr "프린트 서버 상태 알 수 없음; " +msgstr "알 수 없는 프린터 서버; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " @@ -1332,7 +1332,7 @@ msgstr "암호(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" -msgstr "내 암호 기억(&R)" +msgstr "내 암호 저장(&R)" #: dlls/credui/credui.rc:30 msgid "Connect to %s" @@ -1577,7 +1577,7 @@ msgstr "성" #: dlls/crypt32/crypt32.rc:81 msgid "Domain Component" -msgstr "주소 구성 요소" +msgstr "도메인 구성 요소" #: dlls/crypt32/crypt32.rc:82 msgid "Street Address" @@ -2633,23 +2633,23 @@ msgstr " 유효기간(끝) " #: dlls/cryptui/cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "이 인증서는 잘못된 서명을 가지고 있습니다." +msgstr "인증서 서명이 잘못되었습니다." #: dlls/cryptui/cryptui.rc:43 msgid "This certificate has expired or is not yet valid." -msgstr "이 인증서는 만료되었거나 아직 유효하지 않습니다." +msgstr "만료되었거나 아직 유효하지 않은 인증서입니다." #: dlls/cryptui/cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "이 인증서는 발행자가 정한 유효시간을 초과했습니다." +msgstr "발행자가 정한 유효 기간을 넘긴 인증서입니다." #: dlls/cryptui/cryptui.rc:45 msgid "This certificate was revoked by its issuer." -msgstr "이 인증서는 발행자에 의하여 취소되었습니다." +msgstr "발행자가 취소한 인증서입니다." #: dlls/cryptui/cryptui.rc:46 msgid "This certificate is OK." -msgstr "이 인증서는 올바릅니다." +msgstr "올바른 인증서입니다." #: dlls/cryptui/cryptui.rc:47 msgid "Field" @@ -3251,7 +3251,7 @@ msgstr "이 대화상자 건너뛰기" #: dlls/gphoto2.ds/gphoto2.rc:38 msgid "Exit" -msgstr "끝내기" +msgstr "나가기" #: dlls/gphoto2.ds/gphoto2.rc:43 msgid "Transferring" @@ -3954,7 +3954,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "속성 '|'을(를) 정의할 수 없습니다. 개체가 확장 가능하지 않습니다." +msgstr "확장 가능하지 않은 속성 '|'을(를) 정의할 수 없습니다" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -4867,7 +4867,7 @@ msgstr "잘못된 서비스 컨트롤.\n" #: dlls/kernel32/winerror.mc:1143 msgid "Service request timeout.\n" -msgstr "서비스 요청 시간초과.\n" +msgstr "서비스 요청 시간 초과.\n" #: dlls/kernel32/winerror.mc:1148 msgid "Cannot create service thread.\n" @@ -6083,7 +6083,7 @@ msgstr "페이지파일 할당량이 없음.\n" #: dlls/kernel32/winerror.mc:2673 msgid "Exceeded commitment limit.\n" -msgstr "헌신 한도 초과.\n" +msgstr "약정 한도 초과.\n" #: dlls/kernel32/winerror.mc:2678 msgid "Menu item not found.\n" @@ -8342,7 +8342,7 @@ msgstr "프로그램: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "프로그램 컨텍스트: [1], 어셈블리 이름 : [2]" +msgstr "프로그램 컨텍스트:[1], 어셈블리 이름:[2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" @@ -10394,9 +10394,7 @@ msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "" -"협정 세계시\n" -"(UTC-08:00) 협정 세계시-08" +msgstr "(UTC-08:00) 협정 세계시-08" #: dlls/tzres/tzres.rc:39 msgid "Altai Standard Time" @@ -13178,13 +13176,12 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "활성 코드 페이지: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy #| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "잘못된 메시지입니다.\n" +msgstr "잘못된 코드 페이지입니다\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13197,6 +13194,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [번호]\n" +"\n" +" 활성 콘솔 코드 페이지를 설정하거나 표시합니다.\n" +"\n" +" 번호 활성화할 콘솔 코드 페이지 번호.\n" +"\n" +" 활성화된 콘솔 코드 페이지를 표시하려면 번호 없이 CHCP를 입력합니다.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14372,11 +14377,11 @@ msgid "" msgstr "" "구문:\n" "\n" -"NET 명령어[매개변수]\n" -"\n" +"NET 명령어 [매개변수]\n" +" 또는\n" "NET 명령어 /HELP\n" "\n" -"<명령어>는 HELP, START, STOP, USE 중 하나입니다.\n" +"<명령어>는 HELP, START, STOP, USE 중 하나입니다.\n" #: programs/net/net.rc:31 msgid "" @@ -15445,6 +15450,7 @@ msgstr "" "\n" "지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"\n" "특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" " REG [작업] /?\n" "\n" @@ -15911,7 +15917,7 @@ msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" #: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "reg: '%1'의 모든 레지스트리 값을 지울 수 없습니다.\n" +msgstr "reg: '%1'의 모든 레지스트리 값을 지울 수 없습니다\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15923,7 +15929,7 @@ msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: 레지스트리 키 '%1'을(를) 가져올 수 없습니다.\n" +msgstr "reg: 레지스트리 키 '%1'을(를) 가져올 수 없습니다\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16736,7 +16742,7 @@ msgstr "오류: 프로세스 자체 종료는 허용되지 않습니다.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" -msgstr "새 작업 (실행...)(&N)" +msgstr "새 작업(&N) (실행...)" #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" @@ -17568,7 +17574,7 @@ msgid "" msgstr "" "Wine Application Uninstaller\n" "\n" -"현재 Wine 구성(prefix)에서 프로그램을 제거합니다.\n" +"현재 Wine PREFIX에서 프로그램을 제거합니다.\n" "\n" #: programs/uninstaller/uninstaller.rc:43 @@ -17589,7 +17595,8 @@ msgstr "" "\n" "옵션:\n" " --help 지금 보고 있는 정보를 표시합니다.\n" -" --list 실행한 Wine에 설치된 모든 프로그램의 목록을 표시합니다.\n" +" --list 실행한 Wine PREFIX에 설치된 모든 프로그램의 목록을 표시합니" +"다.\n" " --remove {GUID} 지정한 프로그램을 제거합니다. '--list' 옵션을\n" " 사용하면 프로그램의 GUID를 알 수 있습니다.\n" " [옵션 없음] 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" @@ -17641,7 +17648,7 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "%s의 Wine 구성을 업데이트하고 있습니다. 잠시만 기다려주세요..." +msgstr "%s의 Wine 설정을 업데이트하고 있습니다. 잠시만 기다려주세요..." # 라이선스 문구는 번역하지 않습니다. #: programs/winecfg/winecfg.rc:140 -- 2.34.1

1 0

[PATCH 1/6] wined3d: Acquire sampler references for command lists by inspecting CS packets.
by Jan Sikorski Dec. 2, 2021

Dec. 2, 2021

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- This is meant to be followed by more patches that manage references to all the other objects that need to be kept alive for command lists. That includes: all the ones handled similarly to samplers (i.e. the ones that we put into dedicated arrays); wined3d_resources, which are currently acquired on every draw/dispatch call; and views on these resources, which are not handled at all at this point. Apart from simplifying the code to some degree, it will fix the size problem of wined3d_resources arrays, which can get pretty large when the application is doing many repeated draw/dispatch calls. v2: naming & source structure changes --- dlls/wined3d/cs.c | 83 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2c94b7aed76..03a9cb74ffe 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -102,6 +102,10 @@ ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) return refcount; } +struct wined3d_cs_packet; +static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *); +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *, SIZE_T *); + ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { ULONG refcount = InterlockedDecrement(&list->refcount); @@ -111,7 +115,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) if (!refcount) { - SIZE_T i; + const struct wined3d_cs_packet *packet; + SIZE_T i, start = 0; for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); @@ -132,6 +137,12 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->sampler_count; ++i) wined3d_sampler_decref(list->samplers[i]); + while (start < list->data_size) + { + packet = wined3d_next_cs_packet(list->data, &start); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); @@ -207,6 +218,14 @@ struct wined3d_cs_packet BYTE data[1]; }; +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *start) +{ + struct wined3d_cs_packet *packet; + packet = (struct wined3d_cs_packet *)&data[*start]; + *start += offsetof(struct wined3d_cs_packet, data[packet->size]); + return packet; +} + struct wined3d_cs_nop { enum wined3d_cs_op opcode; @@ -3626,6 +3645,52 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) heap_free(cs); } +static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_decref(op->samplers[i]); + } + break; + } + default: + break; + } +} + +static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op + = (struct wined3d_cs_set_samplers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_incref(op->samplers[i]); + } + break; + } + default: + break; + } +} + struct wined3d_deferred_context { struct wined3d_device_context c; @@ -3688,16 +3753,18 @@ static void *wined3d_deferred_context_require_space(struct wined3d_device_contex packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); TRACE("size was %zu, adding %zu\n", (size_t)deferred->data_size, packet_size); - deferred->data_size += packet_size; packet->size = packet_size - header_size; return &packet->data; } static void wined3d_deferred_context_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { - assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_packet *packet; - /* Nothing to do. */ + assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size); + wined3d_cs_packet_incref_objects(packet); } static void wined3d_deferred_context_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -3979,7 +4046,7 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *context) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - SIZE_T i; + SIZE_T i, start = 0; TRACE("context %p.\n", context); @@ -4022,6 +4089,12 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_sampler_decref(deferred->samplers[i]); heap_free(deferred->samplers); + while (start < deferred->data_size) + { + const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(deferred->data, &start); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); -- 2.32.0

1 5

[PATCH 1/8] dinput8/tests: Add a more effect direction tests.
by Rémi Bernon Dec. 2, 2021

Dec. 2, 2021

Making sure we are actually writing the correctly values to PID reports, regardless of user provided coordinate space. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 14 ++++- dlls/dinput8/tests/hid.c | 103 +++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 99fe98d95ce..49a8f28e864 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2764,6 +2764,13 @@ static void set_parameter_value_us( struct hid_joystick_effect *impl, char *repo set_parameter_value( impl, report_buf, caps, value ); } +static BOOL is_axis_usage_enabled( struct hid_joystick_effect *impl, USAGE usage ) +{ + DWORD i = impl->params.cAxes; + while (i--) if (LOWORD(impl->params.rgdwAxes[i]) == usage) return TRUE; + return FALSE; +} + static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) { static const DWORD complete_mask = DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS; @@ -2937,7 +2944,12 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) spherical.rglDirection = directions; convert_directions_to_spherical( &impl->params, &spherical ); - for (i = 0; i < min( effect_update->direction_count, spherical.cAxes ); ++i) + /* FIXME: as far as the test cases go, directions are only written if + * either X or Y axes are enabled, maybe need more tests though */ + if (!is_axis_usage_enabled( impl, HID_USAGE_GENERIC_X ) && + !is_axis_usage_enabled( impl, HID_USAGE_GENERIC_Y )) + WARN( "neither X or Y axes are selected, skipping direction\n" ); + else for (i = 0; i < min( effect_update->direction_count, spherical.cAxes ); ++i) { tmp = directions[i] + (i == 0 ? 9000 : 0); caps = effect_update->direction_caps[effect_update->direction_count - i - 1]; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d9ecf4a5dd5..2efa817f00e 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6357,6 +6357,54 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO for (i = 1; i < 4; i++) { + struct hid_expect expect_directions[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x02,0x00,0x04,0x00}, + }, + /* update effect */ + {0}, + /* effect control */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {0x02,0x01,0x03,0x00}, + }, + }; + struct hid_expect expect_spherical = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x55 : 0,i >= 3 ? 0x1c : 0}, + }; + struct hid_expect expect_cartesian = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x63 : 0,i >= 3 ? 0x1d : 0}, + }; + struct hid_expect expect_polar = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,i >= 2 ? 0x3f : 0,i >= 3 ? 0x00 : 0}, + }; + winetest_push_context( "%u axes", i ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); @@ -6465,6 +6513,61 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); + + desc = expect_desc; + desc.dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 3000; + desc.rglDirection[1] = 4000; + desc.rglDirection[2] = 5000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_spherical; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + desc = expect_desc; + desc.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 6000; + desc.rglDirection[1] = 7000; + desc.rglDirection[2] = 8000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_cartesian; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + + if (i == 2) + { + desc = expect_desc; + desc.dwFlags = DIEFF_POLAR | DIEFF_OBJECTIDS; + desc.cAxes = i; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + desc.rglDirection[0] = 9000; + desc.rglDirection[1] = 10000; + desc.rglDirection[2] = 11000; + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + expect_directions[2] = expect_polar; + set_hid_expect( file, expect_directions, sizeof(expect_directions) ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &desc, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, NULL, 0 ); + } + winetest_pop_context(); } -- 2.34.0

1 7

[PATCH 1/3] comsvcs: Add IDispatch support for ISharedPropertyGroupManager.
by Jactry Zeng Dec. 2, 2021

Dec. 2, 2021

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/comsvcs_private.h | 15 +++++++ dlls/comsvcs/main.c | 82 ++++++++++++++++++++++++++++++++++ dlls/comsvcs/property.c | 46 +++++++++++++++---- dlls/comsvcs/tests/property.c | 61 +++++++++++++++++++++++++ 5 files changed, 197 insertions(+), 9 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 22090938b52..5ad3d085b90 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 uuid +IMPORTS = ole32 oleaut32 uuid EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h index c09c2174e0e..0051fb95831 100644 --- a/dlls/comsvcs/comsvcs_private.h +++ b/dlls/comsvcs/comsvcs_private.h @@ -31,4 +31,19 @@ HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out); +enum tid_t +{ + NULL_tid, + ISharedPropertyGroupManager_tid, + LAST_tid +}; + +static REFIID tid_ids[] = +{ + &IID_NULL, + &IID_ISharedPropertyGroupManager, +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); + #endif diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 797e2db97db..7903d2c2e07 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); +HINSTANCE dll_instance = NULL; + typedef struct dispensermanager { IDispenserManager IDispenserManager_iface; @@ -1024,3 +1026,83 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + if (typelib) + return S_OK; + + hr = LoadRegTypeLib(&LIBID_COMSVCSLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %#x.\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + hr = load_typelib(); + if (FAILED(hr)) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %#x.\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + dll_instance = instance; + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; + } + return TRUE; +} diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 4dc6e1d9a46..382089f87b2 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -76,32 +76,62 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager *iface, UINT *info) { - FIXME("iface %p, info %p: stub.\n", iface, info); - return E_NOTIMPL; + TRACE("iface %p, info %p.\n", iface, info); + + if (!info) + return E_INVALIDARG; + + *info = 1; + return S_OK; } static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); - return E_NOTIMPL; + TRACE("iface %p, index %u, lcid %u, info %p.\n", iface, index, lcid, info); + + if (index) + return DISP_E_BADINDEX; + + return get_typeinfo(ISharedPropertyGroupManager_tid, info); } static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); - return E_NOTIMPL; + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) { - FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p.\n", iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); - return E_NOTIMPL; + + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, member, flags, params, result, except, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index 7be62987507..53dcfae8c8e 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -60,6 +60,59 @@ static const IUnknownVtbl outer_vtbl = static IUnknown test_outer = {&outer_vtbl}; +struct test_name_id +{ + const WCHAR *name; + DISPID id; +}; + +#define TEST_TYPEINFO(dispatch,test_name_ids,id_count,riid) \ + _test_typeinfo(dispatch, test_name_ids, id_count, riid, __LINE__) +static void _test_typeinfo(IDispatch *dispatch, const struct test_name_id *test_name_ids, + UINT id_count, REFIID riid, int line) +{ + static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + ULONG refcount; + DISPID dispid; + UINT count; + BSTR names; + HRESULT hr; + int i; + + hr = IDispatch_GetTypeInfoCount(dispatch, NULL); + ok_(__FILE__,line)(hr == E_INVALIDARG, "GetTypeInfoCount got hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IDispatch_GetTypeInfoCount(dispatch, &count); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfoCount got hr %#x.\n", hr); + ok_(__FILE__,line)(count == 1, "Got unexpected count: %d.\n", count); + + hr = IDispatch_GetTypeInfo(dispatch, 1, english, &typeinfo); + ok_(__FILE__,line)(hr == DISP_E_BADINDEX, "GetTypeInfo got hr %#x.\n", hr); + + hr = IDispatch_GetTypeInfo(dispatch, 0, english, &typeinfo); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfo failed %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok_(__FILE__,line)(hr == S_OK, "GetTypeAttr got hr %#x.\n", hr); + ok_(__FILE__,line)(IsEqualGUID(&typeattr->guid, riid), + "Got unexpected type guid: %s.\n", wine_dbgstr_guid(&typeattr->guid)); + refcount = get_refcount(typeinfo); + ok_(__FILE__,line)(refcount == 2, "Got refcount: %u.\n", refcount); + ITypeInfo_Release(typeinfo); + + for (i = 0; i < id_count; i++) + { + names = SysAllocString(test_name_ids[i].name); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames(dispatch, &IID_NULL, &names, 1, english, &dispid); + SysFreeString(names); + ok_(__FILE__,line)(hr == S_OK, "tests[%d] got hr %#x.\n", i, hr); + ok_(__FILE__,line)(dispid == test_name_ids[i].id, "tests[%d] got wrong dispid %x.\n", i, dispid); + } +} + static void test_interfaces(void) { ISharedPropertyGroupManager *manager, *manager1; @@ -67,6 +120,12 @@ static void test_interfaces(void) IDispatch *dispatch; IUnknown *unk; HRESULT hr; + static const struct test_name_id test_name_ids[] = + { + {L"CreatePropertyGroup", 0x1}, + {L"Group", 0x2}, + {L"_NewEnum", DISPID_NEWENUM}, + }; hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, &test_outer, CLSCTX_INPROC_SERVER, &IID_ISharedPropertyGroupManager, (void **)&manager); @@ -100,6 +159,8 @@ static void test_interfaces(void) refcount = get_refcount(manager); ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroupManager); + IDispatch_Release(dispatch); IUnknown_Release(unk); ISharedPropertyGroupManager_Release(manager); -- 2.33.0

1 2

[PATCH] winemac: Include missing dlfcn.h.
by Huw Davies Dec. 2, 2021

Dec. 2, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 3665e0023b7..ca70db7a689 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include <dlfcn.h> #include "macdrv.h" #include "wine/debug.h" -- 2.23.0

1 0