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

Sebastian Lackner : msctf: Always use interlocked functions when accessing MSCTF_refCount.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 3765e08ddce41dde80ccb8129338cdf1e4f8609a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3765e08ddce41dde80ccb8129… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 05:05:04 2015 +0100 msctf: Always use interlocked functions when accessing MSCTF_refCount. --- dlls/msctf/msctf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 78992f7..231246a 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -110,7 +110,7 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); HeapFree(GetProcessHeap(),0,This); - MSCTF_refCount--; + InterlockedDecrement(&MSCTF_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -190,7 +190,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - MSCTF_refCount++; + InterlockedIncrement(&MSCTF_refCount); return S_OK; }

1 0

Nikolay Sivov : comctl32/tests: Fix Monthcal tests failures on some VMs.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: f935a10add34fa1413df00047c0eebac26df823d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f935a10add34fa1413df00047… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 1 21:08:13 2015 +0300 comctl32/tests: Fix Monthcal tests failures on some VMs. --- dlls/comctl32/tests/monthcal.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 61f819e..b22db1c 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -612,7 +612,9 @@ static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wPa static HWND create_monthcal_control(DWORD style) { WNDPROC oldproc; + RECT rect; HWND hwnd; + BOOL ret; hwnd = CreateWindowExA(0, MONTHCAL_CLASSA, "", WS_CHILD | WS_BORDER | WS_VISIBLE | style, 0, 0, 300, 400, parent_wnd, NULL, GetModuleHandleA(NULL), NULL); @@ -625,6 +627,13 @@ static HWND create_monthcal_control(DWORD style) SendMessageA(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + /* make sure calendar grid is 2x1 */ + ret = SendMessageA(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&rect); + ok(ret, "got %d\n", ret); + + ret = SetWindowPos(hwnd, NULL, 0, 0, rect.right * 5 / 2, rect.bottom * 3 / 2, SWP_NOMOVE); + ok(ret, "got %d\n", ret); + return hwnd; }

1 0

Sebastian Lackner : shell32: Fix incorrect size argument of FormatMessageW.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 7c48641100b6edc16116d68895f0b4bcf620a8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c48641100b6edc16116d6889… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 28 19:58:59 2015 +0100 shell32: Fix incorrect size argument of FormatMessageW. --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 62d7880..e7e24e0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -292,7 +292,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args); + szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);

1 0

Sebastian Lackner : browseui: Always use interlocked functions when accessing variable BROWSEUI_refCount.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 890dc4d2600857cb691f65bd069d8a1d0e0f9b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890dc4d2600857cb691f65bd0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 03:46:06 2015 +0100 browseui: Always use interlocked functions when accessing variable BROWSEUI_refCount. --- dlls/browseui/browseui_main.c | 4 ++-- dlls/browseui/compcatcachedaemon.c | 4 ++-- dlls/browseui/progressdlg.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 78ce326..f509ee5 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -74,7 +74,7 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -154,7 +154,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 0acb4ec..a5addd2 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -60,7 +60,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, REFIID iid, LPVOID *ppvOut) @@ -159,6 +159,6 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 598197b..e61a4cc 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -268,7 +268,7 @@ static void ProgressDialog_Destructor(ProgressDialog *This) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) @@ -574,6 +574,6 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; }

1 0

Nikolay Sivov : scrrun: Implement Add() and RemoveAll() for dictionary.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 5f41a746e97be7f2a0fd7937bc4a1a0ab6b256b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f41a746e97be7f2a0fd7937b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:00:28 2015 +0300 scrrun: Implement Add() and RemoveAll() for dictionary. --- dlls/scrrun/dictionary.c | 170 +++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/tests/dictionary.c | 10 +-- 2 files changed, 166 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 958d7fc..5c1893a 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -32,9 +32,20 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#define BUCKET_COUNT 509 + +struct keyitem_pair { + struct list entry; + DWORD bucket; + DWORD hash; + VARIANT key; + VARIANT item; +}; + typedef struct { IDictionary IDictionary_iface; @@ -42,6 +53,8 @@ typedef struct CompareMethod method; LONG count; + struct list pairs; + struct keyitem_pair *buckets[BUCKET_COUNT]; } dictionary; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -49,6 +62,133 @@ static inline dictionary *impl_from_IDictionary(IDictionary *iface) return CONTAINING_RECORD(iface, dictionary, IDictionary_iface); } +static inline struct keyitem_pair *get_bucket_head(const dictionary *dict, DWORD hash) +{ + return dict->buckets[hash % BUCKET_COUNT]; +} + +static inline BOOL is_string_key(const VARIANT *key) +{ + return V_VT(key) == VT_BSTR || V_VT(key) == (VT_BSTR|VT_BYREF); +} + +/* Only for VT_BSTR or VT_BSTR|VT_BYREF types */ +static inline WCHAR *get_key_strptr(const VARIANT *key) +{ + if (V_VT(key) == VT_BSTR) + return V_BSTR(key); + + if (V_BSTRREF(key)) + return *V_BSTRREF(key); + + return NULL; +} + +/* should be used only when both keys are of string type, it's not checked */ +static inline int strcmp_key(const dictionary *dict, const VARIANT *key1, const VARIANT *key2) +{ + const WCHAR *str1, *str2; + + str1 = get_key_strptr(key1); + str2 = get_key_strptr(key2); + return dict->method == BinaryCompare ? strcmpW(str1, str2) : strcmpiW(str1, str2); +} + +static BOOL is_matching_key(const dictionary *dict, const struct keyitem_pair *pair, const VARIANT *key, DWORD hash) +{ + if (is_string_key(key) && is_string_key(&pair->key)) { + if (hash != pair->hash) + return FALSE; + + return strcmp_key(dict, key, &pair->key) == 0; + } + + if ((is_string_key(key) && !is_string_key(&pair->key)) || + (!is_string_key(key) && is_string_key(&pair->key))) + return FALSE; + + /* for numeric keys only check hash */ + return hash == pair->hash; +} + +static struct keyitem_pair *get_keyitem_pair(dictionary *dict, VARIANT *key) +{ + struct keyitem_pair *pair; + DWORD bucket; + VARIANT hash; + HRESULT hr; + + hr = IDictionary_get_HashVal(&dict->IDictionary_iface, key, &hash); + if (FAILED(hr)) + return NULL; + + pair = get_bucket_head(dict, V_I4(&hash)); + if (!pair) + return NULL; + + bucket = pair->bucket; + + do { + if (is_matching_key(dict, pair, key, V_I4(&hash))) return pair; + pair = LIST_ENTRY(list_next(&dict->pairs, &pair->entry), struct keyitem_pair, entry); + if (pair && pair->bucket != bucket) break; + } while (pair != NULL); + + return NULL; +} + +static HRESULT add_keyitem_pair(dictionary *dict, VARIANT *key, VARIANT *item) +{ + struct keyitem_pair *pair, *head; + VARIANT hash; + HRESULT hr; + + hr = IDictionary_get_HashVal(&dict->IDictionary_iface, key, &hash); + if (FAILED(hr)) + return hr; + + pair = heap_alloc(sizeof(*pair)); + if (!pair) + return E_OUTOFMEMORY; + + pair->hash = V_I4(&hash); + pair->bucket = pair->hash % BUCKET_COUNT; + VariantInit(&pair->key); + VariantInit(&pair->item); + + hr = VariantCopyInd(&pair->key, key); + if (FAILED(hr)) + goto failed; + + hr = VariantCopyInd(&pair->item, item); + if (FAILED(hr)) + goto failed; + + head = get_bucket_head(dict, pair->hash); + if (head) + list_add_tail(&head->entry, &pair->entry); + else { + dict->buckets[pair->bucket] = pair; + list_add_tail(&dict->pairs, &pair->entry); + } + + dict->count++; + return S_OK; + +failed: + VariantClear(&pair->key); + VariantClear(&pair->item); + heap_free(pair); + return hr; +} + +static void free_keyitem_pair(struct keyitem_pair *pair) +{ + VariantClear(&pair->key); + VariantClear(&pair->item); + heap_free(pair); +} + static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, void **obj) { dictionary *This = impl_from_IDictionary(iface); @@ -100,8 +240,10 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface) TRACE("(%p)\n", This); ref = InterlockedDecrement(&This->ref); - if(ref == 0) + if(ref == 0) { + IDictionary_RemoveAll(iface); heap_free(This); + } return ref; } @@ -192,13 +334,16 @@ static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *Key, VARI return E_NOTIMPL; } -static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *Key, VARIANT *Item) +static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *key, VARIANT *item) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p %p)\n", This, Key, Item); + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(key), debugstr_variant(item)); - return E_NOTIMPL; + if (get_keyitem_pair(This, key)) + return CTL_E_KEY_ALREADY_EXISTS; + + return add_keyitem_pair(This, key, item); } static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) @@ -259,10 +404,21 @@ static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *Key) static HRESULT WINAPI dictionary_RemoveAll(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair, *pair2; - FIXME("(%p)->()\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + if (This->count == 0) + return S_OK; + + LIST_FOR_EACH_ENTRY_SAFE(pair, pair2, &This->pairs, struct keyitem_pair, entry) { + list_remove(&pair->entry); + free_keyitem_pair(pair); + } + memset(This->buckets, 0, sizeof(This->buckets)); + This->count = 0; + + return S_OK; } static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMethod method) @@ -415,6 +571,8 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->ref = 1; This->method = BinaryCompare; This->count = 0; + list_init(&This->pairs); + memset(This->buckets, 0, sizeof(This->buckets)); *obj = &This->IDictionary_iface; diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 25cb0a6..066a5ab 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -64,7 +64,7 @@ static void test_interfaces(void) V_VT(&value) = VT_BSTR; V_BSTR(&value) = SysAllocString(key_add_value); hr = IDictionary_Add(dict, &key, &value); - todo_wine ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); VariantClear(&value); exists = VARIANT_FALSE; @@ -83,7 +83,7 @@ static void test_interfaces(void) hr = IDictionary_get_Count(dict, &count); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - todo_wine ok(count == 1, "got %d, expected 1\n", count); + ok(count == 1, "got %d, expected 1\n", count); IDictionary_Release(dict); IDispatch_Release(disp); @@ -128,11 +128,9 @@ if (0) /* crashes on native */ V_I2(&key) = 0; VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_put_CompareMode(dict, BinaryCompare); -todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); IDictionary_Release(dict); @@ -457,13 +455,11 @@ todo_wine { } VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); V_VT(&key) = VT_R4; V_R4(&key) = 0.0; hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == CTL_E_KEY_ALREADY_EXISTS, "got 0x%08x\n", hr); V_VT(&key) = VT_I2; @@ -519,7 +515,6 @@ todo_wine { V_R4(&key) = 0.0; VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&keys); @@ -570,7 +565,6 @@ todo_wine VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_Remove(dict, &key);

1 0

Nikolay Sivov : services: Locate service image in proper system dir for WOW64 case.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 38bba54f325880a35acc98d1c5c408beb629414b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bba54f325880a35acc98d1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 1 02:24:02 2015 +0300 services: Locate service image in proper system dir for WOW64 case. --- programs/services/services.c | 106 +++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index dd79770..1335837 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -621,35 +621,15 @@ static LPWSTR service_get_pipe_name(void) return name; } -static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +static DWORD get_service_binary_path(const struct service_entry *service_entry, WCHAR **path) { - PROCESS_INFORMATION pi; - STARTUPINFOW si; - LPWSTR path = NULL; - DWORD size; - BOOL r; - - service_lock_exclusive(service_entry); - - if (!env) - { - HANDLE htok; - - if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) - CreateEnvironmentBlock(&env, htok, FALSE); - - if (!env) - WINE_ERR("failed to create services environment\n"); - } + DWORD size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, NULL, 0); - size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - if (!path) - { - service_unlock(service_entry); + *path = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + if (!*path) return ERROR_NOT_ENOUGH_SERVER_MEMORY; - } - ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size); + + ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) { @@ -660,25 +640,81 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * GetSystemDirectoryW( system_dir, MAX_PATH ); if (is_win64) { - if (!GetBinaryTypeW( path, &type )) + if (!GetBinaryTypeW( *path, &type )) { - HeapFree( GetProcessHeap(), 0, path ); - service_unlock(service_entry); + HeapFree( GetProcessHeap(), 0, *path ); return GetLastError(); } if (type == SCS_32BIT_BINARY) GetSystemWow64DirectoryW( system_dir, MAX_PATH ); } len = strlenW( system_dir ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name); - HeapFree( GetProcessHeap(), 0, path ); - if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + HeapFree( GetProcessHeap(), 0, *path ); + if (!(*path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + lstrcpyW( *path, system_dir ); + lstrcatW( *path, winedeviceW ); + lstrcatW( *path, service_entry->name ); + return ERROR_SUCCESS; + } + + /* if service image is configured to systemdir, redirect it to wow64 systemdir */ + if (service_entry->is_wow64) + { + WCHAR system_dir[MAX_PATH], *redirected; + DWORD len; + + GetSystemDirectoryW( system_dir, MAX_PATH ); + len = strlenW( system_dir ); + + if (strncmpiW( system_dir, *path, len )) + return ERROR_SUCCESS; + + GetSystemWow64DirectoryW( system_dir, MAX_PATH ); + + redirected = HeapAlloc( GetProcessHeap(), 0, (strlenW( *path ) + strlenW( system_dir ))*sizeof(WCHAR)); + if (!redirected) { - service_unlock(service_entry); + HeapFree( GetProcessHeap(), 0, *path ); return ERROR_NOT_ENOUGH_SERVER_MEMORY; } - lstrcpyW( path, system_dir ); - lstrcatW( path, winedeviceW ); - lstrcatW( path, service_entry->name ); + + strcpyW( redirected, system_dir ); + strcatW( redirected, &(*path)[len] ); + HeapFree( GetProcessHeap(), 0, *path ); + *path = redirected; + TRACE("redirected to %s\n", debugstr_w(redirected)); + } + + return ERROR_SUCCESS; +} + +static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + LPWSTR path = NULL; + DWORD err; + BOOL r; + + service_lock_exclusive(service_entry); + + if (!env) + { + HANDLE htok; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) + CreateEnvironmentBlock(&env, htok, FALSE); + + if (!env) + WINE_ERR("failed to create services environment\n"); + } + + if ((err = get_service_binary_path(service_entry, &path))) + { + service_unlock(service_entry); + return err; } ZeroMemory(&si, sizeof(STARTUPINFOW));

1 0

Alexandre Julliard : ntdll: Don' t queue a user APC when there is no callback function.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 577cb166d48e5c6f270237179cdbeb82a68b1ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577cb166d48e5c6f270237179… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 17:53:40 2015 +0900 ntdll: Don't queue a user APC when there is no callback function. --- dlls/ntdll/file.c | 89 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0323b23..43b6097 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -331,9 +331,10 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB struct async_fileio { - HANDLE handle; - PIO_APC_ROUTINE apc; - void *apc_arg; + struct async_fileio *next; + HANDLE handle; + PIO_APC_ROUTINE apc; + void *apc_arg; }; struct async_fileio_read @@ -353,13 +354,46 @@ struct async_fileio_write unsigned int count; }; +static struct async_fileio *fileio_freelist; + +static void release_fileio( struct async_fileio *io ) +{ + for (;;) + { + struct async_fileio *next = fileio_freelist; + io->next = next; + if (interlocked_cmpxchg_ptr( (void **)&fileio_freelist, io, next ) == next) return; + } +} + +static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROUTINE apc, void *arg ) +{ + /* first free remaining previous fileinfos */ + + struct async_fileio *io = interlocked_xchg_ptr( (void **)&fileio_freelist, NULL ); + + while (io) + { + struct async_fileio *next = io->next; + RtlFreeHeap( GetProcessHeap(), 0, io ); + io = next; + } + + if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + io->handle = handle; + io->apc = apc; + io->apc_arg = arg; + } + return io; +} /* callback for file I/O user APC */ static void WINAPI fileio_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) { struct async_fileio *async = arg; if (async->apc) async->apc( async->apc_arg, io, reserved ); - RtlFreeHeap( GetProcessHeap(), 0, async ); + release_fileio( async ); } /*********************************************************************** @@ -466,7 +500,10 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); } return status; } @@ -741,14 +778,12 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) + fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + if (!fileio) { status = STATUS_NO_MEMORY; goto err; } - fileio->io.handle = hFile; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -963,7 +998,10 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); } return status; } @@ -1142,14 +1180,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { struct async_fileio_write *fileio; - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) + fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + if (!fileio) { status = STATUS_NO_MEMORY; goto err; } - fileio->io.handle = hFile; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -1353,7 +1389,10 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { io->u.Status = status; - if (async->io.apc || async->event) *apc = fileio_apc; + if (async->io.apc) + *apc = fileio_apc; + else + release_fileio( &async->io ); } return status; } @@ -1371,11 +1410,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) + if (!(async = (struct async_ioctl *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) return STATUS_NO_MEMORY; - async->io.handle = handle; - async->io.apc = apc; - async->io.apc_arg = apc_context; async->event = event; async->buffer = out_buffer; async->size = out_size; @@ -1410,7 +1446,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; NtClose( wait_handle ); - RtlFreeHeap( GetProcessHeap(), 0, async ); } return status; @@ -1740,7 +1775,10 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st iosb->u.Status = ret; iosb->Information = size; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); return ret; } @@ -1772,13 +1810,10 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP if (!iosb) return STATUS_ACCESS_VIOLATION; if (filter == 0 || (filter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - fileio = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct read_changes_fileio, data[size] )); - if (!fileio) - return STATUS_NO_MEMORY; + fileio = (struct read_changes_fileio *)alloc_fileio( offsetof(struct read_changes_fileio, data[size]), + handle, apc, apc_context ); + if (!fileio) return STATUS_NO_MEMORY; - fileio->io.handle = handle; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_context; fileio->buffer = buffer; fileio->buffer_size = buffer_size; fileio->data_size = size;

1 0

Alexandre Julliard : ntdll: Use the fileio structure and callback also for ioctl calls.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 4f43d743e07ab1b809de70d10972d6f97ba1f3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f43d743e07ab1b809de70d10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:56:47 2015 +0900 ntdll: Use the fileio structure and callback also for ioctl calls. --- dlls/ntdll/file.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5232027..6e3825f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -336,22 +336,22 @@ struct async_fileio void *apc_arg; }; -typedef struct +struct async_fileio_read { struct async_fileio io; char* buffer; unsigned int already; unsigned int count; BOOL avail_mode; -} async_fileio_read; +}; -typedef struct +struct async_fileio_write { struct async_fileio io; const char *buffer; unsigned int already; unsigned int count; -} async_fileio_write; +}; /* callback for file I/O user APC */ @@ -416,7 +416,7 @@ NTSTATUS FILE_GetNtStatus(void) */ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc) { - async_fileio_read *fileio = user; + struct async_fileio_read *fileio = user; int fd, needs_close, result; switch (status) @@ -730,7 +730,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (async_read) { - async_fileio_read *fileio; + struct async_fileio_read *fileio; BOOL avail_mode; if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) @@ -923,7 +923,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap */ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc) { - async_fileio_write *fileio = user; + struct async_fileio_write *fileio = user; int result, fd, needs_close; enum server_fd_type type; @@ -1140,7 +1140,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (async_write) { - async_fileio_write *fileio; + struct async_fileio_write *fileio; if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) { @@ -1327,22 +1327,12 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap struct async_ioctl { - HANDLE handle; /* handle to the device */ - HANDLE event; /* async event */ - void *buffer; /* buffer for output */ - ULONG size; /* size of buffer */ - PIO_APC_ROUTINE apc; /* user apc params */ - void *apc_arg; + struct async_fileio io; + HANDLE event; /* async event */ + void *buffer; /* buffer for output */ + ULONG size; /* size of buffer */ }; -/* callback for ioctl user APC */ -static void WINAPI ioctl_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) -{ - struct async_ioctl *async = arg; - if (async->apc) async->apc( async->apc_arg, io, reserved ); - RtlFreeHeap( GetProcessHeap(), 0, async ); -} - /* callback for ioctl async I/O completion */ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc ) { @@ -1352,7 +1342,7 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu { SERVER_START_REQ( get_ioctl_result ) { - req->handle = wine_server_obj_handle( async->handle ); + req->handle = wine_server_obj_handle( async->io.handle ); req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = wine_server_call( req ); @@ -1363,7 +1353,7 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { io->u.Status = status; - if (async->apc || async->event) *apc = ioctl_apc; + if (async->io.apc || async->event) *apc = fileio_apc; } return status; } @@ -1383,12 +1373,12 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) return STATUS_NO_MEMORY; - async->handle = handle; + async->io.handle = handle; + async->io.apc = apc; + async->io.apc_arg = apc_context; async->event = event; async->buffer = out_buffer; async->size = out_size; - async->apc = apc; - async->apc_arg = apc_context; SERVER_START_REQ( ioctl ) {

1 0

Nikolay Sivov : scrrun: Implement Exists() method for dictionary.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 9419e97c3e896c33987018cf65c59e8d211b4153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9419e97c3e896c33987018cf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:18:13 2015 +0300 scrrun: Implement Exists() method for dictionary. --- dlls/scrrun/dictionary.c | 10 +++++++--- dlls/scrrun/tests/dictionary.c | 19 +++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 2306fad..7c776ee 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -368,13 +368,17 @@ static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) return S_OK; } -static HRESULT WINAPI dictionary_Exists(IDictionary *iface, VARIANT *Key, VARIANT_BOOL *pExists) +static HRESULT WINAPI dictionary_Exists(IDictionary *iface, VARIANT *key, VARIANT_BOOL *exists) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p %p)\n", This, Key, pExists); + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(key), exists); - return E_NOTIMPL; + if (!exists) + return CTL_E_ILLEGALFUNCTIONCALL; + + *exists = get_keyitem_pair(This, key) != NULL ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI dictionary_Items(IDictionary *iface, VARIANT *pItemsArray) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index deeea50..74ab7b9 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -69,16 +69,16 @@ static void test_interfaces(void) exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); - todo_wine ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - todo_wine ok(exists == VARIANT_TRUE, "Expected TRUE but got FALSE.\n"); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(exists == VARIANT_TRUE, "Expected TRUE but got FALSE.\n"); VariantClear(&key); exists = VARIANT_TRUE; V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(key_non_exist); hr = IDictionary_Exists(dict, &key, &exists); - todo_wine ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - todo_wine ok(exists == VARIANT_FALSE, "Expected FALSE but got TRUE.\n"); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(exists == VARIANT_FALSE, "Expected FALSE but got TRUE.\n"); VariantClear(&key); hr = IDictionary_get_Count(dict, &count); @@ -442,17 +442,15 @@ if (0) /* crashes on native */ V_VT(&key) = VT_I2; V_I2(&key) = 0; hr = IDictionary_Exists(dict, &key, NULL); -todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; exists = VARIANT_TRUE; hr = IDictionary_Exists(dict, &key, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == VARIANT_FALSE, "got %x\n", exists); -} + VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -465,26 +463,23 @@ todo_wine { V_VT(&key) = VT_I2; V_I2(&key) = 0; hr = IDictionary_Exists(dict, &key, NULL); -todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == VARIANT_TRUE, "got %x\n", exists); -} + /* key of different type, but resolves to same hash value */ V_VT(&key) = VT_R4; V_R4(&key) = 0.0; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == VARIANT_TRUE, "got %x\n", exists); -} + IDictionary_Release(dict); }

1 0

Nikolay Sivov : scrrun: Implement Remove() for dictionary.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: acfde52f06eb9800faae0a1d537ff064da50758f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfde52f06eb9800faae0a1d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:15:10 2015 +0300 scrrun: Implement Remove() for dictionary. --- dlls/scrrun/dictionary.c | 16 +++++++++++++--- dlls/scrrun/tests/dictionary.c | 2 -- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a7c90db..2306fad 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -404,13 +404,23 @@ static HRESULT WINAPI dictionary_Keys(IDictionary *iface, VARIANT *pKeysArray) return E_NOTIMPL; } -static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *Key) +static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *key) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - FIXME("(%p)->(%p)\n", This, Key); + TRACE("(%p)->(%p)\n", This, debugstr_variant(key)); - return E_NOTIMPL; + if (!(pair = get_keyitem_pair(This, key))) + return CTL_E_ELEMENT_NOT_FOUND; + + list_remove(&pair->entry); + if (This->buckets[pair->bucket] == pair) + This->buckets[pair->bucket] = NULL; + This->count--; + + free_keyitem_pair(pair); + return S_OK; } static HRESULT WINAPI dictionary_RemoveAll(IDictionary *iface) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index c9e71a5..deeea50 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -560,7 +560,6 @@ if (0) V_VT(&key) = VT_R4; V_R4(&key) = 0.0; hr = IDictionary_Remove(dict, &key); -todo_wine ok(hr == CTL_E_ELEMENT_NOT_FOUND, "got 0x%08x\n", hr); VariantInit(&item); @@ -568,7 +567,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_Remove(dict, &key); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IDictionary_Release(dict);

1 0