wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Biswapriyo Nath : ntdll: Add RtlDefaultNpAcl stub.
by Alexandre Julliard 08 Dec '20

08 Dec '20

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

Paul Gofman : kernelbase: Get language sort only when required in LCMapStringEx().
by Alexandre Julliard 08 Dec '20

08 Dec '20

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

Rémi Bernon : gdi32: Don't try to get glyph index when default char is 0.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 06206f1628be8e12164f097d985a7e20a3a3d0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06206f1628be8e12164f097d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 8 13:09:22 2020 +0100 gdi32: Don't try to get glyph index when default char is 0. Fixes a regression from 5bdc6e0fe64222d8d7d383616f5e230928af011a, this is what the code was originally doing. 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/freetype.c | 2 +- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 09c8251de8f..fffa3288503 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2601,7 +2601,7 @@ static UINT CDECL freetype_get_default_glyph( struct gdi_font *font ) if ((pOS2 = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_os2 ))) { UINT glyph = pOS2->usDefaultChar; - freetype_get_glyph_index( font, &glyph, TRUE ); + if (glyph) freetype_get_glyph_index( font, &glyph, TRUE ); return glyph; } if (!pFT_Get_WinFNT_Header( ft_face, &winfnt )) return winfnt.default_char + winfnt.first_char; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cde83757c16..86ccddd05ea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1716,8 +1716,8 @@ static void test_GetGlyphIndices(void) 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]); + 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 = pRemoveFontMemResourceEx(rsrc);

1 0

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

08 Dec '20

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

Alexandre Julliard : winegcc: Look for ntdll.so instead of libwine.so to find the library directory.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 4e9f855be55fadf42627cd303841462aa2d80824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9f855be55fadf42627cd30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 18:44:33 2020 +0100 winegcc: Look for ntdll.so instead of libwine.so to find the library directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6decb02ee04..0a45cb7a0d5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -638,7 +638,7 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) static char *get_lib_dir( struct options *opts ) { const char *stdlibpath[] = { libdir, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; - static const char libwine[] = "/libwine.so"; + static const char ntdll[] = "/wine/ntdll.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; @@ -658,31 +658,31 @@ static char *get_lib_dir( struct options *opts ) if (!stdlibpath[i]) continue; buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + - strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + strlen("/arm-linux-gnueabi") + strlen(ntdll) + 1 ); strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, libwine ); + strcpy( p, ntdll ); if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) { p -= 2; - strcpy( p, libwine ); + strcpy( p, ntdll ); if (check_platform( opts, buffer )) goto found; } strcpy( p, bit_suffix ); - strcat( p, libwine ); + strcat( p, ntdll ); if (check_platform( opts, buffer )) goto found; strcpy( p, target_multiarch ); - strcat( p, libwine ); + strcat( p, ntdll ); if (check_platform( opts, buffer )) goto found; strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, libwine ); + strcpy( p, ntdll ); /* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */ while (p > buffer) @@ -724,7 +724,7 @@ static char *get_lib_dir( struct options *opts ) continue; found: - buffer[strlen(buffer) - strlen(libwine)] = 0; + buffer[strlen(buffer) - strlen(ntdll)] = 0; return buffer; } return strmake( "%s%s", root, LIBDIR );

1 0

Alexandre Julliard : ntdll: Support the Android Java %fs register being a GDT selector.
by Alexandre Julliard 08 Dec '20

08 Dec '20

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 08 Dec '20

08 Dec '20

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

Alexandre Julliard : libwine: Move the Android JNI initialization to ntdll.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 758e75cc46afe7d0349615998f533abca5eeca26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=758e75cc46afe7d034961599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:45:18 2020 +0100 libwine: Move the Android JNI initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 120 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/WineActivity.java | 9 +-- dlls/wineandroid.drv/android.h | 5 +- dlls/wineandroid.drv/device.c | 4 +- dlls/wineandroid.drv/init.c | 18 ++--- libs/wine/loader.c | 130 --------------------------------- 6 files changed, 135 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=758e75cc46afe7d03496…

1 0

Alexandre Julliard : ntdll: Don't use the main exe path as bindir on Android.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 99ef6faf769bba812632ac4a18c925dc5e9f4ca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ef6faf769bba812632ac4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:41:20 2020 +0100 ntdll: Don't use the main exe path as bindir on Android. The main exe can be the JVM host process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 72f215eb2d3..7a9e73d9730 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -339,7 +339,7 @@ static void set_config_dir(void) } } -static void init_paths( int argc, char *argv[], char *envp[] ) +static void init_paths( char *argv[] ) { Dl_info info; @@ -350,7 +350,7 @@ static void init_paths( int argc, char *argv[], char *envp[] ) if (!(build_dir = remove_tail( dll_dir, "/dlls/ntdll" ))) { -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) bin_dir = realpath_dirname( "/proc/self/exe" ); #elif defined (__FreeBSD__) || defined(__DragonFly__) bin_dir = realpath_dirname( "/proc/curproc/file" ); @@ -1757,7 +1757,7 @@ static void check_command_line( int argc, char *argv[] ) */ void __wine_main( int argc, char *argv[], char *envp[] ) { - init_paths( argc, argv, envp ); + init_paths( argv ); if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ {

1 0

Chip Davis : iphlpapi: Fix copy-paste error.
by Alexandre Julliard 08 Dec '20

08 Dec '20

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

← Newer
1
...
16
17
18
19
20
21
22
...
42
Older →

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 December 2020