wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Nikolay Sivov : include: Fix packing of DWM_BLURBEHIND.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 1fcc75299f3e640ec60ef3caade9d14fa2e1299a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc75299f3e640ec60ef3caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 18:15:17 2015 +0300 include: Fix packing of DWM_BLURBEHIND. Spotted by Christoph von Wittich. --- include/dwmapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index db13b5f..3c5ed8f 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -95,8 +95,6 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; -#include <poppack.h> - #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -109,6 +107,8 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#include <poppack.h> + DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT);

1 0

Nikolay Sivov : include: Fix REPASTESPECIAL definition.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 8f517054d236967411042d7ff68e68b23214b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f517054d236967411042d7ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 18:07:37 2015 +0300 include: Fix REPASTESPECIAL definition. Spotted by Christoph von Wittich. --- include/richedit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/richedit.h b/include/richedit.h index 6b27fc9..ce2c145 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -691,7 +691,7 @@ typedef struct _reqresize { typedef struct _repastespecial { DWORD dwAspect; - DWORD dwParam; + DWORD_PTR dwParam; } REPASTESPECIAL; typedef struct _punctuation {

1 0

Nikolay Sivov : scrrun: It' s not allowed to change compare mode when dictionary is not empty.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 778d4da2d9e9f899013ce52a2aa30ada263542ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=778d4da2d9e9f899013ce52a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 17:27:02 2015 +0300 scrrun: It's not allowed to change compare mode when dictionary is not empty. --- dlls/scrrun/dictionary.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a33e1de..958d7fc 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -41,6 +41,7 @@ typedef struct LONG ref; CompareMethod method; + LONG count; } dictionary; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -200,14 +201,13 @@ static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *Key, VARIANT * return E_NOTIMPL; } -static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *pCount) +static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p)\n", This, pCount); - - *pCount = 0; + TRACE("(%p)->(%p)\n", This, count); + *count = This->count; return S_OK; } @@ -271,6 +271,9 @@ static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMeth TRACE("(%p)->(%d)\n", This, method); + if (This->count) + return CTL_E_ILLEGALFUNCTIONCALL; + This->method = method; return S_OK; } @@ -411,6 +414,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->IDictionary_iface.lpVtbl = &dictionary_vtbl; This->ref = 1; This->method = BinaryCompare; + This->count = 0; *obj = &This->IDictionary_iface;

1 0

Nikolay Sivov : scrrun/tests: More dictionary tests.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 94e5353f0d3b19c4bfc102d6d214fc48891eced9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e5353f0d3b19c4bfc102d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 17:23:12 2015 +0300 scrrun/tests: More dictionary tests. --- dlls/scrrun/scrrun.idl | 5 +- dlls/scrrun/tests/dictionary.c | 169 +++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/tests/scrrun.idl | 5 +- 3 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 53125ee..061d924d 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -27,7 +27,10 @@ cpp_quote("#undef CopyFile") cpp_quote("#undef DeleteFile") cpp_quote("#undef MoveFile") cpp_quote("#endif") -cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") /* this is not defined in public headers */ +/* this is not defined in public headers */ +cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") +cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") +cpp_quote("#define CTL_E_ELEMENT_NOT_FOUND STD_CTL_SCODE(32811)") [ uuid(420B2830-E718-11CF-893D-00A0C9054228), diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 0c3a92c..25cb0a6 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -93,6 +93,7 @@ static void test_comparemode(void) { CompareMethod method; IDictionary *dict; + VARIANT key, item; HRESULT hr; hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -122,6 +123,18 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(method == DatabaseCompare, "got %d\n", method); + /* try to change mode of a non-empty dict */ + V_VT(&key) = VT_I2; + 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); } @@ -414,6 +427,159 @@ static void test_hash_value(void) IDictionary_Release(dict); } +static void test_Exists(void) +{ + VARIANT_BOOL exists; + IDictionary *dict; + VARIANT key, item; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDictionary_Exists(dict, NULL, NULL); + + 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); +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; + 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); +} + +static void test_Keys(void) +{ + VARIANT key, keys, item; + IDictionary *dict; + LONG index; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_Keys(dict, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&keys); + hr = IDictionary_Keys(dict, &keys); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); +} + VariantClear(&keys); + + V_VT(&key) = VT_R4; + 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); + hr = IDictionary_Keys(dict, &keys); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); +} +if (hr == S_OK) +{ + VariantInit(&key); + index = 0; + hr = SafeArrayGetElement(V_ARRAY(&keys), &index, &key); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&key) == VT_R4, "got %d\n", V_VT(&key)); + + index = SafeArrayGetDim(V_ARRAY(&keys)); + ok(index == 1, "got %d\n", index); + + hr = SafeArrayGetUBound(V_ARRAY(&keys), 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index == 0, "got %d\n", index); +} + VariantClear(&keys); + + IDictionary_Release(dict); +} + +static void test_Remove(void) +{ + VARIANT key, item; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) + hr = IDictionary_Remove(dict, NULL); + + /* nothing added yet */ + 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); + hr = IDictionary_Add(dict, &key, &item); +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); +} + START_TEST(dictionary) { IDispatch *disp; @@ -433,6 +599,9 @@ START_TEST(dictionary) test_interfaces(); test_comparemode(); test_hash_value(); + test_Exists(); + test_Keys(); + test_Remove(); CoUninitialize(); } diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl index 96835c7..91e0151 100644 --- a/dlls/scrrun/tests/scrrun.idl +++ b/dlls/scrrun/tests/scrrun.idl @@ -24,7 +24,10 @@ cpp_quote("#undef CopyFile") cpp_quote("#undef DeleteFile") cpp_quote("#undef MoveFile") cpp_quote("#endif") -cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") /* this is not defined in public headers */ +/* this is not defined in public headers */ +cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") +cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") +cpp_quote("#define CTL_E_ELEMENT_NOT_FOUND STD_CTL_SCODE(32811)") [ uuid(420B2830-E718-11CF-893D-00A0C9054228),

1 0

Jacek Caban : winegecko.php: Make use of autoselect mirror SourceForge feature.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: tools Branch: master Commit: c97e300fa50540af4c9b9cea5d17293524320cbd URL: http://source.winehq.org/git/tools.git/?a=commit;h=c97e300fa50540af4c9b9cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 27 11:45:49 2015 +0100 winegecko.php: Make use of autoselect mirror SourceForge feature. This leaves the job of redirecting to mirror to SourceForge, which may do much better job at this than we do. Our current solution is to redirect to random mirror known to have Gecko. In our current code, connection time is bad (it may even feel like it hangs), because we need an additional request from server script to a mirror to ensure that the resource is present there. Also, choosing random mirror often causes pretty bad transfers. --- winegecko.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/winegecko.php b/winegecko.php index fdc1b96..e44b9e3 100644 --- a/winegecko.php +++ b/winegecko.php @@ -48,6 +48,16 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); +// SourceForge can do better job at redirecting to the mirror than us. However, +// it redirects to HTML page by default for web browser user agents. New enough +// Wine set user agent to 'Wine Addon Downloader', so redirect them directly +// to SourceForge. For older Wine and other user agents, fallback to random +// known mirror. +if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { + header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); + exit; +} + // Size array $aFileSizes = array( '0.0.1'=>5219822,

1 0

Andrew Eikum : advapi32: Partially implement NotifyServiceStatusChangeW.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: afa965a152672dcd24e0a9cb4483871a778ee2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa965a152672dcd24e0a9cb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:29:12 2015 -0600 advapi32: Partially implement NotifyServiceStatusChangeW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/service.c | 34 +++++++++++ dlls/advapi32/tests/service.c | 131 ++++++++++++++++++++++++++++++++++++++++++ include/winsvc.h | 37 ++++++++++++ 4 files changed, 203 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 322360d..e7b7cf7 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -496,7 +496,7 @@ @ stdcall NotifyChangeEventLog (long long) # @ stub NotifyServiceStatusChange # @ stub NotifyServiceStatusChangeA -# @ stub NotifyServiceStatusChangeW +@ stdcall NotifyServiceStatusChangeW(ptr long ptr) @ stdcall ObjectCloseAuditAlarmA(str ptr long) @ stdcall ObjectCloseAuditAlarmW(wstr ptr long) # @ stub ObjectDeleteAuditAlarmA diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ae002c9..4657bd9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2335,3 +2335,37 @@ BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, *lpServicesReturned = 0; return TRUE; } + +/****************************************************************************** + * NotifyServiceStatusChangeW [ADVAPI32.@] + */ +DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE hService, DWORD dwNotifyMask, + SERVICE_NOTIFYW *pNotifyBuffer) +{ + DWORD dummy; + BOOL ret; + SERVICE_STATUS_PROCESS st; + + FIXME("%p 0x%x %p - semi-stub\n", hService, dwNotifyMask, pNotifyBuffer); + + ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (void*)&st, sizeof(st), &dummy); + if (ret) + { + /* dwNotifyMask is a set of bitflags in same order as SERVICE_ statuses */ + if (dwNotifyMask & (1 << (st.dwCurrentState - SERVICE_STOPPED))) + { + pNotifyBuffer->dwNotificationStatus = ERROR_SUCCESS; + memcpy(&pNotifyBuffer->ServiceStatus, &st, sizeof(pNotifyBuffer->ServiceStatus)); + pNotifyBuffer->dwNotificationTriggered = 1 << (st.dwCurrentState - SERVICE_STOPPED); + pNotifyBuffer->pszServiceNames = NULL; + TRACE("Queueing notification: 0x%x\n", pNotifyBuffer->dwNotificationTriggered); + QueueUserAPC((PAPCFUNC)pNotifyBuffer->pfnNotifyCallback, + GetCurrentThread(), (ULONG_PTR)pNotifyBuffer); + } + } + + /* TODO: If the service is not currently in a matching state, we should + * tell `services` to monitor it. */ + + return ERROR_SUCCESS; +} diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 0fc8e3a..f87508b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -50,6 +50,7 @@ static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI *pQueryServiceObjectSecurity)(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD); +static DWORD (WINAPI *pNotifyServiceStatusChangeW)(SC_HANDLE,DWORD,SERVICE_NOTIFYW*); static void init_function_pointers(void) { @@ -63,6 +64,7 @@ static void init_function_pointers(void) pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); + pNotifyServiceStatusChangeW = (void*)GetProcAddress(hadvapi32, "NotifyServiceStatusChangeW"); } static void test_open_scm(void) @@ -2195,6 +2197,75 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4 return le1; } +struct notify_data { + SERVICE_NOTIFYW notify; + SC_HANDLE svc; +}; + +void CALLBACK cb_stopped(void *user) +{ + struct notify_data *data = user; + BOOL br; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = StartServiceA(data->svc, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); +} + +void CALLBACK cb_running(void *user) +{ + struct notify_data *data = user; + BOOL br; + SERVICE_STATUS status; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = ControlService(data->svc, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); +} + +static void test_servicenotify(SC_HANDLE svc) +{ + DWORD dr; + struct notify_data data; + + if(!pNotifyServiceStatusChangeW){ + win_skip("No NotifyServiceStatusChangeW\n"); + return; + } + + memset(&data.notify, 0, sizeof(data.notify)); + data.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data.notify.pfnNotifyCallback = &cb_stopped; + data.notify.pContext = &data; + data.svc = svc; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + + data.notify.pfnNotifyCallback = &cb_running; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); +} + static void test_start_stop(void) { BOOL ret; @@ -2267,6 +2338,13 @@ static void test_start_stop(void) le = try_start_stop(svc_handle, displayname, is_nt4); ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + /* create a real service and test notifications */ + sprintf(cmd, "%s service serve", selfname); + displayname = "Winetest Service"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); + ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); + test_servicenotify(svc_handle); + cleanup: if (svc_handle) { @@ -2370,6 +2448,57 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static DWORD WINAPI ctrl_handler(DWORD ctl, DWORD type, void *data, void *user) +{ + HANDLE evt = user; + + switch(ctl){ + case SERVICE_CONTROL_STOP: + SetEvent(evt); + break; + case SERVICE_CONTROL_INTERROGATE: + return NO_ERROR; + } + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static void WINAPI service_main(DWORD argc, char **argv) +{ + SERVICE_STATUS_HANDLE st_handle; + SERVICE_STATUS st; + HANDLE evt = CreateEventW(0, FALSE, FALSE, 0); + + st_handle = RegisterServiceCtrlHandlerExA("", &ctrl_handler, evt); + + st.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + st.dwServiceSpecificExitCode = 0; + st.dwCurrentState = SERVICE_RUNNING; + st.dwWin32ExitCode = NO_ERROR; + st.dwWaitHint = 0; + st.dwControlsAccepted = SERVICE_ACCEPT_STOP; + st.dwCheckPoint = 0; + + SetServiceStatus(st_handle, &st); + + WaitForSingleObject(evt, 5000); + + st.dwCurrentState = SERVICE_STOPPED; + + SetServiceStatus(st_handle, &st); +} + +static void run_service(void) +{ + char empty[] = {0}; + SERVICE_TABLE_ENTRYA table[] = { + {empty, &service_main }, + {0, 0} + }; + + StartServiceCtrlDispatcherA(table); +} + START_TEST(service) { SC_HANDLE scm_handle; @@ -2380,6 +2509,8 @@ START_TEST(service) GetFullPathNameA(myARGV[0], sizeof(selfname), selfname, NULL); if (myARGC >= 3) { + if (strcmp(myARGV[2], "serve") == 0) + run_service(); return; } diff --git a/include/winsvc.h b/include/winsvc.h index c1af509..7d768f5 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -159,6 +159,43 @@ typedef struct _SERVICE_STATUS_PROCESS DWORD dwServiceFlags; } SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS; +#define SERVICE_NOTIFY_STATUS_CHANGE 2 + +#define SERVICE_NOTIFY_STOPPED 0x1 +#define SERVICE_NOTIFY_START_PENDING 0x2 +#define SERVICE_NOTIFY_STOP_PENDING 0x4 +#define SERVICE_NOTIFY_RUNNING 0x8 +#define SERVICE_NOTIFY_CONTINUE_PENDING 0x10 +#define SERVICE_NOTIFY_PAUSE_PENDING 0x20 +#define SERVICE_NOTIFY_PAUSED 0x40 +#define SERVICE_NOTIFY_CREATED 0x80 +#define SERVICE_NOTIFY_DELETED 0x100 +#define SERVICE_NOTIFY_DELETE_PENDING 0x200 + +typedef void (CALLBACK *PFN_SC_NOTIFY_CALLBACK)(void *); + +typedef struct _SERVICE_NOTIFY_2A { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + void *pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwNotificationTriggered; + char *pszServiceNames; +} SERVICE_NOTIFY_2A, SERVICE_NOTIFYA; + +typedef struct _SERVICE_NOTIFY_2W { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + void *pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwNotificationTriggered; + WCHAR *pszServiceNames; +} SERVICE_NOTIFY_2W, SERVICE_NOTIFYW; + +DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE,DWORD,SERVICE_NOTIFYW*); + typedef enum _SC_STATUS_TYPE { SC_STATUS_PROCESS_INFO = 0 } SC_STATUS_TYPE;

1 0

Andrew Eikum : advapi32/tests: Don't test service timeout.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 48f0f16311260648d16f75e9d50e4e284f09f05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f0f16311260648d16f75e9d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:28:49 2015 -0600 advapi32/tests: Don't test service timeout. --- dlls/advapi32/tests/service.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ad81a25..0fc8e3a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2267,18 +2267,6 @@ static void test_start_stop(void) le = try_start_stop(svc_handle, displayname, is_nt4); ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); - /* And finally with a service that plays dead, forcing a timeout. - * This time we will put no quotes. That should work too, even if there are - * spaces in the path. - */ - sprintf(cmd, "%s service sleep", selfname); - displayname = "Winetest Sleep Service"; - ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); - ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - - le = try_start_stop(svc_handle, displayname, is_nt4); - ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); - cleanup: if (svc_handle) { @@ -2392,10 +2380,6 @@ START_TEST(service) GetFullPathNameA(myARGV[0], sizeof(selfname), selfname, NULL); if (myARGC >= 3) { - if (strcmp(myARGV[2], "sleep") == 0) - /* Cause a service startup timeout */ - Sleep(90000); - /* then, or if myARGV[2] == "exit", just exit */ return; }

1 0

Andrew Eikum : services: Monitor process handles for process quit.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 1e783dbfaad7e290a7659e829141acf0a831f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e783dbfaad7e290a7659e829… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Feb 26 07:46:14 2015 -0600 services: Monitor process handles for process quit. --- programs/services/rpc.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3a206c7..0d74b5b 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1623,7 +1623,7 @@ DWORD events_loop(void) { struct timeout_queue_elem *iter, *iter_safe; DWORD err; - HANDLE wait_handles[2]; + HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; DWORD timeout = INFINITE; wait_handles[0] = __wine_make_process_system(); @@ -1636,13 +1636,29 @@ DWORD events_loop(void) do { - err = WaitForMultipleObjects(2, wait_handles, FALSE, timeout); + DWORD num_handles = 2; + + /* monitor tracked process handles for process end */ + EnterCriticalSection(&timeout_queue_cs); + LIST_FOR_EACH_ENTRY(iter, &timeout_queue, struct timeout_queue_elem, entry) + { + if(num_handles == MAXIMUM_WAIT_OBJECTS){ + WINE_TRACE("Exceeded maximum wait object count\n"); + break; + } + wait_handles[num_handles] = iter->service_entry->process; + num_handles++; + } + LeaveCriticalSection(&timeout_queue_cs); + + err = WaitForMultipleObjects(num_handles, wait_handles, FALSE, timeout); WINE_TRACE("Wait returned %d\n", err); - if(err==WAIT_OBJECT_0+1 || err==WAIT_TIMEOUT) + if(err > WAIT_OBJECT_0 || err == WAIT_TIMEOUT) { FILETIME cur_time; ULARGE_INTEGER time; + DWORD idx = 0; GetSystemTimeAsFileTime(&cur_time); time.u.LowPart = cur_time.dwLowDateTime; @@ -1652,7 +1668,8 @@ DWORD events_loop(void) timeout = INFINITE; LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) { - if(CompareFileTime(&cur_time, &iter->time) >= 0) + if(CompareFileTime(&cur_time, &iter->time) >= 0 || + (err > WAIT_OBJECT_0 + 1 && idx == err - WAIT_OBJECT_0 - 2)) { LeaveCriticalSection(&timeout_queue_cs); iter->func(iter->service_entry); @@ -1673,6 +1690,7 @@ DWORD events_loop(void) if(time_diff.QuadPart < timeout) timeout = time_diff.QuadPart; } + idx++; } LeaveCriticalSection(&timeout_queue_cs);

1 0

Alexandre Julliard : imm32: Remove redundant IsWindow calls.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: c731ed30acb08fe6414230f376e629589e42eab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c731ed30acb08fe6414230f37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 22:52:56 2015 +0900 imm32: Remove redundant IsWindow calls. --- dlls/imm32/imm.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1fc553d..c4b44e4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -588,23 +588,9 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!hIMC) return old; - if (IsWindow(data->IMC.hWnd)) - { - /* - * Post a message that your context is switching - */ - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); - } - + SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); data->IMC.hWnd = hWnd; - - if (IsWindow(data->IMC.hWnd)) - { - /* - * Post a message that your context is switching - */ - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); - } + SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); return old; } @@ -2185,13 +2171,11 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) InputContextData *data = get_imc_data(hIMC); TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - if (!data) - SetLastError(ERROR_INVALID_HANDLE); - if (data && IsWindow(data->IMC.hWnd)) - return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + if (data) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - return 0; + SetLastError(ERROR_INVALID_HANDLE); + return 0; } /*********************************************************************** @@ -2203,13 +2187,10 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - if (!data) - SetLastError(ERROR_INVALID_HANDLE); - - if (data && IsWindow(data->IMC.hWnd)) - return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + if (data) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - return 0; + SetLastError(ERROR_INVALID_HANDLE); + return 0; } /***********************************************************************

1 0

Alexandre Julliard : imm32: Simplify the helper functions to retrieve the thread data.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: c84fd8586a21e665db18dcaaa46d5c185fddb403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84fd8586a21e665db18dcaaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 22:59:51 2015 +0900 imm32: Simplify the helper functions to retrieve the thread data. --- dlls/imm32/imm.c | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 07ab598..1fc553d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -225,43 +225,29 @@ static DWORD convert_candidatelist_AtoW( return ret; } -static IMMThreadData* IMM_GetThreadData(DWORD id) +static IMMThreadData *IMM_GetThreadData(HWND hwnd) { IMMThreadData *data; + DWORD process, thread; - if (!id) id = GetCurrentThreadId(); + if (hwnd) + { + if (!(thread = GetWindowThreadProcessId(hwnd, &process))) return NULL; + if (process != GetCurrentProcessId()) return NULL; + } + else thread = GetCurrentThreadId(); EnterCriticalSection(&threaddata_cs); LIST_FOR_EACH_ENTRY(data, &ImmThreadDataList, IMMThreadData, entry) - { - if (data->threadID == id) - return data; - } + if (data->threadID == thread) return data; - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IMMThreadData)); - data->threadID = id; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); + data->threadID = thread; list_add_head(&ImmThreadDataList,&data->entry); - TRACE("Thread Data Created (%x)\n",id); - + TRACE("Thread Data Created (%x)\n",thread); return data; } -static IMMThreadData* IMM_GetThreadDataForWindow(HWND hwnd) -{ - DWORD process; - DWORD thread = 0; - - if (hwnd) - { - thread = GetWindowThreadProcessId(hwnd, &process); - if (process != GetCurrentProcessId()) - return NULL; - } - - return IMM_GetThreadData(thread); -} - static BOOL IMM_IsDefaultContext(HIMC imc) { InputContextData *data = get_imc_data(imc); @@ -497,7 +483,7 @@ static InputContextData* get_imc_data(HIMC hIMC) static HIMC get_default_context( HWND hwnd ) { HIMC ret; - IMMThreadData* thread_data = IMM_GetThreadDataForWindow( hwnd ); + IMMThreadData* thread_data = IMM_GetThreadData( hwnd ); if (!thread_data) return 0; @@ -1625,7 +1611,7 @@ BOOL WINAPI ImmGetConversionStatus( HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { HWND ret, new = NULL; - IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); + IMMThreadData* thread_data = IMM_GetThreadData(hWnd); if (!thread_data) return NULL; if (thread_data->hwndDefault == NULL && thread_data->threadID == GetCurrentThreadId()) @@ -1634,12 +1620,8 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) LeaveCriticalSection(&threaddata_cs); new = CreateWindowExW( WS_EX_TOOLWINDOW, szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); - thread_data = IMM_GetThreadDataForWindow(hWnd); - if (!thread_data) - { - DestroyWindow(new); - return NULL; - } + /* thread_data is in the current thread so we can assume it's still valid */ + EnterCriticalSection(&threaddata_cs); /* See if anyone beat us */ if (thread_data->hwndDefault == NULL) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015