November 2016 - Wine-commits

Michael Müller : ntdll: Move EventRegister/ Unregister from advapi32 to ntdll.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 900366fd074a4ffab4cc9b6cbc27960bec7ba251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900366fd074a4ffab4cc9b6cb… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Oct 27 16:17:31 2016 +0300 ntdll: Move EventRegister/Unregister from advapi32 to ntdll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 20 -------------------- dlls/ntdll/misc.c | 22 ++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index b1a051c..4868841 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -272,9 +272,9 @@ @ stdcall EventActivityIdControl(long ptr) @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) -@ stdcall EventRegister(ptr ptr ptr ptr) +@ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister @ stdcall EventSetInformation(int64 long ptr long) -@ stdcall EventUnregister(int64) +@ stdcall EventUnregister(int64) ntdll.EtwEventUnregister @ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario # @ stub EventWriteEx diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index e97ddc7..9bd75e8 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -829,26 +829,6 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) } /****************************************************************************** - * EventRegister [ADVAPI32.@] - */ -ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) -{ - FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); - - *handle = 0xdeadbeef; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * EventUnregister [ADVAPI32.@] - */ -ULONG WINAPI EventUnregister( REGHANDLE handle ) -{ - FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); - return ERROR_SUCCESS; -} - -/****************************************************************************** * EventEnabled [ADVAPI32.@] * */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index f540c4b..687fff5 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -34,6 +34,7 @@ #include "ntdll_misc.h" #include "wmistr.h" #include "evntrace.h" +#include "evntprov.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -359,6 +360,27 @@ HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unkno } /****************************************************************************** + * EtwEventRegister (NTDLL.@) + */ +ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, + PREGHANDLE handle ) +{ + FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + + *handle = 0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwEventUnregister (NTDLL.@) + */ +ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) +{ + FIXME("(%s) stub.\n", wine_dbgstr_longlong(handle)); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EtwRegisterTraceGuidsW (NTDLL.@) * * Register an event trace provider and the event trace classes that it uses diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d138ac1..4fd944e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -41,6 +41,8 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() +@ stdcall EtwEventRegister(ptr ptr ptr ptr) +@ stdcall EtwEventUnregister(int64) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall

1 0

Alexandre Julliard : server: Get rid of the set_clipboard_info request.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: a5f42fcd6ee7904d67594f5965937788e27a2c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f42fcd6ee7904d67594f596… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 17:06:23 2016 +0100 server: Get rid of the set_clipboard_info request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 32 +------------------------------- server/clipboard.c | 41 ----------------------------------------- server/protocol.def | 20 -------------------- server/request.h | 11 ----------- server/trace.c | 19 ------------------- 5 files changed, 1 insertion(+), 122 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 29f5146..8fec67f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4488,33 +4488,6 @@ struct close_clipboard_reply -struct set_clipboard_info_request -{ - struct request_header __header; - unsigned int flags; - user_handle_t owner; - char __pad_20[4]; -}; -struct set_clipboard_info_reply -{ - struct reply_header __header; - unsigned int flags; - user_handle_t old_clipboard; - user_handle_t old_owner; - user_handle_t old_viewer; - unsigned int seqno; - char __pad_28[4]; -}; - -#define SET_CB_SEQNO 0x008 -#define SET_CB_RELOWNER 0x010 -#define CB_OPEN_ANY 0x020 -#define CB_OPEN 0x040 -#define CB_OWNER 0x080 -#define CB_PROCESS 0x100 - - - struct empty_clipboard_request { struct request_header __header; @@ -5792,7 +5765,6 @@ enum request REQ_set_class_info, REQ_open_clipboard, REQ_close_clipboard, - REQ_set_clipboard_info, REQ_empty_clipboard, REQ_set_clipboard_data, REQ_get_clipboard_data, @@ -6083,7 +6055,6 @@ union generic_request struct set_class_info_request set_class_info_request; struct open_clipboard_request open_clipboard_request; struct close_clipboard_request close_clipboard_request; - struct set_clipboard_info_request set_clipboard_info_request; struct empty_clipboard_request empty_clipboard_request; struct set_clipboard_data_request set_clipboard_data_request; struct get_clipboard_data_request get_clipboard_data_request; @@ -6372,7 +6343,6 @@ union generic_reply struct set_class_info_reply set_class_info_reply; struct open_clipboard_reply open_clipboard_reply; struct close_clipboard_reply close_clipboard_reply; - struct set_clipboard_info_reply set_clipboard_info_reply; struct empty_clipboard_reply empty_clipboard_reply; struct set_clipboard_data_reply set_clipboard_data_reply; struct get_clipboard_data_reply get_clipboard_data_reply; @@ -6442,6 +6412,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 522 +#define SERVER_PROTOCOL_VERSION 523 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index 89ce835..a04bbff 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -354,20 +354,6 @@ void cleanup_clipboard_thread(struct thread *thread) release_object( winstation ); } -static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) -{ - if ((clipboard->open_thread && clipboard->open_thread->process != current->process) || - (win && clipboard->owner_win != get_user_full_handle( win ))) - { - set_win32_error( ERROR_CLIPBOARD_NOT_OPEN ); - return 0; - } - clipboard->owner_win = 0; - clipboard->owner_thread = NULL; - return 1; -} - - /* open the clipboard */ DECL_HANDLER(open_clipboard) { @@ -408,33 +394,6 @@ DECL_HANDLER(close_clipboard) } -DECL_HANDLER(set_clipboard_info) -{ - struct clipboard *clipboard = get_process_clipboard(); - - if (!clipboard) return; - - reply->old_clipboard = clipboard->open_win; - reply->old_owner = clipboard->owner_win; - reply->old_viewer = clipboard->viewer; - - if (req->flags & SET_CB_RELOWNER) - { - if (!release_clipboard_owner( clipboard, req->owner )) return; - } - - if (req->flags & SET_CB_SEQNO) clipboard->seqno++; - - reply->seqno = clipboard->seqno; - - if (clipboard->open_thread) reply->flags |= CB_OPEN_ANY; - if (clipboard->open_thread == current) reply->flags |= CB_OPEN; - if (clipboard->owner_thread == current) reply->flags |= CB_OWNER; - if (clipboard->owner_thread && clipboard->owner_thread->process == current->process) - reply->flags |= CB_PROCESS; -} - - /* add a data format to the clipboard */ DECL_HANDLER(set_clipboard_data) { diff --git a/server/protocol.def b/server/protocol.def index 8d86737..9344da2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3174,26 +3174,6 @@ enum caret_state @END -/* Set/get clipboard information */ -(a)REQ(set_clipboard_info) - unsigned int flags; /* flags for fields to set (see below) */ - user_handle_t owner; /* clipboard owner */ -(a)REPLY - unsigned int flags; /* status flags (see below) */ - user_handle_t old_clipboard; /* old clipboard window */ - user_handle_t old_owner; /* old clipboard owner */ - user_handle_t old_viewer; /* old clipboard viewer */ - unsigned int seqno; /* current sequence number */ -(a)END - -#define SET_CB_SEQNO 0x008 -#define SET_CB_RELOWNER 0x010 -#define CB_OPEN_ANY 0x020 -#define CB_OPEN 0x040 -#define CB_OWNER 0x080 -#define CB_PROCESS 0x100 - - /* Empty the clipboard and grab ownership */ @REQ(empty_clipboard) @END diff --git a/server/request.h b/server/request.h index f3592de..43752e8 100644 --- a/server/request.h +++ b/server/request.h @@ -328,7 +328,6 @@ DECL_HANDLER(destroy_class); DECL_HANDLER(set_class_info); DECL_HANDLER(open_clipboard); DECL_HANDLER(close_clipboard); -DECL_HANDLER(set_clipboard_info); DECL_HANDLER(empty_clipboard); DECL_HANDLER(set_clipboard_data); DECL_HANDLER(get_clipboard_data); @@ -618,7 +617,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_class_info, (req_handler)req_open_clipboard, (req_handler)req_close_clipboard, - (req_handler)req_set_clipboard_info, (req_handler)req_empty_clipboard, (req_handler)req_set_clipboard_data, (req_handler)req_get_clipboard_data, @@ -2040,15 +2038,6 @@ C_ASSERT( sizeof(struct close_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct close_clipboard_reply, viewer) == 8 ); C_ASSERT( FIELD_OFFSET(struct close_clipboard_reply, owner) == 12 ); C_ASSERT( sizeof(struct close_clipboard_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_request, flags) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_request, owner) == 16 ); -C_ASSERT( sizeof(struct set_clipboard_info_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, flags) == 8 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_clipboard) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_owner) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_viewer) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, seqno) == 24 ); -C_ASSERT( sizeof(struct set_clipboard_info_reply) == 32 ); C_ASSERT( sizeof(struct empty_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_data_request, format) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_data_request, lcid) == 16 ); diff --git a/server/trace.c b/server/trace.c index 791641d..f7e114b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3754,21 +3754,6 @@ static void dump_close_clipboard_reply( const struct close_clipboard_reply *req fprintf( stderr, ", owner=%08x", req->owner ); } -static void dump_set_clipboard_info_request( const struct set_clipboard_info_request *req ) -{ - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", owner=%08x", req->owner ); -} - -static void dump_set_clipboard_info_reply( const struct set_clipboard_info_reply *req ) -{ - fprintf( stderr, " flags=%08x", req->flags ); - fprintf( stderr, ", old_clipboard=%08x", req->old_clipboard ); - fprintf( stderr, ", old_owner=%08x", req->old_owner ); - fprintf( stderr, ", old_viewer=%08x", req->old_viewer ); - fprintf( stderr, ", seqno=%08x", req->seqno ); -} - static void dump_empty_clipboard_request( const struct empty_clipboard_request *req ) { } @@ -4692,7 +4677,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_class_info_request, (dump_func)dump_open_clipboard_request, (dump_func)dump_close_clipboard_request, - (dump_func)dump_set_clipboard_info_request, (dump_func)dump_empty_clipboard_request, (dump_func)dump_set_clipboard_data_request, (dump_func)dump_get_clipboard_data_request, @@ -4979,7 +4963,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_class_info_reply, (dump_func)dump_open_clipboard_reply, (dump_func)dump_close_clipboard_reply, - (dump_func)dump_set_clipboard_info_reply, NULL, (dump_func)dump_set_clipboard_data_reply, (dump_func)dump_get_clipboard_data_reply, @@ -5266,7 +5249,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_class_info", "open_clipboard", "close_clipboard", - "set_clipboard_info", "empty_clipboard", "set_clipboard_data", "get_clipboard_data", @@ -5432,7 +5414,6 @@ static const struct { "OBJECT_PATH_SYNTAX_BAD", STATUS_OBJECT_PATH_SYNTAX_BAD }, { "OBJECT_TYPE_MISMATCH", STATUS_OBJECT_TYPE_MISMATCH }, { "PENDING", STATUS_PENDING }, - { "PIPE_BUSY", STATUS_PIPE_BUSY }, { "PIPE_CONNECTED", STATUS_PIPE_CONNECTED }, { "PIPE_DISCONNECTED", STATUS_PIPE_DISCONNECTED }, { "PIPE_LISTENING", STATUS_PIPE_LISTENING },

1 0

Alexandre Julliard : server: Get rid of the clipboard owner thread field.
by Alexandre Julliard 02 Nov '16

02 Nov '16

Module: wine Branch: master Commit: 86ec16971234d66b94790d32c88219687e058702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ec16971234d66b94790d32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 17:09:15 2016 +0100 server: Get rid of the clipboard owner thread field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index a04bbff..a93319a 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -52,8 +52,7 @@ struct clipboard struct object obj; /* object header */ struct thread *open_thread; /* thread id that has clipboard open */ user_handle_t open_win; /* window that has clipboard open */ - struct thread *owner_thread; /* thread id that owns the clipboard */ - user_handle_t owner_win; /* window that owns the clipboard data */ + user_handle_t owner; /* window that owns the clipboard */ user_handle_t viewer; /* first window in clipboard viewer list */ unsigned int lcid; /* locale id to use for synthesizing text formats */ unsigned int seqno; /* clipboard change sequence number */ @@ -141,9 +140,9 @@ static void clipboard_dump( struct object *obj, int verbose ) { struct clipboard *clipboard = (struct clipboard *)obj; - fprintf( stderr, "Clipboard open_thread=%p open_win=%08x owner_thread=%p owner_win=%08x viewer=%08x seq=%u\n", - clipboard->open_thread, clipboard->open_win, clipboard->owner_thread, - clipboard->owner_win, clipboard->viewer, clipboard->seqno ); + fprintf( stderr, "Clipboard open_thread=%p open_win=%08x owner=%08x viewer=%08x seq=%u\n", + clipboard->open_thread, clipboard->open_win, + clipboard->owner, clipboard->viewer, clipboard->seqno ); } static void clipboard_destroy( struct object *obj ) @@ -168,8 +167,7 @@ static struct clipboard *get_process_clipboard(void) { clipboard->open_thread = NULL; clipboard->open_win = 0; - clipboard->owner_thread = NULL; - clipboard->owner_win = 0; + clipboard->owner = 0; clipboard->viewer = 0; clipboard->seqno = 0; clipboard->format_count = 0; @@ -297,8 +295,7 @@ static user_handle_t release_clipboard( struct clipboard *clipboard ) struct clip_format *format, *next; int changed = 0; - clipboard->owner_win = 0; - clipboard->owner_thread = NULL; + clipboard->owner = 0; /* free the delayed-rendered formats, since we no longer have an owner to render them */ LIST_FOR_EACH_ENTRY_SAFE( format, next, &clipboard->formats, struct clip_format, entry ) @@ -325,11 +322,11 @@ void cleanup_clipboard_window( struct desktop *desktop, user_handle_t window ) remove_listener( clipboard, window ); if (clipboard->viewer == window) clipboard->viewer = 0; - if (clipboard->owner_win == window) release_clipboard( clipboard ); + if (clipboard->owner == window) release_clipboard( clipboard ); if (clipboard->open_win == window) { user_handle_t viewer = close_clipboard( clipboard ); - if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner_win, 0 ); + if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner, 0 ); } } @@ -344,11 +341,10 @@ void cleanup_clipboard_thread(struct thread *thread) if ((clipboard = winstation->clipboard)) { - if (thread == clipboard->owner_thread) clipboard->owner_thread = NULL; if (thread == clipboard->open_thread) { user_handle_t viewer = close_clipboard( clipboard ); - if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner_win, 0 ); + if (viewer) send_notify_message( viewer, WM_DRAWCLIPBOARD, clipboard->owner, 0 ); } } release_object( winstation ); @@ -373,7 +369,7 @@ DECL_HANDLER(open_clipboard) clipboard->open_win = win; clipboard->open_thread = current; - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; } @@ -390,7 +386,7 @@ DECL_HANDLER(close_clipboard) return; } reply->viewer = close_clipboard( clipboard ); - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; } @@ -454,7 +450,7 @@ DECL_HANDLER(get_clipboard_data) reply->from = format->from; reply->total = format->size; reply->seqno = format->seqno; - if (!format->data && !format->from) reply->owner = clipboard->owner_win; + if (!format->data && !format->from) reply->owner = clipboard->owner; if (req->cached && req->seqno == format->seqno) return; /* client-side cache still valid */ if (format->size <= get_reply_max_size()) set_reply_data( format->data, format->size ); else set_error( STATUS_BUFFER_OVERFLOW ); @@ -530,8 +526,7 @@ DECL_HANDLER(empty_clipboard) } free_clipboard_formats( clipboard ); - clipboard->owner_win = clipboard->open_win; - clipboard->owner_thread = clipboard->open_thread; + clipboard->owner = clipboard->open_win; clipboard->seqno++; } @@ -546,10 +541,10 @@ DECL_HANDLER(release_clipboard) if (!(owner = get_valid_window_handle( req->owner ))) return; - if (clipboard->owner_win == owner) + if (clipboard->owner == owner) { reply->viewer = release_clipboard( clipboard ); - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; } else set_error( STATUS_INVALID_OWNER ); } @@ -563,7 +558,7 @@ DECL_HANDLER(get_clipboard_info) if (!clipboard) return; reply->window = clipboard->open_win; - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; reply->viewer = clipboard->viewer; reply->seqno = clipboard->seqno; } @@ -580,7 +575,7 @@ DECL_HANDLER(set_clipboard_viewer) if (req->previous && !(previous = get_valid_window_handle( req->previous ))) return; reply->old_viewer = clipboard->viewer; - reply->owner = clipboard->owner_win; + reply->owner = clipboard->owner; if (!previous || clipboard->viewer == previous) clipboard->viewer = viewer;

1 0

Alistair Leslie-Hughes : dpnet: Semi-stub IDirectPlay8Client SetClientInfo.
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: 7a71a6a85867e473040ee7c8e3f8eaad34ac709a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a71a6a85867e473040ee7c8e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 28 07:07:07 2016 +0000 dpnet: Semi-stub IDirectPlay8Client SetClientInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 54 +++++++++++++++++++++++++++++++++---- dlls/dpnet/dpnet_private.h | 3 +++ dlls/dpnet/tests/client.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 5 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index bf2b8d2..f6f9e79 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -86,8 +86,11 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) TRACE("(%p) ref=%u\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + { + heap_free(This->username); + heap_free(This->data); + heap_free(This); } return ref; } @@ -182,9 +185,50 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i const DPN_PLAYER_INFO * const pdpnPlayerInfo, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + FIXME("(%p):(%p,%p,%x): Semi-stub.\n", This, pvAsyncContext, phAsyncHandle, dwFlags); + + if(!pdpnPlayerInfo) + return E_POINTER; + + if(phAsyncHandle) + FIXME("Async handle currently not supported.\n"); + + if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) + { + heap_free(This->username); + This->username = NULL; + + if(pdpnPlayerInfo->pwszName) + { + This->username = heap_strdupW(pdpnPlayerInfo->pwszName); + if (!This->username) + return E_OUTOFMEMORY; + } + } + + if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) + { + heap_free(This->data); + This->data = NULL; + This->datasize = 0; + + if(!pdpnPlayerInfo->pvData && pdpnPlayerInfo->dwDataSize) + return E_POINTER; + + if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) + { + This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + if (!This->data) + return E_OUTOFMEMORY; + + This->datasize = pdpnPlayerInfo->dwDataSize; + + memcpy(This->data, pdpnPlayerInfo->pvData, pdpnPlayerInfo->dwDataSize); + } + } + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerInfo(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 05608a6..dc6a4f1 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -56,6 +56,9 @@ struct IDirectPlay8ClientImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + WCHAR *username; + void *data; + DWORD datasize; DPN_SP_CAPS spcaps; }; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 253526a..f7d6c53 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -230,6 +230,71 @@ static void test_lobbyclient(void) } } +static void test_player_info(void) +{ + HRESULT hr; + DPN_PLAYER_INFO info; + WCHAR name[] = {'w','i','n','e',0}; + WCHAR name2[] = {'w','i','n','e','2',0}; + WCHAR data[] = {'X','X','X','X',0}; + + ZeroMemory( &info, sizeof(DPN_PLAYER_INFO) ); + info.dwSize = sizeof(DPN_PLAYER_INFO); + info.dwInfoFlags = DPNINFO_NAME; + + hr = IDirectPlay8Client_SetClientInfo(client, NULL, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == E_POINTER, "got %x\n", hr); + + info.pwszName = NULL; + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.pwszName = name; + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_NAME; + info.pwszName = name2; + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA; + info.pwszName = NULL; + info.pvData = NULL; + info.dwDataSize = sizeof(data); + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == E_POINTER, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA; + info.pwszName = NULL; + info.pvData = data; + info.dwDataSize = 0; + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA; + info.pwszName = NULL; + info.pvData = data; + info.dwDataSize = sizeof(data); + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA | DPNINFO_NAME; + info.pwszName = name; + info.pvData = data; + info.dwDataSize = sizeof(data); + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + /* Leave ClientInfo with only the name set. */ + info.dwInfoFlags = DPNINFO_DATA | DPNINFO_NAME; + info.pwszName = name; + info.pvData = NULL; + info.dwDataSize = 0; + hr = IDirectPlay8Client_SetClientInfo(client, &info, NULL, NULL, DPNSETCLIENTINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); +} + static void test_cleanup_dp(void) { HRESULT hr; @@ -258,6 +323,7 @@ START_TEST(client) test_enum_service_providers(); test_enum_hosts(); test_get_sp_caps(); + test_player_info(); test_lobbyclient(); test_cleanup_dp(); }

1 0

Alistair Leslie-Hughes : dpnet: Semi-stub IDirectPlay8Server SetServerInfo.
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: 5f797e6c340bc84ad3c31b3c1920cf05191ac89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f797e6c340bc84ad3c31b3c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 28 07:07:21 2016 +0000 dpnet: Semi-stub IDirectPlay8Server SetServerInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/server.c | 61 +++++++++++++++++++++++++++++++--- dlls/dpnet/tests/server.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 3e026fc..cd54ba4 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -43,6 +43,10 @@ typedef struct IDirectPlay8ServerImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + + WCHAR *servername; + void *data; + DWORD datasize; } IDirectPlay8ServerImpl; WINE_DEFAULT_DEBUG_CHANNEL(dpnet); @@ -91,8 +95,11 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface) TRACE("(%p) ref=%d\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + { + heap_free(This->servername); + heap_free(This->data); + heap_free(This); } return ref; @@ -151,8 +158,54 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i PVOID pvAsyncContext, DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %p %d)\n", This, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags); - return E_NOTIMPL; + + FIXME("(%p)->(%p %p %p %x) Semi-stub\n", This, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags); + + if(!pdpnPlayerInfo) + return E_POINTER; + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(phAsyncHandle) + FIXME("Async handle currently not supported.\n"); + + if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) + { + heap_free(This->servername); + This->servername = NULL; + + if(pdpnPlayerInfo->pwszName) + { + This->servername = heap_strdupW(pdpnPlayerInfo->pwszName); + if (!This->servername) + return E_OUTOFMEMORY; + } + } + + if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) + { + heap_free(This->data); + This->data = NULL; + This->datasize = 0; + + if(!pdpnPlayerInfo->pvData && pdpnPlayerInfo->dwDataSize) + return E_POINTER; + + if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) + { + This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + if (!This->data) + return E_OUTOFMEMORY; + + This->datasize = pdpnPlayerInfo->dwDataSize; + + memcpy(This->data, pdpnPlayerInfo->pvData, pdpnPlayerInfo->dwDataSize); + } + } + + /* TODO: Send DPN_MSGID_SERVER_INFO message to all players. */ + return S_OK; } static HRESULT WINAPI IDirectPlay8ServerImpl_GetClientInfo(IDirectPlay8Server *iface, DPNID dpnid, DPN_PLAYER_INFO *pdpnPlayerInfo, diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 8279666..928c6a0 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -98,6 +98,88 @@ static void create_server(void) } } +static void test_server_info(void) +{ + HRESULT hr; + DPN_PLAYER_INFO info; + WCHAR name[] = {'w','i','n','e',0}; + WCHAR name2[] = {'w','i','n','e','2',0}; + WCHAR data[] = {'X','X','X','X',0}; + IDirectPlay8Server *server = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); + if( SUCCEEDED(hr) ) + { + ZeroMemory( &info, sizeof(DPN_PLAYER_INFO) ); + info.dwSize = sizeof(DPN_PLAYER_INFO); + info.dwInfoFlags = DPNINFO_NAME; + + hr = IDirectPlay8Server_SetServerInfo(server, NULL, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == E_POINTER, "got %x\n", hr); + + info.pwszName = name; + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Server_SetServerInfo(server, NULL, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == E_POINTER, "got %x\n", hr); + + info.pwszName = NULL; + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.pwszName = name; + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_NAME; + info.pwszName = name2; + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA; + info.pwszName = NULL; + info.pvData = NULL; + info.dwDataSize = sizeof(data); + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == E_POINTER, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA; + info.pwszName = NULL; + info.pvData = data; + info.dwDataSize = 0; + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA; + info.pwszName = NULL; + info.pvData = data; + info.dwDataSize = sizeof(data); + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA | DPNINFO_NAME; + info.pwszName = name; + info.pvData = data; + info.dwDataSize = sizeof(data); + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + info.dwInfoFlags = DPNINFO_DATA | DPNINFO_NAME; + info.pwszName = name; + info.pvData = NULL; + info.dwDataSize = 0; + hr = IDirectPlay8Server_SetServerInfo(server, &info, NULL, NULL, DPNSETSERVERINFO_SYNC); + ok(hr == S_OK, "got %x\n", hr); + + IDirectPlay8Server_Release(server); + } +} + START_TEST(server) { HRESULT hr; @@ -108,6 +190,7 @@ START_TEST(server) return; create_server(); + test_server_info(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8LobbyClient Initialize.
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: 5183ebd8ab31cd3d65716d76621e579d5ddd3dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5183ebd8ab31cd3d65716d766… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 28 07:07:32 2016 +0000 dpnet: Implement IDirectPlay8LobbyClient Initialize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 15 +++++++++++++-- dlls/dpnet/tests/client.c | 5 ++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index f6f9e79..36df50d 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -40,6 +40,10 @@ typedef struct IDirectPlay8LobbyClientImpl { IDirectPlay8LobbyClient IDirectPlay8LobbyClient_iface; LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; } IDirectPlay8LobbyClientImpl; static inline IDirectPlay8LobbyClientImpl *impl_from_IDirectPlay8LobbyClient(IDirectPlay8LobbyClient *iface) @@ -427,9 +431,16 @@ static HRESULT WINAPI lobbyclient_Initialize(IDirectPlay8LobbyClient *iface, voi { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); - FIXME("(%p)->(%p %p 0x%08x)\n", This, context, msghandler, flags); + TRACE("(%p):(%p,%p,%x)\n", This, context, msghandler, flags); - return E_NOTIMPL; + if(!msghandler) + return E_POINTER; + + This->usercontext = context; + This->msghandler = msghandler; + This->flags = flags; + + return DPN_OK; } static HRESULT WINAPI lobbyclient_EnumLocalPrograms(IDirectPlay8LobbyClient *iface, GUID* guidapplication, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index f7d6c53..6732034 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -220,8 +220,11 @@ static void test_lobbyclient(void) ok(hr == S_OK, "Failed to create object\n"); if(SUCCEEDED(hr)) { + hr = IDirectPlay8LobbyClient_Initialize(client, NULL, NULL, 0); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IDirectPlay8LobbyClient_Initialize(client, NULL, DirectPlayLobbyClientMessageHandler, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8LobbyClient_Close(client, 0); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Carlo Bramini : wordpad: Fix syntax error in resource files ( native Windows build).
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: d38c0c3b7c8e309d868ce608047448868b5ab4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38c0c3b7c8e309d868ce6080… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Nov 1 18:07:55 2016 +0100 wordpad: Fix syntax error in resource files (native Windows build). Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.rc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index 368d169..10df516 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "Roman numerals - lower case", ID_LCROMAN MENUITEM "Roman numerals - upper case", ID_UCROMAN END - MENUITEM "&Paragraph...", ID_PARAFORMAT - MENUITEM "&Tabs...", ID_TABSTOPS + MENUITEM "&Paragraph...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -112,8 +112,8 @@ BEGIN MENUITEM "&Copy", ID_EDIT_COPY MENUITEM "&Paste", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraph...", ID_PARAFORMAT END END @@ -124,20 +124,20 @@ BEGIN MENUITEM "Black", ID_COLOR_BLACK MENUITEM "Maroon", ID_COLOR_MAROON MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Olive", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Purple", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Gray", ID_COLOR_GRAY + MENUITEM "Silver", ID_COLOR_SILVER + MENUITEM "Red", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Yellow", ID_COLOR_YELLOW + MENUITEM "Blue", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "White", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END

1 0

Nikolay Sivov : d2d1: For transformed geometry forward StrokeContainsPoint () to its source geometry.
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: 306d062f46af01c17aa0159c9ef5ce6af890eb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306d062f46af01c17aa0159c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 03:34:04 2016 +0300 d2d1: For transformed geometry forward StrokeContainsPoint() to its source geometry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 385e171..4abe9bc 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2633,11 +2633,19 @@ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_StrokeContainsPoint(ID D2D1_POINT_2F point, float stroke_width, ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, stroke_width %.8e, stroke_style %p, " - "transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; + + TRACE("iface %p, point {%.8e, %.8e}, stroke_width %.8e, stroke_style %p, " + "transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, stroke_width, stroke_style, transform, tolerance, contains); - return E_NOTIMPL; + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_StrokeContainsPoint(geometry->u.transformed.src_geometry, point, stroke_width, stroke_style, + &g, tolerance, contains); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_FillContainsPoint(ID2D1TransformedGeometry *iface,

1 0

Nikolay Sivov : d2d1: Fix a typo in traced error message parameter.
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: aa552066266df76da23bd22d28743272c05bac8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa552066266df76da23bd22d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 03:34:05 2016 +0300 d2d1: Fix a typo in traced error message parameter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 4110b48..d51f53f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -881,7 +881,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b { if (opacity_brush->type >= sizeof(brush_sizes) / sizeof(*brush_sizes)) { - ERR("Unhandled opacity brush type %#x.\n", brush->type); + ERR("Unhandled opacity brush type %#x.\n", opacity_brush->type); return E_NOTIMPL; } buffer_desc.ByteWidth += brush_sizes[opacity_brush->type];

1 0

Carlos Rafael Ramirez : cmd: When 'if' condition is not met, ignore the next commands in the list.
by Alexandre Julliard 01 Nov '16

01 Nov '16

Module: wine Branch: master Commit: 55be713d76bef86ba7577c810a9dbdfb071fc179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55be713d76bef86ba7577c810… Author: Carlos Rafael Ramirez <crramirez(a)gmail.com> Date: Mon Oct 31 18:57:33 2016 -0500 cmd: When 'if' condition is not met, ignore the next commands in the list. Signed-off-by: Carlos Rafael Ramirez <crramirez(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 3 +++ programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++++++++ 3 files changed, 27 insertions(+) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 49c366a..a29a502 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1574,6 +1574,9 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, } } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; + } else if (!processThese) { + if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; + WINE_TRACE("Ignore the next command as well (next = %p)\n", *cmdList); } else { WINE_TRACE("Found end of this IF statement (next = %p)\n", *cmdList); break; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index eac5dca..38a7700 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -836,6 +836,17 @@ if 1 GEQ "10" (echo 1 GEQ "10") else echo foo if "1" GEQ "10" (echo 1 GEQ "10") else echo foo if '1' GEQ "10" (echo '1' GEQ "10") else echo foo if "10" GEQ "10" (echo "10" GEQ "10") +echo --- unconditional ampersand after if one line +if "0"=="0" echo 1 & echo 2 & echo 3 else echo 4 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 +echo --- +echo x & if "0"=="1" (echo 1 & echo 2 & echo 3) +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 else echo 4 +echo --- goto :endIfCompOpsSubroutines rem IF subroutines helpers diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 67e75e0..d01a23e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -645,6 +645,19 @@ foo foo '1' GEQ "10" "10" GEQ "10" +--- unconditional ampersand after if one line +1(a)space@ +2(a)space@ +3 else echo 4 +--- +x(a)space@ +--- +x(a)space@ +--- +x(a)space@ +--- +x(a)space@ +--- ------------ Testing for ------------ --- plain FOR A

1 0