July 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : wintrust: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 04ffca6e167784d7f2fab6c9eb9dd64476356a6b URL: https://gitlab.winehq.org/wine/wine/-/commit/04ffca6e167784d7f2fab6c9eb9dd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:18:10 2023 +0200 wintrust: Use nameless unions/structs. --- dlls/wintrust/asn.c | 52 ++++++++-------- dlls/wintrust/softpub.c | 135 +++++++++++++++++++++--------------------- dlls/wintrust/wintrust_main.c | 44 +++++++------- 3 files changed, 114 insertions(+), 117 deletions(-)

1 0

Alexandre Julliard : wow64: Implement backend notification functions.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 1591e01e5d5b29ebb3d3bcb01e6ffc962d65b919 URL: https://gitlab.winehq.org/wine/wine/-/commit/1591e01e5d5b29ebb3d3bcb01e6ffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:03:31 2023 +0200 wow64: Implement backend notification functions. Co-authored-by: Billy Laws <blaws05(a)gmail.com> --- dlls/wow64/process.c | 3 +++ dlls/wow64/syscall.c | 15 ++++++++++++++ dlls/wow64/virtual.c | 49 +++++++++++++++++++++++++++++++++------------- dlls/wow64/wow64_private.h | 10 +++++++++- 4 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 2182491bbfb..0728f9f0999 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -435,6 +435,9 @@ NTSTATUS WINAPI wow64_NtFlushInstructionCache( UINT *args ) const void *addr = get_ptr( &args ); SIZE_T size = get_ulong( &args ); + if (pBTCpuNotifyFlushInstructionCache2 && RtlIsCurrentProcess( process )) + pBTCpuNotifyFlushInstructionCache2( addr, size ); + return NtFlushInstructionCache( process, addr, size ); } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 85db80a53df..0f8135859bc 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -100,6 +100,7 @@ static HMODULE win32u_module; static WOW64INFO *wow64info; /* cpu backend dll functions */ +/* the function prototypes most likely differ from Windows */ static void * (WINAPI *pBTCpuGetBopCode)(void); static NTSTATUS (WINAPI *pBTCpuGetContext)(HANDLE,HANDLE,void *,void *); static BOOLEAN (WINAPI *pBTCpuIsProcessorFeaturePresent)(UINT); @@ -110,6 +111,13 @@ static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); +void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ) = NULL; +void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ) = NULL; +void (WINAPI *pBTCpuNotifyMemoryAlloc)( void *, SIZE_T, ULONG, ULONG ) = NULL; +void (WINAPI *pBTCpuNotifyMemoryDirty)( void *, SIZE_T ) = NULL; +void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T ) = NULL; +void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG ) = NULL; +void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void * ) = NULL; void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; void *dummy = RtlUnwind; @@ -896,6 +904,13 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); + GET_PTR( BTCpuNotifyFlushInstructionCache2 ); + GET_PTR( BTCpuNotifyMapViewOfSection ); + GET_PTR( BTCpuNotifyMemoryAlloc ); + GET_PTR( BTCpuNotifyMemoryDirty ); + GET_PTR( BTCpuNotifyMemoryFree ); + GET_PTR( BTCpuNotifyMemoryProtect ); + GET_PTR( BTCpuNotifyUnmapViewOfSection ); GET_PTR( BTCpuUpdateProcessorInformation ); GET_PTR( __wine_get_unix_opcode ); diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index c171fe39cb2..6a63f3793bb 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -126,6 +126,8 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemory( UINT *args ) size_32to64( &size, size32 ), type, protect ); if (!status) { + if (pBTCpuNotifyMemoryAlloc && RtlIsCurrentProcess(process)) + pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); put_addr( addr32, addr ); put_size( size32, size ); } @@ -150,7 +152,8 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) SIZE_T size; NTSTATUS status; MEM_EXTENDED_PARAMETER *params64; - BOOL set_limit = (!*addr32 && process == GetCurrentProcess()); + BOOL is_current = RtlIsCurrentProcess( process ); + BOOL set_limit = (!*addr32 && is_current); if ((status = mem_extended_parameters_32to64( &params64, params32, &count, set_limit ))) return status; @@ -158,6 +161,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) type, protect, params64, count ); if (!status) { + if (pBTCpuNotifyMemoryAlloc && is_current) pBTCpuNotifyMemoryAlloc( addr, size, type, protect ); put_addr( addr32, addr ); put_size( size32, size ); } @@ -212,12 +216,14 @@ NTSTATUS WINAPI wow64_NtFreeVirtualMemory( UINT *args ) ULONG *size32 = get_ptr( &args ); ULONG type = get_ulong( &args ); - void *addr; - SIZE_T size; + void *addr = ULongToPtr( *addr32 ); + SIZE_T size = *size32; NTSTATUS status; - status = NtFreeVirtualMemory( process, addr_32to64( &addr, addr32 ), - size_32to64( &size, size32 ), type ); + if (pBTCpuNotifyMemoryFree && RtlIsCurrentProcess( process )) + pBTCpuNotifyMemoryFree( addr, size ); + + status = NtFreeVirtualMemory( process, &addr, &size, type ); if (!status) { put_addr( addr32, addr ); @@ -353,9 +359,12 @@ NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) { SECTION_IMAGE_INFORMATION info; - if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) + if (RtlIsCurrentProcess( process ) && + !NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL ) && + info.Machine == current_machine) { - if (info.Machine == current_machine) init_image_mapping( addr ); + if (pBTCpuNotifyMapViewOfSection) pBTCpuNotifyMapViewOfSection( addr ); + init_image_mapping( addr ); } put_addr( addr32, addr ); put_size( size32, size ); @@ -382,7 +391,8 @@ NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *args ) SIZE_T size; NTSTATUS status; MEM_EXTENDED_PARAMETER *params64; - BOOL set_limit = (!*addr32 && process == GetCurrentProcess()); + BOOL is_current = RtlIsCurrentProcess( process ); + BOOL set_limit = (!*addr32 && is_current); if ((status = mem_extended_parameters_32to64( &params64, params32, &count, set_limit ))) return status; @@ -392,9 +402,12 @@ NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *args ) { SECTION_IMAGE_INFORMATION info; - if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) + if (is_current && + !NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL ) && + info.Machine == current_machine) { - if (info.Machine == current_machine) init_image_mapping( addr ); + if (pBTCpuNotifyMapViewOfSection) pBTCpuNotifyMapViewOfSection( addr ); + init_image_mapping( addr ); } put_addr( addr32, addr ); put_size( size32, size ); @@ -413,12 +426,14 @@ NTSTATUS WINAPI wow64_NtProtectVirtualMemory( UINT *args ) ULONG new_prot = get_ulong( &args ); ULONG *old_prot = get_ptr( &args ); - void *addr; - SIZE_T size; + void *addr = ULongToPtr( *addr32 ); + SIZE_T size = *size32; NTSTATUS status; - status = NtProtectVirtualMemory( process, addr_32to64( &addr, addr32 ), - size_32to64( &size, size32 ), new_prot, old_prot ); + if (pBTCpuNotifyMemoryProtect && RtlIsCurrentProcess(process)) + pBTCpuNotifyMemoryProtect( addr, size, new_prot ); + + status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); if (!status) { put_addr( addr32, addr ); @@ -686,6 +701,9 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) HANDLE process = get_handle( &args ); void *addr = get_ptr( &args ); + if (pBTCpuNotifyUnmapViewOfSection && RtlIsCurrentProcess( process )) + pBTCpuNotifyUnmapViewOfSection( addr ); + return NtUnmapViewOfSection( process, addr ); } @@ -699,6 +717,9 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSectionEx( UINT *args ) void *addr = get_ptr( &args ); ULONG flags = get_ulong( &args ); + if (pBTCpuNotifyUnmapViewOfSection && RtlIsCurrentProcess( process )) + pBTCpuNotifyUnmapViewOfSection( addr ); + return NtUnmapViewOfSectionEx( process, addr, flags ); } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index a840c1d01c0..73a100cba32 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -38,7 +38,15 @@ extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; extern ULONG_PTR highest_user_address DECLSPEC_HIDDEN; extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; -extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) DECLSPEC_HIDDEN; + +extern void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ); +extern void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ); +extern void (WINAPI *pBTCpuNotifyMemoryAlloc)( void *, SIZE_T, ULONG, ULONG ); +extern void (WINAPI *pBTCpuNotifyMemoryDirty)( void *, SIZE_T ); +extern void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T ); +extern void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG ); +extern void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void * ); +extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ); struct object_attr64 {

1 0

Alexandre Julliard : gitlab: Upgrade the Debian image to bookworm.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 5799e89f15b5584f186dcc2fd24b98e0a7bd6c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/5799e89f15b5584f186dcc2fd24b98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:18:49 2023 +0200 gitlab: Upgrade the Debian image to bookworm. --- tools/gitlab/build.yml | 4 ++-- tools/gitlab/image.docker | 5 ++--- tools/gitlab/image.yml | 4 ++-- tools/gitlab/test.yml | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index b474f271c8b..441582a99f3 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -2,7 +2,7 @@ .wine-build: stage: build - image: $CI_REGISTRY/wine/wine:debian-bullseye + image: $CI_REGISTRY/wine/wine:debian-bookworm interruptible: true variables: GIT_DEPTH: 0 @@ -64,7 +64,7 @@ build-daily-linux: build-winetest: stage: build - image: $CI_REGISTRY/wine/wine:debian-bullseye + image: $CI_REGISTRY/wine/wine:debian-bookworm rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index cf16ed49c95..c7f9bcd1c08 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -23,13 +23,12 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ libgnutls28-dev:amd64 libgnutls28-dev:i386 \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \ - libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ + libgstreamer-plugins-base1.0-dev:i386 \ libice-dev:amd64 libice-dev:i386 \ libkrb5-dev:amd64 libkrb5-dev:i386 \ - libldap-dev:amd64 libldap-dev:i386 \ - libopenal-dev:amd64 libopenal-dev:i386 \ libosmesa6-dev:amd64 libosmesa6-dev:i386 \ libpcap-dev:amd64 libpcap-dev:i386 \ + libpcsclite-dev:amd64 \ libpulse-dev:amd64 libpulse-dev:i386 \ libsane-dev:amd64 libsane-dev:i386 \ libsdl2-dev:amd64 libsdl2-dev:i386 \ diff --git a/tools/gitlab/image.yml b/tools/gitlab/image.yml index 7a866553dc2..1e9b3207572 100644 --- a/tools/gitlab/image.yml +++ b/tools/gitlab/image.yml @@ -11,8 +11,8 @@ build-image: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] variables: - IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bullseye" - IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bullseye" + IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bookworm" + IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bookworm" DOCKER_FILE: "$CI_PROJECT_DIR/tools/gitlab/image.docker" script: - mkdir -p /kaniko/.docker diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 568addecb5c..1fa0ce402af 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -2,7 +2,7 @@ .wine-test: stage: test - image: $CI_REGISTRY/wine/wine:debian-bullseye + image: $CI_REGISTRY/wine/wine:debian-bookworm interruptible: true variables: GIT_STRATEGY: none

1 0

Jeff Smith : gdiplus: Dash pattern scaling does not shrink below line width 1.0.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: abdde73a1c143a47a11fda24632102a2d50573c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/abdde73a1c143a47a11fda24632102… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Mar 5 14:00:47 2020 -0600 gdiplus: Dash pattern scaling does not shrink below line width 1.0. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 3 ++- dlls/gdiplus/tests/graphicspath.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ad4dde58ccd..85e0f7d5777 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2295,6 +2295,7 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, int dash_index=0; const REAL *dash_pattern; REAL *dash_pattern_scaled; + REAL dash_pattern_scaling = max(pen->width, 1.0); int dash_count; GpPointF *tmp_points; REAL segment_dy; @@ -2337,7 +2338,7 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, if (!dash_pattern_scaled) return; for (i = 0; i < dash_count; i++) - dash_pattern_scaled[i] = pen->width * dash_pattern[i]; + dash_pattern_scaled[i] = dash_pattern_scaling * dash_pattern[i]; tmp_points = heap_alloc_zero((end - start + 2) * sizeof(GpPoint)); if (!tmp_points) { diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5082f0671d2..7cbcb51edfc 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1278,6 +1278,17 @@ static path_test_t widenline_dash_path[] = { {45.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ }; +static path_test_t widenline_thin_dash_path[] = { + {5.0, 4.75, PathPointTypeStart, 0, 0}, /*0*/ + {8.0, 4.75, PathPointTypeLine, 0, 0}, /*1*/ + {8.0, 5.25, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 5.25, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {9.0, 4.75, PathPointTypeStart, 0, 0}, /*4*/ + {9.5, 4.75, PathPointTypeLine, 0, 0}, /*5*/ + {9.5, 5.25, PathPointTypeLine, 0, 0}, /*6*/ + {9.0, 5.25, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + }; + static path_test_t widenline_unit_path[] = { {5.0, 9.5, PathPointTypeStart, 0, 0}, /*0*/ {50.0, 9.5, PathPointTypeLine, 0, 0}, /*1*/ @@ -1375,6 +1386,18 @@ static void test_widen(void) status = GdipSetPenDashStyle(pen, DashStyleSolid); expect(Ok, status); + /* dashed line less than 1 pixel wide */ + GdipDeletePen(pen); + GdipCreatePen1(0xffffffff, 0.5, UnitPixel, &pen); + GdipSetPenDashStyle(pen, DashStyleDash); + + GdipResetPath(path); + GdipAddPathLine(path, 5.0, 5.0, 9.5, 5.0); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path_fudge(path, widenline_thin_dash_path, ARRAY_SIZE(widenline_thin_dash_path), FALSE, 0.000005); + /* pen width in UnitWorld */ GdipDeletePen(pen); status = GdipCreatePen1(0xffffffff, 10.0, UnitWorld, &pen);

1 0

Kurt Kartaltepe : winegstreamer: Replace pointers with handles in PE->Unix transition.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 18e79f813b51056534ef3ca3de000cab62436c6b URL: https://gitlab.winehq.org/wine/wine/-/commit/18e79f813b51056534ef3ca3de000c… Author: Kurt Kartaltepe <kkartaltepe(a)gmail.com> Date: Fri Jul 7 20:32:21 2023 -0700 winegstreamer: Replace pointers with handles in PE->Unix transition. Converts struct pointers in syscalls to 64bit opaque handles. This makes future wow64 thunking simpler and should avoid dereferencing Unix pointers in the PE code. --- dlls/winegstreamer/aac_decoder.c | 6 +- dlls/winegstreamer/color_convert.c | 6 +- dlls/winegstreamer/gst_private.h | 62 ++++++++--------- dlls/winegstreamer/h264_decoder.c | 6 +- dlls/winegstreamer/main.c | 126 +++++++++++++++++----------------- dlls/winegstreamer/media_source.c | 14 ++-- dlls/winegstreamer/quartz_parser.c | 20 +++--- dlls/winegstreamer/quartz_transform.c | 6 +- dlls/winegstreamer/resampler.c | 6 +- dlls/winegstreamer/unixlib.h | 48 +++++++------ dlls/winegstreamer/video_decoder.c | 4 +- dlls/winegstreamer/video_processor.c | 6 +- dlls/winegstreamer/wg_parser.c | 62 ++++++++++------- dlls/winegstreamer/wg_sample.c | 28 ++++---- dlls/winegstreamer/wg_transform.c | 23 ++++--- dlls/winegstreamer/wm_reader.c | 12 ++-- dlls/winegstreamer/wma_decoder.c | 6 +- dlls/winegstreamer/wmv_decoder.c | 12 ++-- 18 files changed, 236 insertions(+), 217 deletions(-)

1 0

Kurt Kartaltepe : winegstreamer: Replace ambiguously sized/aligned elements.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 6987f565e012b176d19e807eb6f35d9daaea9eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6987f565e012b176d19e807eb6f35d… Author: Kurt Kartaltepe <kkartaltepe(a)gmail.com> Date: Fri Jul 7 20:41:36 2023 -0700 winegstreamer: Replace ambiguously sized/aligned elements. Replaces bool and enum elements in syscalls with fixed sized UINT64 and UINT8 to avoid ambiguity in size or alignment in future wow64 thunks. --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 131 +++++++++++++++++++++----------------- 2 files changed, 73 insertions(+), 59 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index f1847eb27ef..527822cf15b 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -23,6 +23,7 @@ #include "unixlib.h" +#include <stdbool.h> #include <gst/gst.h> /* unixlib.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 36abb098127..39391b44735 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -21,7 +21,6 @@ #ifndef __WINE_WINEGSTREAMER_UNIXLIB_H #define __WINE_WINEGSTREAMER_UNIXLIB_H -#include <stdbool.h> #include <stdint.h> #include "windef.h" #include "winternl.h" @@ -30,37 +29,74 @@ #include "wine/unixlib.h" +typedef UINT32 wg_major_type; +enum wg_major_type +{ + WG_MAJOR_TYPE_UNKNOWN = 0, + WG_MAJOR_TYPE_AUDIO, + WG_MAJOR_TYPE_AUDIO_MPEG1, + WG_MAJOR_TYPE_AUDIO_MPEG4, + WG_MAJOR_TYPE_AUDIO_WMA, + WG_MAJOR_TYPE_VIDEO, + WG_MAJOR_TYPE_VIDEO_CINEPAK, + WG_MAJOR_TYPE_VIDEO_H264, + WG_MAJOR_TYPE_VIDEO_WMV, + WG_MAJOR_TYPE_VIDEO_INDEO, +}; + +typedef UINT32 wg_audio_format; +enum wg_audio_format +{ + WG_AUDIO_FORMAT_UNKNOWN, + + WG_AUDIO_FORMAT_U8, + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_S24LE, + WG_AUDIO_FORMAT_S32LE, + WG_AUDIO_FORMAT_F32LE, + WG_AUDIO_FORMAT_F64LE, +}; + +typedef UINT32 wg_video_format; +enum wg_video_format +{ + WG_VIDEO_FORMAT_UNKNOWN, + + WG_VIDEO_FORMAT_BGRA, + WG_VIDEO_FORMAT_BGRx, + WG_VIDEO_FORMAT_BGR, + WG_VIDEO_FORMAT_RGB15, + WG_VIDEO_FORMAT_RGB16, + + WG_VIDEO_FORMAT_AYUV, + WG_VIDEO_FORMAT_I420, + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_UYVY, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YVYU, +}; + +typedef UINT32 wg_wmv_video_format; +enum wg_wmv_video_format +{ + WG_WMV_VIDEO_FORMAT_UNKNOWN, + WG_WMV_VIDEO_FORMAT_WMV1, + WG_WMV_VIDEO_FORMAT_WMV2, + WG_WMV_VIDEO_FORMAT_WMV3, + WG_WMV_VIDEO_FORMAT_WMVA, + WG_WMV_VIDEO_FORMAT_WVC1, +}; + struct wg_format { - enum wg_major_type - { - WG_MAJOR_TYPE_UNKNOWN = 0, - WG_MAJOR_TYPE_AUDIO, - WG_MAJOR_TYPE_AUDIO_MPEG1, - WG_MAJOR_TYPE_AUDIO_MPEG4, - WG_MAJOR_TYPE_AUDIO_WMA, - WG_MAJOR_TYPE_VIDEO, - WG_MAJOR_TYPE_VIDEO_CINEPAK, - WG_MAJOR_TYPE_VIDEO_H264, - WG_MAJOR_TYPE_VIDEO_WMV, - WG_MAJOR_TYPE_VIDEO_INDEO, - } major_type; + wg_major_type major_type; union { struct { - enum wg_audio_format - { - WG_AUDIO_FORMAT_UNKNOWN, - - WG_AUDIO_FORMAT_U8, - WG_AUDIO_FORMAT_S16LE, - WG_AUDIO_FORMAT_S24LE, - WG_AUDIO_FORMAT_S32LE, - WG_AUDIO_FORMAT_F32LE, - WG_AUDIO_FORMAT_F64LE, - } format; + wg_audio_format format; uint32_t channels; uint32_t channel_mask; /* In WinMM format. */ @@ -92,24 +128,7 @@ struct wg_format struct { - enum wg_video_format - { - WG_VIDEO_FORMAT_UNKNOWN, - - WG_VIDEO_FORMAT_BGRA, - WG_VIDEO_FORMAT_BGRx, - WG_VIDEO_FORMAT_BGR, - WG_VIDEO_FORMAT_RGB15, - WG_VIDEO_FORMAT_RGB16, - - WG_VIDEO_FORMAT_AYUV, - WG_VIDEO_FORMAT_I420, - WG_VIDEO_FORMAT_NV12, - WG_VIDEO_FORMAT_UYVY, - WG_VIDEO_FORMAT_YUY2, - WG_VIDEO_FORMAT_YV12, - WG_VIDEO_FORMAT_YVYU, - } format; + wg_video_format format; /* Positive height indicates top-down video; negative height * indicates bottom-up video. */ int32_t width, height; @@ -132,15 +151,7 @@ struct wg_format } video_h264; struct { - enum wg_wmv_video_format - { - WG_WMV_VIDEO_FORMAT_UNKNOWN, - WG_WMV_VIDEO_FORMAT_WMV1, - WG_WMV_VIDEO_FORMAT_WMV2, - WG_WMV_VIDEO_FORMAT_WMV3, - WG_WMV_VIDEO_FORMAT_WMVA, - WG_WMV_VIDEO_FORMAT_WVC1, - } format; + wg_wmv_video_format format; int32_t width, height; uint32_t fps_n, fps_d; } video_wmv; @@ -180,10 +191,11 @@ struct wg_parser_buffer UINT64 pts, duration; UINT32 size; UINT32 stream; - bool discontinuity, preroll, delta, has_pts, has_duration; + UINT8 discontinuity, preroll, delta, has_pts, has_duration; }; C_ASSERT(sizeof(struct wg_parser_buffer) == 32); +typedef UINT32 wg_parser_type; enum wg_parser_type { WG_PARSER_DECODEBIN, @@ -199,10 +211,10 @@ typedef UINT64 wg_transform_t; struct wg_parser_create_params { wg_parser_t parser; - enum wg_parser_type type; - bool unlimited_buffering; - bool err_on; - bool warn_on; + wg_parser_type type; + UINT8 unlimited_buffering; + UINT8 err_on; + UINT8 warn_on; }; struct wg_parser_connect_params @@ -274,7 +286,7 @@ struct wg_parser_stream_copy_buffer_params struct wg_parser_stream_notify_qos_params { wg_parser_stream_t stream; - bool underflow; + UINT8 underflow; DOUBLE proportion; INT64 diff; UINT64 timestamp; @@ -286,6 +298,7 @@ struct wg_parser_stream_get_duration_params UINT64 duration; }; +typedef UINT64 wg_parser_tag; enum wg_parser_tag { WG_PARSER_TAG_LANGUAGE, @@ -296,7 +309,7 @@ enum wg_parser_tag struct wg_parser_stream_get_tag_params { wg_parser_stream_t stream; - enum wg_parser_tag tag; + wg_parser_tag tag; char *buffer; UINT32 *size; };

1 0

Kurt Kartaltepe : winegstreamer: Implement Wow64 entrypoints in the Unix library.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 3347af2e7c6eec8be224953ee7e51f0218a2ef6f URL: https://gitlab.winehq.org/wine/wine/-/commit/3347af2e7c6eec8be224953ee7e51f… Author: Kurt Kartaltepe <kkartaltepe(a)gmail.com> Date: Fri Jul 7 20:41:52 2023 -0700 winegstreamer: Implement Wow64 entrypoints in the Unix library. --- dlls/winegstreamer/wg_parser.c | 249 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 76977ba0c0d..9c020cbf055 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1956,3 +1956,252 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_transform_drain), X(wg_transform_flush), }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_wg_parser_push_data(void *args) { + struct + { + wg_parser_t parser; + PTR32 data; + UINT32 size; + } *params32 = args; + struct wg_parser_push_data_params params = + { + .parser = params32->parser, + .data = ULongToPtr(params32->data), + .size = params32->size, + }; + + return wg_parser_push_data(&params); +} + +static NTSTATUS wow64_wg_parser_stream_get_preferred_format(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 format; + } *params32 = args; + struct wg_parser_stream_get_preferred_format_params params = + { + .stream = params32->stream, + .format = ULongToPtr(params32->format), + }; + + return wg_parser_stream_get_preferred_format(&params); +} + +static NTSTATUS wow64_wg_parser_stream_get_codec_format(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 format; + } *params32 = args; + struct wg_parser_stream_get_codec_format_params params = + { + .stream = params32->stream, + .format = ULongToPtr(params32->format), + }; + + return wg_parser_stream_get_codec_format(&params); +} + +static NTSTATUS wow64_wg_parser_stream_enable(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 format; + } *params32 = args; + struct wg_parser_stream_enable_params params = + { + .stream = params32->stream, + .format = ULongToPtr(params32->format), + }; + + return wg_parser_stream_enable(&params); +} + +static NTSTATUS wow64_wg_parser_stream_get_buffer(void *args) +{ + struct + { + wg_parser_t parser; + wg_parser_stream_t stream; + PTR32 buffer; + } *params32 = args; + struct wg_parser_stream_get_buffer_params params = + { + .parser = params32->parser, + .stream = params32->stream, + .buffer = ULongToPtr(params32->buffer), + }; + return wg_parser_stream_get_buffer(&params); +} + +static NTSTATUS wow64_wg_parser_stream_copy_buffer(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 data; + UINT32 offset; + UINT32 size; + } *params32 = args; + struct wg_parser_stream_copy_buffer_params params = + { + .stream = params32->stream, + .data = ULongToPtr(params32->data), + .offset = params32->offset, + .size = params32->size, + }; + return wg_parser_stream_copy_buffer(&params); +} + + +static NTSTATUS wow64_wg_parser_stream_get_tag(void *args) +{ + struct + { + wg_parser_stream_t stream; + wg_parser_tag tag; + PTR32 buffer; + PTR32 size; + } *params32 = args; + struct wg_parser_stream_get_tag_params params = + { + .stream = params32->stream, + .tag = params32->tag, + .buffer = ULongToPtr(params32->buffer), + .size = ULongToPtr(params32->size), + }; + + return wg_parser_stream_get_tag(&params); +} + +NTSTATUS wow64_wg_transform_create(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 input_format; + PTR32 output_format; + PTR32 attrs; + } *params32 = args; + struct wg_transform_create_params params = + { + .input_format = ULongToPtr(params32->input_format), + .output_format = ULongToPtr(params32->output_format), + .attrs = ULongToPtr(params32->attrs), + }; + NTSTATUS ret; + + ret = wg_transform_create(&params); + params32->transform = params.transform; + return ret; +} + +NTSTATUS wow64_wg_transform_set_output_format(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 format; + } *params32 = args; + struct wg_transform_set_output_format_params params = + { + .transform = params32->transform, + .format = ULongToPtr(params32->format), + }; + return wg_transform_set_output_format(&params); +} + +NTSTATUS wow64_wg_transform_push_data(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 sample; + HRESULT result; + } *params32 = args; + struct wg_transform_push_data_params params = + { + .transform = params32->transform, + .sample = ULongToPtr(params32->sample), + }; + NTSTATUS ret; + + ret = wg_transform_push_data(&params); + params32->result = params.result; + return ret; +} + +NTSTATUS wow64_wg_transform_read_data(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 sample; + PTR32 format; + HRESULT result; + } *params32 = args; + struct wg_transform_read_data_params params = + { + .transform = params32->transform, + .sample = ULongToPtr(params32->sample), + .format = ULongToPtr(params32->format), + }; + NTSTATUS ret; + + ret = wg_transform_read_data(&params); + params32->result = params.result; + return ret; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ +#define X64(name) [unix_ ## name] = wow64_ ## name + X(wg_init_gstreamer), + + X(wg_parser_create), + X(wg_parser_destroy), + + X(wg_parser_connect), + X(wg_parser_disconnect), + + X(wg_parser_get_next_read_offset), + X64(wg_parser_push_data), + + X(wg_parser_get_stream_count), + X(wg_parser_get_stream), + + X64(wg_parser_stream_get_preferred_format), + X64(wg_parser_stream_get_codec_format), + X64(wg_parser_stream_enable), + X(wg_parser_stream_disable), + + X64(wg_parser_stream_get_buffer), + X64(wg_parser_stream_copy_buffer), + X(wg_parser_stream_release_buffer), + X(wg_parser_stream_notify_qos), + + X(wg_parser_stream_get_duration), + X64(wg_parser_stream_get_tag), + X(wg_parser_stream_seek), + + X64(wg_transform_create), + X(wg_transform_destroy), + X64(wg_transform_set_output_format), + + X64(wg_transform_push_data), + X64(wg_transform_read_data), + X(wg_transform_get_status), + X(wg_transform_drain), + X(wg_transform_flush), +}; + +#endif /* _WIN64 */

1 0

Ekaterine Papava : po: Add Georgian translation.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 36b715c5c0fa2677033304bc2cfc7fe8874cff01 URL: https://gitlab.winehq.org/wine/wine/-/commit/36b715c5c0fa2677033304bc2cfc7f… Author: Ekaterine Papava <papava.e(a)gtu.ge> Date: Mon Jul 10 16:23:28 2023 +0200 po: Add Georgian translation. --- po/Makefile.in | 1 + po/ka.po | 19028 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 19029 insertions(+)

1 0

Brendan Shanks : winecoreaudio: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 73fc9e749372c06cff4e744e92a9de6ee60cc405 URL: https://gitlab.winehq.org/wine/wine/-/commit/73fc9e749372c06cff4e744e92a9de… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:30:45 2023 -0700 winecoreaudio: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/winecoreaudio.drv/coreaudio.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1e712a624cb..fcf02401429 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -103,6 +103,8 @@ struct coreaudio_stream static const REFERENCE_TIME def_period = 100000; static const REFERENCE_TIME min_period = 50000; +static ULONG_PTR zero_bits = 0; + static NTSTATUS unix_not_implemented(void *args) { return STATUS_SUCCESS; @@ -196,6 +198,20 @@ static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) return ret; } +static NTSTATUS unix_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS unix_main_loop(void *args) { struct main_loop_params *params = args; @@ -639,15 +655,6 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return S_OK; } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static AudioDeviceID dev_id_from_device(const char *device) { return strtoul(device, NULL, 10); @@ -757,7 +764,7 @@ static NTSTATUS unix_create_stream(void *args) } size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; @@ -1497,7 +1504,7 @@ static NTSTATUS unix_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = params->frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; @@ -1595,7 +1602,7 @@ static NTSTATUS unix_get_capture_buffer(void *args) chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ size = stream->period_frames * stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; @@ -1782,7 +1789,7 @@ static NTSTATUS unix_set_event_handle(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - unix_not_implemented, + unix_process_attach, unix_not_implemented, unix_main_loop, unix_get_endpoint_ids, @@ -2177,7 +2184,7 @@ static NTSTATUS unix_wow64_set_event_handle(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - unix_not_implemented, + unix_process_attach, unix_not_implemented, unix_wow64_main_loop, unix_wow64_get_endpoint_ids,

1 0

Brendan Shanks : winealsa: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 5cf597ba09f4e479ac2d8d7312e2b65748c1b1c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf597ba09f4e479ac2d8d7312e2b6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:39:57 2023 -0700 winealsa: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/winealsa.drv/alsa.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0f2211d77e7..17737012579 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -91,6 +91,8 @@ static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v'}; +static ULONG_PTR zero_bits = 0; + static NTSTATUS alsa_not_implemented(void *args) { return STATUS_SUCCESS; @@ -476,6 +478,20 @@ static WCHAR *alsa_get_card_name(int card) return ret; } +static NTSTATUS alsa_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS alsa_main_loop(void *args) { struct main_loop_params *params = args; @@ -781,15 +797,6 @@ static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 fram memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static NTSTATUS alsa_create_stream(void *args) { struct create_stream_params *params = args; @@ -1004,7 +1011,7 @@ static NTSTATUS alsa_create_stream(void *args) stream->fmt = &fmtex->Format; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; @@ -1718,7 +1725,7 @@ static NTSTATUS alsa_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1821,7 +1828,7 @@ static NTSTATUS alsa_get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -2499,7 +2506,7 @@ static NTSTATUS alsa_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - alsa_not_implemented, + alsa_process_attach, alsa_not_implemented, alsa_main_loop, alsa_get_endpoint_ids, @@ -2953,7 +2960,7 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - alsa_not_implemented, + alsa_process_attach, alsa_not_implemented, alsa_wow64_main_loop, alsa_wow64_get_endpoint_ids,

1 0