October 2018 - Wine-commits

Jacek Caban : ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 4be482bc825c419acd3b524b4825e03998040bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be482bc825c419acd3b524b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 14:55:57 2018 +0200 ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests. Based on a patch by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 38 +++++++++++ dlls/ntdll/tests/pipe.c | 169 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 198 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4be482bc825c419acd3b…

1 0

Sebastian Lackner : server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on server-side asyncs.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: c0996553a1d9056e1b89871fc8c3fb0bfb5a4f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0996553a1d9056e1b89871f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 25 14:56:08 2018 +0200 server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on server-side asyncs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 5 ----- server/async.c | 10 ++++++++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index c4d4d877..20bfc73 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1287,7 +1287,6 @@ static void test_completion(void) ret = WriteFile(client, buf, sizeof(buf), &num_bytes, &ov); ok(ret, "WriteFile failed, error %u\n", GetLastError()); ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); - todo_wine test_no_queued_completion(port); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, &ov); @@ -1301,14 +1300,12 @@ static void test_completion(void) if(status == STATUS_PENDING) /* win8+ */ test_queued_completion(port, &io, STATUS_BUFFER_OVERFLOW, 1); else - todo_wine test_no_queued_completion(port); status = NtReadFile(client, NULL, NULL, &io, &io, read_buf, sizeof(read_buf), NULL, NULL); ok(status == STATUS_SUCCESS, "status = %x\n", status); ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status); ok(io.Information == sizeof(buf)-1, "Information = %lu\n", io.Information); - todo_wine test_no_queued_completion(port); status = NtFsControlFile(client, NULL, NULL, &io, &io, FSCTL_PIPE_PEEK, @@ -1317,7 +1314,6 @@ static void test_completion(void) if(status == STATUS_PENDING) /* win8+ */ test_queued_completion(port, &io, STATUS_SUCCESS, FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data)); else - todo_wine test_no_queued_completion(port); memset(&io, 0xcc, sizeof(io)); @@ -1339,7 +1335,6 @@ static void test_completion(void) if(status == STATUS_PENDING) /* win8+ */ test_queued_completion(port, &io, STATUS_BUFFER_OVERFLOW, sizeof(peek_buf)); else - todo_wine test_no_queued_completion(port); CloseHandle(ov.hEvent); diff --git a/server/async.c b/server/async.c index adbadc5..f2674bb 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async int direct_result; /* a flag if we're passing result directly from request instead of APC */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ + unsigned int comp_flags; /* completion flags */ }; static void async_dump( struct object *obj, int verbose ); @@ -239,6 +240,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->wait_handle = 0; async->direct_result = 0; async->completion = fd_get_completion( fd, &async->comp_key ); + async->comp_flags = 0; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -258,7 +260,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da /* create an async associated with iosb for async-based requests * returned async must be passed to async_handoff */ -struct async *create_request_async( struct fd *fd, const async_data_t *data ) +struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ) { struct async *async; struct iosb *iosb; @@ -276,6 +278,7 @@ struct async *create_request_async( struct fd *fd, const async_data_t *data ) return NULL; } async->direct_result = 1; + async->comp_flags = comp_flags; } return async; } @@ -377,8 +380,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota data.user.args[2] = 0; thread_queue_apc( NULL, async->thread, NULL, &data ); } - else if (async->data.apc_context) + else if (async->data.apc_context && (!async->direct_result || + !(async->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS))) + { add_async_completion( async, async->data.apc_context, status, total ); + } if (async->event) set_event( async->event ); else if (async->fd) set_fd_signaled( async->fd, 1 ); diff --git a/server/fd.c b/server/fd.c index 686382e..06778fe 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2414,7 +2414,7 @@ DECL_HANDLER(flush) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL ); release_object( async ); @@ -2513,7 +2513,7 @@ DECL_HANDLER(read) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; @@ -2530,7 +2530,7 @@ DECL_HANDLER(write) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); reply->options = fd->options; @@ -2548,7 +2548,7 @@ DECL_HANDLER(ioctl) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->ioctl( fd, req->code, async ), NULL ); reply->options = fd->options; diff --git a/server/file.h b/server/file.h index c30bc96..84cbc29 100644 --- a/server/file.h +++ b/server/file.h @@ -185,7 +185,7 @@ extern struct object *create_serial( struct fd *fd ); /* async I/O functions */ extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); -extern struct async *create_request_async( struct fd *fd, const async_data_t *data ); +extern struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ); extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status );

1 0

Sebastian Lackner : server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on client-side asyncs.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 18e074b0f30e8067c0901979308e961627b182a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e074b0f30e8067c0901979… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 25 14:56:24 2018 +0200 server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on client-side asyncs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 4 ---- dlls/ws2_32/socket.c | 15 ++++++++------- include/wine/server_protocol.h | 4 ++-- server/fd.c | 2 +- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index db077d6..a4ae64f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3444,9 +3444,7 @@ static void test_file_completion_information(void) pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 500); - todo_wine ok(!ret, "GetQueuedCompletionStatus succeeded\n"); - todo_wine ok(pov == NULL, "expected NULL, got %p\n", pov); } else @@ -3474,9 +3472,7 @@ static void test_file_completion_information(void) pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - todo_wine ok(!ret, "GetQueuedCompletionStatus succeeded\n"); - todo_wine ok(pov == NULL, "expected NULL, got %p\n", pov); } else diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 164a48c..df068fe 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -642,7 +642,7 @@ static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, in int WSAIOCTL_GetInterfaceCount(void); int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); -static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information ); +static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information, BOOL force ); #define MAP_OPTION(opt) { WS_##opt, opt } @@ -2459,7 +2459,7 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTAT return status; if (wsa->cvalue) - WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); + WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information, TRUE ); release_async_io( &wsa->io ); return status; @@ -3591,7 +3591,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n { ov->Internal = _get_sock_error(s, FD_CONNECT_BIT); ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh ); + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, FALSE ); if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); status = STATUS_PENDING; } @@ -5082,7 +5082,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID overlapped->Internal = status; overlapped->InternalHigh = total; if (overlapped->hEvent) NtSetEvent( overlapped->hEvent, NULL ); - if (cvalue) WS_AddCompletion( HANDLE2SOCKET(s), cvalue, status, total ); + if (cvalue) WS_AddCompletion( HANDLE2SOCKET(s), cvalue, status, total, FALSE ); } if (!status) @@ -5477,7 +5477,7 @@ int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) /* helper to send completion messages for client-only i/o operation case */ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, - ULONG Information ) + ULONG Information, BOOL async ) { SERVER_START_REQ( add_fd_completion ) { @@ -5485,6 +5485,7 @@ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS C req->cvalue = CompletionValue; req->status = CompletionStatus; req->information = Information; + req->async = async; wine_server_call( req ); } SERVER_END_REQ; @@ -5629,7 +5630,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (lpNumberOfBytesSent) *lpNumberOfBytesSent = n; if (!wsa->completion_func) { - if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n ); + if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n, FALSE ); if (lpOverlapped->hEvent) SetEvent( lpOverlapped->hEvent ); HeapFree( GetProcessHeap(), 0, wsa ); } @@ -8046,7 +8047,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->Information = n; if (!wsa->completion_func) { - if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n ); + if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n, FALSE ); if (lpOverlapped->hEvent) SetEvent( lpOverlapped->hEvent ); HeapFree( GetProcessHeap(), 0, wsa ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d7e9119..0e85d1a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5373,7 +5373,7 @@ struct add_fd_completion_request apc_param_t cvalue; apc_param_t information; unsigned int status; - char __pad_36[4]; + int async; }; struct add_fd_completion_reply { @@ -6546,6 +6546,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 569 +#define SERVER_PROTOCOL_VERSION 570 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index 06778fe..117fad8 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2611,7 +2611,7 @@ DECL_HANDLER(add_fd_completion) struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); if (fd) { - if (fd->completion) + if (fd->completion && (req->async || !(fd->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS))) add_completion( fd->completion, fd->comp_key, req->cvalue, req->status, req->information ); release_object( fd ); } diff --git a/server/protocol.def b/server/protocol.def index 08fcf8c..6e02fbc 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3697,6 +3697,7 @@ struct handle_info apc_param_t cvalue; /* completion value */ apc_param_t information; /* IO_STATUS_BLOCK Information */ unsigned int status; /* completion status */ + int async; /* completion is an async result */ @END diff --git a/server/request.h b/server/request.h index e24f125..4610ca6 100644 --- a/server/request.h +++ b/server/request.h @@ -2331,6 +2331,7 @@ C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, cvalue) == 16 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, information) == 24 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, status) == 32 ); +C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, async) == 36 ); C_ASSERT( sizeof(struct add_fd_completion_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, flags) == 16 ); diff --git a/server/trace.c b/server/trace.c index 39743d4..9a84067 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4387,6 +4387,7 @@ static void dump_add_fd_completion_request( const struct add_fd_completion_reque dump_uint64( ", cvalue=", &req->cvalue ); dump_uint64( ", information=", &req->information ); fprintf( stderr, ", status=%08x", req->status ); + fprintf( stderr, ", async=%d", req->async ); } static void dump_set_fd_completion_mode_request( const struct set_fd_completion_mode_request *req )

1 0

Sebastian Lackner : kernel32: Add SetFileCompletionNotificationModes implementation.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 139cc95610d7c14a5eab62df971fe5505b0b067c URL: https://source.winehq.org/git/wine.git/?a=commit;h=139cc95610d7c14a5eab62df… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 25 14:56:31 2018 +0200 kernel32: Add SetFileCompletionNotificationModes implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 081f076..eeccf67 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1065,13 +1065,20 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile ) return FALSE; } + /************************************************************************** * SetFileCompletionNotificationModes (KERNEL32.@) */ -BOOL WINAPI SetFileCompletionNotificationModes( HANDLE handle, UCHAR flags ) +BOOL WINAPI SetFileCompletionNotificationModes( HANDLE file, UCHAR flags ) { - FIXME("%p %x - stub\n", handle, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + info.Flags = flags; + status = NtSetInformationFile( file, &io, &info, sizeof(info), FileIoCompletionNotificationInformation ); + if (status == STATUS_SUCCESS) return TRUE; + SetLastError( RtlNtStatusToDosError(status) ); return FALSE; }

1 0

Michael Stefaniuc : include: Use the ARRAY_SIZE() macro in debug.h.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: af3992374e530a037e650b45194f933c5406038f URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3992374e530a037e650b45… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 25 15:47:28 2018 +0200 include: Use the ARRAY_SIZE() macro in debug.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index fb0d6bb..066873a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < sizeof(variant_types)/sizeof(*variant_types)) + if (vt < ARRAY_SIZE(variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB)

1 0

Michael Stefaniuc : libs/wine: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 93acf3a6950925ac1631614007d1e2de63e020ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=93acf3a6950925ac16316140… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 25 15:47:29 2018 +0200 libs/wine: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 4116b96..ae12356 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -144,7 +144,7 @@ static void parse_options( const char *str ) if (p > opt) { - for (i = 0; i < sizeof(debug_classes)/sizeof(debug_classes[0]); i++) + for (i = 0; i < ARRAY_SIZE(debug_classes); i++) { int len = strlen(debug_classes[i]); if (len != (p - opt)) continue; @@ -155,7 +155,7 @@ static void parse_options( const char *str ) break; } } - if (i == sizeof(debug_classes)/sizeof(debug_classes[0])) /* bad class name, skip it */ + if (i == ARRAY_SIZE(debug_classes)) /* bad class name, skip it */ continue; } else @@ -268,7 +268,7 @@ static char *get_temp_buffer( size_t size ) char *ret; int idx; - idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); + idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); if ((ret = realloc( list[idx], size ))) list[idx] = ret; return ret; } @@ -411,7 +411,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif - if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + if (cls < ARRAY_SIZE(debug_classes)) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format) ret += funcs.dbg_vprintf( format, args );

1 0

Alex Henrie : wintab32: Change the LoadTabletInfo failure message from ERR to TRACE.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 13cdcdae1a9e58f2eec9cd99b7b7f7899b4d111b URL: https://source.winehq.org/git/wine.git/?a=commit;h=13cdcdae1a9e58f2eec9cd99… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 25 08:59:47 2018 -0600 wintab32: Change the LoadTabletInfo failure message from ERR to TRACE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 17f9a11..2993c47 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -156,16 +156,15 @@ static inline BOOL LoadTablet(void) if (loaded == TI_START) { - TRACE("Initializing the tablet to hwnd %p\n",hwndDefault); - if (pLoadTabletInfo && pLoadTabletInfo(hwndDefault)) { + TRACE("Initialized the tablet to hwnd %p\n", hwndDefault); loaded = TI_OK; } else { + TRACE("Failed to initialize the tablet to hwnd %p\n", hwndDefault); loaded = TI_FAIL; - ERR("LoadTabletInfo(%p) failed\n", hwndDefault); } }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: f1ccd02608559b2c6009ea741a8583354c398875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ccd02608559b2c6009ea74… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Oct 25 10:02:51 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 7580e4e..b861c2b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-07 20:50+0200\n" +"PO-Revision-Date: 2018-10-25 11:58+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -308,25 +308,23 @@ msgstr "Avbryter..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 gjenstår" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 og %3!u! %4 gjenstår" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Sekunder" +msgstr "sekunder" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minutter" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "timer" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s"

1 0

Aaryaman Vasishta : d3drm: Partially implement d3drm_texture*_InitFromFile ().
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: dbb49e32c34907cf8fd8731f6bd9c4296b798751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb49e32c34907cf8fd8731f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Oct 25 14:29:28 2018 +0330 d3drm: Partially implement d3drm_texture*_InitFromFile(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 53 ++++---- dlls/d3drm/texture.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 329 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb49e32c34907cf8fd8…

1 0

Aaryaman Vasishta : d3drm: Implement d3drm*_LoadTexture().
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: wine Branch: master Commit: 1fd88b38856cbaee4087281511c807f110c97c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fd88b38856cbaee40872815… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Oct 25 14:29:29 2018 +0330 d3drm: Implement d3drm*_LoadTexture(). Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 ++++++++++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 66 ++++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3ea1632..d0f2023 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -638,12 +638,24 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, struct d3drm_texture *object; HRESULT hr; - FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); + TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture); + + if (!texture) + return D3DRMERR_BADVALUE; if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; + if (FAILED(hr = IDirect3DRMTexture_InitFromFile(*texture, filename))) + { + IDirect3DRMTexture_Release(*texture); + *texture = NULL; + if (!filename) + return D3DRMERR_BADVALUE; + + return hr == D3DRMERR_BADOBJECT ? D3DRMERR_FILENOTFOUND : hr; + } return D3DRM_OK; } @@ -1143,15 +1155,22 @@ static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, const char *filename, IDirect3DRMTexture2 **texture) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); - struct d3drm_texture *object; + IDirect3DRMTexture3 *texture3; HRESULT hr; - FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); + TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + if (!texture) + return D3DRMERR_BADVALUE; + + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, filename, &texture3))) + { + *texture = NULL; return hr; + } - *texture = &object->IDirect3DRMTexture2_iface; + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture2, (void **)texture); + IDirect3DRMTexture3_Release(texture3); return hr; } @@ -1818,12 +1837,21 @@ static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, struct d3drm_texture *object; HRESULT hr; - FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); + TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture); + + if (!texture) + return D3DRMERR_BADVALUE; if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; + if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(*texture, filename))) + { + IDirect3DRMTexture3_Release(*texture); + *texture = NULL; + return hr == D3DRMERR_BADOBJECT ? D3DRMERR_FILENOTFOUND : hr; + } return D3DRM_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 91ee68c..5157952 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5601,45 +5601,36 @@ static void test_load_texture(void) /* Test all failures together. */ texture1 = (IDirect3DRMTexture *)0xdeadbeef; hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + ok(!texture1, "Got unexpected texture %p.\n", texture1); texture1 = (IDirect3DRMTexture *)0xdeadbeef; hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); - if (hr == D3DRMERR_FILENOTFOUND) - { - hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - } + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture1, "Got unexpected texture %p.\n", texture1); + hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture2, "Got unexpected texture %p.\n", texture2); texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); - if (hr == D3DRMERR_FILENOTFOUND) - { - hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - } + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture2, "Got unexpected texture %p.\n", texture2); + hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture3, "Got unexpected texture %p.\n", texture3); texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3); - todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); - if (hr == D3DRMERR_FILENOTFOUND) - { - hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); - } + ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!texture3, "Got unexpected texture %p.\n", texture3); + hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5648,13 +5639,12 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2); hr = IDirect3DRMTexture_InitFromFile(texture1, filename); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */ - if (hr == D3DRMERR_BADOBJECT) - IDirect3DRM_Release(d3drm1); + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); @@ -5678,12 +5668,11 @@ static void test_load_texture(void) hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2); hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); - if (hr == D3DRMERR_BADOBJECT) - IDirect3DRM_Release(d3drm1); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); @@ -5707,12 +5696,11 @@ static void test_load_texture(void) hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2); hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); - if (hr == D3DRMERR_BADOBJECT) - IDirect3DRM_Release(d3drm1); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);

1 0