April 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : shell32: Cleanup IShellItem creation calls.
by Alexandre Julliard April 8, 2015

April 8, 2015

Module: wine Branch: master Commit: 17339f4f94b9e76d52957e10a636627a56ab2517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17339f4f94b9e76d52957e10a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:55:48 2015 +0300 shell32: Cleanup IShellItem creation calls. --- dlls/shell32/shellitem.c | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d8cb6a8..a410381 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -548,7 +548,6 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi) { - ShellItem *This; LPITEMIDLIST new_pidl; HRESULT ret; @@ -597,16 +596,9 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, return E_OUTOFMEMORY; } - ret = IShellItem_Constructor(NULL, &IID_IShellItem, (void**)&This); - if (This) - { - *ppsi = (IShellItem*)&This->IShellItem2_iface; - This->pidl = new_pidl; - } - else - { - ILFree(new_pidl); - } + ret = SHCreateItemFromIDList(new_pidl, &IID_IShellItem, (void**)ppsi); + ILFree(new_pidl); + return ret; } @@ -621,37 +613,34 @@ HRESULT WINAPI SHCreateItemFromParsingName(PCWSTR pszPath, ret = SHParseDisplayName(pszPath, pbc, &pidl, 0, NULL); if(SUCCEEDED(ret)) { - ShellItem *This; - ret = IShellItem_Constructor(NULL, riid, (void**)&This); - - if(SUCCEEDED(ret)) - { - This->pidl = pidl; - *ppv = (void*)This; - } - else - { - ILFree(pidl); - } + ret = SHCreateItemFromIDList(pidl, riid, ppv); + ILFree(pidl); } return ret; } HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv) { - ShellItem *psiimpl; + IPersistIDList *persist; HRESULT ret; if(!pidl) return E_INVALIDARG; - ret = IShellItem_Constructor(NULL, riid, ppv); - if(SUCCEEDED(ret)) + *ppv = NULL; + ret = IShellItem_Constructor(NULL, &IID_IPersistIDList, (void**)&persist); + if(FAILED(ret)) + return ret; + + ret = IPersistIDList_SetIDList(persist, pidl); + if(FAILED(ret)) { - psiimpl = (ShellItem*)*ppv; - psiimpl->pidl = ILClone(pidl); + IPersistIDList_Release(persist); + return ret; } + ret = IPersistIDList_QueryInterface(persist, riid, ppv); + IPersistIDList_Release(persist); return ret; }

1 0

Francois Gouget : shell32: Add support for the OS X 'My Stuff' folders.
by Alexandre Julliard April 8, 2015

April 8, 2015

Module: wine Branch: master Commit: e9d010ef628ac58482cee9c6c7814516d5e79e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d010ef628ac58482cee9c6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 16:50:43 2015 +0200 shell32: Add support for the OS X 'My Stuff' folders. --- dlls/shell32/shellpath.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index cfd3094..b35f04f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -813,6 +813,7 @@ static const WCHAR Microsoft_Windows_GameExplorerW[] = {'M','i','c','r','o','s', static const WCHAR Microsoft_Windows_LibrariesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','L','i','b','r','a','r','i','e','s','\0'}; static const WCHAR Microsoft_Windows_RingtonesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','R','i','n','g','t','o','n','e','s','\0'}; static const WCHAR Microsoft_Windows_Start_MenuW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u',0}; +static const WCHAR MoviesW[] = {'M','o','v','i','e','s','\0'}; static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'}; static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'}; @@ -2785,6 +2786,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { static void _SHCreateSymbolicLinks(void) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; + const WCHAR* MyOSXStuffW[] = { PicturesW, MoviesW, MusicW }; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; static const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); @@ -2870,36 +2872,47 @@ static void _SHCreateSymbolicLinks(void) } /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ - for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { + for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) + { /* Create the current 'My Whatever' folder and get its unix path. */ hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_DEFAULT, wszTempPath); if (FAILED(hr)) continue; + pszMyStuff = wine_get_unix_file_name(wszTempPath); if (!pszMyStuff) continue; - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && - !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* If there's a 'My Whatever' directory where 'My Documents' links to, link to it. */ - rmdir(pszMyStuff); - symlink(szMyStuffTarget, pszMyStuff); - } - else + while (1) { - rmdir(pszMyStuff); + /* Check for the Wine-specific '$HOME/My Documents' subfolder */ + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && + !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + break; + + /* Try the XDG_XXX_DIR folder */ if (xdg_results && xdg_results[i]) { - /* the folder specified by XDG_XXX_DIR exists, link to it. */ - symlink(xdg_results[i], pszMyStuff); + strcpy(szMyStuffTarget, xdg_results[i]); + break; } - else + + /* Or the OS X folder (these are never localized) */ + if (pszHome) { - /* Else link to where 'My Documents' itself links to. */ - symlink(szPersonalTarget, pszMyStuff); + strcpy(szMyStuffTarget, pszHome); + if (_SHAppendToUnixPath(szMyStuffTarget, MyOSXStuffW[i]) && + !stat(szMyStuffTarget, &statFolder) && + S_ISDIR(statFolder.st_mode)) + break; } + + /* As a last resort point to the same location as 'My Documents' */ + strcpy(szMyStuffTarget, szPersonalTarget); + break; } + rmdir(pszMyStuff); + symlink(szMyStuffTarget, pszMyStuff); HeapFree(GetProcessHeap(), 0, pszMyStuff); }

1 0

Sebastian Lackner : wined3d: Fix typo in init_output_registers.
by Alexandre Julliard April 8, 2015

April 8, 2015

Module: wine Branch: master Commit: 3a14df3b9a9c5fbb6b9d292d4e5e748946587971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a14df3b9a9c5fbb6b9d292d4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 20:07:56 2015 +0200 wined3d: Fix typo in init_output_registers. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d4d5e1..091ae1d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4166,7 +4166,7 @@ static void init_output_registers(const struct wined3d_shader *shader, for (j = 0; j < ps_input_sig->element_count; ++j) { - const struct wined3d_shader_signature_element *input = &ps_input_sig->elements[i]; + const struct wined3d_shader_signature_element *input = &ps_input_sig->elements[j]; if (!input->semantic_name) continue;

1 0

Sebastian Lackner : server: Implement waiting for job objects.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: a7247df6ca54fd1209eff9f9199447643ebdaec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7247df6ca54fd1209eff9f91… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 3 17:20:35 2015 +1100 server: Implement waiting for job objects. --- dlls/kernel32/tests/process.c | 2 -- server/process.c | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0bd14dc..c63d6b1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2469,7 +2469,6 @@ static void test_WaitForJobObject(void) ok(ret, "TerminateJobObject error %u\n", GetLastError()); dwret = WaitForSingleObject(job, 500); - todo_wine ok(dwret == WAIT_OBJECT_0 || broken(dwret == WAIT_TIMEOUT), "WaitForSingleObject returned %u\n", dwret); @@ -2478,7 +2477,6 @@ static void test_WaitForJobObject(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(job); - todo_wine win_skip("TerminateJobObject doesn't signal job, skipping tests\n"); return; } diff --git a/server/process.c b/server/process.c index d912739..569a8fe 100644 --- a/server/process.c +++ b/server/process.c @@ -149,6 +149,7 @@ struct job int num_processes; /* count of running processes */ unsigned int limit_flags; /* limit flags */ int terminating; /* job is terminating */ + int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ }; @@ -191,6 +192,7 @@ static struct job *create_job_object( struct directory *root, const struct unico job->num_processes = 0; job->limit_flags = 0; job->terminating = 0; + job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; } @@ -281,6 +283,8 @@ static void terminate_job( struct job *job, int exit_code ) } job->terminating = 0; + job->signaled = 1; + wake_up( &job->obj, 0 ); } static void job_destroy( struct object *obj ) @@ -303,7 +307,8 @@ static void job_dump( struct object *obj, int verbose ) static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) { - return 0; + struct job *job = (struct job *)obj; + return job->signaled; } struct ptid_entry

1 0

Nikolay Sivov : shell32: Remove a couple of redundant lines.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 1d3d0865608e16f5cdd651462677601e9f42222f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3d0865608e16f5cdd651462… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:41:28 2015 +0300 shell32: Remove a couple of redundant lines. --- dlls/shell32/shellitem.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 9eb675a..d8cb6a8 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1121,12 +1121,8 @@ static HRESULT WINAPI IShellItemArray_fnEnumItems(IShellItemArray *iface, IEnumShellItems **ppenumShellItems) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); - HRESULT hr; TRACE("%p (%p)\n", This, ppenumShellItems); - - hr = IEnumShellItems_Constructor(iface, ppenumShellItems); - - return hr; + return IEnumShellItems_Constructor(iface, ppenumShellItems); } static const IShellItemArrayVtbl vt_IShellItemArray = {

1 0

Marcus Meissner : comctl32: Avoid integer overflow (Coverity).
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: b4ec41220306a3504a7bbcf815bf802c7f4a37b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ec41220306a3504a7bbcf81… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 7 07:09:28 2015 +0200 comctl32: Avoid integer overflow (Coverity). --- dlls/comctl32/dsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 32f9926..a73a54a 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -488,5 +488,5 @@ ULONGLONG WINAPI DSA_GetSize(HDSA hdsa) if (!hdsa) return 0; - return sizeof(*hdsa) + hdsa->nMaxCount*hdsa->nItemSize; + return sizeof(*hdsa) + (ULONGLONG)hdsa->nMaxCount*hdsa->nItemSize; }

1 0

Sebastian Lackner : kernel32: Add stub for PowerCreateRequest.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 966dd5074dd51cc56afb4859de471ab144ae6750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966dd5074dd51cc56afb4859d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 15 01:44:12 2015 +0100 kernel32: Add stub for PowerCreateRequest. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 130affc..5258819 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1135,7 +1135,7 @@ @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall PostQueuedCompletionStatus(long long ptr ptr) # @ stub PowerClearRequest -# @ stub PowerCreateRequest +@ stdcall PowerCreateRequest(ptr) # @ stub PowerSetRequest @ stdcall PrepareTape(ptr long long) @ stub PrivCopyFileExW diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 6d4336d..74ec397 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -100,3 +100,14 @@ EXECUTION_STATE WINAPI SetThreadExecutionState(EXECUTION_STATE flags) current = flags; return old; } + +/*********************************************************************** + * PowerCreateRequest (KERNEL32.@) + */ +HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) +{ + FIXME("(%p): stub\n", context); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; +}

1 0

Sebastian Lackner : user32: Move key state cache into a separate struct.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 325c061bbd6fcd7ebaa60e62a69e52b000b61cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=325c061bbd6fcd7ebaa60e62a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 02:33:28 2015 +0200 user32: Move key state cache into a separate struct. --- dlls/user32/hook.c | 5 ++++- dlls/user32/input.c | 23 +++++++++++++++-------- dlls/user32/message.c | 7 ++++--- dlls/user32/user_private.h | 9 +++++++-- dlls/user32/winstation.c | 3 ++- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 2f6b42c..f19949c 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -437,7 +437,10 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - get_user_thread_info()->key_state_time = 0; /* force refreshing the key state cache */ + { + struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; + if (key_state_info) key_state_info->time = 0; /* force refreshing the key state cache */ + } return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b6eecbe..6ea2c2f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -368,7 +368,7 @@ static void check_for_events( UINT flags ) */ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -377,24 +377,31 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { - if (thread_info->key_state && - !(thread_info->key_state[key] & 0xc0) && - GetTickCount() - thread_info->key_state_time < 50) + if (key_state_info && + !(key_state_info->state[key] & 0xc0) && + GetTickCount() - key_state_info->time < 50) + { + /* use cached value */ return 0; - - if (!thread_info->key_state) thread_info->key_state = HeapAlloc( GetProcessHeap(), 0, 256 ); + } + else if (!key_state_info) + { + key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); + get_user_thread_info()->key_state = key_state_info; + } ret = 0; SERVER_START_REQ( get_key_state ) { req->tid = 0; req->key = key; - if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); + if (key_state_info) wine_server_set_reply( req, key_state_info->state, + sizeof(key_state_info->state) ); if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; - thread_info->key_state_time = GetTickCount(); + if (key_state_info) key_state_info->time = GetTickCount(); } } SERVER_END_REQ; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eac4e4d..fbc11da 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3290,7 +3290,7 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO */ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; int prev_x, prev_y, new_x, new_y; NTSTATUS ret; @@ -3329,7 +3329,8 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); break; } - if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); + if (key_state_info) wine_server_set_reply( req, key_state_info->state, + sizeof(key_state_info->state) ); ret = wine_server_call( req ); wait = reply->wait; prev_x = reply->prev_x; @@ -3341,7 +3342,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (!ret) { - if (thread_info->key_state) thread_info->key_state_time = GetTickCount(); + if (key_state_info) key_state_info->time = GetTickCount(); if ((flags & SEND_HWMSG_INJECTED) && (prev_x != new_x || prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 919540d..9e3a373 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -184,8 +184,7 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ UINT active_hooks; /* Bitmap of active hooks */ - UINT key_state_time; /* Time of last key state refresh */ - BYTE *key_state; /* Cache of global key state */ + struct user_key_state_info *key_state; /* Cache of global key state */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; @@ -193,6 +192,12 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +struct user_key_state_info +{ + UINT time; /* Time of last key state refresh */ + BYTE state[256]; /* State for each key */ +}; + struct hook_extra_info { HHOOK handle; diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 12b9edc..d1353b4 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -399,9 +399,10 @@ BOOL WINAPI SetThreadDesktop( HDESK handle ) if (ret) /* reset the desktop windows */ { struct user_thread_info *thread_info = get_user_thread_info(); + struct user_key_state_info *key_state_info = thread_info->key_state; thread_info->top_window = 0; thread_info->msg_window = 0; - thread_info->key_state_time = 0; + if (key_state_info) key_state_info->time = 0; } return ret; }

1 0

Andrew Cook : server: Implement TerminateJobObject.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: 1d359a5827159fb0572d598ed02054ff3d700f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d359a5827159fb0572d598ed… Author: Andrew Cook <ariscop(a)gmail.com> Date: Fri Apr 3 17:19:45 2015 +1100 server: Implement TerminateJobObject. --- dlls/kernel32/tests/process.c | 2 -- dlls/ntdll/sync.c | 15 +++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 39 ++++++++++++++++++++++++++++++++++++++- server/process.h | 1 + server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 91 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 11c9253..d981ec9 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2255,13 +2255,11 @@ static void test_TerminateJobObject(void) ok(ret, "TerminateJobObject error %u\n", GetLastError()); dwret = WaitForSingleObject(pi.hProcess, 1000); - todo_wine ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); ret = GetExitCodeProcess(pi.hProcess, &dwret); ok(ret, "GetExitCodeProcess error %u\n", GetLastError()); - todo_wine ok(dwret == 123 || broken(dwret == 0) /* randomly fails on Win 2000 / XP */, "wrong exitcode %u\n", dwret); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 5db736e..04c6de30 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -613,8 +613,19 @@ NTSTATUS WINAPI NtOpenJobObject( PHANDLE handle, ACCESS_MASK access, const OBJEC */ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) { - FIXME( "stub: %p %x\n", handle, status ); - return STATUS_SUCCESS; + NTSTATUS ret; + + TRACE( "(%p, %d)\n", handle, status ); + + SERVER_START_REQ( terminate_job ) + { + req->handle = wine_server_obj_handle( handle ); + req->status = status; + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index de6302c..d27914a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5156,6 +5156,20 @@ struct set_job_completion_port_reply }; + +struct terminate_job_request +{ + struct request_header __header; + obj_handle_t handle; + int status; + char __pad_20[4]; +}; +struct terminate_job_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5419,6 +5433,7 @@ enum request REQ_process_in_job, REQ_set_job_limits, REQ_set_job_completion_port, + REQ_terminate_job, REQ_NB_REQUESTS }; @@ -5687,6 +5702,7 @@ union generic_request struct process_in_job_request process_in_job_request; struct set_job_limits_request set_job_limits_request; struct set_job_completion_port_request set_job_completion_port_request; + struct terminate_job_request terminate_job_request; }; union generic_reply { @@ -5953,8 +5969,9 @@ union generic_reply struct process_in_job_reply process_in_job_reply; struct set_job_limits_reply set_job_limits_reply; struct set_job_completion_port_reply set_job_completion_port_reply; + struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 466 +#define SERVER_PROTOCOL_VERSION 467 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index eba47f7..d912739 100644 --- a/server/process.c +++ b/server/process.c @@ -64,6 +64,7 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); static void process_destroy( struct object *obj ); +static void terminate_process( struct process *process, struct thread *skip, int exit_code ); static const struct object_ops process_ops = { @@ -147,6 +148,7 @@ struct job struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ unsigned int limit_flags; /* limit flags */ + int terminating; /* job is terminating */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ }; @@ -188,6 +190,7 @@ static struct job *create_job_object( struct directory *root, const struct unico list_init( &job->process_list ); job->num_processes = 0; job->limit_flags = 0; + job->terminating = 0; job->completion_port = NULL; job->completion_key = 0; } @@ -251,12 +254,35 @@ static void release_job_process( struct process *process ) assert( job->num_processes ); job->num_processes--; - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); if (!job->num_processes) add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); } +static void terminate_job( struct job *job, int exit_code ) +{ + /* don't report completion events for terminated processes */ + job->terminating = 1; + + for (;;) /* restart from the beginning of the list every time */ + { + struct process *process; + + /* find the first process associated with this job and still running */ + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (process->running_threads) break; + } + if (&process->job_entry == &job->process_list) break; /* no process found */ + assert( process->job == job ); + terminate_process( process, NULL, exit_code ); + } + + job->terminating = 0; +} + static void job_destroy( struct object *obj ) { struct job *job = (struct job *)obj; @@ -1543,6 +1569,17 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* terminate all processes associated with the job */ +DECL_HANDLER(terminate_job) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_TERMINATE ); + + if (!job) return; + + terminate_job( job, req->status ); + release_object( job ); +} + /* update limits of the job object */ DECL_HANDLER(set_job_limits) { diff --git a/server/process.h b/server/process.h index 58c313a..59625f0 100644 --- a/server/process.h +++ b/server/process.h @@ -26,6 +26,7 @@ struct atom_table; struct handle_table; struct startup_info; +struct job; /* process startup state */ enum startup_state { STARTUP_IN_PROGRESS, STARTUP_DONE, STARTUP_ABORTED }; diff --git a/server/protocol.def b/server/protocol.def index 625b3c9..54501e8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3544,3 +3544,10 @@ enum coords_relative obj_handle_t port; /* handle to the completion port */ client_ptr_t key; /* key to send with completion messages */ @END + + +/* Terminate all processes associated with the job */ +(a)REQ(terminate_job) + obj_handle_t handle; /* handle to the job */ + int status; /* process exit code */ +(a)END diff --git a/server/request.h b/server/request.h index dd6e4e2..f94235f 100644 --- a/server/request.h +++ b/server/request.h @@ -367,6 +367,7 @@ DECL_HANDLER(assign_job); DECL_HANDLER(process_in_job); DECL_HANDLER(set_job_limits); DECL_HANDLER(set_job_completion_port); +DECL_HANDLER(terminate_job); #ifdef WANT_REQUEST_HANDLERS @@ -634,6 +635,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_process_in_job, (req_handler)req_set_job_limits, (req_handler)req_set_job_completion_port, + (req_handler)req_terminate_job, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2233,6 +2235,9 @@ C_ASSERT( FIELD_OFFSET(struct set_job_completion_port_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_job_completion_port_request, port) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_job_completion_port_request, key) == 24 ); C_ASSERT( sizeof(struct set_job_completion_port_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct terminate_job_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct terminate_job_request, status) == 16 ); +C_ASSERT( sizeof(struct terminate_job_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 0e2e7e2..236c9ab 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4133,6 +4133,12 @@ static void dump_set_job_completion_port_request( const struct set_job_completio dump_uint64( ", key=", &req->key ); } +static void dump_terminate_job_request( const struct terminate_job_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", status=%d", req->status ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4395,6 +4401,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_process_in_job_request, (dump_func)dump_set_job_limits_request, (dump_func)dump_set_job_completion_port_request, + (dump_func)dump_terminate_job_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4659,6 +4666,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4923,6 +4931,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "process_in_job", "set_job_limits", "set_job_completion_port", + "terminate_job", }; static const struct

1 0

Stefan Dösinger : wined3d: Move surface_convert_color_to_float to utils.c.
by Alexandre Julliard April 7, 2015

April 7, 2015

Module: wine Branch: master Commit: fa0a9232e05fd2e9d66bc3face95df85c5819f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0a9232e05fd2e9d66bc3fac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:53 2015 +0200 wined3d: Move surface_convert_color_to_float to utils.c. --- dlls/wined3d/surface.c | 60 +++--------------------------------------- dlls/wined3d/utils.c | 51 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 56 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d27339b..e3601a2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1013,62 +1013,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, - DWORD color, struct wined3d_color *float_color) -{ - const struct wined3d_format *format = surface->resource.format; - const struct wined3d_palette *palette; - - switch (format->id) - { - case WINED3DFMT_P8_UINT: - palette = surface->container->swapchain ? surface->container->swapchain->palette : NULL; - - if (palette) - { - float_color->r = palette->colors[color].rgbRed / 255.0f; - float_color->g = palette->colors[color].rgbGreen / 255.0f; - float_color->b = palette->colors[color].rgbBlue / 255.0f; - } - else - { - float_color->r = 0.0f; - float_color->g = 0.0f; - float_color->b = 0.0f; - } - float_color->a = color / 255.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; - - default: - ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); - return FALSE; - } - - return TRUE; -} - static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format; @@ -5333,10 +5277,12 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC if (flags & WINEDDBLT_COLORFILL) { struct wined3d_color color; + const struct wined3d_palette *palette = dst_swapchain ? dst_swapchain->palette : NULL; TRACE("Color fill.\n"); - if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) + if (!wined3d_format_convert_color_to_float(dst_surface->resource.format, + palette, fx->u5.dwFillColor, &color)) goto fallback; if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1cb928e..f3c84ac 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3511,6 +3511,57 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c return 0; } +BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, + const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) +{ + switch (format->id) + { + case WINED3DFMT_P8_UINT: + if (palette) + { + float_color->r = palette->colors[color].rgbRed / 255.0f; + float_color->g = palette->colors[color].rgbGreen / 255.0f; + float_color->b = palette->colors[color].rgbBlue / 255.0f; + } + else + { + float_color->r = 0.0f; + float_color->g = 0.0f; + float_color->b = 0.0f; + } + float_color->a = color / 255.0f; + break; + + case WINED3DFMT_B5G6R5_UNORM: + float_color->r = ((color >> 11) & 0x1f) / 31.0f; + float_color->g = ((color >> 5) & 0x3f) / 63.0f; + float_color->b = (color & 0x1f) / 31.0f; + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8A8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = D3DCOLOR_A(color); + break; + + default: + ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); + return FALSE; + } + + return TRUE; +} + /* DirectDraw stuff */ enum wined3d_format_id pixelformat_for_depth(DWORD depth) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e401b8a..5d736dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3167,6 +3167,8 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const struct wined3d_color *color) DECLSPEC_HIDDEN; +BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, + const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN;

1 0