[PATCH v2 8/9] gdi32: Move ntgdi functions to Unix library.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 4 + dlls/gdi32/bitmap.c | 4 + dlls/gdi32/brush.c | 6 +- dlls/gdi32/clipping.c | 4 + dlls/gdi32/dc.c | 6 +- dlls/gdi32/dib.c | 4 + dlls/gdi32/dibdrv/bitblt.c | 4 + dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 4 + dlls/gdi32/dibdrv/objects.c | 4 + dlls/gdi32/dibdrv/opengl.c | 11 +- dlls/gdi32/dibdrv/primitives.c | 4 + dlls/gdi32/driver.c | 14 +- dlls/gdi32/emfdrv.c | 6 +- dlls/gdi32/font.c | 20 +- dlls/gdi32/freetype.c | 28 +- dlls/gdi32/gdi_private.h | 12 +- dlls/gdi32/gdiobj.c | 237 +++++++- dlls/gdi32/mapping.c | 4 + dlls/gdi32/ntgdi_private.h | 19 +- dlls/gdi32/objects.c | 18 + dlls/gdi32/painting.c | 4 + dlls/gdi32/palette.c | 4 + dlls/gdi32/path.c | 4 + dlls/gdi32/pen.c | 4 + dlls/gdi32/printdrv.c | 4 + dlls/gdi32/region.c | 4 + dlls/gdi32/vertical.c | 4 + dlls/gdi32/vulkan.c | 4 + dlls/gdi32/win32u_private.h | 273 +++++++++ dlls/gdi32/wrappers.c | 1016 +++++++++++++++++++++++++++++++- 32 files changed, 1655 insertions(+), 87 deletions(-)
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=98971 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/gdi32/font.c:4137 error: patch failed: dlls/gdi32/dc.c:628 error: patch failed: dlls/gdi32/driver.c:289 error: patch failed: dlls/gdi32/driver.c:65 error: patch failed: dlls/gdi32/driver.c:84 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/gdi32/font.c:4137 error: patch failed: dlls/gdi32/dc.c:628 error: patch failed: dlls/gdi32/driver.c:289 error: patch failed: dlls/gdi32/driver.c:65 error: patch failed: dlls/gdi32/driver.c:84 Task: Patch failed to apply
Jacek Caban <jacek(a)codeweavers.com> writes:
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 4 + dlls/gdi32/bitmap.c | 4 + dlls/gdi32/brush.c | 6 +- dlls/gdi32/clipping.c | 4 + dlls/gdi32/dc.c | 6 +- dlls/gdi32/dib.c | 4 + dlls/gdi32/dibdrv/bitblt.c | 4 + dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 4 + dlls/gdi32/dibdrv/objects.c | 4 + dlls/gdi32/dibdrv/opengl.c | 11 +- dlls/gdi32/dibdrv/primitives.c | 4 + dlls/gdi32/driver.c | 14 +- dlls/gdi32/emfdrv.c | 6 +- dlls/gdi32/font.c | 20 +- dlls/gdi32/freetype.c | 28 +- dlls/gdi32/gdi_private.h | 12 +- dlls/gdi32/gdiobj.c | 237 +++++++- dlls/gdi32/mapping.c | 4 + dlls/gdi32/ntgdi_private.h | 19 +- dlls/gdi32/objects.c | 18 + dlls/gdi32/painting.c | 4 + dlls/gdi32/palette.c | 4 + dlls/gdi32/path.c | 4 + dlls/gdi32/pen.c | 4 + dlls/gdi32/printdrv.c | 4 + dlls/gdi32/region.c | 4 + dlls/gdi32/vertical.c | 4 + dlls/gdi32/vulkan.c | 4 + dlls/gdi32/win32u_private.h | 273 +++++++++ dlls/gdi32/wrappers.c | 1016 +++++++++++++++++++++++++++++++- 32 files changed, 1655 insertions(+), 87 deletions(-)
This is breaking the tests: tools/runtest -q -P wine -T . -M services.exe -p programs/services/tests/services.exe_test.exe service && touch programs/services/tests/service.ok 0138:err:gdi:__wine_set_display_driver Could not create graphics driver wine: Unhandled page fault on execute access to 00000000 at address 00000000 (thread 0138), starting debugger... 0050:err:service:process_send_command service protocol error - failed to read pipe r = 0 count = 0! service.c:485: Test failed: ControlService failed: 109 -- Alexandre Julliard julliard(a)winehq.org
On 9/28/21 9:50 PM, Alexandre Julliard wrote:
Jacek Caban <jacek(a)codeweavers.com> writes:
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 4 + dlls/gdi32/bitmap.c | 4 + dlls/gdi32/brush.c | 6 +- dlls/gdi32/clipping.c | 4 + dlls/gdi32/dc.c | 6 +- dlls/gdi32/dib.c | 4 + dlls/gdi32/dibdrv/bitblt.c | 4 + dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 4 + dlls/gdi32/dibdrv/objects.c | 4 + dlls/gdi32/dibdrv/opengl.c | 11 +- dlls/gdi32/dibdrv/primitives.c | 4 + dlls/gdi32/driver.c | 14 +- dlls/gdi32/emfdrv.c | 6 +- dlls/gdi32/font.c | 20 +- dlls/gdi32/freetype.c | 28 +- dlls/gdi32/gdi_private.h | 12 +- dlls/gdi32/gdiobj.c | 237 +++++++- dlls/gdi32/mapping.c | 4 + dlls/gdi32/ntgdi_private.h | 19 +- dlls/gdi32/objects.c | 18 + dlls/gdi32/painting.c | 4 + dlls/gdi32/palette.c | 4 + dlls/gdi32/path.c | 4 + dlls/gdi32/pen.c | 4 + dlls/gdi32/printdrv.c | 4 + dlls/gdi32/region.c | 4 + dlls/gdi32/vertical.c | 4 + dlls/gdi32/vulkan.c | 4 + dlls/gdi32/win32u_private.h | 273 +++++++++ dlls/gdi32/wrappers.c | 1016 +++++++++++++++++++++++++++++++- 32 files changed, 1655 insertions(+), 87 deletions(-) This is breaking the tests:
tools/runtest -q -P wine -T . -M services.exe -p programs/services/tests/services.exe_test.exe service && touch programs/services/tests/service.ok 0138:err:gdi:__wine_set_display_driver Could not create graphics driver wine: Unhandled page fault on execute access to 00000000 at address 00000000 (thread 0138), starting debugger... 0050:err:service:process_send_command service protocol error - failed to read pipe r = 0 count = 0! service.c:485: Test failed: ControlService failed: 109
Sorry about that, I sent a new version that fixes it. Thanks, Jacek
participants (4)
-
Alexandre Julliard -
Huw Davies -
Jacek Caban -
Marvin