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

Dmitry Timoshkov : windowscodecs: Add support for 128bppRGBAFloat format to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 462c650ea4cb5d28e4926f133c09360181e4c0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=462c650ea4cb5d28e4926f13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:01 2020 +0800 windowscodecs: Add support for 128bppRGBAFloat 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/regsvr.c | 18 ++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 12 ++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c15daf2022..d8147c0e15 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1236,6 +1236,7 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat64bppPRGBA, + &GUID_WICPixelFormat128bppRGBAFloat, NULL }; @@ -1766,6 +1767,11 @@ static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; +static BYTE const channel_mask_128bit1[] = { 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_128bit2[] = { 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_128bit3[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_128bit4[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1783,6 +1789,7 @@ static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; +static BYTE const * const channel_masks_128bit[] = { channel_mask_128bit1, channel_mask_128bit2, channel_mask_128bit3, channel_mask_128bit4 }; static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -2066,6 +2073,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat128bppRGBAFloat, + "The Wine Project", + "128bpp RGBAFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 128, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_128bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 7354781eed..984acabfbf 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -464,9 +464,17 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } break; + case 32: + if (samples != 4) + { + FIXME("unhandled 32bpp RGB sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat128bppRGBAFloat; + break; default: - FIXME("unhandled RGB bit count %u\n", bps); - return E_FAIL; + WARN("unhandled RGB bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; } break; case 3: /* RGB Palette */

1 0

Dmitry Timoshkov : windowscodecs: Add support for 32bppCMYK and 64bppCMYK formats to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 948e5dffcd55fc52fe07188dc454806fd77fd857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e5dffcd55fc52fe07188d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:06 2020 +0800 windowscodecs: Add support for 32bppCMYK and 64bppCMYK 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 | 13 +++++++++++++ dlls/windowscodecs/tiffformat.c | 25 ++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d8147c0e15..3329c2d811 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1236,6 +1236,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat64bppPRGBA, + &GUID_WICPixelFormat32bppCMYK, + &GUID_WICPixelFormat64bppCMYK, &GUID_WICPixelFormat128bppRGBAFloat, NULL }; @@ -2073,6 +2075,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat64bppCMYK, + "The Wine Project", + "64bpp CMYK", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 64, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_16bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 0 + }, { &GUID_WICPixelFormat128bppRGBAFloat, "The Wine Project", "128bpp RGBAFloat", diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 984acabfbf..646bcf3822 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -505,8 +505,31 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_NOTIMPL; } break; + + case 5: /* Separated */ + if (samples != 4) + { + FIXME("unhandled Separated sample count %u\n", samples); + return E_FAIL; + } + + decode_info->bpp = bps * samples; + switch(bps) + { + case 8: + decode_info->format = &GUID_WICPixelFormat32bppCMYK; + break; + case 16: + decode_info->format = &GUID_WICPixelFormat64bppCMYK; + break; + + default: + WARN("unhandled Separated bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + break; + case 4: /* Transparency mask */ - case 5: /* CMYK */ case 6: /* YCbCr */ case 8: /* CIELab */ default:

1 0

Dmitry Timoshkov : windowscodecs: Add support for 3bps RGB format to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: a1fb3bb4da947e720d921d605e0776a311b2c431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1fb3bb4da947e720d921d60… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:08 2020 +0800 windowscodecs: Add support for 3bps 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 | 78 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 646bcf3822..d6773d22f2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -407,8 +407,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 2: /* RGB */ - decode_info->bpp = bps * samples; - if (samples == 4) { ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples); @@ -425,8 +423,11 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } + decode_info->bpp = max(bps, 8) * samples; + decode_info->source_bpp = bps * samples; switch(bps) { + case 1: case 8: decode_info->reverse_bgr = 1; if (samples == 3) @@ -1039,8 +1040,79 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT if (ret == -1) return E_FAIL; + /* 3bps RGB */ + if (This->decode_info.source_bpp == 3 && 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 * 3 + 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 += 8) + { + dst[2] = (src[0] & 0x80) ? 0xff : 0; /* R */ + dst[1] = (src[0] & 0x40) ? 0xff : 0; /* G */ + dst[0] = (src[0] & 0x20) ? 0xff : 0; /* B */ + if (x + 1 < This->decode_info.tile_width) + { + dst[5] = (src[0] & 0x10) ? 0xff : 0; /* R */ + dst[4] = (src[0] & 0x08) ? 0xff : 0; /* G */ + dst[3] = (src[0] & 0x04) ? 0xff : 0; /* B */ + } + if (x + 2 < This->decode_info.tile_width) + { + dst[8] = (src[0] & 0x02) ? 0xff : 0; /* R */ + dst[7] = (src[0] & 0x01) ? 0xff : 0; /* G */ + dst[6] = (src[1] & 0x80) ? 0xff : 0; /* B */ + } + if (x + 3 < This->decode_info.tile_width) + { + dst[11] = (src[1] & 0x40) ? 0xff : 0; /* R */ + dst[10] = (src[1] & 0x20) ? 0xff : 0; /* G */ + dst[9] = (src[1] & 0x10) ? 0xff : 0; /* B */ + } + if (x + 4 < This->decode_info.tile_width) + { + dst[14] = (src[1] & 0x08) ? 0xff : 0; /* R */ + dst[13] = (src[1] & 0x04) ? 0xff : 0; /* G */ + dst[12] = (src[1] & 0x02) ? 0xff : 0; /* B */ + } + if (x + 5 < This->decode_info.tile_width) + { + dst[17] = (src[1] & 0x01) ? 0xff : 0; /* R */ + dst[16] = (src[2] & 0x80) ? 0xff : 0; /* G */ + dst[15] = (src[2] & 0x40) ? 0xff : 0; /* B */ + } + if (x + 6 < This->decode_info.tile_width) + { + dst[20] = (src[2] & 0x20) ? 0xff : 0; /* R */ + dst[19] = (src[2] & 0x10) ? 0xff : 0; /* G */ + dst[18] = (src[2] & 0x08) ? 0xff : 0; /* B */ + } + if (x + 7 < This->decode_info.tile_width) + { + dst[23] = (src[2] & 0x04) ? 0xff : 0; /* R */ + dst[22] = (src[2] & 0x02) ? 0xff : 0; /* G */ + dst[21] = (src[2] & 0x01) ? 0xff : 0; /* B */ + } + src += 3; + dst += 24; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } /* 8bpp grayscale with extra alpha */ - if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) + else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) { BYTE *src; DWORD *dst, count = This->decode_info.tile_width * This->decode_info.tile_height;

1 0

Dmitry Timoshkov : windowscodecs: Add support for 12bps RGB format to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

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 4bps RGBA format to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 0cd8502b493e7a93df7aad08bc2fdfe3fd73b5cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd8502b493e7a93df7aad08… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:15 2020 +0800 windowscodecs: Add support for 4bps RGBA 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 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b0c422a440..33d3a3c992 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1147,6 +1147,45 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT HeapFree(GetProcessHeap(), 0, srcdata); } + /* 4bps RGBA */ + else if (This->decode_info.source_bpp == 4 && This->decode_info.samples == 4 && This->decode_info.bpp == 32) + { + BYTE *srcdata, *src, *dst; + DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 3 + 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 * 4; + + /* 1 source byte expands to 2 BGRA samples */ + + for (x = 0; x < This->decode_info.tile_width; x += 2) + { + dst[0] = (src[0] & 0x20) ? 0xff : 0; /* B */ + dst[1] = (src[0] & 0x40) ? 0xff : 0; /* G */ + dst[2] = (src[0] & 0x80) ? 0xff : 0; /* R */ + dst[3] = (src[0] & 0x10) ? 0xff : 0; /* A */ + if (x + 1 < This->decode_info.tile_width) + { + dst[4] = (src[0] & 0x02) ? 0xff : 0; /* B */ + dst[5] = (src[0] & 0x04) ? 0xff : 0; /* G */ + dst[6] = (src[0] & 0x08) ? 0xff : 0; /* R */ + dst[7] = (src[0] & 0x01) ? 0xff : 0; /* A */ + } + src++; + dst += 8; + } + } + + 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 16bps RGBA format to TIFF decoder.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 3b9560c6f363433c47b08a4df940a6f86ab3aaab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9560c6f363433c47b08a4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:21 2020 +0800 windowscodecs: Add support for 16bps RGBA 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 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 33d3a3c992..3d43c967d9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1186,6 +1186,36 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT HeapFree(GetProcessHeap(), 0, srcdata); } + /* 16bps RGBA */ + else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 4 && This->decode_info.bpp == 32) + { + 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 * 4; + + for (x = 0; x < This->decode_info.tile_width; x++) + { + dst[0] = ((src[1] & 0xf0) >> 4) * 17; /* B */ + dst[1] = (src[0] & 0x0f) * 17; /* G */ + dst[2] = ((src[0] & 0xf0) >> 4) * 17; /* R */ + dst[3] = (src[1] & 0x0f) * 17; /* A */ + src += 2; + dst += 4; + } + } + + 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

Zhiyi Zhang : wined3d: Correct a comment in wined3d_check_device_type().
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: b6968ab59dddd9c056d49effc60559065f34a5f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6968ab59dddd9c056d49eff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 21:36:43 2020 +0800 wined3d: Correct a comment in wined3d_check_device_type(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42e1578561..b65f13e775 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1755,7 +1755,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, debug_d3dformat(backbuffer_format), windowed); /* The task of this function is to check whether a certain display / backbuffer format - * combination is available on the given adapter. In fullscreen mode microsoft specified + * combination is available on the given output. In fullscreen mode microsoft specified * that the display format shouldn't provide alpha and that ignoring alpha the backbuffer * and display format should match exactly. * In windowed mode format conversion can occur and this depends on the driver. */

1 0

Alexandre Julliard : ntdll: Make sure we don't try to attach the main exe a second time.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 0a72ec1dacb59c72980c3133fddf316377349048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a72ec1dacb59c72980c3133… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:23:15 2020 +0200 ntdll: Make sure we don't try to attach the main exe a second time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48961 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b0d5cf46a5..4868919b0b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4009,6 +4009,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow NtTerminateProcess( GetCurrentProcess(), status ); } wm->ldr.LoadCount = -1; + wm->ldr.Flags |= LDR_PROCESS_ATTACHED; /* don't try to attach again */ if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie );

1 0

Alexandre Julliard : ntdll: Support loading ntdll without a constructor.
by Alexandre Julliard 21 Apr '20

21 Apr '20

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

Alexandre Julliard : winebuild: Don't use a constructor for dll modules either.
by Alexandre Julliard 21 Apr '20

21 Apr '20

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