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

Piotr Caban : vcruntime140_1: Add __CxxFrameHandler4 stub.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 68bbf86483d88df3442bfb3332b71438f6a508c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68bbf86483d88df3442bfb33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:04 2020 +0200 vcruntime140_1: Add __CxxFrameHandler4 stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/Makefile.in | 5 +++++ dlls/vcruntime140_1/except_x86_64.c | 34 +++++++++++++++++++++++++++++++++ dlls/vcruntime140_1/vcruntime140_1.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in index b5e20fe92f..ab17b330be 100644 --- a/dlls/vcruntime140_1/Makefile.in +++ b/dlls/vcruntime140_1/Makefile.in @@ -1 +1,6 @@ MODULE = vcruntime140_1.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + except_x86_64.c diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c new file mode 100644 index 0000000000..ff582e44da --- /dev/null +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -0,0 +1,34 @@ +/* + * C++ exception handling (ver. 4) + * + * Copyright 2020 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __x86_64__ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(seh); + +EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, + ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch) +{ + FIXME("%p %lx %p %p\n", rec, frame, context, dispatch); + return ExceptionContinueSearch; +} + +#endif diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec index 5119df9b99..f41c7d2a12 100644 --- a/dlls/vcruntime140_1/vcruntime140_1.spec +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -1,3 +1,3 @@ -@ stub -arch=x86_64 __CxxFrameHandler4 +@ cdecl -arch=x86_64 __CxxFrameHandler4(ptr long ptr ptr) @ stub -arch=x86_64 __NLG_Dispatch2 @ stub -arch=x86_64 __NLG_Return2

1 0

Piotr Caban : vcruntime140_1: Export functions only on x86_64.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 311d040e24aa26a68a5ef089f33f573d373893d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=311d040e24aa26a68a5ef089… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:01 2020 +0200 vcruntime140_1: Export functions only on x86_64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/vcruntime140_1.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec index 55f568ef13..5119df9b99 100644 --- a/dlls/vcruntime140_1/vcruntime140_1.spec +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -1,3 +1,3 @@ -@ stub __CxxFrameHandler4 -@ stub __NLG_Dispatch2 -@ stub __NLG_Return2 +@ stub -arch=x86_64 __CxxFrameHandler4 +@ stub -arch=x86_64 __NLG_Dispatch2 +@ stub -arch=x86_64 __NLG_Return2

1 0

Dmitry Timoshkov : windowscodecs: Add support for 12bps RGB format to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: d5830ff9bdc0436cc2e59c2c91a82a745bc4ad65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5830ff9bdc0436cc2e59c2c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:12 2020 +0800 windowscodecs: Add support for 12bps RGB format to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index d6773d22f2..b0c422a440 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -428,6 +428,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) switch(bps) { case 1: + case 4: case 8: decode_info->reverse_bgr = 1; if (samples == 3) @@ -1111,6 +1112,41 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT HeapFree(GetProcessHeap(), 0, srcdata); } + /* 12bps RGB */ + else if (This->decode_info.source_bpp == 12 && This->decode_info.samples == 3 && This->decode_info.bpp == 24) + { + BYTE *srcdata, *src, *dst; + DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 12 + 7) / 8; + + count = width_bytes * This->decode_info.tile_height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, count); + if (!srcdata) return E_OUTOFMEMORY; + memcpy(srcdata, This->cached_tile, count); + + for (y = 0; y < This->decode_info.tile_height; y++) + { + src = srcdata + y * width_bytes; + dst = This->cached_tile + y * This->decode_info.tile_width * 3; + + for (x = 0; x < This->decode_info.tile_width; x += 2) + { + dst[0] = ((src[1] & 0xf0) >> 4) * 17; /* B */ + dst[1] = (src[0] & 0x0f) * 17; /* G */ + dst[2] = ((src[0] & 0xf0) >> 4) * 17; /* R */ + if (x + 1 < This->decode_info.tile_width) + { + dst[5] = (src[1] & 0x0f) * 17; /* B */ + dst[4] = ((src[2] & 0xf0) >> 4) * 17; /* G */ + dst[3] = (src[2] & 0x0f) * 17; /* R */ + } + src += 3; + dst += 6; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } /* 8bpp grayscale with extra alpha */ else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for 16bppGray and 32bppGrayFloat formats to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: fa753b5cf20dae0666537a3324dc83dc671b3d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa753b5cf20dae0666537a33… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:01:57 2020 +0800 windowscodecs: Add support for 16bppGray and 32bppGrayFloat formats to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 2 ++ dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 2c053bc5e4..c15daf2022 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1223,6 +1223,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, + &GUID_WICPixelFormat32bppGrayFloat, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a4c441e706..7354781eed 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -319,6 +319,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } decode_info->planar = planar; + TRACE("planar %u, photometric %u, samples %u, bps %u\n", planar, photometric, samples, bps); + switch(photometric) { case 0: /* WhiteIsZero */ @@ -383,9 +385,25 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } } break; + case 16: + if (samples != 1) + { + FIXME("unhandled 16bpp grayscale sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat16bppGray; + break; + case 32: + if (samples != 1) + { + FIXME("unhandled 32bpp grayscale sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat32bppGrayFloat; + break; default: - FIXME("unhandled greyscale bit count %u\n", bps); - return E_FAIL; + WARN("unhandled greyscale bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; } break; case 2: /* RGB */

1 0

Piotr Caban : vcruntime140_1: Add __CxxFrameHandler4 implementation.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: a715a0c4cafe150ebbbf4245127907309cd389e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a715a0c4cafe150ebbbf4245… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:13 2020 +0200 vcruntime140_1: Add __CxxFrameHandler4 implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/cppexcept.h | 65 +++++ dlls/vcruntime140_1/except_x86_64.c | 471 +++++++++++++++++++++++++++++++++++- 2 files changed, 534 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a715a0c4cafe150ebbbf…

1 0

Piotr Caban : vcruntime140_1: Implement function description version 4 structures reading.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 7f4a880fc5b3169ba54bc39b2bcf704a8079591a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f4a880fc5b3169ba54bc39b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:12:09 2020 +0200 vcruntime140_1: Implement function description version 4 structures reading. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/cppexcept.h | 54 +++++++ dlls/vcruntime140_1/except_x86_64.c | 289 ++++++++++++++++++++++++++++++++++++ 2 files changed, 343 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f4a880fc5b3169ba54b…

1 0

Hans Leidekker : msi: Add support for bitmap buttons.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 9cc044957791e0658ec3d0d8ad08eebfc08b522c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc044957791e0658ec3d0d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:55:09 2020 +0200 msi: Add support for bitmap buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48974 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 166 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 75 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 67a0633991..81b0d3dba0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1014,38 +1014,120 @@ static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, return r; } +static HBITMAP msi_load_picture( MSIDATABASE *db, const WCHAR *name, INT cx, INT cy, DWORD flags ) +{ + HBITMAP hOleBitmap = 0, hBitmap = 0, hOldSrcBitmap, hOldDestBitmap; + MSIRECORD *rec = NULL; + IStream *stm = NULL; + IPicture *pic = NULL; + HDC srcdc, destdc; + BITMAP bm; + UINT r; + + rec = msi_get_binary_record( db, name ); + if (!rec) + goto end; + + r = MSI_RecordGetIStream( rec, 2, &stm ); + msiobj_release( &rec->hdr ); + if (r != ERROR_SUCCESS) + goto end; + + r = OleLoadPicture( stm, 0, TRUE, &IID_IPicture, (void **)&pic ); + IStream_Release( stm ); + if (FAILED( r )) + { + ERR("failed to load picture\n"); + goto end; + } + + r = IPicture_get_Handle( pic, (OLE_HANDLE *)&hOleBitmap ); + if (FAILED( r )) + { + ERR("failed to get bitmap handle\n"); + goto end; + } + + /* make the bitmap the desired size */ + r = GetObjectW( hOleBitmap, sizeof(bm), &bm ); + if (r != sizeof(bm)) + { + ERR("failed to get bitmap size\n"); + goto end; + } + + if (flags & LR_DEFAULTSIZE) + { + cx = bm.bmWidth; + cy = bm.bmHeight; + } + + srcdc = CreateCompatibleDC( NULL ); + hOldSrcBitmap = SelectObject( srcdc, hOleBitmap ); + destdc = CreateCompatibleDC( NULL ); + hBitmap = CreateCompatibleBitmap( srcdc, cx, cy ); + hOldDestBitmap = SelectObject( destdc, hBitmap ); + StretchBlt( destdc, 0, 0, cx, cy, srcdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY ); + SelectObject( srcdc, hOldSrcBitmap ); + SelectObject( destdc, hOldDestBitmap ); + DeleteDC( srcdc ); + DeleteDC( destdc ); + +end: + if (pic) IPicture_Release( pic ); + return hBitmap; +} + static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; - UINT attributes, style; + UINT attributes, style, cx = 0, cy = 0, flags = 0; + WCHAR *name = NULL; TRACE("%p %p\n", dialog, rec); style = WS_TABSTOP; attributes = MSI_RecordGetInteger( rec, 8 ); - if( attributes & msidbControlAttributesIcon ) - style |= BS_ICON; + if (attributes & msidbControlAttributesIcon) style |= BS_ICON; + else if (attributes & msidbControlAttributesBitmap) + { + style |= BS_BITMAP; + if (attributes & msidbControlAttributesFixedSize) flags |= LR_DEFAULTSIZE; + else + { + cx = msi_dialog_scale_unit( dialog, MSI_RecordGetInteger(rec, 6) ); + cy = msi_dialog_scale_unit( dialog, MSI_RecordGetInteger(rec, 7) ); + } + } control = msi_dialog_add_control( dialog, rec, szButton, style ); - if( !control ) + if (!control) return ERROR_FUNCTION_FAILED; control->handler = msi_dialog_button_handler; if (attributes & msidbControlAttributesIcon) { - /* set the icon */ - LPWSTR name = msi_get_binary_name( dialog->package, rec ); + name = msi_get_binary_name( dialog->package, rec ); control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); if (control->hIcon) { SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); } - else - ERR("Failed to load icon %s\n", debugstr_w(name)); - msi_free( name ); + else ERR("Failed to load icon %s\n", debugstr_w(name)); + } + else if (attributes & msidbControlAttributesBitmap) + { + name = msi_get_binary_name( dialog->package, rec ); + control->hBitmap = msi_load_picture( dialog->package->db, name, cx, cy, flags ); + if (control->hBitmap) + { + SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) control->hBitmap ); + } + else ERR("Failed to load bitmap %s\n", debugstr_w(name)); } + msi_free( name ); return ERROR_SUCCESS; } @@ -1341,72 +1423,6 @@ static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } -static HBITMAP msi_load_picture( MSIDATABASE *db, LPCWSTR name, - INT cx, INT cy, DWORD flags ) -{ - HBITMAP hOleBitmap = 0, hBitmap = 0, hOldSrcBitmap, hOldDestBitmap; - MSIRECORD *rec = NULL; - IStream *stm = NULL; - IPicture *pic = NULL; - HDC srcdc, destdc; - BITMAP bm; - UINT r; - - rec = msi_get_binary_record( db, name ); - if( !rec ) - goto end; - - r = MSI_RecordGetIStream( rec, 2, &stm ); - msiobj_release( &rec->hdr ); - if( r != ERROR_SUCCESS ) - goto end; - - r = OleLoadPicture( stm, 0, TRUE, &IID_IPicture, (LPVOID*) &pic ); - IStream_Release( stm ); - if( FAILED( r ) ) - { - ERR("failed to load picture\n"); - goto end; - } - - r = IPicture_get_Handle( pic, (OLE_HANDLE*) &hOleBitmap ); - if( FAILED( r ) ) - { - ERR("failed to get bitmap handle\n"); - goto end; - } - - /* make the bitmap the desired size */ - r = GetObjectW( hOleBitmap, sizeof bm, &bm ); - if (r != sizeof bm ) - { - ERR("failed to get bitmap size\n"); - goto end; - } - - if (flags & LR_DEFAULTSIZE) - { - cx = bm.bmWidth; - cy = bm.bmHeight; - } - - srcdc = CreateCompatibleDC( NULL ); - hOldSrcBitmap = SelectObject( srcdc, hOleBitmap ); - destdc = CreateCompatibleDC( NULL ); - hBitmap = CreateCompatibleBitmap( srcdc, cx, cy ); - hOldDestBitmap = SelectObject( destdc, hBitmap ); - StretchBlt( destdc, 0, 0, cx, cy, - srcdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); - SelectObject( srcdc, hOldSrcBitmap ); - SelectObject( destdc, hOldDestBitmap ); - DeleteDC( srcdc ); - DeleteDC( destdc ); - -end: - if ( pic ) - IPicture_Release( pic ); - return hBitmap; -} static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) {

1 0

Alexandre Julliard : winegcc: No longer use a constructor for module initialization.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 1ccd638b1aa85fb3c43b49d69d279cd509ebdc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccd638b1aa85fb3c43b49d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:27:53 2020 +0200 winegcc: No longer use a constructor for module initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0682e9aa9a..5ea99d3cf0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -534,8 +534,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-Wl,--no-wchar-size-warning" ); if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) strarray_add( flags, "-Wl,-z,defs" ); - if (opts->shared && !try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init" )) - strarray_add( flags, "-Wl,-init,__wine_spec_init" ); strarray_addall( link_args, flags ); return link_args; @@ -1379,8 +1377,8 @@ static void build(struct options* opts) } } - if (!is_pe && !opts->shared) fixup_constructors( opts, output_path ); - if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); + if (!is_pe) fixup_constructors( opts, output_path ); + else if (opts->wine_builtin) make_wine_builtin( opts, output_path ); /* create the loader script */ if (generate_app_loader)

1 0

Alexandre Julliard : winebuild: Don't use a constructor for dll modules either.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 719324343124c96ba4b24bae1399f9903dc46768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=719324343124c96ba4b24bae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:27:33 2020 +0200 winebuild: Don't use a constructor for dll modules either. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- tools/winebuild/parser.c | 2 +- tools/winebuild/spec32.c | 45 --------------------------------------------- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d973a4e973..47f2787b10 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -389,7 +389,7 @@ static void set_exec_mode( enum exec_mode_values mode ) /* get the default entry point for a given spec file */ static const char *get_default_entry_point( const DLLSPEC *spec ) { - if (spec->characteristics & IMAGE_FILE_DLL) return "__wine_spec_dll_entry"; + if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; return "__wine_spec_exe_entry"; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index be705c25f0..0f2b9c1e10 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -829,7 +829,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) if (spec16->characteristics & IMAGE_FILE_DLL) { spec32->characteristics = IMAGE_FILE_DLL; - spec32->init_func = xstrdup( "__wine_spec_dll_entry" ); + spec32->init_func = xstrdup( "DllMain" ); } /* add an export for the NE module */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 6e6f502e99..b1e20e0484 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -587,43 +587,6 @@ void output_exports( DLLSPEC *spec ) } -/******************************************************************* - * output_asm_constructor - * - * Output code for calling a dll constructor. - */ -static void output_asm_constructor( const char *constructor ) -{ - if (target_platform == PLATFORM_APPLE) - { - /* Mach-O doesn't have an init section */ - output( "\n\t.mod_init_func\n" ); - output( "\t.align %d\n", get_alignment(get_ptr_size()) ); - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(constructor) ); - } - else - { - switch(target_cpu) - { - case CPU_x86: - case CPU_x86_64: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tcall %s\n", asm_name(constructor) ); - break; - case CPU_ARM: - output( "\n\t.section \".text\",\"ax\"\n" ); - output( "\tblx %s\n", asm_name(constructor) ); - break; - case CPU_ARM64: - case CPU_POWERPC: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tbl %s\n", asm_name(constructor) ); - break; - } - } -} - - /******************************************************************* * output_module * @@ -750,14 +713,6 @@ void output_module( DLLSPEC *spec ) output_data_directories( data_dirs ); - if (spec->characteristics & IMAGE_FILE_DLL) - { - output( "\n\t%s\n", get_asm_string_section() ); - output( "%s\n", asm_globl("__wine_spec_file_name") ); - output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); - output_asm_constructor( "__wine_spec_init_ctor" ); - } - if (target_platform == PLATFORM_APPLE) output( "\t.lcomm %s,4\n", asm_name("_end") ); }

1 0

Alexandre Julliard : ntdll: Support loading ntdll without a constructor.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 3872dc55ef3825182fcf88afce719aca1af4ef2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3872dc55ef3825182fcf88af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:27:11 2020 +0200 ntdll: Support loading ntdll without a constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4868919b0b..65f9d3f298 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4469,6 +4469,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) */ void __wine_process_init(void) { + extern IMAGE_NT_HEADERS __wine_spec_nt_header; static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'n','t','d','l','l','.','d','l','l',0}; @@ -4480,6 +4481,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; + HMODULE ntdll_module; INITIAL_TEB stack; BOOL suspend; SIZE_T info_size; @@ -4496,6 +4498,7 @@ void __wine_process_init(void) init_unix_codepage(); init_directories(); init_user_process_params( info_size ); + params = peb->ProcessParameters; NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); @@ -4510,9 +4513,16 @@ void __wine_process_init(void) RtlInitUnicodeString( &nt_name, ntdllW ); default_load_info.filename = &nt_name; wine_dll_set_callback( load_builtin_callback ); + ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); + if (!get_modref( ntdll_module )) + { + map_so_dll( &__wine_spec_nt_header, ntdll_module ); + status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); + assert( !status ); + } RtlInitUnicodeString( &nt_name, kernel32W ); - if ((status = load_builtin_dll( NULL, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); @@ -4527,7 +4537,6 @@ void __wine_process_init(void) init_locale( wm->ldr.BaseAddress ); - params = peb->ProcessParameters; if (!(status = load_dll( params->DllPath.Buffer, params->ImagePathName.Buffer, NULL, DONT_RESOLVE_DLL_REFERENCES, &wm ))) {

1 0