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

Nikolay Sivov : vkd3d-shader/hlsl: Change warning code for unknown loop attributes.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: 89eda51855f30cb93e2ff08a552e39fb99276a76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/89eda51855f30cb93e2ff08a552e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 16 20:19:37 2023 +0200 vkd3d-shader/hlsl: Change warning code for unknown loop attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 048f7232..2fd8ceb9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -493,11 +493,11 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, || !strcmp(attr->name, "fastopt") || !strcmp(attr->name, "allow_uav_condition")) { - hlsl_fixme(ctx, loc, "Unhandled attribute %s.", attr->name); + hlsl_fixme(ctx, loc, "Unhandled attribute '%s'.", attr->name); } else { - hlsl_warning(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Unrecognized attribute %s.", attr->name); + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, "Unrecognized attribute '%s'.", attr->name); } }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: 926575a6f3fb7dee853280a58401eeb407f1afb5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/926575a6f3fb7dee853280a58401e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 13:00:45 2023 -0500 vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders. Pixel shaders still have an appropriate writemask. --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++-- tests/vkd3d_shader_api.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index bfa605f4..bae8e5f9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -321,9 +321,10 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, s if (!semantic->name) return; - vector_type_src = hlsl_get_vector_type(ctx, type->base_type, - (ctx->profile->major_version < 4) ? 4 : hlsl_type_minor_size(type)); vector_type_dst = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type)); + vector_type_src = vector_type_dst; + if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX) + vector_type_src = hlsl_get_vector_type(ctx, type->base_type, 4); for (i = 0; i < hlsl_type_major_size(type); ++i) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 4893f44f..af75e0fd 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -630,7 +630,7 @@ static void test_scan_signatures(void) { {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0xf, 0xf}, - {"DEPTH", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + {"DEPTH", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0x1, 0x1}, {"BLENDINDICES", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 3, 0xf, 0xf}, {"VPOS", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, {"VFACE", 0, 0, VKD3D_SHADER_SV_IS_FRONT_FACE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1},

1 0

Piotr Caban : msvcrt/tests: Make registry handle inheritable in test_invalid_stdin tests.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 74eae57e0f34334f58b003ee002d2bc4aee273d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/74eae57e0f34334f58b003ee002d2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 23 18:56:59 2023 +0200 msvcrt/tests: Make registry handle inheritable in test_invalid_stdin tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55286 --- dlls/msvcrt/tests/file.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 15f18a395c8..71b3e1399f8 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1929,6 +1929,10 @@ static void test_invalid_stdin( const char* selfname ) ret = RegOpenCurrentUser(KEY_READ, &key); ok(!ret, "RegOpenCurrentUser failed: %lx\n", ret); + ret = DuplicateHandle(GetCurrentProcess(), key, GetCurrentProcess(), + (HANDLE *)&key, GENERIC_READ, TRUE, DUPLICATE_CLOSE_SOURCE); + ok(ret, "DuplicateHandle failed: %lx\n", GetLastError()); + sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE;

1 0

Alex Henrie : mlang: Use CRT allocation functions.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 7428b176474b64f278e5b23354d004667eed9704 URL: https://gitlab.winehq.org/wine/wine/-/commit/7428b176474b64f278e5b23354d004… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 23 23:15:22 2023 -0600 mlang: Use CRT allocation functions. --- dlls/mlang/mlang.c | 79 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 40 deletions(-)

1 0

Alex Henrie : mciavi32: Use CRT allocation functions.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 0f3c4eb319bba066a19ca8f5204938339c623b22 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f3c4eb319bba066a19ca8f5204938… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 23 23:00:24 2023 -0600 mciavi32: Use CRT allocation functions. --- dlls/mciavi32/mciavi.c | 61 ++++++++++++++++++++++++------------------------ dlls/mciavi32/mmoutput.c | 21 +++++++---------- 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index dcd07032fec..15322b9a35a 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -79,7 +79,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) if (!MCIAVI_RegisterClass()) return 0; - wma = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIAVI)); + wma = calloc(1, sizeof(WINE_MCIAVI)); if (!wma) return 0; @@ -124,8 +124,8 @@ static DWORD MCIAVI_drvClose(DWORD dwDevID) wma->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&wma->cs); - HeapFree(GetProcessHeap(), 0, wma); - return 1; + free(wma); + return 1; } return (dwDevID == 0xFFFFFFFF) ? 1 : 0; } @@ -172,30 +172,30 @@ static void MCIAVI_CleanUp(WINE_MCIAVI* wma) mmioClose(wma->hFile, 0); wma->hFile = 0; - HeapFree(GetProcessHeap(), 0, wma->lpFileName); + free(wma->lpFileName); wma->lpFileName = NULL; - HeapFree(GetProcessHeap(), 0, wma->lpVideoIndex); - wma->lpVideoIndex = NULL; - HeapFree(GetProcessHeap(), 0, wma->lpAudioIndex); - wma->lpAudioIndex = NULL; - if (wma->hic) ICClose(wma->hic); - wma->hic = 0; - HeapFree(GetProcessHeap(), 0, wma->inbih); - wma->inbih = NULL; - HeapFree(GetProcessHeap(), 0, wma->outbih); - wma->outbih = NULL; - HeapFree(GetProcessHeap(), 0, wma->indata); - wma->indata = NULL; - HeapFree(GetProcessHeap(), 0, wma->outdata); - wma->outdata = NULL; - if (wma->hbmFrame) DeleteObject(wma->hbmFrame); - wma->hbmFrame = 0; - if (wma->hWnd) DestroyWindow(wma->hWnd); - wma->hWnd = 0; - - HeapFree(GetProcessHeap(), 0, wma->lpWaveFormat); - wma->lpWaveFormat = 0; + free(wma->lpVideoIndex); + wma->lpVideoIndex = NULL; + free(wma->lpAudioIndex); + wma->lpAudioIndex = NULL; + if (wma->hic) ICClose(wma->hic); + wma->hic = 0; + free(wma->inbih); + wma->inbih = NULL; + free(wma->outbih); + wma->outbih = NULL; + free(wma->indata); + wma->indata = NULL; + free(wma->outdata); + wma->outdata = NULL; + if (wma->hbmFrame) DeleteObject(wma->hbmFrame); + wma->hbmFrame = 0; + if (wma->hWnd) DestroyWindow(wma->hWnd); + wma->hWnd = 0; + + free(wma->lpWaveFormat); + wma->lpWaveFormat = 0; memset(&wma->mah, 0, sizeof(wma->mah)); memset(&wma->ash_video, 0, sizeof(wma->ash_video)); @@ -251,8 +251,7 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, /* FIXME : what should be done id wma->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpOpenParms->lpstrElementName)); - wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); - lstrcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); + wma->lpFileName = wcsdup(lpOpenParms->lpstrElementName); if (lpOpenParms->lpstrElementName[0] == '@') { /* The file name @11223344 encodes an AVIFile handle in decimal notation @@ -366,7 +365,7 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP if (MCIAVI_OpenAudio(wma, &nHdr, &waveHdr) != 0) { /* can't play audio */ - HeapFree(GetProcessHeap(), 0, wma->lpWaveFormat); + free(wma->lpWaveFormat); wma->lpWaveFormat = NULL; } else @@ -462,7 +461,7 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP dwRet = 0; if (wma->lpWaveFormat) { - HeapFree(GetProcessHeap(), 0, waveHdr); + free(waveHdr); if (wma->hWave) { LeaveCriticalSection(&wma->cs); @@ -507,7 +506,7 @@ static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) ret = MCIAVI_player(data->wma, data->flags, &data->params); TRACE("In thread after async play command (id %u, flags %08lx)\n", data->wma->wDevID, data->flags); - HeapFree(GetProcessHeap(), 0, data); + free(data); return ret; } @@ -517,7 +516,7 @@ static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParams) { HANDLE handle; - struct MCIAVI_play_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct MCIAVI_play_data)); + struct MCIAVI_play_data *data = malloc(sizeof(struct MCIAVI_play_data)); if (!data) return MCIERR_OUT_OF_MEMORY; diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index ec2751e6d9a..948b33ae3e1 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -65,7 +65,7 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK WARN("Size of strf chunk (%ld) < audio format struct\n", mmckInfo.cksize); return FALSE; } - wma->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); + wma->lpWaveFormat = malloc(mmckInfo.cksize); if (!wma->lpWaveFormat) { WARN("Can't alloc WaveFormat\n"); return FALSE; @@ -120,7 +120,7 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK return FALSE; } - wma->inbih = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); + wma->inbih = malloc(mmckInfo.cksize); if (!wma->inbih) { WARN("Can't alloc input BIH\n"); return FALSE; @@ -228,10 +228,7 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, DWORD newsize = alb->numAudioAllocated + 32; struct MMIOPos* newindex; - if (!wma->lpAudioIndex) - newindex = HeapAlloc(GetProcessHeap(), 0, newsize * sizeof(struct MMIOPos)); - else - newindex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); + newindex = realloc(wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); if (!newindex) return FALSE; alb->numAudioAllocated = newsize; wma->lpAudioIndex = newindex; @@ -371,8 +368,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) } wma->dwPlayableVideoFrames = wma->mah.dwTotalFrames; - wma->lpVideoIndex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - wma->dwPlayableVideoFrames * sizeof(struct MMIOPos)); + wma->lpVideoIndex = calloc(wma->dwPlayableVideoFrames, sizeof(struct MMIOPos)); if (!wma->lpVideoIndex) { WARN("Can't alloc video index array\n"); return FALSE; @@ -414,7 +410,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) wma->ash_audio.dwSuggestedBufferSize = alb.inAudioSize; } - wma->indata = HeapAlloc(GetProcessHeap(), 0, wma->ash_video.dwSuggestedBufferSize); + wma->indata = malloc(wma->ash_video.dwSuggestedBufferSize); if (!wma->indata) { WARN("Can't alloc input buffer\n"); return FALSE; @@ -453,7 +449,7 @@ BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) outSize = sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD); - wma->outbih = HeapAlloc(GetProcessHeap(), 0, outSize); + wma->outbih = malloc(outSize); if (!wma->outbih) { WARN("Can't alloc output BIH\n"); return FALSE; @@ -475,7 +471,7 @@ BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) TRACE("bih.biClrUsed=%ld\n", wma->outbih->biClrUsed); TRACE("bih.biClrImportant=%ld\n", wma->outbih->biClrImportant); - wma->outdata = HeapAlloc(GetProcessHeap(), 0, wma->outbih->biSizeImage); + wma->outdata = malloc(wma->outbih->biSizeImage); if (!wma->outdata) { WARN("Can't alloc output buffer\n"); return FALSE; @@ -541,8 +537,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) * to be used... */ *nHdr = 7; - waveHdr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - *nHdr * (sizeof(WAVEHDR) + wma->ash_audio.dwSuggestedBufferSize)); + waveHdr = calloc(*nHdr, sizeof(WAVEHDR) + wma->ash_audio.dwSuggestedBufferSize); if (!waveHdr) { TRACE("Can't alloc wave headers\n"); dwRet = MCIERR_DEVICE_OPEN;

1 0

Jeff Smith : gdiplus/tests: Add test for mask-only icon with GdipCreateBitmapFromHICON.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: a548bef8d0732839d051ae9713bfa034884126f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a548bef8d0732839d051ae9713bfa0… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Aug 18 21:24:34 2023 -0500 gdiplus/tests: Add test for mask-only icon with GdipCreateBitmapFromHICON. --- dlls/gdiplus/tests/image.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cd9634a6e2a..b0a17217366 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1612,6 +1612,19 @@ static void test_fromhicon(void) GdipDisposeImage((GpImage*)bitmap); DestroyIcon(hIcon); + /* mask-only icon */ + info = iconinfo_base; + info.hbmMask = hbmMask; + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + + stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); + todo_wine + expect(InvalidParameter, stat); + if (stat == Ok) + GdipDisposeImage((GpImage*)bitmap); + DestroyIcon(hIcon); + DeleteObject(hbmMask); DeleteObject(hbmColor);

1 0

Jeff Smith : gdiplus/tests: Create helper function for testing image properties.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 5e5b7d560f5b836a05adc45ca47504187043e8cf URL: https://gitlab.winehq.org/wine/wine/-/commit/5e5b7d560f5b836a05adc45ca47504… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 20:16:31 2023 -0500 gdiplus/tests: Create helper function for testing image properties. --- dlls/gdiplus/tests/image.c | 57 +++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 48a4652e688..e8158151293 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -82,6 +82,30 @@ static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo expect_guid(expected, &raw, line, todo); } +static void expect_image_properties(GpImage *image, UINT width, UINT height, int line) +{ + GpStatus stat; + UINT dim; + ImageType type; + PixelFormat format; + + stat = GdipGetImageWidth(image, &dim); + ok_(__FILE__, line)(stat == Ok, "Expected %d, got %d\n", Ok, stat); + ok_(__FILE__, line)(dim == width, "Expected %d, got %d\n", width, dim); + + stat = GdipGetImageHeight(image, &dim); + ok_(__FILE__, line)(stat == Ok, "Expected %d, got %d\n", Ok, stat); + ok_(__FILE__, line)(dim == height, "Expected %d, got %d\n", height, dim); + + stat = GdipGetImageType(image, &type); + ok_(__FILE__, line)(stat == Ok, "Expected %d, got %d\n", Ok, stat); + ok_(__FILE__, line)(type == ImageTypeBitmap, "Expected %d, got %d\n", ImageTypeBitmap, type); + + stat = GdipGetImagePixelFormat(image, &format); + ok_(__FILE__, line)(stat == Ok, "Expected %d, got %d\n", Ok, stat); + ok_(__FILE__, line)(format == PixelFormat32bppARGB, "Expected %d, got %d\n", PixelFormat32bppARGB, format); +} + static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) { GpStatus status; @@ -1542,9 +1566,6 @@ static void test_fromhicon(void) HICON hIcon; GpStatus stat; GpBitmap *bitmap = NULL; - UINT dim; - ImageType type; - PixelFormat format; /* NULL */ stat = GdipCreateBitmapFromHICON(NULL, NULL); @@ -1570,20 +1591,7 @@ static void test_fromhicon(void) broken(stat == InvalidParameter), /* Win98 */ "Expected Ok, got %.8x\n", stat); if(stat == Ok){ - /* check attributes */ - stat = GdipGetImageHeight((GpImage*)bitmap, &dim); - expect(Ok, stat); - expect(16, dim); - stat = GdipGetImageWidth((GpImage*)bitmap, &dim); - expect(Ok, stat); - expect(16, dim); - stat = GdipGetImageType((GpImage*)bitmap, &type); - expect(Ok, stat); - expect(ImageTypeBitmap, type); - stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); - expect(Ok, stat); - expect(PixelFormat32bppARGB, format); - /* raw format */ + expect_image_properties((GpImage*)bitmap, 16, 16, __LINE__); expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); GdipDisposeImage((GpImage*)bitmap); } @@ -1605,20 +1613,7 @@ static void test_fromhicon(void) stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); expect(Ok, stat); if(stat == Ok){ - /* check attributes */ - stat = GdipGetImageHeight((GpImage*)bitmap, &dim); - expect(Ok, stat); - expect(16, dim); - stat = GdipGetImageWidth((GpImage*)bitmap, &dim); - expect(Ok, stat); - expect(16, dim); - stat = GdipGetImageType((GpImage*)bitmap, &type); - expect(Ok, stat); - expect(ImageTypeBitmap, type); - stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); - expect(Ok, stat); - expect(PixelFormat32bppARGB, format); - /* raw format */ + expect_image_properties((GpImage*)bitmap, 16, 16, __LINE__); expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, FALSE); GdipDisposeImage((GpImage*)bitmap); }

1 0

Jeff Smith : gdiplus/tests: Simplify ICONINFO initialization.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 5e7877da82a2215fea5587050e16776a5e5abbb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e7877da82a2215fea5587050e1677… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 18:29:22 2023 -0500 gdiplus/tests: Simplify ICONINFO initialization. --- dlls/gdiplus/tests/image.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0baf6eae77b..48a4652e688 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1538,7 +1538,7 @@ static void test_fromhicon(void) { static const BYTE bmp_bits[1024]; HBITMAP hbmMask, hbmColor; - ICONINFO info; + ICONINFO info, iconinfo_base = {TRUE, 0, 0, 0, 0}; HICON hIcon; GpStatus stat; GpBitmap *bitmap = NULL; @@ -1557,9 +1557,7 @@ static void test_fromhicon(void) ok(hbmMask != 0, "CreateBitmap failed\n"); hbmColor = CreateBitmap(16, 16, 1, 1, bmp_bits); ok(hbmColor != 0, "CreateBitmap failed\n"); - info.fIcon = TRUE; - info.xHotspot = 8; - info.yHotspot = 8; + info = iconinfo_base; info.hbmMask = hbmMask; info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info); @@ -1596,9 +1594,7 @@ static void test_fromhicon(void) ok(hbmMask != 0, "CreateBitmap failed\n"); hbmColor = CreateBitmap(16, 16, 1, 8, bmp_bits); ok(hbmColor != 0, "CreateBitmap failed\n"); - info.fIcon = TRUE; - info.xHotspot = 8; - info.yHotspot = 8; + info = iconinfo_base; info.hbmMask = hbmMask; info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info);

1 0

Jeff Smith : gdiplus/tests: Add test for cursor with GdipCreateBitmapFromHICON.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 159e346547e1ec3f9739b6f934a1f6dd34aef66c URL: https://gitlab.winehq.org/wine/wine/-/commit/159e346547e1ec3f9739b6f934a1f6… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Aug 21 15:55:53 2023 -0500 gdiplus/tests: Add test for cursor with GdipCreateBitmapFromHICON. --- dlls/gdiplus/tests/image.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e8158151293..cd9634a6e2a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1573,18 +1573,17 @@ static void test_fromhicon(void) stat = GdipCreateBitmapFromHICON(NULL, &bitmap); expect(InvalidParameter, stat); - /* color icon 1 bit */ + /* monochrome icon */ hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); ok(hbmMask != 0, "CreateBitmap failed\n"); hbmColor = CreateBitmap(16, 16, 1, 1, bmp_bits); ok(hbmColor != 0, "CreateBitmap failed\n"); + info = iconinfo_base; info.hbmMask = hbmMask; info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - DeleteObject(hbmMask); - DeleteObject(hbmColor); stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); ok(stat == Ok || @@ -1597,11 +1596,31 @@ static void test_fromhicon(void) } DestroyIcon(hIcon); - /* color icon 8 bpp */ - hbmMask = CreateBitmap(16, 16, 1, 8, bmp_bits); + /* monochrome cursor */ + info.fIcon = FALSE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = hbmMask; + info.hbmColor = hbmColor; + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + + stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); + todo_wine + expect(InvalidParameter, stat); + if (stat == Ok) + GdipDisposeImage((GpImage*)bitmap); + DestroyIcon(hIcon); + + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + /* 8 bpp icon */ + hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); ok(hbmMask != 0, "CreateBitmap failed\n"); hbmColor = CreateBitmap(16, 16, 1, 8, bmp_bits); ok(hbmColor != 0, "CreateBitmap failed\n"); + info = iconinfo_base; info.hbmMask = hbmMask; info.hbmColor = hbmColor;

1 0

Jeff Smith : gdiplus: Fix GdipCreateBitmapFromICON return status with mask-only icon.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 19b7d1dbabe75366f20eadc704109583a89f9dd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/19b7d1dbabe75366f20eadc7041095… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Aug 19 18:45:06 2023 -0500 gdiplus: Fix GdipCreateBitmapFromICON return status with mask-only icon. --- dlls/gdiplus/image.c | 84 ++++++++++++++++------------------------------ dlls/gdiplus/tests/image.c | 4 --- 2 files changed, 29 insertions(+), 59 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1aa5f59a4e7..7640c934902 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1635,11 +1635,11 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) TRACE("%p, %p\n", hicon, bitmap); - if(!bitmap || !GetIconInfo(hicon, &iinfo)) + if(!bitmap || !GetIconInfo(hicon, &iinfo) || !iinfo.hbmColor || !iinfo.fIcon) return InvalidParameter; /* get the size of the icon */ - ret = GetObjectA(iinfo.hbmColor ? iinfo.hbmColor : iinfo.hbmMask, sizeof(bm), &bm); + ret = GetObjectA(iinfo.hbmColor, sizeof(bm), &bm); if (ret == 0) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -1647,7 +1647,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } width = bm.bmWidth; - height = iinfo.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + height = abs(bm.bmHeight); stride = width * 4; stat = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat32bppARGB, NULL, bitmap); @@ -1672,7 +1672,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biSize = sizeof(bih); bih.biWidth = width; - bih.biHeight = iinfo.hbmColor ? -height: -height * 2; + bih.biHeight = -height; bih.biPlanes = 1; bih.biBitCount = 32; bih.biCompression = BI_RGB; @@ -1683,71 +1683,45 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biClrImportant = 0; screendc = CreateCompatibleDC(0); - if (iinfo.hbmColor) - { - GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); - if (bm.bmBitsPixel == 32) - { - has_alpha = FALSE; - - /* If any pixel has a non-zero alpha, ignore hbmMask */ - src = (DWORD*)lockeddata.Scan0; - for (y=0; y<height && !has_alpha; y++) - for (x=0; x<width && !has_alpha; x++) - if ((*src++ & 0xff000000) != 0) - has_alpha = TRUE; - } - else has_alpha = FALSE; - } - else + if (bm.bmBitsPixel == 32) { - GetDIBits(screendc, iinfo.hbmMask, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); has_alpha = FALSE; + + /* If any pixel has a non-zero alpha, ignore hbmMask */ + src = (DWORD*)lockeddata.Scan0; + for (y=0; y<height && !has_alpha; y++) + for (x=0; x<width && !has_alpha; x++) + if ((*src++ & 0xff000000) != 0) + has_alpha = TRUE; } + else has_alpha = FALSE; if (!has_alpha) { - if (iinfo.hbmMask) - { - BYTE *bits = heap_alloc(height * stride); - - /* read alpha data from the mask */ - if (iinfo.hbmColor) - GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); - else - GetDIBits(screendc, iinfo.hbmMask, height, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + BYTE *bits = heap_alloc(height * stride); - src = (DWORD*)bits; - dst_row = lockeddata.Scan0; - for (y=0; y<height; y++) - { - dst = (DWORD*)dst_row; - for (x=0; x<width; x++) - { - DWORD src_value = *src++; - if (src_value) - *dst++ = 0; - else - *dst++ |= 0xff000000; - } - dst_row += lockeddata.Stride; - } + /* read alpha data from the mask - the mask can safely be assumed to exist */ + GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); - heap_free(bits); - } - else + src = (DWORD*)bits; + dst_row = lockeddata.Scan0; + for (y=0; y<height; y++) { - /* set constant alpha of 255 */ - dst_row = lockeddata.Scan0; - for (y=0; y<height; y++) + dst = (DWORD*)dst_row; + for (x=0; x<width; x++) { - dst = (DWORD*)dst_row; - for (x=0; x<width; x++) + DWORD src_value = *src++; + if (src_value) + *dst++ = 0; + else *dst++ |= 0xff000000; - dst_row += lockeddata.Stride; } + dst_row += lockeddata.Stride; } + + heap_free(bits); } DeleteDC(screendc); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b0a17217366..cbc07b877a9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1606,7 +1606,6 @@ static void test_fromhicon(void) ok(hIcon != 0, "CreateIconIndirect failed\n"); stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); - todo_wine expect(InvalidParameter, stat); if (stat == Ok) GdipDisposeImage((GpImage*)bitmap); @@ -1619,10 +1618,7 @@ static void test_fromhicon(void) ok(hIcon != 0, "CreateIconIndirect failed\n"); stat = GdipCreateBitmapFromHICON(hIcon, &bitmap); - todo_wine expect(InvalidParameter, stat); - if (stat == Ok) - GdipDisposeImage((GpImage*)bitmap); DestroyIcon(hIcon); DeleteObject(hbmMask);

1 0