wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Hans Leidekker : mountmgr: Fix buffer length check.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: ea9b507380b4415cf9edd3643d9bcea7ab934fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9b507380b4415cf9edd364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 16:13:12 2020 +0200 mountmgr: Fix buffer length check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49305 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c29ce9f924..d99a096c61 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1780,7 +1780,7 @@ static void query_property( struct disk_device *device, IRP *irp ) if (!irp->UserBuffer || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DEVICE_DESCRIPTOR)) + else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { descriptor = irp->UserBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR);

1 0

Louis Lenders : api-ms-win-core-localization-l1-2-2: Add new dll.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: d48fed09e530b8e5779412d083a71aeea5808644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48fed09e530b8e5779412d0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:02 2020 +0200 api-ms-win-core-localization-l1-2-2: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-2-2.spec | 42 ++++++++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/configure b/configure index 5ad79eaf27..d12afc2a4d 100755 --- a/configure +++ b/configure @@ -975,6 +975,7 @@ enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 +enable_api_ms_win_core_localization_l1_2_2 enable_api_ms_win_core_localization_l2_1_0 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localization_obsolete_l1_2_0 @@ -20302,6 +20303,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 +wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-2 enable_api_ms_win_core_localization_l1_2_2 wine_fn_config_makefile dlls/api-ms-win-core-localization-l2-1-0 enable_api_ms_win_core_localization_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 diff --git a/configure.ac b/configure.ac index 87ba3bb780..e61a98455c 100644 --- a/configure.ac +++ b/configure.ac @@ -2891,6 +2891,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-obsolete-l1-2-0) diff --git a/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in new file mode 100644 index 0000000000..f4475691cc --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-2-2.dll diff --git a/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec b/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec new file mode 100644 index 0000000000..37f45c3303 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec @@ -0,0 +1,42 @@ +@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx +@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW +@ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GetACP() kernel32.GetACP +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx +@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo +@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW +@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW +@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA +@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx +@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW +@ stdcall GetNLSVersionEx(long wstr ptr) kernel32.GetNLSVersionEx +@ stdcall GetOEMCP() kernel32.GetOEMCP +@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall GetSystemDefaultLocaleName(ptr long) kernel32.GetSystemDefaultLocaleName +@ stdcall GetThreadLocale() kernel32.GetThreadLocale +@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName +@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte +@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stdcall IsValidNLSVersion(long wstr ptr) kernel32.IsValidNLSVersion +@ stdcall LCIDToLocaleName(long ptr long long) kernel32.LCIDToLocaleName +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx +@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW +@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName +@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA +@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW

1 0

Louis Lenders : api-ms-win-core-memory-l1-1-4: Add new dll.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: a20a02ca914d5817195c87a18470a24b9ea6841b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20a02ca914d5817195c87a1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:01 2020 +0200 api-ms-win-core-memory-l1-1-4: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-memory-l1-1-4/Makefile.in | 1 + .../api-ms-win-core-memory-l1-1-4.spec | 31 ++++++++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/configure b/configure index bd5d1166ee..5ad79eaf27 100755 --- a/configure +++ b/configure @@ -984,6 +984,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_memory_l1_1_2 +enable_api_ms_win_core_memory_l1_1_4 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 @@ -20310,6 +20311,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-localregistry-l1-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-4 enable_api_ms_win_core_memory_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 diff --git a/configure.ac b/configure.ac index 22369882ce..87ba3bb780 100644 --- a/configure.ac +++ b/configure.ac @@ -2900,6 +2900,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) diff --git a/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in new file mode 100644 index 0000000000..1a45e5581b --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-memory-l1-1-4.dll diff --git a/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec b/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec new file mode 100644 index 0000000000..b0d402b24c --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec @@ -0,0 +1,31 @@ +@ stub CreateFileMappingFromApp +@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stub DiscardVirtualMemory +@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch +@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile +@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx +@ stub MapViewOfFileFromApp +@ stub OfferVirtualMemory +@ stub OpenFileMappingFromApp +@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory +@ stub ReclaimVirtualMemory +@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch +@ stub SetProcessValidCallTargets +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx +@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile +@ stub UnmapViewOfFileEx +@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc +@ stub VirtualAllocFromApp +@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree +@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx +@ stdcall VirtualLock(ptr long) kernel32.VirtualLock +@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect +@ stub VirtualProtectFromApp +@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery +@ stdcall VirtualQueryEx(long ptr ptr long) kernel32.VirtualQueryEx +@ stdcall VirtualUnlock(ptr long) kernel32.VirtualUnlock +@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory

1 0

Louis Lenders : api-ms-win-core-libraryloader-l2-1-0: Add new dll.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: fcdaf2ca2f6eb1412b350ca1b0f99fde5b65170d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcdaf2ca2f6eb1412b350ca1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:00 2020 +0200 api-ms-win-core-libraryloader-l2-1-0: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-libraryloader-l2-1-0.spec | 2 ++ 4 files changed, 6 insertions(+) diff --git a/configure b/configure index bb98f99f9f..bd5d1166ee 100755 --- a/configure +++ b/configure @@ -971,6 +971,7 @@ enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 enable_api_ms_win_core_libraryloader_l1_2_1 enable_api_ms_win_core_libraryloader_l1_2_2 +enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 @@ -20296,6 +20297,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-1 enable_api_ms_win_core_libraryloader_l1_2_1 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-2 enable_api_ms_win_core_libraryloader_l1_2_2 +wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_win_core_libraryloader_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 diff --git a/configure.ac b/configure.ac index e3d63ed750..22369882ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2887,6 +2887,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in new file mode 100644 index 0000000000..c4c4c315b6 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l2-1-0.dll diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec new file mode 100644 index 0000000000..a9dc31df32 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall LoadPackagedLibrary(wstr long) kernel32.LoadPackagedLibrary +@ stub QueryOptionalDelayLoadedAPI

1 0

Alex Henrie : quartz/tests: Fix overflow in 32-bit time calculation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 56e72e071dfa0fd9954f765fabf8e2a9ccb01af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e72e071dfa0fd9954f765f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 3 22:38:39 2020 -0600 quartz/tests: Fix overflow in 32-bit time calculation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 71a7ac26d8..f13e89abed 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -183,7 +183,7 @@ static void test_get_time(void) if (pGetTickCount64) time2 = pGetTickCount64() * 10000; else - time2 = GetTickCount() * 10000; + time2 = (REFERENCE_TIME)GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1));

1 0

Alexandre Julliard : ntdll: Move the section object functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: cdfc45859c299aa629482ee06614c9819346b444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfc45859c299aa629482ee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:34:28 2020 +0200 ntdll: Move the section object functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/sync.c | 77 +++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 7 ++- dlls/ntdll/virtual.c | 108 +---------------------------------------------- 4 files changed, 87 insertions(+), 107 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e93978993..767cae92b4 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -991,6 +991,7 @@ static struct unix_funcs unix_funcs = NtCreateEvent, NtCreateKeyedEvent, NtCreateMutant, + NtCreateSection, NtCreateSemaphore, NtCreateTimer, NtCurrentTeb, @@ -1005,6 +1006,7 @@ static struct unix_funcs unix_funcs = NtOpenEvent, NtOpenKeyedEvent, NtOpenMutant, + NtOpenSection, NtOpenSemaphore, NtOpenTimer, NtProtectVirtualMemory, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index cea005fefb..c67eb70697 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -871,3 +871,80 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.key = wine_server_client_ptr( key ); return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } + + +/*********************************************************************** + * NtCreateSection (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + const LARGE_INTEGER *size, ULONG protect, + ULONG sec_flags, HANDLE file ) +{ + NTSTATUS ret; + unsigned int file_access; + data_size_t len; + struct object_attributes *objattr; + + switch (protect & 0xff) + { + case PAGE_READONLY: + case PAGE_EXECUTE_READ: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_WRITECOPY: + file_access = FILE_READ_DATA; + break; + case PAGE_READWRITE: + case PAGE_EXECUTE_READWRITE: + if (sec_flags & SEC_IMAGE) file_access = FILE_READ_DATA; + else file_access = FILE_READ_DATA | FILE_WRITE_DATA; + break; + case PAGE_EXECUTE: + case PAGE_NOACCESS: + file_access = 0; + break; + default: + return STATUS_INVALID_PAGE_PROTECTION; + } + + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + + SERVER_START_REQ( create_mapping ) + { + req->access = access; + req->flags = sec_flags; + req->file_handle = wine_server_obj_handle( file ); + req->file_access = file_access; + req->size = size ? size->QuadPart : 0; + wine_server_add_data( req, objattr, len ); + ret = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); + return ret; +} + + +/*********************************************************************** + * NtOpenSection (NTDLL.@) + */ +NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + NTSTATUS ret; + + if ((ret = validate_open_object_attributes( attr ))) return ret; + + SERVER_START_REQ( open_mapping ) + { + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + if (attr->ObjectName) + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + ret = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index df8f271383..4e5cec6637 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 26 +#define NTDLL_UNIXLIB_VERSION 27 struct unix_funcs { @@ -45,6 +45,9 @@ struct unix_funcs const OBJECT_ATTRIBUTES *attr, ULONG flags ); NTSTATUS (WINAPI *NtCreateMutant)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, BOOLEAN owned ); + NTSTATUS (WINAPI *NtCreateSection)( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, const LARGE_INTEGER *size, + ULONG protect, ULONG sec_flags, HANDLE file ); NTSTATUS (WINAPI *NtCreateSemaphore)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max ); NTSTATUS (WINAPI *NtCreateTimer)( HANDLE *handle, ACCESS_MASK access, @@ -72,6 +75,8 @@ struct unix_funcs const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenMutant)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); + NTSTATUS (WINAPI *NtOpenSection)( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenSemaphore)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenTimer)( HANDLE *handle, ACCESS_MASK access, diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e277de16fe..6d5c98b58e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -63,17 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(virtual); -/* per-page protection flags */ -#define VPROT_READ 0x01 -#define VPROT_WRITE 0x02 -#define VPROT_EXEC 0x04 -#define VPROT_WRITECOPY 0x08 -#define VPROT_GUARD 0x10 -#define VPROT_COMMITTED 0x20 -#define VPROT_WRITEWATCH 0x40 -/* per-mapping protection flags */ -#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ - static const UINT page_shift = 12; static const UINT_PTR page_mask = 0xfff; @@ -84,59 +73,6 @@ static SIZE_T signal_stack_align; #define ROUND_SIZE(addr,size) \ (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask) -/*********************************************************************** - * get_vprot_flags - * - * Build page protections from Win32 flags. - * - * PARAMS - * protect [I] Win32 protection flags - * - * RETURNS - * Value of page protection flags - */ -static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image ) -{ - switch(protect & 0xff) - { - case PAGE_READONLY: - *vprot = VPROT_READ; - break; - case PAGE_READWRITE: - if (image) - *vprot = VPROT_READ | VPROT_WRITECOPY; - else - *vprot = VPROT_READ | VPROT_WRITE; - break; - case PAGE_WRITECOPY: - *vprot = VPROT_READ | VPROT_WRITECOPY; - break; - case PAGE_EXECUTE: - *vprot = VPROT_EXEC; - break; - case PAGE_EXECUTE_READ: - *vprot = VPROT_EXEC | VPROT_READ; - break; - case PAGE_EXECUTE_READWRITE: - if (image) - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; - else - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; - break; - case PAGE_EXECUTE_WRITECOPY: - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; - break; - case PAGE_NOACCESS: - *vprot = 0; - break; - default: - return STATUS_INVALID_PAGE_PROTECTION; - } - if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; - return STATUS_SUCCESS; -} - - /********************************************************************** * RtlCreateUserStack (NTDLL.@) */ @@ -270,32 +206,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC const LARGE_INTEGER *size, ULONG protect, ULONG sec_flags, HANDLE file ) { - NTSTATUS ret; - unsigned int vprot, file_access = 0; - data_size_t len; - struct object_attributes *objattr; - - if ((ret = get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ))) return ret; - if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; - - if (vprot & VPROT_READ) file_access |= FILE_READ_DATA; - if (vprot & VPROT_WRITE) file_access |= FILE_WRITE_DATA; - - SERVER_START_REQ( create_mapping ) - { - req->access = access; - req->flags = sec_flags; - req->file_handle = wine_server_obj_handle( file ); - req->file_access = file_access; - req->size = size ? size->QuadPart : 0; - wine_server_add_data( req, objattr, len ); - ret = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - - RtlFreeHeap( GetProcessHeap(), 0, objattr ); - return ret; + return unix_funcs->NtCreateSection( handle, access, attr, size, protect, sec_flags, file ); } @@ -305,22 +216,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC */ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { - NTSTATUS ret; - - if ((ret = validate_open_object_attributes( attr ))) return ret; - - SERVER_START_REQ( open_mapping ) - { - req->access = access; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); - if (attr->ObjectName) - wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); - ret = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; + return unix_funcs->NtOpenSection( handle, access, attr ); }

1 0

Alexandre Julliard : ntdll: Move the keyed event functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: f1276b25ae72e81cf044134bae92db6ef73be3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1276b25ae72e81cf044134b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:27:22 2020 +0200 ntdll: Move the keyed event functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 57 ++------------------------ dlls/ntdll/unix/loader.c | 4 ++ dlls/ntdll/unix/sync.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 10 ++++- 6 files changed, 109 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1276b25ae72e81cf044…

1 0

Alexandre Julliard : ntdll: Move the timer functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 65edacf93484faf1dc3d11e555081d69556ccbc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65edacf93484faf1dc3d11e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:21:33 2020 +0200 ntdll: Move the timer functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 164 ++++------------------------------------------- dlls/ntdll/unix/loader.c | 5 ++ dlls/ntdll/unix/sync.c | 149 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 12 +++- 4 files changed, 179 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65edacf93484faf1dc3d…

1 0

Alexandre Julliard : ntdll: Move the mutex functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 8b87d6b81408e5d6fe34f9e9fda1df2f4f2e5cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b87d6b81408e5d6fe34f9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:10:17 2020 +0200 ntdll: Move the mutex functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 84 ++++---------------------------------- dlls/ntdll/unix/loader.c | 4 ++ dlls/ntdll/unix/sync.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 9 +++- 4 files changed, 123 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b87d6b81408e5d6fe34…

1 0

Alexandre Julliard : ntdll: Move the event functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: efd59e378c2ba8cae98fa664ae98521027e96b81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efd59e378c2ba8cae98fa664… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 20:34:58 2020 +0200 ntdll: Move the event functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 105 +++----------------------------- dlls/ntdll/unix/loader.c | 7 +++ dlls/ntdll/unix/sync.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 12 +++- 4 files changed, 181 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efd59e378c2ba8cae98f…

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
95
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 June 2020