wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Eric Pouech : dbghelp: Allow loading virtual module at any address.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: aed40b934c6ab307afc156b943c8087b57934ae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aed40b934c6ab307afc156b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 6 10:39:55 2021 +0200 dbghelp: Allow loading virtual module at any address. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index f2c0eca5df6..916aaf5ce53 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -786,7 +786,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Data) FIXME("Unsupported load data parameter %p for %s\n", Data, debugstr_w(wImageName)); - if (!validate_addr64(BaseOfDll)) return 0; if (!(pcs = process_find_by_handle(hProcess))) return 0; @@ -803,6 +802,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); + if (!validate_addr64(BaseOfDll)) return 0; + pcs->loader->synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ @@ -923,7 +924,6 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; - if (!validate_addr64(BaseOfDll)) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; return module_remove(pcs, module);

1 0

Eric Pouech : dbghelp: SymLoadModule* should return the base address in case of success, and 0 otherwise.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: f2f27b6b9589a31cf92600db1b3cc8a1610dbdca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2f27b6b9589a31cf92600db… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Sep 6 10:39:49 2021 +0200 dbghelp: SymLoadModule* should return the base address in case of success, and 0 otherwise. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3bc2a9e143a..f2c0eca5df6 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -786,19 +786,19 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Data) FIXME("Unsupported load data parameter %p for %s\n", Data, debugstr_w(wImageName)); - if (!validate_addr64(BaseOfDll)) return FALSE; + if (!validate_addr64(BaseOfDll)) return 0; - if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + if (!(pcs = process_find_by_handle(hProcess))) return 0; if (Flags & SLMFLAG_VIRTUAL) { - if (!wImageName) return FALSE; + if (!wImageName) return 0; module = module_new(pcs, wImageName, DMT_PE, TRUE, BaseOfDll, SizeOfDll, 0, 0); - if (!module) return FALSE; + if (!module) return 0; if (wModuleName) module_set_module(module, wModuleName); module->module.SymType = SymVirtual; - return TRUE; + return module->module.BaseOfImage; } if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName));

1 0

Zhiyi Zhang : hh: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 3f95a56e59117f73ad456ddd59d615aaa93dbee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f95a56e59117f73ad456ddd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:55:01 2021 +0800 hh: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hh/hh.manifest | 9 +++++++++ programs/hh/hh.rc | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/programs/hh/hh.manifest b/programs/hh/hh.manifest new file mode 100644 index 00000000000..be1e025a548 --- /dev/null +++ b/programs/hh/hh.manifest @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.HelpViewer" version="0.0.0.0"/> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> +</assembly> diff --git a/programs/hh/hh.rc b/programs/hh/hh.rc index d397dc63ee4..36c142345b9 100644 --- a/programs/hh/hh.rc +++ b/programs/hh/hh.rc @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <winuser.h> /* @makedep: winhelp.ico */ 101 ICON winhelp.ico + +/* @makedep: hh.manifest */ +1 RT_MANIFEST hh.manifest

1 0

Zhiyi Zhang : explorer: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: f613323d93ba43053d81a123244895e87d6d7c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f613323d93ba43053d81a123… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:52 2021 +0800 explorer: Add system DPI awareness settings to the application manifest. This is also required for get_monitor_dpi() in wineserver to function properly for DPI unaware applications because it uses desktop window DPI as monitor DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/explorer/explorer.manifest b/programs/explorer/explorer.manifest index 15e5428a1b7..a4b573f0b41 100644 --- a/programs/explorer/explorer.manifest +++ b/programs/explorer/explorer.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : dxdiag: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 3331d92a3cc3a0e5ee23ad8d7ca023f9377a62bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3331d92a3cc3a0e5ee23ad8d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:45 2021 +0800 dxdiag: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/dxdiag.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest index 57ba80c05db..6b17f6cd09f 100644 --- a/programs/dxdiag/dxdiag.manifest +++ b/programs/dxdiag/dxdiag.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : clock: Add DPI system awareness settings to the application manifest.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: a30d2c5821cec6301b6736e22d4a00dd8f2f31b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30d2c5821cec6301b6736e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:37 2021 +0800 clock: Add DPI system awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/clock.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest index 4a9f38c4ff8..393459c383c 100644 --- a/programs/clock/clock.manifest +++ b/programs/clock/clock.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : control: Add DPI system awareness settings to the application manifest.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 882516e58c32eaaba0d94de932c9584634c71e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=882516e58c32eaaba0d94de9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 6 16:54:28 2021 +0800 control: Add DPI system awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/control/control.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/control/control.manifest b/programs/control/control.manifest index 2834937e564..0b677f379b0 100644 --- a/programs/control/control.manifest +++ b/programs/control/control.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Alex Henrie : ntdll/tests: Remove unused variable sbi from test_query_process.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: d5a8a5e199e573d21d58ba303095571162eada73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a8a5e199e573d21d58ba30… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 5 19:33:21 2021 -0600 ntdll/tests: Remove unused variable sbi from test_query_process. The code that used it was removed in commit 8ac77cfbf96689d83463928a9d0bdc5fcd054cb9. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7b6f947569a..6e71f0848ec 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -444,7 +444,6 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - SYSTEM_BASIC_INFORMATION sbi; PROCESS_BASIC_INFORMATION pbi; THREAD_BASIC_INFORMATION tbi; OBJECT_ATTRIBUTES attr; @@ -492,8 +491,6 @@ static void test_query_process(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); spi = spi_buf; - pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - for (;;) { DWORD_PTR tid;

1 0

Zebediah Figura : server: Fill the TimeZoneBias member of KSHARED_USER_DATA.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: dd9eacff4ea2c9eff9f4b8a368bb680df86df9bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd9eacff4ea2c9eff9f4b8a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 16:15:27 2021 -0500 server: Fill the TimeZoneBias member of KSHARED_USER_DATA. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 8 ++++++++ server/fd.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 7ea506337a4..549db5b22b6 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -410,7 +410,9 @@ static ULONGLONG read_ksystem_time(volatile KSYSTEM_TIME *time) static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + SYSTEM_TIMEOFDAY_INFORMATION timeofday; ULONGLONG t1, t2, t3; + NTSTATUS status; int i = 0; i = 0; @@ -464,6 +466,12 @@ static void test_user_shared_data_time(void) ok(t2 <= t3, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + t1 = read_ksystem_time(&user_shared_data->TimeZoneBias); + status = NtQuerySystemInformation(SystemTimeOfDayInformation, &timeofday, sizeof(timeofday), NULL); + ok(!status, "failed to query time of day, status %#x\n", status); + ok(timeofday.TimeZoneBias.QuadPart == t1, "got USD bias %I64u, ntdll bias %I64u\n", + t1, timeofday.TimeZoneBias.QuadPart); } START_TEST(time) diff --git a/server/fd.c b/server/fd.c index 8ef01e0ce40..01185429244 100644 --- a/server/fd.c +++ b/server/fd.c @@ -410,6 +410,26 @@ static void atomic_store_long(volatile LONG *ptr, LONG value) static void set_user_shared_data_time(void) { timeout_t tick_count = monotonic_time / 10000; + static timeout_t last_timezone_update; + timeout_t timezone_bias; + struct tm *tm; + time_t now; + + if (monotonic_time - last_timezone_update > TICKS_PER_SEC) + { + now = time( NULL ); + tm = gmtime( &now ); + timezone_bias = mktime( tm ) - now; + tm = localtime( &now ); + if (tm->tm_isdst) timezone_bias -= 3600; + timezone_bias *= TICKS_PER_SEC; + + atomic_store_long(&user_shared_data->TimeZoneBias.High2Time, timezone_bias >> 32); + atomic_store_ulong(&user_shared_data->TimeZoneBias.LowPart, timezone_bias); + atomic_store_long(&user_shared_data->TimeZoneBias.High1Time, timezone_bias >> 32); + + last_timezone_update = monotonic_time; + } atomic_store_long(&user_shared_data->SystemTime.High2Time, current_time >> 32); atomic_store_ulong(&user_shared_data->SystemTime.LowPart, current_time);

1 0

Zebediah Figura : server: Add helper functions to perform atomic stores.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 09dd801291db78ede8515081e8837f562dc1a908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09dd801291db78ede8515081… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 16:15:26 2021 -0500 server: Add helper functions to perform atomic stores. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 63 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/server/fd.c b/server/fd.c index 7a88f412c7a..8ef01e0ce40 100644 --- a/server/fd.c +++ b/server/fd.c @@ -385,43 +385,46 @@ timeout_t monotonic_time; struct _KUSER_SHARED_DATA *user_shared_data = NULL; static const int user_shared_data_timeout = 16; -static void set_user_shared_data_time(void) +static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) { - timeout_t tick_count = monotonic_time / 10000; + /* on x86 there should be total store order guarantees, so volatile is + * enough to ensure the stores aren't reordered by the compiler, and then + * they will always be seen in-order from other CPUs. On other archs, we + * need atomic intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ +static void atomic_store_long(volatile LONG *ptr, LONG value) +{ #if defined(__i386__) || defined(__x86_64__) - user_shared_data->SystemTime.High2Time = current_time >> 32; - user_shared_data->SystemTime.LowPart = current_time; - user_shared_data->SystemTime.High1Time = current_time >> 32; - - user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; - user_shared_data->InterruptTime.LowPart = monotonic_time; - user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; - - user_shared_data->TickCount.High2Time = tick_count >> 32; - user_shared_data->TickCount.LowPart = tick_count; - user_shared_data->TickCount.High1Time = tick_count >> 32; - *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; + *ptr = value; #else - __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); #endif } +static void set_user_shared_data_time(void) +{ + timeout_t tick_count = monotonic_time / 10000; + + atomic_store_long(&user_shared_data->SystemTime.High2Time, current_time >> 32); + atomic_store_ulong(&user_shared_data->SystemTime.LowPart, current_time); + atomic_store_long(&user_shared_data->SystemTime.High1Time, current_time >> 32); + + atomic_store_long(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32); + atomic_store_ulong(&user_shared_data->InterruptTime.LowPart, monotonic_time); + atomic_store_long(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32); + + atomic_store_long(&user_shared_data->TickCount.High2Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCount.LowPart, tick_count); + atomic_store_long(&user_shared_data->TickCount.High1Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCountLowDeprecated, tick_count); +} + void set_current_time(void) { static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC;

1 0

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 September 2021