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

Francois Gouget : kernel32/tests: Use WineTest contexts to simplify test_Loader().
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 566a98800d500091c1ddc5440a4e5406826b7f1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=566a98800d500091c1ddc544… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 18 07:35:11 2021 +0200 kernel32/tests: Use WineTest contexts to simplify test_Loader(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 98 ++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=566a98800d500091c1dd…

1 0

Paul Gofman : ntdll: Add SystemKernelDebuggerInformationEx info class to NtQuerySystemInformation().
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: b335b69368a642b0b57cfd63990313b34cb3ee31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b335b69368a642b0b57cfd63… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 13:40:57 2021 +0300 ntdll: Add SystemKernelDebuggerInformationEx info class to NtQuerySystemInformation(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 24 ++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 18 ++++++++++++++++++ include/winternl.h | 6 ++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c873a224a7c..85e27e92663 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -979,6 +979,7 @@ static void test_query_kerndebug(void) { NTSTATUS status; ULONG ReturnLength; + SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi_ex; SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi; status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, 0, &ReturnLength); @@ -991,6 +992,29 @@ static void test_query_kerndebug(void) status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi) + 2, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + + status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH + || status == STATUS_NOT_IMPLEMENTED /* before win7 */ + || status == STATUS_INVALID_INFO_CLASS /* wow64 on Win10 */, + "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + if (status != STATUS_INFO_LENGTH_MISMATCH) + { + win_skip( "NtQuerySystemInformation(SystemKernelDebuggerInformationEx) is not implemented.\n" ); + } + else + { + status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, + sizeof(skdi_ex), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + + status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, + sizeof(skdi_ex) + 2, &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + } } static void test_query_regquota(void) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 596eea251b6..fcc0fb6677e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2860,6 +2860,24 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemKernelDebuggerInformationEx: /* 149 */ + { + SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi; + + skdi.DebuggerAllowed = FALSE; + skdi.DebuggerEnabled = FALSE; + skdi.DebuggerPresent = FALSE; + + len = sizeof(skdi); + if (size >= len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else memcpy( info, &skdi, len ); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + case SystemCpuSetInformation: /* 175 */ return NtQuerySystemInformationEx(class, NULL, 0, info, size, ret_size); diff --git a/include/winternl.h b/include/winternl.h index f832729f985..c632328b322 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2485,6 +2485,12 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; +typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX { + BOOLEAN DebuggerAllowed; + BOOLEAN DebuggerEnabled; + BOOLEAN DebuggerPresent; +} SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION_EX; + typedef struct _VM_COUNTERS { SIZE_T PeakVirtualSize;

1 0

Biswapriyo Nath : winecrt0: Add missing members in _JUMP_BUFFER for SJLJ.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: d60c450c7be196c2072f74e34f7760d39e3bad32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d60c450c7be196c2072f74e3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jul 10 10:47:30 2021 +0530 winecrt0: Add missing members in _JUMP_BUFFER for SJLJ. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 +++- dlls/winecrt0/setjmp.c | 5 +++++ include/msvcrt/setjmp.h | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index cc97a98e0d6..8bede41ee49 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -127,7 +127,9 @@ typedef struct _JUMP_BUFFER unsigned __int64 R14; unsigned __int64 R15; unsigned __int64 Rip; - unsigned __int64 Spare; + unsigned long MxCsr; + unsigned short FpCsr; + unsigned short Spare; SETJMP_FLOAT128 Xmm6; SETJMP_FLOAT128 Xmm7; SETJMP_FLOAT128 Xmm8; diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c index d83df54b889..ffb3b243e75 100644 --- a/dlls/winecrt0/setjmp.c +++ b/dlls/winecrt0/setjmp.c @@ -66,6 +66,8 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ "movq (%rsp),%rax\n\t" "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ + "stmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnstcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ @@ -89,6 +91,9 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ + "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnclex\n\t" + "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index b539b22058f..6576605cf1b 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -65,7 +65,9 @@ typedef DECLSPEC_ALIGN(16) struct _JUMP_BUFFER unsigned __int64 R14; unsigned __int64 R15; unsigned __int64 Rip; - unsigned __int64 Spare; + unsigned long MxCsr; + unsigned short FpCsr; + unsigned short Spare; SETJMP_FLOAT128 Xmm6; SETJMP_FLOAT128 Xmm7; SETJMP_FLOAT128 Xmm8;

1 0

Francois Gouget : winetest: Create the -d directory if it does not exist already.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: dc8ef75904c0cace22f75b201c2c9f7c8b0f5cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc8ef75904c0cace22f75b20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 19 15:16:59 2021 +0200 winetest: Create the -d directory if it does not exist already. 'winetest.exe' automatically creates '%TEMP%\wct' (or an alternative new directory). 'winetext.exe -x DIR' automatically creates DIR. 'winetest.exe -d DIR' now automatically creates DIR too. In all cases newly created directories are removed after the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 81c7de2a020..fa773e28d4f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1024,6 +1024,7 @@ run_tests (char *logname, char *outdir) DWORD strsize; SECURITY_ATTRIBUTES sa; char tmppath[MAX_PATH], tempdir[MAX_PATH+4]; + BOOL newdir; DWORD needed; HMODULE kernel32; @@ -1064,22 +1065,23 @@ run_tests (char *logname, char *outdir) if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); - /* try stable path for ZoneAlarm */ - if (!outdir) { + if (outdir) + strcpy( tempdir, outdir); + else + { strcpy( tempdir, tmppath ); - strcat( tempdir, "wct" ); - - if (!CreateDirectoryA( tempdir, NULL )) - { - if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - DeleteFileA( tempdir ); - if (!CreateDirectoryA( tempdir, NULL )) - report (R_FATAL, "Could not create directory: %s", tempdir); - } + strcat( tempdir, "wct" ); /* try stable path for ZoneAlarm */ } - else - strcpy( tempdir, outdir); + newdir = CreateDirectoryA( tempdir, NULL ); + if (!newdir && !outdir) + { + if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) + report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); + DeleteFileA( tempdir ); + newdir = CreateDirectoryA( tempdir, NULL ); + } + if (!newdir && (!outdir || GetLastError() != ERROR_ALREADY_EXISTS)) + report (R_FATAL, "Could not create directory %s (%d)", tempdir, GetLastError()); report (R_DIR, tempdir); @@ -1172,7 +1174,7 @@ run_tests (char *logname, char *outdir) report (R_STATUS, "Cleaning up - %u failures", failures); CloseHandle( logfile ); logfile = 0; - if (!outdir) + if (newdir) remove_dir (tempdir); heap_free(wine_tests); heap_free(curpath);

1 0

Esdras Tarsis : api-ms-win-core-console-l3-2-0: Add stub dll.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 9422d0a0a2d65909cb9d3dfa360ce98bc35671de URL: https://source.winehq.org/git/wine.git/?a=commit;h=9422d0a0a2d65909cb9d3dfa… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Fri Jul 16 05:23:46 2021 -0300 api-ms-win-core-console-l3-2-0: Add stub dll. Needed for Pickup Basketball VR. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-console-l3-2-0/Makefile.in | 1 + .../api-ms-win-core-console-l3-2-0.spec | 32 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 37 insertions(+) diff --git a/configure b/configure index 27a33234eb7..bf5c5b71992 100755 --- a/configure +++ b/configure @@ -936,6 +936,7 @@ enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l1_2_0 enable_api_ms_win_core_console_l2_1_0 +enable_api_ms_win_core_console_l3_2_0 enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_crt_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 @@ -20085,6 +20086,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_ wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-2-0 enable_api_ms_win_core_console_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-console-l3-2-0 enable_api_ms_win_core_console_l3_2_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 diff --git a/configure.ac b/configure.ac index b889947b65b..084990c0cd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l3-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-datetime-l1-1-0) diff --git a/dlls/api-ms-win-core-console-l3-2-0/Makefile.in b/dlls/api-ms-win-core-console-l3-2-0/Makefile.in new file mode 100644 index 00000000000..74f49d62710 --- /dev/null +++ b/dlls/api-ms-win-core-console-l3-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l3-2-0.dll diff --git a/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec b/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec new file mode 100644 index 00000000000..a9923150866 --- /dev/null +++ b/dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec @@ -0,0 +1,32 @@ +@ stdcall AddConsoleAliasA(str str str) kernel32.AddConsoleAliasA +@ stdcall AddConsoleAliasW(wstr wstr wstr) kernel32.AddConsoleAliasW +@ stdcall ExpungeConsoleCommandHistoryA(str) kernel32.ExpungeConsoleCommandHistoryA +@ stdcall ExpungeConsoleCommandHistoryW(wstr) kernel32.ExpungeConsoleCommandHistoryW +@ stub GetConsoleAliasA +@ stub GetConsoleAliasExesA +@ stdcall GetConsoleAliasExesLengthA() kernel32.GetConsoleAliasExesLengthA +@ stdcall GetConsoleAliasExesLengthW() kernel32.GetConsoleAliasExesLengthW +@ stub GetConsoleAliasExesW +@ stdcall GetConsoleAliasW(wstr ptr long wstr) kernel32.GetConsoleAliasW +@ stub GetConsoleAliasesA +@ stdcall GetConsoleAliasesLengthA(str) kernel32.GetConsoleAliasesLengthA +@ stdcall GetConsoleAliasesLengthW(wstr) kernel32.GetConsoleAliasesLengthW +@ stub GetConsoleAliasesW +@ stdcall GetConsoleCommandHistoryA(long long long) kernel32.GetConsoleCommandHistoryA +@ stdcall GetConsoleCommandHistoryLengthA(str) kernel32.GetConsoleCommandHistoryLengthA +@ stdcall GetConsoleCommandHistoryLengthW(wstr) kernel32.GetConsoleCommandHistoryLengthW +@ stdcall GetConsoleCommandHistoryW(long long long) kernel32.GetConsoleCommandHistoryW +@ stdcall GetConsoleDisplayMode(ptr) kernel32.GetConsoleDisplayMode +@ stdcall GetConsoleFontSize(long long) kernel32.GetConsoleFontSize +@ stub GetConsoleHistoryInfo +@ stdcall GetConsoleProcessList(ptr long) kernel32.GetConsoleProcessList +@ stub GetConsoleSelectionInfo +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stdcall GetCurrentConsoleFont(long long ptr) kernel32.GetCurrentConsoleFont +@ stdcall GetCurrentConsoleFontEx(long long ptr) kernel32.GetCurrentConsoleFontEx +@ stdcall GetNumberOfConsoleMouseButtons(ptr) kernel32.GetNumberOfConsoleMouseButtons +@ stdcall SetConsoleDisplayMode(long long ptr) kernel32.SetConsoleDisplayMode +@ stub SetConsoleHistoryInfo +@ stub SetConsoleNumberOfCommandsA +@ stub SetConsoleNumberOfCommandsW +@ stdcall SetCurrentConsoleFontEx(long long ptr) kernel32.SetCurrentConsoleFontEx diff --git a/tools/make_specfiles b/tools/make_specfiles index d782beb27d7..50d848b4ce8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -232,6 +232,7 @@ my @dll_groups = "api-ms-win-core-console-l1-1-0", "api-ms-win-core-console-l1-2-0", "api-ms-win-core-console-l2-1-0", + "api-ms-win-core-console-l3-2-0", "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0",

1 0

Jacek Caban : gdi32: Introduce DC_ATTR struct and use it to store current position.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 3f779e47ee2414e6221d7f66f855d69ee624f2f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f779e47ee2414e6221d7f66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:01:49 2021 +0200 gdi32: Introduce DC_ATTR struct and use it to store current position. 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 | 24 +++++++++++++++++++----- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 2 +- dlls/gdi32/ntgdi_private.h | 2 +- dlls/gdi32/painting.c | 30 +++++++++++++++--------------- dlls/gdi32/path.c | 2 +- include/ntgdi.h | 10 ++++++++++ 8 files changed, 53 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f779e47ee2414e6221d…

1 0

Nikolay Sivov : mfplat: Add some Video Processor attributes to tracing.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 5af2db41b3c6d4040d5087d38e904a781ac67aa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5af2db41b3c6d4040d5087d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 16 20:24:53 2021 +0300 mfplat: Add some Video Processor attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 ++++ include/mfidl.idl | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5406ceb5063..bcad90c29da 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1530,11 +1530,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), + X(MF_XVP_DISABLE_FRC), X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), X(MF_MT_PIXEL_ASPECT_RATIO), + X(MF_VIDEO_PROCESSOR_ALGORITHM), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MFT_CONNECTED_STREAM_ATTRIBUTE), X(MF_MT_REALTIME_CONTENT), @@ -1546,6 +1548,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MAX_LUMINANCE_LEVEL), X(MFT_CONNECTED_TO_HW_STREAM), X(MF_SA_D3D_AWARE), + X(MF_XVP_SAMPLE_LOCK_TIMEOUT), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), @@ -1741,6 +1744,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), + X(MF_XVP_CALLER_ALLOCATES_OUTPUT), X(MF_MT_H264_SVC_CAPABILITIES), X(MF_TOPONODE_WORKQUEUE_ITEM_PRIORITY), X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_LENGTH), diff --git a/include/mfidl.idl b/include/mfidl.idl index 76e0d0dfeb4..5b16c08bb90 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1573,4 +1573,9 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xb cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_VIDEO_PROCESSOR_ALGORITHM, 0x4a0a1e1f, 0x272c, 0x4fb6, 0x9e, 0xb1, 0xdb, 0x33, 0x0c, 0xbc, 0x97, 0xca);") +cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe8, 0x16, 0xd4, 0xfc, 0x51, 0x8d, 0x8c);") +cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") +cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Jacek Caban : gdi32: Handle metafiles directly in Arc implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: b789992337609843873109aab4b58cc9b6f9cdeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b789992337609843873109aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 18 12:57:34 2021 +0200 gdi32: Handle metafiles directly in Arc 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/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 5 +++++ dlls/gdi32/mfdrv/graphics.c | 20 +++++++++++++++----- dlls/gdi32/mfdrv/init.c | 4 ++-- dlls/gdi32/mfdrv/metafiledrv.h | 4 ++-- dlls/gdi32/tests/metafile.c | 3 +++ 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8c014b7123f..436846c5bd5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -37,6 +37,8 @@ static inline BOOL is_meta_dc( HDC hdc ) return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; } +extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index d3f71d3c59d..01c9dfdf8c7 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -55,6 +55,11 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, INT bottom, { TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if (is_meta_dc( hdc )) + return METADC_Arc( hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiArc, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 89793d0e72d..2037d7ac2e2 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -48,13 +48,23 @@ BOOL METADC_LineTo( HDC hdc, INT x, INT y ) /*********************************************************************** - * MFDRV_Arc + * METADC_Arc */ -BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return metadc_param8( hdc, META_ARC, left, top, right, bottom, + xstart, ystart, xend, yend ); +} + + +/*********************************************************************** + * MFDRV_ArcTo + */ +BOOL CDECL MFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { - return MFDRV_MetaParam8(dev, META_ARC, left, top, right, bottom, - xstart, ystart, xend, yend); + return FALSE; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 17352282471..444d3dbf1d4 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -103,8 +103,8 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_AbortPath, /* pAbortPath */ NULL, /* pAlphaBlend */ NULL, /* pAngleArc */ - MFDRV_Arc, /* pArc */ - NULL, /* pArcTo */ + NULL, /* pArc */ + MFDRV_ArcTo, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ NULL, /* pChord */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index fd206b75ac0..46a9d43d34b 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -67,8 +67,8 @@ extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, /* Metafile driver functions */ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL CDECL MFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2ea8b1070ce..0e2a5aa4cec 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3312,6 +3312,9 @@ static void test_mf_Graphics(void) ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); + ret = ArcTo(hdcMetafile, 1, 2, 30, 40, 11, 12, 23, 24 ); + ok( !ret, "ArcTo succeeded\n" ); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hdcMetafile);

1 0

Jacek Caban : gdi32: Handle metafiles directly in Chord and Pie implementations.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: b70616b50832a9e887a619123bcb61d52de7631c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70616b50832a9e887a61912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:01:18 2021 +0200 gdi32: Handle metafiles directly in Chord and Pie implementations. 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/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/mfdrv/graphics.c | 20 ++++++++++---------- dlls/gdi32/mfdrv/init.c | 15 +++++++++++++-- dlls/gdi32/mfdrv/metafiledrv.h | 7 +++---- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 41758b6a25b..8c014b7123f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -37,7 +37,11 @@ static inline BOOL is_meta_dc( HDC hdc ) return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; } +extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, + INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; 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; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1aac2d5b418..d3f71d3c59d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -81,6 +81,10 @@ BOOL WINAPI Chord( HDC hdc, INT left, INT top, INT right, INT bottom, TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + if (is_meta_dc( hdc )) + return METADC_Chord( hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiChord, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } @@ -94,6 +98,10 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, INT right, INT bottom, TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + if (is_meta_dc( hdc )) + return METADC_Pie( hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiPie, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index ebed0f8bc3b..89793d0e72d 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -59,24 +59,24 @@ BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** - * MFDRV_Pie + * METADC_Pie */ -BOOL CDECL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { - return MFDRV_MetaParam8(dev, META_PIE, left, top, right, bottom, - xstart, ystart, xend, yend); + return metadc_param8( hdc, META_PIE, left, top, right, bottom, + xstart, ystart, xend, yend ); } /*********************************************************************** - * MFDRV_Chord + * METADC_Chord */ -BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { - return MFDRV_MetaParam8(dev, META_CHORD, left, top, right, bottom, - xstart, ystart, xend, yend); + return metadc_param8( hdc, META_CHORD, left, top, right, bottom, + xstart, ystart, xend, yend ); } /*********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index df97817e0a9..17352282471 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -107,7 +107,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ - MFDRV_Chord, /* pChord */ + NULL, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ @@ -167,7 +167,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ MFDRV_PaintRgn, /* pPaintRgn */ MFDRV_PatBlt, /* pPatBlt */ - MFDRV_Pie, /* pPie */ + NULL, /* pPie */ MFDRV_PolyBezier, /* pPolyBezier */ MFDRV_PolyBezierTo, /* pPolyBezierTo */ NULL, /* pPolyDraw */ @@ -613,3 +613,14 @@ BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) if (!(dev = get_metadc_ptr( hdc ))) return FALSE; return MFDRV_MetaParam2( &dev->dev, func, param1, param2 ); } + +BOOL metadc_param8( HDC hdc, short func, short param1, short param2, + short param3, short param4, short param5, + short param6, short param7, short param8) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam8( &dev->dev, func, param1, param2, param3, + param4, param5, param6, param7, param8 ); +} diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b2384602743..fd206b75ac0 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -60,6 +60,9 @@ extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; +extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, + short param3, short param4, short param5, short param6, + short param7, short param8 ) DECLSPEC_HIDDEN; /* Metafile driver functions */ @@ -67,8 +70,6 @@ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; @@ -89,8 +90,6 @@ extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *p extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Handle metafiles directly in MoveToEx implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 95b3504e1e8e065046b63cd4c5237f809b8ead00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95b3504e1e8e065046b63cd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:20:11 2021 +0200 gdi32: Handle metafiles directly in MoveToEx 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/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 12 ++++-------- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 830c2707e29..41758b6a25b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -38,5 +38,6 @@ static inline BOOL is_meta_dc( HDC hdc ) } extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index eecd1b69ad6..1aac2d5b418 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -42,6 +42,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, POINT *pt ) { TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); + + if (is_meta_dc( hdc )) return METADC_MoveTo( hdc, x, y ); return NtGdiMoveTo( hdc, x, y, pt ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 95c25d1e709..ebed0f8bc3b 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); /********************************************************************** - * MFDRV_MoveTo + * METADC_MoveTo */ -BOOL CDECL MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) +BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2(dev,META_MOVETO,x,y); + return metadc_param2( hdc, META_MOVETO, x, y ); } /*********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 36b523e52cc..df97817e0a9 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -161,7 +161,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_InvertRgn, /* pInvertRgn */ NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ - MFDRV_MoveTo, /* pMoveTo */ + NULL, /* pMoveTo */ MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ MFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 88c149e0523..b2384602743 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -84,7 +84,6 @@ extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 574ccc3d98f..2ea8b1070ce 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3302,16 +3302,12 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + + oldpoint.x = oldpoint.y = 0xdeadbeef; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + ok(oldpoint.x == 0xdeadbeef && oldpoint.y == 0xdeadbeef, + "MoveToEx modified oldpoint\n"); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError());

1 0