February 2020 - Wine-Commits

Rémi Bernon : fusion/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: cc012d13ee5f8ff6b836e6d39025b4d864cfff9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc012d13ee5f8ff6b836e6d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:25 2020 +0100 fusion/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/tests/asmenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 115089e674..5892cfde7e 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -381,7 +381,7 @@ static void test_enumerate_name(void) IAssemblyName *asmname, *next; WCHAR buf[MAX_PATH]; CHAR gac[MAX_PATH]; - CHAR path[MAX_PATH]; + CHAR path[MAX_PATH + 40]; CHAR disp[MAX_PATH]; WCHAR namestr[MAX_PATH]; CHAR exp[6][MAX_PATH];

1 0

Nikolay Sivov : crypt32/tests: Detect missing HEXRAW support by output.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: eb00dbd9134783242d0e3c21be8f5fafd4519d70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb00dbd9134783242d0e3c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:25:39 2020 +0300 crypt32/tests: Detect missing HEXRAW support by output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index ac41d5c86d..874f8e432d 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -363,11 +363,16 @@ static void test_CryptBinaryToString(void) heap_free(encodedW); } - /* winxp and win2k3 are documented as not handling HEXRAW but do not return failure */ - GetVersionExA(&ver); - if (ver.dwMajorVersion <= 5) + /* Systems that don't support HEXRAW format convert to BASE64 instead - 3 bytes in -> 4 chars + crlf + 1 null out. */ + strLen = 0; + ret = CryptBinaryToStringW(input, 3, CRYPT_STRING_HEXRAW, NULL, &strLen); +todo_wine { + ok(ret, "Failed to get string length.\n"); + ok(strLen == 9 || broken(strLen == 7), "Unexpected string length %d.\n", strLen); +} + if (strLen == 7) { - win_skip("CryptBinaryToString(HEX) not supported\n"); + win_skip("CryptBinaryToString(HEXRAW) not supported\n"); return; } @@ -376,6 +381,12 @@ static void test_CryptBinaryToString(void) for (i = 0; i < ARRAY_SIZE(flags); i++) { + strLen = 0; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); +todo_wine { + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen > 0, "Unexpected string length.\n"); +} strLen = ~0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen);

1 0

Rémi Bernon : wpp: Do not pass NULL %s to fprintf.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 7154c8676f1e26270addfb41f93c2fb1a47e2980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7154c8676f1e26270addfb41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 15:49:12 2020 +0100 wpp: Do not pass NULL %s to fprintf. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppl.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 4fd12c6b17..a68124355b 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1620,8 +1620,8 @@ void pp_do_include(char *fname, int type) pp_incl_state.ppp = NULL; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ifdepth); pp_status.file = fp; ppy__switch_to_buffer(ppy__create_buffer(NULL, YY_BUF_SIZE));

1 0

Alistair Leslie-Hughes : d3dx9: Implement D3DXCreateKeyframedAnimationSet.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 0854a7eab7ac69057a3bf8c44ef90ce18497d964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0854a7eab7ac69057a3bf8c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 11 18:36:46 2020 +0100 d3dx9: Implement D3DXCreateKeyframedAnimationSet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45481 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/animation.c | 419 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 27 +++ 2 files changed, 443 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0854a7eab7ac69057a3b…

1 0

Piotr Caban : ucrtbase: Added stub for _get_FMA3_enable.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 87f42c3ae778029067add5c27629704d65bb6f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f42c3ae778029067add5c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 11 13:06:21 2020 +0100 ucrtbase: Added stub for _get_FMA3_enable. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 15 ++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index cb8fdc9227..579b97fee3 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -81,7 +81,7 @@ @ cdecl _fpclass(double) ucrtbase._fpclass @ stub _fpclassf @ cdecl -arch=i386 -ret64 _ftol() ucrtbase._ftol -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() ucrtbase._get_FMA3_enable @ cdecl _hypot(double double) ucrtbase._hypot @ cdecl _hypotf(float float) ucrtbase._hypotf @ cdecl _isnan(double) ucrtbase._isnan diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f6824128cd..19a4da222b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -117,7 +117,19 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#if defined(_WIN64) && _MSVCR_VER>=120 +#if defined(_WIN64) +# if _MSVCR_VER>=140 +/********************************************************************* + * _get_FMA3_enable (UCRTBASE.@) + */ +int CDECL MSVCRT__get_FMA3_enable(void) +{ + FIXME("() stub\n"); + return 0; +} +# endif + +# if _MSVCR_VER>=120 /********************************************************************* * _set_FMA3_enable (MSVCR120.@) */ @@ -126,6 +138,7 @@ int CDECL MSVCRT__set_FMA3_enable(int flag) FIXME("(%x) stub\n", flag); return 0; } +# endif #endif #if !defined(__i386__) || _MSVCR_VER>=120 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 568019da51..6cac7a5ef5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -357,7 +357,7 @@ @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() MSVCRT__get_FMA3_enable @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr)

1 0

Hans Leidekker : bcrypt: Support BCRYPT_HASH_REUSABLE_FLAG in BCryptOpenAlgorithmProvider.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 215c1718914a3fb32332efb4e69ae98f3d6ce695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=215c1718914a3fb32332efb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 11 10:47:34 2020 +0100 bcrypt: Support BCRYPT_HASH_REUSABLE_FLAG in BCryptOpenAlgorithmProvider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index d026dab729..5cc2c249da 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -154,7 +154,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - BOOL hmac; + ULONG flags; }; #if defined(HAVE_GNUTLS_CIPHER_INIT) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2ac36d3db0..298bfb4007 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -216,7 +216,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { - const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG; + const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG | BCRYPT_HASH_REUSABLE_FLAG; struct algorithm *alg; enum alg_id alg_id; ULONG i; @@ -254,7 +254,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->mode = MODE_ID_CBC; - alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; + alg->flags = flags; *handle = alg; return STATUS_SUCCESS; @@ -692,8 +692,9 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; - if (alg->hmac) hash->flags = HASH_FLAG_HMAC; - if (flags & BCRYPT_HASH_REUSABLE_FLAG) hash->flags |= HASH_FLAG_REUSABLE; + if (alg->flags & BCRYPT_ALG_HANDLE_HMAC_FLAG) hash->flags = HASH_FLAG_HMAC; + if ((alg->flags & BCRYPT_HASH_REUSABLE_FLAG) || (flags & BCRYPT_HASH_REUSABLE_FLAG)) + hash->flags |= HASH_FLAG_REUSABLE; if (secretlen && !(hash->secret = heap_alloc( secretlen ))) {

1 0

Derek Lesho : mfplat: Implement IMFByteStream::GetLength() for file streams.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: e756c28b0b47323e1ad131504452eefdd30a4203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e756c28b0b47323e1ad13150… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 11 12:19:10 2020 +0300 mfplat: Implement IMFByteStream::GetLength() for file streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 27 +++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e96a972909..1ebd443131 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3278,13 +3278,6 @@ static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *ca return S_OK; } -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - FIXME("%p, %p.\n", iface, length); - - return E_NOTIMPL; -} - static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); @@ -3312,6 +3305,24 @@ static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWOR return E_NOTIMPL; } +static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER li; + + TRACE("%p, %p.\n", iface, length); + + if (!length) + return E_INVALIDARG; + + if (GetFileSizeEx(stream->hfile, &li)) + *length = li.QuadPart; + else + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +} + static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3440,7 +3451,7 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_AddRef, bytestream_Release, bytestream_GetCapabilities, - mfbytestream_GetLength, + bytestream_file_GetLength, mfbytestream_SetLength, mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 56aa23c68c..7ec0b01982 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1342,6 +1342,7 @@ static void test_file_stream(void) IMFByteStream *bytestream, *bytestream2; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; + QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; @@ -1405,6 +1406,15 @@ static void test_file_stream(void) IMFAttributes_Release(attributes); + /* Length. */ + hr = IMFByteStream_GetLength(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + bytestream_length = 0; + hr = IMFByteStream_GetLength(bytestream, &bytestream_length); + ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); + ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Jeff Smith : gdiplus: Round up when converting from 32-bit ARGB to PARGB.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: ddd88fe2f40299697208efc9f6b3842a4515054b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd88fe2f40299697208efc9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Feb 10 17:32:52 2020 -0600 gdiplus: Round up when converting from 32-bit ARGB to PARGB. Applies fix from d23bfd8dfc74a1955a0270feaf07ccd7a23a723a to setpixel_32bppPARGB. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 6 +++--- dlls/gdiplus/tests/image.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 29fba1a9c1..dcdc49c6d6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -459,9 +459,9 @@ static inline void setpixel_32bppARGB(BYTE r, BYTE g, BYTE b, BYTE a, static inline void setpixel_32bppPARGB(BYTE r, BYTE g, BYTE b, BYTE a, BYTE *row, UINT x) { - r = r * a / 255; - g = g * a / 255; - b = b * a / 255; + r = (r * a + 127) / 255; + g = (g * a + 127) / 255; + b = (b * a + 127) / 255; *((DWORD*)(row)+x) = (a<<24)|(r<<16)|(g<<8)|b; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8b9c44ef7b..d6f74050c0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4810,6 +4810,7 @@ static void test_PARGB_conversion(void) { BYTE pargb[8] = { 0x62,0x77,0x99,0x77, 0x62,0x77,0x99,0 }; BYTE argb[8] = { 0xd1,0xfe,0xff,0x77, 0x62,0x77,0x99,0 }; + BYTE pargb2[8] = { 0x01,0x01,0x00,0x01, 0xfe,0x7f,0x7f,0xfe }; BYTE *bits; GpBitmap *bitmap; BitmapData data; @@ -4836,6 +4837,28 @@ static void test_PARGB_conversion(void) status = GdipBitmapUnlockBits(bitmap, &data); expect(Ok, status); + /* Testing SetPixel 32-bit ARGB to PARGB */ + status = GdipBitmapSetPixel(bitmap, 0, 0, 0x017f80ff); + expect(Ok, status); + status = GdipBitmapSetPixel(bitmap, 1, 0, 0xfe7f80ff); + expect(Ok, status); + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppPARGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppPARGB, "expected PixelFormat32bppPARGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, pargb2, sizeof(pargb2)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppPARGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + GdipDisposeImage((GpImage *)bitmap); }

1 0

Jeff Smith : gdiplus: Fix calculation for 32-bit PARGB to ARGB conversion.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 06bf4283fbbde31f0ce496a93f896cc04a0ca825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06bf4283fbbde31f0ce496a9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Feb 10 17:32:51 2020 -0600 gdiplus: Fix calculation for 32-bit PARGB to ARGB conversion. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 13 +++++++++---- dlls/gdiplus/tests/image.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9fa2aaee95..29fba1a9c1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -239,12 +239,17 @@ static inline void getpixel_32bppPARGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, { *a = row[x*4+3]; if (*a == 0) - *r = *g = *b = 0; + { + *r = row[x*4+2]; + *g = row[x*4+1]; + *b = row[x*4]; + } else { - *r = row[x*4+2] * 255 / *a; - *g = row[x*4+1] * 255 / *a; - *b = row[x*4] * 255 / *a; + DWORD scaled_q = (255 << 15) / *a; + *r = (row[x*4+2] > *a) ? 0xff : (row[x*4+2] * scaled_q) >> 15; + *g = (row[x*4+1] > *a) ? 0xff : (row[x*4+1] * scaled_q) >> 15; + *b = (row[x*4] > *a) ? 0xff : (row[x*4] * scaled_q) >> 15; } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index eeeea8746a..8b9c44ef7b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4806,6 +4806,39 @@ static void test_ARGB_conversion(void) GdipDisposeImage((GpImage *)bitmap); } +static void test_PARGB_conversion(void) +{ + BYTE pargb[8] = { 0x62,0x77,0x99,0x77, 0x62,0x77,0x99,0 }; + BYTE argb[8] = { 0xd1,0xfe,0xff,0x77, 0x62,0x77,0x99,0 }; + BYTE *bits; + GpBitmap *bitmap; + BitmapData data; + GpStatus status; + int match; + + status = GdipCreateBitmapFromScan0(2, 1, 8, PixelFormat32bppPARGB, pargb, &bitmap); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppARGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppARGB, "expected PixelFormat32bppARGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, argb, sizeof(argb)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppARGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + GdipDisposeImage((GpImage *)bitmap); +} + static void test_CloneBitmapArea(void) { @@ -5626,6 +5659,7 @@ START_TEST(image) test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); + test_PARGB_conversion(); test_DrawImage_scale(); test_image_format(); test_DrawImage();

1 0

Zebediah Figura : d3d9: Retrieve pixel shader constants from the primary stateblock.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: ace7d485643adf25fc8aa86ecf1d3c5053b06aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace7d485643adf25fc8aa86e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:59 2020 -0600 d3d9: Retrieve pixel shader constants from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 04fb158bc6..f6ff9466b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3908,19 +3908,22 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if } static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(IDirect3DDevice9Ex *iface, - UINT reg_idx, float *data, UINT count) + UINT start_idx, float *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, - reg_idx, count, (struct wined3d_vec4 *)data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *iface, @@ -3943,19 +3946,24 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if } static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *iface, - UINT reg_idx, int *data, UINT count) + UINT start_idx, int *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_ivec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_i(device->wined3d_device, - reg_idx, count, (struct wined3d_ivec4 *)data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_i; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *iface, @@ -3976,18 +3984,22 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if } static HRESULT WINAPI d3d9_device_GetPixelShaderConstantB(IDirect3DDevice9Ex *iface, - UINT reg_idx, BOOL *data, UINT count) + UINT start_idx, BOOL *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, count, data); + memcpy(constants, &wined3d_stateblock_get_state(device->state)->ps_consts_b[start_idx], count * sizeof(*constants)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_DrawRectPatch(IDirect3DDevice9Ex *iface, UINT handle,

1 0