wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : mshtml: Initialize HTMLSelectionObject object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 45c682c74bbef83d332e448e92525ad6b0312a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45c682c74bbef83d332e448e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:39:57 2021 +0100 mshtml: Initialize HTMLSelectionObject object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/selection.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 4fe9a1708a1..9c1bfc15bb8 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -343,7 +343,8 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect if(!selection) return E_OUTOFMEMORY; - init_dispex(&selection->dispex, (IUnknown*)&selection->IHTMLSelectionObject_iface, &HTMLSelectionObject_dispex); + init_dispex_with_compat_mode(&selection->dispex, (IUnknown*)&selection->IHTMLSelectionObject_iface, + &HTMLSelectionObject_dispex, dispex_compat_mode(&doc->node.event_target.dispex)); selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; selection->IHTMLSelectionObject2_iface.lpVtbl = &HTMLSelectionObject2Vtbl;

1 0

Jacek Caban : mshtml: Initialize HTMLTxtRange object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 8b0f1721bbc547fc85892b58f7d14acd424104e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0f1721bbc547fc85892b58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:39:52 2021 +0100 mshtml: Initialize HTMLTxtRange object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/range.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index aa8e8942a87..d739c18d13e 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1729,7 +1729,8 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx if(!ret) return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex, + dispex_compat_mode(&doc->node.event_target.dispex)); ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl; ret->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl;

1 0

Jacek Caban : mshtml: Initialize HTMLOptionElementFactory object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 8de773d9f275395e525340c19b53610789fba753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de773d9f275395e525340c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:39:47 2021 +0100 mshtml: Initialize HTMLOptionElementFactory object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 13a2f8b3f6a..f94319e22a2 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -614,8 +614,8 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionEleme ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLOptionElementFactory_iface, - &HTMLOptionElementFactory_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLOptionElementFactory_iface, + &HTMLOptionElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); *ret_ptr = ret; return S_OK;

1 0

Rémi Bernon : setupapi: Support installing DLLs with dots in their name.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: ef8fc24acf9fd57fa0764fe186171cc98fe604a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8fc24acf9fd57fa0764fe1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:07 2021 +0100 setupapi: Support installing DLLs with dots in their name. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index cf219916400..3196708a7f7 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -881,13 +881,18 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL ex WCHAR *destname = dest + lstrlenW(dest); WCHAR *name = wcsrchr( file, '\\' ) + 1; WCHAR *end = name + lstrlenW(name); + SIZE_T len = end - name; if (ext) lstrcpyW( end, ext ); - if (!(ret = read_file( file, &data, &size, expect_builtin ))) return 0; + if (!(ret = read_file( file, &data, &size, expect_builtin ))) + { + *end = 0; + return 0; + } - if (end > name + 2 && !wcsncmp( end - 2, L"16", 2 )) end -= 2; /* remove "16" suffix */ - memcpy( destname, name, (end - name) * sizeof(WCHAR) ); - destname[end - name] = 0; + if (end > name + 2 && !wcsncmp( end - 2, L"16", 2 )) len -= 2; /* remove "16" suffix */ + memcpy( destname, name, len * sizeof(WCHAR) ); + destname[len] = 0; if (!add_handled_dll( destname )) ret = -1; if (ret != -1) @@ -906,6 +911,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL ex } } *destname = 0; /* restore it for next file */ + *end = 0; return ret; } @@ -965,9 +971,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, { lstrcatW( name, L"\\" ); lstrcatW( name, data.name ); - if (!wcschr( data.name, '.' )) lstrcatW( name, default_ext ); - if (!install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) - install_fake_dll( dest, file, L".fake", FALSE, &delay_copy ); + if (wcschr( data.name, '.' )) /* module possibly already has an extension */ + { + if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; + } + lstrcatW( name, default_ext ); + if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; } else install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy ); }

1 0

Nikolay Sivov : dwrite/tests: Test font set properties that should be always available.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: fc1f50c5154e27bceb570c925c88763609f57c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1f50c5154e27bceb570c92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:07:02 2021 +0300 dwrite/tests: Test font set properties that should be always available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e995f9441bd..c14c557c92a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9512,6 +9512,13 @@ static void test_fontsetbuilder(void) hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + if (id == DWRITE_FONT_PROPERTY_ID_WEIGHT || id == DWRITE_FONT_PROPERTY_ID_STRETCH + || id == DWRITE_FONT_PROPERTY_ID_STYLE) + { + todo_wine + ok(exists, "Property %u expected to exist.\n", id); + } + if (!exists) continue;

1 0

Nikolay Sivov : dwrite: Add a helper to return font list item.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 2bc442aa1beb24a48ea4f3be44c01374dc439d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc442aa1beb24a48ea4f3be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:07:01 2021 +0300 dwrite: Add a helper to return font list item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cd90a9c051c..14be1b9fc1b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2336,12 +2336,9 @@ static DWRITE_LOCALITY WINAPI dwritefontlist1_GetFontLocality(IDWriteFontList2 * return DWRITE_LOCALITY_LOCAL; } -static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font) +static HRESULT fontlist_get_font(const struct dwrite_fontlist *fontlist, unsigned int index, + IDWriteFont3 **font) { - struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); - - TRACE("%p, %u, %p.\n", iface, index, font); - *font = NULL; if (fontlist->font_count == 0) @@ -2353,9 +2350,19 @@ static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 in return create_font(fontlist->family, index, font); } +static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font) +{ + struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); + + TRACE("%p, %u, %p.\n", iface, index, font); + + return fontlist_get_font(fontlist, index, font); +} + static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { + struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); IDWriteFont3 *font; HRESULT hr; @@ -2363,12 +2370,11 @@ static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *ifa *reference = NULL; - hr = IDWriteFontList2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (SUCCEEDED(hr = fontlist_get_font(fontlist, index, &font))) + { + hr = IDWriteFont3_GetFontFaceReference(font, reference); + IDWriteFont3_Release(font); + } return hr; }

1 0

Nikolay Sivov : dwrite: Enable 'meta' table properties for the font set.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 8010ede25738611471ef494aa81b40d95ce160d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8010ede25738611471ef494a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:07:00 2021 +0300 dwrite: Enable 'meta' table properties for the font set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1a54d2300b1..cd90a9c051c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7157,6 +7157,10 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_FULL_NAME, &value); else if (property == DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME) opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, &value); + else if (property == DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG) + opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, &value); + else if (property == DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG) + opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, &value); else WARN("Unsupported property %u.\n", property); @@ -7296,6 +7300,8 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE { case DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME: case DWRITE_FONT_PROPERTY_ID_FULL_NAME: + case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: + case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: if (!(value = fontset_entry_get_property(entry, props[i].propertyId))) return FALSE; @@ -7307,8 +7313,6 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME: case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: - case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: - case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG: case DWRITE_FONT_PROPERTY_ID_WEIGHT: case DWRITE_FONT_PROPERTY_ID_STRETCH:

1 0

Nikolay Sivov : dwrite/tests: Reduce number of skipped test messages to one per test.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 3fb3b87210f91779980c7cf106da450ae8c73420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb3b87210f91779980c7cf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:06:59 2021 +0300 dwrite/tests: Reduce number of skipped test messages to one per test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4b31c331872..e995f9441bd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2411,8 +2411,11 @@ static void test_GetMetrics(void) get_combined_font_name(familyW, faceW, nameW); - if (has_face_variations(fontface)) { - skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + if (has_face_variations(fontface)) + { + static int once; + if (!once++) + skip("GetMetrics() test does not support variable fonts.\n"); IDWriteFontFace_Release(fontface); continue; } @@ -2841,8 +2844,11 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - if (has_face_variations(fontface)) { - skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + if (has_face_variations(fontface)) + { + static int once; + if (!once++) + skip("ConvertFontFaceToLOGFONT() test does not support variable fonts.\n"); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); continue; @@ -3810,8 +3816,11 @@ if (strcmp(winetest_platform, "wine")) { IDWriteLocalizedStrings_Release(names); - if (IDWriteFontFace_IsSymbolFont(fontface)) { - skip("Skipping for symbol font %s %s.\n", wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW)); + if (IDWriteFontFace_IsSymbolFont(fontface)) + { + static int once; + if (!once++) + skip("GetUnicodeRanges() test does not support symbol fonts.\n"); IDWriteFontFace_Release(fontface); continue; } @@ -4802,8 +4811,11 @@ if (0) { /* crashes on native */ has_variations = has_face_variations(fontface); IDWriteFontFace_Release(fontface); - if (has_variations) { - skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + if (has_variations) + { + static int once; + if (!once++) + skip("ConvertFontToLOGFONT() test does not support variable fonts.\n"); IDWriteFont_Release(font); continue; }

1 0

Nikolay Sivov : dwrite/tests: Remove tests failing on Win10 20H2.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 9c5f2853eca3ce4eedcdc442938bee4da572eb1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5f2853eca3ce4eedcdc442… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:06:58 2021 +0300 dwrite/tests: Remove tests failing on Win10 20H2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d0940c3b145..4b31c331872 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2460,11 +2460,6 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(coll2 == collection, "got %p, was %p\n", coll2, collection); - IDWriteFontCollection_Release(coll2); - factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2652,10 +2647,8 @@ todo_wine hr = IDWriteFactory6_GetSystemFontCollection(factory6, FALSE, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &collection2); ok(hr == S_OK, "Failed to get collection, hr %#x.\n", hr); - ok(collection == (IDWriteFontCollection *)collection2, "Unexpected instance.\n"); IDWriteFontCollection2_Release(collection2); } - IDWriteFactory6_Release(factory6); } else

1 0

Rémi Bernon : msvcrt: Lazily initialize console handles.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: d5ab1401c0988b8c8c14ae7c64da0a55f4e4bbeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ab1401c0988b8c8c14ae7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 14:02:39 2021 +0100 msvcrt: Lazily initialize console handles. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 78 +++++++++++++++++++++++++++++---------------------- dlls/msvcrt/main.c | 1 - dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 26f7b554636..cd9119cf20f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -33,25 +33,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_CONSOLE _lock(_CONIO_LOCK) #define UNLOCK_CONSOLE _unlock(_CONIO_LOCK) -static HANDLE MSVCRT_console_in = INVALID_HANDLE_VALUE; -static HANDLE MSVCRT_console_out= INVALID_HANDLE_VALUE; +static HANDLE MSVCRT_console_in; +static HANDLE MSVCRT_console_out; static int __MSVCRT_console_buffer = EOF; static wchar_t __MSVCRT_console_buffer_w = WEOF; -/* INTERNAL: Initialise console handles */ -void msvcrt_init_console(void) +/* INTERNAL: Initialise console handles, _CONIO_LOCK must be held */ +static HANDLE msvcrt_input_console(void) { - TRACE(":Opening console handles\n"); - - MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, - FILE_SHARE_WRITE|FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, 0, NULL); + if (!MSVCRT_console_in) + { + MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, + FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_in == INVALID_HANDLE_VALUE) + WARN("Input console handle initialization failed!\n"); + } + return MSVCRT_console_in; +} - if ((MSVCRT_console_in == INVALID_HANDLE_VALUE) || - (MSVCRT_console_out== INVALID_HANDLE_VALUE)) - WARN(":Console handle Initialisation FAILED!\n"); +static HANDLE msvcrt_output_console(void) +{ + if (!MSVCRT_console_out) + { + MSVCRT_console_out = CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_out == INVALID_HANDLE_VALUE) + WARN("Output console handle initialization failed!\n"); + } + return MSVCRT_console_out; } /* INTERNAL: Free console handles */ @@ -74,7 +84,7 @@ int CDECL _cputs(const char* str) len = strlen(str); LOCK_CONSOLE; - if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleA(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -93,7 +103,7 @@ int CDECL _cputws(const wchar_t* str) len = wcslen(str); LOCK_CONSOLE; - if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleW(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -166,12 +176,12 @@ int CDECL _getch_nolock(void) DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(msvcrt_input_console(), &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(msvcrt_input_console(), 0); do { - if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputA(msvcrt_input_console(), &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -197,7 +207,7 @@ int CDECL _getch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(msvcrt_input_console(), mode); } return retval; } @@ -233,12 +243,12 @@ wchar_t CDECL _getwch_nolock(void) DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(msvcrt_input_console(), &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(msvcrt_input_console(), 0); do { - if (ReadConsoleInputW(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputW(msvcrt_input_console(), &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -264,7 +274,7 @@ wchar_t CDECL _getwch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(msvcrt_input_console(), mode); } return retval; } @@ -288,7 +298,7 @@ wchar_t CDECL _getwch(void) int CDECL _putch_nolock(int c) { DWORD count; - if (WriteConsoleA(MSVCRT_console_out, &c, 1, &count, NULL) && count == 1) + if (WriteConsoleA(msvcrt_output_console(), &c, 1, &count, NULL) && count == 1) return c; return EOF; } @@ -310,7 +320,7 @@ int CDECL _putch(int c) wchar_t CDECL _putwch_nolock(wchar_t c) { DWORD count; - if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1) + if (WriteConsoleW(msvcrt_output_console(), &c, 1, &count, NULL) && count==1) return c; return WEOF; } @@ -388,10 +398,10 @@ char* CDECL _cgets(char* str) TRACE("(%p)\n", str); str[1] = 0; /* Length */ LOCK_CONSOLE; - GetConsoleMode(MSVCRT_console_in, &conmode); - SetConsoleMode(MSVCRT_console_in, ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); + GetConsoleMode(msvcrt_input_console(), &conmode); + SetConsoleMode(msvcrt_input_console(), ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); - if(ReadConsoleA(MSVCRT_console_in, buf, str[0], &got, NULL)) { + if(ReadConsoleA(msvcrt_input_console(), buf, str[0], &got, NULL)) { if(buf[got-2] == '\r') { buf[got-2] = 0; str[1] = got-2; @@ -409,7 +419,7 @@ char* CDECL _cgets(char* str) } else buf = NULL; - SetConsoleMode(MSVCRT_console_in, conmode); + SetConsoleMode(msvcrt_input_console(), conmode); UNLOCK_CONSOLE; return buf; } @@ -474,10 +484,10 @@ int CDECL _kbhit(void) INPUT_RECORD *ir = NULL; DWORD count = 0, i; - GetNumberOfConsoleInputEvents(MSVCRT_console_in, &count); + GetNumberOfConsoleInputEvents(msvcrt_input_console(), &count); if (count && (ir = malloc(count * sizeof(INPUT_RECORD))) && - PeekConsoleInputA(MSVCRT_console_in, ir, count, &count)) + PeekConsoleInputA(msvcrt_input_console(), ir, count, &count)) for(i = 0; i < count - 1; i++) { if (ir[i].EventType == KEY_EVENT && @@ -497,7 +507,7 @@ int CDECL _kbhit(void) static int puts_clbk_console_a(void *ctx, int len, const char *str) { LOCK_CONSOLE; - if(!WriteConsoleA(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleA(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; @@ -506,7 +516,7 @@ static int puts_clbk_console_a(void *ctx, int len, const char *str) static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str) { LOCK_CONSOLE; - if(!WriteConsoleW(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleW(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 0da4885c7a5..61e8479bf90 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -113,7 +113,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } msvcrt_init_math(hinstDLL); msvcrt_init_io(); - msvcrt_init_console(); msvcrt_init_args(); msvcrt_init_signals(); #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0a742807430..8f6ee08ef2a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -232,7 +232,6 @@ extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; extern void msvcrt_init_math(void*) DECLSPEC_HIDDEN; extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_console(void) DECLSPEC_HIDDEN; extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; extern void msvcrt_free_args(void) DECLSPEC_HIDDEN;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021