October 2019 - Wine-devel - list.winehq.org

[PATCH v2] comsvcs/tests: Increase the timeout in the implicit MTA test.
by Zebediah Figura 25 Oct '19

25 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 98d2a91bf5..137dd98aea 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -186,7 +186,7 @@ static void create_dispenser(void) * actually initialize. */ Sleep(200); thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); - ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + ok(!WaitForSingleObject(thread, 5000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); -- 2.20.1

2 1

[PATCH v2 1/3] advapi32/tests: Clean up tests for duplicate service names.
by Zebediah Figura 25 Oct '19

25 Oct '19

Use our own services instead of relying on a system service, and account for differing Windows 10 behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/service.c | 72 ++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 6c78900bd4..c607e292aa 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -203,10 +203,9 @@ static void test_create_delete_svc(void) static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; static const CHAR password [] = "secret"; - BOOL spooler_exists = FALSE; + char buffer[200]; + DWORD size; BOOL ret; - CHAR display[4096]; - DWORD display_size = sizeof(display); /* Get the username and turn it into an account to be used in some tests */ GetUserNameA(username, &user_size); @@ -356,42 +355,45 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* The service already exists (check first, just in case) */ - svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); - if (svc_handle1) + /* Test duplicate service names */ + svc_handle1 = CreateServiceA(scm_handle, "winetest_dupname", "winetest_display", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!!svc_handle1, "Failed to create service, error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname", NULL, 0, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle2, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_EXISTS, "Got wrong error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname2", "winetest_dupname", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + todo_wine ok(!svc_handle2, "Expected failure\n"); + todo_wine ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Got wrong error %u\n", GetLastError()); + if (svc_handle2) { - spooler_exists = TRUE; - CloseServiceHandle(svc_handle1); - SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, - SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure\n"); - ok(GetLastError() == ERROR_SERVICE_EXISTS, "Expected ERROR_SERVICE_EXISTS, got %d\n", GetLastError()); + DeleteService(svc_handle2); + CloseServiceHandle(svc_handle2); + } + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname2", "winetest_display", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + if (svc_handle2) /* Win10 1709+ */ + { + size = sizeof(buffer); + ret = GetServiceKeyNameA(scm_handle, "winetest_display", buffer, &size); + ok(ret, "Failed to get key name, error %u\n", GetLastError()); + ok(!strcmp(buffer, "winetest_dupname"), "Got wrong name \"%s\"\n", buffer); + + ret = DeleteService(svc_handle2); + ok(ret, "Failed to delete service, error %u\n", GetLastError()); + CloseServiceHandle(svc_handle2); } else - skip("Spooler service doesn't exist\n"); + ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Got wrong error %u\n", GetLastError()); - /* To find an existing displayname we check the 'Spooler' service. Although the registry - * doesn't show DisplayName on NT4, this call will return a displayname which is equal - * to the servicename and can't be used as well for a new displayname. - */ - if (spooler_exists) - { - ret = GetServiceDisplayNameA(scm_handle, spooler, display, &display_size); - - if (!ret) - skip("Could not retrieve a displayname for the Spooler service\n"); - else - { - svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, - SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure for display name '%s'\n", display); - ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, - "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); - } - } - else - skip("Could not retrieve a displayname (Spooler service doesn't exist)\n"); + ret = DeleteService(svc_handle1); + ok(ret, "Failed to delete service, error %u\n", GetLastError()); + CloseServiceHandle(svc_handle1); /* Windows doesn't care about the access rights for creation (which makes * sense as there is no service yet) as long as there are sufficient -- 2.20.1

2 5

[PATCH] gameux/tests: Get rid of registry value tests.
by Zebediah Figura 25 Oct '19

25 Oct '19

Where gameux stores registry values is an implementation detail, and subject to change. There's no reason to test it, unless an application relies on it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gameux/tests/gameexplorer.c | 515 +------------------------------ 1 file changed, 11 insertions(+), 504 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 0a235863bf..1774128fee 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -33,467 +33,6 @@ #include "wine/test.h" -/******************************************************************************* - * Pointers used instead of direct calls. These procedures are not available on - * older system, which causes problem while loading test binary. - */ -static BOOL WINAPI (*_ConvertSidToStringSidW)(PSID,LPWSTR*); -static LONG WINAPI (*_RegGetValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); - -/******************************************************************************* - *_loadDynamicRoutines - * - * Helper function, prepares pointers to system procedures which may be not - * available on older operating systems. - * - * Returns: - * TRUE procedures were loaded successfully - * FALSE procedures were not loaded successfully - */ -static BOOL _loadDynamicRoutines(void) -{ - HMODULE hAdvapiModule = GetModuleHandleA( "advapi32.dll" ); - - _ConvertSidToStringSidW = (LPVOID)GetProcAddress(hAdvapiModule, "ConvertSidToStringSidW"); - if (!_ConvertSidToStringSidW) return FALSE; - _RegGetValueW = (LPVOID)GetProcAddress(hAdvapiModule, "RegGetValueW"); - if (!_RegGetValueW) return FALSE; - return TRUE; -} - -/******************************************************************************* - * _buildGameRegistryPath - * - * Helper function, builds registry path to key, where game's data are stored - * - * Parameters: - * installScope [I] the scope which was used in AddGame/InstallGame call - * gameInstanceId [I] game instance GUID. If NULL, then only - * path to scope is returned - * lpRegistryPath [O] pointer which will receive address to string - * containing expected registry path. Path - * is relative to HKLM registry key. It - * must be freed by calling CoTaskMemFree - */ -static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, - LPCGUID gameInstanceId, - LPWSTR* lpRegistryPath) -{ - static const WCHAR sGameUxRegistryPath[] = {'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','G','a','m','e','U','X',0}; - static const WCHAR sGames[] = {'G','a','m','e','s',0}; - static const WCHAR sBackslash[] = {'\\',0}; - - HRESULT hr = S_OK; - HANDLE hToken = NULL; - PTOKEN_USER pTokenUser = NULL; - DWORD dwLength; - LPWSTR lpSID = NULL; - WCHAR sInstanceId[40]; - WCHAR sRegistryPath[8192]; - - lstrcpyW(sRegistryPath, sGameUxRegistryPath); - lstrcatW(sRegistryPath, sBackslash); - - if(installScope == GIS_CURRENT_USER) - { - /* build registry path containing user's SID */ - if(!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if(SUCCEEDED(hr)) - { - if(!GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) && - GetLastError()!=ERROR_INSUFFICIENT_BUFFER) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if(SUCCEEDED(hr)) - { - pTokenUser = CoTaskMemAlloc(dwLength); - if(!pTokenUser) - hr = E_OUTOFMEMORY; - } - - if(SUCCEEDED(hr)) - if(!GetTokenInformation(hToken, TokenUser, (LPVOID)pTokenUser, dwLength, &dwLength)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if(SUCCEEDED(hr)) - if(!_ConvertSidToStringSidW(pTokenUser->User.Sid, &lpSID)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if(SUCCEEDED(hr)) - { - lstrcatW(sRegistryPath, lpSID); - LocalFree(lpSID); - } - - CoTaskMemFree(pTokenUser); - CloseHandle(hToken); - } - } - else if(installScope == GIS_ALL_USERS) - /* build registry path without SID */ - lstrcatW(sRegistryPath, sGames); - else - hr = E_INVALIDARG; - - /* put game's instance id on the end of path, but only if id was passes */ - if(gameInstanceId) - { - if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, ARRAY_SIZE(sInstanceId)) ? S_OK : E_FAIL); - - if(SUCCEEDED(hr)) - { - lstrcatW(sRegistryPath, sBackslash); - lstrcatW(sRegistryPath, sInstanceId); - } - } - - if(SUCCEEDED(hr)) - { - *lpRegistryPath = CoTaskMemAlloc((lstrlenW(sRegistryPath)+1)*sizeof(WCHAR)); - if(!*lpRegistryPath) - hr = E_OUTOFMEMORY; - } - - if(SUCCEEDED(hr)) - lstrcpyW(*lpRegistryPath, sRegistryPath); - - return hr; -} -/******************************************************************************* - * _validateRegistryValue - * - * Helper function, verifies single registry value with expected - * - * Parameters: - * hKey [I] handle to game's key. Key must be opened - * keyPath [I] string with path to game's key. Used only - * to display more useful message on test fail - * valueName [I] name of value to check - * dwExpectedType [I] expected type of value. It should be - * one of RRF_RT_* flags - * lpExpectedContent [I] expected content of value. It should be - * pointer to variable with same type as - * passed in dwExpectedType - * - * Returns: - * S_OK value exists and contains expected data - * S_FALSE value exists, but contains other data - * than expected - * E_OUTOFMEMORY allocation problem - * HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) - * value does not exist - * - * Note: this function returns error codes instead of failing test case, because - * it is sometimes expected that given value may not exist on some systems, or - * contain other data. - */ -static HRESULT _validateRegistryValue( - HKEY hKey, - LPCWSTR keyPath, - LPCWSTR valueName, - DWORD dwExpectedType, - LPCVOID lpExpectedContent) -{ - HRESULT hr; - DWORD dwType, dwSize; - LPVOID lpData = NULL; - - hr = HRESULT_FROM_WIN32(_RegGetValueW(hKey, NULL, valueName, dwExpectedType, &dwType, NULL, &dwSize)); - if(FAILED(hr)) trace("registry value cannot be opened\n" - " key: %s\n" - " value: %s\n" - " expected type: 0x%x\n" - " found type: 0x%x\n" - " result code: 0x%0x\n", - wine_dbgstr_w(keyPath), - wine_dbgstr_w(valueName), - dwExpectedType, - dwType, - hr); - - if(SUCCEEDED(hr)) - { - lpData = CoTaskMemAlloc(dwSize); - if(!lpData) - hr = E_OUTOFMEMORY; - } - - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(_RegGetValueW(hKey, NULL, valueName, dwExpectedType, &dwType, lpData, &dwSize)); - - if(SUCCEEDED(hr)) - { - if(memcmp(lpData, lpExpectedContent, dwSize)==0) - hr = S_OK; - else - { - if(dwExpectedType == RRF_RT_REG_SZ) - /* if value type is REG_SZ, display expected and found values */ - trace("not expected content of registry value\n" - " key: %s\n" - " value: %s\n" - " expected REG_SZ content: %s\n" - " found REG_SZ content: %s\n", - wine_dbgstr_w(keyPath), - wine_dbgstr_w(valueName), - wine_dbgstr_w(lpExpectedContent), - wine_dbgstr_w(lpData)); - else - /* in the other case, do not display content */ - trace("not expected content of registry value\n" - " key: %s\n" - " value: %s\n" - " value type: 0x%x\n", - wine_dbgstr_w(keyPath), - wine_dbgstr_w(valueName), - dwType); - - hr = S_FALSE; - } - } - - CoTaskMemFree(lpData); - return hr; -} -/******************************************************************************* - * _validateGameRegistryValues - * - * Helper function, verifies values in game's registry key - * - * Parameters: - * line [I] place of original call. Used only to display - * more useful message on test fail - * hKey [I] handle to game's key. Key must be opened - * with KEY_READ access permission - * keyPath [I] string with path to game's key. Used only - * to display more useful message on test fail - * gameApplicationId [I] game application identifier - * gameExePath [I] directory where game executable is stored - * gameExeName [I] full path to executable, including directory and file name - */ -static void _validateGameRegistryValues(int line, - HKEY hKey, - LPCWSTR keyPath, - LPCGUID gameApplicationId, - LPCWSTR gameExePath, - LPCWSTR gameExeName) -{ - static const WCHAR sApplicationId[] = {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; - static const WCHAR sConfigApplicationPath[] = {'C','o','n','f','i','g','A','p','p','l','i','c','a','t','i','o','n','P','a','t','h',0}; - static const WCHAR sConfigGDFBinaryPath[] = {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; - static const WCHAR sDescription[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR sExampleGame[] = {'E','x','a','m','p','l','e',' ','G','a','m','e',0}; - static const WCHAR sGameDescription[] = {'G','a','m','e',' ','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR sTitle[] = {'T','i','t','l','e',0}; - - HRESULT hr; - WCHAR sGameApplicationId[40]; - - hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, ARRAY_SIZE(sGameApplicationId)) ? S_OK : E_FAIL); - ok_(__FILE__, line)(hr == S_OK, "cannot convert game application id to string\n"); - - /* these values exist up from Vista */ - hr = _validateRegistryValue(hKey, keyPath, sApplicationId, RRF_RT_REG_SZ, sGameApplicationId); - ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); - hr = _validateRegistryValue(hKey, keyPath, sConfigApplicationPath, RRF_RT_REG_SZ, gameExePath); - ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); - hr = _validateRegistryValue(hKey, keyPath, sConfigGDFBinaryPath, RRF_RT_REG_SZ, gameExeName); - ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); - hr = _validateRegistryValue(hKey, keyPath, sTitle, RRF_RT_REG_SZ, sExampleGame); - ok_(__FILE__, line)(hr==S_OK, "failed while checking registry value (error 0x%x)\n", hr); - - /* this value exists up from Win7 */ - hr = _validateRegistryValue(hKey, keyPath, sDescription, RRF_RT_REG_SZ, sGameDescription); - ok_(__FILE__, line)(hr==S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), "failed while checking registry value (error 0x%x)\n", hr); -} -/******************************************************************************* - * _validateGameKey - * - * Helper function, verifies current state of game's registry key with expected. - * - * Parameters: - * line [I] place of original call. Used only to display - * more useful message on test fail - * installScope [I] the scope which was used in AddGame/InstallGame call - * gameInstanceId [I] game instance identifier - * gameApplicationId [I] game application identifier - * gameExePath [I] directory where game executable is stored - * gameExeName [I] full path to executable, including directory and file name - * presenceExpected [I] is it expected that game should be currently - * registered or not. Should be TRUE if checking - * after using AddGame/InstallGame, and FALSE - * if checking after RemoveGame/UninstallGame - */ -static void _validateGameRegistryKey(int line, - GAME_INSTALL_SCOPE installScope, - LPCGUID gameInstanceId, - LPCGUID gameApplicationId, - LPCWSTR gameExePath, - LPCWSTR gameExeName, - BOOL presenceExpected) -{ - HRESULT hr; - LPWSTR lpRegistryPath = NULL; - HKEY hKey; - - /* check key presence */ - hr = _buildGameRegistryPath(installScope, gameInstanceId, &lpRegistryPath); - - if(SUCCEEDED(hr)) - { - hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, - KEY_READ | KEY_WOW64_64KEY, &hKey)); - - if(presenceExpected) - ok_(__FILE__, line)(hr == S_OK, - "problem while trying to open registry key (HKLM): %s, error: 0x%x\n", wine_dbgstr_w(lpRegistryPath), hr); - else - ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "other than expected (FILE_NOT_FOUND) error while trying to open registry key (HKLM): %s, error: 0x%x\n", wine_dbgstr_w(lpRegistryPath), hr); - } - - if(SUCCEEDED(hr)) - { - if(presenceExpected) - /* if the key exists and we expected it, let's verify its content */ - _validateGameRegistryValues(line, hKey, lpRegistryPath, gameApplicationId, gameExePath, gameExeName); - - RegCloseKey(hKey); - } - - CoTaskMemFree(lpRegistryPath); -} - -/******************************************************************************* - * _LoadRegistryString - * - * Helper function, loads string from registry value and allocates buffer for it - * - * Parameters: - * hRootKey [I] base key for reading. Should be opened - * with KEY_READ permission - * lpRegistryKey [I] name of registry key, subkey of root key - * lpRegistryValue [I] name of registry value - * lpValue [O] pointer where address of received - * value will be stored. Value should be - * freed by CoTaskMemFree call - */ -static HRESULT _LoadRegistryString(HKEY hRootKey, - LPCWSTR lpRegistryKey, - LPCWSTR lpRegistryValue, - LPWSTR* lpValue) -{ - HRESULT hr; - DWORD dwSize; - - *lpValue = NULL; - - hr = HRESULT_FROM_WIN32(_RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, - RRF_RT_REG_SZ, NULL, NULL, &dwSize)); - - if(SUCCEEDED(hr)) - { - *lpValue = CoTaskMemAlloc(dwSize); - if(!*lpValue) - hr = E_OUTOFMEMORY; - } - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(_RegGetValueW(hRootKey, lpRegistryKey, lpRegistryValue, - RRF_RT_REG_SZ, NULL, *lpValue, &dwSize)); - - return hr; -} -/******************************************************************************* - * _findGameInstanceId - * - * Helper function. Searches for instance identifier of given game in given - * installation scope. - * - * Parameters: - * line [I] line to display messages - * sGDFBinaryPath [I] path to binary containing GDF - * installScope [I] game install scope to search in - * pInstanceId [O] instance identifier of given game - */ -static void _findGameInstanceId(int line, - LPWSTR sGDFBinaryPath, - GAME_INSTALL_SCOPE installScope, - GUID* pInstanceId) -{ - static const WCHAR sConfigGDFBinaryPath[] = - {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; - - HRESULT hr; - BOOL found = FALSE; - LPWSTR lpRegistryPath = NULL; - HKEY hRootKey; - DWORD dwSubKeys, dwSubKeyLen, dwMaxSubKeyLen, i; - LPWSTR lpName = NULL, lpValue = NULL; - - hr = _buildGameRegistryPath(installScope, NULL, &lpRegistryPath); - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot get registry path to given scope: %d\n", installScope); - - if(SUCCEEDED(hr)) - /* enumerate all subkeys of received one and search them for value "ConfigGGDFBinaryPath" */ - hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, - lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hRootKey)); - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot open key registry key: %s\n", wine_dbgstr_w(lpRegistryPath)); - - if(SUCCEEDED(hr)) - { - hr = HRESULT_FROM_WIN32(RegQueryInfoKeyW(hRootKey, NULL, NULL, NULL, - &dwSubKeys, &dwMaxSubKeyLen, NULL, NULL, NULL, NULL, NULL, NULL)); - - if(SUCCEEDED(hr)) - { - ++dwMaxSubKeyLen; /* for string terminator */ - lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); - if(!lpName) hr = E_OUTOFMEMORY; - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name\n"); - } - - if(SUCCEEDED(hr)) - { - for(i=0; i<dwSubKeys && !found; ++i) - { - dwSubKeyLen = dwMaxSubKeyLen; - hr = HRESULT_FROM_WIN32(RegEnumKeyExW(hRootKey, i, lpName, &dwSubKeyLen, - NULL, NULL, NULL, NULL)); - - if(SUCCEEDED(hr)) - hr = _LoadRegistryString(hRootKey, lpName, - sConfigGDFBinaryPath, &lpValue); - - if(SUCCEEDED(hr)) - if(lstrcmpW(lpValue, sGDFBinaryPath)==0) - { - /* key found, let's copy instance id and exit */ - hr = CLSIDFromString(lpName, pInstanceId); - ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n", - wine_dbgstr_w(lpName)); - - found = TRUE; - } - CoTaskMemFree(lpValue); - } - } - - CoTaskMemFree(lpName); - RegCloseKey(hRootKey); - } - - CoTaskMemFree(lpRegistryPath); - ok_(__FILE__, line)(found==TRUE, "cannot find game with GDF path %s in scope %d\n", - wine_dbgstr_w(sGDFBinaryPath), installScope); -} -/******************************************************************************* - * Test routines - */ static void test_create(BOOL* gameExplorerAvailable, BOOL* gameExplorer2Available) { HRESULT hr; @@ -528,8 +67,6 @@ static void test_add_remove_game(void) { static const GUID defaultGUID = {0x01234567, 0x89AB, 0xCDEF, { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF}}; - static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, - { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; HRESULT hr; @@ -570,31 +107,21 @@ static void test_add_remove_game(void) if(SUCCEEDED(hr)) { - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); - hr = IGameExplorer_RemoveGame(ge, guid); ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); } - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); - - /* try to register game with empty guid */ memcpy(&guid, &GUID_NULL, sizeof (guid)); hr = IGameExplorer_AddGame(ge, bstrExeName, bstrExePath, GIS_CURRENT_USER, &guid); ok(SUCCEEDED(hr), "IGameExplorer::AddGame failed (error 0x%08x)\n", hr); - ok(memcmp(&guid, &GUID_NULL, sizeof (guid)) != 0, "AddGame did not modify GUID\n"); if(SUCCEEDED(hr)) { - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); - hr = IGameExplorer_RemoveGame(ge, guid); ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); } - - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); } /* free allocated resources */ @@ -607,16 +134,12 @@ static void test_add_remove_game(void) static void test_install_uninstall_game(void) { - static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, - { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; - HRESULT hr; IGameExplorer2* ge2 = NULL; WCHAR sExeName[MAX_PATH]; WCHAR sExePath[MAX_PATH]; DWORD dwExeNameLen; - GUID guid; hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer2, (LPVOID*)&ge2); ok(ge2 != NULL, "cannot create coclass IGameExplorer2\n"); @@ -635,20 +158,13 @@ static void test_install_uninstall_game(void) hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); - /* in comparison to AddGame, InstallGame does not return instance ID, - * so we need to find it manually */ - _findGameInstanceId(__LINE__, sExeName, GIS_CURRENT_USER, &guid); if(SUCCEEDED(hr)) { - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); - hr = IGameExplorer2_UninstallGame(ge2, sExeName); ok(SUCCEEDED(hr), "IGameExplorer2::UninstallGame failed (error 0x%08x)\n", hr); } - _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); - IGameExplorer2_Release(ge2); } } @@ -669,26 +185,17 @@ static void run_tests(void) START_TEST(gameexplorer) { - if(_loadDynamicRoutines()) - { - HRESULT hr; + HRESULT hr; - hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); - ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); - trace("Running multithreaded tests.\n"); - run_tests(); - if(SUCCEEDED(hr)) - CoUninitialize(); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + trace("Running multithreaded tests.\n"); + run_tests(); + CoUninitialize(); - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); - trace("Running apartment threaded tests.\n"); - run_tests(); - if(SUCCEEDED(hr)) - CoUninitialize(); - } - else - /* this is not a failure, because both procedures loaded by address - * are always available on systems which has gameux.dll */ - win_skip("too old system, cannot load required dynamic procedures\n"); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + trace("Running apartment threaded tests.\n"); + run_tests(); + CoUninitialize(); } -- 2.20.1

1 0

[PATCH] comsvcs/tests: Increase the timeout in the implicit MTA test.
by Zebediah Figura 25 Oct '19

25 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/comsvcs/tests/dispenser.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 98d2a91bf5..7e873c1cf8 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -165,6 +165,7 @@ static void create_dispenser(void) RESID resid; DWORD ret; BSTR str; + int i; hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); @@ -184,10 +185,14 @@ static void create_dispenser(void) /* The above call creates an MTA thread, but we need to wait for it to * actually initialize. */ - Sleep(200); - thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); - ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); - GetExitCodeThread(thread, &ret); + for (i = 1; i < 10; ++i) + { + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); + if (ret != CO_E_NOTINITIALIZED) break; + Sleep(100 * i); + } ok(ret == S_OK, "got unexpected hr %#x\n", ret); hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); -- 2.20.1

2 1

Building Windows Python packages/executables under Wine
by Erich E. Hoover 25 Oct '19

25 Oct '19

All, As promised at WineConf (though a little late), here's my utility for building Windows Python packages under Wine: https://github.com/sweptlaser/build-python-wine This took a little longer than I expected because I wanted to make sure that py2exe was working properly for some example projects (in addition to building wheels). So, with this project I have now tested building and running both wheels (bdist_wheel) and executables (py2exe) for Python 3.7 under Wine (for both 32-bit and 64-bit Windows). Please note that there are two issues that this script currently works around: 1) No chcp.exe ( https://bugs.winehq.org/show_bug.cgi?id=47960 ) 2) The installer hangs creating a restore point ( possibly https://bugs.winehq.org/show_bug.cgi?id=46559 ) I've prepared a stub patch for the first one and the second _appears_ to be that wmic.exe does not yet support the system restore command. I'll upstream both of these once I have the restore point issue figured out (hopefully this next week). Hopefully others find this useful, questions and comments are always welcome. Best, Erich

1 0

[PATCH v2 0/3] d3d10 + d3dcompiler: unify reflection interface.
by Connor McAdams 25 Oct '19

25 Oct '19

Ignore first patch series, it was missing memcpy for GetInputParameterDesc/GetOutputParameterDesc. This series of patches moves the reflection interface for d3d10 into the already existing d3d11 reflection interface within d3dcompiler_43. This is done using ifdef's. If this is not preferable, please let me know, and I'll change it to whatever considered the best option. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Connor McAdams (3): D3D10: Add d3dcompiler_43 PARENTSRC to d3d10 d3dcompiler: unify d3d11 + d3d10 reflection ifaces d3d10+d3dcompiler: Move d3d10 reflection into d3dcompiler dlls/d3d10/Makefile.in | 19 +++++ dlls/d3d10/d3d10_main.c | 19 +---- dlls/d3d10/d3d10_private.h | 10 +-- dlls/d3d10/effect.c | 12 +-- dlls/d3d10/shader.c | 112 ---------------------------- dlls/d3d10/utils.c | 4 +- dlls/d3dcompiler_43/reflection.c | 123 ++++++++++++++++++++++++------- include/d3dcompiler.h | 4 + 8 files changed, 131 insertions(+), 172 deletions(-) -- 2.20.1

3 9

[PATCH 1/3] advapi32/tests: Clean up tests for duplicate service names.
by Zebediah Figura 25 Oct '19

25 Oct '19

Use our own services instead of relying on a system service, and account for differing Windows 10 behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/service.c | 67 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 6c78900bd4..123673022d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -203,10 +203,9 @@ static void test_create_delete_svc(void) static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; static const CHAR password [] = "secret"; - BOOL spooler_exists = FALSE; + char buffer[200]; + DWORD size; BOOL ret; - CHAR display[4096]; - DWORD display_size = sizeof(display); /* Get the username and turn it into an account to be used in some tests */ GetUserNameA(username, &user_size); @@ -356,42 +355,40 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* The service already exists (check first, just in case) */ - svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); - if (svc_handle1) + /* Test duplicate service names */ + svc_handle1 = CreateServiceA(scm_handle, "winetest_dupname", "winetest_display", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!!svc_handle1, "Failed to create service, error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname", NULL, 0, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle2, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_EXISTS, "Got wrong error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname2", "winetest_dupname", 0, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle2, "Expected failure\n"); + ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Got wrong error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname2", "winetest_display", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + if (svc_handle2) /* Win10 1709+ */ { - spooler_exists = TRUE; - CloseServiceHandle(svc_handle1); - SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, - SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure\n"); - ok(GetLastError() == ERROR_SERVICE_EXISTS, "Expected ERROR_SERVICE_EXISTS, got %d\n", GetLastError()); + size = sizeof(buffer); + ret = GetServiceKeyNameA(scm_handle, "winetest_display", buffer, &size); + ok(ret, "Failed to get key name, error %u\n", GetLastError()); + ok(!strcmp(buffer, "winetest_dupname"), "Got wrong name \"%s\"\n", buffer); + + ret = DeleteService(svc_handle2); + ok(ret, "Failed to delete service, error %u\n", GetLastError()); + CloseServiceHandle(svc_handle2); } else - skip("Spooler service doesn't exist\n"); + ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Got wrong error %u\n", GetLastError()); - /* To find an existing displayname we check the 'Spooler' service. Although the registry - * doesn't show DisplayName on NT4, this call will return a displayname which is equal - * to the servicename and can't be used as well for a new displayname. - */ - if (spooler_exists) - { - ret = GetServiceDisplayNameA(scm_handle, spooler, display, &display_size); - - if (!ret) - skip("Could not retrieve a displayname for the Spooler service\n"); - else - { - svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, - SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure for display name '%s'\n", display); - ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, - "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); - } - } - else - skip("Could not retrieve a displayname (Spooler service doesn't exist)\n"); + ret = DeleteService(svc_handle1); + ok(ret, "Failed to delete service, error %u\n", GetLastError()); + CloseServiceHandle(svc_handle1); /* Windows doesn't care about the access rights for creation (which makes * sense as there is no service yet) as long as there are sufficient -- 2.20.1

1 2

[PATCH vkd3d v2] vkd3d: Do not report a root signature version higher than requested.
by Rémi Bernon 25 Oct '19

25 Oct '19

This fixes Shadow of the Tomb Raider crashing because of NULL root signatures being passed since c002aee119b638d30eeb7cdc91099449ccafeafc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add related test cases. libs/vkd3d/device.c | 3 ++- tests/d3d12.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d30c447c..30cee112 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2512,7 +2512,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + TRACE("Root signature requested %#x.\n", data->HighestVersion); + data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1); TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; diff --git a/tests/d3d12.c b/tests/d3d12.c index 9fe47c6c..7bc8baef 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1026,6 +1026,7 @@ static void test_check_feature_support(void) D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_FORMAT_INFO format_info; + D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; unsigned int expected_plane_count; ID3D12Device *device; DXGI_FORMAT format; @@ -1213,6 +1214,23 @@ static void test_check_feature_support(void) trace("GPU virtual address bits per process: %u.\n", gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Unexpected %d root signature feature version returned.\n", + root_signature.HighestVersion); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0 || + root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_1, + "Unexpected %d root signature feature version returned.\n", + root_signature.HighestVersion); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.24.0.rc0

1 0

[PATCH v2 4/4] winex11.drv: Handle display device events in the desktop thread.
by Zhiyi Zhang 25 Oct '19

25 Oct '19

This fixes a regression from 22795243b2d21e1a667215f54c3a15634735749c, which calls thread_init_display() and eventually XOpenIM() before X11DRV_InitXIM() is called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 5 +++++ dlls/winex11.drv/xinerama.c | 1 + dlls/winex11.drv/xrandr.c | 35 +++++++++++++++++++++++------------ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 5b0b062ff6..e351484e31 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -243,6 +243,12 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +void X11DRV_DisplayDevices_RegisterEventHandlers(void) +{ + if (handler.register_event_handlers) + handler.register_event_handlers(); +} + /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..f3c6a1b3cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1833,6 +1833,7 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) XFlush( data->display ); SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); X11DRV_InitClipboard(); + X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a06cf3ffd8..35e27334db 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -743,10 +743,15 @@ struct x11drv_display_device_handler /* free_monitors will be called to free a monitor list from get_monitors */ void (*free_monitors)(struct x11drv_monitor *monitors); + + /* register_event_handlers will be called to register event handlers. + * This function pointer is optional and can be NULL when driver doesn't support it */ + void (*register_event_handlers)(void); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b5620d3403..57c77d6273 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -344,5 +344,6 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.free_gpus = xinerama_free_gpus; handler.free_adapters = xinerama_free_adapters; handler.free_monitors = xinerama_free_monitors; + handler.register_event_handlers = NULL; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 412400e3f6..0a64613fac 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1063,10 +1063,29 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } -static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { - X11DRV_DisplayDevices_Init( TRUE ); - return TRUE; + if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) + X11DRV_DisplayDevices_Init( TRUE ); + return FALSE; +} + +static void xrandr14_register_event_handlers(void) +{ + Display *display = thread_init_display(); + int event_base, error_base; + + if (!pXRRQueryExtension( display, &event_base, &error_base )) + return; + + pXRRSelectInput( display, root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask ); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_handler, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_handler, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_handler, + "XRandR ProviderChange" ); } #endif @@ -1115,16 +1134,8 @@ void X11DRV_XRandR_Init(void) handler.free_gpus = xrandr14_free_gpus; handler.free_adapters = xrandr14_free_adapters; handler.free_monitors = xrandr14_free_monitors; + handler.register_event_handlers = xrandr14_register_event_handlers; X11DRV_DisplayDevices_SetHandler( &handler ); - - pXRRSelectInput( thread_init_display(), root_window, - RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); - X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, - "XRandR CrtcChange" ); - X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, - "XRandR OutputChange" ); - X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, - "XRandR ProviderChange" ); } #endif } -- 2.23.0

1 0

[PATCH v2 2/4] winex11.drv: Use underscore style for struct x11drv_display_device_handler.
by Zhiyi Zhang 25 Oct '19

25 Oct '19

Now look back at the surrounding code, underscore style is more fitting. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 16 ++++++++-------- dlls/winex11.drv/x11drv.h | 26 +++++++++++++------------- dlls/winex11.drv/xinerama.c | 12 ++++++------ dlls/winex11.drv/xrandr.c | 12 ++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 107719a26f..6c4097a790 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -470,7 +470,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ - if (!handler.pGetGpus(&gpus, &gpu_count)) + if (!handler.get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); @@ -480,13 +480,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; /* Initialize adapters */ - if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + if (!handler.get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { - if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + if (!handler.get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); @@ -502,12 +502,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); monitors = NULL; video_index++; } - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); adapters = NULL; } @@ -522,9 +522,9 @@ done: ReleaseMutex(mutex); CloseHandle(mutex); if (gpus) - handler.pFreeGpus(gpus); + handler.free_gpus(gpus); if (adapters) - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); if (monitors) - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5e9dfc9f7..a06cf3ffd8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -715,34 +715,34 @@ struct x11drv_display_device_handler /* A name to tell what host driver is used */ const char *name; - /* Higher priority can override handlers with lower proprity */ + /* Higher priority can override handlers with lower priority */ INT priority; - /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + /* get_gpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + BOOL (*get_gpus)(struct x11drv_gpu **gpus, int *count); - /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + /* get_adapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. * The first adapter has to be primary if GPU is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + BOOL (*get_adapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); - /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + /* get_monitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. * The first monitor has to be primary if adapter is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + BOOL (*get_monitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); - /* pFreeGpus will be called to free a GPU list from pGetGpus */ - void (*pFreeGpus)(struct x11drv_gpu *gpus); + /* free_gpus will be called to free a GPU list from get_gpus */ + void (*free_gpus)(struct x11drv_gpu *gpus); - /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ - void (*pFreeAdapters)(struct x11drv_adapter *adapters); + /* free_adapters will be called to free an adapter list from get_adapters */ + void (*free_adapters)(struct x11drv_adapter *adapters); - /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ - void (*pFreeMonitors)(struct x11drv_monitor *monitors); + /* free_monitors will be called to free a monitor list from get_monitors */ + void (*free_monitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 61c422e835..b5620d3403 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -338,11 +338,11 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.name = desktop_mode ? "Desktop" : "Xinerama"; handler.priority = desktop_mode ? 1000 : 100; - handler.pGetGpus = xinerama_get_gpus; - handler.pGetAdapters = xinerama_get_adapters; - handler.pGetMonitors = xinerama_get_monitors; - handler.pFreeGpus = xinerama_free_gpus; - handler.pFreeAdapters = xinerama_free_adapters; - handler.pFreeMonitors = xinerama_free_monitors; + handler.get_gpus = xinerama_get_gpus; + handler.get_adapters = xinerama_get_adapters; + handler.get_monitors = xinerama_get_monitors; + handler.free_gpus = xinerama_free_gpus; + handler.free_adapters = xinerama_free_adapters; + handler.free_monitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 85da5efea3..412400e3f6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1109,12 +1109,12 @@ void X11DRV_XRandR_Init(void) { handler.name = "XRandR 1.4"; handler.priority = 200; - handler.pGetGpus = xrandr14_get_gpus; - handler.pFreeGpus = xrandr14_free_gpus; - handler.pGetAdapters = xrandr14_get_adapters; - handler.pFreeAdapters = xrandr14_free_adapters; - handler.pGetMonitors = xrandr14_get_monitors; - handler.pFreeMonitors = xrandr14_free_monitors; + handler.get_gpus = xrandr14_get_gpus; + handler.get_adapters = xrandr14_get_adapters; + handler.get_monitors = xrandr14_get_monitors; + handler.free_gpus = xrandr14_free_gpus; + handler.free_adapters = xrandr14_free_adapters; + handler.free_monitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); pXRRSelectInput( thread_init_display(), root_window, -- 2.23.0

1 0