December 2020 - Wine-Commits

Zhiyi Zhang : user32/tests: Test that monitor handles are user32 handles.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: bc4d22b3dcb48d6e5d0be467ebfd6f2c7506f347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4d22b3dcb48d6e5d0be467… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 8 16:12:15 2020 +0800 user32/tests: Test that monitor handles are user32 handles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c3f5d1eddcb..2ca6e9ece84 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1862,6 +1862,86 @@ static void test_display_config(void) test_DisplayConfigGetDeviceInfo(); } +static BOOL CALLBACK test_handle_proc(HMONITOR full_monitor, HDC hdc, LPRECT rect, LPARAM lparam) +{ + MONITORINFO monitor_info = {sizeof(monitor_info)}; + HMONITOR monitor; + BOOL ret; + +#ifdef _WIN64 + if ((ULONG_PTR)full_monitor >> 32) + monitor = full_monitor; + else + monitor = (HMONITOR)((ULONG_PTR)full_monitor | ((ULONG_PTR)~0u << 32)); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); + + monitor = (HMONITOR)((ULONG_PTR)full_monitor & 0xffffffff); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); + + monitor = (HMONITOR)(((ULONG_PTR)full_monitor & 0xffffffff) | ((ULONG_PTR)0x1234 << 32)); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); + + monitor = (HMONITOR)((ULONG_PTR)full_monitor & 0xffff); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + todo_wine ok(!ret, "GetMonitorInfoW succeeded.\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_MONITOR_HANDLE, "Expected error code %#x, got %#x.\n", + ERROR_INVALID_MONITOR_HANDLE, GetLastError()); + + monitor = (HMONITOR)(((ULONG_PTR)full_monitor & 0xffff) | ((ULONG_PTR)0x9876 << 16)); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(!ret, "GetMonitorInfoW succeeded.\n"); + ok(GetLastError() == ERROR_INVALID_MONITOR_HANDLE, "Expected error code %#x, got %#x.\n", + ERROR_INVALID_MONITOR_HANDLE, GetLastError()); + + monitor = (HMONITOR)(((ULONG_PTR)full_monitor & 0xffff) | ((ULONG_PTR)0x12345678 << 16)); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(!ret, "GetMonitorInfoW succeeded.\n"); + ok(GetLastError() == ERROR_INVALID_MONITOR_HANDLE, "Expected error code %#x, got %#x.\n", + ERROR_INVALID_MONITOR_HANDLE, GetLastError()); +#else + if ((ULONG_PTR)full_monitor >> 16) + monitor = full_monitor; + else + monitor = (HMONITOR)((ULONG_PTR)full_monitor | ((ULONG_PTR)~0u << 16)); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + todo_wine_if(((ULONG_PTR)full_monitor >> 16) == 0) + ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); + + monitor = (HMONITOR)((ULONG_PTR)full_monitor & 0xffff); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); + + monitor = (HMONITOR)(((ULONG_PTR)full_monitor & 0xffff) | ((ULONG_PTR)0x1234 << 16)); + SetLastError(0xdeadbeef); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(!ret, "GetMonitorInfoW succeeded.\n"); + ok(GetLastError() == ERROR_INVALID_MONITOR_HANDLE, "Expected error code %#x, got %#x.\n", + ERROR_INVALID_MONITOR_HANDLE, GetLastError()); +#endif + + return TRUE; +} + +static void test_handles(void) +{ + BOOL ret; + + /* Test that monitor handles are user32 handles */ + ret = EnumDisplayMonitors(NULL, NULL, test_handle_proc, 0); + ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); +} + START_TEST(monitor) { init_function_pointers(); @@ -1871,4 +1951,5 @@ START_TEST(monitor) test_monitors(); test_work_area(); test_display_config(); + test_handles(); }

1 0

Biswapriyo Nath : ntdll: Add RtlDefaultNpAcl stub.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 2d0fefbc49e202fa7f8ae21eb435b5fd91ceb8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0fefbc49e202fa7f8ae21e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Nov 28 00:01:40 2020 +0530 ntdll: Add RtlDefaultNpAcl stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49900 Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 248ae72a011..b9acb120844 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -572,7 +572,7 @@ @ stdcall RtlDecodeSystemPointer(ptr) RtlDecodePointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) -@ stub RtlDefaultNpAcl +@ stdcall RtlDefaultNpAcl(ptr) @ stub RtlDelete @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 0d45bbf02aa..eccfc82ce8c 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1718,3 +1718,14 @@ NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( return STATUS_NOT_IMPLEMENTED; } + +/****************************************************************************** + * RtlDefaultNpAcl (NTDLL.@) + */ +NTSTATUS WINAPI RtlDefaultNpAcl(PACL *pAcl) +{ + FIXME("%p - stub\n", pAcl); + + *pAcl = NULL; + return STATUS_SUCCESS; +}

1 0

Rémi Bernon : gdi32/tests: Test GetGlyphIndices with '\0' default and a glyph.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 6245f07201fd2c9ec9bc60b3de7757cb6d20bd76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6245f07201fd2c9ec9bc60b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 8 13:09:21 2020 +0100 gdi32/tests: Test GetGlyphIndices with '\0' default and a glyph. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50175 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/font.c | 112 ++++++++++++++++++++++++++--------------- dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_nul.sfd | 113 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_nul.ttf | Bin 0 -> 1600 bytes 5 files changed, 190 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 1eba8d13cef..876f6a376a2 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -24,6 +24,7 @@ FONT_SRCS = \ wine_langnames2.sfd \ wine_langnames3.sfd \ wine_longname.sfd \ + wine_nul.sfd \ wine_test.sfd \ wine_ttfnames.sfd \ wine_ttfnames_bold.sfd \ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8b0c7b3dbcc..cde83757c16 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1587,6 +1587,45 @@ static void test_text_extents(void) ReleaseDC(NULL, hdc); } +static void free_font(void *font) +{ + UnmapViewOfFile(font); +} + +static void *load_font(const char *font_name, DWORD *font_size) +{ + char file_name[MAX_PATH]; + HANDLE file, mapping; + void *font; + + if (font_name[1] == ':') + strcpy(file_name, font_name); + else + { + if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; + strcat(file_name, "\\fonts\\"); + strcat(file_name, font_name); + } + + file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) return NULL; + + *font_size = GetFileSize(file, NULL); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + { + CloseHandle(file); + return NULL; + } + + font = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + + CloseHandle(file); + CloseHandle(mapping); + return font; +} + static void test_GetGlyphIndices(void) { HDC hdc; @@ -1598,6 +1637,10 @@ static void test_GetGlyphIndices(void) WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; + HANDLE rsrc; + DWORD ret, font_size, num_fonts; + void *font; + char ttf_name[MAX_PATH]; if (!pGetGlyphIndicesW) { win_skip("GetGlyphIndicesW not available on platform\n"); @@ -1653,6 +1696,36 @@ static void test_GetGlyphIndices(void) ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + + ret = write_ttf_file("wine_nul.ttf", ttf_name); + ok(ret, "Failed to create test font file.\n"); + font = load_font(ttf_name, &font_size); + ok(font != NULL, "Failed to map font file.\n"); + num_fonts = 0; + rsrc = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ok(ret != 0, "Failed to add resource, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "wine_nul"); + lf.lfHeight = 20; + flags = 0; + hfont = CreateFontIndirectA(&lf); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + testtext[0] = 'T'; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + todo_wine ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); + DeleteObject(SelectObject(hdc, hOldFont)); + + ret = pRemoveFontMemResourceEx(rsrc); + ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); + free_font(font); + ret = DeleteFileA(ttf_name); + ok(ret, "Failed to delete font file, %d.\n", GetLastError()); + } static void test_GetKerningPairs(void) @@ -5000,45 +5073,6 @@ static void test_CreateFontIndirectEx(void) DeleteObject(hfont); } -static void free_font(void *font) -{ - UnmapViewOfFile(font); -} - -static void *load_font(const char *font_name, DWORD *font_size) -{ - char file_name[MAX_PATH]; - HANDLE file, mapping; - void *font; - - if (font_name[1] == ':') - strcpy(file_name, font_name); - else - { - if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; - strcat(file_name, "\\fonts\\"); - strcat(file_name, font_name); - } - - file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) return NULL; - - *font_size = GetFileSize(file, NULL); - - mapping = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); - if (!mapping) - { - CloseHandle(file); - return NULL; - } - - font = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); - - CloseHandle(file); - CloseHandle(mapping); - return font; -} - static void test_realization_info(const char *name, DWORD size, BOOL is_memory_resource) { struct font_realization_info info; diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index 6cbe789880b..784d8602a9a 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -46,3 +46,6 @@ wine_langnames2.ttf RCDATA wine_langnames2.ttf /* @makedep: wine_langnames3.ttf */ wine_langnames3.ttf RCDATA wine_langnames3.ttf + +/* @makedep: wine_nul.ttf */ +wine_nul.ttf RCDATA wine_nul.ttf diff --git a/dlls/gdi32/tests/wine_nul.sfd b/dlls/gdi32/tests/wine_nul.sfd new file mode 100644 index 00000000000..c82180f1007 --- /dev/null +++ b/dlls/gdi32/tests/wine_nul.sfd @@ -0,0 +1,113 @@ +SplineFontDB: 3.2 +FontName: wine_nul +FullName: wine_nul +FamilyName: wine_nul +Weight: Medium +Copyright: Copyright (c) 2020 Remi Bernon for CodeWeavers +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -205 +UnderlineWidth: 102 +Ascent: 1638 +Descent: 410 +InvalidEm: 0 +sfntRevision: 0x00010000 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +XUID: [1021 905 592216984 1247726] +FSType: 32767 +OS2Version: 2 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1607427474 +ModificationTime: 1607428497 +PfmFamily: 17 +TTFWeight: 500 +TTFWidth: 5 +LineGap: 184 +VLineGap: 0 +Panose: 2 0 6 3 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 184 +OS2WinAscent: 1638 +OS2WinAOffset: 0 +OS2WinDescent: 410 +OS2WinDOffset: 0 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2SubXSize: 1331 +OS2SubYSize: 1433 +OS2SubXOff: 0 +OS2SubYOff: 286 +OS2SupXSize: 1331 +OS2SupYSize: 1433 +OS2SupXOff: 0 +OS2SupYOff: 983 +OS2StrikeYSize: 102 +OS2StrikeYPos: 530 +OS2Vendor: 'Wine' +OS2CodePages: 00000001.00000000 +OS2UnicodeRanges: 00000001.00000000.00000000.00000000 +MarkAttachClasses: 1 +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +ShortTable: maxp 16 + 1 + 0 + 4 + 8 + 2 + 0 + 0 + 2 + 0 + 1 + 1 + 0 + 64 + 46 + 0 + 0 +EndShort +LangName: 1033 "" "" "" "Wine : wine_nul : 4-11-2010" +GaspTable: 1 65535 2 0 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -24 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 76 22 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 1 + +StartChar: uni0000 +Encoding: 0 0 0 +Width: 2048 +LayerCount: 2 +Fore +SplineSet +667 1485 m 5,0,-1 + 1327 1485 l 1,1,-1 + 1327 0 l 1,2,-1 + 667 0 l 1,3,-1 + 667 1485 l 5,0,-1 +601 1575 m 1,0,-1 + 1405 1575 l 1,1,-1 + 1405 -63 l 1,2,-1 + 601 -63 l 1,3,-1 + 601 1575 l 1,0,-1 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_nul.ttf b/dlls/gdi32/tests/wine_nul.ttf new file mode 100644 index 00000000000..89e5648fd92 Binary files /dev/null and b/dlls/gdi32/tests/wine_nul.ttf differ

1 0

Paul Gofman : kernelbase: Get language sort only when required in LCMapStringEx().
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: cf3bb0ce0d07531f7c8a053d5184bf2b0b287ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf3bb0ce0d07531f7c8a053d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 8 13:07:19 2020 +0300 kernelbase: Get language sort only when required in LCMapStringEx(). Fixes very slow loading (a few minutes) of Warhammer 40000: Inquisitor - Martyr after b780e5f5b1bd018629bfa31431e216c7579fe9aa. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7218a159844..c60b796aa48 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5205,7 +5205,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co WCHAR *dst, int dstlen, NLSVERSIONINFO *version, void *reserved, LPARAM handle ) { - const struct sortguid *sortid; + const struct sortguid *sortid = NULL; LPWSTR dst_ptr; INT len; @@ -5236,7 +5236,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co if (!dstlen) dst = NULL; - if (!(sortid = get_language_sort( locale ))) + if (flags & LCMAP_LINGUISTIC_CASING && !(sortid = get_language_sort( locale ))) { FIXME( "unknown locale %s\n", debugstr_w(locale) ); SetLastError( ERROR_INVALID_PARAMETER );

1 0

Jacek Caban : dbghelp: Use WINELOADER environment variable from debuggee process in get_wine_loader_name.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 310019789f7bde12ae3f25f723957c975fb2f804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=310019789f7bde12ae3f25f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 20:19:12 2020 +0100 dbghelp: Use WINELOADER environment variable from debuggee process in get_wine_loader_name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49838 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 5 +---- dlls/dbghelp/macho_module.c | 7 +------ dlls/dbghelp/module.c | 35 +++++------------------------------ 4 files changed, 8 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 13e98b3b5f6..b51e8800403 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -651,7 +651,7 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern WCHAR * get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; +extern const WCHAR *get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e44629f016e..d1a4454e043 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1752,13 +1752,10 @@ static const struct loader_ops elf_loader_ops = BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) { struct elf_info elf_info; - WCHAR *loader; BOOL ret; elf_info.flags = ELF_INFO_DEBUG_HEADER | ELF_INFO_MODULE; - loader = get_wine_loader_name(pcs); - ret = elf_search_and_load_file(pcs, loader, addr, 0, &elf_info); - heap_free(loader); + ret = elf_search_and_load_file(pcs, get_wine_loader_name(pcs), addr, 0, &elf_info); if (!ret || !elf_info.dbg_hdr_addr) return FALSE; TRACE("Found ELF debug header %#lx\n", elf_info.dbg_hdr_addr); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 8e91577e449..602f7e45c14 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1885,12 +1885,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } } - if (!ret) - { - WCHAR *loader = get_wine_loader_name(pcs); - ret = loader && macho_search_and_load_file(pcs, loader, 0, macho_info); - heap_free(loader); - } + if (!ret) ret = macho_search_and_load_file(pcs, get_wine_loader_name(pcs), 0, macho_info); return ret; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 23e67390185..cadb285accb 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -138,37 +138,12 @@ void module_set_module(struct module* module, const WCHAR* name) } /* Returned string must be freed by caller */ -WCHAR *get_wine_loader_name(struct process *pcs) +const WCHAR *get_wine_loader_name(struct process *pcs) { - static const WCHAR wineW[] = {'w','i','n','e',0}; - static const WCHAR suffixW[] = {'6','4',0}; - WCHAR *buffer, *p; - const char *env; - - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((env = getenv("WINELOADER"))) - { - DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, env, -1, NULL, 0 ); - buffer = heap_alloc( len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, env, -1, buffer, len ); - } - else - { - buffer = heap_alloc( sizeof(wineW) + 2 * sizeof(WCHAR) ); - lstrcpyW( buffer, wineW ); - } - - p = buffer + lstrlenW( buffer ) - lstrlenW( suffixW ); - if (p > buffer && !wcscmp( p, suffixW )) - *p = 0; - - if (pcs->is_64bit) - lstrcatW(buffer, suffixW); - - TRACE( "returning %s\n", debugstr_w(buffer) ); - return buffer; + const WCHAR *name = process_getenv(pcs, L"WINELOADER"); + if (!name) name = pcs->is_64bit ? L"wine64" : L"wine"; + TRACE("returning %s\n", debugstr_w(name)); + return name; } static const char* get_module_type(enum module_type type, BOOL virtual)

1 0

Alexandre Julliard : ntdll: Support the Android Java %fs register being a GDT selector.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 6ddd6e836cf0c1f592845296428dde28df851e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ddd6e836cf0c1f592845296… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:46:17 2020 +0100 ntdll: Support the Android Java %fs register being a GDT selector. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 + dlls/wineandroid.drv/device.c | 4 +++- dlls/wineandroid.drv/init.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 676027fe516..31cfb43d11f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1671,6 +1671,7 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { unsigned short java_fs; __asm__( "mov %%fs,%0" : "=r" (java_fs) ); + if (!(java_fs & 4)) java_gdt_sel = java_fs; __asm__( "mov %0,%%fs" :: "r" (0) ); start_main_thread(); __asm__( "mov %0,%%fs" :: "r" (java_fs) ); diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 45ceb0a5c0b..5bebc5c7901 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -258,9 +258,11 @@ static inline void wrap_java_call(void) { __asm__( "mov %0,%%fs" :: "r" (java_ static inline void unwrap_java_call(void) { __asm__( "mov %0,%%fs" :: "r" (orig_fs) ); } static inline void init_java_thread( JavaVM *java_vm ) { + java_fs = *p_java_gdt_sel; __asm__( "mov %%fs,%0" : "=r" (orig_fs) ); + __asm__( "mov %0,%%fs" :: "r" (java_fs) ); (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); - __asm__( "mov %%fs,%0" : "=r" (java_fs) ); + if (!*p_java_gdt_sel) __asm__( "mov %%fs,%0" : "=r" (java_fs) ); __asm__( "mov %0,%%fs" :: "r" (orig_fs) ); } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 638fb5726c1..d6ca79a1416 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -622,6 +622,7 @@ static void load_android_libs(void) JavaVM **p_java_vm = NULL; jobject *p_java_object = NULL; +unsigned short *p_java_gdt_sel = NULL; static BOOL process_attach(void) { @@ -635,6 +636,7 @@ static BOOL process_attach(void) p_java_vm = dlsym( ntdll, "java_vm" ); p_java_object = dlsym( ntdll, "java_object" ); + p_java_gdt_sel = dlsym( ntdll, "java_gdt_sel" ); object = *p_java_object;

1 0

Alexandre Julliard : libwine: Mark more functions as obsolete.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 2bf8293e8fec0aa7efb450a7bf1a14633d16abcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bf8293e8fec0aa7efb450a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 13:13:14 2020 +0100 libwine: Mark more functions as obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 9 +++++---- libs/wine/loader.c | 59 ++++++++++++++++++++++++++++++------------------------ libs/wine/mmap.c | 54 ++++++++++++++++++++++++++++--------------------- libs/wine/wine.map | 12 +++++------ 4 files changed, 75 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bf8293e8fec0aa7efb4…

1 0

Michael Stefaniuc : ieframe/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 22471237bf4d8a3749ff51cccc99cf42a4a38fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=22471237bf4d8a3749ff51cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 6 16:02:18 2020 +0100 ieframe/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/intshcut.c | 12 ++++-------- dlls/ieframe/tests/webbrowser.c | 16 +++++----------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 803e7ec60e9..d2135d0ebb3 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -171,9 +171,7 @@ static void test_ReadAndWriteProperties(void) IUniformResourceLocatorA *urlA; IUniformResourceLocatorA *urlAFromFile; WCHAR fileNameW[MAX_PATH]; - - static const WCHAR shortcutW[] = {'t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; - WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; + static WCHAR iconPath[] = L"file:///C:/arbitrary/icon/path"; char testurl[] = "http://some/bogus/url.html"; ps[0].ulKind = PRSPEC_PROPID; @@ -183,7 +181,7 @@ static void test_ReadAndWriteProperties(void) /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); - lstrcatW(fileNameW, shortcutW); + lstrcatW(fileNameW, L"testshortcut.url"); hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); ok(hr == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hr); @@ -208,7 +206,7 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = (void *) iconPath; + U(pv[0]).pwszVal = iconPath; pv[1].vt = VT_I4; U(pv[1]).lVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); @@ -326,10 +324,8 @@ static void test_Load(void) HANDLE file; HRESULT hres; - static const WCHAR test_urlW[] = {'t','e','s','t','.','u','r','l',0}; - GetTempPathW(MAX_PATH, file_path); - lstrcatW(file_path, test_urlW); + lstrcatW(file_path, L"test.url"); for(test = load_tests; test < load_tests + ARRAY_SIZE(load_tests); test++) { IPropertySetStorage *propsetstorage; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9c2c393aafe..52d1f707357 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -160,8 +160,6 @@ DEFINE_EXPECT(GetExternal); DEFINE_EXPECT(outer_QI_test); DEFINE_EXPECT(Advise_OnClose); -static const WCHAR wszItem[] = {'i','t','e','m',0}; - static VARIANT_BOOL exvb; static IWebBrowser2 *wb; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT(UIWindow_SetActiveObject); if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + ok(!lstrcmpW(pszObjName, L"item"), "unexpected pszObjName\n"); } else { ok(!pActiveObject, "pActiveObject != NULL\n"); ok(!pszObjName, "pszObjName != NULL\n"); @@ -1282,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT(Frame_SetActiveObject); if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + ok(!lstrcmpW(pszObjName, L"item"), "unexpected pszObjName\n"); } else { ok(!pActiveObject, "pActiveObject != NULL\n"); ok(!pszObjName, "pszObjName != NULL\n"); @@ -1817,19 +1815,17 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static HWND create_container_window(void) { - static const WCHAR wszWebBrowserContainer[] = - {'W','e','b','B','r','o','w','s','e','r','C','o','n','t','a','i','n','e','r',0}; static WNDCLASSEXW wndclass = { sizeof(WNDCLASSEXW), 0, wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszWebBrowserContainer, + L"WebBrowserContainer", NULL }; RegisterClassExW(&wndclass); - return CreateWindowW(wszWebBrowserContainer, wszWebBrowserContainer, + return CreateWindowW(L"WebBrowserContainer", L"WebBrowserContainer", WS_OVERLAPPEDWINDOW, 10, 10, 600, 600, NULL, NULL, NULL, NULL); } @@ -1942,9 +1938,7 @@ static void test_SetHostNames(IOleObject *oleobj) { HRESULT hres; - static const WCHAR test_appW[] = {'t','e','s','t',' ','a','p','p',0}; - - hres = IOleObject_SetHostNames(oleobj, test_appW, (void*)0xdeadbeef); + hres = IOleObject_SetHostNames(oleobj, L"test app", (void*)0xdeadbeef); ok(hres == S_OK, "SetHostNames failed: %08x\n", hres); }

1 0

Jacek Caban : conhost: Use QS_ALLINPUT to wait for input in main loop.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 8a47ef28caf2432a06b753a6af9b0449dbc95e1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a47ef28caf2432a06b753a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 01:03:51 2020 +0100 conhost: Use QS_ALLINPUT to wait for input in main loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50014 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dbf0e1459d1..0548fcaafd3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2625,7 +2625,7 @@ static int main_loop( struct console *console, HANDLE signal ) for (;;) { if (pump_msgs) - res = MsgWaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE, QS_ALLEVENTS ); + res = MsgWaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE, QS_ALLINPUT ); else res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE );

1 0

Chip Davis : iphlpapi: Fix copy-paste error.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: bf662e5b624c30bf458f23779c52b3acf9204b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf662e5b624c30bf458f2377… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 7 22:26:04 2020 -0600 iphlpapi: Fix copy-paste error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50274 Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 0fa446c21a5..36f90f2c3a8 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2980,7 +2980,7 @@ DWORD build_tcp6_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwLocalScopeId = find_ipv6_addr_scope( (const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size ); memcpy( &row.ucRemoteAddr, &in->in6p_faddr.s6_addr, sizeof(row.ucRemoteAddr) ); row.dwRemotePort = in->inp_fport; - row.dwLocalScopeId = find_ipv6_addr_scope( (const IN6_ADDR *)&row.ucRemoteAddr, addr_scopes, addr_scopes_size ); + row.dwRemoteScopeId = find_ipv6_addr_scope( (const IN6_ADDR *)&row.ucRemoteAddr, addr_scopes, addr_scopes_size ); row.dwState = TCPStateToMIBState( tcp->t_state ); if (!match_class( class, row.dwState )) continue;

1 0