Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[ekohl] 71449: [SERVICES] Prepare service logon.
by ekohl＠svn.reactos.org 28 May '16

28 May '16

Author: ekohl Date: Sat May 28 21:56:56 2016 New Revision: 71449 URL: http://svn.reactos.org/svn/reactos?rev=71449&view=rev Log: [SERVICES] Prepare service logon. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat May 28 21:56:56 2016 @@ -140,9 +140,9 @@ CurrentImage = CONTAINING_RECORD(ImageEntry, SERVICE_IMAGE, ImageListEntry); - if (_wcsicmp(CurrentImage->szImagePath, lpImagePath) == 0) - { - DPRINT("Found image: '%S'\n", CurrentImage->szImagePath); + if (_wcsicmp(CurrentImage->pszImagePath, lpImagePath) == 0) + { + DPRINT("Found image: '%S'\n", CurrentImage->pszImagePath); return CurrentImage; } @@ -153,21 +153,114 @@ return NULL; +} + + +static +BOOL +ScmIsSameServiceAccount( + IN PWSTR pszAccountName1, + IN PWSTR pszAccountName2) +{ + if ((pszAccountName1 == NULL && pszAccountName2 == NULL) || + (pszAccountName1 == NULL && wcscmp(pszAccountName2, L"LocalSystem") == 0) || + (pszAccountName2 == NULL && wcscmp(pszAccountName1, L"LocalSystem") == 0) || + (wcscmp(pszAccountName1, pszAccountName2) == 0)) + return TRUE; + + return FALSE; +} + + +static +BOOL +ScmIsLocalSystemAccount( + IN PWSTR pszAccountName) +{ + if (pszAccountName == NULL || + wcscmp(pszAccountName, L"LocalSystem") == 0) + return TRUE; + + return FALSE; +} + + +static +DWORD +ScmLogonService( + IN PSERVICE pService, + IN PSERVICE_IMAGE pImage) +{ + PWSTR pUserName = NULL; + PWSTR pDomainName = NULL; + PWSTR ptr; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("ScmLogonService()\n"); + + DPRINT("Service %S\n", pService->lpServiceName); + + if (ScmIsLocalSystemAccount(pImage->pszAccountName)) + return ERROR_SUCCESS; + + ptr = wcschr(pImage->pszAccountName, L'\\'); + if (ptr != NULL) + { + *ptr = 0; + + pUserName = ptr + 1; + pDomainName = pImage->pszAccountName; + } + else + { + pUserName = pImage->pszAccountName; + pDomainName = NULL; + } + + if (pDomainName == NULL || wcscmp(pDomainName, L".") == 0) + { + // pDomainName = computer name + } + + DPRINT("Domain: %S User: %S\n", pDomainName, pUserName); + + /* FIXME */ +#if 0 + if (!LogonUserW(pUserName, + pDomainName, + L"", // lpszPassword, + LOGON32_LOGON_SERVICE, + LOGON32_PROVIDER_DEFAULT, + &pImage->hToken)) + { + dwError = GetLastError(); + DPRINT1("LogonUserW() failed (Error %lu)\n", dwError); + } +#endif + + if (ptr != NULL) + *ptr = L'\\'; + + return dwError; } static DWORD ScmCreateOrReferenceServiceImage(PSERVICE pService) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING ImagePath; + UNICODE_STRING ObjectName; PSERVICE_IMAGE pServiceImage = NULL; NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; + DWORD dwRecordSize; + LPWSTR pString; DPRINT("ScmCreateOrReferenceServiceImage(%p)\n", pService); RtlInitUnicodeString(&ImagePath, NULL); + RtlInitUnicodeString(&ObjectName, NULL); /* Get service data */ RtlZeroMemory(&QueryTable, @@ -176,6 +269,9 @@ QueryTable[0].Name = L"ImagePath"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; QueryTable[0].EntryContext = &ImagePath; + QueryTable[1].Name = L"ObjectName"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ObjectName; Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, pService->lpServiceName, @@ -189,14 +285,19 @@ } DPRINT("ImagePath: '%wZ'\n", &ImagePath); + DPRINT("ObjectName: '%wZ'\n", &ObjectName); pServiceImage = ScmGetServiceImageByImagePath(ImagePath.Buffer); if (pServiceImage == NULL) { + dwRecordSize = sizeof(SERVICE_IMAGE) + + ImagePath.Length + sizeof(WCHAR) + + ((ObjectName.Length != 0) ? (ObjectName.Length + sizeof(WCHAR)) : 0); + /* Create a new service image */ pServiceImage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - FIELD_OFFSET(SERVICE_IMAGE, szImagePath[ImagePath.Length / sizeof(WCHAR) + 1])); + dwRecordSize); if (pServiceImage == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; @@ -206,11 +307,30 @@ pServiceImage->dwImageRunCount = 1; pServiceImage->hControlPipe = INVALID_HANDLE_VALUE; + pString = (PWSTR)((INT_PTR)pServiceImage + sizeof(SERVICE_IMAGE)); + /* Set the image path */ - wcscpy(pServiceImage->szImagePath, + pServiceImage->pszImagePath = pString; + wcscpy(pServiceImage->pszImagePath, ImagePath.Buffer); - RtlFreeUnicodeString(&ImagePath); + /* Set the account name */ + if (ObjectName.Length > 0) + { + pString = pString + wcslen(pString) + 1; + + pServiceImage->pszAccountName = pString; + wcscpy(pServiceImage->pszAccountName, + ObjectName.Buffer); + } + + /* Service logon */ + dwError = ScmLogonService(pService, pServiceImage); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmLogonService() failed (Error %lu)\n", dwError); + goto done; + } /* Create the control pipe */ dwError = ScmCreateNewControlPipe(pServiceImage); @@ -229,16 +349,28 @@ } else { +// if ((lpService->Status.dwServiceType & SERVICE_WIN32_SHARE_PROCESS) == 0) + + /* Fail if services in an image use different accounts */ + if (!ScmIsSameServiceAccount(pServiceImage->pszAccountName, ObjectName.Buffer)) + { + dwError = ERROR_DIFFERENT_SERVICE_ACCOUNT; + goto done; + } + /* Increment the run counter */ pServiceImage->dwImageRunCount++; } + DPRINT("pServiceImage->pszImagePath: %S\n", pServiceImage->pszImagePath); + DPRINT("pServiceImage->pszAccountName: %S\n", pServiceImage->pszAccountName); DPRINT("pServiceImage->dwImageRunCount: %lu\n", pServiceImage->dwImageRunCount); /* Link the service image to the service */ pService->lpImage = pServiceImage; -done:; +done: + RtlFreeUnicodeString(&ObjectName); RtlFreeUnicodeString(&ImagePath); DPRINT("ScmCreateOrReferenceServiceImage() done (Error: %lu)\n", dwError); @@ -262,6 +394,10 @@ /* Remove the service image from the list */ RemoveEntryList(&pServiceImage->ImageListEntry); + + /* Close the logon token */ + if (pServiceImage->hToken != NULL) + CloseHandle(pServiceImage->hToken); /* Close the control pipe */ if (pServiceImage->hControlPipe != INVALID_HANDLE_VALUE) @@ -1566,16 +1702,17 @@ StartupInfo.cb = sizeof(StartupInfo); ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); - Result = CreateProcessW(NULL, - Service->lpImage->szImagePath, - NULL, - NULL, - FALSE, - DETACHED_PROCESS | CREATE_SUSPENDED, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); + Result = CreateProcessAsUserW(Service->lpImage->hToken, + NULL, + Service->lpImage->pszImagePath, + NULL, + NULL, + FALSE, + DETACHED_PROCESS | CREATE_SUSPENDED, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); if (!Result) { dwError = GetLastError(); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat May 28 21:56:56 2016 @@ -1992,6 +1992,7 @@ goto done; } + /* Set the tag */ if (lpdwTagId != NULL) { dwError = ScmAssignNewTag(lpService); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sat May 28 21:56:56 2016 @@ -43,13 +43,14 @@ typedef struct _SERVICE_IMAGE { LIST_ENTRY ImageListEntry; + LPWSTR pszImagePath; + LPWSTR pszAccountName; DWORD dwImageRunCount; HANDLE hControlPipe; HANDLE hProcess; DWORD dwProcessId; - - WCHAR szImagePath[1]; + HANDLE hToken; } SERVICE_IMAGE, *PSERVICE_IMAGE;

1 0

[mjansen] 71448: [APPHELP_APITEST] Update embedded database to actually match the embedded exe again.
by mjansen＠svn.reactos.org 28 May '16

28 May '16

Author: mjansen Date: Sat May 28 21:46:24 2016 New Revision: 71448 URL: http://svn.reactos.org/svn/reactos?rev=71448&view=rev Log: [APPHELP_APITEST] Update embedded database to actually match the embedded exe again. Modified: trunk/rostests/apitests/apphelp/apphelp.c trunk/rostests/apitests/apphelp/data.c trunk/rostests/apitests/apphelp/db.c Modified: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Sat May 28 21:46:24 2016 @@ -1,7 +1,7 @@ /* * Copyright 2012 Detlef Riekenberg * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2016 Mark Jansen + * Copyright 2015,2016 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -131,7 +131,6 @@ DEFINE_GUID(GUID_DATABASE_MSI,0xd8ff6d16,0x6a3a,0x468a,0x8b,0x44,0x01,0x71,0x4d,0xdc,0x49,0xea); DEFINE_GUID(GUID_DATABASE_SHIM,0x11111111,0x1111,0x1111,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11); DEFINE_GUID(GUID_DATABASE_DRIVERS,0xf9ab2228,0x3312,0x4a73,0xb6,0xf9,0x93,0x6d,0x70,0xe1,0x12,0xef); -DEFINE_GUID(GUID_DATABASE_TEST,0x6E989AB7,0x864D,0x4575,0x87,0x34,0x90,0x36,0x4A,0xC6,0x4F,0xBD); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(test_UserAssist, 0xdd313e04, 0xfeff, 0x11d1, 0x8e, 0xcd, 0x00, 0x00, 0xf8, 0x7a, 0x47, 0x0c); Modified: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/apphelp/data.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Sat May 28 21:46:24 2016 @@ -586,8 +586,8 @@ 0x03, 0x78, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x38, 0x04, 0x70, 0x03, 0x38, 0x01, 0x60, 0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x26, 0x00, 0x00, 0x00, 0x02, 0x38, 0x0D, 0x70, 0x03, 0x38, 0x15, 0x40, 0x01, 0x98, - 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x74, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x74, 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x04, 0x00, 0x00, 0x03, 0x78, 0x14, 0x00, 0x00, 0x00, 0x02, 0x38, 0x10, 0x70, 0x03, 0x38, 0x01, 0x60, 0x16, 0x40, 0x01, 0x00, 0x00, 0x00, 0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x0E, 0x00, 0x00, 0x00, @@ -596,27 +596,27 @@ 0x03, 0x38, 0x04, 0x90, 0x16, 0x40, 0x01, 0x00, 0x00, 0x00, 0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x3E, 0x00, 0x00, 0x00, 0x02, 0x38, 0x07, 0x70, 0x03, 0x38, 0x04, 0x90, 0x01, 0x98, 0x30, 0x00, 0x00, 0x00, - 0xB5, 0x16, 0xDD, 0x96, 0xC9, 0x6B, 0xC5, 0x04, 0x7C, 0x03, 0x00, 0x00, - 0xCA, 0xA0, 0x3C, 0x5A, 0xDD, 0xFC, 0x99, 0x19, 0xC6, 0x01, 0x00, 0x00, - 0x72, 0xC6, 0xBB, 0xB9, 0x20, 0x71, 0xE3, 0x27, 0xEC, 0x02, 0x00, 0x00, - 0xBF, 0x27, 0xFB, 0xFF, 0x09, 0xB0, 0x4D, 0x8E, 0x56, 0x02, 0x00, 0x00, - 0x01, 0x70, 0x42, 0x03, 0x00, 0x00, 0x01, 0x50, 0x3E, 0x96, 0x3F, 0x00, - 0xE6, 0xF3, 0xD0, 0x01, 0x22, 0x60, 0x06, 0x00, 0x00, 0x00, 0x01, 0x60, + 0xED, 0xB4, 0x89, 0x50, 0xB1, 0xA4, 0x82, 0xA7, 0xEC, 0x02, 0x00, 0x00, + 0x85, 0x2B, 0x88, 0x40, 0x97, 0x76, 0xA6, 0xC4, 0xC6, 0x01, 0x00, 0x00, + 0x77, 0x7A, 0xBF, 0x48, 0x78, 0xB1, 0x69, 0xD2, 0x56, 0x02, 0x00, 0x00, + 0xD0, 0x15, 0xE6, 0xCB, 0xE8, 0x90, 0x68, 0xFE, 0x7C, 0x03, 0x00, 0x00, + 0x01, 0x70, 0x42, 0x03, 0x00, 0x00, 0x01, 0x50, 0x3E, 0xD6, 0xC0, 0x02, + 0x1A, 0xB9, 0xD1, 0x01, 0x22, 0x60, 0x06, 0x00, 0x00, 0x00, 0x01, 0x60, 0x1C, 0x00, 0x00, 0x00, 0x23, 0x40, 0x01, 0x00, 0x00, 0x00, 0x07, 0x90, - 0x10, 0x00, 0x00, 0x00, 0xB7, 0x9A, 0x98, 0x6E, 0x4D, 0x86, 0x75, 0x45, - 0x87, 0x34, 0x90, 0x36, 0x4A, 0xC6, 0x4F, 0xBD, 0x02, 0x70, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0xB0, 0x0E, 0x9B, 0xE3, 0xDB, 0x55, 0x0B, 0x45, + 0x9B, 0xD4, 0xD2, 0x0C, 0x94, 0x84, 0x26, 0x0F, 0x02, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x3E, 0x00, 0x00, 0x00, 0x09, 0x70, 0x26, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x00, - 0x00, 0x00, 0x08, 0x60, 0x82, 0x00, 0x00, 0x00, 0x03, 0x70, 0x08, 0x00, - 0x00, 0x00, 0x01, 0x10, 0x03, 0x60, 0xA0, 0x00, 0x00, 0x00, 0x03, 0x70, - 0x06, 0x00, 0x00, 0x00, 0x03, 0x60, 0xBE, 0x00, 0x00, 0x00, 0x07, 0x70, + 0x00, 0x00, 0x08, 0x60, 0x82, 0x00, 0x00, 0x00, 0x03, 0x70, 0x06, 0x00, + 0x00, 0x00, 0x03, 0x60, 0xA0, 0x00, 0x00, 0x00, 0x03, 0x70, 0x08, 0x00, + 0x00, 0x00, 0x01, 0x10, 0x03, 0x60, 0xBE, 0x00, 0x00, 0x00, 0x07, 0x70, 0x8A, 0x00, 0x00, 0x00, 0x01, 0x60, 0xDC, 0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x01, 0x00, 0x00, 0x05, 0x60, 0x2C, 0x01, 0x00, 0x00, 0x04, 0x90, - 0x10, 0x00, 0x00, 0x00, 0x52, 0x35, 0x26, 0x1A, 0x04, 0xE9, 0xB2, 0x41, - 0x98, 0x95, 0x1A, 0x40, 0xD9, 0x15, 0x2B, 0x58, 0x0D, 0x70, 0x24, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x3F, 0xC9, 0x50, 0x4E, 0x63, 0xB8, 0xFA, 0x4D, + 0xBA, 0xE2, 0xD8, 0x0E, 0xF4, 0xCE, 0x5C, 0x89, 0x0D, 0x70, 0x24, 0x00, 0x00, 0x00, 0x17, 0x40, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x01, 0x00, - 0x00, 0x00, 0x15, 0x40, 0x04, 0x00, 0x00, 0x00, 0x24, 0x40, 0x78, 0x00, - 0x30, 0x00, 0x25, 0x40, 0x22, 0x00, 0x20, 0x00, 0x26, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x15, 0x40, 0x01, 0x00, 0x00, 0x00, 0x24, 0x40, 0x72, 0x00, + 0x6F, 0x00, 0x25, 0x40, 0x67, 0x00, 0x72, 0x00, 0x26, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, 0x00, 0x00, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x13, 0x60, 0xB8, 0x01, @@ -624,21 +624,21 @@ 0x0D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x70, 0x90, 0x00, 0x00, 0x00, 0x01, 0x60, 0xCE, 0x01, 0x00, 0x00, 0x06, 0x60, 0xF8, 0x01, 0x00, 0x00, 0x05, 0x60, 0x2A, 0x02, 0x00, 0x00, 0x04, 0x90, - 0x10, 0x00, 0x00, 0x00, 0x2D, 0xE0, 0x94, 0xAE, 0x00, 0x63, 0xE3, 0x4E, - 0x92, 0xC7, 0x6F, 0x51, 0x09, 0xD3, 0xAE, 0xC0, 0x0D, 0x70, 0x24, 0x00, + 0x10, 0x00, 0x00, 0x00, 0xE1, 0x20, 0x67, 0x15, 0x98, 0xEF, 0x04, 0x4D, + 0x96, 0x5A, 0xD8, 0x5D, 0xE0, 0x5E, 0x6D, 0x9F, 0x0D, 0x70, 0x24, 0x00, 0x00, 0x00, 0x17, 0x40, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x02, 0x00, - 0x00, 0x00, 0x15, 0x40, 0x03, 0x00, 0x00, 0x00, 0x24, 0x40, 0x65, 0x00, - 0x20, 0x00, 0x25, 0x40, 0x00, 0x00, 0x00, 0x00, 0x26, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x15, 0x40, 0x02, 0x00, 0x00, 0x00, 0x24, 0x40, 0x20, 0x00, + 0x32, 0x00, 0x25, 0x40, 0x2E, 0x00, 0x38, 0x00, 0x26, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x70, 0x38, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, 0x00, 0x00, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x50, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0B, 0x40, 0x48, 0x18, 0x00, 0x00, 0x13, 0x60, + 0x00, 0x00, 0x01, 0x00, 0x0B, 0x40, 0xAD, 0xBA, 0x00, 0x00, 0x13, 0x60, 0xB8, 0x01, 0x00, 0x00, 0x07, 0x70, 0x8A, 0x00, 0x00, 0x00, 0x01, 0x60, 0x60, 0x02, 0x00, 0x00, 0x06, 0x60, 0x80, 0x02, 0x00, 0x00, 0x05, 0x60, - 0x9E, 0x02, 0x00, 0x00, 0x04, 0x90, 0x10, 0x00, 0x00, 0x00, 0xC0, 0x58, - 0x69, 0x5B, 0x84, 0x60, 0x7B, 0x4F, 0xB2, 0x9E, 0xD2, 0xE2, 0xA4, 0x11, - 0x98, 0x68, 0x08, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, + 0x9E, 0x02, 0x00, 0x00, 0x04, 0x90, 0x10, 0x00, 0x00, 0x00, 0x69, 0xEF, + 0x70, 0xCE, 0x1D, 0xA2, 0x8B, 0x40, 0x84, 0x5B, 0xF9, 0x9E, 0xAC, 0x06, + 0x09, 0xE7, 0x08, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, 0x00, 0x00, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x50, 0x01, 0x00, 0x00, 0x00, @@ -648,28 +648,28 @@ 0x0C, 0x00, 0x00, 0x00, 0x01, 0x60, 0x3E, 0x00, 0x00, 0x00, 0x1A, 0x40, 0x8E, 0x01, 0x00, 0x00, 0x07, 0x70, 0xCE, 0x00, 0x00, 0x00, 0x01, 0x60, 0xEC, 0x02, 0x00, 0x00, 0x06, 0x60, 0x0E, 0x03, 0x00, 0x00, 0x05, 0x60, - 0x26, 0x03, 0x00, 0x00, 0x04, 0x90, 0x10, 0x00, 0x00, 0x00, 0x36, 0x9B, - 0x3E, 0x8A, 0xD0, 0xAF, 0xD0, 0x42, 0x83, 0x8D, 0xE3, 0x1C, 0x19, 0xC4, - 0x15, 0x46, 0x08, 0x70, 0x94, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, - 0x00, 0x00, 0x01, 0x40, 0x00, 0x08, 0x00, 0x00, 0x03, 0x40, 0xFE, 0x26, - 0x08, 0x55, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, + 0x26, 0x03, 0x00, 0x00, 0x04, 0x90, 0x10, 0x00, 0x00, 0x00, 0x44, 0xD1, + 0xEA, 0xB4, 0x40, 0xF6, 0x4B, 0x4E, 0x94, 0xC4, 0x0C, 0x7F, 0xA8, 0x66, + 0x23, 0xB0, 0x08, 0x70, 0x94, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, + 0x00, 0x00, 0x01, 0x40, 0x00, 0x08, 0x00, 0x00, 0x03, 0x40, 0x29, 0xD6, + 0x8B, 0x17, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x12, 0x60, 0x42, 0x03, 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x40, 0x03, 0x00, 0x00, 0x00, 0x09, 0x40, 0x04, 0x00, 0x00, 0x00, 0x0A, 0x40, - 0x01, 0x00, 0x00, 0x00, 0x0B, 0x40, 0x48, 0x18, 0x00, 0x00, 0x1C, 0x40, - 0x00, 0x00, 0x00, 0x00, 0x13, 0x60, 0xB8, 0x01, 0x00, 0x00, 0x14, 0x60, + 0x01, 0x00, 0x00, 0x00, 0x0B, 0x40, 0xAD, 0xBA, 0x00, 0x00, 0x1C, 0x40, + 0x02, 0x00, 0x04, 0x00, 0x13, 0x60, 0xB8, 0x01, 0x00, 0x00, 0x14, 0x60, 0x68, 0x03, 0x00, 0x00, 0x15, 0x60, 0x90, 0x03, 0x00, 0x00, 0x16, 0x60, 0xB0, 0x03, 0x00, 0x00, 0x06, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x1D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x40, 0x00, 0x00, 0x00, 0x00, + 0x1D, 0x40, 0x45, 0x23, 0x01, 0x00, 0x1E, 0x40, 0x45, 0x23, 0x01, 0x00, 0x0B, 0x70, 0x06, 0x00, 0x00, 0x00, 0x01, 0x60, 0xD4, 0x03, 0x00, 0x00, - 0x0D, 0x70, 0x1E, 0x00, 0x00, 0x00, 0x15, 0x40, 0x04, 0x00, 0x00, 0x00, + 0x0D, 0x70, 0x1E, 0x00, 0x00, 0x00, 0x15, 0x40, 0x02, 0x00, 0x00, 0x00, 0x0E, 0x70, 0x06, 0x00, 0x00, 0x00, 0x19, 0x60, 0xEC, 0x03, 0x00, 0x00, - 0x1B, 0x60, 0x00, 0x01, 0x00, 0x00, 0x18, 0x60, 0x24, 0x04, 0x00, 0x00, - 0x0D, 0x70, 0x1E, 0x00, 0x00, 0x00, 0x15, 0x40, 0x03, 0x00, 0x00, 0x00, - 0x0E, 0x70, 0x06, 0x00, 0x00, 0x00, 0x19, 0x60, 0x3E, 0x04, 0x00, 0x00, - 0x1B, 0x60, 0xF8, 0x01, 0x00, 0x00, 0x18, 0x60, 0x7C, 0x04, 0x00, 0x00, + 0x1B, 0x60, 0xF8, 0x01, 0x00, 0x00, 0x18, 0x60, 0x2A, 0x04, 0x00, 0x00, + 0x0D, 0x70, 0x1E, 0x00, 0x00, 0x00, 0x15, 0x40, 0x01, 0x00, 0x00, 0x00, + 0x0E, 0x70, 0x06, 0x00, 0x00, 0x00, 0x19, 0x60, 0x4A, 0x04, 0x00, 0x00, + 0x1B, 0x60, 0x00, 0x01, 0x00, 0x00, 0x18, 0x60, 0x82, 0x04, 0x00, 0x00, 0x01, 0x78, 0x96, 0x04, 0x00, 0x00, 0x01, 0x88, 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x2E, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00, 0x33, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1C, 0x00, 0x00, 0x00, 0x61, 0x00, @@ -683,10 +683,10 @@ 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x79, 0x00, 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x54, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x41, 0x00, 0x63, 0x00, 0x74, 0x00, 0x69, 0x00, 0x76, 0x00, - 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x69, 0x00, - 0x6E, 0x00, 0x63, 0x00, 0x6C, 0x00, 0x75, 0x00, 0x64, 0x00, 0x65, 0x00, + 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x65, 0x00, + 0x78, 0x00, 0x63, 0x00, 0x6C, 0x00, 0x75, 0x00, 0x64, 0x00, 0x65, 0x00, 0x2E, 0x00, 0x64, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x01, 0x88, - 0x18, 0x00, 0x00, 0x00, 0x65, 0x00, 0x78, 0x00, 0x63, 0x00, 0x6C, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x63, 0x00, 0x6C, 0x00, 0x75, 0x00, 0x64, 0x00, 0x65, 0x00, 0x2E, 0x00, 0x64, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1E, 0x00, 0x00, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x5F, 0x00, 0x61, 0x00, 0x6C, 0x00, @@ -753,25 +753,25 @@ 0x43, 0x00, 0x6F, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x00, 0x00, 0x01, 0x88, 0x12, 0x00, 0x00, 0x00, 0x57, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x53, 0x00, 0x72, 0x00, - 0x76, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00, 0x01, 0x88, 0x32, 0x00, + 0x76, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00, 0x01, 0x88, 0x38, 0x00, 0x00, 0x00, 0x68, 0x00, 0x74, 0x00, 0x74, 0x00, 0x70, 0x00, 0x3A, 0x00, 0x2F, 0x00, 0x2F, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x63, 0x00, 0x74, 0x00, 0x6F, 0x00, 0x73, 0x00, 0x2E, 0x00, 0x6F, 0x00, 0x72, 0x00, - 0x67, 0x00, 0x2F, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, - 0x77, 0x00, 0x00, 0x00, 0x01, 0x88, 0x14, 0x00, 0x00, 0x00, 0x41, 0x00, - 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x20, 0x00, 0x69, 0x00, - 0x74, 0x00, 0x21, 0x00, 0x00, 0x00, 0x01, 0x88, 0x38, 0x00, 0x00, 0x00, + 0x67, 0x00, 0x2F, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, + 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x1A, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x20, 0x00, + 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x65, 0x00, + 0x64, 0x00, 0x21, 0x00, 0x00, 0x00, 0x01, 0x88, 0x32, 0x00, 0x00, 0x00, 0x68, 0x00, 0x74, 0x00, 0x74, 0x00, 0x70, 0x00, 0x3A, 0x00, 0x2F, 0x00, 0x2F, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x63, 0x00, 0x74, 0x00, 0x6F, 0x00, 0x73, 0x00, 0x2E, 0x00, 0x6F, 0x00, 0x72, 0x00, 0x67, 0x00, - 0x2F, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x6C, 0x00, - 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1A, 0x00, - 0x00, 0x00, 0x4E, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, - 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x65, 0x00, 0x64, 0x00, + 0x2F, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, + 0x00, 0x00, 0x01, 0x88, 0x14, 0x00, 0x00, 0x00, 0x41, 0x00, 0x6C, 0x00, + 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x20, 0x00, 0x69, 0x00, 0x74, 0x00, 0x21, 0x00, 0x00, 0x00 }; -void test_create_db(const char* name) +void test_create_db_imp(const char* name) { HANDLE file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Sat May 28 21:46:24 2016 @@ -37,7 +37,9 @@ #include "wine/test.h" /* data.c */ -void test_create_db(const char* name); +void test_create_db_imp(const char* name); + +#define test_create_db (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_db_imp typedef WORD TAG; typedef DWORD TAGID; @@ -165,6 +167,9 @@ static BOOL (WINAPI *pSdbGetDatabaseID)(PDB, GUID*); static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); +DEFINE_GUID(GUID_DATABASE_TEST,0xe39b0eb0,0x55db,0x450b,0x9b,0xd4,0xd2,0x0c,0x94,0x84,0x26,0x0f); + + static void Write(HANDLE file, LPCVOID buffer, DWORD size) { DWORD dwWritten = 0; @@ -387,13 +392,13 @@ { char guid_str[50]; WideCharToMultiByte( CP_ACP, 0, guid_wstr, -1, guid_str, sizeof(guid_str), NULL, NULL ); - ok_str(guid_str, "{6e989ab7-864d-4575-8734-90364ac64fbd}"); + ok_str(guid_str, "{e39b0eb0-55db-450b-9bd4-d20c9484260f}"); } ok(pSdbGetDatabaseID(pdb, &guid2),"expected SdbGetDatabaseID not to fail.\n"); ok(IsEqualGUID(&guid, &guid2), "expected guids to be equal(%s:%s)\n", wine_dbgstr_guid(&guid), wine_dbgstr_guid(&guid2)); } } - match_qw_attr(pdb, root, TAG_TIME, 0x1d0f3e6003f963e); + match_qw_attr(pdb, root, TAG_TIME, 0x1d1b91a02c0d63e); match_str_attr(pdb, root, TAG_COMPILER_VERSION, "2.1.0.3"); match_str_attr(pdb, root, TAG_NAME, "apphelp_test1"); match_dw_attr(pdb, root, TAG_OS_PLATFORM, 1); @@ -420,8 +425,8 @@ return; is_include = pSdbFindFirstTag(pdb, inexclude, TAG_INCLUDE); - ok(is_include != TAGID_NULL, "Expected a valid include ref, got NULL\n"); - match_str_attr(pdb, inexclude, TAG_MODULE, "include.dll"); + ok(is_include == TAGID_NULL, "Expected a NULL include ref, but got one anyway.\n"); + match_str_attr(pdb, inexclude, TAG_MODULE, "exclude.dll"); inexclude = pSdbFindNextTag(pdb, shimref, inexclude); ok(inexclude != TAGID_NULL, "Expected a valid in/exclude ref, got NULL\n"); @@ -429,8 +434,8 @@ return; is_include = pSdbFindFirstTag(pdb, inexclude, TAG_INCLUDE); - ok(is_include == TAGID_NULL, "Expected a NULL include ref, but got one anyway.\n"); - match_str_attr(pdb, inexclude, TAG_MODULE, "exclude.dll"); + ok(is_include != TAGID_NULL, "Expected a valid include ref, got NULL\n"); + match_str_attr(pdb, inexclude, TAG_MODULE, "include.dll"); } static void check_matching_file(PDB pdb, TAGID exe, TAGID matching_file, int num) @@ -457,7 +462,7 @@ } if(num == 1 || num == 3) { - match_dw_attr(pdb, matching_file, TAG_PE_CHECKSUM, 0x1848); + match_dw_attr(pdb, matching_file, TAG_PE_CHECKSUM, 0xbaad); } if(num != 0) { @@ -467,17 +472,17 @@ if(num == 3) { match_dw_attr(pdb, matching_file, TAG_SIZE, 0x800); - match_dw_attr(pdb, matching_file, TAG_CHECKSUM, 0x550826fe); + match_dw_attr(pdb, matching_file, TAG_CHECKSUM, 0x178bd629); match_str_attr(pdb, matching_file, TAG_FILE_DESCRIPTION, "FileDescription"); match_dw_attr(pdb, matching_file, TAG_MODULE_TYPE, 3); match_dw_attr(pdb, matching_file, TAG_VERFILEOS, 4); match_dw_attr(pdb, matching_file, TAG_VERFILETYPE, 1); - match_dw_attr(pdb, matching_file, TAG_LINKER_VERSION, 0); + match_dw_attr(pdb, matching_file, TAG_LINKER_VERSION, 0x40002); match_str_attr(pdb, matching_file, TAG_ORIGINAL_FILENAME, "OriginalFilename"); match_str_attr(pdb, matching_file, TAG_INTERNAL_NAME, "InternalName"); match_str_attr(pdb, matching_file, TAG_LEGAL_COPYRIGHT, "LegalCopyright"); - match_dw_attr(pdb, matching_file, TAG_LINK_DATE, 0); - match_dw_attr(pdb, matching_file, TAG_UPTO_LINK_DATE, 0); + match_dw_attr(pdb, matching_file, TAG_LINK_DATE, 0x12345); + match_dw_attr(pdb, matching_file, TAG_UPTO_LINK_DATE, 0x12345); } if(num > 3) { @@ -515,9 +520,9 @@ */ match_dw_attr(pdb, apphelp, TAG_FLAGS, 1); match_dw_attr(pdb, apphelp, TAG_PROBLEMSEVERITY, 1); - match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, 4); - match_dw_attr(pdb, apphelp, TAG_APP_NAME_RC_ID, 0x300078); - match_dw_attr(pdb, apphelp, TAG_VENDOR_NAME_RC_ID, 0x200022); + match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, 1); + match_dw_attr(pdb, apphelp, TAG_APP_NAME_RC_ID, 0x6f0072); + match_dw_attr(pdb, apphelp, TAG_VENDOR_NAME_RC_ID, 0x720067); match_dw_attr(pdb, apphelp, TAG_SUMMARY_MSG_RC_ID, 0); } else @@ -536,9 +541,9 @@ */ match_dw_attr(pdb, apphelp, TAG_FLAGS, 1); match_dw_attr(pdb, apphelp, TAG_PROBLEMSEVERITY, 2); - match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, 3); - match_dw_attr(pdb, apphelp, TAG_APP_NAME_RC_ID, 0x200065); - match_dw_attr(pdb, apphelp, TAG_VENDOR_NAME_RC_ID, 0); + match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, 2); + match_dw_attr(pdb, apphelp, TAG_APP_NAME_RC_ID, 0x320020); + match_dw_attr(pdb, apphelp, TAG_VENDOR_NAME_RC_ID, 0x38002e); match_dw_attr(pdb, apphelp, TAG_SUMMARY_MSG_RC_ID, 0); } apphelp = pSdbFindNextTag(pdb, apphelp, apphelp); @@ -575,7 +580,7 @@ "test_allow.exe", "apphelp_name_allow", "apphelp_vendor_allow", - {0x1a263552,0xe904,0x41b2,{0x98,0x95,0x1a,0x40,0xd9,0x15,0x2b,0x58}}, + {0x4e50c93f,0xb863,0x4dfa,{0xba,0xe2,0xd8,0x0e,0xf4,0xce,0x5c,0x89}}, NULL, 0, 0x1c6, @@ -585,7 +590,7 @@ "test_disallow.exe", "apphelp_name_disallow", "apphelp_vendor_disallow", - {0xae94e02d,0x6300,0x4ee3,{0x92,0xc7,0x6f,0x51,0x09,0xd3,0xae,0xc0}}, + {0x156720e1,0xef98,0x4d04,{0x96,0x5a,0xd8,0x5d,0xe0,0x5e,0x6d,0x9f}}, NULL, 0, 0x256, @@ -595,7 +600,7 @@ "test_new.exe", "fixnew_name", "fixnew_vendor", - {0x5b6958c0,0x6084,0x4f7b,{0xb2,0x9e,0xd2,0xe2,0xa4,0x11,0x98,0x68}}, + {0xce70ef69,0xa21d,0x408b,{0x84,0x5b,0xf9,0x9e,0xac,0x06,0x09,0xe7}}, "test_checkfile.txt", 1, 0x2ec, @@ -605,7 +610,7 @@ "test_w2k3.exe", "fix_name", "fix_vendor", - {0x8a3e9b36,0xafd0,0x42d0,{0x83,0x8d,0xe3,0x1c,0x19,0xc4,0x15,0x46}}, + {0xb4ead144,0xf640,0x4e4b,{0x94,0xc4,0x0c,0x7f,0xa8,0x66,0x23,0xb0}}, NULL, 0, 0x37c, @@ -664,16 +669,16 @@ const char* apphelp_details; } test_layerdata[2] = { { - 4, + 2, + "http://reactos.org/disallow", + "apphelp_name_disallow", + "Not allowed!", + }, + { + 1, "http://reactos.org/allow", "apphelp_name_allow", "Allow it!", - }, - { - 3, - "http://reactos.org/disallow", - "apphelp_name_disallow", - "Not allowed!", }, };

1 0

[mjansen] 71447: [APPSHIM_APITEST] Move versionlie tests to a dedicate shim-test binary.
by mjansen＠svn.reactos.org 28 May '16

28 May '16

Author: mjansen Date: Sat May 28 21:33:56 2016 New Revision: 71447 URL: http://svn.reactos.org/svn/reactos?rev=71447&view=rev Log: [APPSHIM_APITEST] Move versionlie tests to a dedicate shim-test binary. Added: trunk/rostests/apitests/appshim/ trunk/rostests/apitests/appshim/CMakeLists.txt (with props) trunk/rostests/apitests/appshim/testlist.c (with props) trunk/rostests/apitests/appshim/versionlie.c (with props) Removed: trunk/rostests/apitests/apphelp/versionlie.c Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/testlist.c Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat May 28 21:33:56 2016 @@ -2,6 +2,7 @@ add_subdirectory(advapi32) add_subdirectory(apphelp) +add_subdirectory(appshim) add_subdirectory(atl) add_subdirectory(browseui) add_subdirectory(com) Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Sat May 28 21:33:56 2016 @@ -6,7 +6,6 @@ data.c db.c layerapi.c - versionlie.c testlist.c) add_executable(apphelp_apitest ${SOURCE}) Modified: trunk/rostests/apitests/apphelp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/testlist… ============================================================================== --- trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] Sat May 28 21:33:56 2016 @@ -6,13 +6,11 @@ extern void func_apphelp(void); extern void func_db(void); extern void func_layerapi(void); -extern void func_versionlie(void); const struct test winetest_testlist[] = { { "apphelp", func_apphelp }, { "db", func_db }, { "layerapi", func_layerapi }, - { "versionlie", func_versionlie }, { 0, 0 } }; Removed: trunk/rostests/apitests/apphelp/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/versionl… ============================================================================== --- trunk/rostests/apitests/apphelp/versionlie.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/versionlie.c (removed) @@ -1,350 +0,0 @@ -/* - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <ntstatus.h> -#define WIN32_NO_STATUS -#include <windows.h> -#ifdef __REACTOS__ -#include <ntndk.h> -#else -#include <winternl.h> -#endif -#include <stdio.h> -#include "wine/test.h" - -/* data.c */ -DWORD get_host_winver(void); - -typedef struct tagHOOKAPI { - PCSTR LibraryName; - PCSTR FunctionName; - PVOID ReplacementFunction; - PVOID OriginalFunction; - PVOID Unk1; - PVOID Unk2; -} HOOKAPI, *PHOOKAPI; - -static BOOL (WINAPI* pSdbGetAppPatchDir)(PVOID,LPWSTR,DWORD); -static PHOOKAPI (WINAPI* pGetHookAPIs)(LPCSTR,LPCWSTR,PDWORD); - - -static DWORD g_WinVersion; -#define WINVER_WINXP 0x0501 - - -typedef struct VersionLieInfo -{ - DWORD FullVersion; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - WORD wServicePackMajor; - WORD wServicePackMinor; -} VersionLieInfo; - -typedef BOOL(WINAPI* GETVERSIONEXAPROC)(LPOSVERSIONINFOEXA); -typedef BOOL(WINAPI* GETVERSIONEXWPROC)(LPOSVERSIONINFOEXW); -typedef DWORD(WINAPI* GETVERSIONPROC)(void); - -static void expect_shim_imp(PHOOKAPI hook, PCSTR library, PCSTR function, PCSTR shim, int* same) -{ - int lib = lstrcmpA(library, hook->LibraryName); - int fn = lstrcmpA(function, hook->FunctionName); - winetest_ok(lib == 0, "Expected LibrarayName to be %s, was: %s for %s\n", library, hook->LibraryName, shim); - winetest_ok(fn == 0, "Expected FunctionName to be %s, was: %s for %s\n", function, hook->FunctionName, shim); - *same = (lib == 0 && fn == 0); -} - -static void verify_shima_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same) -{ - OSVERSIONINFOEXA v1 = { sizeof(v1), 0 }, v2 = { sizeof(v2), 0 }; - BOOL ok1, ok2; - - if (!same) - { - skip("Skipping implementation tests for %s\n", shim); - return; - } - - while (v1.dwOSVersionInfoSize) - { - ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1), ok2; - hook->OriginalFunction = GetVersionExA; - - ok2 = ((GETVERSIONEXAPROC)hook->ReplacementFunction)(&v2); - - winetest_ok(ok1 == ok2, "Expected ok1 to equal ok2, was: %i, %i for %s\n", ok1, ok2, shim); - if (ok1 && ok2) - { - char szCSDVersion[128] = ""; - winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); - winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); - winetest_ok(info->dwMinorVersion == v2.dwMinorVersion, "Expected dwMinorVersion to be equal, was: %u, %u for %s\n", info->dwMinorVersion, v2.dwMinorVersion, shim); - winetest_ok(info->dwBuildNumber == v2.dwBuildNumber, "Expected dwBuildNumber to be equal, was: %u, %u for %s\n", info->dwBuildNumber, v2.dwBuildNumber, shim); - winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); - - if (info->wServicePackMajor) - sprintf(szCSDVersion, "Service Pack %u", info->wServicePackMajor); - winetest_ok(lstrcmpA(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", szCSDVersion, v2.szCSDVersion, shim); - - if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) - { - if (info->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) - { - winetest_ok(info->wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", info->wServicePackMajor, v2.wServicePackMajor, shim); - winetest_ok(info->wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", info->wServicePackMinor, v2.wServicePackMinor, shim); - } - else - { - winetest_ok(v1.wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); - winetest_ok(v1.wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); - } - winetest_ok(v1.wSuiteMask == v2.wSuiteMask, "Expected wSuiteMask to be equal, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); - winetest_ok(v1.wProductType == v2.wProductType, "Expected wProductType to be equal, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); - winetest_ok(v1.wReserved == v2.wReserved, "Expected wReserved to be equal, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); - } - else - { - winetest_ok(v1.wServicePackMajor == 0 && v2.wServicePackMajor == 0, "Expected wServicePackMajor to be 0, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); - winetest_ok(v1.wServicePackMinor == 0 && v2.wServicePackMinor == 0, "Expected wServicePackMinor to be 0, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); - winetest_ok(v1.wSuiteMask == 0 && v2.wSuiteMask == 0, "Expected wSuiteMask to be 0, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); - winetest_ok(v1.wProductType == 0 && v2.wProductType == 0, "Expected wProductType to be 0, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); - winetest_ok(v1.wReserved == 0 && v2.wReserved == 0, "Expected wReserved to be 0, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); - } - } - - ZeroMemory(&v1, sizeof(v1)); - ZeroMemory(&v2, sizeof(v2)); - if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) - v1.dwOSVersionInfoSize = v2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - } -} - -static void verify_shimw_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same, int first_might_be_broken) -{ - OSVERSIONINFOEXW v1 = { sizeof(v1), 0 }, v2 = { sizeof(v2), 0 }; - BOOL ok1, ok2, first = TRUE; - - if (!same) - { - skip("Skipping implementation tests for %s\n", shim); - return; - } - - while (v1.dwOSVersionInfoSize) - { - ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1), ok2; - hook->OriginalFunction = GetVersionExW; - - ok2 = ((GETVERSIONEXWPROC)hook->ReplacementFunction)(&v2); - - if (first_might_be_broken && first && ok1 == TRUE && ok2 == FALSE) - { - skip("Skipping first check because 0x%x is (falsely) not accepted by the shim %s\n", sizeof(v1), shim); - } - else - { - winetest_ok(ok1 == ok2, "Expected ok1 to equal ok2, was: %i, %i for %s(first:%d)\n", ok1, ok2, shim, first); - } - if (ok1 && ok2) - { - WCHAR szCSDVersion[128] = { 0 }; - winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); - winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); - winetest_ok(info->dwMinorVersion == v2.dwMinorVersion, "Expected dwMinorVersion to be equal, was: %u, %u for %s\n", info->dwMinorVersion, v2.dwMinorVersion, shim); - winetest_ok(info->dwBuildNumber == v2.dwBuildNumber, "Expected dwBuildNumber to be equal, was: %u, %u for %s\n", info->dwBuildNumber, v2.dwBuildNumber, shim); - winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); - - if (info->wServicePackMajor) - swprintf(szCSDVersion, (const WCHAR[]){'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}, info->wServicePackMajor); - winetest_ok(lstrcmpW(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", wine_dbgstr_w(szCSDVersion), wine_dbgstr_w(v2.szCSDVersion), shim); - - if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) - { - if (info->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) - { - winetest_ok(info->wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", info->wServicePackMajor, v2.wServicePackMajor, shim); - winetest_ok(info->wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", info->wServicePackMinor, v2.wServicePackMinor, shim); - } - else - { - winetest_ok(v1.wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); - winetest_ok(v1.wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); - } - winetest_ok(v1.wSuiteMask == v2.wSuiteMask, "Expected wSuiteMask to be equal, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); - winetest_ok(v1.wProductType == v2.wProductType, "Expected wProductType to be equal, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); - winetest_ok(v1.wReserved == v2.wReserved, "Expected wReserved to be equal, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); - } - else - { - winetest_ok(v1.wServicePackMajor == 0 && v2.wServicePackMajor == 0, "Expected wServicePackMajor to be 0, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); - winetest_ok(v1.wServicePackMinor == 0 && v2.wServicePackMinor == 0, "Expected wServicePackMinor to be 0, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); - winetest_ok(v1.wSuiteMask == 0 && v2.wSuiteMask == 0, "Expected wSuiteMask to be 0, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); - winetest_ok(v1.wProductType == 0 && v2.wProductType == 0, "Expected wProductType to be 0, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); - winetest_ok(v1.wReserved == 0 && v2.wReserved == 0, "Expected wReserved to be 0, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); - } - } - - ZeroMemory(&v1, sizeof(v1)); - ZeroMemory(&v2, sizeof(v2)); - if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) - v1.dwOSVersionInfoSize = v2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - first = FALSE; - } -} - -static void verify_shim_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same) -{ - DWORD ver; - if (!same) - { - skip("Skipping implementation tests for %s\n", shim); - return; - } - ver = ((GETVERSIONPROC)hook->ReplacementFunction)(); - winetest_ok(info->FullVersion == ver, "Expected GetVersion to return %u, was: %u for %s\n", info->FullVersion, ver, shim); -} - - -#define expect_shim (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_shim_imp -#define verify_shima (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shima_imp -#define verify_shimw (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shimw_imp -#define verify_shim (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shim_imp - - - - -static void run_test(LPCSTR shim, const VersionLieInfo* info) -{ - DWORD num_shims = 0; - WCHAR wide_shim[50] = { 0 }; - PHOOKAPI hook; - DWORD ver; - MultiByteToWideChar(CP_ACP, 0, shim, -1, wide_shim, 50); - hook = pGetHookAPIs("", wide_shim, &num_shims); - ver = (info->dwMajorVersion << 8) | info->dwMinorVersion; - if (hook == NULL) - { - skip("Skipping tests for layers (%s) not present in this os (0x%x)\n", shim, g_WinVersion); - return; - } - ok(hook != NULL, "Expected hook to be a valid pointer for %s\n", shim); - if (info->dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - { - ok(num_shims == 3, "Expected num_shims to be 3, was: %u for %s\n", num_shims, shim); - if (hook && num_shims == 3) - { - int off = info->dwBuildNumber == 0x040A08AE ? 0 : 1, same = 0; - expect_shim(hook + ((0+off)%3), "KERNEL32.DLL", "GetVersionExA", shim, &same); - verify_shima(hook + ((0+off)%3), info, shim, same); - expect_shim(hook + ((1+off)%3), "KERNEL32.DLL", "GetVersionExW", shim, &same); - verify_shimw(hook + ((1+off)%3), info, shim, same, 0); - expect_shim(hook + ((2+off)%3), "KERNEL32.DLL", "GetVersion", shim, &same); - verify_shim(hook + ((2+off)%3), info, shim, same); - } - } - else - { - int shimnum_ok = num_shims == 4 || ((ver < WINVER_WINXP) && (num_shims == 3)); - ok(shimnum_ok, "Expected num_shims to be 4%s, was: %u for %s\n", ((ver < WINVER_WINXP) ? " or 3":""), num_shims, shim); - if (hook && shimnum_ok) - { - int same = 0; - expect_shim(hook + 0, "KERNEL32.DLL", "GetVersionExA", shim, &same); - verify_shima(hook + 0, info, shim, same); - expect_shim(hook + 1, "KERNEL32.DLL", "GetVersionExW", shim, &same); - verify_shimw(hook + 1, info, shim, same, 0); - expect_shim(hook + 2, "KERNEL32.DLL", "GetVersion", shim, &same); - verify_shim(hook + 2, info, shim, same); - if (num_shims == 4) - { - expect_shim(hook + 3, "NTDLL.DLL", "RtlGetVersion", shim, &same); - verify_shimw(hook + 3, info, shim, same, 1); - } - } - } -} - - -VersionLieInfo g_Win95 = { 0xC3B60004, 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; -VersionLieInfo g_WinNT4SP5 = { 0x05650004, 4, 0, 1381, VER_PLATFORM_WIN32_NT, 5, 0 }; -VersionLieInfo g_Win98 = { 0xC0000A04, 4, 10, 0x040A08AE, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; - -VersionLieInfo g_Win2000 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 0, 0 }; -VersionLieInfo g_Win2000SP1 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 1, 0 }; -VersionLieInfo g_Win2000SP2 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 2, 0 }; -VersionLieInfo g_Win2000SP3 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 3, 0 }; - -VersionLieInfo g_WinXP = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 0, 0 }; -VersionLieInfo g_WinXPSP1 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 1, 0 }; -VersionLieInfo g_WinXPSP2 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 2, 0 }; -VersionLieInfo g_WinXPSP3 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 3, 0 }; - -VersionLieInfo g_Win2k3RTM = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 0, 0 }; -VersionLieInfo g_Win2k3SP1 = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 1, 0 }; - -VersionLieInfo g_WinVistaRTM = { 0x17700006, 6, 0, 6000, VER_PLATFORM_WIN32_NT, 0, 0 }; -VersionLieInfo g_WinVistaSP1 = { 0x17710006, 6, 0, 6001, VER_PLATFORM_WIN32_NT, 1, 0 }; -VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, 2, 0 }; - -VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 0 }; - - -START_TEST(versionlie) -{ - HMODULE dll = LoadLibraryA("apphelp.dll"); - WCHAR buf[MAX_PATH]; - WCHAR aclayers[] = {'\\','a','c','l','a','y','e','r','s','.','d','l','l',0}; - pSdbGetAppPatchDir = (void*)GetProcAddress(dll, "SdbGetAppPatchDir"); - if (!pSdbGetAppPatchDir) - { - skip("apphelp.dll not loaded, or does not export SdbGetAppPatchDir\n"); - return; - } - - pSdbGetAppPatchDir(NULL, buf, MAX_PATH); - lstrcatW(buf, aclayers); - dll = LoadLibraryW(buf); - pGetHookAPIs = (void*)GetProcAddress(dll, "GetHookAPIs"); - - if (!pGetHookAPIs) - { - skip("aclayers.dll not loaded, or does not export GetHookAPIs\n"); - return; - } - g_WinVersion = get_host_winver(); - - run_test("Win95VersionLie", &g_Win95); - run_test("WinNT4SP5VersionLie", &g_WinNT4SP5); - run_test("Win98VersionLie", &g_Win98); - run_test("Win2000VersionLie", &g_Win2000); - run_test("Win2000SP1VersionLie", &g_Win2000SP1); - run_test("Win2000SP2VersionLie", &g_Win2000SP2); - run_test("Win2000SP3VersionLie", &g_Win2000SP3); - run_test("WinXPVersionLie", &g_WinXP); - run_test("WinXPSP1VersionLie", &g_WinXPSP1); - run_test("WinXPSP2VersionLie", &g_WinXPSP2); - run_test("WinXPSP3VersionLie", &g_WinXPSP3); - run_test("Win2k3RTMVersionLie", &g_Win2k3RTM); - run_test("Win2k3SP1VersionLie", &g_Win2k3SP1); - run_test("VistaRTMVersionLie", &g_WinVistaRTM); - run_test("VistaSP1VersionLie", &g_WinVistaSP1); - run_test("VistaSP2VersionLie", &g_WinVistaSP2); - run_test("Win7RTMVersionLie", &g_Win7RTM); -} Added: trunk/rostests/apitests/appshim/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/CMakeLis… ============================================================================== --- trunk/rostests/apitests/appshim/CMakeLists.txt (added) +++ trunk/rostests/apitests/appshim/CMakeLists.txt [iso-8859-1] Sat May 28 21:33:56 2016 @@ -0,0 +1,11 @@ +project(appcompat) +add_definitions(-D__ROS_LONG64__) + +list(APPEND SOURCE + versionlie.c + testlist.c) + +add_executable(appshim_apitest ${SOURCE}) +set_module_type(appshim_apitest win32cui) +add_importlibs(appshim_apitest msvcrt kernel32 ntdll) +add_cd_file(TARGET appshim_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/appshim/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/appshim/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/testlist… ============================================================================== --- trunk/rostests/apitests/appshim/testlist.c (added) +++ trunk/rostests/apitests/appshim/testlist.c [iso-8859-1] Sat May 28 21:33:56 2016 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_versionlie(void); + +const struct test winetest_testlist[] = +{ + { "versionlie", func_versionlie }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/appshim/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/appshim/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/versionl… ============================================================================== --- trunk/rostests/apitests/appshim/versionlie.c (added) +++ trunk/rostests/apitests/appshim/versionlie.c [iso-8859-1] Sat May 28 21:33:56 2016 @@ -0,0 +1,357 @@ +/* + * Copyright 2015 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#ifdef __REACTOS__ +#include <ntndk.h> +#else +#include <winternl.h> +#endif +#include <stdio.h> +#include "wine/test.h" + +typedef struct tagHOOKAPI { + PCSTR LibraryName; + PCSTR FunctionName; + PVOID ReplacementFunction; + PVOID OriginalFunction; + PVOID Unk1; + PVOID Unk2; +} HOOKAPI, *PHOOKAPI; + +static BOOL (WINAPI* pSdbGetAppPatchDir)(PVOID,LPWSTR,DWORD); +static PHOOKAPI (WINAPI* pGetHookAPIs)(LPCSTR,LPCWSTR,PDWORD); + + +static DWORD g_WinVersion; +#define WINVER_WINXP 0x0501 + + +typedef struct VersionLieInfo +{ + DWORD FullVersion; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + DWORD dwBuildNumber; + DWORD dwPlatformId; + WORD wServicePackMajor; + WORD wServicePackMinor; +} VersionLieInfo; + +typedef BOOL(WINAPI* GETVERSIONEXAPROC)(LPOSVERSIONINFOEXA); +typedef BOOL(WINAPI* GETVERSIONEXWPROC)(LPOSVERSIONINFOEXW); +typedef DWORD(WINAPI* GETVERSIONPROC)(void); + +static void expect_shim_imp(PHOOKAPI hook, PCSTR library, PCSTR function, PCSTR shim, int* same) +{ + int lib = lstrcmpA(library, hook->LibraryName); + int fn = lstrcmpA(function, hook->FunctionName); + winetest_ok(lib == 0, "Expected LibrarayName to be %s, was: %s for %s\n", library, hook->LibraryName, shim); + winetest_ok(fn == 0, "Expected FunctionName to be %s, was: %s for %s\n", function, hook->FunctionName, shim); + *same = (lib == 0 && fn == 0); +} + +static void verify_shima_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same) +{ + OSVERSIONINFOEXA v1 = { sizeof(v1), 0 }, v2 = { sizeof(v2), 0 }; + BOOL ok1, ok2; + + if (!same) + { + skip("Skipping implementation tests for %s\n", shim); + return; + } + + while (v1.dwOSVersionInfoSize) + { + ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1), ok2; + hook->OriginalFunction = GetVersionExA; + + ok2 = ((GETVERSIONEXAPROC)hook->ReplacementFunction)(&v2); + + winetest_ok(ok1 == ok2, "Expected ok1 to equal ok2, was: %i, %i for %s\n", ok1, ok2, shim); + if (ok1 && ok2) + { + char szCSDVersion[128] = ""; + winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); + winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); + winetest_ok(info->dwMinorVersion == v2.dwMinorVersion, "Expected dwMinorVersion to be equal, was: %u, %u for %s\n", info->dwMinorVersion, v2.dwMinorVersion, shim); + winetest_ok(info->dwBuildNumber == v2.dwBuildNumber, "Expected dwBuildNumber to be equal, was: %u, %u for %s\n", info->dwBuildNumber, v2.dwBuildNumber, shim); + winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); + + if (info->wServicePackMajor) + sprintf(szCSDVersion, "Service Pack %u", info->wServicePackMajor); + winetest_ok(lstrcmpA(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", szCSDVersion, v2.szCSDVersion, shim); + + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) + { + if (info->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) + { + winetest_ok(info->wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", info->wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(info->wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", info->wServicePackMinor, v2.wServicePackMinor, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + } + winetest_ok(v1.wSuiteMask == v2.wSuiteMask, "Expected wSuiteMask to be equal, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == v2.wProductType, "Expected wProductType to be equal, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == v2.wReserved, "Expected wReserved to be equal, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == 0 && v2.wServicePackMajor == 0, "Expected wServicePackMajor to be 0, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == 0 && v2.wServicePackMinor == 0, "Expected wServicePackMinor to be 0, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + winetest_ok(v1.wSuiteMask == 0 && v2.wSuiteMask == 0, "Expected wSuiteMask to be 0, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == 0 && v2.wProductType == 0, "Expected wProductType to be 0, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == 0 && v2.wReserved == 0, "Expected wReserved to be 0, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + } + + ZeroMemory(&v1, sizeof(v1)); + ZeroMemory(&v2, sizeof(v2)); + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) + v1.dwOSVersionInfoSize = v2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + } +} + +static void verify_shimw_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same, int first_might_be_broken) +{ + OSVERSIONINFOEXW v1 = { sizeof(v1), 0 }, v2 = { sizeof(v2), 0 }; + BOOL ok1, ok2, first = TRUE; + + if (!same) + { + skip("Skipping implementation tests for %s\n", shim); + return; + } + + while (v1.dwOSVersionInfoSize) + { + ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1), ok2; + hook->OriginalFunction = GetVersionExW; + + ok2 = ((GETVERSIONEXWPROC)hook->ReplacementFunction)(&v2); + + if (first_might_be_broken && first && ok1 == TRUE && ok2 == FALSE) + { + skip("Skipping first check because 0x%x is (falsely) not accepted by the shim %s\n", sizeof(v1), shim); + } + else + { + winetest_ok(ok1 == ok2, "Expected ok1 to equal ok2, was: %i, %i for %s(first:%d)\n", ok1, ok2, shim, first); + } + if (ok1 && ok2) + { + WCHAR szCSDVersion[128] = { 0 }; + winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); + winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); + winetest_ok(info->dwMinorVersion == v2.dwMinorVersion, "Expected dwMinorVersion to be equal, was: %u, %u for %s\n", info->dwMinorVersion, v2.dwMinorVersion, shim); + winetest_ok(info->dwBuildNumber == v2.dwBuildNumber, "Expected dwBuildNumber to be equal, was: %u, %u for %s\n", info->dwBuildNumber, v2.dwBuildNumber, shim); + winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); + + if (info->wServicePackMajor) + swprintf(szCSDVersion, (const WCHAR[]){'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}, info->wServicePackMajor); + winetest_ok(lstrcmpW(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", wine_dbgstr_w(szCSDVersion), wine_dbgstr_w(v2.szCSDVersion), shim); + + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + { + if (info->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) + { + winetest_ok(info->wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", info->wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(info->wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", info->wServicePackMinor, v2.wServicePackMinor, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + } + winetest_ok(v1.wSuiteMask == v2.wSuiteMask, "Expected wSuiteMask to be equal, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == v2.wProductType, "Expected wProductType to be equal, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == v2.wReserved, "Expected wReserved to be equal, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == 0 && v2.wServicePackMajor == 0, "Expected wServicePackMajor to be 0, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == 0 && v2.wServicePackMinor == 0, "Expected wServicePackMinor to be 0, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + winetest_ok(v1.wSuiteMask == 0 && v2.wSuiteMask == 0, "Expected wSuiteMask to be 0, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == 0 && v2.wProductType == 0, "Expected wProductType to be 0, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == 0 && v2.wReserved == 0, "Expected wReserved to be 0, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + } + + ZeroMemory(&v1, sizeof(v1)); + ZeroMemory(&v2, sizeof(v2)); + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + v1.dwOSVersionInfoSize = v2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + first = FALSE; + } +} + +static void verify_shim_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same) +{ + DWORD ver; + if (!same) + { + skip("Skipping implementation tests for %s\n", shim); + return; + } + ver = ((GETVERSIONPROC)hook->ReplacementFunction)(); + winetest_ok(info->FullVersion == ver, "Expected GetVersion to return %u, was: %u for %s\n", info->FullVersion, ver, shim); +} + + +#define expect_shim (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_shim_imp +#define verify_shima (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shima_imp +#define verify_shimw (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shimw_imp +#define verify_shim (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shim_imp + + + + +static void run_test(LPCSTR shim, const VersionLieInfo* info) +{ + DWORD num_shims = 0; + WCHAR wide_shim[50] = { 0 }; + PHOOKAPI hook; + DWORD ver; + MultiByteToWideChar(CP_ACP, 0, shim, -1, wide_shim, 50); + hook = pGetHookAPIs("", wide_shim, &num_shims); + ver = (info->dwMajorVersion << 8) | info->dwMinorVersion; + if (hook == NULL) + { + skip("Skipping tests for layers (%s) not present in this os (0x%x)\n", shim, g_WinVersion); + return; + } + ok(hook != NULL, "Expected hook to be a valid pointer for %s\n", shim); + if (info->dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) + { + ok(num_shims == 3, "Expected num_shims to be 3, was: %u for %s\n", num_shims, shim); + if (hook && num_shims == 3) + { + int off = info->dwBuildNumber == 0x040A08AE ? 0 : 1, same = 0; + expect_shim(hook + ((0+off)%3), "KERNEL32.DLL", "GetVersionExA", shim, &same); + verify_shima(hook + ((0+off)%3), info, shim, same); + expect_shim(hook + ((1+off)%3), "KERNEL32.DLL", "GetVersionExW", shim, &same); + verify_shimw(hook + ((1+off)%3), info, shim, same, 0); + expect_shim(hook + ((2+off)%3), "KERNEL32.DLL", "GetVersion", shim, &same); + verify_shim(hook + ((2+off)%3), info, shim, same); + } + } + else + { + int shimnum_ok = num_shims == 4 || ((ver < WINVER_WINXP) && (num_shims == 3)); + ok(shimnum_ok, "Expected num_shims to be 4%s, was: %u for %s\n", ((ver < WINVER_WINXP) ? " or 3":""), num_shims, shim); + if (hook && shimnum_ok) + { + int same = 0; + expect_shim(hook + 0, "KERNEL32.DLL", "GetVersionExA", shim, &same); + verify_shima(hook + 0, info, shim, same); + expect_shim(hook + 1, "KERNEL32.DLL", "GetVersionExW", shim, &same); + verify_shimw(hook + 1, info, shim, same, 0); + expect_shim(hook + 2, "KERNEL32.DLL", "GetVersion", shim, &same); + verify_shim(hook + 2, info, shim, same); + if (num_shims == 4) + { + expect_shim(hook + 3, "NTDLL.DLL", "RtlGetVersion", shim, &same); + verify_shimw(hook + 3, info, shim, same, 1); + } + } + } +} + + +VersionLieInfo g_Win95 = { 0xC3B60004, 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; +VersionLieInfo g_WinNT4SP5 = { 0x05650004, 4, 0, 1381, VER_PLATFORM_WIN32_NT, 5, 0 }; +VersionLieInfo g_Win98 = { 0xC0000A04, 4, 10, 0x040A08AE, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; + +VersionLieInfo g_Win2000 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2000SP1 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_Win2000SP2 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 2, 0 }; +VersionLieInfo g_Win2000SP3 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 3, 0 }; + +VersionLieInfo g_WinXP = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_WinXPSP1 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_WinXPSP2 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 2, 0 }; +VersionLieInfo g_WinXPSP3 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 3, 0 }; + +VersionLieInfo g_Win2k3RTM = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2k3SP1 = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 1, 0 }; + +VersionLieInfo g_WinVistaRTM = { 0x17700006, 6, 0, 6000, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_WinVistaSP1 = { 0x17710006, 6, 0, 6001, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, 2, 0 }; + +VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 0 }; + +DWORD get_host_winver(void) +{ + RTL_OSVERSIONINFOEXW rtlinfo = {0}; + void (__stdcall* pRtlGetVersion)(RTL_OSVERSIONINFOEXW*); + pRtlGetVersion = (void (__stdcall*)(RTL_OSVERSIONINFOEXW*))GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion"); + + rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo); + pRtlGetVersion(&rtlinfo); + return (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; +} + +START_TEST(versionlie) +{ + HMODULE dll = LoadLibraryA("apphelp.dll"); + WCHAR buf[MAX_PATH]; + WCHAR aclayers[] = {'\\','a','c','l','a','y','e','r','s','.','d','l','l',0}; + pSdbGetAppPatchDir = (void*)GetProcAddress(dll, "SdbGetAppPatchDir"); + if (!pSdbGetAppPatchDir) + { + skip("apphelp.dll not loaded, or does not export SdbGetAppPatchDir\n"); + return; + } + + pSdbGetAppPatchDir(NULL, buf, MAX_PATH); + lstrcatW(buf, aclayers); + dll = LoadLibraryW(buf); + pGetHookAPIs = (void*)GetProcAddress(dll, "GetHookAPIs"); + + if (!pGetHookAPIs) + { + skip("aclayers.dll not loaded, or does not export GetHookAPIs\n"); + return; + } + g_WinVersion = get_host_winver(); + + run_test("Win95VersionLie", &g_Win95); + run_test("WinNT4SP5VersionLie", &g_WinNT4SP5); + run_test("Win98VersionLie", &g_Win98); + run_test("Win2000VersionLie", &g_Win2000); + run_test("Win2000SP1VersionLie", &g_Win2000SP1); + run_test("Win2000SP2VersionLie", &g_Win2000SP2); + run_test("Win2000SP3VersionLie", &g_Win2000SP3); + run_test("WinXPVersionLie", &g_WinXP); + run_test("WinXPSP1VersionLie", &g_WinXPSP1); + run_test("WinXPSP2VersionLie", &g_WinXPSP2); + run_test("WinXPSP3VersionLie", &g_WinXPSP3); + run_test("Win2k3RTMVersionLie", &g_Win2k3RTM); + run_test("Win2k3SP1VersionLie", &g_Win2k3SP1); + run_test("VistaRTMVersionLie", &g_WinVistaRTM); + run_test("VistaSP1VersionLie", &g_WinVistaSP1); + run_test("VistaSP2VersionLie", &g_WinVistaSP2); + run_test("Win7RTMVersionLie", &g_Win7RTM); +} Propchange: trunk/rostests/apitests/appshim/versionlie.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71446: [FREELDR]: Usability fix: When pressing F8 (Advanced boot options menu), select "Start ReactOS normally" by default.
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 20:21:11 2016 New Revision: 71446 URL: http://svn.reactos.org/svn/reactos?rev=71446&view=rev Log: [FREELDR]: Usability fix: When pressing F8 (Advanced boot options menu), select "Start ReactOS normally" by default. Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Sat May 28 20:21:11 2016 @@ -96,7 +96,8 @@ TRUE, OptionsMenuList, OptionsMenuItemCount, - 0, -1, + 11, // Use "Start ReactOS normally" as default; see the switch below. + -1, &SelectedMenuItem, TRUE, NULL))

1 0

[pschweitzer] 71445: [KMTESTS:CC] Introduce tests for Cc :-) Currently, we only test CcCopyRead for specific alignment matters. It shows that under certain conditions, our Cc doesn't align reads it...
by pschweitzer＠svn.reactos.org 28 May '16

28 May '16

Author: pschweitzer Date: Sat May 28 19:59:10 2016 New Revision: 71445 URL: http://svn.reactos.org/svn/reactos?rev=71445&view=rev Log: [KMTESTS:CC] Introduce tests for Cc :-) Currently, we only test CcCopyRead for specific alignment matters. It shows that under certain conditions, our Cc doesn't align reads it does, leading to later failure in disk.sys. This reproduces an error observed with MS FastFAT in ReactOS. CORE-11003 Added: trunk/rostests/kmtests/ntos_cc/ trunk/rostests/kmtests/ntos_cc/CMakeLists.txt (with props) trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c (with props) trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sat May 28 19:59:10 2016 @@ -6,6 +6,7 @@ # add_subdirectory(example) add_subdirectory(kernel32) +add_subdirectory(ntos_cc) add_subdirectory(ntos_io) add_subdirectory(ntos_po) add_subdirectory(tcpip) @@ -118,6 +119,7 @@ example/Example_user.c kernel32/FindFile_user.c + ntos_cc/CcCopyRead_user.c ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Sat May 28 19:59:10 2016 @@ -7,6 +7,7 @@ #include <kmt_test.h> +KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FindFile; KMT_TESTFUNC Test_IoCreateFile; @@ -27,6 +28,7 @@ /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = { + { "CcCopyRead", Test_CcCopyRead }, { "-Example", Test_Example }, { "FindFile", Test_FindFile }, { "IoCreateFile", Test_IoCreateFile }, Added: trunk/rostests/kmtests/ntos_cc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CMakeLists.txt (added) +++ trunk/rostests/kmtests/ntos_cc/CMakeLists.txt [iso-8859-1] Sat May 28 19:59:10 2016 @@ -0,0 +1,17 @@ + +include_directories(../include) + +# +# IoCreateFile +# +list(APPEND CCCOPYREAD_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + CcCopyRead_drv.c) + +add_library(cccopyread_drv SHARED ${CCCOPYREAD_DRV_SOURCE}) +set_module_type(cccopyread_drv kernelmodedriver) +target_link_libraries(cccopyread_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(cccopyread_drv ntoskrnl hal) +add_target_compile_definitions(cccopyread_drv KMT_STANDALONE_DRIVER) +#add_pch(cccopyread_drv ../include/kmt_test.h) +add_cd_file(TARGET cccopyread_drv DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/kmtests/ntos_cc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CcCopyRea… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c (added) +++ trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] Sat May 28 19:59:10 2016 @@ -0,0 +1,272 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for CcCopyRead function + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +typedef struct _TEST_FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + SECTION_OBJECT_POINTERS SectionObjectPointers; + FAST_MUTEX HeaderMutex; +} TEST_FCB, *PTEST_FCB; + +static PFILE_OBJECT TestFileObject; +static PDEVICE_OBJECT TestDeviceObject; +static KMT_IRP_HANDLER TestIrpHandler; +static FAST_IO_DISPATCH TestFastIoDispatch; + +static +BOOLEAN +NTAPI +FastIoRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + IoStatus->Status = STATUS_NOT_SUPPORTED; + return FALSE; +} + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"CcCopyRead"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | + TESTENTRY_BUFFERED_IO_DEVICE | + TESTENTRY_NO_READONLY_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_CLEANUP, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_READ, NULL, TestIrpHandler); + + TestFastIoDispatch.FastIoRead = FastIoRead; + DriverObject->FastIoDispatch = &TestFastIoDispatch; + + + return Status; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +BOOLEAN +NTAPI +AcquireForLazyWrite( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromLazyWrite( + _In_ PVOID Context) +{ + return; +} + +BOOLEAN +NTAPI +AcquireForReadAhead( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromReadAhead( + _In_ PVOID Context) +{ + return; +} + +static CACHE_MANAGER_CALLBACKS Callbacks = { + AcquireForLazyWrite, + ReleaseFromLazyWrite, + AcquireForReadAhead, + ReleaseFromReadAhead, +}; + +static +PVOID +MapUserBuffer( + _In_ _Out_ PIRP Irp) +{ + if (Irp->MdlAddress == NULL) + { + return Irp->UserBuffer; + } + else + { + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + } +} + + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + PTEST_FCB Fcb; + CACHE_UNINITIALIZE_EVENT CacheUninitEvent; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_CLEANUP || + IoStack->MajorFunction == IRP_MJ_CREATE || + IoStack->MajorFunction == IRP_MJ_READ); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_CREATE) + { + if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR)) + { + TestDeviceObject = DeviceObject; + TestFileObject = IoStack->FileObject; + } + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Fcb), 'FwrI'); + RtlZeroMemory(Fcb, sizeof(*Fcb)); + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && + IoStack->FileObject->FileName.Buffer[1] == 'B') + { + Fcb->Header.AllocationSize.QuadPart = 1000000; + Fcb->Header.FileSize.QuadPart = 1000000; + Fcb->Header.ValidDataLength.QuadPart = 1000000; + } + else if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && + IoStack->FileObject->FileName.Buffer[1] == 'S') + { + Fcb->Header.AllocationSize.QuadPart = 3000; + Fcb->Header.FileSize.QuadPart = 3000; + Fcb->Header.ValidDataLength.QuadPart = 3000; + } + else + { + Fcb->Header.AllocationSize.QuadPart = 512; + Fcb->Header.FileSize.QuadPart = 512; + Fcb->Header.ValidDataLength.QuadPart = 512; + } + Fcb->Header.IsFastIoPossible = FALSE; + IoStack->FileObject->FsContext = Fcb; + IoStack->FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + CcInitializeCacheMap(IoStack->FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, + FALSE, &Callbacks, NULL); + + Irp->IoStatus.Information = FILE_OPENED; + Status = STATUS_SUCCESS; + } + else if (IoStack->MajorFunction == IRP_MJ_READ) + { + BOOLEAN Ret; + ULONG Length; + PVOID Buffer; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Read.ByteOffset; + Length = IoStack->Parameters.Read.Length; + Fcb = IoStack->FileObject->FsContext; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + + if (!FlagOn(Irp->Flags, IRP_NOCACHE)) + { + ok(Offset.QuadPart % 512 != 0, "Offset is aligned: %I64i\n", Offset.QuadPart); + ok(Length % 512 != 0, "Length is aligned: %I64i\n", Length); + + Buffer = MapUserBuffer(Irp); + ok(Buffer != NULL, "Null pointer!\n"); + + _SEH2_TRY + { + Ret = CcCopyRead(IoStack->FileObject, &Offset, Length, TRUE, Buffer, + &Irp->IoStatus); + ok_bool_true(Ret, "CcCopyRead"); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Irp->IoStatus.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + Status = Irp->IoStatus.Status; + } + else + { + ok(Offset.QuadPart % 512 == 0, "Offset is not aligned: %I64i\n", Offset.QuadPart); + ok(Length % 512 == 0, "Length is not aligned: %I64i\n", Length); + + Status = STATUS_SUCCESS; + } + + if (NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = Length; + IoStack->FileObject->CurrentByteOffset.QuadPart = Offset.QuadPart + Length; + } + } + else if (IoStack->MajorFunction == IRP_MJ_CLEANUP) + { + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); + CcUninitializeCacheMap(IoStack->FileObject, NULL, &CacheUninitEvent); + KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + Fcb = IoStack->FileObject->FsContext; + ExFreePoolWithTag(Fcb, 'FwrI'); + IoStack->FileObject->FsContext = NULL; + Status = STATUS_SUCCESS; + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} Propchange: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CcCopyRea… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c (added) +++ trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c [iso-8859-1] Sat May 28 19:59:10 2016 @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite CcCopyRead test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +START_TEST(CcCopyRead) +{ + HANDLE Handle; + NTSTATUS Status; + LARGE_INTEGER ByteOffset; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PVOID Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, 1024); + UNICODE_STRING BigAlignmentTest = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-CcCopyRead\\BigAlignmentTest"); + UNICODE_STRING SmallAlignmentTest = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-CcCopyRead\\SmallAlignmentTest"); + + KmtLoadDriver(L"CcCopyRead", FALSE); + KmtOpenDriver(); + + InitializeObjectAttributes(&ObjectAttributes, &SmallAlignmentTest, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, 0, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + ok_eq_hex(Status, STATUS_SUCCESS); + + ByteOffset.QuadPart = 3; + Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 3, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + ByteOffset.QuadPart = 514; + Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 514, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + NtClose(Handle); + + InitializeObjectAttributes(&ObjectAttributes, &BigAlignmentTest, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, 0, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + ok_eq_hex(Status, STATUS_SUCCESS); + + ByteOffset.QuadPart = 3; + Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 3, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + ByteOffset.QuadPart = 514; + Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 514, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + ByteOffset.QuadPart = 300000; + Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 10, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + NtClose(Handle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71444: [WIN32K]: Whitespace fix only.
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 19:48:44 2016 New Revision: 71444 URL: http://svn.reactos.org/svn/reactos?rev=71444&view=rev Log: [WIN32K]: Whitespace fix only. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat May 28 19:48:44 2016 @@ -60,7 +60,7 @@ UNICODE_STRING DesktopName; PBOOLEAN pContext = (PBOOLEAN) Context; - if(pContext) + if (pContext) *pContext = FALSE; /* Set the list pointers and loop the window station */ @@ -111,7 +111,7 @@ NextEntry = NextEntry->Flink; } - /* If we got here but this isn't a create, then fail */ + /* If we got here but this isn't a create, just fail */ if (!Context) return STATUS_OBJECT_NAME_NOT_FOUND; /* Create the desktop object */ @@ -180,14 +180,14 @@ PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS OkToCloseParameters = Parameters; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - if( pti == NULL) + if (pti == NULL) { /* This happens when we leak desktop handles */ return STATUS_SUCCESS; } /* Do not allow the current desktop or the initial desktop to be closed */ - if( OkToCloseParameters->Handle == pti->ppi->hdeskStartup || + if (OkToCloseParameters->Handle == pti->ppi->hdeskStartup || OkToCloseParameters->Handle == pti->hdesk) { return STATUS_ACCESS_DENIED; @@ -292,7 +292,7 @@ *hWinSta = NULL; *hDesktop = NULL; - if(DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) + if (DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) { /* * Parse the desktop path string which can be in the form "WinSta\Desktop" @@ -300,7 +300,7 @@ */ pwstrDesktop = wcschr(DesktopPath->Buffer, L'\\'); - if(pwstrDesktop != NULL) + if (pwstrDesktop != NULL) { *pwstrDesktop = 0; pwstrDesktop++; @@ -326,7 +326,7 @@ #endif { /* We had no luck searching for opened handles, use WinSta0 now */ - if(!pwstrWinsta) + if (!pwstrWinsta) pwstrWinsta = L"WinSta0"; } @@ -341,11 +341,11 @@ #endif { /* We had no luck searching for opened handles, use Desktop now */ - if(!pwstrDesktop) + if (!pwstrDesktop) pwstrDesktop = L"Default"; } - if(*hWinSta == NULL) + if (*hWinSta == NULL) { swprintf(wstrWinstaFullName, L"%wZ\\%ws", &gustrWindowStationsDir, pwstrWinsta); RtlInitUnicodeString( &ObjectName, wstrWinstaFullName); @@ -367,7 +367,7 @@ NULL, (HANDLE*)hWinSta); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); ERR("Failed to reference window station %wZ PID: --!\n", &ObjectName ); @@ -375,7 +375,7 @@ } } - if(*hDesktop == NULL) + if (*hDesktop == NULL) { RtlInitUnicodeString(&ObjectName, pwstrDesktop); @@ -396,7 +396,7 @@ NULL, (HANDLE*)hDesktop); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { *hDesktop = NULL; NtClose(*hWinSta); @@ -475,7 +475,7 @@ ExDesktopObjectType, UserMode, (PHANDLE)&Ret); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { /* Unable to create a handle */ ERR("Unable to create a desktop handle\n"); @@ -512,9 +512,9 @@ TRACE("No active desktop\n"); return; } - if(NewQueue != NULL) - { - if(NewQueue->Desktop != NULL) + if (NewQueue != NULL) + { + if (NewQueue->Desktop != NULL) { TRACE("Message Queue already attached to another desktop!\n"); return; @@ -523,7 +523,7 @@ (void)InterlockedExchangePointer((PVOID*)&NewQueue->Desktop, pdo); } Old = (PUSER_MESSAGE_QUEUE)InterlockedExchangePointer((PVOID*)&pdo->ActiveMessageQueue, NewQueue); - if(Old != NULL) + if (Old != NULL) { (void)InterlockedExchangePointer((PVOID*)&Old->Desktop, 0); gpqForegroundPrev = Old; @@ -692,7 +692,7 @@ case WM_WINDOWPOSCHANGING: { PWINDOWPOS pWindowPos = (PWINDOWPOS)lParam; - if((pWindowPos->flags & SWP_SHOWWINDOW) != 0) + if ((pWindowPos->flags & SWP_SHOWWINDOW) != 0) { HDESK hdesk = IntGetDesktopObjectHandle(gpdeskInputDesktop); IntSetThreadDesktop(hdesk, FALSE); @@ -800,12 +800,12 @@ UINT flags = SWP_NOACTIVATE|SWP_NOZORDER|SWP_SHOWWINDOW; ASSERT(pwnd); - if(!bRedraw) + if (!bRedraw) flags |= SWP_NOREDRAW; co_WinPosSetWindowPos(pwnd, NULL, 0, 0, Width, Height, flags); - if(bRedraw) + if (bRedraw) co_UserRedrawWindow( pwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_INVALIDATE ); return STATUS_SUCCESS; @@ -1050,7 +1050,7 @@ } else { - /* Find the upper left corner, can be negative if the bitmap is bigger then the screen */ + /* Find the upper left corner, can be negative if the bitmap is bigger than the screen */ x = (sz.cx / 2) - (gspv.cxWallpaper / 2); y = (sz.cy / 2) - (gspv.cyWallpaper / 2); } @@ -1078,7 +1078,7 @@ if (gspv.WallpaperMode == wmStretch) { - if(Rect.right && Rect.bottom) + if (Rect.right && Rect.bottom) NtGdiStretchBlt(hDC, x, y, @@ -1095,9 +1095,9 @@ else if (gspv.WallpaperMode == wmTile) { /* Paint the bitmap across the screen then down */ - for(y = 0; y < Rect.bottom; y += gspv.cyWallpaper) + for (y = 0; y < Rect.bottom; y += gspv.cyWallpaper) { - for(x = 0; x < Rect.right; x += gspv.cxWallpaper) + for (x = 0; x < Rect.right; x += gspv.cxWallpaper) { NtGdiBitBlt(hDC, x, @@ -1137,6 +1137,7 @@ /* Black desktop background in Safe Mode */ DesktopBrush = StockObjects[BLACK_BRUSH]; } + /* Background is set to none, clear the screen */ if (doPatBlt) { @@ -1146,7 +1147,7 @@ } /* - * Display system version on the desktop background + * Display the system version on the desktop background */ if (g_PaintDesktopVersion || UserGetSystemMetrics(SM_CLEANBOOT)) @@ -1175,7 +1176,7 @@ align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); - if(!UserGetSystemMetrics(SM_CLEANBOOT)) + if (!UserGetSystemMetrics(SM_CLEANBOOT)) { GreExtTextOutW(hDC, rect.right - 16, rect.bottom - 48, 0, NULL, s_wszVersion, len, NULL, 0); } @@ -1204,6 +1205,7 @@ IntGdiSetTextColor(hDC, color_old); } } + return TRUE; } @@ -1550,7 +1552,7 @@ UserEnterExclusive(); TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); - if(fInherit) HandleAttributes = OBJ_INHERIT; + if (fInherit) HandleAttributes = OBJ_INHERIT; /* Create a new handle to the object */ Status = ObOpenObjectByPointer( @@ -1605,7 +1607,7 @@ TRACE("NtUserCloseDesktop called (0x%p)\n", hDesktop); UserEnterExclusive(); - if( hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup) + if (hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup) { ERR("Attempted to close thread desktop\n"); EngSetLastError(ERROR_BUSY); @@ -1802,7 +1804,7 @@ RETURN(FALSE); } - if(pdesk == gpdeskInputDesktop) + if (pdesk == gpdeskInputDesktop) { ObDereferenceObject(pdesk); WARN("NtUserSwitchDesktop called for active desktop\n"); @@ -1813,15 +1815,15 @@ * Don't allow applications switch the desktop if it's locked, unless the caller * is the logon application itself */ - if((pdesk->rpwinstaParent->Flags & WSS_LOCKED) && - gpidLogon != PsGetCurrentProcessId()) + if ((pdesk->rpwinstaParent->Flags & WSS_LOCKED) && + gpidLogon != PsGetCurrentProcessId()) { ObDereferenceObject(pdesk); ERR("Switching desktop 0x%p denied because the window station is locked!\n", hdesk); RETURN(FALSE); } - if(pdesk->rpwinstaParent != InputWindowStation) + if (pdesk->rpwinstaParent != InputWindowStation) { ObDereferenceObject(pdesk); ERR("Switching desktop 0x%p denied because desktop doesn't belong to the interactive winsta!\n", hdesk); @@ -1837,9 +1839,9 @@ bRedrawDesktop = FALSE; /* The first time SwitchDesktop is called, gpdeskInputDesktop is NULL */ - if(gpdeskInputDesktop != NULL) - { - if((gpdeskInputDesktop->pDeskInfo->spwnd->style & WS_VISIBLE) == WS_VISIBLE) + if (gpdeskInputDesktop != NULL) + { + if ((gpdeskInputDesktop->pDeskInfo->spwnd->style & WS_VISIBLE) == WS_VISIBLE) bRedrawDesktop = TRUE; /* Hide the previous desktop window */ @@ -1886,20 +1888,20 @@ UserEnterExclusive(); TRACE("Enter NtUserGetThreadDesktop\n"); - if(!dwThreadId) + if (!dwThreadId) { EngSetLastError(ERROR_INVALID_PARAMETER); RETURN(0); } Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_PARAMETER); RETURN(0); } - if(Thread->ThreadsProcess == PsGetCurrentProcess()) + if (Thread->ThreadsProcess == PsGetCurrentProcess()) { /* Just return the handle, we queried the desktop handle of a thread running in the same context */ @@ -1909,8 +1911,8 @@ } /* Get the desktop handle and the desktop of the thread */ - if(!(hThreadDesktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk) || - !(DesktopObject = ((PTHREADINFO)Thread->Tcb.Win32Thread)->rpdesk)) + if (!(hThreadDesktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk) || + !(DesktopObject = ((PTHREADINFO)Thread->Tcb.Win32Thread)->rpdesk)) { ObDereferenceObject(Thread); ERR("Desktop information of thread 0x%x broken!?\n", dwThreadId); @@ -1931,7 +1933,7 @@ KeDetachProcess(); /* The handle couldn't be found, there's nothing to get... */ - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ObDereferenceObject(Thread); RETURN(NULL); @@ -2089,7 +2091,7 @@ pci = pti->pClientInfo; /* If the caller gave us a desktop, ensure it is valid */ - if(hDesktop != NULL) + if (hDesktop != NULL) { /* Validate the new desktop. */ Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); @@ -2110,7 +2112,7 @@ /* Make sure that we don't own any window in the current desktop */ if (!IsListEmpty(&pti->WindowListHead)) { - if(pdesk) + if (pdesk) ObDereferenceObject(pdesk); ERR("Attempted to change thread desktop although the thread has windows!\n"); EngSetLastError(ERROR_BUSY); @@ -2125,7 +2127,7 @@ } /* Before doing the switch, map the new desktop heap and allocate the new pcti */ - if(pdesk != NULL) + if (pdesk != NULL) { Status = IntMapDesktopView(pdesk); if (!NT_SUCCESS(Status)) @@ -2137,7 +2139,7 @@ } pctiNew = DesktopHeapAlloc( pdesk, sizeof(CLIENTTHREADINFO)); - if(pctiNew == NULL) + if (pctiNew == NULL) { ERR("Failed to allocate new pcti\n"); IntUnmapDesktopView(pdesk); @@ -2148,12 +2150,12 @@ } /* free all classes or move them to the shared heap */ - if(pti->rpdesk != NULL) - { - if(!IntCheckProcessDesktopClasses(pti->rpdesk, FreeOnFailure)) + if (pti->rpdesk != NULL) + { + if (!IntCheckProcessDesktopClasses(pti->rpdesk, FreeOnFailure)) { ERR("Failed to move process classes to shared heap!\n"); - if(pdesk) + if (pdesk) { DesktopHeapFree(pdesk, pctiNew); IntUnmapDesktopView(pdesk); @@ -2171,7 +2173,7 @@ pctiOld = NULL; /* do the switch */ - if(pdesk != NULL) + if (pdesk != NULL) { pti->rpdesk = pdesk; pti->hdesk = hDesktop; @@ -2183,7 +2185,7 @@ pci->pClientThreadInfo = (PVOID)((ULONG_PTR)pti->pcti - pci->ulClientDelta); /* initialize the new pcti */ - if(pctiOld != NULL) + if (pctiOld != NULL) { RtlCopyMemory(pctiNew, pctiOld, sizeof(CLIENTTHREADINFO)); } @@ -2206,7 +2208,7 @@ } /* clean up the old desktop */ - if(pdeskOld != NULL) + if (pdeskOld != NULL) { RemoveEntryList(&pti->PtiLink); if (pctiOld) DesktopHeapFree(pdeskOld, pctiOld); @@ -2215,7 +2217,7 @@ ZwClose(hdeskOld); } - if(pdesk) + if (pdesk) { InsertTailList(&pdesk->PtiList, &pti->PtiLink); }

1 0

[hbelusca] 71443: [DESK.CPL] - Only use the minimum required registry rights needed in RegOpenKeyEx and RegCreateKeyEx calls. - Fix SetDesktopBackColor function where we tried to save the selected ...
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 19:12:14 2016 New Revision: 71443 URL: http://svn.reactos.org/svn/reactos?rev=71443&view=rev Log: [DESK.CPL] - Only use the minimum required registry rights needed in RegOpenKeyEx and RegCreateKeyEx calls. - Fix SetDesktopBackColor function where we tried to save the selected desktop background color in the registry only in the case where opening the corresponding registry key actually failed... >_> Now we do the right thing! Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sat May 28 19:12:14 2016 @@ -179,7 +179,6 @@ LV_ITEM listItem; HIMAGELIST himl; - szFileTypes = GdipGetSupportedFileExtensions(); if (!szFileTypes) { @@ -216,7 +215,6 @@ sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - if (himl == NULL) break; @@ -332,7 +330,7 @@ pData->listViewItemCount++; /* Add current wallpaper if any */ - result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_QUERY_VALUE, &regKey); if (result == ERROR_SUCCESS) { result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); @@ -376,7 +374,6 @@ sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - if (himl != NULL) { if (i++ == 0) @@ -513,8 +510,8 @@ LONG res = ERROR_SUCCESS; CHOOSECOLOR cc; - res = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &hKey, NULL); + res = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE, NULL, &hKey, NULL); /* Now the key is either created or opened existing, if res == ERROR_SUCCESS */ if (res == ERROR_SUCCESS) { @@ -522,7 +519,7 @@ DWORD dwType = REG_BINARY; DWORD cbData = sizeof(pData->custom_colors); res = RegQueryValueEx(hKey, TEXT("CustomColors"), NULL, &dwType, - (LPBYTE)pData->custom_colors, &cbData); + (LPBYTE)pData->custom_colors, &cbData); RegCloseKey(hKey); hKey = NULL; } @@ -554,12 +551,12 @@ /* Save custom colors to reg. To this moment key must be created already. See above */ res = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, - KEY_WRITE, &hKey); + KEY_SET_VALUE, &hKey); if (res == ERROR_SUCCESS) { /* Key opened */ RegSetValueEx(hKey, TEXT("CustomColors"), 0, REG_BINARY, - (const BYTE *)pData->custom_colors, sizeof(pData->custom_colors)); + (LPBYTE)pData->custom_colors, sizeof(pData->custom_colors)); RegCloseKey(hKey); hKey = NULL; } @@ -907,7 +904,6 @@ size_t length = 0; GpStatus status; - if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, szWallpaper))) { return; @@ -918,24 +914,28 @@ return; } - RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &regKey, NULL) != ERROR_SUCCESS) + { + return; + } if (pData->placementSelection == PLACEMENT_TILE) { - RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("1"), sizeof(TCHAR) * 2); - RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (LPBYTE)TEXT("1"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (LPBYTE)TEXT("0"), sizeof(TCHAR) * 2); } if (pData->placementSelection == PLACEMENT_CENTER) { - RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); - RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (LPBYTE)TEXT("0"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (LPBYTE)TEXT("0"), sizeof(TCHAR) * 2); } if (pData->placementSelection == PLACEMENT_STRETCH) { - RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); - RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("2"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (LPBYTE)TEXT("0"), sizeof(TCHAR) * 2); + RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (LPBYTE)TEXT("2"), sizeof(TCHAR) * 2); } if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == TRUE) @@ -979,7 +979,7 @@ TEXT("ConvertedWallpaper"), 0, REG_SZ, - (BYTE*)pData->backgroundItems[pData->backgroundSelection].szFilename, + (LPBYTE)pData->backgroundItems[pData->backgroundSelection].szFilename, (DWORD)((length + 1) * sizeof(TCHAR))); } @@ -989,7 +989,7 @@ TEXT("OriginalWallpaper"), 0, REG_SZ, - (BYTE *)szWallpaper, + (LPBYTE)szWallpaper, (DWORD)((length + 1) * sizeof(TCHAR))); } @@ -1008,30 +1008,34 @@ static VOID SetDesktopBackColor(HWND hwndDlg, DATA *pData) { + HKEY hKey; INT iElement = COLOR_BACKGROUND; - HKEY hKey; - LONG result; TCHAR clText[16]; BYTE red, green, blue; - DWORD dwDispostion; - - if( !SetSysColors( 1, &iElement, &g_GlobalData.desktop_color ) ) - MessageBox(hwndDlg, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ + + if (!SetSysColors(1, &iElement, &g_GlobalData.desktop_color)) + { + /* FIXME: these error texts can need internationalization? */ + MessageBox(hwndDlg, TEXT("SetSysColor() failed!"), TEXT("Error!"), MB_ICONSTOP ); - - result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &hKey, &dwDispostion ); - if (result != ERROR_SUCCESS) - { - red = GetRValue(g_GlobalData.desktop_color); - green = GetGValue(g_GlobalData.desktop_color); - blue = GetBValue(g_GlobalData.desktop_color); - /* Format string to be set to registry */ - StringCbPrintf(clText, sizeof(clText), TEXT("%d %d %d"), red, green, blue); - RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, - (lstrlen(clText) + 1) * sizeof(TCHAR)); - RegCloseKey(hKey); - } + } + + if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) + { + return; + } + + red = GetRValue(g_GlobalData.desktop_color); + green = GetGValue(g_GlobalData.desktop_color); + blue = GetBValue(g_GlobalData.desktop_color); + + /* Format string to be set to registry */ + StringCbPrintf(clText, sizeof(clText), TEXT("%d %d %d"), red, green, blue); + RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (LPBYTE)clText, + (wcslen(clText) + 1) * sizeof(TCHAR)); + + RegCloseKey(hKey); } INT_PTR CALLBACK

1 0

[mjansen] 71442: [APPHELP][APPHELP_APITEST] Implement various VersionLie shims. CORE-11299 #resolve - Implement VersionLie shims - Add tests for the VersionLie shims - update get_host_winver protot...
by mjansen＠svn.reactos.org 28 May '16

28 May '16

Author: mjansen Date: Sat May 28 17:55:56 2016 New Revision: 71442 URL: http://svn.reactos.org/svn/reactos?rev=71442&view=rev Log: [APPHELP][APPHELP_APITEST] Implement various VersionLie shims. CORE-11299 #resolve - Implement VersionLie shims - Add tests for the VersionLie shims - update get_host_winver prototype (thanks to Thomas for pointing out my err) We cannot apply this shim yet, since a required part of the infrastructure is missing. Added: trunk/reactos/dll/appcompat/shims/layer/ trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt (with props) trunk/reactos/dll/appcompat/shims/layer/layer.spec (with props) trunk/reactos/dll/appcompat/shims/layer/main.c (with props) trunk/reactos/dll/appcompat/shims/layer/versionlie.c (with props) trunk/reactos/dll/appcompat/shims/layer/versionlie.inl (with props) trunk/rostests/apitests/apphelp/versionlie.c (with props) Modified: trunk/reactos/dll/appcompat/shims/CMakeLists.txt trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/apphelp.c trunk/rostests/apitests/apphelp/data.c trunk/rostests/apitests/apphelp/layerapi.c trunk/rostests/apitests/apphelp/testlist.c Modified: trunk/reactos/dll/appcompat/shims/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/CMakeL… ============================================================================== --- trunk/reactos/dll/appcompat/shims/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/CMakeLists.txt [iso-8859-1] Sat May 28 17:55:56 2016 @@ -1,3 +1,4 @@ add_subdirectory(shimlib) +add_subdirectory(layer) Added: trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt (added) +++ trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt [iso-8859-1] Sat May 28 17:55:56 2016 @@ -0,0 +1,18 @@ + +include_directories(${SHIMLIB_DIR}) + +spec2def(aclayers.dll layer.spec) + +list(APPEND SOURCE + versionlie.c + main.c + layer.spec) + +add_library(aclayers SHARED + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/aclayers.def) + +set_module_type(aclayers win32dll) +target_link_libraries(aclayers shimlib) +add_importlibs(aclayers msvcrt kernel32 ntdll) +add_cd_file(TARGET aclayers DESTINATION reactos/AppPatch FOR all) Propchange: trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/layer/layer.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/layer.spec (added) +++ trunk/reactos/dll/appcompat/shims/layer/layer.spec [iso-8859-1] Sat May 28 17:55:56 2016 @@ -0,0 +1,3 @@ + +@ stdcall GetHookAPIs(str wstr ptr) +@ stdcall NotifyShims(long ptr) Propchange: trunk/reactos/dll/appcompat/shims/layer/layer.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/layer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/main.c (added) +++ trunk/reactos/dll/appcompat/shims/layer/main.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -0,0 +1,37 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/layer/main.c + * PURPOSE: Shim entrypoint + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <strsafe.h> +#include <shimlib.h> + +/* Forward to the generic implementation */ +PHOOKAPI WINAPI GetHookAPIs(IN LPCSTR szCommandLine, IN LPCWSTR wszShimName, OUT PDWORD pdwHookCount) +{ + return ShimLib_GetHookAPIs(szCommandLine, wszShimName, pdwHookCount); +} + +/* PLDR_DATA_TABLE_ENTRY */ +BOOL WINAPI NotifyShims(DWORD fdwReason, PVOID P) +{ + return TRUE; +} + +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + ShimLib_Init(hInstance); + break; + case DLL_PROCESS_DETACH: + ShimLib_Deinit(); + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/appcompat/shims/layer/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/layer/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/versionlie.c (added) +++ trunk/reactos/dll/appcompat/shims/layer/versionlie.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -0,0 +1,232 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/layer/versionlie.c + * PURPOSE: Version lie shims + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <shimlib.h> +#include <strsafe.h> + +/* Generic version info to use with the shims */ +typedef struct VersionLieInfo +{ + DWORD FullVersion; + WORD dwMajorVersion; + WORD dwMinorVersion; + DWORD dwBuildNumber; + WORD dwPlatformId; + WORD wServicePackMajor; + WORD wServicePackMinor; + char szCSDVersionA[20]; + WCHAR szCSDVersionW[20]; +} VersionLieInfo; + +VersionLieInfo g_Win95 = { 0xC3B60004, 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; +VersionLieInfo g_WinNT4SP5 = { 0x05650004, 4, 0, 1381, VER_PLATFORM_WIN32_NT, 5, 0 }; +VersionLieInfo g_Win98 = { 0xC0000A04, 4, 10, 0x040A08AE, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; + +VersionLieInfo g_Win2000 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2000SP1 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_Win2000SP2 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 2, 0 }; +VersionLieInfo g_Win2000SP3 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 3, 0 }; + +VersionLieInfo g_WinXP = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_WinXPSP1 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_WinXPSP2 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 2, 0 }; +VersionLieInfo g_WinXPSP3 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 3, 0 }; + +VersionLieInfo g_Win2k3RTM = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2k3SP1 = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 1, 0 }; + +VersionLieInfo g_WinVistaRTM = { 0x17700006, 6, 0, 6000, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_WinVistaSP1 = { 0x17710006, 6, 0, 6001, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, 2, 0 }; + +VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 0 }; + + +/* Fill the OSVERSIONINFO[EX][W|A] struct with the info from the generic VersionLieInfo */ + +BOOL FakeVersion(LPOSVERSIONINFOEXA pResult, VersionLieInfo* pFake) +{ + if (pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA) || pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOA) || + pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW) || pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOW)) + { + pResult->dwMajorVersion = pFake->dwMajorVersion; + pResult->dwMinorVersion = pFake->dwMinorVersion; + pResult->dwBuildNumber = pFake->dwBuildNumber; + pResult->dwPlatformId = pFake->dwPlatformId; + if (pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA) || pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOA)) + { + if (FAILED(StringCbCopyA(pResult->szCSDVersion, sizeof(pResult->szCSDVersion), pFake->szCSDVersionA))) + return FALSE; + if (pResult->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA) && pFake->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) + { + pResult->wServicePackMajor = pFake->wServicePackMajor; + pResult->wServicePackMinor = pFake->wServicePackMinor; + } + } + else + { + LPOSVERSIONINFOEXW pResultW = (LPOSVERSIONINFOEXW)pResult; + if (FAILED(StringCbCopyW(pResultW->szCSDVersion, sizeof(pResultW->szCSDVersion), pFake->szCSDVersionW))) + return FALSE; + if (pResultW->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW) && pFake->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) + { + pResultW->wServicePackMajor = pFake->wServicePackMajor; + pResultW->wServicePackMinor = pFake->wServicePackMinor; + } + } + return TRUE; + } + return FALSE; +} + +typedef BOOL(WINAPI* GETVERSIONEXAPROC)(LPOSVERSIONINFOEXA); + + +#define SHIM_NS Win95VersionLie + +#include <setup_shim.inl> + +DWORD WINAPI SHIM_OBJ_NAME(APIHook_GetVersion)() +{ + return g_Win95.FullVersion; +} + +BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExA)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(1, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &g_Win95); + } + return FALSE; +} + +/* We do not call about the actual type, FakeVersion will correctly handle it either way */ +BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(2, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &g_Win95); + } + return FALSE; +} + +#define SHIM_NUM_HOOKS 3 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "GetVersion", SHIM_OBJ_NAME(APIHook_GetVersion)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "GetVersionExA", SHIM_OBJ_NAME(APIHook_GetVersionExA)) \ + SHIM_HOOK(2, "KERNEL32.DLL", "GetVersionExW", SHIM_OBJ_NAME(APIHook_GetVersionExW)) + +#include <implement_shim.inl> + + + + +#define SHIM_NS Win98VersionLie + +#include <setup_shim.inl> + +DWORD WINAPI SHIM_OBJ_NAME(APIHook_GetVersion)() +{ + return g_Win98.FullVersion; +} + +BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExA)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(0, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &g_Win98); + } + return FALSE; +} + +/* We do not call about the actual type, FakeVersion will correctly handle it either way */ +BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(1, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &g_Win98); + } + return FALSE; +} + +#define SHIM_NUM_HOOKS 3 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(2, "KERNEL32.DLL", "GetVersion", SHIM_OBJ_NAME(APIHook_GetVersion)) \ + SHIM_HOOK(0, "KERNEL32.DLL", "GetVersionExA", SHIM_OBJ_NAME(APIHook_GetVersionExA)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "GetVersionExW", SHIM_OBJ_NAME(APIHook_GetVersionExW)) + +#include <implement_shim.inl> + + + +#define SHIM_NS WinNT4SP5VersionLie +#define VERSION_INFO g_WinNT4SP5 +#include "versionlie.inl" + +#define SHIM_NS Win2000VersionLie +#define VERSION_INFO g_Win2000 +#include "versionlie.inl" + +#define SHIM_NS Win2000SP1VersionLie +#define VERSION_INFO g_Win2000SP1 +#include "versionlie.inl" + +#define SHIM_NS Win2000SP2VersionLie +#define VERSION_INFO g_Win2000SP2 +#include "versionlie.inl" + +#define SHIM_NS Win2000SP3VersionLie +#define VERSION_INFO g_Win2000SP3 +#include "versionlie.inl" + + +#define SHIM_NS WinXPVersionLie +#define VERSION_INFO g_WinXP +#include "versionlie.inl" + +#define SHIM_NS WinXPSP1VersionLie +#define VERSION_INFO g_WinXPSP1 +#include "versionlie.inl" + +#define SHIM_NS WinXPSP2VersionLie +#define VERSION_INFO g_WinXPSP2 +#include "versionlie.inl" + +#define SHIM_NS WinXPSP3VersionLie +#define VERSION_INFO g_WinXPSP3 +#include "versionlie.inl" + + +#define SHIM_NS Win2k3RTMVersionLie +#define VERSION_INFO g_Win2k3RTM +#include "versionlie.inl" + +#define SHIM_NS Win2k3SP1VersionLie +#define VERSION_INFO g_Win2k3SP1 +#include "versionlie.inl" + + +#define SHIM_NS VistaRTMVersionLie +#define VERSION_INFO g_WinVistaRTM +#include "versionlie.inl" + +#define SHIM_NS VistaSP1VersionLie +#define VERSION_INFO g_WinVistaSP1 +#include "versionlie.inl" + +#define SHIM_NS VistaSP2VersionLie +#define VERSION_INFO g_WinVistaSP2 +#include "versionlie.inl" + + +#define SHIM_NS Win7RTMVersionLie +#define VERSION_INFO g_Win7RTM +#include "versionlie.inl" + + Propchange: trunk/reactos/dll/appcompat/shims/layer/versionlie.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/layer/versionlie.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/versionlie.inl (added) +++ trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] Sat May 28 17:55:56 2016 @@ -0,0 +1,73 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/layer/versionlie.inl + * PURPOSE: Version lie implementation helper + * PROGRAMMER: Mark Jansen + */ + + +#include <setup_shim.inl> + +DWORD WINAPI SHIM_OBJ_NAME(APIHook_GetVersion)() +{ + return VERSION_INFO.FullVersion; +} + +BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExA)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(0, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &VERSION_INFO); + } + return FALSE; +} + +/* We do not care about the actual type, FakeVersion will correctly handle it either way */ +BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(1, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &VERSION_INFO); + } + return FALSE; +} + +/* We do not care about the actual type, FakeVersion will correctly handle it either way */ +BOOL WINAPI SHIM_OBJ_NAME(APIHook_RtlGetVersion)(LPOSVERSIONINFOEXA lpOsVersionInfo) +{ + if (CALL_SHIM(3, GETVERSIONEXAPROC)(lpOsVersionInfo)) + { + return FakeVersion(lpOsVersionInfo, &VERSION_INFO); + } + return FALSE; +} + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason) +{ + if (fdwReason == SHIM_REASON_ATTACH && VERSION_INFO.wServicePackMajor) + { + HRESULT hr = StringCbPrintfA(VERSION_INFO.szCSDVersionA, sizeof(VERSION_INFO.szCSDVersionA), + "Service Pack %u", VERSION_INFO.wServicePackMajor); + if (FAILED(hr)) + return FALSE; + StringCbPrintfW(VERSION_INFO.szCSDVersionW, sizeof(VERSION_INFO.szCSDVersionW), + (CONST WCHAR[]){'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}, VERSION_INFO.wServicePackMajor); + if (FAILED(hr)) + return FALSE; + } + return TRUE; +} + + +#define SHIM_NUM_HOOKS 4 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "GetVersionExA", SHIM_OBJ_NAME(APIHook_GetVersionExA)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "GetVersionExW", SHIM_OBJ_NAME(APIHook_GetVersionExW)) \ + SHIM_HOOK(2, "KERNEL32.DLL", "GetVersion", SHIM_OBJ_NAME(APIHook_GetVersion)) \ + SHIM_HOOK(3, "NTDLL.DLL", "RtlGetVersion", SHIM_OBJ_NAME(APIHook_RtlGetVersion)) +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) + +#include <implement_shim.inl> + +#undef VERSION_INFO Propchange: trunk/reactos/dll/appcompat/shims/layer/versionlie.inl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Sat May 28 17:55:56 2016 @@ -1,4 +1,4 @@ - +project(appcompat) add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE @@ -6,6 +6,7 @@ data.c db.c layerapi.c + versionlie.c testlist.c) add_executable(apphelp_apitest ${SOURCE}) Modified: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -40,7 +40,7 @@ void test_create_exe_imp(const char* name, int skip_rsrc_exports); void test_create_file_imp(const char* name, const char* contents, size_t len); void test_create_ne_imp(const char* name, int skip_names); -DWORD get_host_winver(); +DWORD get_host_winver(void); #define test_create_exe (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_exe_imp #define test_create_file (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_file_imp Modified: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/apphelp/data.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -784,7 +784,7 @@ } static DWORD g_WinVersion; -DWORD get_host_winver() +DWORD get_host_winver(void) { if (!g_WinVersion) { Modified: trunk/rostests/apitests/apphelp/layerapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/layerapi… ============================================================================== --- trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -32,7 +32,7 @@ #include "wine/test.h" /* data.c */ -DWORD get_host_winver(); +DWORD get_host_winver(void); #define GPLK_USER 1 #define GPLK_MACHINE 2 Modified: trunk/rostests/apitests/apphelp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/testlist… ============================================================================== --- trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -6,11 +6,13 @@ extern void func_apphelp(void); extern void func_db(void); extern void func_layerapi(void); +extern void func_versionlie(void); const struct test winetest_testlist[] = { { "apphelp", func_apphelp }, { "db", func_db }, { "layerapi", func_layerapi }, + { "versionlie", func_versionlie }, { 0, 0 } }; Added: trunk/rostests/apitests/apphelp/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/versionl… ============================================================================== --- trunk/rostests/apitests/apphelp/versionlie.c (added) +++ trunk/rostests/apitests/apphelp/versionlie.c [iso-8859-1] Sat May 28 17:55:56 2016 @@ -0,0 +1,350 @@ +/* + * Copyright 2015 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#ifdef __REACTOS__ +#include <ntndk.h> +#else +#include <winternl.h> +#endif +#include <stdio.h> +#include "wine/test.h" + +/* data.c */ +DWORD get_host_winver(void); + +typedef struct tagHOOKAPI { + PCSTR LibraryName; + PCSTR FunctionName; + PVOID ReplacementFunction; + PVOID OriginalFunction; + PVOID Unk1; + PVOID Unk2; +} HOOKAPI, *PHOOKAPI; + +static BOOL (WINAPI* pSdbGetAppPatchDir)(PVOID,LPWSTR,DWORD); +static PHOOKAPI (WINAPI* pGetHookAPIs)(LPCSTR,LPCWSTR,PDWORD); + + +static DWORD g_WinVersion; +#define WINVER_WINXP 0x0501 + + +typedef struct VersionLieInfo +{ + DWORD FullVersion; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + DWORD dwBuildNumber; + DWORD dwPlatformId; + WORD wServicePackMajor; + WORD wServicePackMinor; +} VersionLieInfo; + +typedef BOOL(WINAPI* GETVERSIONEXAPROC)(LPOSVERSIONINFOEXA); +typedef BOOL(WINAPI* GETVERSIONEXWPROC)(LPOSVERSIONINFOEXW); +typedef DWORD(WINAPI* GETVERSIONPROC)(void); + +static void expect_shim_imp(PHOOKAPI hook, PCSTR library, PCSTR function, PCSTR shim, int* same) +{ + int lib = lstrcmpA(library, hook->LibraryName); + int fn = lstrcmpA(function, hook->FunctionName); + winetest_ok(lib == 0, "Expected LibrarayName to be %s, was: %s for %s\n", library, hook->LibraryName, shim); + winetest_ok(fn == 0, "Expected FunctionName to be %s, was: %s for %s\n", function, hook->FunctionName, shim); + *same = (lib == 0 && fn == 0); +} + +static void verify_shima_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same) +{ + OSVERSIONINFOEXA v1 = { sizeof(v1), 0 }, v2 = { sizeof(v2), 0 }; + BOOL ok1, ok2; + + if (!same) + { + skip("Skipping implementation tests for %s\n", shim); + return; + } + + while (v1.dwOSVersionInfoSize) + { + ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1), ok2; + hook->OriginalFunction = GetVersionExA; + + ok2 = ((GETVERSIONEXAPROC)hook->ReplacementFunction)(&v2); + + winetest_ok(ok1 == ok2, "Expected ok1 to equal ok2, was: %i, %i for %s\n", ok1, ok2, shim); + if (ok1 && ok2) + { + char szCSDVersion[128] = ""; + winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); + winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); + winetest_ok(info->dwMinorVersion == v2.dwMinorVersion, "Expected dwMinorVersion to be equal, was: %u, %u for %s\n", info->dwMinorVersion, v2.dwMinorVersion, shim); + winetest_ok(info->dwBuildNumber == v2.dwBuildNumber, "Expected dwBuildNumber to be equal, was: %u, %u for %s\n", info->dwBuildNumber, v2.dwBuildNumber, shim); + winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); + + if (info->wServicePackMajor) + sprintf(szCSDVersion, "Service Pack %u", info->wServicePackMajor); + winetest_ok(lstrcmpA(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", szCSDVersion, v2.szCSDVersion, shim); + + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) + { + if (info->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) + { + winetest_ok(info->wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", info->wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(info->wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", info->wServicePackMinor, v2.wServicePackMinor, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + } + winetest_ok(v1.wSuiteMask == v2.wSuiteMask, "Expected wSuiteMask to be equal, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == v2.wProductType, "Expected wProductType to be equal, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == v2.wReserved, "Expected wReserved to be equal, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == 0 && v2.wServicePackMajor == 0, "Expected wServicePackMajor to be 0, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == 0 && v2.wServicePackMinor == 0, "Expected wServicePackMinor to be 0, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + winetest_ok(v1.wSuiteMask == 0 && v2.wSuiteMask == 0, "Expected wSuiteMask to be 0, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == 0 && v2.wProductType == 0, "Expected wProductType to be 0, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == 0 && v2.wReserved == 0, "Expected wReserved to be 0, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + } + + ZeroMemory(&v1, sizeof(v1)); + ZeroMemory(&v2, sizeof(v2)); + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) + v1.dwOSVersionInfoSize = v2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + } +} + +static void verify_shimw_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same, int first_might_be_broken) +{ + OSVERSIONINFOEXW v1 = { sizeof(v1), 0 }, v2 = { sizeof(v2), 0 }; + BOOL ok1, ok2, first = TRUE; + + if (!same) + { + skip("Skipping implementation tests for %s\n", shim); + return; + } + + while (v1.dwOSVersionInfoSize) + { + ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1), ok2; + hook->OriginalFunction = GetVersionExW; + + ok2 = ((GETVERSIONEXWPROC)hook->ReplacementFunction)(&v2); + + if (first_might_be_broken && first && ok1 == TRUE && ok2 == FALSE) + { + skip("Skipping first check because 0x%x is (falsely) not accepted by the shim %s\n", sizeof(v1), shim); + } + else + { + winetest_ok(ok1 == ok2, "Expected ok1 to equal ok2, was: %i, %i for %s(first:%d)\n", ok1, ok2, shim, first); + } + if (ok1 && ok2) + { + WCHAR szCSDVersion[128] = { 0 }; + winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); + winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); + winetest_ok(info->dwMinorVersion == v2.dwMinorVersion, "Expected dwMinorVersion to be equal, was: %u, %u for %s\n", info->dwMinorVersion, v2.dwMinorVersion, shim); + winetest_ok(info->dwBuildNumber == v2.dwBuildNumber, "Expected dwBuildNumber to be equal, was: %u, %u for %s\n", info->dwBuildNumber, v2.dwBuildNumber, shim); + winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); + + if (info->wServicePackMajor) + swprintf(szCSDVersion, (const WCHAR[]){'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}, info->wServicePackMajor); + winetest_ok(lstrcmpW(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", wine_dbgstr_w(szCSDVersion), wine_dbgstr_w(v2.szCSDVersion), shim); + + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + { + if (info->dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) + { + winetest_ok(info->wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", info->wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(info->wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", info->wServicePackMinor, v2.wServicePackMinor, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == v2.wServicePackMajor, "Expected wServicePackMajor to be equal, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == v2.wServicePackMinor, "Expected wServicePackMinor to be equal, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + } + winetest_ok(v1.wSuiteMask == v2.wSuiteMask, "Expected wSuiteMask to be equal, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == v2.wProductType, "Expected wProductType to be equal, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == v2.wReserved, "Expected wReserved to be equal, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + else + { + winetest_ok(v1.wServicePackMajor == 0 && v2.wServicePackMajor == 0, "Expected wServicePackMajor to be 0, was: %i, %i for %s\n", v1.wServicePackMajor, v2.wServicePackMajor, shim); + winetest_ok(v1.wServicePackMinor == 0 && v2.wServicePackMinor == 0, "Expected wServicePackMinor to be 0, was: %i, %i for %s\n", v1.wServicePackMinor, v2.wServicePackMinor, shim); + winetest_ok(v1.wSuiteMask == 0 && v2.wSuiteMask == 0, "Expected wSuiteMask to be 0, was: %i, %i for %s\n", v1.wSuiteMask, v2.wSuiteMask, shim); + winetest_ok(v1.wProductType == 0 && v2.wProductType == 0, "Expected wProductType to be 0, was: %i, %i for %s\n", v1.wProductType, v2.wProductType, shim); + winetest_ok(v1.wReserved == 0 && v2.wReserved == 0, "Expected wReserved to be 0, was: %i, %i for %s\n", v1.wReserved, v2.wReserved, shim); + } + } + + ZeroMemory(&v1, sizeof(v1)); + ZeroMemory(&v2, sizeof(v2)); + if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) + v1.dwOSVersionInfoSize = v2.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + first = FALSE; + } +} + +static void verify_shim_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shim, int same) +{ + DWORD ver; + if (!same) + { + skip("Skipping implementation tests for %s\n", shim); + return; + } + ver = ((GETVERSIONPROC)hook->ReplacementFunction)(); + winetest_ok(info->FullVersion == ver, "Expected GetVersion to return %u, was: %u for %s\n", info->FullVersion, ver, shim); +} + + +#define expect_shim (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_shim_imp +#define verify_shima (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shima_imp +#define verify_shimw (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shimw_imp +#define verify_shim (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_shim_imp + + + + +static void run_test(LPCSTR shim, const VersionLieInfo* info) +{ + DWORD num_shims = 0; + WCHAR wide_shim[50] = { 0 }; + PHOOKAPI hook; + DWORD ver; + MultiByteToWideChar(CP_ACP, 0, shim, -1, wide_shim, 50); + hook = pGetHookAPIs("", wide_shim, &num_shims); + ver = (info->dwMajorVersion << 8) | info->dwMinorVersion; + if (hook == NULL) + { + skip("Skipping tests for layers (%s) not present in this os (0x%x)\n", shim, g_WinVersion); + return; + } + ok(hook != NULL, "Expected hook to be a valid pointer for %s\n", shim); + if (info->dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) + { + ok(num_shims == 3, "Expected num_shims to be 3, was: %u for %s\n", num_shims, shim); + if (hook && num_shims == 3) + { + int off = info->dwBuildNumber == 0x040A08AE ? 0 : 1, same = 0; + expect_shim(hook + ((0+off)%3), "KERNEL32.DLL", "GetVersionExA", shim, &same); + verify_shima(hook + ((0+off)%3), info, shim, same); + expect_shim(hook + ((1+off)%3), "KERNEL32.DLL", "GetVersionExW", shim, &same); + verify_shimw(hook + ((1+off)%3), info, shim, same, 0); + expect_shim(hook + ((2+off)%3), "KERNEL32.DLL", "GetVersion", shim, &same); + verify_shim(hook + ((2+off)%3), info, shim, same); + } + } + else + { + int shimnum_ok = num_shims == 4 || ((ver < WINVER_WINXP) && (num_shims == 3)); + ok(shimnum_ok, "Expected num_shims to be 4%s, was: %u for %s\n", ((ver < WINVER_WINXP) ? " or 3":""), num_shims, shim); + if (hook && shimnum_ok) + { + int same = 0; + expect_shim(hook + 0, "KERNEL32.DLL", "GetVersionExA", shim, &same); + verify_shima(hook + 0, info, shim, same); + expect_shim(hook + 1, "KERNEL32.DLL", "GetVersionExW", shim, &same); + verify_shimw(hook + 1, info, shim, same, 0); + expect_shim(hook + 2, "KERNEL32.DLL", "GetVersion", shim, &same); + verify_shim(hook + 2, info, shim, same); + if (num_shims == 4) + { + expect_shim(hook + 3, "NTDLL.DLL", "RtlGetVersion", shim, &same); + verify_shimw(hook + 3, info, shim, same, 1); + } + } + } +} + + +VersionLieInfo g_Win95 = { 0xC3B60004, 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; +VersionLieInfo g_WinNT4SP5 = { 0x05650004, 4, 0, 1381, VER_PLATFORM_WIN32_NT, 5, 0 }; +VersionLieInfo g_Win98 = { 0xC0000A04, 4, 10, 0x040A08AE, VER_PLATFORM_WIN32_WINDOWS, 0, 0 }; + +VersionLieInfo g_Win2000 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2000SP1 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_Win2000SP2 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 2, 0 }; +VersionLieInfo g_Win2000SP3 = { 0x08930005, 5, 0, 2195, VER_PLATFORM_WIN32_NT, 3, 0 }; + +VersionLieInfo g_WinXP = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_WinXPSP1 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_WinXPSP2 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 2, 0 }; +VersionLieInfo g_WinXPSP3 = { 0x0a280105, 5, 1, 2600, VER_PLATFORM_WIN32_NT, 3, 0 }; + +VersionLieInfo g_Win2k3RTM = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2k3SP1 = { 0x0ece0205, 5, 2, 3790, VER_PLATFORM_WIN32_NT, 1, 0 }; + +VersionLieInfo g_WinVistaRTM = { 0x17700006, 6, 0, 6000, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_WinVistaSP1 = { 0x17710006, 6, 0, 6001, VER_PLATFORM_WIN32_NT, 1, 0 }; +VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, 2, 0 }; + +VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 0 }; + + +START_TEST(versionlie) +{ + HMODULE dll = LoadLibraryA("apphelp.dll"); + WCHAR buf[MAX_PATH]; + WCHAR aclayers[] = {'\\','a','c','l','a','y','e','r','s','.','d','l','l',0}; + pSdbGetAppPatchDir = (void*)GetProcAddress(dll, "SdbGetAppPatchDir"); + if (!pSdbGetAppPatchDir) + { + skip("apphelp.dll not loaded, or does not export SdbGetAppPatchDir\n"); + return; + } + + pSdbGetAppPatchDir(NULL, buf, MAX_PATH); + lstrcatW(buf, aclayers); + dll = LoadLibraryW(buf); + pGetHookAPIs = (void*)GetProcAddress(dll, "GetHookAPIs"); + + if (!pGetHookAPIs) + { + skip("aclayers.dll not loaded, or does not export GetHookAPIs\n"); + return; + } + g_WinVersion = get_host_winver(); + + run_test("Win95VersionLie", &g_Win95); + run_test("WinNT4SP5VersionLie", &g_WinNT4SP5); + run_test("Win98VersionLie", &g_Win98); + run_test("Win2000VersionLie", &g_Win2000); + run_test("Win2000SP1VersionLie", &g_Win2000SP1); + run_test("Win2000SP2VersionLie", &g_Win2000SP2); + run_test("Win2000SP3VersionLie", &g_Win2000SP3); + run_test("WinXPVersionLie", &g_WinXP); + run_test("WinXPSP1VersionLie", &g_WinXPSP1); + run_test("WinXPSP2VersionLie", &g_WinXPSP2); + run_test("WinXPSP3VersionLie", &g_WinXPSP3); + run_test("Win2k3RTMVersionLie", &g_Win2k3RTM); + run_test("Win2k3SP1VersionLie", &g_Win2k3SP1); + run_test("VistaRTMVersionLie", &g_WinVistaRTM); + run_test("VistaSP1VersionLie", &g_WinVistaSP1); + run_test("VistaSP2VersionLie", &g_WinVistaSP2); + run_test("Win7RTMVersionLie", &g_Win7RTM); +} Propchange: trunk/rostests/apitests/apphelp/versionlie.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71441: [SHELL32]: Always paint the desktop listview transparent. This allows explorer to display the default desktop background color set by win32k as well as the ReactOS version on the ...
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 16:59:55 2016 New Revision: 71441 URL: http://svn.reactos.org/svn/reactos?rev=71441&view=rev Log: [SHELL32]: Always paint the desktop listview transparent. This allows explorer to display the default desktop background color set by win32k as well as the ReactOS version on the desktop. See also r66271 and r66752. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat May 28 16:59:55 2016 @@ -582,20 +582,27 @@ DWORD cbDropShadow = sizeof(bDropShadow); WCHAR wszBuf[16] = L""; + /* + * The desktop ListView always take the default desktop colours, by + * remaining transparent and letting user32/win32k paint itself the + * desktop background color, if any. + */ + m_ListView.SetBkColor(CLR_NONE); + RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"ListviewShadow", RRF_RT_DWORD, NULL, &bDropShadow, &cbDropShadow); if (bDropShadow && SystemParametersInfoW(SPI_GETDESKWALLPAPER, _countof(wszBuf), wszBuf, 0) && wszBuf[0]) { + /* Set the icon background transparent */ m_ListView.SetTextBkColor(CLR_NONE); - m_ListView.SetBkColor(CLR_NONE); m_ListView.SetTextColor(RGB(255, 255, 255)); m_ListView.SetExtendedListViewStyle(LVS_EX_TRANSPARENTSHADOWTEXT, LVS_EX_TRANSPARENTSHADOWTEXT); } else { + /* Set the icon background as the same colour as the desktop */ COLORREF crDesktop = GetSysColor(COLOR_DESKTOP); m_ListView.SetTextBkColor(crDesktop); - m_ListView.SetBkColor(crDesktop); if (GetRValue(crDesktop) + GetGValue(crDesktop) + GetBValue(crDesktop) > 128 * 3) m_ListView.SetTextColor(RGB(0, 0, 0)); else

1 0

[mjansen] 71440: [APPHELP] Register AppPatch directory with cmake, import SdbGetAppPatchDir implementation from Mislav Blažević CORE-10369
by mjansen＠svn.reactos.org 28 May '16

28 May '16

Author: mjansen Date: Sat May 28 16:47:39 2016 New Revision: 71440 URL: http://svn.reactos.org/svn/reactos?rev=71440&view=rev Log: [APPHELP] Register AppPatch directory with cmake, import SdbGetAppPatchDir implementation from Mislav Blažević CORE-10369 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat May 28 16:47:39 2016 @@ -69,6 +69,7 @@ 50 = security\templates 51 = system32\CatRoot 52 = system32\CatRoot2 +53 = AppPatch .InfEnd Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sat May 28 16:47:39 2016 @@ -49,6 +49,11 @@ #define SDB_DATABASE_MAIN_MSI 0x80020000 #define SDB_DATABASE_MAIN_SHIM 0x80030000 #define SDB_DATABASE_MAIN_DRIVERS 0x80040000 + +typedef struct _SDB { + PDB db; + BOOL auto_loaded; +} SDB, *HSDB; typedef struct tagATTRINFO { TAG type; Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sat May 28 16:47:39 2016 @@ -52,7 +52,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(ptr wstr long) @ stdcall SdbGetBinaryTagData(ptr long) @ stdcall SdbGetDatabaseID(ptr ptr) @ stub SdbGetDatabaseInformation Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sat May 28 16:47:39 2016 @@ -431,6 +431,53 @@ NtClose(db->file); SdbFree(db->data); SdbFree(db); +} + +/** + * Retrieves AppPatch directory. + * + * @param [in] db Handle to the shim database. + * @param [out] path Pointer to memory in which path shall be written. + * @param [in] size Size of the buffer in characters. + */ +BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size) +{ + static WCHAR* default_dir = NULL; + + if(!default_dir) + { + WCHAR* tmp = NULL; + UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW((CONST WCHAR[]){'\\','A','p','p','P','a','t','c','h',0}); + tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); + if(tmp) + { + UINT r = GetSystemWindowsDirectoryW(tmp, len+1); + if (r && r < len) + { + if (SUCCEEDED(StringCchCatW(tmp, len+1, (CONST WCHAR[]){'\\','A','p','p','P','a','t','c','h',0}))) + { + if(InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) + tmp = NULL; + } + } + if (tmp) + SdbFree(tmp); + } + } + + /* In case function fails, path holds empty string */ + if (size > 0) + *path = 0; + + if (!db) + { + return SUCCEEDED(StringCchCopyW(path, size, default_dir)); + } + else + { + /* fixme */ + return FALSE; + } } /** Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Sat May 28 16:47:39 2016 @@ -261,6 +261,8 @@ set(${var} 51) elseif(${dir} STREQUAL reactos/system32/CatRoot2) set(${var} 52) + elseif(${dir} STREQUAL reactos/AppPatch) + set(${var} 53) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

← Newer
1
2
3
4
5
6
7
...
26
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016