September 2021 - Wine-commits

Esme Povirk : sppc: Stub SLClose.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 8b886cdc5d6097de7ba800674288def0a1825009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b886cdc5d6097de7ba80067… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Sep 4 12:50:19 2021 -0500 sppc: Stub SLClose. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/slc.spec | 2 +- dlls/sppc/sppc.c | 7 +++++++ dlls/sppc/sppc.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 19895041a32..a5250df23b9 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -6,7 +6,7 @@ @ stub SLpGetLicenseAcquisitionInfo @ stub SLpGetMachineUGUID @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) sppc.SLClose @ stub SLConsumeRight @ stub SLConsumeWindowsRight @ stub SLDepositOfflineConfirmationId diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index c05f15a28db..ce3183f39bd 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -51,6 +51,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } +HRESULT WINAPI SLClose(HSLC handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index 3ac40c23972..6926d4d8b6d 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -17,7 +17,7 @@ @ stub SLpSetActivationInProgress @ stub SLpTriggerServiceWorker @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLDepositMigrationBlob @ stub SLDepositOfflineConfirmationId

1 0

Francois Gouget : msvcrt: Remove CDECL on static functions where not needed.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: a6b1e97eb694731fcbf7238dc4a5bce3c7091d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b1e97eb694731fcbf7238d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 3 11:50:32 2021 +0200 msvcrt: Remove CDECL on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5a4a701dfc6..4c0fce194bd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -556,7 +556,7 @@ void CDECL _unlock_locales(void) _unlock(_SETLOCALE_LOCK); } -static void CDECL grab_locinfo(pthreadlocinfo locinfo) +static void grab_locinfo(pthreadlocinfo locinfo) { int i; @@ -578,7 +578,7 @@ static void CDECL grab_locinfo(pthreadlocinfo locinfo) InterlockedIncrement(&locinfo->lc_time_curr->refcount); } -static void CDECL update_thread_locale(thread_data_t *data) +static void update_thread_locale(thread_data_t *data) { if((data->locale_flags & LOCALE_FREE) && ((data->locale_flags & LOCALE_THREAD) || (data->locinfo == MSVCRT_locale->locinfo && data->mbcinfo == MSVCRT_locale->mbcinfo))) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index efdde8e4afb..7f59a4d20d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -90,7 +90,7 @@ static inline double fp_barrier(double x) return y; } -static inline double CDECL ret_nan( BOOL update_sw ) +static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; @@ -2663,7 +2663,7 @@ double CDECL cos( double x ) } /* Copied from musl: src/math/expm1.c */ -static double CDECL __expm1(double x) +static double __expm1(double x) { static const double o_threshold = 7.09782712893383973096e+02, ln2_hi = 6.93147180369123816490e-01,

1 0

Francois Gouget : msvcp140_1: Remove __cdecl on static functions where not needed.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: ec6ce2ce53b91bbb5bc8eaaec01c7f2fa6f892eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6ce2ce53b91bbb5bc8eaae… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 3 11:50:39 2021 +0200 msvcp140_1: Remove __cdecl on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_1/msvcp140_1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index 823adedf3ac..c6a6ff19f13 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -64,7 +64,7 @@ void __cdecl MSVCRT_operator_delete(void *mem) free(mem); } -static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) +static void* MSVCRT_operator_new_aligned(size_t size, size_t alignment) { void *retval; int freed; @@ -85,7 +85,7 @@ static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) return NULL; } -static void __cdecl MSVCRT_operator_delete_aligned(void *mem, size_t alignment) +static void MSVCRT_operator_delete_aligned(void *mem, size_t alignment) { _aligned_free(mem); }

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

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

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

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

Zebediah Figura : server: Return void from the write callback.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: 377d18c7b117ba225dd555dbfac62b3d8af423f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=377d18c7b117ba225dd555db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:52 2021 -0500 server: Return void from the write callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 18 +++++++++--------- server/device.c | 6 +++--- server/fd.c | 3 +-- server/file.h | 4 ++-- server/named_pipe.c | 15 +++++++-------- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/server/console.c b/server/console.c index 597bff994a2..0080e6ed163 100644 --- a/server/console.c +++ b/server/console.c @@ -240,7 +240,7 @@ static const struct object_ops screen_buffer_ops = screen_buffer_destroy /* destroy */ }; -static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ); +static void screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ); static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops screen_buffer_fd_ops = @@ -381,7 +381,7 @@ static const struct object_ops console_output_ops = console_output_destroy /* destroy */ }; -static int console_output_write( struct fd *fd, struct async *async, file_pos_t pos ); +static void console_output_write( struct fd *fd, struct async *async, file_pos_t pos ); static int console_output_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_output_fd_ops = @@ -972,18 +972,18 @@ static int console_flush( struct fd *fd, struct async *async ) return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); } -static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ) +static void screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct screen_buffer *screen_buffer = get_fd_user( fd ); if (!screen_buffer->input || !screen_buffer->input->server) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return queue_host_ioctl( screen_buffer->input->server, IOCTL_CONDRV_WRITE_FILE, - screen_buffer->id, async, &screen_buffer->ioctl_q ); + queue_host_ioctl( screen_buffer->input->server, IOCTL_CONDRV_WRITE_FILE, + screen_buffer->id, async, &screen_buffer->ioctl_q ); } static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) @@ -1421,16 +1421,16 @@ static int console_output_ioctl( struct fd *fd, ioctl_code_t code, struct async return screen_buffer_ioctl( console->active->fd, code, async ); } -static int console_output_write( struct fd *fd, struct async *async, file_pos_t pos ) +static void console_output_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct console *console = current->process->console; if (!console || !console->active) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return screen_buffer_write( console->active->fd, async, pos ); + screen_buffer_write( console->active->fd, async, pos ); } struct object *create_console_device( struct object *root, const struct unicode_str *name, diff --git a/server/device.c b/server/device.c index 4dd9213811a..cc3e0466468 100644 --- a/server/device.c +++ b/server/device.c @@ -202,7 +202,7 @@ static int device_file_close_handle( struct object *obj, struct process *process static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); -static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); +static void device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static int device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -637,7 +637,7 @@ static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos queue_irp( file, &params, async ); } -static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) +static void device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); irp_params_t params; @@ -646,7 +646,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos params.write.type = IRP_CALL_WRITE; params.write.key = 0; params.write.pos = pos; - return queue_irp( file, &params, async ); + queue_irp( file, &params, async ); } static int device_file_flush( struct fd *fd, struct async *async ) diff --git a/server/fd.c b/server/fd.c index c2cab0da1fe..6b79585147d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2298,10 +2298,9 @@ void no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) } /* default write() routine */ -int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) +void no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return 0; } /* default flush() routine */ diff --git a/server/file.h b/server/file.h index e4b8422660a..e200281d03b 100644 --- a/server/file.h +++ b/server/file.h @@ -59,7 +59,7 @@ struct fd_ops /* perform a read on the file */ void (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ - int (*write)(struct fd *, struct async *, file_pos_t ); + void (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ int (*flush)(struct fd *, struct async *); /* query file info */ @@ -110,7 +110,7 @@ extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); -extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); +extern void no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b81e167ddfc..503dda93931 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -144,7 +144,7 @@ static int pipe_end_set_sd( struct object *obj, const struct security_descriptor unsigned int set_info ); static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); static void pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); -static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); +static void pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -923,7 +923,7 @@ static void pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) set_error( STATUS_PENDING ); } -static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) +static void pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); struct pipe_message *message; @@ -935,27 +935,26 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) break; case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED ); - return 0; + return; case FILE_PIPE_LISTENING_STATE: set_error( STATUS_PIPE_LISTENING ); - return 0; + return; case FILE_PIPE_CLOSING_STATE: set_error( STATUS_PIPE_CLOSING ); - return 0; + return; } - if (!pipe_end->pipe->message_mode && !get_req_data_size()) return 1; + if (!pipe_end->pipe->message_mode && !get_req_data_size()) return; iosb = async_get_iosb( async ); message = queue_message( pipe_end->connection, iosb ); release_object( iosb ); - if (!message) return 0; + if (!message) return; message->async = (struct async *)grab_object( async ); queue_async( &pipe_end->write_q, async ); reselect_read_queue( pipe_end->connection, 1 ); set_error( STATUS_PENDING ); - return 1; } static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue )

1 0

Zebediah Figura : server: Return void from the flush callback.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: a36e2769c97a4c54f01cef660dc1714357d9d890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36e2769c97a4c54f01cef66… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:53 2021 -0500 server: Return void from the flush callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 16 ++++++++-------- server/device.c | 6 +++--- server/fd.c | 3 +-- server/file.h | 4 ++-- server/named_pipe.c | 7 +++---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/server/console.c b/server/console.c index 0080e6ed163..df88b14f609 100644 --- a/server/console.c +++ b/server/console.c @@ -101,7 +101,7 @@ static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void console_read( struct fd *fd, struct async *async, file_pos_t pos ); -static int console_flush( struct fd *fd, struct async *async ); +static void console_flush( struct fd *fd, struct async *async ); static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_fd_ops = @@ -326,7 +326,7 @@ static const struct object_ops console_input_ops = }; static void console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); -static int console_input_flush( struct fd *fd, struct async *async ); +static void console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_input_fd_ops = @@ -960,16 +960,16 @@ static void console_read( struct fd *fd, struct async *async, file_pos_t pos ) queue_host_ioctl( console->server, IOCTL_CONDRV_READ_FILE, 0, async, &console->ioctl_q ); } -static int console_flush( struct fd *fd, struct async *async ) +static void console_flush( struct fd *fd, struct async *async ) { struct console *console = get_fd_user( fd ); if (!console->server) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); + queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); } static void screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ) @@ -1361,16 +1361,16 @@ static void console_input_read( struct fd *fd, struct async *async, file_pos_t p console_read( console->fd, async, pos ); } -static int console_input_flush( struct fd *fd, struct async *async ) +static void console_input_flush( struct fd *fd, struct async *async ) { struct console *console = current->process->console; if (!console) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return console_flush( console->fd, async ); + console_flush( console->fd, async ); } static void console_output_dump( struct object *obj, int verbose ) diff --git a/server/device.c b/server/device.c index cc3e0466468..7e9954a9305 100644 --- a/server/device.c +++ b/server/device.c @@ -203,7 +203,7 @@ static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static void device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); -static int device_file_flush( struct fd *fd, struct async *async ); +static void device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); @@ -649,14 +649,14 @@ static void device_file_write( struct fd *fd, struct async *async, file_pos_t po queue_irp( file, &params, async ); } -static int device_file_flush( struct fd *fd, struct async *async ) +static void device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); irp_params_t params; memset( &params, 0, sizeof(params) ); params.flush.type = IRP_CALL_FLUSH; - return queue_irp( file, &params, async ); + queue_irp( file, &params, async ); } static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) diff --git a/server/fd.c b/server/fd.c index 6b79585147d..ca91ff724a1 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2304,10 +2304,9 @@ void no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) } /* default flush() routine */ -int no_fd_flush( struct fd *fd, struct async *async ) +void no_fd_flush( struct fd *fd, struct async *async ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return 0; } /* default get_file_info() routine */ diff --git a/server/file.h b/server/file.h index e200281d03b..c4c33fc1e79 100644 --- a/server/file.h +++ b/server/file.h @@ -61,7 +61,7 @@ struct fd_ops /* perform a write on the file */ void (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ - int (*flush)(struct fd *, struct async *); + void (*flush)(struct fd *, struct async *); /* query file info */ void (*get_file_info)( struct fd *, obj_handle_t, unsigned int ); /* query volume info */ @@ -111,7 +111,7 @@ extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern void no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); -extern int no_fd_flush( struct fd *fd, struct async *async ); +extern void no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 503dda93931..3d1b2d8b917 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -145,7 +145,7 @@ static int pipe_end_set_sd( struct object *obj, const struct security_descriptor static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); static void pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static void pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); -static int pipe_end_flush( struct fd *fd, struct async *async ); +static void pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); @@ -578,14 +578,14 @@ static void named_pipe_device_file_destroy( struct object *obj ) release_object( file->device ); } -static int pipe_end_flush( struct fd *fd, struct async *async ) +static void pipe_end_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); if (!pipe_end->pipe) { set_error( STATUS_PIPE_DISCONNECTED ); - return 0; + return; } if (pipe_end->connection && !list_empty( &pipe_end->connection->message_queue )) @@ -593,7 +593,6 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); set_error( STATUS_PENDING ); } - return 1; } static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class )

1 0

Zebediah Figura : server: Return void from the ioctl callback.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: b1e4d920c3debb7359dbfa3f3fb50b26c18b41b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e4d920c3debb7359dbfa3f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:54 2021 -0500 server: Return void from the ioctl callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 83 ++++++++++++------------ server/device.c | 11 ++-- server/fd.c | 9 ++- server/file.h | 6 +- server/named_pipe.c | 86 ++++++++++++------------ server/serial.c | 21 +++--- server/sock.c | 184 ++++++++++++++++++++++++++-------------------------- 7 files changed, 197 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e4d920c3debb7359db…

1 0