May 2024 - Wine-Commits - list.winehq.org

Ilia Docin : sane.ds: Add missing color modes setting support.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 104d47beae48112a8b5e8e3491d3edd35e93a7f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/104d47beae48112a8b5e8e3491d3ed… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Wed May 22 16:19:50 2024 +0300 sane.ds: Add missing color modes setting support. --- dlls/sane.ds/capability.c | 72 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 560b670ae4d..555575c45a4 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -277,27 +277,45 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action return twCC; } -static BOOL pixeltype_to_sane_mode(TW_UINT16 pixeltype, char *mode, int len) +static TW_UINT16 set_color_mode(TW_UINT32 pixeltype) { - const char *m = NULL; + TW_UINT16 twCC = TWCC_BADCAP; + BOOL reload = FALSE; + int i; + const char * const * modes; + /* most of the values are taken from https://gitlab.gnome.org/GNOME/simple-scan/-/blob/master/src/scanner.vala */ + static const char * const gray[] = {"Gray", "Grayscale", "True Gray", "8-bit Grayscale", "Grayscale - 256 Levels", "gray", + 0}; + static const char * const rgb[] = {"Color", "24bit Color[Fast]", "24bit Color", + "24 bit Color", "Color - 16 Million Colors", 0}; + static const char * const bw[] = {"Lineart", "LineArt", "Black & White", "Binary", "Thresholded", "1-bit Black & White", + "Black and White - Line Art", "Black and White - Halftone", "Monochrome", 0}; switch (pixeltype) { case TWPT_GRAY: - m = "Gray"; + modes = gray; break; case TWPT_RGB: - m = "Color"; + modes = rgb; break; case TWPT_BW: - m = "Lineart"; + modes = bw; + break; + default: + ERR("Unsupported pixeltype %lu\n", pixeltype); + return TWCC_BADVALUE; + break; + } + TRACE("Setting pixeltype to %lu\n", pixeltype); + for(i=0; modes[i]; ++i) + { + twCC = sane_option_set_str("mode", (char*)modes[i], &reload); + if (twCC == TWCC_SUCCESS) { + if (reload) get_sane_params(&activeDS.frame_params); break; + } } - if (! m) - return FALSE; - if (strlen(m) >= len) - return FALSE; - strcpy(mode, m); - return TRUE; + return twCC; } /* ICAP_PIXELTYPE */ @@ -307,9 +325,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio TW_UINT32 possible_values[3]; int possible_value_count; TW_UINT32 val; - BOOL reload = FALSE; TW_UINT16 current_pixeltype = TWPT_BW; - char mode[64]; TRACE("ICAP_PIXELTYPE\n"); @@ -345,17 +361,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio if (twCC == TWCC_SUCCESS) { TRACE("Setting pixeltype to %ld\n", val); - if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) - return TWCC_BADVALUE; - - twCC = sane_option_set_str("mode", mode, &reload); - /* Some SANE devices use 'Grayscale' instead of the standard 'Gray' */ - if (twCC != TWCC_SUCCESS && strcmp(mode, "Gray") == 0) - { - strcpy(mode, "Grayscale"); - twCC = sane_option_set_str("mode", mode, &reload); - } - if (reload) get_sane_params( &activeDS.frame_params ); + twCC = set_color_mode(val); } break; @@ -364,19 +370,11 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio break; case MSG_RESET: - current_pixeltype = activeDS.defaultPixelType; - if (! pixeltype_to_sane_mode(current_pixeltype, mode, sizeof(mode))) - return TWCC_BADVALUE; - - twCC = sane_option_set_str("mode", mode, &reload); - /* Some SANE devices use 'Grayscale' instead of the standard 'Gray' */ - if (twCC != TWCC_SUCCESS && strcmp(mode, "Gray") == 0) - { - strcpy(mode, "Grayscale"); - twCC = sane_option_set_str("mode", mode, &reload); - } - if (twCC != TWCC_SUCCESS) break; - if (reload) get_sane_params( &activeDS.frame_params ); + twCC = set_color_mode(activeDS.defaultPixelType); + if (twCC == TWCC_SUCCESS) + current_pixeltype = activeDS.defaultPixelType; + else + ERR("Unable to reset color mode\n"); /* .. fall through intentional .. */

1 0

Anton Baskanov : quartz: Hold the streaming lock while calling ICDecompressEnd.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a91a7bf5a7602afa0e735f69782897a497290f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/a91a7bf5a7602afa0e735f69782897… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 16 14:17:09 2024 +0700 quartz: Hold the streaming lock while calling ICDecompressEnd. Otherwise, the streaming thread might try to access the decompressor while it's being destroyed. --- dlls/quartz/avidec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index d7f97e0380c..f494efdf1e8 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -573,10 +573,16 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) if (!filter->source.pin.peer) return S_OK; - if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) + if (filter->hvid) { - ERR("ICDecompressEnd() failed, error %Id.\n", res); - return E_FAIL; + EnterCriticalSection(&filter->filter.stream_cs); + res = ICDecompressEnd(filter->hvid); + LeaveCriticalSection(&filter->filter.stream_cs); + if (res) + { + ERR("ICDecompressEnd() failed, error %Id.\n", res); + return E_FAIL; + } } IMemAllocator_Decommit(filter->source.pAllocator);

1 0

Anton Baskanov : quartz/tests: Use unaligned width in AVIDec tests to expose incorrect stride calculation.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 5e592a8e74715c8ffbef03493e035fb7b63fa56f URL: https://gitlab.winehq.org/wine/wine/-/commit/5e592a8e74715c8ffbef03493e035f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue May 21 13:19:29 2024 +0700 quartz/tests: Use unaligned width in AVIDec tests to expose incorrect stride calculation. --- dlls/quartz/tests/avidec.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index f28dfee7402..aa3aada3acc 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -85,10 +85,10 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, out->biSize = sizeof(BITMAPINFOHEADER); out->biCompression = mmioFOURCC('I','4','2','0'); - out->biWidth = 32; + out->biWidth = 29; out->biHeight = 24; out->biBitCount = 12; - out->biSizeImage = 32 * 24 * 12 / 8; + out->biSizeImage = 24 * (((29 * 12 + 31) / 8) & ~3); return ICERR_OK; } @@ -159,7 +159,7 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, for (i = 0; i < 200; ++i) expect[i] = i; ok(!memcmp(params->lpInput, expect, 200), "Data didn't match.\n"); - for (i = 0; i < 32 * 24 * 12 / 8; ++i) + for (i = 0; i < 24 * (((29 * 12 + 31) / 8) & ~3); ++i) output[i] = 111 - i; return ICERR_OK; @@ -876,7 +876,7 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); - BYTE *data, expect[32 * 24 * 12 / 8]; + BYTE *data, expect[24 * (((29 * 12 + 31) / 8) & ~3)]; REFERENCE_TIME start, stop; LONG size, i; HRESULT hr; @@ -884,9 +884,9 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample ++filter->got_sample; size = IMediaSample_GetSize(sample); - ok(size == 32 * 24 * 12 / 8, "Got size %lu.\n", size); + ok(size == 24 * (((29 * 12 + 31) / 8) & ~3), "Got size %lu.\n", size); size = IMediaSample_GetActualDataLength(sample); - ok(size == 32 * 24 * 12 / 8, "Got valid size %lu.\n", size); + ok(size == 24 * (((29 * 12 + 31) / 8) & ~3), "Got valid size %lu.\n", size); hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1221,7 +1221,7 @@ static void test_connect_pin(void) { .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), .bmiHeader.biCompression = test_handler, - .bmiHeader.biWidth = 32, + .bmiHeader.biWidth = 29, .bmiHeader.biHeight = 24, .bmiHeader.biBitCount = 16, }; @@ -1313,28 +1313,29 @@ static void test_connect_pin(void) const GUID *subtype; DWORD compression; WORD bpp; + BOOL todo; } expect[9] = { - {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8}, - {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16}, - {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16}, - {&MEDIASUBTYPE_RGB32, BI_RGB, 32}, - {&MEDIASUBTYPE_RGB24, BI_RGB, 24}, - {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16}, - {&MEDIASUBTYPE_RGB555, BI_RGB, 16}, - {&MEDIASUBTYPE_RGB8, BI_RGB, 8}, - {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12}, + {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8, TRUE}, + {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16, TRUE}, + {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16, TRUE}, + {&MEDIASUBTYPE_RGB32, BI_RGB, 32, FALSE}, + {&MEDIASUBTYPE_RGB24, BI_RGB, 24, TRUE}, + {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16, TRUE}, + {&MEDIASUBTYPE_RGB555, BI_RGB, 16, TRUE}, + {&MEDIASUBTYPE_RGB8, BI_RGB, 8, TRUE}, + {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12, FALSE}, }; VIDEOINFOHEADER expect_format = { .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), - .bmiHeader.biWidth = 32, + .bmiHeader.biWidth = 29, .bmiHeader.biHeight = 24, .bmiHeader.biBitCount = expect[i].bpp, .bmiHeader.biCompression = expect[i].compression, - .bmiHeader.biSizeImage = 32 * 24 * expect[i].bpp / 8, + .bmiHeader.biSizeImage = 24 * (((29 * expect[i].bpp + 31) / 8) & ~3), }; AM_MEDIA_TYPE expect_mt = @@ -1342,7 +1343,7 @@ static void test_connect_pin(void) .majortype = MEDIATYPE_Video, .subtype = *expect[i].subtype, .bFixedSizeSamples = TRUE, - .lSampleSize = 32 * 24 * expect[i].bpp / 8, + .lSampleSize = 24 * (((29 * expect[i].bpp + 31) / 8) & ~3), .formattype = FORMAT_VideoInfo, .cbFormat = sizeof(VIDEOINFOHEADER), .pbFormat = (BYTE *)&expect_format, @@ -1350,9 +1351,9 @@ static void test_connect_pin(void) hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), + todo_wine_if(expect[i].todo) ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), "%u: Media types didn't match.\n", i); - ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), + todo_wine_if(expect[i].todo) ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), "%u: Format blocks didn't match.\n", i); if (i == 5) {

1 0

Anton Baskanov : quartz: Get output format from source, not sink in AVIDec.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a2996078bf1b4e4f20c26a02011d3cf349765c4b URL: https://gitlab.winehq.org/wine/wine/-/commit/a2996078bf1b4e4f20c26a02011d3c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 16 14:11:24 2024 +0700 quartz: Get output format from source, not sink in AVIDec. --- dlls/quartz/avidec.c | 2 +- dlls/quartz/tests/avidec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8cc729748c1..f020d618fdb 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -552,7 +552,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) filter->late = -1; - source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat; + source_format = (VIDEOINFOHEADER *)filter->source.pin.mt.pbFormat; if ((res = ICDecompressBegin(filter->hvid, filter->pBihIn, &source_format->bmiHeader))) { ERR("ICDecompressBegin() failed, error %Id.\n", res); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index aa3aada3acc..6cb67563bcb 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -119,7 +119,7 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, todo_wine_if (in->biSizeImage != sink_bitmap_info.biSizeImage) ok(!memcmp(in, &sink_bitmap_info, sizeof(BITMAPINFOHEADER)), "Input types didn't match.\n"); - todo_wine ok(!memcmp(out, &source_bitmap_info, sizeof(BITMAPINFOHEADER)), + ok(!memcmp(out, &source_bitmap_info, sizeof(BITMAPINFOHEADER)), "Output types didn't match.\n"); ok(!in_begin, "Got multiple ICM_DECOMPRESS_BEGIN messages.\n"); in_begin = 1;

1 0

Alexandre Julliard : msvcrt/tests: Use function pointers to bypass builtin malloc/realloc.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a9689eb62c6bd35aecb00f83216f04fe2ba96c74 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9689eb62c6bd35aecb00f83216f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 22:28:33 2024 +0200 msvcrt/tests: Use function pointers to bypass builtin malloc/realloc. --- dlls/msvcrt/tests/heap.c | 50 +++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index a747482130d..e6de728f2b7 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -467,6 +467,35 @@ static void test_sbheap(void) free(mem); } +static void test_malloc(void) +{ + /* use function pointers to bypass gcc builtins */ + void *(__cdecl *p_malloc)(size_t); + void *(__cdecl *p_realloc)(void *,size_t); + void *mem; + + p_malloc = (void *)GetProcAddress( GetModuleHandleA("msvcrt.dll"), "malloc"); + p_realloc = (void *)GetProcAddress( GetModuleHandleA("msvcrt.dll"), "realloc"); + + mem = p_malloc(0); + ok(mem != NULL, "memory not allocated for size 0\n"); + free(mem); + + mem = p_realloc(NULL, 10); + ok(mem != NULL, "memory not allocated\n"); + + mem = p_realloc(mem, 20); + ok(mem != NULL, "memory not reallocated\n"); + + mem = p_realloc(mem, 0); + ok(mem == NULL, "memory not freed\n"); + + mem = p_realloc(NULL, 0); + ok(mem != NULL, "memory not (re)allocated for size 0\n"); + + free(mem); +} + static void test_calloc(void) { /* use function pointer to bypass gcc builtin */ @@ -496,27 +525,8 @@ static void test_calloc(void) START_TEST(heap) { - void *mem; - - mem = malloc(0); - ok(mem != NULL, "memory not allocated for size 0\n"); - free(mem); - - mem = realloc(NULL, 10); - ok(mem != NULL, "memory not allocated\n"); - - mem = realloc(mem, 20); - ok(mem != NULL, "memory not reallocated\n"); - - mem = realloc(mem, 0); - ok(mem == NULL, "memory not freed\n"); - - mem = realloc(NULL, 0); - ok(mem != NULL, "memory not (re)allocated for size 0\n"); - - free(mem); - test_aligned(); test_sbheap(); + test_malloc(); test_calloc(); }

1 0

Alexandre Julliard : msvcp: Use RVAs in rtti and exception data on all platforms except i386.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 44691e8de328c40cd229a7bfe0a051be90623f2c URL: https://gitlab.winehq.org/wine/wine/-/commit/44691e8de328c40cd229a7bfe0a051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 13:50:48 2024 +0200 msvcp: Use RVAs in rtti and exception data on all platforms except i386. --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcp140_1/msvcp140_1.c | 2 +- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/misc.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0fcdc52c203..05e3aee4b6a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -5162,7 +5162,7 @@ static void init_io(void *base) { filebuf *fb; -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_streambuf_rtti(base); init_filebuf_rtti(base); init_strstreambuf_rtti(base); diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index c6a6ff19f13..c9ca98df268 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -263,7 +263,7 @@ static BOOL init_cxx_funcs(void) static void init_rtti(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_base_memory_resource_rtti(base); init__Identity_equal_resource_rtti(base); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 3da714375f4..891c126b6be 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -11154,7 +11154,7 @@ void* __thiscall _Winit_op_assign(void *this, void *rhs) void init_io(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index c0b43f78256..8037d7def56 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -21,7 +21,7 @@ #include "rtlsupportapi.h" #include "wine/asm.h" -#ifndef __x86_64__ +#ifdef __i386__ #undef RTTI_USE_RVA #else #define RTTI_USE_RVA 1 diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 98579dfa991..984a277ed12 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1118,7 +1118,7 @@ __ASM_BLOCK_END void init_concurrency_details(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Concurrent_queue_base_v4_rtti(base); init__Runtime_object_rtti(base); #endif diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 3d569d8d855..5c8e5e85e18 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1497,7 +1497,7 @@ void DECLSPEC_NORETURN throw_failure(const char *str) void init_exception(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_exception_rtti(base); init_bad_alloc_rtti(base); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1240bb537c9..25b5d7fe1a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15837,7 +15837,7 @@ void* __thiscall _Winit_op_assign(void *this, void *rhs) void init_io(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b6af02dea42..4eaf679139c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -13336,7 +13336,7 @@ __ASM_BLOCK_END void init_locale(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Facet_base_rtti(base); init_locale_facet_rtti(base); init_locale__Locimp_rtti(base); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index e8998383ecc..a1c9c7f0646 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1781,7 +1781,7 @@ __ASM_BLOCK_END void init_misc(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA #if _MSVCP_VER >= 100 init_error_category_rtti(base); init_generic_category_rtti(base);

1 0

Alexandre Julliard : msvcrt: Use RVAs in rtti and exception data on all platforms except i386.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a794b0224e27f91bf0855cd7376d6af3de44523d URL: https://gitlab.winehq.org/wine/wine/-/commit/a794b0224e27f91bf0855cd7376d6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 13:50:39 2024 +0200 msvcrt: Use RVAs in rtti and exception data on all platforms except i386. --- dlls/concrt140/concrt140.c | 2 +- dlls/concrt140/details.c | 2 +- dlls/msvcr90/tests/msvcr90.c | 10 +++++----- dlls/msvcrt/concurrency.c | 2 +- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/cxx.h | 2 +- dlls/msvcrt/msvcrt.h | 3 +-- dlls/msvcrt/tests/cpp.c | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.c b/dlls/concrt140/concrt140.c index 72d8da0dd62..75b4ae24581 100644 --- a/dlls/concrt140/concrt140.c +++ b/dlls/concrt140/concrt140.c @@ -140,7 +140,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { case DLL_PROCESS_ATTACH: if (!init_cxx_funcs()) return FALSE; -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_exception_rtti((char*)inst); init_range_error_rtti((char*)inst); init_runtime_error_rtti((char*)inst); diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 978a7a8f96e..a8e7478b9a6 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1100,7 +1100,7 @@ __ASM_BLOCK_END void init_concurrency_details(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Concurrent_queue_base_v4_rtti(base); init__Runtime_object_rtti(base); #endif diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0b274fd694f..6a584d81b04 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -234,7 +234,7 @@ typedef struct typedef void (*cxx_copy_ctor)(void); /* complete information about a C++ type */ -#ifndef __x86_64__ +#ifdef __i386__ typedef struct __cxx_type_info { UINT flags; /* flags (see CLASS_* flags below) */ @@ -255,7 +255,7 @@ typedef struct __cxx_type_info #endif /* table of C++ types that apply for a given object */ -#ifndef __x86_64__ +#ifdef __i386__ typedef struct __cxx_type_info_table { UINT count; /* number of types */ @@ -270,7 +270,7 @@ typedef struct __cxx_type_info_table #endif /* type information for an exception object */ -#ifndef __x86_64__ +#ifdef __i386__ typedef struct __cxx_exception_type { UINT flags; /* TYPE_FLAG flags */ @@ -1489,7 +1489,7 @@ static void test_access_s(void) ok(errno == ENOENT, "got %x\n", res); } -#ifndef __x86_64__ +#ifdef __i386__ #define EXCEPTION_REF(instance, name) &instance.name #else #define EXCEPTION_REF(instance, name) FIELD_OFFSET(struct _exception_data, name) @@ -1521,7 +1521,7 @@ static void test_is_exception_typeof(void) int ret; -#ifdef __x86_64__ +#ifndef __i386__ rec.NumberParameters = 4; rec.ExceptionInformation[3] = (ULONG_PTR)&exception_data; #endif diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f075c685326..39059d66b38 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3775,7 +3775,7 @@ __ASM_BLOCK_END void msvcrt_init_concurrency(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_cexception_rtti(base); init_improper_lock_rtti(base); init_improper_scheduler_attach_rtti(base); diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 7e0d3f69396..2db4ef32e99 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -573,7 +573,7 @@ DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor ) void msvcrt_init_exception(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_exception_rtti(base); #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index c0b43f78256..8037d7def56 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -21,7 +21,7 @@ #include "rtlsupportapi.h" #include "wine/asm.h" -#ifndef __x86_64__ +#ifdef __i386__ #undef RTTI_USE_RVA #else #define RTTI_USE_RVA 1 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fe626e2e79f..dd7fb5895a0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -117,11 +117,10 @@ BOOL __cdecl __CxxRegisterExceptionObject(EXCEPTION_POINTERS*, cxx_frame_info*); void __cdecl __CxxUnregisterExceptionObject(cxx_frame_info*, BOOL); void CDECL __DestructExceptionObject(EXCEPTION_RECORD*); -#if defined(__x86_64__) && _MSVCR_VER>=140 void** __cdecl __current_exception(void); int* __cdecl __processing_throw(void); -void __cdecl terminate(void); +#if defined(__x86_64__) && _MSVCR_VER>=140 BOOL msvcrt_init_handler4(void); void msvcrt_attach_handler4(void); void msvcrt_free_handler4(void); diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 29bb126bcda..bfc092e0591 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -869,7 +869,7 @@ static inline void/*rtti_object_locator*/ *get_obj_locator( void *cppobj ) return (void *)vtable[-1]; } -#ifndef __x86_64__ +#ifdef __i386__ #define DEFINE_RTTI_REF(type, name) type *name #define RTTI_REF(instance, name) &instance.name #define RTTI_REF_SIG0(instance, name, base) RTTI_REF(instance, name) @@ -970,7 +970,7 @@ static void test_rtti(void) exception e,b; void *casted; BOOL old_signature; -#ifdef __x86_64__ +#ifndef __i386__ char *base = (char*)GetModuleHandleW(NULL); #endif

1 0

Esme Povirk : gdiplus: Don't call GetDeviceCaps for NULL dc.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: d41a1f0183f5686fa3ed1b42c4de07e393833925 URL: https://gitlab.winehq.org/wine/wine/-/commit/d41a1f0183f5686fa3ed1b42c4de07… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 11:52:56 2024 -0500 gdiplus: Don't call GetDeviceCaps for NULL dc. --- dlls/gdiplus/graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 58fa129b504..14e09e7cc47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -519,7 +519,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ if(!hbitmap || !temp_bits) goto done; - if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + if ((graphics->hdc && + GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4);

1 0

Esme Povirk : gdiplus: Do not store HDC on HWND Graphics objects.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: f20a1bb94fd567b39b3cce1a52c88edc7efca811 URL: https://gitlab.winehq.org/wine/wine/-/commit/f20a1bb94fd567b39b3cce1a52c88e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 11:47:09 2024 -0500 gdiplus: Do not store HDC on HWND Graphics objects. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e25f60de78e..d247b973b3b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -665,7 +665,7 @@ static inline void image_unlock(GpImage *image) static inline BOOL has_gdi_dc(GpGraphics *graphics) { - return graphics->hdc != NULL; + return graphics->hdc != NULL || graphics->owndc; } static inline void set_rect(GpRectF *rect, REAL x, REAL y, REAL width, REAL height) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d50379e5943..58fa129b504 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -55,6 +55,14 @@ GpStatus gdi_dc_acquire(GpGraphics *graphics, HDC *hdc) graphics->hdc_refs++; return Ok; } + else if (graphics->owndc) + { + *hdc = graphics->hdc = GetDC(graphics->hwnd); + if (!graphics->hdc) + return OutOfMemory; + graphics->hdc_refs++; + return Ok; + } *hdc = NULL; return InvalidParameter; @@ -64,6 +72,13 @@ void gdi_dc_release(GpGraphics *graphics, HDC hdc) { assert(graphics->hdc_refs > 0); graphics->hdc_refs--; + + if (graphics->owndc && !graphics->hdc_refs) + { + assert(graphics->hdc == hdc); + graphics->hdc = NULL; + ReleaseDC(graphics->hwnd, hdc); + } } static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, @@ -2556,6 +2571,9 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) (*graphics)->hwnd = hwnd; (*graphics)->owndc = TRUE; + ReleaseDC(hwnd, hdc); + (*graphics)->hdc = NULL; + return Ok; } @@ -2610,13 +2628,13 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if (graphics->temp_hdc) { - DeleteDC(graphics->temp_hdc); + if (graphics->owndc) + ReleaseDC(graphics->hwnd, graphics->temp_hdc); + else + DeleteDC(graphics->temp_hdc); graphics->temp_hdc = NULL; } - if(graphics->owndc) - ReleaseDC(graphics->hwnd, graphics->hdc); - LIST_FOR_EACH_ENTRY_SAFE(cont, next, &graphics->containers, GraphicsContainerItem, entry){ list_remove(&cont->entry); delete_container(cont); @@ -7002,6 +7020,13 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); } + else if (graphics->owndc) + { + graphics->temp_hdc = GetDC(graphics->hwnd); + if (!graphics->temp_hdc) + return OutOfMemory; + *hdc = graphics->temp_hdc; + } else if (!graphics->hdc || (graphics->image && graphics->image->type == ImageTypeBitmap)) { @@ -7083,6 +7108,11 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) { stat = METAFILE_ReleaseDC((GpMetafile*)graphics->image, hdc); } + else if (graphics->owndc) + { + ReleaseDC(graphics->hwnd, graphics->temp_hdc); + graphics->temp_hdc = NULL; + } else if (graphics->temp_hdc == hdc) { DWORD* pos;

1 0

Esme Povirk : gdiplus: Bracket HDC use in gdi_transform_acquire/release.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 8c04e7c0cceb34241b7276aee358987620d4502f URL: https://gitlab.winehq.org/wine/wine/-/commit/8c04e7c0cceb34241b7276aee35898… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 21:07:29 2024 +0000 gdiplus: Bracket HDC use in gdi_transform_acquire/release. --- dlls/gdiplus/graphics.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4dd33e5616b..d50379e5943 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7154,14 +7154,21 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) GpStatus gdi_transform_acquire(GpGraphics *graphics) { - if (graphics->gdi_transform_acquire_count == 0 && graphics->hdc) + if (graphics->gdi_transform_acquire_count == 0 && has_gdi_dc(graphics)) { - graphics->gdi_transform_save = SaveDC(graphics->hdc); - ModifyWorldTransform(graphics->hdc, NULL, MWT_IDENTITY); - SetGraphicsMode(graphics->hdc, GM_COMPATIBLE); - SetMapMode(graphics->hdc, MM_TEXT); - SetWindowOrgEx(graphics->hdc, 0, 0, NULL); - SetViewportOrgEx(graphics->hdc, 0, 0, NULL); + HDC hdc; + GpStatus stat; + + stat = gdi_dc_acquire(graphics, &hdc); + if (stat != Ok) + return stat; + + graphics->gdi_transform_save = SaveDC(hdc); + ModifyWorldTransform(hdc, NULL, MWT_IDENTITY); + SetGraphicsMode(hdc, GM_COMPATIBLE); + SetMapMode(hdc, MM_TEXT); + SetWindowOrgEx(hdc, 0, 0, NULL); + SetViewportOrgEx(hdc, 0, 0, NULL); } graphics->gdi_transform_acquire_count++; return Ok; @@ -7177,6 +7184,7 @@ GpStatus gdi_transform_release(GpGraphics *graphics) if (graphics->gdi_transform_acquire_count == 1 && graphics->hdc) { RestoreDC(graphics->hdc, graphics->gdi_transform_save); + gdi_dc_release(graphics, graphics->hdc); } graphics->gdi_transform_acquire_count--; return Ok;

1 0