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

Alexandre Julliard : ntdll: Use the 32-bit RtlUserThreadStart as initial Eip in the 32-bit context.
by Alexandre Julliard 09 Jul '21

09 Jul '21

Module: wine Branch: master Commit: 1ce08530c34b3760f8efe3f009efdb5cea8f1131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce08530c34b3760f8efe3f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 21:09:56 2021 +0200 ntdll: Use the 32-bit RtlUserThreadStart as initial Eip in the 32-bit context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4deeec37abb..6b668508d80 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2930,7 +2930,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B wow_context->Eax = (ULONG_PTR)entry; wow_context->Ebx = (ULONG_PTR)arg; wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; - wow_context->Eip = (ULONG_PTR)pRtlUserThreadStart; + wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; wow_context->SegCs = cs32_sel; wow_context->SegDs = context.SegDs; wow_context->SegEs = context.SegEs;

1 0

Paul Gofman : mshtml: Move assert.h include to mshtml_private.h.
by Alexandre Julliard 08 Jul '21

08 Jul '21

1 0

Paul Gofman : mshtml_private.tlb: Add private typelib.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 73f7873d96e2468f3fe8781e93c3c88700cbd2be URL: https://source.winehq.org/git/wine.git/?a=commit;h=73f7873d96e2468f3fe8781e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 8 03:34:20 2021 +0300 mshtml_private.tlb: Add private typelib. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/mshtml.rc | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mshtml_private_iface.idl | 28 ++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 469667081e3..ce7ddb40bde 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -71,4 +71,5 @@ RC_SRCS = mshtml.rc IDL_SRCS = \ mshtml_classes.idl \ + mshtml_private_iface.idl \ nsiface.idl diff --git a/dlls/mshtml/mshtml.rc b/dlls/mshtml/mshtml.rc index 22926e1643e..156e1ad734d 100644 --- a/dlls/mshtml/mshtml.rc +++ b/dlls/mshtml/mshtml.rc @@ -74,3 +74,6 @@ REGINST REGINST mshtml.inf /* @makedep: blank.htm */ blank.htm HTML "blank.htm" + +/* @makedep: mshtml_private_iface.tlb */ +1 TYPELIB mshtml_private_iface.tlb diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e3486aa3314..6228cf1298d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,8 @@ #include "nsiface.h" +#include "mshtml_private_iface.h" + #include <assert.h> #define NS_ERROR_GENERATE_FAILURE(module,code) \ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl new file mode 100644 index 00000000000..5a01c6c1b27 --- /dev/null +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep typelib + +[ + version(1.0), + hidden, + uuid(90de541e-380b-4530-94a9-97367fe49d8d) +] +library MSHTML_private +{ +} /* library MSHTML_private */

1 0

Paul Gofman : mshtml: Export requestAnimationFrame() through a private interface.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: fdb304ff1444a898fd81f12961c3006f4800ca32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb304ff1444a898fd81f129… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 8 03:34:21 2021 +0300 mshtml: Export requestAnimationFrame() through a private interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 31 ++++++++- dlls/mshtml/htmlwindow.c | 126 +++++++++++++++++++++++++++-------- dlls/mshtml/mshtml_private.h | 6 ++ dlls/mshtml/mshtml_private_iface.idl | 18 +++++ 4 files changed, 149 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdb304ff1444a898fd81…

1 0

Paul Gofman : mshtml: Add console object stub implementation.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: fd892ff10f87c3ab6c7c8af23c8a9e2c940496d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd892ff10f87c3ab6c7c8af2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 8 03:34:22 2021 +0300 mshtml: Add console object stub implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 19 +++ dlls/mshtml/mshtml_private.h | 6 +- dlls/mshtml/mshtml_private_iface.idl | 46 +++++++ dlls/mshtml/omnavigator.c | 258 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 64 +++++++++ 6 files changed, 393 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd892ff10f87c3ab6c7c…

1 0

Jacek Caban : gdi32/tests: Remove workarounds for old Windows versions.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 4b1094099c697ba59c791feb7b040c2d32cd4265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1094099c697ba59c791feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 8 17:11:13 2021 +0200 gdi32/tests: Remove workarounds for old Windows versions. 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 | 94 +++++++-------------------------------------- 1 file changed, 13 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1094099c697ba59c79…

1 0

Jacek Caban : gdi32/test: Add more handle table tests.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: c56cf0131bfa758ff35964124046a825a3f6eb86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56cf0131bfa758ff3596412… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 8 17:11:26 2021 +0200 gdi32/test: Add more handle table tests. 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/gdiobj.c | 83 ++++++++++++++++++++++++++++++++++++++++++----- include/ntgdi.h | 31 ++++++++++++++++-- 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 80c8b284c62..5665361d5e6 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -378,12 +378,45 @@ static GDI_SHARED_MEMORY *get_gdi_shared(void) return (GDI_SHARED_MEMORY *)NtCurrentTeb()->Peb->GdiSharedHandleTable; } +static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_stock ) +{ + GDI_SHARED_MEMORY *gdi_shared = get_gdi_shared(); + unsigned int handle = HandleToULong( obj ); + GDI_HANDLE_ENTRY *entry; + + entry = &gdi_shared->Handles[handle & 0xffff]; + ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", + entry->Unique, handle >> 16); + if (type != NTGDI_OBJ_MEMDC) + { + todo_wine + ok(entry->ExtType == type, "ExtType = %x, expected %x\n", entry->ExtType, type); + } + else + { + todo_wine + ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); + } + todo_wine_if(is_stock) + ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); + todo_wine + ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); + ok(entry->Object, "Object = NULL\n"); + ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); +} + static void test_shared_handle_table(void) { GDI_SHARED_MEMORY *gdi_shared; GDI_HANDLE_ENTRY *entry; unsigned int handle; + HENHMETAFILE enhmetafile; + HMETAFILE metafile; + HPEN pen; HRGN hrgn; + HBRUSH brush; + LOGBRUSH lb; + HDC dc; if (sizeof(void *) == 4 && !is_wow64) { @@ -394,18 +427,13 @@ static void test_shared_handle_table(void) hrgn = CreateRectRgn(10, 10, 20, 20); ok(hrgn != 0, "CreateRectRgn failed\n"); - - handle = (UINT_PTR)hrgn; + handle = HandleToULong( hrgn ); entry = &gdi_shared->Handles[handle & 0xffff]; - ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", - entry->Unique, handle >> 16); - todo_wine - ok(entry->Type == 4, "Type = %x\n", entry->Type); - ok(entry->Object, "Object = NULL\n"); todo_wine ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %x\n", entry->Owner.ProcessId, GetCurrentProcessId()); - ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + + test_shared_handle_entry( hrgn, NTGDI_OBJ_REGION, FALSE ); DeleteObject(hrgn); ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", @@ -417,6 +445,45 @@ static void test_shared_handle_table(void) ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %x\n", entry->Owner.ProcessId, GetCurrentProcessId()); ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + + test_shared_handle_entry( GetStockObject( WHITE_PEN ), NTGDI_OBJ_PEN, TRUE ); + test_shared_handle_entry( GetStockObject( WHITE_BRUSH ), NTGDI_OBJ_BRUSH, TRUE ); + + brush = CreateSolidBrush(0); + test_shared_handle_entry( brush, NTGDI_OBJ_BRUSH, FALSE ); + DeleteObject(brush); + + lb.lbStyle = BS_SOLID; + lb.lbColor = RGB(12,34,56); + lb.lbHatch = HS_CROSS; + pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); + test_shared_handle_entry( pen, NTGDI_OBJ_EXTPEN, FALSE ); + DeleteObject(pen); + + test_shared_handle_entry( GetStockObject( SYSTEM_FONT ), NTGDI_OBJ_FONT, TRUE ); + test_shared_handle_entry( GetStockObject( DEFAULT_PALETTE ), NTGDI_OBJ_PAL, TRUE ); + test_shared_handle_entry( GetStockObject( STOCK_LAST + 1 ), NTGDI_OBJ_BITMAP, TRUE ); + + dc = CreateDCW(L"display", NULL, NULL, NULL); + ok(GetObjectType(dc) == OBJ_DC, "GetObjectType(dc) = %x\n", GetObjectType(dc)); + test_shared_handle_entry( dc, NTGDI_OBJ_DC, FALSE ); + DeleteDC(dc); + + dc = CreateMetaFileW(NULL); + test_shared_handle_entry( dc, NTGDI_OBJ_METADC, FALSE ); + metafile = CloseMetaFile(dc); + test_shared_handle_entry( metafile, NTGDI_OBJ_METAFILE, FALSE ); + DeleteObject(metafile); + + dc = CreateEnhMetaFileW(NULL, NULL, NULL, NULL); + test_shared_handle_entry( dc, NTGDI_OBJ_ENHMETADC, FALSE ); + enhmetafile = CloseEnhMetaFile(dc); + test_shared_handle_entry( enhmetafile, NTGDI_OBJ_ENHMETAFILE, FALSE ); + DeleteObject(metafile); + + dc = CreateCompatibleDC(NULL); + test_shared_handle_entry( dc, NTGDI_OBJ_MEMDC, FALSE ); + DeleteDC(dc); } START_TEST(gdiobj) diff --git a/include/ntgdi.h b/include/ntgdi.h index 196fb69bf4e..7e8954468fb 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -34,14 +34,39 @@ typedef struct _GDI_HANDLE_ENTRY }; ULONG Value; } Owner; - USHORT Unique; - UCHAR Type; - UCHAR Flags; + union + { + struct + { + UCHAR ExtType : 7; + UCHAR StockFlag : 1; + UCHAR Generation; + }; + USHORT Unique; + }; + UCHAR Type; + UCHAR Flags; UINT64 UserPointer; } GDI_HANDLE_ENTRY, *PGDI_HANDLE_ENTRY; #define GDI_MAX_HANDLE_COUNT 0x10000 +#define NTGDI_OBJ_DC 0x01 +#define NTGDI_OBJ_ENHMETADC 0x21 +#define NTGDI_OBJ_REGION 0x04 +#define NTGDI_OBJ_METAFILE 0x26 +#define NTGDI_OBJ_ENHMETAFILE 0x46 +#define NTGDI_OBJ_METADC 0x66 +#define NTGDI_OBJ_PAL 0x08 +#define NTGDI_OBJ_BITMAP 0x09 +#define NTGDI_OBJ_FONT 0x0a +#define NTGDI_OBJ_BRUSH 0x10 +#define NTGDI_OBJ_PEN 0x30 +#define NTGDI_OBJ_EXTPEN 0x50 + +/* Wine extension, native uses NTGDI_OBJ_DC */ +#define NTGDI_OBJ_MEMDC 0x41 + typedef struct _GDI_SHARED_MEMORY { GDI_HANDLE_ENTRY Handles[GDI_MAX_HANDLE_COUNT];

1 0

Jacek Caban : gdi32: Store ntgdi object types in handle table.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 06afb958d457fe5ae7984fe027fc0926bed8d789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06afb958d457fe5ae7984fe0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 8 17:11:45 2021 +0200 gdi32: Store ntgdi object types in handle table. 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/bitmap.c | 14 ++++++------ dlls/gdi32/brush.c | 10 ++++----- dlls/gdi32/dc.c | 12 +++++----- dlls/gdi32/dib.c | 14 ++++++------ dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/enhmetafile.c | 4 ++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 41 +++++++++++++++++----------------- dlls/gdi32/metafile.c | 6 ++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/objects.c | 55 +++++++++++++++++++++++++++++++--------------- dlls/gdi32/palette.c | 18 +++++++-------- dlls/gdi32/pen.c | 12 +++++----- dlls/gdi32/region.c | 40 ++++++++++++++++----------------- dlls/gdi32/tests/gdiobj.c | 2 -- 17 files changed, 129 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06afb958d457fe5ae798…

1 0

Nikolay Sivov : mf/evr: Query d3d device manager via MR_VIDEO_RENDER_SERVICE service.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 1a4136a9bc1257d2ba0becd33c05e9c472bd2fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4136a9bc1257d2ba0becd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 8 18:55:03 2021 +0300 mf/evr: Query d3d device manager via MR_VIDEO_RENDER_SERVICE service. Default presenter responds to MR_VIDEO_ACCELERATION_SERVICE as well, but we'll have to be compatible to integrate with custom presenters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index d048ea59681..5730a6e769f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1610,6 +1610,12 @@ static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); } +static HRESULT video_renderer_get_device_manager(struct video_renderer *renderer, IUnknown **device_manager) +{ + return MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_RENDER_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)device_manager); +} + static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; @@ -1660,13 +1666,12 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) /* Set device manager that presenter should have created. */ if (video_renderer_is_mixer_d3d_aware(renderer)) { - IDirect3DDeviceManager9 *device_manager; + IUnknown *device_manager; - if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IDirect3DDeviceManager9, (void **)&device_manager))) + if (SUCCEEDED(video_renderer_get_device_manager(renderer, &device_manager))) { IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); - IDirect3DDeviceManager9_Release(device_manager); + IUnknown_Release(device_manager); } } @@ -1690,8 +1695,7 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere hr = video_renderer_init_presenter_services(renderer); - if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IUnknown, (void **)&renderer->device_manager))) + if (FAILED(video_renderer_get_device_manager(renderer, &renderer->device_manager))) { WARN("Failed to get device manager from the presenter.\n"); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 8b982a1955adfa34127a6ef799f1768d5dd1f179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b982a1955adfa34127a6ef7… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 8 17:52:15 2021 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 427 +++++++++++++++++++++------------------------------------------ 1 file changed, 139 insertions(+), 288 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b982a1955adfa34127a…

1 0