Ros-diffs December 2016

ros-diffs@reactos.org

10 participants
83 discussions

[ekohl] 73423: [INCLUDE] Add CreateUserProfileExA and CreateUserProfileExW prototypes to userenv.h.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 4 15:56:44 2016 New Revision: 73423 URL: http://svn.reactos.org/svn/reactos?rev=73423&view=rev Log: [INCLUDE] Add CreateUserProfileExA and CreateUserProfileExW prototypes to userenv.h. Modified: trunk/reactos/sdk/include/psdk/userenv.h Modified: trunk/reactos/sdk/include/psdk/userenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/userenv.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/userenv.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/userenv.h [iso-8859-1] Sun Dec 4 15:56:44 2016 @@ -89,6 +89,8 @@ BOOL WINAPI InitializeProfiles (VOID); BOOL WINAPI CreateUserProfileA (PSID, LPCSTR); BOOL WINAPI CreateUserProfileW (PSID, LPCWSTR); +BOOL WINAPI CreateUserProfileExA (PSID, LPCSTR, LPCSTR, LPSTR, DWORD, BOOL); +BOOL WINAPI CreateUserProfileExW (PSID, LPCWSTR, LPCWSTR, LPWSTR, DWORD, BOOL); BOOL WINAPI AddDesktopItemA (BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT); BOOL WINAPI AddDesktopItemW (BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT); BOOL WINAPI DeleteDesktopItemA (BOOL, LPCSTR); @@ -163,6 +165,7 @@ typedef LPPROFILEINFOW LPPROFILEINFO; /* begin private */ #define CreateUserProfile CreateUserProfileW +#define CreateUserProfileEx CreateUserProfileExW #define AddDesktopItem AddDesktopItemW #define DeleteDesktopItem DeleteDesktopItemW #define CreateGroup CreateGroupW @@ -189,6 +192,7 @@ typedef LPPROFILEINFOA LPPROFILEINFO; /* begin private */ #define CreateUserProfile CreateUserProfileA +#define CreateUserProfileEx CreateUserProfileExA #define AddDesktopItem AddDesktopItemA #define DeleteDesktopItem DeleteDesktopItemA #define CreateGroup CreateGroupA

8 years

[mjansen] 73422: [APPSHIM_APITEST] Add tests for the DisableThemes shim. CORE-11927

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Dec 4 15:33:28 2016 New Revision: 73422 URL: http://svn.reactos.org/svn/reactos?rev=73422&view=rev Log: [APPSHIM_APITEST] Add tests for the DisableThemes shim. CORE-11927 Modified: trunk/rostests/apitests/appshim/dispmode.c Modified: trunk/rostests/apitests/appshim/dispmode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/dispmode… ============================================================================== --- trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] Sun Dec 4 15:33:28 2016 @@ -46,7 +46,7 @@ static DEVMODEA g_LastDevmode; static DWORD g_LastFlags; -LONG (WINAPI *pChangeDisplaySettingsA)(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags); +static LONG (WINAPI *pChangeDisplaySettingsA)(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags); LONG WINAPI mChangeDisplaySettingsA(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags) { g_Count++; @@ -56,15 +56,33 @@ return DISP_CHANGE_FAILED; } - -static void pre_8bit() +static LONG g_ThemeCount; +static DWORD g_LastThemeFlags; + +static void (WINAPI *pSetThemeAppProperties)(DWORD dwFlags); +void WINAPI mSetThemeAppProperties(DWORD dwFlags) +{ + g_ThemeCount++; + g_LastThemeFlags = dwFlags; +} + + +static const WCHAR* shim_dll(const WCHAR* name) +{ + static WCHAR buf[MAX_PATH]; + pSdbGetAppPatchDir(NULL, buf, MAX_PATH); + StringCchCatW(buf, _countof(buf), name); + return buf; +} + +static void pre_8bit(void) { g_Count = 0; memset(&g_LastDevmode, 0, sizeof(g_LastDevmode)); g_LastFlags = 0xffffffff; } -static void post_8bit() +static void post_8bit(void) { ok_int(g_Count, 1); ok_hex(g_LastDevmode.dmFields & DM_BITSPERPEL, DM_BITSPERPEL); @@ -72,14 +90,14 @@ ok_hex(g_LastFlags, CDS_FULLSCREEN); } -static void pre_640() +static void pre_640(void) { g_Count = 0; memset(&g_LastDevmode, 0, sizeof(g_LastDevmode)); g_LastFlags = 0xffffffff; } -static void post_640() +static void post_640(void) { ok_int(g_Count, 1); ok_hex(g_LastDevmode.dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT), (DM_PELSWIDTH | DM_PELSHEIGHT)); @@ -88,8 +106,17 @@ ok_hex(g_LastFlags, CDS_FULLSCREEN); } - - +static void pre_theme(void) +{ + g_ThemeCount = 0; + g_LastThemeFlags = 0xffffffff; +} + +static void post_theme(void) +{ + ok_int(g_ThemeCount, 1); + ok_hex(g_LastThemeFlags, 0); +} static PIMAGE_IMPORT_DESCRIPTOR FindImportDescriptor(PBYTE DllBase, PCSTR DllName) { @@ -144,6 +171,15 @@ return FALSE; } +static BOOL hook_disp(HMODULE dll) +{ + return RedirectIat(dll, "user32.dll", "ChangeDisplaySettingsA", (ULONG_PTR)mChangeDisplaySettingsA, (ULONG_PTR*)&pChangeDisplaySettingsA); +} + +static BOOL hook_theme(HMODULE dll) +{ + return RedirectIat(dll, "uxtheme.dll", "SetThemeAppProperties", (ULONG_PTR)mSetThemeAppProperties, (ULONG_PTR*)&pSetThemeAppProperties); +} static void test_one(LPCSTR shim, DWORD dwReason, void(*pre)(), void(*post)()) @@ -178,28 +214,30 @@ static struct test_info { const char* name; + const WCHAR* dll; DWORD winver; DWORD reason; - void(*pre)(); - void(*post)(); + BOOL(*hook)(HMODULE); + void(*pre)(void); + void(*post)(void); } tests[] = { - { "Force8BitColor", WINVER_ANY, 1, pre_8bit, post_8bit }, - { "Force8BitColor", WINVER_VISTA, 100, pre_8bit, post_8bit }, - { "Force640x480", WINVER_ANY, 1, pre_640, post_640 }, - { "Force640x480", WINVER_VISTA, 100, pre_640, post_640 }, - /* { "DisableThemes" }, AcGenral.dll */ + { "Force8BitColor", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_8bit, post_8bit }, + { "Force8BitColor", L"\\aclayers.dll", WINVER_VISTA, 100, hook_disp, pre_8bit, post_8bit }, + { "Force640x480", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_640, post_640 }, + { "Force640x480", L"\\aclayers.dll", WINVER_VISTA, 100, hook_disp, pre_640, post_640 }, + { "DisableThemes", L"\\acgenral.dll", WINVER_ANY, 1, hook_theme, pre_theme, post_theme }, + { "DisableThemes", L"\\acgenral.dll", WINVER_VISTA, 100, hook_theme, pre_theme, post_theme }, }; -static void run_test(size_t n, WCHAR* buf, BOOL unload) +static void run_test(size_t n, BOOL unload) { BOOL ret; HMODULE dll; - - trace("Running %d (%s)\n", n, tests[n].name); - - dll = LoadLibraryW(buf); + const WCHAR* buf = shim_dll(tests[n].dll); + + dll = LoadLibraryW(shim_dll(tests[n].dll)); pGetHookAPIs = (void*)GetProcAddress(dll, "GetHookAPIs"); pNotifyShims = (void*)GetProcAddress(dll, "NotifyShims"); @@ -210,14 +248,14 @@ return; } - ret = RedirectIat(dll, "user32.dll", "ChangeDisplaySettingsA", (ULONG_PTR)mChangeDisplaySettingsA, (ULONG_PTR*)&pChangeDisplaySettingsA); + ret = tests[n].hook(dll); if (ret) { test_one(tests[n].name, tests[n].reason, tests[n].pre, tests[n].post); } else { - ok(0, "Unable to redirect ChangeDisplaySettingsA!\n"); + ok(0, "Unable to redirect functions!\n"); } FreeLibrary(dll); if (unload) @@ -231,8 +269,6 @@ START_TEST(dispmode) { HMODULE dll = LoadLibraryA("apphelp.dll"); - WCHAR buf[MAX_PATH]; - WCHAR aclayers[] = L"\\aclayers.dll"; size_t n; int argc; char **argv; @@ -246,26 +282,27 @@ g_WinVersion = get_host_winver(); - pSdbGetAppPatchDir(NULL, buf, MAX_PATH); - StringCchCatW(buf, _countof(buf), aclayers); - argc = winetest_get_mainargs(&argv); if (argc < 3) { WCHAR path[MAX_PATH]; GetModuleFileNameW(NULL, path, _countof(path)); - dll = GetModuleHandleW(buf); + dll = GetModuleHandleW(shim_dll(L"\\aclayers.dll")); + if (!dll) + dll = GetModuleHandleW(shim_dll(L"\\acgenral.dll")); if (dll != NULL) trace("Loaded under a shim, running each test in it's own process\n"); for (n = 0; n < _countof(tests); ++n) { + LONG failures = winetest_get_failures(); + if (g_WinVersion < tests[n].winver) continue; if (dll == NULL) { - run_test(n, buf, TRUE); + run_test(n, TRUE); } else { @@ -284,6 +321,11 @@ CloseHandle(pi.hProcess); } } + + if (failures != winetest_get_failures()) + { + trace("Failures from %d (%s)\n", n, tests[n].name); + } } } else @@ -291,7 +333,7 @@ n = (size_t)atoi(argv[2]); if (n >= 0 && n < _countof(tests)) { - run_test(n, buf, FALSE); + run_test(n, FALSE); } else {

8 years

[mjansen] 73421: [APPSHIM_APITEST] Add tests for display mode shims. CORE-11927

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Dec 3 21:24:47 2016 New Revision: 73421 URL: http://svn.reactos.org/svn/reactos?rev=73421&view=rev Log: [APPSHIM_APITEST] Add tests for display mode shims. CORE-11927 Added: trunk/rostests/apitests/appshim/dispmode.c (with props) Modified: trunk/rostests/apitests/appshim/CMakeLists.txt trunk/rostests/apitests/appshim/testlist.c trunk/rostests/apitests/appshim/versionlie.c Modified: trunk/rostests/apitests/appshim/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/CMakeLis… ============================================================================== --- trunk/rostests/apitests/appshim/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/CMakeLists.txt [iso-8859-1] Sat Dec 3 21:24:47 2016 @@ -2,6 +2,7 @@ add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE + dispmode.c versionlie.c testlist.c) Added: trunk/rostests/apitests/appshim/dispmode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/dispmode… ============================================================================== --- trunk/rostests/apitests/appshim/dispmode.c (added) +++ trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] Sat Dec 3 21:24:47 2016 @@ -0,0 +1,301 @@ +/* + * Copyright 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 + * 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 <strsafe.h> +#include "wine/test.h" + +extern DWORD get_host_winver(void); +static DWORD g_WinVersion; +#define WINVER_ANY 0 +#define WINVER_VISTA 0x0600 + + +/* apphelp.dll */ +static BOOL(WINAPI* pSdbGetAppPatchDir)(PVOID, LPWSTR, DWORD); + +/* aclayers.dll */ +static PVOID(WINAPI* pGetHookAPIs)(LPCSTR, LPCWSTR, PDWORD); +static BOOL(WINAPI* pNotifyShims)(DWORD fdwReason, PVOID ptr); + + +static LONG g_Count; +static DEVMODEA g_LastDevmode; +static DWORD g_LastFlags; + +LONG (WINAPI *pChangeDisplaySettingsA)(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags); +LONG WINAPI mChangeDisplaySettingsA(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags) +{ + g_Count++; + g_LastDevmode = *lpDevMode; + g_LastFlags = dwflags; + + return DISP_CHANGE_FAILED; +} + + +static void pre_8bit() +{ + g_Count = 0; + memset(&g_LastDevmode, 0, sizeof(g_LastDevmode)); + g_LastFlags = 0xffffffff; +} + +static void post_8bit() +{ + ok_int(g_Count, 1); + ok_hex(g_LastDevmode.dmFields & DM_BITSPERPEL, DM_BITSPERPEL); + ok_int(g_LastDevmode.dmBitsPerPel, 8); + ok_hex(g_LastFlags, CDS_FULLSCREEN); +} + +static void pre_640() +{ + g_Count = 0; + memset(&g_LastDevmode, 0, sizeof(g_LastDevmode)); + g_LastFlags = 0xffffffff; +} + +static void post_640() +{ + ok_int(g_Count, 1); + ok_hex(g_LastDevmode.dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT), (DM_PELSWIDTH | DM_PELSHEIGHT)); + ok_int(g_LastDevmode.dmPelsWidth, 640); + ok_int(g_LastDevmode.dmPelsHeight, 480); + ok_hex(g_LastFlags, CDS_FULLSCREEN); +} + + + + +static PIMAGE_IMPORT_DESCRIPTOR FindImportDescriptor(PBYTE DllBase, PCSTR DllName) +{ + ULONG Size; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor = RtlImageDirectoryEntryToData((HMODULE)DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &Size); + while (ImportDescriptor->Name && ImportDescriptor->OriginalFirstThunk) + { + PCHAR Name = (PCHAR)(DllBase + ImportDescriptor->Name); + if (!lstrcmpiA(Name, DllName)) + { + return ImportDescriptor; + } + ImportDescriptor++; + } + return NULL; +} + +static BOOL RedirectIat(HMODULE TargetDll, PCSTR DllName, PCSTR FunctionName, ULONG_PTR NewFunction, ULONG_PTR* OriginalFunction) +{ + PBYTE DllBase = (PBYTE)TargetDll; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor = FindImportDescriptor(DllBase, DllName); + if (ImportDescriptor) + { + // On loaded images, OriginalFirstThunk points to the name / ordinal of the function + PIMAGE_THUNK_DATA OriginalThunk = (PIMAGE_THUNK_DATA)(DllBase + ImportDescriptor->OriginalFirstThunk); + // FirstThunk points to the resolved address. + PIMAGE_THUNK_DATA FirstThunk = (PIMAGE_THUNK_DATA)(DllBase + ImportDescriptor->FirstThunk); + while (OriginalThunk->u1.AddressOfData && FirstThunk->u1.Function) + { + if (!IMAGE_SNAP_BY_ORDINAL32(OriginalThunk->u1.AddressOfData)) + { + PIMAGE_IMPORT_BY_NAME ImportName = (PIMAGE_IMPORT_BY_NAME)(DllBase + OriginalThunk->u1.AddressOfData); + if (!lstrcmpiA((PCSTR)ImportName->Name, FunctionName)) + { + DWORD dwOld; + VirtualProtect(&FirstThunk->u1.Function, sizeof(ULONG_PTR), PAGE_EXECUTE_READWRITE, &dwOld); + *OriginalFunction = FirstThunk->u1.Function; + FirstThunk->u1.Function = NewFunction; + VirtualProtect(&FirstThunk->u1.Function, sizeof(ULONG_PTR), dwOld, &dwOld); + return TRUE; + } + } + OriginalThunk++; + FirstThunk++; + } + skip("Unable to find the Import %s!%s\n", DllName, FunctionName); + } + else + { + skip("Unable to find the ImportDescriptor for %s\n", DllName); + } + return FALSE; +} + + + +static void test_one(LPCSTR shim, DWORD dwReason, void(*pre)(), void(*post)()) +{ + DWORD num_shims = 0; + WCHAR wide_shim[50] = { 0 }; + PVOID hook; + BOOL ret; + MultiByteToWideChar(CP_ACP, 0, shim, -1, wide_shim, 50); + + if (pre) + pre(); + + hook = pGetHookAPIs("", wide_shim, &num_shims); + 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); + ok(num_shims == 0, "Expected not to find any apihooks, got: %u for %s\n", num_shims, shim); + + ret = pNotifyShims(dwReason, NULL); + + /* Win7 and Win10 return 1, w2k3 returns a pointer */ + ok(ret != 0, "Expected pNotifyShims to succeed (%i)\n", ret); + + if (post) + post(); +} + +static struct test_info +{ + const char* name; + DWORD winver; + DWORD reason; + void(*pre)(); + void(*post)(); +} tests[] = +{ + { "Force8BitColor", WINVER_ANY, 1, pre_8bit, post_8bit }, + { "Force8BitColor", WINVER_VISTA, 100, pre_8bit, post_8bit }, + { "Force640x480", WINVER_ANY, 1, pre_640, post_640 }, + { "Force640x480", WINVER_VISTA, 100, pre_640, post_640 }, + /* { "DisableThemes" }, AcGenral.dll */ +}; + + +static void run_test(size_t n, WCHAR* buf, BOOL unload) +{ + BOOL ret; + HMODULE dll; + + trace("Running %d (%s)\n", n, tests[n].name); + + dll = LoadLibraryW(buf); + pGetHookAPIs = (void*)GetProcAddress(dll, "GetHookAPIs"); + pNotifyShims = (void*)GetProcAddress(dll, "NotifyShims"); + + if (!pGetHookAPIs || !pNotifyShims) + { + skip("aclayers.dll not loaded, or does not export GetHookAPIs or pNotifyShims (%s, %p, %p)\n", + tests[n].name, pGetHookAPIs, pNotifyShims); + return; + } + + ret = RedirectIat(dll, "user32.dll", "ChangeDisplaySettingsA", (ULONG_PTR)mChangeDisplaySettingsA, (ULONG_PTR*)&pChangeDisplaySettingsA); + if (ret) + { + test_one(tests[n].name, tests[n].reason, tests[n].pre, tests[n].post); + } + else + { + ok(0, "Unable to redirect ChangeDisplaySettingsA!\n"); + } + FreeLibrary(dll); + if (unload) + { + dll = GetModuleHandleW(buf); + ok(dll == NULL, "Unable to unload %s\n", wine_dbgstr_w(buf)); + } +} + + +START_TEST(dispmode) +{ + HMODULE dll = LoadLibraryA("apphelp.dll"); + WCHAR buf[MAX_PATH]; + WCHAR aclayers[] = L"\\aclayers.dll"; + size_t n; + int argc; + char **argv; + + pSdbGetAppPatchDir = (void*)GetProcAddress(dll, "SdbGetAppPatchDir"); + if (!pSdbGetAppPatchDir) + { + skip("apphelp.dll not loaded, or does not export SdbGetAppPatchDir\n"); + return; + } + + g_WinVersion = get_host_winver(); + + pSdbGetAppPatchDir(NULL, buf, MAX_PATH); + StringCchCatW(buf, _countof(buf), aclayers); + + argc = winetest_get_mainargs(&argv); + if (argc < 3) + { + WCHAR path[MAX_PATH]; + GetModuleFileNameW(NULL, path, _countof(path)); + dll = GetModuleHandleW(buf); + if (dll != NULL) + trace("Loaded under a shim, running each test in it's own process\n"); + + for (n = 0; n < _countof(tests); ++n) + { + if (g_WinVersion < tests[n].winver) + continue; + + if (dll == NULL) + { + run_test(n, buf, TRUE); + } + else + { + WCHAR buf[MAX_PATH+40]; + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + BOOL created; + + StringCchPrintfW(buf, _countof(buf), L"\"%ls\" dispmode %u", path, n); + created = CreateProcessW(NULL, buf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(created, "Expected CreateProcess to succeed\n"); + if (created) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } + } + } + } + else + { + n = (size_t)atoi(argv[2]); + if (n >= 0 && n < _countof(tests)) + { + run_test(n, buf, FALSE); + } + else + { + ok(0, "Test out of range: %u\n", n); + } + } +} Propchange: trunk/rostests/apitests/appshim/dispmode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/appshim/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/testlist… ============================================================================== --- trunk/rostests/apitests/appshim/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/testlist.c [iso-8859-1] Sat Dec 3 21:24:47 2016 @@ -3,10 +3,12 @@ #define STANDALONE #include <wine/test.h> +extern void func_dispmode(void); extern void func_versionlie(void); const struct test winetest_testlist[] = { + { "dispmode", func_dispmode }, { "versionlie", func_versionlie }, { 0, 0 } }; Modified: trunk/rostests/apitests/appshim/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/versionl… ============================================================================== --- trunk/rostests/apitests/appshim/versionlie.c [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/versionlie.c [iso-8859-1] Sat Dec 3 21:24:47 2016 @@ -279,21 +279,6 @@ } } -static void hookless_shim(LPCSTR shim) -{ - DWORD num_shims = 0; - WCHAR wide_shim[50] = { 0 }; - PHOOKAPI hook; - MultiByteToWideChar(CP_ACP, 0, shim, -1, wide_shim, 50); - hook = pGetHookAPIs("", wide_shim, &num_shims); - 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); - ok(num_shims == 0, "Expected not to find any apihooks, got: %u for %s\n", num_shims, shim); -} 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 }; @@ -370,8 +355,4 @@ run_test("VistaSP1VersionLie", &g_WinVistaSP1); run_test("VistaSP2VersionLie", &g_WinVistaSP2); run_test("Win7RTMVersionLie", &g_Win7RTM); - - hookless_shim("Force8BitColor"); - hookless_shim("Force640x480"); - hookless_shim("DisableThemes"); -} +}

8 years

[ekohl] 73420: [SERVICES] - Code cleanup. - ScmCreateOrReferenceServiceImage() and ScmDereferenceServiceImage(): Close the logon token and service process handles properly. - ScmStartUserModeServic...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 3 14:33:07 2016 New Revision: 73420 URL: http://svn.reactos.org/svn/reactos?rev=73420&view=rev Log: [SERVICES] - Code cleanup. - ScmCreateOrReferenceServiceImage() and ScmDereferenceServiceImage(): Close the logon token and service process handles properly. - ScmStartUserModeService(): Store the service process handle in the SERVICE_IMAGE struct. Patch by Hermès BÉLUSCA - MAÏTO. Modified: trunk/reactos/base/system/services/database.c 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 Dec 3 14:33:07 2016 @@ -153,8 +153,8 @@ static BOOL ScmIsSameServiceAccount( - IN PWSTR pszAccountName1, - IN PWSTR pszAccountName2) + _In_ PCWSTR pszAccountName1, + _In_ PCWSTR pszAccountName2) { if (pszAccountName1 == NULL && pszAccountName2 == NULL) return TRUE; @@ -175,7 +175,7 @@ static BOOL ScmIsLocalSystemAccount( - IN PWSTR pszAccountName) + _In_ PCWSTR pszAccountName) { if (pszAccountName == NULL || wcscmp(pszAccountName, L"LocalSystem") == 0) @@ -306,6 +306,7 @@ pServiceImage->dwImageRunCount = 1; pServiceImage->hControlPipe = INVALID_HANDLE_VALUE; + pServiceImage->hProcess = INVALID_HANDLE_VALUE; pString = (PWSTR)((INT_PTR)pServiceImage + sizeof(SERVICE_IMAGE)); @@ -329,6 +330,10 @@ if (dwError != ERROR_SUCCESS) { DPRINT1("ScmLogonService() failed (Error %lu)\n", dwError); + + /* Release the service image */ + HeapFree(GetProcessHeap(), 0, pServiceImage); + goto done; } @@ -336,7 +341,15 @@ dwError = ScmCreateNewControlPipe(pServiceImage); if (dwError != ERROR_SUCCESS) { + DPRINT1("ScmCreateNewControlPipe() failed (Error %lu)\n", dwError); + + /* Close the logon token */ + if (pServiceImage->hToken != NULL) + CloseHandle(pServiceImage->hToken); + + /* Release the service image */ HeapFree(GetProcessHeap(), 0, pServiceImage); + goto done; } @@ -395,13 +408,17 @@ /* Remove the service image from the list */ RemoveEntryList(&pServiceImage->ImageListEntry); + /* Close the process handle */ + if (pServiceImage->hProcess != INVALID_HANDLE_VALUE) + CloseHandle(pServiceImage->hProcess); + + /* Close the control pipe */ + if (pServiceImage->hControlPipe != INVALID_HANDLE_VALUE) + CloseHandle(pServiceImage->hControlPipe); + /* Close the logon token */ if (pServiceImage->hToken != NULL) CloseHandle(pServiceImage->hToken); - - /* Close the control pipe */ - if (pServiceImage->hControlPipe != INVALID_HANDLE_VALUE) - CloseHandle(pServiceImage->hControlPipe); /* Release the service image */ HeapFree(GetProcessHeap(), 0, pServiceImage); @@ -1706,30 +1723,25 @@ ProcessInformation.dwThreadId, ProcessInformation.hThread); - /* Get process handle and id */ + /* Get the process handle and ID */ + Service->lpImage->hProcess = ProcessInformation.hProcess; Service->lpImage->dwProcessId = ProcessInformation.dwProcessId; - /* Resume Thread */ + /* Resume the main thread and close its handle */ ResumeThread(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hThread); /* Connect control pipe */ dwError = ScmWaitForServiceConnect(Service); - if (dwError == ERROR_SUCCESS) - { - /* Send start command */ - dwError = ScmSendStartCommand(Service, argc, argv); - } - else + if (dwError != ERROR_SUCCESS) { DPRINT1("Connecting control pipe failed! (Error %lu)\n", dwError); Service->lpImage->dwProcessId = 0; - } - - /* Close thread and process handle */ - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); - - return dwError; + return dwError; + } + + /* Send the start command */ + return ScmSendStartCommand(Service, argc, argv); }

8 years

[ekohl] 73419: [SERVICES] Tiny fixes. One fix found by Serge Gautherie.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 3 13:54:11 2016 New Revision: 73419 URL: http://svn.reactos.org/svn/reactos?rev=73419&view=rev Log: [SERVICES] Tiny fixes. One fix found by Serge Gautherie. Modified: trunk/reactos/base/system/services/rpcserver.c 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 Dec 3 13:54:11 2016 @@ -1443,7 +1443,7 @@ { PSERVICE_HANDLE hSvc; PSERVICE lpService; - ULONG DesiredAccess = 0; + ACCESS_MASK DesiredAccess = 0; HANDLE hToken = NULL; HKEY hServiceKey = NULL; BOOL bDatabaseLocked = FALSE; @@ -6361,7 +6361,7 @@ sizeof(SERVICE_STATUS)); /* Copy the service process ID */ - if ((CurrentService->Status.dwCurrentState == SERVICE_STOPPED) ||(CurrentService->lpImage == NULL)) + if ((CurrentService->Status.dwCurrentState == SERVICE_STOPPED) || (CurrentService->lpImage == NULL)) lpStatusPtr->ServiceStatusProcess.dwProcessId = 0; else lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->lpImage->dwProcessId;

8 years

[ekohl] 73418: [SERVICES] Add more parameter checks to RChangeServiceConfigW().

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 3 12:55:29 2016 New Revision: 73418 URL: http://svn.reactos.org/svn/reactos?rev=73418&view=rev Log: [SERVICES] Add more parameter checks to RChangeServiceConfigW(). Modified: trunk/reactos/base/system/services/rpcserver.c 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 Dec 3 12:55:29 2016 @@ -1845,6 +1845,40 @@ DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } + + /* Check for invalid service type value */ + if ((dwServiceType != SERVICE_NO_CHANGE) && + (dwServiceType != SERVICE_KERNEL_DRIVER) && + (dwServiceType != SERVICE_FILE_SYSTEM_DRIVER) && + ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_OWN_PROCESS) && + ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_SHARE_PROCESS)) + return ERROR_INVALID_PARAMETER; + + /* Check for invalid start type value */ + if ((dwStartType != SERVICE_NO_CHANGE) && + (dwStartType != SERVICE_BOOT_START) && + (dwStartType != SERVICE_SYSTEM_START) && + (dwStartType != SERVICE_AUTO_START) && + (dwStartType != SERVICE_DEMAND_START) && + (dwStartType != SERVICE_DISABLED)) + return ERROR_INVALID_PARAMETER; + + /* Only drivers can be boot start or system start services */ + if ((dwStartType == SERVICE_BOOT_START) || + (dwStartType == SERVICE_SYSTEM_START)) + { + if ((dwServiceType != SERVICE_KERNEL_DRIVER) && + (dwServiceType != SERVICE_FILE_SYSTEM_DRIVER)) + return ERROR_INVALID_PARAMETER; + } + + /* Check for invalid error control value */ + if ((dwErrorControl != SERVICE_NO_CHANGE) && + (dwErrorControl != SERVICE_ERROR_IGNORE) && + (dwErrorControl != SERVICE_ERROR_NORMAL) && + (dwErrorControl != SERVICE_ERROR_SEVERE) && + (dwErrorControl != SERVICE_ERROR_CRITICAL)) + return ERROR_INVALID_PARAMETER; lpService = hSvc->ServiceEntry; if (lpService == NULL)

8 years

[ekohl] 73417: [SERVICES] Implement large parts of RI_ScGetCurrentGroupStateW.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 3 12:48:44 2016 New Revision: 73417 URL: http://svn.reactos.org/svn/reactos?rev=73417&view=rev Log: [SERVICES] Implement large parts of RI_ScGetCurrentGroupStateW. Modified: trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/groupdb.c [iso-8859-1] Sat Dec 3 12:48:44 2016 @@ -21,6 +21,41 @@ /* FUNCTIONS *****************************************************************/ + +PSERVICE_GROUP +ScmGetServiceGroupByName( + _In_ LPCWSTR lpGroupName) +{ + PLIST_ENTRY GroupEntry; + PSERVICE_GROUP lpGroup; + + DPRINT("ScmGetServiceGroupByName(%S)\n", lpGroupName); + + GroupEntry = GroupListHead.Flink; + while (GroupEntry != &GroupListHead) + { + lpGroup = CONTAINING_RECORD(GroupEntry, SERVICE_GROUP, GroupListEntry); + + if (!_wcsicmp(lpGroup->lpGroupName, lpGroupName)) + return lpGroup; + + GroupEntry = GroupEntry->Flink; + } + + GroupEntry = UnknownGroupListHead.Flink; + while (GroupEntry != &UnknownGroupListHead) + { + lpGroup = CONTAINING_RECORD(GroupEntry, SERVICE_GROUP, GroupListEntry); + + if (!_wcsicmp(lpGroup->lpGroupName, lpGroupName)) + return lpGroup; + + GroupEntry = GroupEntry->Flink; + } + + return NULL; +} + DWORD ScmSetServiceGroup(PSERVICE lpService, 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 Dec 3 12:48:44 2016 @@ -1443,7 +1443,7 @@ { PSERVICE_HANDLE hSvc; PSERVICE lpService; - ACCESS_MASK DesiredAccess = 0; + ULONG DesiredAccess = 0; HANDLE hToken = NULL; HKEY hServiceKey = NULL; BOOL bDatabaseLocked = FALSE; @@ -4580,8 +4580,52 @@ LPWSTR lpLoadOrderGroup, LPDWORD lpState) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PMANAGER_HANDLE hManager; + PSERVICE_GROUP pServiceGroup; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("RI_ScGetCurrentGroupStateW() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hManager = ScmGetServiceManagerFromHandle(hSCManager); + if (hManager == NULL) + { + DPRINT1("Invalid service manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check for SC_MANAGER_ENUMERATE_SERVICE access right */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + /* Lock the service database shared */ + ScmLockDatabaseShared(); + + /* Get the group list entry */ + pServiceGroup = ScmGetServiceGroupByName(lpLoadOrderGroup); + if (pServiceGroup == NULL) + { + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + goto done; + } + + /* FIXME: Return the group state */ + *lpState = 0; + +done: + /* Unlock the service database */ + ScmUnlockDatabase(); + + DPRINT("RI_ScGetCurrentGroupStateW() done (Error %lu)\n", dwError); + + return dwError; } 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 Dec 3 12:48:44 2016 @@ -193,6 +193,10 @@ /* groupdb.c */ +PSERVICE_GROUP +ScmGetServiceGroupByName( + _In_ LPCWSTR lpGroupName); + DWORD ScmCreateGroupList(VOID); DWORD ScmSetServiceGroup(PSERVICE lpService, LPCWSTR lpGroupName);

8 years

[ekohl] 73416: [SERVICES] - Get rid of the obsolete USE_SERVICE_START_PENDING option. - Services do not accept any command when they are in SERVICE_START_PENDING state. Patch by Hermès BÉLUSCA - MA...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 3 09:33:03 2016 New Revision: 73416 URL: http://svn.reactos.org/svn/reactos?rev=73416&view=rev Log: [SERVICES] - Get rid of the obsolete USE_SERVICE_START_PENDING option. - Services do not accept any command when they are in SERVICE_START_PENDING state. Patch by Hermès BÉLUSCA - MAÏTO. Modified: trunk/reactos/base/system/services/database.c 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 Dec 3 09:33:03 2016 @@ -18,12 +18,6 @@ #define NDEBUG #include <debug.h> - -/* - * Uncomment the line below to start services - * using the SERVICE_START_PENDING state. - */ -#define USE_SERVICE_START_PENDING /* * Uncomment the line below to use asynchronous IO operations @@ -1766,8 +1760,8 @@ dwError = ScmLoadDriver(Service); if (dwError == ERROR_SUCCESS) { + Service->Status.dwCurrentState = SERVICE_RUNNING; Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - Service->Status.dwCurrentState = SERVICE_RUNNING; } } else // if (Service->Status.dwServiceType & (SERVICE_WIN32 | SERVICE_INTERACTIVE_PROCESS)) @@ -1779,11 +1773,8 @@ dwError = ScmStartUserModeService(Service, argc, argv); if (dwError == ERROR_SUCCESS) { -#ifdef USE_SERVICE_START_PENDING Service->Status.dwCurrentState = SERVICE_START_PENDING; -#else - Service->Status.dwCurrentState = SERVICE_RUNNING; -#endif + Service->Status.dwControlsAccepted = 0; } else {

8 years

[rnaumann] 73415: [TIMEDATE] Update/Fix German and French resource files. Patch by Joachim Henze and Kyle Katarn. CORE-12369

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Dec 2 22:36:21 2016 New Revision: 73415 URL: http://svn.reactos.org/svn/reactos?rev=73415&view=rev Log: [TIMEDATE] Update/Fix German and French resource files. Patch by Joachim Henze and Kyle Katarn. CORE-12369 Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/de-DE.rc [iso-8859-1] Fri Dec 2 22:36:21 2016 @@ -37,7 +37,7 @@ AUTOCHECKBOX "Automatisch mit einem Internetzeitserver synchronisieren", IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP LTEXT "Server:", IDC_SERVERTEXT, 34, 22, 28, 13 - PUSHBUTTON "Jetzt aktualisieren", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "Aktualisieren", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 LTEXT "Zum Synchronisieren muss der Computer mit dem Internet verbunden sein.", -1, 12, 114, 225, 25 Modified: trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc [iso-8859-1] Fri Dec 2 22:36:21 2016 @@ -37,7 +37,7 @@ AUTOCHECKBOX "Synchroniser automatiquement avec un serveur d'heure Internet", IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP LTEXT "Serveur:", IDC_SERVERTEXT, 34, 22, 28, 13 - PUSHBUTTON "Mettre Ã jour maintenant", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "Mettre Ã jour", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 LTEXT "La synchronisation ne peut se faire que si votre ordinateur est connectÃ© Ã Internet.", -1, 12, 114, 225, 25

8 years

[rnaumann] 73414: [RAPPS][USERINIT][HIVECLS] Add/Update Italian translation. Patches by Carlo Bramini. Thanks. CORE-9725 #comment rapps_new and usrmgr were not appliable, please check your patches....

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Fri Dec 2 22:22:28 2016 New Revision: 73414 URL: http://svn.reactos.org/svn/reactos?rev=73414&view=rev Log: [RAPPS][USERINIT][HIVECLS] Add/Update Italian translation. Patches by Carlo Bramini. Thanks. CORE-9725 #comment rapps_new and usrmgr were not appliable, please check your patches. The others were committed in r73414 Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/system/userinit/lang/it-IT.rc trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Fri Dec 2 22:22:28 2016 @@ -201,6 +201,6 @@ IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." IDS_INTEG_CHECK_TITLE "Verifica integritÃ pacchetto..." IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integritÃ , potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non Ã¨ raccomandata." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." -END + IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento Ã¨ stato interrotto. Verificare la connessione a Internet." + IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." +END Modified: trunk/reactos/base/system/userinit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/it-IT.rc [iso-8859-1] Fri Dec 2 22:22:28 2016 @@ -10,11 +10,11 @@ COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP RTEXT "Layout di teastiera:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Scegli la tua lingua e il layout di tastiera e premi su Avanti per continuare.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "Selezionare la lingua e il layout di tastiera e premere su Avanti per continuare.", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 DEFPUSHBUTTON "&Avanti", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancella", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "A&nnulla", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 @@ -23,23 +23,23 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Inizia ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + DEFPUSHBUTTON "Avvia ReactOS con &Live CD", IDC_RUN, 71, 102, 175, 21 PUSHBUTTON "&Installa ReactOS", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 PUSHBUTTON "&Precedente", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancella", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "&Annulla", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN - IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente(shell)!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente grafico!\n" + IDS_INSTALLER_FAIL "Userinit non ha potuto avviare l'installazione!\n" END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "Spagnolo (Spagna)" END Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Fri Dec 2 22:22:28 2016 @@ -720,6 +720,28 @@ AVIFILE="Clip VidÃ©o" +; LANG_ITALIAN SUBLANG_NEUTRAL +[Strings.0010] +CPLFILE_OPENWITH="Aprire con il Pannello di Controllo" + +CHMFILE="File della guida HTML compilato" +XMLFILE="Documento XML" +XSLFILE="Foglio di stile XSL" +MSIPACK="Pacchetto di installazione di ReactOS" +MSSTYLESFILE="File di stili visivi" +THEMEFILE="File di tema visivo" +WAVFILE="Audio wave" +MIDFILE="Sequenza MIDI" +CDAFILE="Traccia Audio CD" +AVIFILE="Filmato video" +MERGE="Unione" +CONFIGURE="Configura" +INSTALL="Installa" +UNINSTALL="Rimuovi" +REPAIR="Ripara" +TEST="Prova" + + ; LANG_POLISH SUBLANG_NEUTRAL [Strings.0015] CPLFILE_OPENWITH="OtwÃ³rz poprzez Panel Sterowania"

8 years

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2016