wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Jacek Caban : gdi32: Handle EMFs directly in MoveToEx.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 4fc7a1df1bfb8c43dc07e264e23c37cedd169e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc7a1df1bfb8c43dc07e264… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:05 2021 +0200 gdi32: Handle EMFs directly in MoveToEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 7 ++++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++++ 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 79c3032daa6..d0d9d2f14fe 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -734,17 +734,6 @@ static BOOL CDECL emfpathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx )); } -/*********************************************************************** - * emfpathdrv_MoveTo - */ -static BOOL CDECL emfpathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pMoveTo ); - - return (emfdev->funcs->pMoveTo( emfdev, x, y ) && next->funcs->pMoveTo( next, x, y )); -} - /*********************************************************************** * emfpathdrv_Pie */ @@ -944,7 +933,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pInvertRgn */ NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ - emfpathdrv_MoveTo, /* pMoveTo */ + NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 1a90f70604f..9f9799a54da 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -92,7 +92,6 @@ extern INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 8d6445779b9..3c8c8b3bd07 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -118,10 +118,11 @@ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) } /********************************************************************** - * EMFDRV_MoveTo + * EMFDC_MoveTo */ -BOOL CDECL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) +BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) { + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRMOVETOEX emr; emr.emr.iType = EMR_MOVETOEX; @@ -129,7 +130,7 @@ BOOL CDECL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) emr.ptl.x = x; emr.ptl.y = y; - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } /*********************************************************************** diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 62e35fe4029..c941e095752 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -98,7 +98,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_InvertRgn, /* pInvertRgn */ EMFDRV_LineTo, /* pLineTo */ EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ - EMFDRV_MoveTo, /* pMoveTo */ + NULL, /* pMoveTo */ EMFDRV_OffsetClipRgn, /* pOffsetClipRgn */ EMFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ EMFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bb4504f4934..7f3eeff566c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -53,5 +53,6 @@ extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, /* enhanced metafiles */ extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 54526a0876c..57163423e13 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -68,9 +68,13 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) */ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, POINT *pt ) { + DC_ATTR *dc_attr; + TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); if (is_meta_dc( hdc )) return METADC_MoveTo( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_MoveTo( dc_attr, x, y )) return FALSE; return NtGdiMoveTo( hdc, x, y, pt ); }

1 0

Jacek Caban : gdi32: Use DC_ATTR for GetCurrentPositionEx implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 531a599405786781fa385a4f56b2a26fec624321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=531a599405786781fa385a4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:18:59 2021 +0200 gdi32: Use DC_ATTR for GetCurrentPositionEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 13 ------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/tests/metafile.c | 3 +++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 65401fb8ccf..4441592f59f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1833,19 +1833,6 @@ BOOL WINAPI GetBrushOrgEx( HDC hdc, LPPOINT pt ) } -/*********************************************************************** - * GetCurrentPositionEx (GDI32.@) - */ -BOOL WINAPI GetCurrentPositionEx( HDC hdc, LPPOINT pt ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - *pt = dc->attr->cur_pos; - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * GetViewportExtEx (GDI32.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c011d66deb9..54526a0876c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -37,6 +37,17 @@ static DC_ATTR *get_dc_attr( HDC hdc ) return dc_attr; } +/*********************************************************************** + * GetCurrentPositionEx (GDI32.@) + */ +BOOL WINAPI GetCurrentPositionEx( HDC hdc, POINT *point ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + *point = dc_attr->cur_pos; + return TRUE; +} + /*********************************************************************** * LineTo (GDI32.@) */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 8a8ad48a1c6..921ac888247 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3017,6 +3017,9 @@ static void test_metafile_file(void) ret = Ellipse(dc, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); + ret = GetCurrentPositionEx(dc, &oldpoint); + ok(!ret, "GetCurrentPositionEx succeeded\n"); + size = GetFileSize(file, NULL); ok(!size, "size = %u\n", size);

1 0

Jacek Caban : gdi32: Handle EMFs recording directly in LineTo implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 340a445289ed5777bfc177336fb6e315dfda273c URL: https://source.winehq.org/git/wine.git/?a=commit;h=340a445289ed5777bfc17733… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:18:50 2021 +0200 gdi32: Handle EMFs recording directly in LineTo implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/graphics.c | 28 +++++++++++++++------------- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 12 ++++++++++-- dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/objects.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 9edd09a179e..79c3032daa6 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -734,17 +734,6 @@ static BOOL CDECL emfpathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx )); } -/*********************************************************************** - * emfpathdrv_LineTo - */ -static BOOL CDECL emfpathdrv_LineTo( PHYSDEV dev, INT x, INT y ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); - - return (emfdev->funcs->pLineTo( emfdev, x, y ) && next->funcs->pLineTo( next, x, y )); -} - /*********************************************************************** * emfpathdrv_MoveTo */ @@ -953,7 +942,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pGradientFill */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ - emfpathdrv_LineTo, /* pLineTo */ + NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ emfpathdrv_MoveTo, /* pMoveTo */ NULL, /* pOffsetClipRgn */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f504aee8e36..8d6445779b9 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -133,23 +133,29 @@ BOOL CDECL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) } /*********************************************************************** - * EMFDRV_LineTo + * EMFDC_LineTo */ -BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - DC *dc = get_physdev_dc( dev ); - POINT pt; EMRLINETO emr; - RECTL bounds; emr.emr.iType = EMR_LINETO; emr.emr.nSize = sizeof(emr); emr.ptl.x = x; emr.ptl.y = y; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); +} - if(!EMFDRV_WriteRecord( dev, &emr.emr )) - return FALSE; + +/*********************************************************************** + * EMFDRV_LineTo + */ +BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +{ + EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + POINT pt; pt = dc->attr->cur_pos; @@ -157,14 +163,10 @@ BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) bounds.top = min(y, pt.y); bounds.right = max(x, pt.x); bounds.bottom = max(y, pt.y); - - if(!physDev->path) - EMFDRV_UpdateBBox( dev, &bounds ); - + EMFDRV_UpdateBBox( &physDev->dev, &bounds ); return TRUE; } - /*********************************************************************** * EMFDRV_ArcChordPie */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 9a611e0f1bc..62e35fe4029 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -342,6 +342,7 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } + dc->attr->emf = physDev; if(description) { /* App name\0Title\0\0 */ length = lstrlenW(description); length += lstrlenW(description + length + 1); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 436846c5bd5..bb4504f4934 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -31,10 +31,15 @@ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; +static inline WORD gdi_handle_type( HGDIOBJ obj ) +{ + unsigned int handle = HandleToULong( obj ); + return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT; +} + static inline BOOL is_meta_dc( HDC hdc ) { - unsigned int handle = HandleToULong( hdc ); - return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; + return gdi_handle_type( hdc ) == NTGDI_OBJ_METADC; } extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, @@ -46,4 +51,7 @@ extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +/* enhanced metafiles */ +extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 01c9dfdf8c7..c011d66deb9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -25,14 +25,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); +static DC_ATTR *get_dc_attr( HDC hdc ) +{ + WORD type = gdi_handle_type( hdc ); + DC_ATTR *dc_attr; + if ((type & 0x1f) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) + { + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } + return dc_attr; +} + /*********************************************************************** * LineTo (GDI32.@) */ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) { + DC_ATTR *dc_attr; + TRACE( "%p, (%d, %d)\n", hdc, x, y ); if (is_meta_dc( hdc )) return METADC_LineTo( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_LineTo( dc_attr, x, y )) return FALSE; return NtGdiLineTo( hdc, x, y ); } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index e5aafc1fed4..e614a9d6a52 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -70,7 +70,7 @@ void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) void *get_gdi_client_ptr( HGDIOBJ obj, WORD type ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); - if (!entry || entry->ExtType != type || !entry->UserPointer) + if (!entry || (type && entry->ExtType != type) || !entry->UserPointer) return NULL; return (void *)(UINT_PTR)entry->UserPointer; } diff --git a/include/ntgdi.h b/include/ntgdi.h index b03ffc0fea8..53915033c89 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -89,6 +89,7 @@ enum typedef struct DC_ATTR { POINT cur_pos; + void *emf; } DC_ATTR; #endif /* __WINESRC__ */

1 0

Jacek Caban : gdi32/tests: Silence noisy traces.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 317fe5bcb000b359f9820e57634d1374b438c247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=317fe5bcb000b359f9820e57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:18:30 2021 +0200 gdi32/tests: Silence noisy traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 112 +++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=317fe5bcb000b359f982…

1 0

Alexandre Julliard : ntdll: Load wow64.dll in 64-bit Wow64 processes.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: c4b194f4d959da3d1103085e6421b9b1fdb494f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b194f4d959da3d1103085e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 14:52:58 2021 +0200 ntdll: Load wow64.dll in 64-bit Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b5127327e3d..3339596944a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3681,7 +3681,41 @@ static void load_global_options(void) } -#ifndef _WIN64 + +#ifdef _WIN64 + +static void (WINAPI *pWow64LdrpInitialize)( CONTEXT *ctx ); + +static void init_wow64( CONTEXT *context ) +{ + if (!imports_fixup_done) + { + HMODULE wow64; + WINE_MODREF *wm; + NTSTATUS status; + static const WCHAR wow64_path[] = L"C:\\windows\\system32\\wow64.dll"; + + if ((status = load_dll( NULL, wow64_path, NULL, 0, &wm ))) + { + ERR( "could not load %s, status %x\n", debugstr_w(wow64_path), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + wow64 = wm->ldr.DllBase; +#define GET_PTR(name) \ + if (!(p ## name = RtlFindExportedRoutineByName( wow64, #name ))) ERR( "failed to load %s\n", #name ) + + GET_PTR( Wow64LdrpInitialize ); +#undef GET_PTR + imports_fixup_done = TRUE; + } + + RtlLeaveCriticalSection( &loader_section ); + pWow64LdrpInitialize( context ); +} + + +#else + void *Wow64Transition = NULL; static void map_wow64cpu(void) @@ -3712,13 +3746,13 @@ static void map_wow64cpu(void) NtClose( file ); } -static void init_wow64(void) +static void init_wow64( CONTEXT *context ) { PEB *peb = NtCurrentTeb()->Peb; - PEB64 *peb64; + PEB64 *peb64 = UlongToPtr( NtCurrentTeb64()->Peb ); + + if (Wow64Transition) return; /* already initialized */ - if (!NtCurrentTeb64()) return; - peb64 = UlongToPtr( NtCurrentTeb64()->Peb ); peb64->OSMajorVersion = peb->OSMajorVersion; peb64->OSMinorVersion = peb->OSMinorVersion; peb64->OSBuildNumber = peb->OSBuildNumber; @@ -3791,14 +3825,14 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR init_user_process_params(); load_global_options(); version_init(); -#ifndef _WIN64 - init_wow64(); -#endif + wm = build_main_module(); wm->ldr.LoadCount = -1; build_ntdll_module(); + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); + if ((status = load_dll( NULL, L"kernel32.dll", NULL, 0, &kernel32 )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); @@ -3831,6 +3865,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } else wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); +#endif + RtlAcquirePebLock(); InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock();

1 0

Alexandre Julliard : ntdll/tests: Add tests for Wow64SystemServiceEx().
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 8337998d25688aff9964d1c58536e4d01eeeb60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8337998d25688aff9964d1c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 13:19:57 2021 +0200 ntdll/tests: Add tests for Wow64SystemServiceEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 1c1fd6bc769..14507623310 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1174,6 +1174,96 @@ static void test_iosb(void) CloseHandle( server ); } +static NTSTATUS invoke_syscall( const char *name, ULONG args32[] ) +{ + NTSTATUS status; + ULONG64 args64[] = { -1, PtrToUlong( args32 ) }; + ULONG64 ptr, res, func = get_proc_address64( wow64_module, "Wow64SystemServiceEx" ); + BYTE syscall[32]; + + if (!(ptr = get_proc_address64( ntdll_module, name ))) return STATUS_NOT_IMPLEMENTED; + + if (pNtWow64ReadVirtualMemory64) + { + HANDLE process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + status = pNtWow64ReadVirtualMemory64( process, ptr, syscall, sizeof(syscall), &res ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + if (syscall[0] == 0x4c && syscall[1] == 0x8b && syscall[2] == 0xd1 && syscall[3] == 0xb8) + args64[0] = *(DWORD *)(syscall + 4); + else + win_skip( "syscall thunk not recognized\n" ); + NtClose( process ); + } + return call_func64( func, ARRAY_SIZE(args64), args64 ); +} + +static void test_syscalls(void) +{ + ULONG64 func; + ULONG args32[8]; + HANDLE event, event2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + NTSTATUS status; + + if (!is_wow64) return; + if (!ntdll_module) return; + + func = get_proc_address64( wow64_module, "Wow64SystemServiceEx" ); + ok( func, "Wow64SystemServiceEx not found\n" ); + + event = CreateEventA( NULL, FALSE, FALSE, NULL ); + + status = NtSetEvent( event, NULL ); + ok( !status, "NtSetEvent failed %x\n", status ); + args32[0] = HandleToLong( event ); + status = invoke_syscall( "NtClose", args32 ); + ok( !status, "syscall failed %x\n", status ); + status = NtSetEvent( event, NULL ); + ok( status == STATUS_INVALID_HANDLE, "NtSetEvent failed %x\n", status ); + status = invoke_syscall( "NtClose", args32 ); + ok( status == STATUS_INVALID_HANDLE, "syscall failed %x\n", status ); + args32[0] = 0xdeadbeef; + status = invoke_syscall( "NtClose", args32 ); + ok( status == STATUS_INVALID_HANDLE, "syscall failed %x\n", status ); + + RtlInitUnicodeString( &name, L"\\BaseNamedObjects\\wow64-test"); + InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, 0, NULL ); + event = (HANDLE)0xdeadbeef; + args32[0] = PtrToUlong(&event ); + args32[1] = EVENT_ALL_ACCESS; + args32[2] = PtrToUlong( &attr ); + args32[3] = NotificationEvent; + args32[4] = 0; + status = invoke_syscall( "NtCreateEvent", args32 ); + ok( !status, "syscall failed %x\n", status ); + status = NtSetEvent( event, NULL ); + ok( !status, "NtSetEvent failed %x\n", status ); + + event2 = (HANDLE)0xdeadbeef; + args32[0] = PtrToUlong( &event2 ); + status = invoke_syscall( "NtOpenEvent", args32 ); + ok( !status, "syscall failed %x\n", status ); + status = NtSetEvent( event2, NULL ); + ok( !status, "NtSetEvent failed %x\n", status ); + args32[0] = HandleToLong( event2 ); + status = invoke_syscall( "NtClose", args32 ); + ok( !status, "syscall failed %x\n", status ); + + event2 = (HANDLE)0xdeadbeef; + args32[0] = PtrToUlong( &event2 ); + status = invoke_syscall( "NtCreateEvent", args32 ); + ok( status == STATUS_OBJECT_NAME_EXISTS, "syscall failed %x\n", status ); + status = NtSetEvent( event2, NULL ); + ok( !status, "NtSetEvent failed %x\n", status ); + args32[0] = HandleToLong( event2 ); + status = invoke_syscall( "NtClose", args32 ); + ok( !status, "syscall failed %x\n", status ); + + status = NtClose( event ); + ok( !status, "NtClose failed %x\n", status ); +} + static void test_cpu_area(void) { TEB64 *teb64 = (TEB64 *)NtCurrentTeb()->GdiBatchCount; @@ -1217,6 +1307,7 @@ START_TEST(wow64) test_modules(); test_init_block(); test_iosb(); + test_syscalls(); #endif test_cpu_area(); }

1 0

Alexandre Julliard : Wine release 6.13
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: website Branch: master Commit: 6e586cc6aa5c4c9405f9d2af20767ddc2d6f5a9b URL: https://source.winehq.org/git/website.git/?a=commit;h=6e586cc6aa5c4c9405f9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 22:11:20 2021 +0200 Wine release 6.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021072001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021072001.xml b/news/en/2021072001.xml new file mode 100644 index 00000000..3b5a11b5 --- /dev/null +++ b/news/en/2021072001.xml @@ -0,0 +1,17 @@ +<news> +<date>July 20, 2021</date> +<title>Wine 6.13 Released</title> +<body> + The Wine development release 6.13 is now available. + <a href="{$root}/announce/6.13">What's new</a> in this release: +<ul> + <li>Proper scrollbar theming.</li> + <li>More work towards WinSock PE conversion.</li> + <li>Preparation work for the GDI syscall interface.</li> + <li>Some progress on the IPHLPAPI PE conversion.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.13 : Alexandre Julliard : Release 6.13
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: refs/tags/wine-6.13 Tag: 30a7fbc6bfddba3fab2f494855d2a13661e3b6bb URL: https://source.winehq.org/git/wine.git/?a=tag;h=30a7fbc6bfddba3fab2f494855d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 22:09:28 2021 +0200 Release 6.13

1 0

Alexandre Julliard : Release 6.13.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: feb088b2247e1722b848ac0d67483596d33758ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb088b2247e1722b848ac0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 22:09:28 2021 +0200 Release 6.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 847 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 394 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=feb088b2247e1722b848…

1 0

Nikolay Sivov : mfmediaengine: Update network state when loading the media source.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: f56c12c8477c0deec92440ab809259602d84c2fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f56c12c8477c0deec92440ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 20 21:11:56 2021 +0300 mfmediaengine: Update network state when loading the media source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 ++++++++++++++--- include/mfmediaengine.idl | 8 ++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 36365f2a3cc..bd3fd04aabd 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -126,6 +126,7 @@ struct media_engine double default_playback_rate; double volume; double duration; + MF_MEDIA_ENGINE_NETWORK network_state; MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; MF_MEDIA_ENGINE_READY ready_state; @@ -1190,6 +1191,7 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, EnterCriticalSection(&engine->cs); + engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0); if (FAILED(hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object))) @@ -1205,8 +1207,13 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IUnknown_Release(object); } - if (FAILED(hr)) + if (SUCCEEDED(hr)) { + engine->network_state = MF_MEDIA_ENGINE_NETWORK_IDLE; + } + else + { + engine->network_state = MF_MEDIA_ENGINE_NETWORK_NO_SOURCE; engine->error_code = MF_MEDIA_ENGINE_ERR_SRC_NOT_SUPPORTED; engine->extended_code = hr; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ERROR, engine->error_code, @@ -1365,6 +1372,8 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + engine->network_state = MF_MEDIA_ENGINE_NETWORK_NO_SOURCE; + if (url) { IPropertyStore *props = NULL; @@ -1410,9 +1419,11 @@ static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + + TRACE("%p.\n", iface); - return 0; + return engine->network_state; } static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index c00e364116e..aaf3bb55e4d 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -50,6 +50,14 @@ cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID, 0x1e7 cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_TRACK_ID, 0x65bea312, 0x4043, 0x4815, 0x8e, 0xab, 0x44, 0xdc, 0xe2, 0xef, 0x8f, 0x2a);") cpp_quote("EXTERN_GUID(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, 0x5066893c, 0x8cf9, 0x42bc, 0x8b, 0x8a, 0x47, 0x22, 0x12, 0xe5, 0x27, 0x26);") +typedef enum MF_MEDIA_ENGINE_NETWORK +{ + MF_MEDIA_ENGINE_NETWORK_EMPTY, + MF_MEDIA_ENGINE_NETWORK_IDLE, + MF_MEDIA_ENGINE_NETWORK_LOADING, + MF_MEDIA_ENGINE_NETWORK_NO_SOURCE +} MF_MEDIA_ENGINE_NETWORK; + typedef enum MF_MEDIA_ENGINE_ERR { MF_MEDIA_ENGINE_ERR_NOERROR,

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021