August 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Avoid referencing winecrt0 exception handlers from the Unix library.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: wine Branch: master Commit: 97847eeee8aaaad9b141e14d4468838960ea3093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97847eeee8aaaad9b141e14d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:30:19 2020 +0200 ntdll: Avoid referencing winecrt0 exception handlers from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 10 ++++++---- include/wine/exception.h | 17 ++++------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fa46ec0966..e3f2820de5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -92,6 +92,8 @@ struct file_view unsigned int protect; /* protection for all pages at allocation time and SEC_* flags */ }; +#define __EXCEPT_SYSCALL __EXCEPT_HANDLER(0) + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -3142,7 +3144,7 @@ BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) dummy = p[0]; dummy = p[count - 1]; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return FALSE; } @@ -3175,7 +3177,7 @@ BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) p[0] |= 0; p[count - 1] |= 0; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return FALSE; } @@ -3197,7 +3199,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) volatile const char *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return TRUE; } @@ -3219,7 +3221,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) volatile const WCHAR *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return TRUE; } diff --git a/include/wine/exception.h b/include/wine/exception.h index a6ada7af21..a2b0bb08dc 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -163,27 +163,18 @@ extern DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { -/* convenience handler for page fault exceptions */ -#define __EXCEPT_PAGE_FAULT \ +#define __EXCEPT_HANDLER(handler) \ } while(0); \ __wine_pop_frame( &__f.frame ); \ break; \ } else { \ - __f.frame.Handler = __wine_exception_handler_page_fault; \ + __f.frame.Handler = (handler); \ if (__wine_setjmpex( &__f.jmp, &__f.frame )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { -/* convenience handler for all exceptions */ -#define __EXCEPT_ALL \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - break; \ - } else { \ - __f.frame.Handler = __wine_exception_handler_all; \ - if (__wine_setjmpex( &__f.jmp, &__f.frame )) { \ - const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ - do { +#define __EXCEPT_PAGE_FAULT __EXCEPT_HANDLER(__wine_exception_handler_page_fault) +#define __EXCEPT_ALL __EXCEPT_HANDLER(__wine_exception_handler_all) #define __ENDTRY \ } while (0); \

1 0

Carlos Rivera : kernel32: Remove obsolete comment.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: wine Branch: master Commit: 70fdc36d296b77d1d130761342778b3b636f00bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=70fdc36d296b77d1d1307613… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Sun Aug 23 19:01:01 2020 +0100 kernel32: Remove obsolete comment. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index bfaba6cdeb..8c03a45602 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1547,8 +1547,6 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, /*********************************************************************** * GetPrivateProfileIntA (KERNEL32.@) - * - * FIXME: rewrite using unicode */ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT def_val, LPCSTR filename )

1 0

Julian Rüger : German translation for release 5.15.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: website Branch: master Commit: c132e7ec408233f015db7149188d953e8a764f8d URL: https://source.winehq.org/git/website.git/?a=commit;h=c132e7ec408233f015db7… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:52:43 2020 +0200 German translation for release 5.15. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020081401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020081401.xml b/news/de/2020081401.xml new file mode 100644 index 00000000..fb02256f --- /dev/null +++ b/news/de/2020081401.xml @@ -0,0 +1,17 @@ +<news> +<date>14. August 2020</date> +<title>Wine 5.15 freigegeben</title> +<body> + Die Entwicklungsversion 5.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfängliche Implementierung der XACT-Engine-Bibliotheken.</li> + <li>Anfänge der Mathematikfunktionen in MSVCRT basierend auf Musl.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Verbesserung der Direct-Input-Performance.</li> + <li>Korrekturen an der Ausnahmebehandlung unter x86-64.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.13.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: website Branch: master Commit: e9523bccfa5e022986ada0c7e8eea4673d14dfa6 URL: https://source.winehq.org/git/website.git/?a=commit;h=e9523bccfa5e022986ada… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:46:47 2020 +0200 German translation for release 5.13. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020071701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020071701.xml b/news/de/2020071701.xml new file mode 100644 index 00000000..f50cc2b5 --- /dev/null +++ b/news/de/2020071701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. Juli 2020</date> +<title>Wine 5.13 freigegeben</title> +<body> + Die Entwicklungsversion 5.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Re-mapping von INI-Dateien in die Registry.</li> + <li>Systemcall-Thunks in NTDLL.</li> + <li>Reimplementierung der Abbildung von Fließkommazahlen.</li> + <li>Anfänge einer Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.14.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: website Branch: master Commit: 4990a076594ade87f4feeb0e7d21c0e416f34fbb URL: https://source.winehq.org/git/website.git/?a=commit;h=4990a076594ade87f4fee… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:48:33 2020 +0200 German translation for release 5.14. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020080101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020080101.xml b/news/de/2020080101.xml new file mode 100644 index 00000000..7654524a --- /dev/null +++ b/news/de/2020080101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. August 2020</date> +<title>Wine 5.14 freigegeben</title> +<body> + Die Entwicklungsversion 5.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Anfängliche Version der Webdings-Schriftart.</li> + <li>Anfänge der PE-Konversion der MSVCRT-Bibliotheken.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.0.2.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: website Branch: master Commit: 8f1a589972aa3404d629482d2087a19ea94a8b2b URL: https://source.winehq.org/git/website.git/?a=commit;h=8f1a589972aa3404d6294… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:49:01 2020 +0200 German translation for release 5.0.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020080701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020080701.xml b/news/de/2020080701.xml new file mode 100644 index 00000000..b88e7572 --- /dev/null +++ b/news/de/2020080701.xml @@ -0,0 +1,12 @@ +<news> +<date>7. August 2020</date> +<title>Wine 5.0.2 freigegeben</title> +<body> + Die Wartungsversion 5.0.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.0.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.12.
by Alexandre Julliard Aug. 24, 2020

Aug. 24, 2020

Module: website Branch: master Commit: 8527e4c86cd9fc39e6cc5d9026697628dff272b0 URL: https://source.winehq.org/git/website.git/?a=commit;h=8527e4c86cd9fc39e6cc5… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:43:34 2020 +0200 German translation for release 5.12. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020070301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020070301.xml b/news/de/2020070301.xml new file mode 100644 index 00000000..70d5f180 --- /dev/null +++ b/news/de/2020070301.xml @@ -0,0 +1,16 @@ +<news> +<date>3. Juli 2020</date> +<title>Wine 5.12 freigegeben</title> +<body> + Die Entwicklungsversion 5.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>NTDLL zum PE-Format konvertiert.</li> + <li>Unterstützung der WebSocket-API.</li> + <li>Verbesserte RawInput-Unterstützung.</li> + <li>Update der Vulkan-Spezifikation.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.12.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: 15a39f9990f17a83d1c375e897403365cb937769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a39f9990f17a83d1c375e8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Aug 21 11:14:14 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9395cb791d..937d64fff8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-07 18:55+0300\n" +"PO-Revision-Date: 2020-08-21 11:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3.1\n" +"X-Generator: Poedit 2.4.1\n" "X-Project-Style: default\n" #: appwiz.rc:58 @@ -16533,10 +16533,8 @@ msgid "&Beginner" msgstr "P&radedantis" #: winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Sąsaja" +msgstr "&Vidutinis" #: winemine.rc:46 msgid "&Expert" @@ -16567,10 +16565,8 @@ msgid "Beginner" msgstr "Pradedantis" #: winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Sąsaja" +msgstr "Vidutinis" #: winemine.rc:66 msgid "Expert"

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFace5::Equals().
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: ab94abb14f74fe863ae40dafc7a8301db22792fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab94abb14f74fe863ae40daf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 21 15:39:27 2020 +0300 dwrite: Add partial implementation for IDWriteFontFace5::Equals(). Issue with missing method spotted by Brendan Shanks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 17 +++++++++++++++++ dlls/dwrite/tests/font.c | 11 ++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 19fe911420..aa51c74429 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1562,6 +1562,22 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } +static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface), *other_face; + + TRACE("%p, %p.\n", iface, other); + + if (!(other_face = unsafe_impl_from_IDWriteFontFace(other))) + return FALSE; + + /* TODO: add variations support */ + + return fontface->index == other_face->index && + fontface->simulations == other_face->simulations && + is_same_fontfile(fontface->files[0], other_face->files[0]); +} + static const IDWriteFontFace5Vtbl dwritefontfacevtbl = { dwritefontface_QueryInterface, @@ -1621,6 +1637,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface5_GetFontAxisValues, dwritefontface5_HasVariations, dwritefontface5_GetFontResource, + dwritefontface5_Equals, }; static HRESULT WINAPI dwritefontface_reference_QueryInterface(IDWriteFontFaceReference *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e1024d0263..becb1a741f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1817,13 +1817,14 @@ static void test_CreateFontFace(void) IDWriteFontCollection *collection; DWRITE_FONT_FILE_TYPE file_type; DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFace5 *fontface5; IDWriteGdiInterop *interop; IDWriteFont *font, *font2; IDWriteFontFamily *family; IDWriteFactory *factory; IDWriteFontFile *file; + BOOL supported, ret; LOGFONTW logfont; - BOOL supported; UINT32 count; WCHAR *path; HRESULT hr; @@ -1908,6 +1909,14 @@ static void test_CreateFontFace(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); + /* Trivial equality test */ + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) + { + ret = IDWriteFontFace5_Equals(fontface5, fontface2); + ok(ret, "Unexpected result %d.\n", ret); + IDWriteFontFace5_Release(fontface5); + } + IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface2); IDWriteFont_Release(font2);

1 0

Piotr Caban : msvcrt: Optimize memmove implementation.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: dd90fdda0e8b8f4b0c669d637193ffdddd1de820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd90fdda0e8b8f4b0c669d63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 20 20:00:42 2020 +0200 msvcrt: Optimize memmove implementation. Based on Torbjorn Granlund code from Glibc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ab6747db5c..3343f1e3cc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2483,23 +2483,106 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) /********************************************************************* * memmove (MSVCRT.@) */ +#ifdef WORDS_BIGENDIAN +# define MERGE(w1, sh1, w2, sh2) ((w1 << sh1) | (w2 >> sh2)) +#else +# define MERGE(w1, sh1, w2, sh2) ((w1 >> sh1) | (w2 << sh2)) +#endif void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ + unsigned char *d = dst; const unsigned char *s = src; + int sh1; + + if (!n) return dst; if ((MSVCRT_size_t)dst - (MSVCRT_size_t)src >= n) { + for (; (MSVCRT_size_t)d % sizeof(MSVCRT_size_t) && n; n--) *d++ = *s++; + + sh1 = 8 * ((MSVCRT_size_t)s % sizeof(MSVCRT_size_t)); + if (!sh1) + { + while (n >= sizeof(MSVCRT_size_t)) + { + *(MSVCRT_size_t*)d = *(MSVCRT_size_t*)s; + s += sizeof(MSVCRT_size_t); + d += sizeof(MSVCRT_size_t); + n -= sizeof(MSVCRT_size_t); + } + } + else if (n >= 2 * sizeof(MSVCRT_size_t)) + { + int sh2 = 8 * sizeof(MSVCRT_size_t) - sh1; + MSVCRT_size_t x, y; + + s -= sh1 / 8; + x = *(MSVCRT_size_t*)s; + do + { + s += sizeof(MSVCRT_size_t); + y = *(MSVCRT_size_t*)s; + *(MSVCRT_size_t*)d = MERGE(x, sh1, y, sh2); + d += sizeof(MSVCRT_size_t); + + s += sizeof(MSVCRT_size_t); + x = *(MSVCRT_size_t*)s; + *(MSVCRT_size_t*)d = MERGE(y, sh1, x, sh2); + d += sizeof(MSVCRT_size_t); + + n -= 2 * sizeof(MSVCRT_size_t); + } while (n >= 2 * sizeof(MSVCRT_size_t)); + s += sh1 / 8; + } while (n--) *d++ = *s++; + return dst; } else { - d += n - 1; - s += n - 1; - while (n--) *d-- = *s--; + d += n; + s += n; + + for (; (MSVCRT_size_t)d % sizeof(MSVCRT_size_t) && n; n--) *--d = *--s; + + sh1 = 8 * ((MSVCRT_size_t)s % sizeof(MSVCRT_size_t)); + if (!sh1) + { + while (n >= sizeof(MSVCRT_size_t)) + { + s -= sizeof(MSVCRT_size_t); + d -= sizeof(MSVCRT_size_t); + *(MSVCRT_size_t*)d = *(MSVCRT_size_t*)s; + n -= sizeof(MSVCRT_size_t); + } + } + else if (n >= 2 * sizeof(MSVCRT_size_t)) + { + int sh2 = 8 * sizeof(MSVCRT_size_t) - sh1; + MSVCRT_size_t x, y; + + s -= sh1 / 8; + x = *(MSVCRT_size_t*)s; + do + { + s -= sizeof(MSVCRT_size_t); + y = *(MSVCRT_size_t*)s; + d -= sizeof(MSVCRT_size_t); + *(MSVCRT_size_t*)d = MERGE(y, sh1, x, sh2); + + s -= sizeof(MSVCRT_size_t); + x = *(MSVCRT_size_t*)s; + d -= sizeof(MSVCRT_size_t); + *(MSVCRT_size_t*)d = MERGE(x, sh1, y, sh2); + + n -= 2 * sizeof(MSVCRT_size_t); + } while (n >= 2 * sizeof(MSVCRT_size_t)); + s += sh1 / 8; + } + while (n--) *--d = *--s; } return dst; } +#undef MERGE /********************************************************************* * memcpy (MSVCRT.@)

1 0