wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Paul Gofman : ntdll: Add stub for ProcessInstrumentationCallback info class in NtSetInformationProcess().
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 20fff538c49c87abffd583f6b63371592ebdd835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20fff538c49c87abffd583f6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 15:16:29 2021 +0300 ntdll: Add stub for ProcessInstrumentationCallback info class in NtSetInformationProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 11 +++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 85e27e92663..a00cb5a6a5b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3256,6 +3256,32 @@ static void test_debug_object(void) ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode ); } +static void test_process_instrumentation_callback(void) +{ + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION info; + NTSTATUS status; + + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS + || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status ); + if (status != STATUS_INFO_LENGTH_MISMATCH) + { + win_skip( "ProcessInstrumentationCallback is not supported.\n" ); + return; + } + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) ); + ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD ) + || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status ); + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) ); + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH + || broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */, + "Got unexpected status %#x.\n", status ); +} + START_TEST(info) { char **argv; @@ -3322,4 +3348,5 @@ START_TEST(info) test_NtGetCurrentProcessorNumber(); test_ThreadEnableAlignmentFaultFixup(); + test_process_instrumentation_callback(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 77fb81fe404..2cd91974462 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1485,6 +1485,17 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, } break; + case ProcessInstrumentationCallback: + { + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION *instr = info; + + FIXME( "ProcessInstrumentationCallback stub.\n" ); + + if (size < sizeof(*instr)) return STATUS_INFO_LENGTH_MISMATCH; + ret = STATUS_SUCCESS; + break; + } + case ProcessThreadStackAllocation: { void *addr = NULL; diff --git a/include/winternl.h b/include/winternl.h index c632328b322..09804a21571 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1472,6 +1472,13 @@ typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION { #define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 #define FILE_SKIP_SET_USER_EVENT_ON_FAST_IO 0x4 +typedef struct _PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION +{ + ULONG Version; + ULONG Reserved; + VOID *Callback; +} PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION, *PPROCESS_INSTRUMENTATION_CALLBACK_INFORMATION; + typedef enum _FSINFOCLASS { FileFsVolumeInformation = 1, FileFsLabelInformation,

1 0

Paul Gofman : ntdll: Add SystemKernelDebuggerInformationEx info class to NtQuerySystemInformation().
by Alexandre Julliard 19 Jul '21

19 Jul '21

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

Esdras Tarsis : api-ms-win-core-kernel32-legacy-l1-1-5: Add stub dll.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 3515da1b823feb014f599c1ce8d47ffd4b05bbdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3515da1b823feb014f599c1c… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Fri Jul 16 05:23:47 2021 -0300 api-ms-win-core-kernel32-legacy-l1-1-5: Add stub dll. 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-kernel32-legacy-l1-1-5/Makefile.in | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-5.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index bf5c5b71992..3ddf6959a9e 100755 --- a/configure +++ b/configure @@ -975,6 +975,7 @@ enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_2 +enable_api_ms_win_core_kernel32_legacy_l1_1_5 enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_largeinteger_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_0 @@ -20125,6 +20126,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_j wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-2 enable_api_ms_win_core_kernel32_legacy_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-5 enable_api_ms_win_core_kernel32_legacy_l1_1_5 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_core_kernel32_private_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-largeinteger-l1-1-0 enable_api_ms_win_core_largeinteger_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 diff --git a/configure.ac b/configure.ac index 084990c0cd6..b5d3217f2a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2795,6 +2795,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-5) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-largeinteger-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in new file mode 100644 index 00000000000..3bfa42e968e --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-legacy-l1-1-5.dll diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/api-ms-win-core-kernel32-legacy-l1-1-5.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/api-ms-win-core-kernel32-legacy-l1-1-5.spec new file mode 100644 index 00000000000..868a457cb79 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/api-ms-win-core-kernel32-legacy-l1-1-5.spec @@ -0,0 +1,2 @@ +@ stdcall GetDllDirectoryW(long ptr) kernel32.GetDllDirectoryW +@ stdcall SetThreadExecutionState(long) kernel32.SetThreadExecutionState diff --git a/tools/make_specfiles b/tools/make_specfiles index 50d848b4ce8..44abb58b0a8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -254,6 +254,7 @@ my @dll_groups = "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-2", + "api-ms-win-core-kernel32-legacy-l1-1-5", "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1",

1 0

Esdras Tarsis : api-ms-win-core-console-l3-2-0: Add stub dll.
by Alexandre Julliard 19 Jul '21

19 Jul '21

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

Francois Gouget : kernel32/tests: Use WineTest contexts to simplify test_Loader().
by Alexandre Julliard 19 Jul '21

19 Jul '21

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

Jacek Caban : gdi32: Introduce DC_ATTR struct and use it to store current position.
by Alexandre Julliard 19 Jul '21

19 Jul '21

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

Jacek Caban : gdi32: Handle metafiles directly in Arc implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

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 19 Jul '21

19 Jul '21

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 19 Jul '21

19 Jul '21

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

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

19 Jul '21

Module: wine Branch: master Commit: 68b6cca258b6db8179446cff06c54cb2198185ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b6cca258b6db8179446cff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 17:00:55 2021 +0200 gdi32: Handle metafiles 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/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 18 +++++++++++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +++- include/ntgdi.h | 3 +++ 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8db78190d5f..830c2707e29 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -31,4 +31,12 @@ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; +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; +} + +extern BOOL METADC_LineTo( 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 b2bddc717ae..eecd1b69ad6 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) { TRACE( "%p, (%d, %d)\n", hdc, x, y ); + + if (is_meta_dc( hdc )) return METADC_LineTo( hdc, x, y ); return NtGdiLineTo( hdc, x, y ); } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 616980d1204..95c25d1e709 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -39,11 +39,11 @@ BOOL CDECL MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) } /*********************************************************************** - * MFDRV_LineTo + * METADC_LineTo */ -BOOL CDECL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL METADC_LineTo( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2(dev, META_LINETO, x, y); + return metadc_param2( hdc, META_LINETO, x, y ); } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f337d4ec559..36b523e52cc 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -159,7 +159,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pGradientFill */ MFDRV_IntersectClipRect, /* pIntersectClipRect */ MFDRV_InvertRgn, /* pInvertRgn */ - MFDRV_LineTo, /* pLineTo */ + NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ MFDRV_MoveTo, /* pMoveTo */ MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ @@ -259,6 +259,7 @@ static DC *MFDRV_AllocMetaFile(void) } push_dc_driver( &dc->physDev, &physDev->dev, &MFDRV_Funcs ); + set_gdi_client_ptr( dc->hSelf, physDev ); physDev->handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(physDev->handles[0])); physDev->handles_size = HANDLE_LIST_INC; @@ -597,3 +598,18 @@ BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, params[7] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } + +static METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) +{ + METAFILEDRV_PDEVICE *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC ); + if (!metafile) SetLastError( ERROR_INVALID_HANDLE ); + return metafile; +} + +BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam2( &dev->dev, func, param1, param2 ); +} diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 6f1f9587d58..88c149e0523 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "ntgdi_private.h" +#include "gdi_private.h" /* Metafile driver physical DC */ @@ -58,6 +59,8 @@ extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; 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; + /* Metafile driver functions */ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; @@ -81,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_LineTo( PHYSDEV dev, INT x, INT y ) 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; diff --git a/include/ntgdi.h b/include/ntgdi.h index d90529392d5..9b37810f7a3 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -67,6 +67,9 @@ typedef struct _GDI_HANDLE_ENTRY /* Wine extension, native uses NTGDI_OBJ_DC */ #define NTGDI_OBJ_MEMDC 0x41 +#define NTGDI_HANDLE_TYPE_SHIFT 16 +#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 + typedef struct _GDI_SHARED_MEMORY { GDI_HANDLE_ENTRY Handles[GDI_MAX_HANDLE_COUNT];

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
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