November 2023 - Wine-Commits

Bartosz Kosiorek : gdiplus/graphicspath: Avoid computation overflow and underflow by using hypotf.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 08653cf36870e595f4cda3012c42e8f417a3a354 URL: https://gitlab.winehq.org/wine/wine/-/commit/08653cf36870e595f4cda3012c42e8… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Nov 24 17:22:16 2023 +0100 gdiplus/graphicspath: Avoid computation overflow and underflow by using hypotf. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45123 By using sqrt(a * a + b * b), for large (or small) a or b, there is a possibility of overflow (underflow), although the result itself is not that big to cause overflow. To overcome this problem, there are implementations of hypotenuse that do not use power of 2, and use other methods to calculate the result. To calculate a ⊕ b, you can easily use hypotf(a,b). https://en.cppreference.com/w/cpp/numeric/math/hypot --- dlls/gdiplus/graphicspath.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 63f120a6aba..32edf408d9d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -201,7 +201,7 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R * x0(y2 - y1) + y0(x1 - x2) + (x2*y1 - x1*y2) */ area_triangle = (pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y); - distance_start_end = sqrtf(powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0)); + distance_start_end = hypotf(pt.Y - pt_st.Y, pt_st.X - pt.X); if(fabs(area_triangle) <= (0.5 * flatness * distance_start_end)){ continue; } @@ -1867,7 +1867,7 @@ static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL distance = pen_width / 2.0; REAL bevel_dx, bevel_dy; @@ -1903,8 +1903,8 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * if ((p2->X - p1->X) * (p3->Y - p1->Y) > (p2->Y - p1->Y) * (p3->X - p1->X)) { float distance = pen_width / 2.0; - float length_0 = sqrtf((p2->X-p1->X)*(p2->X-p1->X)+(p2->Y-p1->Y)*(p2->Y-p1->Y)); - float length_1 = sqrtf((p3->X-p2->X)*(p3->X-p2->X)+(p3->Y-p2->Y)*(p3->Y-p2->Y)); + float length_0 = hypotf(p2->X - p1->X, p2->Y - p1->Y); + float length_1 = hypotf(p3->X - p2->X, p3->Y - p2->Y); float dx0 = distance * (p2->X - p1->X) / length_0; float dy0 = distance * (p2->Y - p1->Y) / length_0; float dx1 = distance * (p3->X - p2->X) / length_1; @@ -1954,7 +1954,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL distance = pen_width / 2.0; REAL bevel_dx, bevel_dy; REAL extend_dx, extend_dy; @@ -1989,7 +1989,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL distance = pen_width / 2.0; REAL dx, dy, dx2, dy2; const REAL control_point_distance = 0.5522847498307935; /* 4/3 * (sqrt(2) - 1) */ @@ -2034,7 +2034,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL distance = pen_width / 2.0; REAL dx, dy; @@ -2074,7 +2074,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL distance = pen_width / sqrtf(2.0); REAL par_dx, par_dy; REAL perp_dx, perp_dy; @@ -2099,7 +2099,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL dx, dy, dx2, dy2; const REAL control_point_distance = 0.55228475; /* 4/3 * (sqrt(2) - 1) */ @@ -2151,7 +2151,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; - REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL par_dx, par_dy; REAL perp_dx, perp_dy; @@ -2175,7 +2175,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, { REAL segment_dy = nextpoint->Y - endpoint->Y; REAL segment_dx = nextpoint->X - endpoint->X; - REAL segment_length = sqrtf(segment_dy * segment_dy + segment_dx * segment_dx); + REAL segment_length = hypotf(segment_dy, segment_dx); REAL par_dx = pen_width * segment_dx / segment_length; REAL par_dy = pen_width * segment_dy / segment_length; REAL perp_dx = -par_dy; @@ -2407,7 +2407,7 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, segment_dy = path->pathdata.Points[j].Y - path->pathdata.Points[i].Y; segment_dx = path->pathdata.Points[j].X - path->pathdata.Points[i].X; - segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + segment_length = hypotf(segment_dy, segment_dx); segment_pos = 0.0; while (1)

1 0

Esme Povirk : user32/tests: Add a simpler test for SetParent's internal message.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 9587214b205c6cabb8df9812a2e67f22c5531368 URL: https://gitlab.winehq.org/wine/wine/-/commit/9587214b205c6cabb8df9812a2e67f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 24 20:29:35 2023 +0000 user32/tests: Add a simpler test for SetParent's internal message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54037 test_SendMessage_other_thread(2), which is supposed to show that Windows doesn't use an internal sent message for SetParent, tacks this onto another more complex test, which introduces a race condition (see Comment 2 on the bug). I am not sure if it can be fixed in the existing function, perhaps it can and I just can't keep track of all the moving parts well enough, but I see no need to make it so difficult. --- dlls/user32/tests/msg.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8517ede31dd..66db16f2392 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19856,6 +19856,55 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.getmessage_complete); } +static DWORD WINAPI SetParent_thread(void *param) +{ + struct wnd_event *wnd_event = param; + + if (winetest_debug > 1) trace("thread: started\n"); + SetEvent(wnd_event->start_event); + + /* this leads to sending an internal message under Wine */ + if (winetest_debug > 1) trace("thread: call SetParent\n"); + SetParent(wnd_event->hwnd, wnd_event->hwnd); + + return 0; +} + +static void test_setparent_status(void) +{ + HANDLE hthread; + struct wnd_event wnd_event; + DWORD ret; + + wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); + + wnd_event.hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event.hwnd != 0, "CreateWindowEx failed\n"); + + ret = GetQueueStatus(QS_SENDMESSAGE); + ok(ret == 0, "wrong status %08lx\n", ret); + + hthread = CreateThread(NULL, 0, SetParent_thread, &wnd_event, 0, NULL); + ok(hthread != NULL, "CreateThread failed, error %ld\n", GetLastError()); + + WaitForSingleObject(wnd_event.start_event, INFINITE); + + /* background thread's SetParent should complete allowing the thread to exit */ + ret = MsgWaitForMultipleObjects(1, &hthread, FALSE, 1000, QS_SENDMESSAGE); + todo_wine ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %08lx\n", ret); + + /* QS_SENDMESSAGE status should not have been set by SetParent */ + ret = GetQueueStatus(QS_SENDMESSAGE); + todo_wine ok(ret == 0, "wrong status %08lx\n", ret); + + DestroyWindow(wnd_event.hwnd); + + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + CloseHandle(wnd_event.start_event); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -20248,6 +20297,7 @@ START_TEST(msg) test_winevents(); test_SendMessage_other_thread(1); test_SendMessage_other_thread(2); + test_setparent_status(); test_InSendMessage(); test_SetFocus(); test_SetParent();

1 0

Rémi Bernon : gitlab: Only run the modifieds tests on Windows for an MR.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 1a3a026d24affa82ffb1a26a10f67764d39797eb URL: https://gitlab.winehq.org/wine/wine/-/commit/1a3a026d24affa82ffb1a26a10f677… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 10 15:13:52 2023 +0100 gitlab: Only run the modifieds tests on Windows for an MR. --- tools/gitlab/build.yml | 4 ++++ tools/gitlab/test.yml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index af9abb7ebc0..81d0e3f969c 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -36,6 +36,8 @@ build-linux: - usr/local/ script: - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux + - git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '/\/tests\//!d; s@/tests/.*@/tests/Makefile.in@' | + (xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s(a).dll@@; s(a).*= *@@' >usr/local/share/wine/winetest.args build-mac: extends: .wine-build @@ -64,9 +66,11 @@ build-winetest: artifacts: name: winetest paths: + - winetest.args - winetest.exe - winetest64.exe script: + - mv usr/local/share/wine/winetest.args winetest.args - mv usr/local/lib/wine/i386-windows/winetest.exe winetest.exe - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 64ad90c76cb..756c4a41ae5 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -72,7 +72,6 @@ test-win10-21h2-32: interruptible: true variables: GIT_STRATEGY: none - EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs: @@ -80,7 +79,8 @@ test-win10-21h2-32: tags: - win10-21h2 script: - - ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS >winetest.log + - $WINETEST_ARGS = Get-Content ./winetest.args + - if ($WINETEST_ARGS.count -gt 0) { ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL @WINETEST_ARGS >winetest.log } else { echo $null >winetest.log } after_script: - Get-Content ./winetest.log artifacts: @@ -93,7 +93,6 @@ test-win10-21h2-64: interruptible: true variables: GIT_STRATEGY: none - INCLUDE_TESTS: "dinput" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs: @@ -101,7 +100,8 @@ test-win10-21h2-64: tags: - win10-21h2 script: - - ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS >winetest.log + - $WINETEST_ARGS = Get-Content ./winetest.args + - if ($WINETEST_ARGS.count -gt 0) { ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL @WINETEST_ARGS >winetest.log } else { echo $null >winetest.log } after_script: - Get-Content ./winetest.log artifacts:

1 0

Zhiyi Zhang : oledb32: Fix a memory leak (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 6aef5f8916d53791c1cae4a8671273f90a161842 URL: https://gitlab.winehq.org/wine/wine/-/commit/6aef5f8916d53791c1cae4a8671273… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:44:21 2023 +0800 oledb32: Fix a memory leak (Coverity). --- dlls/oledb32/datainit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b185ff4a128..38ed5ce0e53 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -577,6 +577,7 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr if (FAILED(hr)) { ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); + SysFreeString(provider_string); free_dbpropset(1, *propset); *propset = NULL; return hr;

1 0

Rémi Bernon : gitlab: Add windows tests to MR pipeline.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 61faaf7ec0b4cbe6aaccb531464eaecc43cef668 URL: https://gitlab.winehq.org/wine/wine/-/commit/61faaf7ec0b4cbe6aaccb531464eae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 10 15:13:52 2023 +0100 gitlab: Add windows tests to MR pipeline. --- tools/gitlab/build.yml | 20 +++++++++++++++++++- tools/gitlab/test.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 8a5d5b40ac1..af9abb7ebc0 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -52,6 +52,24 @@ build-mac: - export PATH="/usr/local/opt/ccache/libexec:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac +build-winetest: + stage: build + image: $CI_REGISTRY/wine/wine:debian-bookworm + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-linux + variables: + GIT_STRATEGY: none + artifacts: + name: winetest + paths: + - winetest.exe + - winetest64.exe + script: + - mv usr/local/lib/wine/i386-windows/winetest.exe winetest.exe + - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe + build-daily-linux: extends: .wine-build rules: @@ -63,7 +81,7 @@ build-daily-linux: script: - ./tools/gitlab/build-linux -build-winetest: +build-daily-winetest: stage: build image: $CI_REGISTRY/wine/wine:debian-bookworm rules: diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 590eacb2438..64ad90c76cb 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -67,6 +67,48 @@ test-linux-32: - export WINETEST_COLOR=1 - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS +test-win10-21h2-32: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-winetest + tags: + - win10-21h2 + script: + - ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS >winetest.log + after_script: + - Get-Content ./winetest.log + artifacts: + when: always + paths: + - winetest.log + +test-win10-21h2-64: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + INCLUDE_TESTS: "dinput" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-winetest + tags: + - win10-21h2 + script: + - ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS >winetest.log + after_script: + - Get-Content ./winetest.log + artifacts: + when: always + paths: + - winetest.log + debian-32: extends: .wine-test rules: @@ -93,7 +135,7 @@ win10-21h2-32: rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - - job: build-winetest + - job: build-daily-winetest tags: - win10-21h2 script: @@ -107,7 +149,7 @@ win10-21h2-64: rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - - job: build-winetest + - job: build-daily-winetest tags: - win10-21h2 script:

1 0

Zhiyi Zhang : dplayx: Fix a memory leak (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 40305ee11ef27d4e02e7d5637d73c9f1baab6557 URL: https://gitlab.winehq.org/wine/wine/-/commit/40305ee11ef27d4e02e7d5637d73c9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 22:35:20 2023 +0800 dplayx: Fix a memory leak (Coverity). --- dlls/dplayx/dplay.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 6945e34b7e8..9b287001e9e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4198,6 +4198,7 @@ static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf, if( FAILED(hr) ) { ERR( "can't create address: %s\n", DPLAYX_HresultToString( hr ) ); + free( *lplpAddrBuf ); return FALSE; }

1 0

Bartosz Kosiorek : gdiplus/font: Avoid computation overflow and underflow by using hypotf.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 1848fd337542d664ffca38d5b790bcdcf0945594 URL: https://gitlab.winehq.org/wine/wine/-/commit/1848fd337542d664ffca38d5b790bc… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Nov 24 21:22:47 2023 +0100 gdiplus/font: Avoid computation overflow and underflow by using hypotf. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45122 --- dlls/gdiplus/graphics.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index cc8411d54f7..16316285cf7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -274,7 +274,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) scale_x = graphics->worldtrans.matrix[0] + graphics->worldtrans.matrix[2]; scale_y = graphics->worldtrans.matrix[1] + graphics->worldtrans.matrix[3]; - width = sqrt(scale_x * scale_x + scale_y * scale_y) / sqrt(2.0); + width = hypotf(scale_x, scale_y) / sqrt(2.0); width *= units_to_pixels(pen->width, pen->unit == UnitWorld ? graphics->unit : pen->unit, graphics->xres, graphics->printer_display); @@ -285,8 +285,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) pt[1].X = 1.0; pt[1].Y = 1.0; gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceDevice, pt, 2); - width *= sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + - (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); + width *= hypotf(pt[1].X - pt[0].X, pt[1].Y - pt[0].Y) / sqrt(2.0); } if(pen->dash == DashStyleCustom){ @@ -1844,7 +1843,7 @@ static void shorten_line_percent(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL per if((y1 == *y2) && (x1 == *x2)) return; - dist = sqrt((*x2 - x1) * (*x2 - x1) + (*y2 - y1) * (*y2 - y1)) * -percent; + dist = hypotf(*x2 - x1, *y2 - y1) * -percent; theta = gdiplus_atan2((*y2 - y1), (*x2 - x1)); dx = cos(theta) * dist; dy = sin(theta) * dist; @@ -1865,7 +1864,7 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) if(dx == 0 && dy == 0) return; - percent = amt / sqrt(dx * dx + dy * dy); + percent = amt / hypotf(dx, dy); if(percent >= 1.0){ *x2 = x1; *y2 = y1; @@ -1913,7 +1912,7 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt, BOOL rev) dx = pt[fourth].X - origx; dy = pt[fourth].Y - origy; - diff = sqrt(dx * dx + dy * dy); + diff = hypotf(dx, dy); percent += 0.0005 * amt; } } @@ -5372,11 +5371,9 @@ void transform_properties(GpGraphics *graphics, GDIPCONST GpMatrix *matrix, BOOL gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); if (rel_width) - *rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + *rel_width = hypotf(pt[1].Y - pt[0].Y, pt[1].X - pt[0].X); if (rel_height) - *rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + *rel_height = hypotf(pt[2].Y - pt[0].Y, pt[2].X - pt[0].X); if (angle) *angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); } @@ -7110,10 +7107,8 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT GdipTransformMatrixPoints(&xform, pt, 3); } gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); - rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); - rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + rel_width = hypotf(pt[1].Y - pt[0].Y, pt[1].X - pt[0].X); + rel_height = hypotf(pt[2].Y - pt[0].Y, pt[2].X - pt[0].X); if (flags & DriverStringOptionsCmapLookup) {

1 0

Esme Povirk : user32/tests: Remove test_SendMessage_other_thread(2).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 886b778aaa13c5b36a6996c76105f5a80e97446e URL: https://gitlab.winehq.org/wine/wine/-/commit/886b778aaa13c5b36a6996c76105f5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 24 20:40:22 2023 +0000 user32/tests: Remove test_SendMessage_other_thread(2). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54037 --- dlls/user32/tests/msg.c | 48 ++++++------------------------------------------ 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 66db16f2392..0059afcbac7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19732,37 +19732,7 @@ static DWORD WINAPI SendMessage_thread_1(void *param) return 0; } -static DWORD WINAPI SendMessage_thread_2(void *param) -{ - struct wnd_event *wnd_event = param; - DWORD ret; - - if (winetest_debug > 1) trace("thread: starting\n"); - WaitForSingleObject(wnd_event->start_event, INFINITE); - - if (winetest_debug > 1) trace("thread: call PostMessage\n"); - PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); - - if (winetest_debug > 1) trace("thread: call PostMessage\n"); - PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); - - /* this leads to sending an internal message under Wine */ - if (winetest_debug > 1) trace("thread: call SetParent\n"); - SetParent(wnd_event->hwnd, wnd_event->hwnd); - - if (winetest_debug > 1) trace("thread: call SendMessage\n"); - SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); - SetEvent(wnd_event->stop_event); - ret = WaitForSingleObject(wnd_event->getmessage_complete, 100); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, ret:%lx\n", ret); - - if (winetest_debug > 1) trace("thread: call SendMessage\n"); - SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); - - return 0; -} - -static void test_SendMessage_other_thread(int thread_n) +static void test_SendMessage_other_thread(void) { DWORD qs_all_input = QS_ALLINPUT & ~QS_RAWINPUT; HANDLE hthread; @@ -19770,8 +19740,6 @@ static void test_SendMessage_other_thread(int thread_n) DWORD tid, ret; MSG msg; - winetest_push_context("thread_%i", thread_n); - wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); wnd_event.stop_event = CreateEventA(NULL, 0, 0, NULL); wnd_event.getmessage_complete = CreateEventA(NULL, 0, 0, NULL); @@ -19780,7 +19748,7 @@ static void test_SendMessage_other_thread(int thread_n) 100, 100, 200, 200, 0, 0, 0, NULL); ok(wnd_event.hwnd != 0, "CreateWindowEx failed\n"); - hthread = CreateThread(NULL, 0, thread_n == 1 ? SendMessage_thread_1 : SendMessage_thread_2, &wnd_event, 0, &tid); + hthread = CreateThread(NULL, 0, SendMessage_thread_1, &wnd_event, 0, &tid); ok(hthread != NULL, "CreateThread failed, error %ld\n", GetLastError()); CloseHandle(hthread); @@ -19807,12 +19775,11 @@ static void test_SendMessage_other_thread(int thread_n) GetMessageA(&msg, 0, 0, 0); ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + ok_sequence(send_message_1, "SendMessage from other thread 1", FALSE); SetEvent(wnd_event.getmessage_complete); ret = WaitForSingleObject(wnd_event.stop_event, 100); - todo_wine_if (thread_n == 2) ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, ret:%lx\n", ret); /* intentionally yield */ @@ -19829,7 +19796,7 @@ static void test_SendMessage_other_thread(int thread_n) ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_3, "SendMessage from other thread 3", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -19838,7 +19805,7 @@ static void test_SendMessage_other_thread(int thread_n) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { ok(ignore_message(msg.message), "got unexpected message %04x from PeekMessageA\n", msg.message); } - ok_sequence(send_message_5, "SendMessage from other thread 5", thread_n == 2); + ok_sequence(send_message_5, "SendMessage from other thread 5", FALSE); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08lx\n", ret); @@ -19849,8 +19816,6 @@ static void test_SendMessage_other_thread(int thread_n) flush_events(); flush_sequence(); - winetest_pop_context(); - CloseHandle(wnd_event.start_event); CloseHandle(wnd_event.stop_event); CloseHandle(wnd_event.getmessage_complete); @@ -20295,8 +20260,7 @@ START_TEST(msg) if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" ); test_winevents(); - test_SendMessage_other_thread(1); - test_SendMessage_other_thread(2); + test_SendMessage_other_thread(); test_setparent_status(); test_InSendMessage(); test_SetFocus();

1 0

Jacek Caban : configure: Use --no-default-config option on clang when available.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 471d7178ae019df0bf5db03b73e6ac7fd3ff99f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/471d7178ae019df0bf5db03b73e6ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 19:59:38 2023 +0100 configure: Use --no-default-config option on clang when available. Some distros arbitrary flags into clang config files without guarding it for applicable targets, which breaks cross compilation. --- configure | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 19 ++++++++++++++----- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e6fa429c8bf..3b8ec628bfb 100755 --- a/configure +++ b/configure @@ -10654,10 +10654,46 @@ then : esac fi llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" + llvm_extra_ldflags="" case $llvm_target in *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; esac - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5 +printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs $llvm_extra_cflags $llvm_cflags --no-default-config" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + llvm_extra_cflags="$llvm_extra_cflags --no-default-config" + llvm_extra_ldflags="--no-default-config" +else $as_nop + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags" >&5 printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags... " >&6; } if eval test \${$as_ac_var+y} @@ -10689,11 +10725,19 @@ eval ac_res=\$$as_ac_var printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : - target=$llvm_target - eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" - as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" - CFLAGS="$llvm_extra_cflags $llvm_cflags" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags $llvm_cflags" +else $as_nop + llvm_extra_cflags="" +fi } fi } + if test -n "$llvm_extra_cflags" + then + target=$llvm_target + eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" + as_fn_append ${wine_arch}_LDFLAGS " $llvm_extra_ldflags" + CFLAGS="$llvm_extra_cflags $llvm_cflags" + fi eval "${wine_arch}_TARGET=\$target" fi diff --git a/configure.ac b/configure.ac index 8d92e4c8ab2..074086c586b 100644 --- a/configure.ac +++ b/configure.ac @@ -893,14 +893,23 @@ do esac fi llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" + llvm_extra_ldflags="" case $llvm_target in *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; esac - WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags], - [target=$llvm_target - AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) - AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) - CFLAGS="$llvm_extra_cflags $llvm_cflags"]) + WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags --no-default-config], + [llvm_extra_cflags="$llvm_extra_cflags --no-default-config" + llvm_extra_ldflags="--no-default-config"], + [WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags],[], + [llvm_extra_cflags=""])]) + if test -n "$llvm_extra_cflags" + then + target=$llvm_target + AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) + AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) + AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" $llvm_extra_ldflags"]) + CFLAGS="$llvm_extra_cflags $llvm_cflags" + fi AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc])

1 0

Jacek Caban : winegcc: Support --no-default-config argument.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 0c7a1be11bb562b0e386b23cd4e05894a6fb5efc URL: https://gitlab.winehq.org/wine/wine/-/commit/0c7a1be11bb562b0e386b23cd4e058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 20:37:22 2023 +0100 winegcc: Support --no-default-config argument. --- tools/winegcc/winegcc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dc085a2ed0f..56fe179c92b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -177,6 +177,7 @@ struct options int unwind_tables; int strip; int pic; + int no_default_config; const char* wine_objdir; const char* winebuild; const char* output_name; @@ -299,6 +300,7 @@ static struct strarray build_tool_name( struct options *opts, enum tool tool ) } strarray_add( &ret, "-Wno-unused-command-line-argument" ); strarray_add( &ret, "-fuse-ld=lld" ); + if (opts->no_default_config) strarray_add( &ret, "--no-default-config" ); } return ret; } @@ -1851,6 +1853,11 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", opts.args.str[i]+1) == 0) linking = -1; + else if (!strcmp( "-no-default-config", opts.args.str[i] + 1 )) + { + opts.no_default_config = 1; + raw_compiler_arg = raw_linker_arg = 1; + } else if (is_option( &opts, i, "--sysroot", &option_arg )) { opts.sysroot = option_arg;

1 0