September 2018 - Wine-Commits

Alexandre Julliard : server: Allow specifying the security descriptor for a new thread.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 4a328e08aca20a46ecbee634ffba873e0ab29b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a328e08aca20a46ecbee634… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:06:12 2018 +0200 server: Allow specifying the security descriptor for a new thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- dlls/ntdll/thread.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 5 ++--- include/winternl.h | 2 +- server/process.c | 2 +- server/protocol.def | 2 +- server/request.h | 7 +++---- server/thread.c | 19 ++++++++++++++++--- server/thread.h | 3 ++- server/trace.c | 2 +- 10 files changed, 45 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a328e08aca20a46ecbe…

1 0

Alexandre Julliard : server: Move initial thread creation out of the create_process() function.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: af8f3ae3339336ff23acad5cdaf8d39812146e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8f3ae3339336ff23acad5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:18:19 2018 +0200 server: Move initial thread creation out of the create_process() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 55 +++++++++++++++++++------------------------------------ server/process.h | 2 +- server/request.c | 7 ++++++- server/thread.c | 18 ++++++++++++++++++ 4 files changed, 44 insertions(+), 38 deletions(-) diff --git a/server/process.c b/server/process.c index 8b808de..0698887 100644 --- a/server/process.c +++ b/server/process.c @@ -232,16 +232,6 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi static void add_job_process( struct job *job, struct process *process ) { - if (!process->running_threads) - { - set_error( STATUS_PROCESS_IS_TERMINATING ); - return; - } - if (process->job) - { - set_error( STATUS_ACCESS_DENIED ); - return; - } process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); job->num_processes++; @@ -493,13 +483,11 @@ static void start_sigkill_timer( struct process *process ) process_died( process ); } -/* create a new process and its main thread */ +/* create a new process */ /* if the function fails the fd is closed */ -struct thread *create_process( int fd, struct thread *parent_thread, int inherit_all ) +struct process *create_process( int fd, struct thread *parent_thread, int inherit_all ) { struct process *process; - struct thread *thread = NULL; - int request_pipe[2]; if (!(process = alloc_object( &process_ops ))) { @@ -577,24 +565,8 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit if (!token_assign_label( process->token, security_high_label_sid )) goto error; - /* create the main thread */ - if (pipe( request_pipe ) == -1) - { - file_set_error(); - goto error; - } - if (send_client_fd( process, request_pipe[1], SERVER_PROTOCOL_VERSION ) == -1) - { - close( request_pipe[0] ); - close( request_pipe[1] ); - goto error; - } - close( request_pipe[1] ); - if (!(thread = create_thread( request_pipe[0], process, NULL ))) goto error; - set_fd_events( process->msg_fd, POLLIN ); /* start listening to events */ - release_object( process ); - return thread; + return process; error: if (process) release_object( process ); @@ -1090,7 +1062,7 @@ DECL_HANDLER(new_process) { struct startup_info *info; struct thread *thread; - struct process *process; + struct process *process = NULL; struct process *parent = current->process; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); @@ -1127,7 +1099,11 @@ DECL_HANDLER(new_process) if (!req->info_size) /* create an orphaned process */ { - create_process( socket_fd, NULL, 0 ); + if ((process = create_process( socket_fd, NULL, 0 ))) + { + create_thread( -1, process, NULL ); + release_object( process ); + } return; } @@ -1189,8 +1165,9 @@ DECL_HANDLER(new_process) #undef FIXUP_LEN } - if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; - process = thread->process; + if (!(process = create_process( socket_fd, current, req->inherit_all ))) goto done; + if (!(thread = create_thread( -1, process, NULL ))) goto done; + process->startup_info = (struct startup_info *)grab_object( info ); if (parent->job @@ -1252,6 +1229,7 @@ DECL_HANDLER(new_process) reply->thandle = alloc_handle( parent, thread, req->thread_access, req->thread_attr ); done: + if (process) release_object( process ); release_object( info ); } @@ -1618,7 +1596,12 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - add_job_process( job, process ); + if (!process->running_threads) + set_error( STATUS_PROCESS_IS_TERMINATING ); + else if (process->job) + set_error( STATUS_ACCESS_DENIED ); + else + add_job_process( job, process ); release_object( process ); } release_object( job ); diff --git a/server/process.h b/server/process.h index f22c128..c9d00aa 100644 --- a/server/process.h +++ b/server/process.h @@ -114,7 +114,7 @@ struct process_snapshot extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); -extern struct thread *create_process( int fd, struct thread *parent_thread, int inherit_all ); +extern struct process *create_process( int fd, struct thread *parent_thread, int inherit_all ); extern data_size_t init_process( struct thread *thread ); extern struct thread *get_process_first_thread( struct process *process ); extern struct process *get_process_from_id( process_id_t id ); diff --git a/server/request.c b/server/request.c index 2dd84fb..40f532b8 100644 --- a/server/request.c +++ b/server/request.c @@ -571,12 +571,17 @@ static void master_socket_poll_event( struct fd *fd, int event ) } else if (event & POLLIN) { + struct process *process; struct sockaddr_un dummy; socklen_t len = sizeof(dummy); int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); - create_process( client, NULL, 0 ); + if ((process = create_process( client, NULL, 0 ))) + { + create_thread( -1, process, NULL ); + release_object( process ); + } } } diff --git a/server/thread.c b/server/thread.c index 9ee846d..d671377 100644 --- a/server/thread.c +++ b/server/thread.c @@ -221,6 +221,24 @@ static inline int is_valid_address( client_ptr_t addr ) struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { struct thread *thread; + int request_pipe[2]; + + if (fd == -1) + { + if (pipe( request_pipe ) == -1) + { + file_set_error(); + return NULL; + } + if (send_client_fd( process, request_pipe[1], SERVER_PROTOCOL_VERSION ) == -1) + { + close( request_pipe[0] ); + close( request_pipe[1] ); + return NULL; + } + close( request_pipe[1] ); + fd = request_pipe[0]; + } if (process->is_terminating) {

1 0

Alexandre Julliard : server: Specify the process in which to create a new thread.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 0fd450af5bad816f7134b5ce6a5b81fb7b962b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd450af5bad816f7134b5ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:19:49 2018 +0200 server: Specify the process in which to create a new thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + include/wine/server_protocol.h | 4 +++- server/protocol.def | 3 ++- server/request.h | 9 +++++---- server/thread.c | 31 +++++++++++++++++++++++++++---- server/trace.c | 3 ++- 6 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7fa087d..8171638 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -605,6 +605,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, SERVER_START_REQ( new_thread ) { + req->process = wine_server_obj_handle( process ); req->access = THREAD_ALL_ACCESS; req->suspend = suspended; req->request_fd = request_pipe[0]; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d31a1d4..02734bc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -766,10 +766,12 @@ struct get_new_process_info_reply struct new_thread_request { struct request_header __header; + obj_handle_t process; unsigned int access; int suspend; int request_fd; /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct new_thread_reply { @@ -6534,6 +6536,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 561 +#define SERVER_PROTOCOL_VERSION 562 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 46669d6..1c2e130 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -766,8 +766,9 @@ struct rawinput_device @END -/* Create a new thread from the context of the parent */ +/* Create a new thread */ @REQ(new_thread) + obj_handle_t process; /* process in which to create thread */ unsigned int access; /* wanted access rights */ int suspend; /* new thread should be suspended on creation */ int request_fd; /* fd for request pipe */ diff --git a/server/request.h b/server/request.h index ff2da53..d7a4c8d 100644 --- a/server/request.h +++ b/server/request.h @@ -752,10 +752,11 @@ C_ASSERT( sizeof(struct get_new_process_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_reply, success) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_reply, exit_code) == 12 ); C_ASSERT( sizeof(struct get_new_process_info_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct new_thread_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct new_thread_request, suspend) == 16 ); -C_ASSERT( FIELD_OFFSET(struct new_thread_request, request_fd) == 20 ); -C_ASSERT( sizeof(struct new_thread_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, process) == 12 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, access) == 16 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, suspend) == 20 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, request_fd) == 24 ); +C_ASSERT( sizeof(struct new_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct new_thread_reply, tid) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_thread_reply, handle) == 12 ); C_ASSERT( sizeof(struct new_thread_reply) == 16 ); diff --git a/server/thread.c b/server/thread.c index d671377..7162fc3 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1271,19 +1271,40 @@ unsigned int get_supported_cpu_mask(void) DECL_HANDLER(new_thread) { struct thread *thread; + struct process *process; struct unicode_str name; const struct security_descriptor *sd; const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); int request_fd = thread_get_inflight_fd( current, req->request_fd ); - if (request_fd == -1 || fcntl( request_fd, F_SETFL, O_NONBLOCK ) == -1) + if (!(process = get_process_from_handle( req->process, PROCESS_CREATE_THREAD ))) { if (request_fd != -1) close( request_fd ); - set_error( STATUS_INVALID_HANDLE ); return; } - if ((thread = create_thread( request_fd, current->process, sd ))) + if (process != current->process) + { + if (request_fd != -1) /* can't create a request fd in a different process */ + { + close( request_fd ); + set_error( STATUS_INVALID_PARAMETER ); + goto done; + } + if (process->running_threads) /* only the initial thread can be created in another process */ + { + set_error( STATUS_ACCESS_DENIED ); + goto done; + } + } + else if (request_fd == -1 || fcntl( request_fd, F_SETFL, O_NONBLOCK ) == -1) + { + if (request_fd != -1) close( request_fd ); + set_error( STATUS_INVALID_HANDLE ); + goto done; + } + + if ((thread = create_thread( request_fd, process, sd ))) { thread->system_regs = current->system_regs; if (req->suspend) thread->suspend++; @@ -1292,10 +1313,12 @@ DECL_HANDLER(new_thread) req->access, objattr->attributes ))) { /* thread object will be released when the thread gets killed */ - return; + goto done; } kill_thread( thread, 1 ); } +done: + release_object( process ); } /* initialize a new thread */ diff --git a/server/trace.c b/server/trace.c index 3054a18..a419ddf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1261,7 +1261,8 @@ static void dump_get_new_process_info_reply( const struct get_new_process_info_r static void dump_new_thread_request( const struct new_thread_request *req ) { - fprintf( stderr, " access=%08x", req->access ); + fprintf( stderr, " process=%04x", req->process ); + fprintf( stderr, ", access=%08x", req->access ); fprintf( stderr, ", suspend=%d", req->suspend ); fprintf( stderr, ", request_fd=%d", req->request_fd ); dump_varargs_object_attributes( ", objattr=", cur_size );

1 0

Nikolay Sivov : opcservices: Fix relationship stream names.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 1b55ac75097a436d460c17b20bf558ac0edd2460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b55ac75097a436d460c17b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 20 10:09:15 2018 +0300 opcservices: Fix relationship stream names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 22bf793..d7467a5 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1888,7 +1888,10 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations if (SUCCEEDED(hr)) hr = IOpcPartUri_GetRawUri(rels_uri, &rels_part_uri); if (SUCCEEDED(hr)) - hr = compress_add_file(archive, rels_part_uri, content, OPC_COMPRESSION_NORMAL); + { + /* Relationship part names always start with root '/', skip it. */ + hr = compress_add_file(archive, rels_part_uri + 1, content, OPC_COMPRESSION_NORMAL); + } SysFreeString(rels_part_uri); IStream_Release(content);

1 0

Huw Davies : setupapi: For consistency use __x86_64__ instead of __x86_64.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: a6d89db61566b5dcccd66cb1cb5a51dfa0cc0f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d89db61566b5dcccd66cb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 20 10:16:05 2018 +0100 setupapi: For consistency use __x86_64__ instead of __x86_64. Spotted by Ken Thomases. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 2 +- dlls/setupapi/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 5b2d4b8..1453f52 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1200,7 +1200,7 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I { #ifdef __i386__ static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; -#elif defined(__x86_64) +#elif defined(__x86_64__) static const WCHAR nt_platformW[] = {'.','n','t','a','m','d','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR nt_platformW[] = {'.','n','t',0}; diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 627c543..ba6d01d 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -38,7 +38,7 @@ static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; static const WCHAR source_disks_files_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; -#elif defined(__x86_64) +#elif defined(__x86_64__) static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; static const WCHAR source_disks_files_platform[] =

1 0

Fabian Maurer : shell32/brsfolder: Add shortcut to delete folders with the delete key.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 43f44ffb3779ff23c863d9b3297f92720e7e3733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f44ffb3779ff23c863d9b3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 14 22:01:41 2018 +0200 shell32/brsfolder: Add shortcut to delete folders with the delete key. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 91936bd..d771d0b 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +#define SHV_CHANGE_NOTIFY (WM_USER + 0x1111) + /* original margins and control size */ typedef struct tagLAYOUT_DATA { @@ -53,6 +55,7 @@ typedef struct tagbrowse_info LPITEMIDLIST pidlRet; LAYOUT_DATA *layout; /* filled by LayoutInit, used by LayoutUpdate */ SIZE szMin; + ULONG hNotify; /* change notification handle */ } browse_info; typedef struct tagTV_ITEMDATA @@ -635,6 +638,30 @@ static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydo case VK_F2: BrsFolder_Rename(info, selected_item); break; + case VK_DELETE: + { + const ITEMIDLIST *item_id; + ISFHelper *psfhlp; + HRESULT hr; + TVITEMW item; + TV_ITEMDATA *item_data; + + item.mask = TVIF_PARAM; + item.mask = TVIF_HANDLE|TVIF_PARAM; + item.hItem = selected_item; + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (TV_ITEMDATA *)item.lParam; + item_id = item_data->lpi; + + hr = IShellFolder_QueryInterface(item_data->lpsfParent, &IID_ISFHelper, (void**)&psfhlp); + if(FAILED(hr)) + return 0; + + /* perform the item deletion - tree view gets updated over shell notification */ + ISFHelper_DeleteItems(psfhlp, 1, &item_id); + ISFHelper_Release(psfhlp); + } + break; } return 0; } @@ -680,6 +707,8 @@ static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) { + LPITEMIDLIST computer_pidl; + SHChangeNotifyEntry ntreg; LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; info->hWnd = hWnd; @@ -745,6 +774,14 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) else ERR("treeview control missing!\n"); + /* Register for change notifications */ + SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &computer_pidl); + + ntreg.pidl = computer_pidl; + ntreg.fRecursive = TRUE; + + info->hNotify = SHChangeNotifyRegister(hWnd, SHCNRF_InterruptLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); + browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); return TRUE; @@ -1001,9 +1038,62 @@ static INT BrsFolder_OnDestroy(browse_info *info) info->layout = NULL; } + SHChangeNotifyDeregister(info->hNotify); + return 0; } +/* Find a treeview node by recursively walking the treeview */ +static HTREEITEM BrsFolder_FindItemByPidl(browse_info *info, LPCITEMIDLIST pidl, HTREEITEM hItem) +{ + TV_ITEMW item; + TV_ITEMDATA *item_data; + HRESULT hr; + + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = hItem; + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (TV_ITEMDATA *)item.lParam; + + hr = IShellFolder_CompareIDs(item_data->lpsfParent, 0, item_data->lpifq, pidl); + if(SUCCEEDED(hr) && !HRESULT_CODE(hr)) + return hItem; + + hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hItem); + + while (hItem) + { + HTREEITEM newItem = BrsFolder_FindItemByPidl(info, pidl, hItem); + if (newItem) + return newItem; + hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hItem); + } + return NULL; +} + +static LRESULT BrsFolder_OnChange(browse_info *info, const LPCITEMIDLIST *pidls, LONG event) +{ + BOOL ret = TRUE; + + TRACE("(%p)->(%p, %p, 0x%08x)\n", info, pidls[0], pidls[1], event); + + switch (event) + { + case SHCNE_RMDIR: + case SHCNE_DELETE: + { + HTREEITEM handle_root = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_ROOT, 0); + HTREEITEM handle_item = BrsFolder_FindItemByPidl(info, pidls[0], handle_root); + + if (handle_item) + SendMessageW(info->hwndTreeView, TVM_DELETEITEM, 0, (LPARAM)handle_item); + + break; + } + } + return ret; +} + /************************************************************************* * BrsFolderDlgProc32 (not an exported API function) */ @@ -1064,6 +1154,9 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, case BFFM_SETEXPANDED: /* unicode only */ return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); + case SHV_CHANGE_NOTIFY: + return BrsFolder_OnChange(info, (const LPCITEMIDLIST*)wParam, (LONG)lParam); + case WM_DESTROY: return BrsFolder_OnDestroy(info); }

1 0

Michael Stefaniuc : winmm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 24f47812165a5dcb2b22825e47ccccbbd7437b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f47812165a5dcb2b22825e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 19 21:01:11 2018 +0200 winmm: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/driver.c | 2 +- dlls/winmm/lolvldrv.c | 10 +++++----- dlls/winmm/mci.c | 20 +++++++++----------- dlls/winmm/mmio.c | 2 +- dlls/winmm/playsound.c | 10 +++++----- dlls/winmm/waveform.c | 2 +- dlls/winmm/winmm.c | 3 +-- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index feecc92..0117c60 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -396,7 +396,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar if (lsn == NULL) { static const WCHAR wszDrivers32[] = {'D','r','i','v','e','r','s','3','2',0}; - lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR)); + lstrcpynW(libName, lpDriverName, ARRAY_SIZE(libName)); if ((lpDrv = DRIVER_TryOpenDriver32(libName, lParam))) goto the_end; diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 35bd6a0..95f454f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -181,7 +181,7 @@ void MMDRV_Free(HANDLE hndl, LPWINE_MLD mld) if ((UINT_PTR)hndl & 0x8000) { UINT_PTR idx = (UINT_PTR)hndl & ~0x8000; - if (idx < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) { + if (idx < ARRAY_SIZE(MM_MLDrvs)) { MM_MLDrvs[idx] = NULL; HeapFree(GetProcessHeap(), 0, mld); return; @@ -261,7 +261,7 @@ LPWINE_MLD MMDRV_Get(HANDLE _hndl, UINT type, BOOL bCanBeID) hndl != (UINT16)-1 && hndl != (UINT)-1) { if (hndl & 0x8000) { UINT idx = hndl & ~0x8000; - if (idx < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) { + if (idx < ARRAY_SIZE(MM_MLDrvs)) { __TRY { mld = MM_MLDrvs[idx]; @@ -424,7 +424,7 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) * drivers !! * If not just increase size of MMDrvs */ - assert(MMDrvsHi <= sizeof(MMDrvs)/sizeof(MMDrvs[0])); + assert(MMDrvsHi <= ARRAY_SIZE(MMDrvs)); memset(lpDrv, 0, sizeof(*lpDrv)); @@ -589,7 +589,7 @@ void MMDRV_Exit(void) unsigned int i; TRACE("()\n"); - for (i = 0; i < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0]); i++) + for (i = 0; i < ARRAY_SIZE(MM_MLDrvs); i++) { if (MM_MLDrvs[i] != NULL) { @@ -602,7 +602,7 @@ void MMDRV_Exit(void) } /* unload driver, in reverse order of loading */ - i = sizeof(MMDrvs) / sizeof(MMDrvs[0]); + i = ARRAY_SIZE(MMDrvs); while (i-- > 0) { MMDRV_ExitPerType(&MMDrvs[i], MMDRV_AUX); diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 56a537d..0319a0b 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -551,7 +551,7 @@ static UINT MCI_GetDevTypeFromResource(LPCWSTR lpstrName) WCHAR buf[32]; UINT uDevType; for (uDevType = MCI_DEVTYPE_FIRST; uDevType <= MCI_DEVTYPE_LAST; uDevType++) { - if (LoadStringW(hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { + if (LoadStringW(hWinMM32Instance, uDevType, buf, ARRAY_SIZE(buf))) { /* FIXME: ignore digits suffix */ if (!strcmpiW(buf, lpstrName)) return uDevType; @@ -668,7 +668,7 @@ static UINT MCI_GetCommandTable(UINT uDevType) /* well try to load id */ if (uDevType >= MCI_DEVTYPE_FIRST && uDevType <= MCI_DEVTYPE_LAST) { - if (LoadStringW(hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { + if (LoadStringW(hWinMM32Instance, uDevType, buf, ARRAY_SIZE(buf))) { str = buf; } } else if (uDevType == 0) { @@ -1450,9 +1450,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, { static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; WCHAR buf[138], retbuf[6]; - snprintfW(buf, sizeof(buf)/sizeof(WCHAR), wszOpenWait, dev); + snprintfW(buf, ARRAY_SIZE(buf), wszOpenWait, dev); /* open via mciSendString handles quoting, dev!file syntax and alias creation */ - if ((dwRet = mciSendStringW(buf, retbuf, sizeof(retbuf)/sizeof(WCHAR), 0)) != 0) + if ((dwRet = mciSendStringW(buf, retbuf, ARRAY_SIZE(retbuf), 0)) != 0) goto errCleanUp; auto_open = strtoulW(retbuf, NULL, 10); TRACE("auto-opened %u for %s\n", auto_open, debugstr_w(dev)); @@ -1746,10 +1746,8 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) if (dwParam & MCI_OPEN_TYPE_ID) { WORD uDevType = LOWORD(lpParms->lpstrDeviceType); - if (uDevType < MCI_DEVTYPE_FIRST || - uDevType > MCI_DEVTYPE_LAST || - !LoadStringW(hWinMM32Instance, uDevType, - strDevTyp, sizeof(strDevTyp) / sizeof(WCHAR))) { + if (uDevType < MCI_DEVTYPE_FIRST || uDevType > MCI_DEVTYPE_LAST || + !LoadStringW(hWinMM32Instance, uDevType, strDevTyp, ARRAY_SIZE(strDevTyp))) { dwRet = MCIERR_BAD_INTEGER; goto errCleanUp; } @@ -1946,7 +1944,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); RegCloseKey( hKey ); } - if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, sizeof(buf) / sizeof(buf[0]), wszSystemIni)) + if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, ARRAY_SIZE(buf), wszSystemIni)) for (s = buf; *s; s += strlenW(s) + 1) cnt++; } } else { @@ -2016,7 +2014,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0) == ERROR_SUCCESS && lpParms->dwNumber <= cnt) { - DWORD bufLen = sizeof(buf)/sizeof(buf[0]); + DWORD bufLen = ARRAY_SIZE(buf); if (RegEnumKeyExW(hKey, lpParms->dwNumber - 1, buf, &bufLen, 0, 0, 0, 0) == ERROR_SUCCESS) s = buf; @@ -2024,7 +2022,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm RegCloseKey( hKey ); } if (!s) { - if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, sizeof(buf) / sizeof(buf[0]), wszSystemIni)) { + if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, ARRAY_SIZE(buf), wszSystemIni)) { for (p = buf; *p; p += strlenW(p) + 1, cnt++) { TRACE("%d: %s\n", cnt, debugstr_w(p)); if (cnt == lpParms->dwNumber - 1) { diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index d8af787..b4155b6 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -315,7 +315,7 @@ static LPMMIOPROC MMIO_InstallIOProc(FOURCC fccIOProc, LPMMIOPROC pIOProc, } /* remove it, but only if it isn't builtin */ if ((*ppListNode) >= defaultProcs && - (*ppListNode) < defaultProcs + sizeof(defaultProcs) / sizeof(defaultProcs[0])) { + (*ppListNode) < defaultProcs + ARRAY_SIZE(defaultProcs)) { WARN("Tried to remove built-in mmio proc. Skipping\n"); } else { /* Okay, nuke it */ diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 6525db5..2731e7b 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -60,7 +60,7 @@ static HMMIO get_mmioFromFile(LPCWSTR lpszName) ret = mmioOpenW((LPWSTR)lpszName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (ret != 0) return ret; - if (SearchPathW(NULL, lpszName, dotwav, sizeof(buf)/sizeof(buf[0]), buf, &dummy)) + if (SearchPathW(NULL, lpszName, dotwav, ARRAY_SIZE(buf), buf, &dummy)) { return mmioOpenW(buf, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); @@ -86,11 +86,11 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) static const WCHAR wszNull[] = {0}; TRACE("searching in SystemSound list for %s\n", debugstr_w(lpszName)); - GetProfileStringW(wszSounds, lpszName, wszNull, str, sizeof(str)/sizeof(str[0])); + GetProfileStringW(wszSounds, lpszName, wszNull, str, ARRAY_SIZE(str)); if (lstrlenW(str) == 0) { if (uFlags & SND_NODEFAULT) goto next; - GetProfileStringW(wszSounds, wszDefault, wszNull, str, sizeof(str)/sizeof(str[0])); + GetProfileStringW(wszSounds, wszDefault, wszNull, str, ARRAY_SIZE(str)); if (lstrlenW(str) == 0) goto next; } for (ptr = str; *ptr && *ptr != ','; ptr++); @@ -108,8 +108,8 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) DWORD len; err = 1; /* error */ - len = GetModuleFileNameW(0, str, sizeof(str)/sizeof(str[0])); - if (len > 0 && len < sizeof(str)/sizeof(str[0])) + len = GetModuleFileNameW(0, str, ARRAY_SIZE(str)); + if (len > 0 && len < ARRAY_SIZE(str)) { for (ptr = str + lstrlenW(str) - 1; ptr >= str; ptr--) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 0a259c0..959773c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -4354,7 +4354,7 @@ UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliA, mliW.Target.wMid = lpmliA->Target.wMid; mliW.Target.wPid = lpmliA->Target.wPid; mliW.Target.vDriverVersion = lpmliA->Target.vDriverVersion; - MultiByteToWideChar( CP_ACP, 0, lpmliA->Target.szPname, -1, mliW.Target.szPname, sizeof(mliW.Target.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpmliA->Target.szPname, -1, mliW.Target.szPname, ARRAY_SIZE(mliW.Target.szPname)); break; default: WARN("Unsupported fdwControls=0x%08x\n", fdwInfo); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 487bbff..0f0cd94 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1445,8 +1445,7 @@ static MMRESULT midistream_post_message_and_wait(WINE_MIDIStream* lpMidiStrm, UI if (GetCurrentThreadId() != lpMidiStrm->dwThreadID) { DWORD ret; hObjects[1] = lpMidiStrm->hThread; - ret = WaitForMultipleObjects(sizeof(hObjects)/sizeof(hObjects[0]), hObjects, - FALSE, INFINITE); + ret = WaitForMultipleObjects(ARRAY_SIZE(hObjects), hObjects, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) { CloseHandle(hObjects[0]); WARN("bad WaitForSingleObject (%u)\n", ret);

1 0

Nikolay Sivov : opcservices: Enforce unique relationship id.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 5efe50e4d9b75b12c3255bcb3f195aa33a8d9cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5efe50e4d9b75b12c3255bcb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 20 10:09:13 2018 +0300 opcservices: Enforce unique relationship id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 44 ++++++++++++++++++++++-------------- dlls/opcservices/tests/opcservices.c | 12 +++++++--- include/opcbase.idl | 1 + 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index e526ebf..22bf793 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1160,6 +1160,20 @@ static const IOpcRelationshipVtbl opc_relationship_vtbl = opc_relationship_GetTargetMode, }; +static struct opc_relationship *opc_relationshipset_get_rel(struct opc_relationship_set *relationship_set, + const WCHAR *id) +{ + size_t i; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + return relationship_set->relationships[i]; + } + + return NULL; +} + static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, const WCHAR *type, IUri *target_uri, OPC_URI_TARGET_MODE target_mode, IOpcRelationship **out) { @@ -1179,7 +1193,6 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->source_uri = set->source_uri; IOpcUri_AddRef(relationship->source_uri); - /* FIXME: test that id is unique */ if (id) relationship->id = opc_strdupW(id); else @@ -1190,8 +1203,16 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W static const WCHAR fmtW[] = {'R','%','0','8','X',0}; DWORD generated; + /* FIXME: test that generated id is unique */ RtlGenRandom(&generated, sizeof(generated)); sprintfW(relationship->id, fmtW, generated); + + if (opc_relationshipset_get_rel(set, relationship->id)) + { + WARN("Newly generated id %s already exists.\n", debugstr_w(relationship->id)); + IOpcRelationship_Release(&relationship->IOpcRelationship_iface); + return E_FAIL; + } } } @@ -1258,20 +1279,6 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) return refcount; } -static struct opc_relationship *opc_relationshipset_get_item(struct opc_relationship_set *relationship_set, - const WCHAR *id) -{ - size_t i; - - for (i = 0; i < relationship_set->count; i++) - { - if (!strcmpW(id, relationship_set->relationships[i]->id)) - return relationship_set->relationships[i]; - } - - return NULL; -} - static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { @@ -1288,7 +1295,7 @@ static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet * if (!id) return E_POINTER; - if ((ret = opc_relationshipset_get_item(relationship_set, id))) + if ((ret = opc_relationshipset_get_rel(relationship_set, id))) { *relationship = &ret->IOpcRelationship_iface; IOpcRelationship_AddRef(*relationship); @@ -1314,6 +1321,9 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe if (!type || !target_uri) return E_POINTER; + if (id && opc_relationshipset_get_rel(relationship_set, id)) + return OPC_E_DUPLICATE_RELATIONSHIP; + if (IUri_GetPropertyLength(target_uri, Uri_PROPERTY_SCHEME_NAME, &length, 0) == S_OK && length != 0 && target_mode == OPC_URI_TARGET_MODE_INTERNAL) return OPC_E_INVALID_RELATIONSHIP_TARGET; @@ -1337,7 +1347,7 @@ static HRESULT WINAPI opc_relationship_set_RelationshipExists(IOpcRelationshipSe if (!id || !exists) return E_POINTER; - *exists = opc_relationshipset_get_item(relationship_set, id) != NULL; + *exists = opc_relationshipset_get_rel(relationship_set, id) != NULL; return S_OK; } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index c5c8ee2..2ef5677 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -384,14 +384,20 @@ static void test_relationship(void) hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); - hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); - ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); - /* Autogenerated relationship id */ hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + hr = IOpcRelationshipSet_CreateRelationship(rels, id, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(hr == OPC_E_DUPLICATE_RELATIONSHIP, "Failed to create relationship, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, id, typeW, target_uri2, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(hr == OPC_E_DUPLICATE_RELATIONSHIP, "Failed to create relationship, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + ret = 123; hr = IOpcRelationshipSet_RelationshipExists(rels, NULL, &ret); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/opcbase.idl b/include/opcbase.idl index d850753..3df2df8 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -45,6 +45,7 @@ cpp_quote("#define OPC_E_NONCONFORMING_URI MAKE_HRESULT(SEVERITY_ERROR, FACILITY cpp_quote("#define OPC_E_RELATIONSHIP_URI_REQUIRED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x3)") cpp_quote("#define OPC_E_DUPLICATE_PART MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0xb)") cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") +cpp_quote("#define OPC_E_DUPLICATE_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x13)") cpp_quote("#define OPC_E_NO_SUCH_PART MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x18)") cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)") cpp_quote("#define OPC_E_ENUM_COLLECTION_CHANGED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x50)")

1 0

Henri Verbeet : wined3d: Disallow creating devices without adapters in wined3d_device_create().
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 859c1d26ce5ee52373ee3f0af63d65a4fff33b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=859c1d26ce5ee52373ee3f0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 02:48:47 2018 +0430 wined3d: Disallow creating devices without adapters in wined3d_device_create(). These days, we have an adapter even with WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d1d80b8..b6c6ecb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2438,12 +2438,11 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, surface_alignment %u, device_parent %p, device %p.\n", + TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, " + "flags %#x, surface_alignment %u, device_parent %p, device %p.\n", wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, device_parent, device); - /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter - * number and create a device without a 3D adapter for 2D only operation. */ - if (wined3d->adapter_count && adapter_idx >= wined3d->adapter_count) + if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; if (!(object = heap_alloc_zero(sizeof(*object))))

1 0

Henri Verbeet : wined3d: Rename "wined3d_adapter_opengl" to " wined3d_adapter_gl".
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 8f9a2165e9e85b2ef8831db7dda3f951ed737825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f9a2165e9e85b2ef8831db7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 02:48:46 2018 +0430 wined3d: Rename "wined3d_adapter_opengl" to "wined3d_adapter_gl". For consistency with the filename. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 ++++---- dlls/wined3d/context.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e60383c..0948741 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4182,12 +4182,12 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static const struct wined3d_adapter_ops wined3d_adapter_opengl_ops = +static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { - wined3d_adapter_opengl_create_context, + wined3d_adapter_gl_create_context, }; -BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) +BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -4290,7 +4290,7 @@ BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_ wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); - adapter->adapter_ops = &wined3d_adapter_opengl_ops; + adapter->adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 34376ef..19f0fcb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1997,7 +1997,7 @@ out: return NULL; } -BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, +BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = context->device; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 81c3b5d..d1d80b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2525,7 +2525,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); - return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); + return wined3d_adapter_gl_init(adapter, wined3d_creation_flags); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 89cf44b..f01ad17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2647,7 +2647,7 @@ struct wined3d_adapter_ops struct wined3d_texture *target, const struct wined3d_format *ds_format); }; -BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, +BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; /* The adapter structure */ @@ -2675,7 +2675,7 @@ struct wined3d_adapter const struct wined3d_adapter_ops *adapter_ops; }; -BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN; struct wined3d_caps_gl_ctx {

1 0