August 2023 - Wine-commits - list.winehq.org

Piotr Caban : include: Add LEGACY_RSA*_BLOB definitions.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 9b92ee76a1717b9bf9bc00ec45a75f5e2aa78acf URL: https://gitlab.winehq.org/wine/wine/-/commit/9b92ee76a1717b9bf9bc00ec45a75f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 8 20:01:36 2023 +0200 include: Add LEGACY_RSA*_BLOB definitions. --- include/bcrypt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 6822491ed36..15dad130892 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -75,6 +75,8 @@ typedef LONG NTSTATUS; #define LEGACY_DSA_PRIVATE_BLOB L"CAPIDSAPRIVATEBLOB" #define LEGACY_DSA_V2_PUBLIC_BLOB L"V2CAPIDSAPUBLICBLOB" #define LEGACY_DSA_V2_PRIVATE_BLOB L"V2CAPIDSAPRIVATEBLOB" +#define LEGACY_RSAPUBLIC_BLOB L"CAPIPUBLICBLOB" +#define LEGACY_RSAPRIVATE_BLOB L"CAPIPRIVATEBLOB" #define MS_PRIMITIVE_PROVIDER L"Microsoft Primitive Provider" #define MS_PLATFORM_CRYPTO_PROVIDER L"Microsoft Platform Crypto Provider" @@ -148,6 +150,8 @@ static const WCHAR LEGACY_DSA_PUBLIC_BLOB[] = {'C','A','P','I','D','S','A','P',' static const WCHAR LEGACY_DSA_PRIVATE_BLOB[] = {'C','A','P','I','D','S','A','P','R','I','V','A','T','E','B','L','O','B',0}; static const WCHAR LEGACY_DSA_V2_PUBLIC_BLOB[] = {'V','2','C','A','P','I','D','S','A','P','U','B','L','I','C','B','L','O','B',0}; static const WCHAR LEGACY_DSA_V2_PRIVATE_BLOB[] = {'V','2','C','A','P','I','D','S','A','P','R','I','V','A','T','E','B','L','O','B',0}; +static const WCHAR LEGACY_RSAPUBLIC_BLOB[] = {'C','A','P','I','P','U','B','L','I','C','B','L','O','B',0}; +static const WCHAR LEGACY_RSAPRIVATE_BLOB[] = {'C','A','P','I','P','R','I','V','A','T','E','B','L','O','B',0}; static const WCHAR MS_PRIMITIVE_PROVIDER[] = \ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0};

1 0

Piotr Caban : bcrypt: Add support for importing LEGACY_RSAPRIVATE_BLOB keys.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 59ffbf204d8ce264fe23cc8dcf9dba7c18c0f78f URL: https://gitlab.winehq.org/wine/wine/-/commit/59ffbf204d8ce264fe23cc8dcf9dba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 7 19:13:18 2023 +0200 bcrypt: Add support for importing LEGACY_RSAPRIVATE_BLOB keys. --- dlls/bcrypt/bcrypt_main.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 824b51e8b7d..ebfcbfb7049 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1595,6 +1595,53 @@ static void key_destroy( struct key *key ) destroy_object( &key->hdr ); } +static NTSTATUS convert_legacy_rsaprivate_blob( struct algorithm *alg, BCRYPT_RSAKEY_BLOB **rsa_data, + ULONG *rsa_len, UCHAR *input, ULONG input_len ) +{ + struct { + PUBLICKEYSTRUC header; + RSAPUBKEY rsapubkey; + } *blob = (void *)input; + ULONG len, pos; + UCHAR *conv; + int i; + + if (alg->id != ALG_ID_RSA) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*blob)) return NTE_BAD_DATA; + if (blob->header.bType != PRIVATEKEYBLOB || blob->header.bVersion != CUR_BLOB_VERSION || + blob->header.aiKeyAlg != CALG_RSA_KEYX || + blob->rsapubkey.magic != BCRYPT_RSAPRIVATE_MAGIC || + input_len != sizeof(*blob) + blob->rsapubkey.bitlen / 16 * 9) return NTE_BAD_DATA; + if (blob->rsapubkey.bitlen & 0xf) return STATUS_INVALID_PARAMETER; + + len = sizeof(**rsa_data) + sizeof(blob->rsapubkey.pubexp) + blob->rsapubkey.bitlen / 4; + if (!(conv = malloc( len ))) return STATUS_NO_MEMORY; + + *rsa_data = (BCRYPT_RSAKEY_BLOB *)conv; + (*rsa_data)->Magic = blob->rsapubkey.magic; + (*rsa_data)->BitLength = blob->rsapubkey.bitlen; + (*rsa_data)->cbPublicExp = sizeof(blob->rsapubkey.pubexp); + (*rsa_data)->cbModulus = blob->rsapubkey.bitlen / 8; + (*rsa_data)->cbPrime1 = blob->rsapubkey.bitlen / 16; + (*rsa_data)->cbPrime2 = blob->rsapubkey.bitlen / 16; + len = sizeof(**rsa_data); + + for(i = 0; i < (*rsa_data)->cbPublicExp; i++) + conv[len++] = ((UCHAR *)&blob->rsapubkey.pubexp)[(*rsa_data)->cbPublicExp - i - 1]; + pos = sizeof(*blob); + for(i = 0; i < (*rsa_data)->cbModulus; i++) + conv[len++] = input[pos + (*rsa_data)->cbModulus - i - 1]; + pos += (*rsa_data)->cbModulus; + for(i = 0; i < (*rsa_data)->cbPrime1; i++) + conv[len++] = input[pos + (*rsa_data)->cbPrime1 - i - 1]; + pos += (*rsa_data)->cbPrime1; + for(i = 0; i < (*rsa_data)->cbPrime2; i++) + conv[len++] = input[pos + (*rsa_data)->cbPrime2 - i - 1]; + + *rsa_len = len; + return STATUS_SUCCESS; +} + static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1749,6 +1796,19 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP *ret_key = key; return STATUS_SUCCESS; } + else if (!wcscmp( type, LEGACY_RSAPRIVATE_BLOB )) + { + BCRYPT_RSAKEY_BLOB *rsa_blob; + + status = convert_legacy_rsaprivate_blob( alg, &rsa_blob, &input_len, input, input_len ); + if (status != STATUS_SUCCESS) + return status; + + status = key_import_pair( alg, BCRYPT_RSAPRIVATE_BLOB, ret_key, (UCHAR *)rsa_blob, input_len ); + SecureZeroMemory( rsa_blob, input_len ); + free( rsa_blob ); + return status; + } else if (!wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB )) { BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)input;

1 0

Piotr Caban : bcrypt/tests: Add LEGACY_RSAPRIVATE_BLOB key import tests.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: f86c49695f1f9e2f68a9ffcd5958877d1f2df09a URL: https://gitlab.winehq.org/wine/wine/-/commit/f86c49695f1f9e2f68a9ffcd595887… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 8 21:22:14 2023 +0200 bcrypt/tests: Add LEGACY_RSAPRIVATE_BLOB key import tests. --- dlls/bcrypt/tests/bcrypt.c | 84 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f7059552b90..1ef25cc344f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -24,6 +24,7 @@ #include <windows.h> #include <bcrypt.h> #include <ncrypt.h> +#include <wincrypt.h> #include "wine/test.h" @@ -2365,6 +2366,56 @@ static UCHAR rsaFullPrivateBlob[] = 0x9d, 0xe2, 0xcc, 0x5a, 0xf1, 0x68, 0x30, 0xe5, 0xbc, 0x8d, 0xad, }; +static struct +{ + PUBLICKEYSTRUC header; + RSAPUBKEY rsapubkey; + BYTE modulus[512 / 8]; + BYTE prime1[512 / 16]; + BYTE prime2[512 / 16]; + BYTE exp1[512 / 16]; + BYTE exp2[512 / 16]; + BYTE coefficient[512 / 16]; + BYTE private_exp[512 / 8]; + +} rsaLegacyPrivateBlob = +{ + { PRIVATEKEYBLOB, CUR_BLOB_VERSION, 0, CALG_RSA_KEYX }, + { BCRYPT_RSAPRIVATE_MAGIC, 512, 0x10001 }, + { + 0x91, 0xe3, 0x6b, 0x5b, 0xea, 0x13, 0x39, 0xca, 0x99, 0x99, 0x6f, 0x1f, 0x69, 0xfd, 0x37, 0x50, + 0xa7, 0xe8, 0xc5, 0xa5, 0x1d, 0xbb, 0x8a, 0x1e, 0xd1, 0x86, 0xa6, 0xe2, 0xf3, 0xf9, 0xa2, 0x0d, + 0xc4, 0x62, 0xb3, 0xfe, 0x1f, 0x8b, 0x48, 0xb2, 0x66, 0x45, 0x9e, 0x81, 0xd7, 0xcd, 0xc8, 0xeb, + 0xe9, 0x74, 0x95, 0x33, 0xf3, 0xa7, 0x66, 0x94, 0x83, 0x69, 0xa9, 0xb5, 0x26, 0x46, 0x8b, 0xa6 + }, + { + 0xc3, 0x94, 0x22, 0xdd, 0x05, 0x73, 0x05, 0xce, 0x48, 0x38, 0x91, 0x7d, 0xeb, 0x2e, 0x7f, 0x88, + 0xcb, 0x34, 0x1b, 0x1f, 0xa4, 0x6d, 0xa0, 0xe8, 0xa9, 0xac, 0xb1, 0x21, 0x0b, 0x2c, 0xd2, 0xc0 + }, + { + 0x1b, 0xd1, 0x31, 0x1c, 0xb5, 0xb5, 0x1a, 0x04, 0xd7, 0x6e, 0x56, 0x6a, 0x52, 0x92, 0xb8, 0x60, + 0x49, 0xf8, 0x06, 0x3f, 0x5f, 0x92, 0xe5, 0xed, 0xf9, 0x94, 0x2e, 0x41, 0xc5, 0xfd, 0x1c, 0xdd + }, + { + 0x1b, 0xf9, 0x5b, 0xc7, 0x0c, 0xec, 0x21, 0xec, 0xb3, 0xd3, 0x24, 0x20, 0x6f, 0x32, 0x49, 0xda, + 0xf5, 0x59, 0x2d, 0xbb, 0x19, 0x7b, 0x40, 0xb6, 0xc1, 0xfe, 0xab, 0x61, 0x69, 0xd1, 0xf3, 0xa3 + }, + { + 0x25, 0xe6, 0xe3, 0xf2, 0x03, 0xe4, 0x55, 0x09, 0x36, 0xee, 0x7a, 0x36, 0x02, 0x9b, 0x0d, 0xc5, + 0xa9, 0x49, 0xcb, 0x3c, 0x3f, 0x66, 0x2d, 0xfd, 0x72, 0xc6, 0x55, 0xda, 0x61, 0xe9, 0x6e, 0xba + }, + { + 0x24, 0x1c, 0x6e, 0xb6, 0x98, 0xb4, 0x7c, 0x21, 0x88, 0x9f, 0xda, 0xfa, 0x5e, 0xd4, 0x4a, 0x38, + 0x4e, 0x43, 0x79, 0x10, 0xad, 0xfd, 0x84, 0x37, 0x8d, 0x0e, 0x27, 0xfb, 0x2b, 0x7f, 0x89, 0x14 + }, + { + 0xad, 0x8d, 0xbc, 0xe5, 0x30, 0x68, 0xf1, 0x5a, 0xcc, 0xe2, 0x9d, 0x02, 0xec, 0x72, 0xa7, 0xb1, + 0xd5, 0x2e, 0x55, 0xcd, 0x82, 0xef, 0x77, 0xd0, 0x7a, 0xb3, 0x2b, 0x5e, 0xf1, 0x6d, 0xe2, 0x1a, + 0x6f, 0x81, 0xe4, 0xb9, 0xe7, 0x09, 0xd5, 0x83, 0xad, 0x69, 0x64, 0xb5, 0x80, 0x24, 0xb3, 0x47, + 0x5f, 0x8b, 0x96, 0x4b, 0xaf, 0x09, 0x36, 0xdc, 0xc0, 0x84, 0xd3, 0x6f, 0x22, 0xe7, 0xe5, 0x09 + } +}; + static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = { @@ -2395,15 +2446,16 @@ static void test_rsa_encrypt(void) { static UCHAR input[] = "Hello World!"; static UCHAR input_no_padding[64] = { 0 }; + UCHAR encrypted[64], decrypted[64]; BCRYPT_ALG_HANDLE rsa = 0; - BCRYPT_KEY_HANDLE key = 0; + BCRYPT_KEY_HANDLE key = 0, key2; NTSTATUS ret = 0; DWORD encrypted_size = 60; UCHAR *encrypted_a = NULL; UCHAR *encrypted_b = NULL; DWORD decrypted_size = 0; - UCHAR *decrypted = NULL; BCRYPT_OAEP_PADDING_INFO oaep_pad; + oaep_pad.pszAlgId = BCRYPT_MD5_ALGORITHM; oaep_pad.pbLabel = (PUCHAR)"test"; oaep_pad.cbLabel = 5; @@ -2453,10 +2505,9 @@ static void test_rsa_encrypt(void) ok(!memcmp(encrypted_b, rsa_encrypted_no_padding, encrypted_size), "Data mismatch.\n"); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE); - decrypted = malloc(decrypted_size); + ok(decrypted_size == sizeof(input_no_padding), "got %lu\n", decrypted_size); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_NONE); ok(!memcmp(decrypted, input_no_padding, sizeof(input_no_padding)), "Decrypted output it's not what expected\n"); - free(decrypted); } encrypted_size = 60; @@ -2478,10 +2529,8 @@ static void test_rsa_encrypt(void) BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_PKCS1); ok(decrypted_size == sizeof(input), "got size of %ld\n", decrypted_size); - decrypted = malloc(decrypted_size); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_PKCS1); ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); - free(decrypted); todo_wine { encrypted_size = 60; @@ -2501,15 +2550,34 @@ static void test_rsa_encrypt(void) ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs are the same\n"); + decrypted_size = 0; + memset(decrypted, 0, sizeof(decrypted)); BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_OAEP); - decrypted = malloc(decrypted_size); + ok(decrypted_size == sizeof(input), "got %lu\n", decrypted_size); BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_OAEP); ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); - free(decrypted); } free(encrypted_a); free(encrypted_b); + + ret = BCryptImportKeyPair(rsa, NULL, LEGACY_RSAPRIVATE_BLOB, &key2, + (UCHAR *)&rsaLegacyPrivateBlob, sizeof(rsaLegacyPrivateBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + ret = BCryptEncrypt(key2, input, sizeof(input), NULL, NULL, 0, + encrypted, sizeof(encrypted), &encrypted_size, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(encrypted_size == 64, "got size of %ld\n", encrypted_size); + + memset(decrypted, 0, sizeof(decrypted)); + ret = BCryptDecrypt(key, encrypted, sizeof(encrypted), NULL, NULL, 0, + decrypted, sizeof(decrypted), &decrypted_size, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(decrypted_size == sizeof(input), "got size of %ld\n", decrypted_size); + ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); + + BCryptDestroyKey(key2); BCryptDestroyKey(key); if (pBCryptHash)

1 0

Bartosz Kosiorek : gdiplus: Add support support for 1, 4 and 8 bpp indexed pixel format conversion.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 90c2949b254c82bc8ddc00d251c64ce336b7d8e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/90c2949b254c82bc8ddc00d251c64c… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Wed Aug 9 19:36:22 2023 +0200 gdiplus: Add support support for 1, 4 and 8 bpp indexed pixel format conversion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20694 --- dlls/gdiplus/image.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 67a7fdfab13..3dfc2fec763 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -617,6 +617,19 @@ GpStatus convert_pixels(INT width, INT height, return Ok; \ } while (0); +#define convert_indexed_to_indexed(getpixel_function, setpixel_function) do { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ + BYTE index; \ + ARGB argb; \ + BYTE *color = (BYTE *)&argb; \ + getpixel_function(&index, src_bits+src_stride*y, x); \ + argb = (src_palette && index < src_palette->Count) ? src_palette->Entries[index] : 0; \ + setpixel_function(color[2], color[1], color[0], color[3], dst_bits+dst_stride*y, x, dst_palette); \ + } \ + return Ok; \ +} while (0); + #define convert_rgb_to_rgb(getpixel_function, setpixel_function) do { \ for (y=0; y<height; y++) \ for (x=0; x<width; x++) { \ @@ -642,6 +655,10 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat1bppIndexed: switch (dst_format) { + case PixelFormat4bppIndexed: + convert_indexed_to_indexed(getpixel_1bppIndexed, setpixel_4bppIndexed); + case PixelFormat8bppIndexed: + convert_indexed_to_indexed(getpixel_1bppIndexed, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_indexed_to_rgb(getpixel_1bppIndexed, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -669,6 +686,10 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat4bppIndexed: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_indexed_to_indexed(getpixel_4bppIndexed, setpixel_1bppIndexed); + case PixelFormat8bppIndexed: + convert_indexed_to_indexed(getpixel_4bppIndexed, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: convert_indexed_to_rgb(getpixel_4bppIndexed, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -696,6 +717,10 @@ GpStatus convert_pixels(INT width, INT height, case PixelFormat8bppIndexed: switch (dst_format) { + case PixelFormat1bppIndexed: + convert_indexed_to_indexed(getpixel_8bppIndexed, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_indexed_to_indexed(getpixel_8bppIndexed, setpixel_4bppIndexed); case PixelFormat16bppGrayScale: convert_indexed_to_rgb(getpixel_8bppIndexed, setpixel_16bppGrayScale); case PixelFormat16bppRGB555: @@ -1067,7 +1092,9 @@ GpStatus convert_pixels(INT width, INT height, } #undef convert_indexed_to_rgb +#undef convert_indexed_to_indexed #undef convert_rgb_to_rgb +#undef convert_rgb_to_indexed return NotImplemented; }

1 0

Bartosz Kosiorek : gdiplus: Fix returned value of GdipDrawImagePointsRect according to native lib.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 1135543dff2695c6aff86adf4ba32ed4e2b4a942 URL: https://gitlab.winehq.org/wine/wine/-/commit/1135543dff2695c6aff86adf4ba32e… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Wed Aug 9 20:10:55 2023 +0200 gdiplus: Fix returned value of GdipDrawImagePointsRect according to native lib. --- dlls/gdiplus/graphics.c | 9 ++++++--- dlls/gdiplus/tests/graphics.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 758889eca06..e3b5661fd67 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3049,11 +3049,11 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image count, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData); - if (count > 3) + if (count == 4) return NotImplemented; if(!graphics || !image || !points || count != 3) - return InvalidParameter; + return InvalidParameter; TRACE("%s %s %s\n", debugstr_pointf(&points[0]), debugstr_pointf(&points[1]), debugstr_pointf(&points[2])); @@ -3421,7 +3421,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics *graphics, GpImage *imag srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData); - if(!points || count!=3) + if (count == 4) + return NotImplemented; + + if (!points || count != 3) return InvalidParameter; for(i = 0; i < count; i++){ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0456a451970..89baff64fa4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1341,6 +1341,8 @@ static void test_GdipDrawImagePointsRect(void) ptf[3].Y = 10; status = GdipDrawImagePointsRect(graphics, (GpImage*)bm, ptf, 4, 0, 0, 10, 10, UnitPixel, NULL, NULL, NULL); expect(NotImplemented, status); + status = GdipDrawImagePointsRect(graphics, (GpImage*)bm, ptf, 5, 0, 0, 10, 10, UnitPixel, NULL, NULL, NULL); + expect(InvalidParameter, status); status = GdipDrawImagePointsRect(graphics, (GpImage*)bm, ptf, 2, 0, 0, 10, 10, UnitPixel, NULL, NULL, NULL); expect(InvalidParameter, status); status = GdipDrawImagePointsRect(graphics, (GpImage*)bm, ptf, 3, 0, 0, 10, 10, UnitPixel, NULL, NULL, NULL);

1 0

Tim Clem : server: Avoid a mach port leak on Apple Silicon.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: b2a099b3ceec6fef05c455408c05714232cb466f URL: https://gitlab.winehq.org/wine/wine/-/commit/b2a099b3ceec6fef05c455408c0571… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Aug 9 11:22:58 2023 -0700 server: Avoid a mach port leak on Apple Silicon. Check for Rosetta before extracting the port right, since we won't need it in that case anyway. --- server/mach.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/mach.c b/server/mach.c index 3852bb3ee5b..a619c1cd2a8 100644 --- a/server/mach.c +++ b/server/mach.c @@ -273,14 +273,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); - if (thread->unix_pid == -1 || !process_port || - mach_port_extract_right( process_port, thread->unix_tid, - MACH_MSG_TYPE_COPY_SEND, &port, &type )) - { - set_error( STATUS_ACCESS_DENIED ); - return; - } - if (is_rosetta()) { /* Setting debug registers of a translated process is not supported cross-process @@ -290,6 +282,14 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + if (thread->unix_pid == -1 || !process_port || + mach_port_extract_right( process_port, thread->unix_tid, + MACH_MSG_TYPE_COPY_SEND, &port, &type )) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + /* get the debug state to determine which flavor to use */ ret = thread_get_state(port, x86_DEBUG_STATE, (thread_state_t)&state, &count); if (ret)

1 0

Alistair Leslie-Hughes : dmime: Store WAVE data when Loading.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 0774873ea26c11757cdf511943c17ec81c6e11c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0774873ea26c11757cdf511943c17e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 3 16:25:11 2022 +1000 dmime: Store WAVE data when Loading. --- dlls/dmime/segment.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index bf44c5e73b3..c005d506cad 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -33,6 +33,10 @@ typedef struct IDirectMusicSegment8Impl { DMUS_IO_SEGMENT_HEADER header; IDirectMusicGraph *pGraph; struct list Tracks; + + PCMWAVEFORMAT wave_format; + void *wave_data; + int data_size; } IDirectMusicSegment8Impl; IDirectMusicSegment8Impl *create_segment(void); @@ -86,6 +90,9 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { + if (This->wave_data) + free(This->wave_data); + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -818,6 +825,52 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); } +static HRESULT parse_wave_form(IDirectMusicSegment8Impl *This, IStream *stream, const struct chunk_entry *riff) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = riff}; + + TRACE("Parsing segment wave in %p: %s\n", stream, debugstr_chunk(riff)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + switch (chunk.id) { + case mmioFOURCC('f','m','t',' '): { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->wave_format, + sizeof(This->wave_format))) ) + return hr; + TRACE("Wave Format tag %d\n", This->wave_format.wf.wFormatTag); + break; + } + case mmioFOURCC('d','a','t','a'): { + TRACE("Wave Data size %lu\n", chunk.size); + if (This->wave_data) + ERR("Multiple data streams detected\n"); + This->wave_data = malloc(chunk.size); + This->data_size = chunk.size; + if (!This->wave_data) + return E_OUTOFMEMORY; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, This->wave_data, chunk.size))) + return hr; + break; + } + case FOURCC_LIST: { + FIXME("Skipping LIST tag\n"); + break; + } + case mmioFOURCC('I','S','F','T'): { + FIXME("Skipping ISFT tag\n"); + break; + } + case mmioFOURCC('f','a','c','t'): { + FIXME("Skipping fact tag\n"); + break; + } + } + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *stream) { IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); @@ -847,8 +900,10 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st if (riff.type == DMUS_FOURCC_SEGMENT_FORM) hr = parse_segment_form(This, stream, &riff); + else if(riff.type == mmioFOURCC('W','A','V','E')) + hr = parse_wave_form(This, stream, &riff); else { - FIXME("WAVE form loading not implemented\n"); + FIXME("Unknown type %s\n", debugstr_chunk(&riff)); hr = S_OK; }

1 0

Ilia Docin : sane.ds: Add maximum scanning dimensions setting support.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: e69785eee110cf4a300b521cc79847efc1325dd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e69785eee110cf4a300b521cc79847… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Aug 6 18:57:29 2023 +0300 sane.ds: Add maximum scanning dimensions setting support. --- dlls/sane.ds/capability.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 312876cd8e6..349126f6b95 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -823,6 +823,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 static TW_UINT32 possible_values[ARRAY_SIZE(supported_sizes)]; unsigned int i; TW_UINT32 val; + double max_width, max_height; TW_UINT16 default_size = get_default_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); TW_UINT16 current_size = get_current_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); @@ -849,7 +850,10 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); - + /* TWAIN: For devices that support physical dimensions TWSS_NONE indicates that the maximum + image size supported by the device is to be used. */ + if (val == TWSS_NONE && get_width_height(&max_width, &max_height, TRUE) == TWCC_SUCCESS) + return set_width_height(max_width, max_height); ERR("Unsupported size %ld\n", val); twCC = TWCC_BADCAP; break;

1 0

Alistair Leslie-Hughes : include: Added D3DX11_TEXTURE_LOAD_INFO struct.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 9f375360d6191cac4ca58c1ff4f965b97f414a13 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f375360d6191cac4ca58c1ff4f965… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 18:02:52 2023 +1000 include: Added D3DX11_TEXTURE_LOAD_INFO struct. --- include/d3dx11tex.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index c8a47925c80..0a823461b46 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -103,6 +103,36 @@ typedef struct D3DX11_IMAGE_LOAD_INFO #endif } D3DX11_IMAGE_LOAD_INFO; +typedef struct _D3DX11_TEXTURE_LOAD_INFO +{ + D3D11_BOX *pSrcBox; + D3D11_BOX *pDstBox; + UINT SrcFirstMip; + UINT DstFirstMip; + UINT NumMips; + UINT SrcFirstElement; + UINT DstFirstElement; + UINT NumElements; + UINT Filter; + UINT MipFilter; + +#ifdef __cplusplus + _D3DX11_TEXTURE_LOAD_INFO() + { + pSrcBox = NULL; + pDstBox = NULL; + SrcFirstMip = 0; + DstFirstMip = 0; + NumMips = D3DX11_DEFAULT; + SrcFirstElement = 0; + DstFirstElement = 0; + NumElements = D3DX11_DEFAULT; + Filter = D3DX11_DEFAULT; + MipFilter = D3DX11_DEFAULT; + } +#endif +} D3DX11_TEXTURE_LOAD_INFO; + #ifdef __cplusplus extern "C" { #endif

1 0

Alistair Leslie-Hughes : d3dx11: Add D3DX11LoadTextureFromTexture stub.
by Alexandre Julliard 10 Aug '23

10 Aug '23

Module: wine Branch: master Commit: 83b86d18dc814ba96e6f684bb7715cfb791106b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/83b86d18dc814ba96e6f684bb7715c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 18:02:53 2023 +1000 d3dx11: Add D3DX11LoadTextureFromTexture stub. --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 9 +++++++++ include/d3dx11tex.h | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 99a38557b83..2d93b8d760a 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -32,7 +32,7 @@ @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW -@ stub D3DX11LoadTextureFromTexture +@ stdcall D3DX11LoadTextureFromTexture(ptr ptr ptr ptr) @ stub D3DX11PreprocessShaderFromFileA @ stub D3DX11PreprocessShaderFromFileW @ stub D3DX11PreprocessShaderFromMemory diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 99a38557b83..2d93b8d760a 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -32,7 +32,7 @@ @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW -@ stub D3DX11LoadTextureFromTexture +@ stdcall D3DX11LoadTextureFromTexture(ptr ptr ptr ptr) @ stub D3DX11PreprocessShaderFromFileA @ stub D3DX11PreprocessShaderFromFileW @ stub D3DX11PreprocessShaderFromMemory diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 81ac8ee6db7..fe7ab8549d0 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -89,3 +89,12 @@ HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Res return E_NOTIMPL; } + +HRESULT WINAPI D3DX11LoadTextureFromTexture(ID3D11DeviceContext *context, ID3D11Resource *src_texture, + D3DX11_TEXTURE_LOAD_INFO *info, ID3D11Resource *dst_texture) +{ + FIXME("context %p, src_texture %p, info %p, dst_texture %p stub!\n", + context, src_texture, info, dst_texture); + + return E_NOTIMPL; +} diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 0a823461b46..fae5ee9c67a 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -155,6 +155,8 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP HRESULT *hresult); HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX11LoadTextureFromTexture(ID3D11DeviceContext *context, ID3D11Resource *src_texture, + D3DX11_TEXTURE_LOAD_INFO *info, ID3D11Resource *dst_texture); HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, const char *filename); HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,

1 0