September 2020 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: a62ae1bcc2fa0f6d9bea2afa0e957a2a0595c1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a62ae1bcc2fa0f6d9bea2afa… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Sep 21 23:30:03 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 210a8ef9d5..437128fd4c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-09-16 23:11+0300\n" +"PO-Revision-Date: 2020-09-21 23:29+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6936,16 +6936,12 @@ msgid "No Signature found in file.\n" msgstr "Joks parašas nerastas faile.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Neteisingas lygis.\n" +msgstr "Neteisingas kreipinys.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Reikšmė neprieinama.\n" +msgstr "Išteklius šiuo metu neprieinamas.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30

1 0

Zhiyi Zhang : winex11.drv: Support display orientations for XRandR 1.4 display settings handler.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 4a330b29212402b9700828be82939112bd11a786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a330b29212402b9700828be… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 22 15:02:24 2020 +0800 winex11.drv: Support display orientations for XRandR 1.4 display settings handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 2 +- dlls/winex11.drv/xrandr.c | 156 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 121 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 97db3d445c..462037b2e0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -621,7 +621,7 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - todo_wine ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(devmode)).dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6c16fb29ec..78ad98acd4 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -465,6 +465,55 @@ static unsigned int get_frequency( const XRRModeInfo *mode ) return (mode->dotClock + dots / 2) / dots; } +static DWORD get_orientation( Rotation rotation ) +{ + if (rotation & RR_Rotate_270) return DMDO_270; + if (rotation & RR_Rotate_180) return DMDO_180; + if (rotation & RR_Rotate_90) return DMDO_90; + return DMDO_DEFAULT; +} + +static DWORD get_orientation_count( Rotation rotations ) +{ + DWORD count = 0; + + if (rotations & RR_Rotate_0) ++count; + if (rotations & RR_Rotate_90) ++count; + if (rotations & RR_Rotate_180) ++count; + if (rotations & RR_Rotate_270) ++count; + return count; +} + +static Rotation get_rotation( DWORD orientation ) +{ + return (Rotation)(1 << orientation); +} + +static RRCrtc get_output_free_crtc( XRRScreenResources *resources, XRROutputInfo *output_info ) +{ + XRRCrtcInfo *crtc_info; + INT crtc_idx; + RRCrtc crtc; + + for (crtc_idx = 0; crtc_idx < output_info->ncrtc; ++crtc_idx) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, output_info->crtcs[crtc_idx] ); + if (!crtc_info) + continue; + + if (!crtc_info->noutput) + { + crtc = output_info->crtcs[crtc_idx]; + pXRRFreeCrtcInfo( crtc_info ); + return crtc; + } + + pXRRFreeCrtcInfo( crtc_info ); + } + + return 0; +} + static RECT get_primary_rect( XRRScreenResources *resources ) { XRROutputInfo *output_info = NULL; @@ -1137,7 +1186,8 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) return FALSE; } -static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency ) +static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency, + DWORD orientation ) { mode->dmSize = sizeof(*mode); mode->dmDriverExtra = sizeof(RRMode); @@ -1148,24 +1198,35 @@ static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, D mode->dmFields |= DM_DISPLAYFREQUENCY; mode->dmDisplayFrequency = frequency; } - mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + if (orientation == DMDO_DEFAULT || orientation == DMDO_180) + { + mode->dmPelsWidth = info->width; + mode->dmPelsHeight = info->height; + } + else + { + mode->dmPelsWidth = info->height; + mode->dmPelsHeight = info->width; + } + mode->u1.s2.dmDisplayOrientation = orientation; mode->dmBitsPerPel = depth; - mode->dmPelsWidth = info->width; - mode->dmPelsHeight = info->height; mode->u2.dmDisplayFlags = 0; memcpy( (BYTE *)mode + sizeof(*mode), &info->id, sizeof(info->id) ); } static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count ) { + DWORD frequency, orientation, orientation_count; XRRScreenResources *screen_resources; XRROutputInfo *output_info = NULL; RROutput output = (RROutput)id; + XRRCrtcInfo *crtc_info = NULL; UINT depth_idx, mode_idx = 0; XRRModeInfo *mode_info; DEVMODEW *mode, *modes; + Rotation rotations; BOOL ret = FALSE; - DWORD frequency; + RRCrtc crtc; INT i, j; screen_resources = xrandr_get_screen_resources(); @@ -1184,9 +1245,44 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, goto done; } - /* Allocate space for display modes in different color depths. + crtc = output_info->crtc; + if (!crtc) + crtc = get_output_free_crtc( screen_resources, output_info ); + if (crtc) + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, crtc ); + + /* If the output is connected to a CRTC, use rotations reported by the CRTC */ + if (crtc_info) + { + if (flags & EDS_ROTATEDMODE) + { + rotations = crtc_info->rotations; + } + else + { + /* According to the RandR spec, RRGetCrtcInfo should set the active rotation to Rotate_0 + * when a CRTC is disabled. However, some RandR implementations report 0 in this case */ + rotations = (crtc_info->rotation & 0xf) ? crtc_info->rotation : RR_Rotate_0; + } + } + /* Not connected to CRTC, assume all rotations are supported */ + else + { + if (flags & EDS_ROTATEDMODE) + { + rotations = RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270; + } + else + { + rotations = RR_Rotate_0; + } + } + orientation_count = get_orientation_count( rotations ); + + /* Allocate space for display modes in different color depths and orientations. * Store a RRMode at the end of each DEVMODEW as private driver data */ - modes = heap_calloc( output_info->nmode * DEPTH_COUNT, sizeof(*modes) + sizeof(RRMode) ); + modes = heap_calloc( output_info->nmode * DEPTH_COUNT * orientation_count, + sizeof(*modes) + sizeof(RRMode) ); if (!modes) goto done; @@ -1202,9 +1298,15 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) { - mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + sizeof(RRMode)) * mode_idx); - add_xrandr14_mode( mode, mode_info, depths[depth_idx], frequency ); - ++mode_idx; + for (orientation = DMDO_DEFAULT; orientation <= DMDO_270; ++orientation) + { + if (!((1 << orientation) & rotations)) + continue; + + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + sizeof(RRMode)) * mode_idx); + add_xrandr14_mode( mode, mode_info, depths[depth_idx], frequency, orientation ); + ++mode_idx; + } } break; @@ -1215,6 +1317,8 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, *new_modes = modes; *mode_count = mode_idx; done: + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); if (output_info) pXRRFreeOutputInfo( output_info ); if (screen_resources) @@ -1285,10 +1389,10 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; - mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u1.s2.dmDisplayOrientation = get_orientation( crtc_info->rotation ); mode->dmBitsPerPel = screen_bpp; - mode->dmPelsWidth = mode_info->width; - mode->dmPelsHeight = mode_info->height; + mode->dmPelsWidth = crtc_info->width; + mode->dmPelsHeight = crtc_info->height; mode->u2.dmDisplayFlags = 0; mode->dmDisplayFrequency = get_frequency( mode_info ); /* Convert RandR coordinates to virtual screen coordinates */ @@ -1314,8 +1418,8 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) XRROutputInfo *output_info = NULL; XRRCrtcInfo *crtc_info = NULL; LONG ret = DISP_CHANGE_FAILED; - INT crtc_idx, output_count; Rotation rotation; + INT output_count; RRCrtc crtc = 0; Status status; RRMode rrmode; @@ -1362,26 +1466,7 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) /* Detached, need to find a free CRTC */ else { - for (crtc_idx = 0; crtc_idx < output_info->ncrtc; ++crtc_idx) - { - crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtcs[crtc_idx] ); - if (!crtc_info) - goto done; - - if (!crtc_info->noutput) - { - crtc = output_info->crtcs[crtc_idx]; - pXRRFreeCrtcInfo( crtc_info ); - crtc_info = NULL; - break; - } - - pXRRFreeCrtcInfo( crtc_info ); - crtc_info = NULL; - } - - /* Failed to find a free CRTC */ - if (crtc_idx == output_info->ncrtc) + if (!(crtc = get_output_free_crtc( screen_resources, output_info ))) goto done; } @@ -1396,14 +1481,13 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) { outputs = crtc_info->outputs; output_count = crtc_info->noutput; - rotation = crtc_info->rotation; } else { outputs = &output; output_count = 1; - rotation = RR_Rotate_0; } + rotation = get_rotation( mode->u1.s2.dmDisplayOrientation ); /* According to the RandR spec, the entire CRTC must fit inside the screen. * Since we use the union of all enabled CRTCs to determine the necessary

1 0

Zhiyi Zhang : user32/tests: Add display orientation tests.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: 9501a3d5abb4a93c53e02b41e32bb9964fb3b6b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9501a3d5abb4a93c53e02b41… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 22 15:01:35 2020 +0800 user32/tests: Add display orientation tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7ae10fcf84..0ce27455a6 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -938,6 +938,70 @@ static void test_ChangeDisplaySettingsEx(void) } } + /* Test changing each adapter to every supported display orientation */ + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, EDS_ROTATEDMODE); ++mode) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel || dm2.dmDisplayFrequency != dm.dmDisplayFrequency) + continue; + + if ((dm2.dmDisplayOrientation == DMDO_DEFAULT || dm2.dmDisplayOrientation == DMDO_180) + && (dm2.dmPelsWidth != dm.dmPelsWidth || dm2.dmPelsHeight != dm.dmPelsHeight)) + continue; + + if ((dm2.dmDisplayOrientation == DMDO_90 || dm2.dmDisplayOrientation == DMDO_270) + && (dm2.dmPelsWidth != dm.dmPelsHeight || dm2.dmPelsHeight != dm.dmPelsWidth)) + continue; + + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_RESET, NULL); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change %s to mode %d.\n", devices[device].name, mode); + continue; + } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d.\n", + devices[device].name, mode, res); + flush_events(); + expect_dm(dm2, devices[device].name, mode); + + /* EnumDisplaySettingsEx without EDS_ROTATEDMODE reports modes with current orientation */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (i = 0; EnumDisplaySettingsExA(devices[device].name, i, &dm3, 0); ++i) + { + ok(dm3.dmDisplayOrientation == dm2.dmDisplayOrientation, + "Expected %s display mode %d orientation %d, got %d.\n", + devices[device].name, i, dm2.dmDisplayOrientation, dm3.dmDisplayOrientation); + } + ok(i > 0, "Expected at least one display mode found.\n"); + + if (device == 0) + { + ok(GetSystemMetrics(SM_CXSCREEN) == dm2.dmPelsWidth, "Expected %d, got %d.\n", + dm2.dmPelsWidth, GetSystemMetrics(SM_CXSCREEN)); + ok(GetSystemMetrics(SM_CYSCREEN) == dm2.dmPelsHeight, "Expected %d, got %d.\n", + dm2.dmPelsHeight, GetSystemMetrics(SM_CYSCREEN)); + } + + if (device_count == 1) + { + ok(GetSystemMetrics(SM_CXVIRTUALSCREEN) == dm2.dmPelsWidth, "Expected %d, got %d.\n", + dm2.dmPelsWidth, GetSystemMetrics(SM_CXVIRTUALSCREEN)); + ok(GetSystemMetrics(SM_CYVIRTUALSCREEN) == dm2.dmPelsHeight, "Expected %d, got %d.\n", + dm2.dmPelsHeight, GetSystemMetrics(SM_CYVIRTUALSCREEN)); + } + } + ok(mode > 0, "Expected at least one display mode found.\n"); + } + /* Restore all adapters to their original settings */ for (device = 0; device < device_count; ++device) {

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.154.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: de508759c67543e3bd21ee6a0873b06aa4014418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de508759c67543e3bd21ee6a… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Sep 21 12:01:34 2020 -0700 winevulkan: Update to VK spec version 1.2.154. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 253 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 134 ++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 993 +++++++++++++++++++++++----------------- 5 files changed, 959 insertions(+), 425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de508759c67543e3bd21…

1 0

Rémi Bernon : gdi32: Use explicit CDECL in window_surface_funcs.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: b16f552e195048f434d486a084fad0fa3afcf712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b16f552e195048f434d486a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 22 10:26:26 2020 +0200 gdi32: Use explicit CDECL in window_surface_funcs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 14 +++++++------- dlls/user32/win.c | 14 +++++++------- dlls/wineandroid.drv/window.c | 14 +++++++------- dlls/winemac.drv/surface.c | 16 ++++++++-------- dlls/winex11.drv/bitblt.c | 14 +++++++------- include/wine/gdi_driver.h | 14 +++++++------- 6 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b16f552e195048f434d4…

1 0

Rémi Bernon : gdi32: Use explicit CDECL in gdi_image_bits.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: a404eb7272db53883cc6d74db044a5443daec71f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a404eb7272db53883cc6d74d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 22 10:26:25 2020 +0200 gdi32: Use explicit CDECL in gdi_image_bits. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/wineps.drv/bitmap.c | 2 +- dlls/winex11.drv/bitblt.c | 4 ++-- include/wine/gdi_driver.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d46d7bada4..f3b866057e 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -163,7 +163,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, return intersect_vis_rectangles( dst, src ); } -void free_heap_bits( struct gdi_image_bits *bits ) +void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f818aa0228..727f3837e3 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -565,7 +565,7 @@ static inline void unlock_surface( struct windrv_physdev *dev ) if (GetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); } -static void unlock_bits_surface( struct gdi_image_bits *bits ) +static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) { struct window_surface *surface = bits->param; surface->funcs->unlock( surface ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b2502c458..4bb4661966 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -620,7 +620,7 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } -extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 1a98f16270..bafc86e9a2 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -148,7 +148,7 @@ static inline DWORD max_ascii85_size(DWORD size) return (size + 3) / 4 * 5; } -static void free_heap_bits( struct gdi_image_bits *bits ) +static void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b530ba7ba6..46e52612a2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -914,12 +914,12 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } -static void free_heap_bits( struct gdi_image_bits *bits ) +static void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } -static void free_ximage_bits( struct gdi_image_bits *bits ) +static void CDECL free_ximage_bits( struct gdi_image_bits *bits ) { XFree( bits->ptr ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 971618e19a..0bd169c653 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -54,7 +54,7 @@ struct gdi_image_bits { void *ptr; /* pointer to the bits */ BOOL is_copy; /* whether this is a copy of the bits that can be modified */ - void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ + void (CDECL *free)(struct gdi_image_bits *); /* callback for freeing the bits */ void *param; /* extra parameter for callback private use */ };

1 0

Alexandre Julliard : ntdll: Add inline wrappers for pthread mutex locking.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: wine Branch: master Commit: d8f7d5457355cd226f0490d849dcd7a34d5f82f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f7d5457355cd226f0490d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 11:28:25 2020 +0200 ntdll: Add inline wrappers for pthread mutex locking. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 24 ++++++++++++------------ dlls/ntdll/unix/file.c | 40 ++++++++++++++++++++-------------------- dlls/ntdll/unix/server.c | 6 +++--- dlls/ntdll/unix/sync.c | 12 ++++++------ dlls/ntdll/unix/system.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 10 ++++++++++ dlls/ntdll/unix/virtual.c | 8 ++++---- 7 files changed, 58 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f7d5457355cd226f04…

1 0

Alexandre Julliard : Vkd3d release 1.2.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: website Branch: master Commit: 8396d3bb42008e32b99f27cf4ba24e60a0d97394 URL: https://source.winehq.org/git/website.git/?a=commit;h=8396d3bb42008e32b99f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 22 12:01:14 2020 +0200 Vkd3d release 1.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020092201.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020092201.xml b/news/en/2020092201.xml new file mode 100644 index 00000000..f1b0c2d6 --- /dev/null +++ b/news/en/2020092201.xml @@ -0,0 +1,18 @@ +<news> +<date>September 22, 2020</date> +<title>Vkd3d 1.2 Released</title> +<body> +The Wine team is proud to announce that release 1.2 of vkd3d, the Direct3D to +Vulkan translation library, is now available. + +This release contains improvements that are listed in the <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.2:/ANNOUNCE">release notes</a>. +The main highlights are: +<ul> + <li>Availability of libvkd3d-shader as a public library.</li> + <li>Support for tessellation shaders.</li> + <li>Version 1.1 root signatures.</li> + <li>Stream output support.</li> +</ul> + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz">available here</a>. +</body></news>

1 0

Henri Verbeet : Release 1.2.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: vkd3d Branch: master Commit: 56cd4a94d541707959ce7677af6d1a34739e5579 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56cd4a94d541707959ce767… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 22 02:23:48 2020 +0330 Release 1.2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 179 ++++++++++++++++++++++++++++++++++++---------- AUTHORS | 11 +++ Makefile.am | 4 +- configure.ac | 2 +- libs/vkd3d-shader/spirv.c | 2 +- 5 files changed, 158 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=56cd4a94d541707959c…

1 0

Henri Verbeet : build: Add ANNOUNCE to EXTRA_DIST.
by Alexandre Julliard Sept. 22, 2020

Sept. 22, 2020

Module: vkd3d Branch: master Commit: db8ab36464cf3a2e8ba53573face2a18c963bfc5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db8ab36464cf3a2e8ba5357… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 22 02:23:47 2020 +0330 build: Add ANNOUNCE to EXTRA_DIST. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ca0f616..deea567 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,7 +129,7 @@ libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif -EXTRA_DIST = LICENSE +EXTRA_DIST = ANNOUNCE LICENSE pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers)

1 0