Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66983: [SETUPAPI_APITEST] Add tests for SetupDiInstallClassExA and SetupInstallServicesFromInfSectionEx. Brought to you by Victor Martinez with some changes by me. ROSTESTS-157

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 21:08:47 2015 New Revision: 66983 URL: http://svn.reactos.org/svn/reactos?rev=66983&view=rev Log: [SETUPAPI_APITEST] Add tests for SetupDiInstallClassExA and SetupInstallServicesFromInfSectionEx. Brought to you by Victor Martinez with some changes by me. ROSTESTS-157 Added: trunk/rostests/apitests/setupapi/SetupDiInstallClassExA.c (with props) trunk/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c (with props) Modified: trunk/rostests/apitests/setupapi/CMakeLists.txt trunk/rostests/apitests/setupapi/testlist.c Modified: trunk/rostests/apitests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/setupapi/CMakeLists.txt [iso-8859-1] Mon Mar 30 21:08:47 2015 @@ -1,5 +1,11 @@ -add_executable(setupapi_apitest devclass.c testlist.c) +list(APPEND SOURCE + devclass.c + SetupDiInstallClassExA.c + SetupInstallServicesFromInfSectionEx.c + testlist.c) + +add_executable(setupapi_apitest ${SOURCE}) set_module_type(setupapi_apitest win32cui) -add_importlibs(setupapi_apitest advapi32 setupapi msvcrt kernel32) +add_importlibs(setupapi_apitest advapi32 setupapi user32 msvcrt kernel32) add_cd_file(TARGET setupapi_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/setupapi/SetupDiInstallClassExA.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/SetupDi… ============================================================================== --- trunk/rostests/apitests/setupapi/SetupDiInstallClassExA.c (added) +++ trunk/rostests/apitests/setupapi/SetupDiInstallClassExA.c [iso-8859-1] Mon Mar 30 21:08:47 2015 @@ -0,0 +1,293 @@ +/* + * SetupAPI device class-related functions tests + * + * Copyright 2015 Víctor Martínez (victor.martinez(a)reactos.org) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public Licence as + * published by the Free Software Foundation; either version 2 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 + * General Public License for more details. + * + * You should have received a copy of the GNU 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 <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> +#include <setupapi.h> + +static const char inffile[] = "test.inf"; +static char CURR_DIR[MAX_PATH]; + +/* Helpers */ + +static void create_inf_file(LPCSTR filename, const char *data) +{ + DWORD res; + BOOL ret; + HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + assert(handle != INVALID_HANDLE_VALUE); + ret = WriteFile(handle, data, strlen(data), &res, NULL); + assert(ret != 0); + CloseHandle(handle); +} + +static void test_SetupDiInstallClassExA(void) +{ + char inf[2048]; + char path[MAX_PATH]; + BOOL ret; + ULONG del; + HKEY RegHandle; + HINF infhandle; + SC_HANDLE scm_handle, svc_handle; + + /* [Version]:Signature */ + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_CLASS, + "Expected ERROR_INVALID_CLASS, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + + /* [Version]:Signature+Class */ + strcat(inf, "Class=MySampleClass\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_CLASS, + "Expected ERROR_INVALID_CLASS, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + + /* [Version]:Signature+Class+ClassGUID */ + strcat(inf, "ClassGuid={3b409830-5f9d-432a-abf5-7d2e4e102467}\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + + /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]Empty */ + strcat(inf, "[ClassInstall32.NT]\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(ret, "Expected success\n"); + ok(!GetLastError(), + "Expected no error, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + if (ret == TRUE) + { + RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); + del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); + ok(del == ERROR_SUCCESS, "Expected success \n"); + } + + /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg */ + strcat(inf, "AddReg=SampleClassAddReg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(ret, "Expected success\n"); + ok(!GetLastError(), + "Expected no error, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + if (ret == TRUE) + { + RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); + del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); + ok(del == ERROR_SUCCESS, "Expected success \n"); + } + + /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg];*/ + strcat(inf, "[SampleClassAddReg]\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(ret, "Expected success\n"); + ok(!GetLastError(), + "Expected no error, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + if (ret == TRUE) + { + RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); + del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); + ok(del == ERROR_SUCCESS, "Expected success \n"); + } + + /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg]HKR;*/ + strcat(inf, "HKR,,,,\"ReactOS Test SetupDiInstallClassExA\"\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(ret, "Expected success\n"); + ok(!GetLastError(), + "Expected no error, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + if (ret == TRUE) + { + RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); + del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); + ok(del == ERROR_SUCCESS, "Expected success \n"); + } + + /*[Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg;[SampleClassAddReg]HKR;[ClassInstall32.NT.Services]*/ + strcat(inf, "[ClassInstall32.NT.Services]\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(ret, "Expected success\n"); + ok(!GetLastError(), + "Expected no error, got %08x\n", (int)GetLastError()); + DeleteFileA(inffile); + if (ret == TRUE) + { + RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); + del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); + ok(del == ERROR_SUCCESS, "Expected success\n"); + } + + /* Add a reference */ + strcat(inf, "AddService=Reactostest,,Reactostest.Service\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the section */ + strcat(inf, "[Reactostest.Service]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Just the ServiceBinary */ + strcat(inf, "ServiceBinary=%12%\\reactostest.sys\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the ServiceType */ + strcat(inf, "ServiceType=1\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the StartType */ + strcat(inf, "StartType=4\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* This should be it, the minimal entries to install a service */ + strcat(inf, "ErrorControl=1"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to install the service\n"); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + return; + } + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + /* Open the service to see if it's really there */ + svc_handle = OpenServiceA(scm_handle, "Reactostest", DELETE); + ok(svc_handle != NULL, "Service was not created\n"); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + ok(ret, "Service could not be deleted : %d\n", (int)GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); +} + + +START_TEST(SetupDiInstallClassExA) +{ + char temp_path[MAX_PATH], prev_path[MAX_PATH]; + DWORD len; + + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + strcpy(CURR_DIR, temp_path); + len = strlen(CURR_DIR); + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; + + test_SetupDiInstallClassExA(); + SetCurrentDirectoryA(prev_path); + +} Propchange: trunk/rostests/apitests/setupapi/SetupDiInstallClassExA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/SetupIn… ============================================================================== --- trunk/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c (added) +++ trunk/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c [iso-8859-1] Mon Mar 30 21:08:47 2015 @@ -0,0 +1,384 @@ +/* + * SetupAPI device class-related functions tests + * + * Copyright 2015 Víctor Martínez (victor.martinez(a)reactos.org) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public Licence as + * published by the Free Software Foundation; either version 2 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 + * General Public License for more details. + * + * You should have received a copy of the GNU 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 <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> +#include <setupapi.h> + +static const char inffile[] = "test.inf"; +static char CURR_DIR[MAX_PATH]; + +/* Helpers */ + +static void create_inf_file(LPCSTR filename, const char *data) +{ + DWORD res; + BOOL ret; + HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + assert(handle != INVALID_HANDLE_VALUE); + ret = WriteFile(handle, data, strlen(data), &res, NULL); + assert(ret != 0); + CloseHandle(handle); +} + +/* CBT hook to ensure a window (e.g., MessageBox) cannot be created */ +static HHOOK hhook; +static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) +{ + return nCode == HCBT_CREATEWND ? 1: CallNextHookEx(hhook, nCode, wParam, lParam); +} + +static void test_SetupInstallServicesFromInfSectionExA(void) +{ + char inf[2048]; + char path[MAX_PATH]; + HINF infhandle; + BOOL ret; + SC_HANDLE scm_handle, svc_handle; + + /* Bail out if we are on win98 */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); + return; + } + CloseServiceHandle(scm_handle); + + /* Basic inf file to satisfy SetupOpenInfFileA */ + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + /* Nothing but the Version section */ + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "trolololo", 0, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + + /* Add the section */ + strcat(inf, "[Winetest.Services]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add a reference */ + strcat(inf, "AddService=Winetest,,Winetest.Service\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the section */ + strcat(inf, "[Winetest.Service]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Just the ServiceBinary */ + strcat(inf, "ServiceBinary=%12%\\winetest.sys\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the ServiceType */ + strcat(inf, "ServiceType=1\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the StartType */ + strcat(inf, "StartType=4\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* This should be it, the minimal entries to install a service */ + strcat(inf, "ErrorControl=1"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "Winetest.Services", 0, NULL, NULL, NULL, NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to install the service\n"); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + return; + } + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + /* Open the service to see if it's really there */ + svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE); + ok(svc_handle != NULL, "Service was not created\n"); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + ok(ret, "Service could not be deleted : %d\n", (int)GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[XSP.InstallPerVer]\n"); + strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExA(infhandle, "XSP.InstallPerVer", 0, NULL, NULL, NULL,NULL); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* TODO: Test the Flags */ +} +static void test_SetupInstallServicesFromInfSectionExW(void) +{ + char inf[2048]; + char path[MAX_PATH]; + HINF infhandle; + BOOL ret; + SC_HANDLE scm_handle, svc_handle; + + /* Bail out if we are on win98 */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerW(NULL, NULL, GENERIC_ALL); + + if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("OpenSCManagerW is not implemented, we are most likely on win9x\n"); + return; + } + CloseServiceHandle(scm_handle); + + /* Basic inf file to satisfy SetupOpenInfFileA */ + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + /* Nothing but the Version section */ + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"trolololo", 0, NULL, NULL, NULL,NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + + /* Add the section */ + strcat(inf, "[Winetest.Services]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add a reference */ + strcat(inf, "AddService=Winetest,,Winetest.Service\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the section */ + strcat(inf, "[Winetest.Service]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Just the ServiceBinary */ + strcat(inf, "ServiceBinary=%12%\\winetest.sys\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the ServiceType */ + strcat(inf, "ServiceType=1\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* Add the StartType */ + strcat(inf, "StartType=4\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* This should be it, the minimal entries to install a service */ + strcat(inf, "ErrorControl=1"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"Winetest.Services", 0, NULL, NULL, NULL, NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to install the service\n"); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + return; + } + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + scm_handle = OpenSCManagerW(NULL, NULL, GENERIC_ALL); + + /* Open the service to see if it's really there */ + svc_handle = OpenServiceW(scm_handle, L"Winetest", DELETE); + ok(svc_handle != NULL, "Service was not created\n"); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + ok(ret, "Service could not be deleted : %d\n", (int)GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[XSP.InstallPerVer]\n"); + strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionExW(infhandle, L"XSP.InstallPerVer", 0, NULL, NULL, NULL, NULL); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08d\n", (int)GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + + /* TODO: Test the Flags */ +} + + +START_TEST(SetupInstallServicesFromInfSectionEx) +{ + char temp_path[MAX_PATH], prev_path[MAX_PATH]; + + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + strcpy(CURR_DIR, temp_path); + + /* Set CBT hook to disallow MessageBox creation in current thread */ + hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + assert(hhook != 0); + + test_SetupInstallServicesFromInfSectionExA(); + test_SetupInstallServicesFromInfSectionExW(); + + UnhookWindowsHookEx(hhook); + SetCurrentDirectoryA(prev_path); +} Propchange: trunk/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/testlis… ============================================================================== --- trunk/rostests/apitests/setupapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/setupapi/testlist.c [iso-8859-1] Mon Mar 30 21:08:47 2015 @@ -4,9 +4,13 @@ #include <apitest.h> extern void func_devclass(void); +extern void func_SetupInstallServicesFromInfSectionEx(void); +extern void func_SetupDiInstallClassExA(void); const struct test winetest_testlist[] = { { "devclass", func_devclass }, + { "SetupInstallServicesFromInfSectionEx", func_SetupInstallServicesFromInfSectionEx}, + { "SetupDiInstallClassExA", func_SetupDiInstallClassExA}, { 0, 0 } };

9 years, 8 months

[akhaldi] 66982: [EXPLORER] Ukrainian translation update by Yaroslav Fedoryako. CORE-9320

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 19:35:15 2015 New Revision: 66982 URL: http://svn.reactos.org/svn/reactos?rev=66982&view=rev Log: [EXPLORER] Ukrainian translation update by Yaroslav Fedoryako. CORE-9320 Modified: trunk/reactos/base/shell/explorer/lang/uk-UA.rc Modified: trunk/reactos/base/shell/explorer/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/u… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/uk-UA.rc [iso-8859-1] Mon Mar 30 19:35:15 2015 @@ -13,16 +13,16 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð°ÑÐ¸ ÑÐ° ÑÐ°ÑÑ", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "Ð&Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¿Ð¾Ð²ÑÑÐµÐ½Ñ...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "ÐÑÐºÐ½Ð° &ÐºÐ°ÑÐºÐ°Ð´Ð¾Ð¼", ID_SHELL_CMD_CASCADE_WND + MENUITEM "ÐÑÐºÐ½Ð° &Ð³Ð¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»ÑÐ½Ð¾", ID_SHELL_CMD_TILE_WND_H + MENUITEM "ÐÑÐºÐ½Ð° &Ð²ÐµÑÑÐ¸ÐºÐ°Ð»ÑÐ½Ð¾", ID_SHELL_CMD_TILE_WND_V + MENUITEM "&ÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ ÑÐ¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ»", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "&Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR - MENUITEM "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "&ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "&ÐÐ°ÐºÑÑÐ¿Ð¸ÑÐ¸ Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°Ð²Ð´Ð°Ð½Ñ", ID_LOCKTASKBAR MENUITEM "Ð&Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", ID_SHELL_CMD_PROPERTIES @@ -91,10 +91,10 @@ BEGIN AUTORADIOBUTTON "&ÐÐµÐ½Ñ ""ÐÑÑÐº""", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 LTEXT "Ð¦ÐµÐ¹ ÑÑÐ¸Ð»Ñ Ð¼ÐµÐ½Ñ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÑÑ Ð·ÑÑÑÐ½Ð¸Ð¹ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ Ð¿Ð°Ð¿Ð¾Ðº, ÑÐ°ÑÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°Ð½Ð¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ ÑÐ° Ð¿Ð¾ÑÑÐºÑ.", IDC_STATIC, 20, 17, 150, 24, WS_DISABLED - PUSHBUTTON "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸...", IDC_TASKBARPROP_STARTMENUCUST, 192, 4, 53, 14, WS_DISABLED + PUSHBUTTON "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸...", IDC_TASKBARPROP_STARTMENUCUST, 192, 4, 60, 14, WS_DISABLED AUTORADIOBUTTON "ÐÐ»Ð°ÑÐ¸ÑÐ½Ðµ Ð¼ÐµÐ½Ñ ""ÐÑÑÐº""", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED LTEXT "Ð¦ÐµÐ¹ ÑÑÐ¸Ð»Ñ Ð¼ÐµÐ½Ñ Ð¼Ð°Ñ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ð¸Ð¹ Ð²Ð¸Ð³Ð»ÑÐ´ Ñ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ", -1, 20, 57, 150, 24, WS_DISABLED - PUSHBUTTON "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 44, 53, 14, WS_DISABLED + PUSHBUTTON "Ð&Ð°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 44, 60, 14, WS_DISABLED GROUPBOX "ÐÐ¾Ð½ÑÑÐ´ÐµÐ½ÑÑÐ¹Ð½ÑÑÑÑ", IDC_STATIC, 7, 100, 238, 42 AUTOCHECKBOX "ÐÐ±ÐµÑÑÐ³Ð°ÑÐ¸ ÑÐ° Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ &ÑÐ°Ð¹Ð»ÑÐ²", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED AUTOCHECKBOX "ÐÐ±ÐµÑÑÐ³Ð°ÑÐ¸ ÑÐ° Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ &Ð¿ÑÐ¾Ð³ÑÐ°Ð¼", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED @@ -109,7 +109,7 @@ GROUPBOX "ÐÐ½Ð°ÑÐºÐ¸", IDC_STATIC, 6, 33, 240, 58, WS_DISABLED LTEXT "ÐÐ¾Ð¶Ð½Ð° ÑÐ½Ð¸ÐºÐ½ÑÑÐ¸ Ð·Ð°ÑÐ°ÑÐ°ÑÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ, Ð¿ÑÐ¸ÑÐ¾Ð²ÑÑÑÐ¸ Ð·Ð½Ð°ÑÐºÐ¸, ÑÐºÑ Ð´Ð°Ð²Ð½Ð¾ Ð½Ðµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°Ð»Ð¸ÑÑ.", IDC_STATIC, 13, 48, 223, 16, WS_DISABLED AUTOCHECKBOX "&ÐÑÐ¸ÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½ÐµÐ²Ð¶Ð¸Ð²Ð°Ð½Ñ Ð·Ð½Ð°ÑÐºÐ¸", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED - PUSHBUTTON "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14, WS_DISABLED + PUSHBUTTON "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸...", IDC_TASKBARPROP_ICONCUST, 183, 70, 60, 14, WS_DISABLED GROUPBOX "Ð¡Ð¸ÑÑÐµÐ¼Ð½Ñ Ð·Ð½Ð°ÑÐºÐ¸", IDC_STATIC, 6, 97, 240, 84, WS_DISABLED LTEXT "ÐÐ±ÐµÑÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½Ñ Ð·Ð½Ð°ÑÐºÐ¸ Ð´Ð»Ñ Ð¿Ð¾ÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ.", IDC_STATIC, 13, 112, 223, 16, WS_DISABLED AUTOCHECKBOX "&ÐÐ¾Ð´Ð¸Ð½Ð½Ð¸Ðº", IDC_TASKBARPROP_CLOCK, 13, 126, 200, 10, WS_DISABLED @@ -129,11 +129,11 @@ IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6, 6, 240, 121 - AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 + GROUPBOX "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ", IDC_STATIC, 6, 6, 240, 121 + AUTOCHECKBOX "&ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÑÐµÐºÑÐ½Ð´Ð¸", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 AUTOCHECKBOX "&ÐÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°ÑÐ¸ Ð·ÑÐ°Ð·ÐºÐ¸ Ð²ÑÐºÐ¾Ð½ (ÐµÑÐºÑÐ·Ð¸)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 END

9 years, 8 months

[spetreolle] 66981: [IPHLPAPI] Make GetAdaptersAddresses work, with parameters check. More work is needed : -it returns the loopback, which shouldn't appear with default flags. -the required size i...

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Mar 30 18:10:36 2015 New Revision: 66981 URL: http://svn.reactos.org/svn/reactos?rev=66981&view=rev Log: [IPHLPAPI] Make GetAdaptersAddresses work, with parameters check. More work is needed : -it returns the loopback, which shouldn't appear with default flags. -the required size is fixed. Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Mon Mar 30 18:10:36 2015 @@ -9,7 +9,7 @@ #include "iphlpapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); - +#if 1 /* Helper for GetAdaptersAddresses: * Retrieves the list of network adapters from tcpip.sys */ static @@ -283,12 +283,22 @@ ULONG i; ULONG TotalSize = 0, RemainingSize; BYTE* Ptr = (BYTE*)pAdapterAddresses; + DWORD MIN_SIZE = 15 * 1024; + PIP_ADAPTER_ADDRESSES PreviousAA = NULL; FIXME("GetAdaptersAddresses - Semi Stub: Family %u, Flags 0x%08x, Reserved %p, pAdapterAddress %p, pOutBufLen %p.\n", Family, Flags, Reserved, pAdapterAddresses, pOutBufLen); if (!pOutBufLen) return ERROR_INVALID_PARAMETER; + + // FIXME: the exact needed size should be computed first, BEFORE doing any write to the output buffer. + // As suggested by MSDN, require a 15 KB buffer, which allows to React properly to length checks. + if(!Ptr || *pOutBufLen < MIN_SIZE) + { + *pOutBufLen = MIN_SIZE; + return ERROR_BUFFER_OVERFLOW; + } switch(Family) { @@ -334,7 +344,7 @@ /* Let's see if we got any adapter. */ for (i = 0; i < InterfacesCount; i++) { - PIP_ADAPTER_ADDRESSES CurrentAA = (PIP_ADAPTER_ADDRESSES)Ptr, PreviousAA = NULL; + PIP_ADAPTER_ADDRESSES CurrentAA = (PIP_ADAPTER_ADDRESSES)Ptr; ULONG CurrentAASize = 0; if (InterfacesList[i].tei_entity == IF_ENTITY) @@ -345,6 +355,10 @@ /* Remember we got one */ AdaptersCount++; + + /* Set the pointer to this instance in the previous one*/ + if(PreviousAA) + PreviousAA->Next = CurrentAA; /* Of course we need some space for the base structure. */ CurrentAASize = sizeof(IP_ADAPTER_ADDRESSES); @@ -409,7 +423,6 @@ CurrentAA->Mtu = Entry->if_mtu; CurrentAA->IfType = Entry->if_type; CurrentAA->OperStatus = Entry->if_operstatus; - CurrentAA->Next = PreviousAA; /* Next items */ Ptr = (BYTE*)(CurrentAA + 1); @@ -628,6 +641,7 @@ HeapFree(GetProcessHeap(), 0, InterfacesList); NtClose(TcpFile); *pOutBufLen = TotalSize; + TRACE("TotalSize: %x\n", *pOutBufLen); return ERROR_SUCCESS; Error: @@ -637,3 +651,4 @@ NtClose(TcpFile); return RtlNtStatusToDosError(Status); } +#endif

9 years, 8 months

[gadamopoulos] 66980: [SHELL32] - CDefaultContextMenu: GetAttributesOf should only return the requested flags and not more. However our shell is not up to such nice behavior so don't depend o it fo...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 13:04:48 2015 New Revision: 66980 URL: http://svn.reactos.org/svn/reactos?rev=66980&view=rev Log: [SHELL32] - CDefaultContextMenu: GetAttributesOf should only return the requested flags and not more. However our shell is not up to such nice behavior so don't depend o it for now. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Mon Mar 30 13:04:48 2015 @@ -567,7 +567,7 @@ } /* Directory is progid of filesystem folders only */ - if (rfg == (SFGAO_FILESYSTEM|SFGAO_FOLDER)) + if ((rfg & (SFGAO_FILESYSTEM|SFGAO_FOLDER)) == (SFGAO_FILESYSTEM|SFGAO_FOLDER)) { /* Load context menu handlers */ TRACE("Add background handlers: %p\n", m_pidlFolder);

9 years, 8 months

[gadamopoulos] 66979: [SHELL32] - CDefView: Use SHForwardContextMenuMsg to forward menu messages to the context menu class - CDefaultContextMenu: Implement IContextMenu3 and use SHForwardContextMen...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 12:21:39 2015 New Revision: 66979 URL: http://svn.reactos.org/svn/reactos?rev=66979&view=rev Log: [SHELL32] - CDefView: Use SHForwardContextMenuMsg to forward menu messages to the context menu class - CDefaultContextMenu: Implement IContextMenu3 and use SHForwardContextMenuMsg to forward menu messages to shell extensions. CORE-9446 (part 2/2) Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.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] Mon Mar 30 12:21:39 2015 @@ -1942,12 +1942,9 @@ return FALSE; } - CComPtr<IContextMenu2> pCM2; - HRESULT hres = m_pCM.p->QueryInterface(IID_PPV_ARG(IContextMenu2, &pCM2)); - if(FAILED(hres)) - return FALSE; - - if (pCM2.p->HandleMenuMsg(uMsg, (WPARAM)m_hWnd, lParam) == S_OK) + LRESULT result; + HRESULT hres = SHForwardContextMenuMsg(m_pCM, uMsg, wParam, lParam, &result, TRUE); + if (SUCCEEDED(hres)) return TRUE; else return FALSE; Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Mon Mar 30 12:21:39 2015 @@ -34,7 +34,7 @@ class CDefaultContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2 + public IContextMenu3 { private: CComPtr<IShellFolder> m_psf; @@ -74,6 +74,7 @@ DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry); HRESULT TryToBrowse(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags); HRESULT InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry); + PDynamicShellEntry GetDynamicEntry(UINT idCmd); public: CDefaultContextMenu(); @@ -88,9 +89,13 @@ // IContextMenu2 virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + // IContextMenu3 + virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + BEGIN_COM_MAP(CDefaultContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) END_COM_MAP() }; @@ -1347,29 +1352,36 @@ return S_OK; } +PDynamicShellEntry CDefaultContextMenu::GetDynamicEntry(UINT idCmd) +{ + PDynamicShellEntry pEntry = m_pDynamicEntries; + + while(pEntry && idCmd > pEntry->iIdCmdFirst + pEntry->NumIds) + pEntry = pEntry->pNext; + + if (!pEntry) + return NULL; + + if (idCmd < pEntry->iIdCmdFirst || idCmd > pEntry->iIdCmdFirst + pEntry->NumIds) + return NULL; + + return pEntry; +} + HRESULT CDefaultContextMenu::DoDynamicShellExtensions( LPCMINVOKECOMMANDINFO lpcmi) -{ +{ + TRACE("verb %p first %x last %x", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); + UINT idCmd = LOWORD(lpcmi->lpVerb); - PDynamicShellEntry pEntry = m_pDynamicEntries; - - TRACE("verb %p first %x last %x", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); - - while(pEntry && idCmd > pEntry->iIdCmdFirst + pEntry->NumIds) - pEntry = pEntry->pNext; - + PDynamicShellEntry pEntry = GetDynamicEntry(idCmd); if (!pEntry) return E_FAIL; - if (idCmd >= pEntry->iIdCmdFirst && idCmd <= pEntry->iIdCmdFirst + pEntry->NumIds) - { - /* invoke the dynamic context menu */ - lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd - pEntry->iIdCmdFirst); - return pEntry->pCM->InvokeCommand(lpcmi); - } - - return E_FAIL; + /* invoke the dynamic context menu */ + lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd - pEntry->iIdCmdFirst); + return pEntry->pCM->InvokeCommand(lpcmi); } DWORD @@ -1594,7 +1606,53 @@ WPARAM wParam, LPARAM lParam) { + /* FIXME: Should we implement this as well? */ return S_OK; +} + +HRESULT +WINAPI +CDefaultContextMenu::HandleMenuMsg2( + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *plResult) +{ + switch (uMsg) + { + case WM_INITMENUPOPUP: + { + PDynamicShellEntry pEntry = m_pDynamicEntries; + while (pEntry) + { + SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); + pEntry = pEntry->pNext; + } + break; + } + case WM_DRAWITEM: + { + DRAWITEMSTRUCT* pDrawStruct = reinterpret_cast<DRAWITEMSTRUCT*>(lParam); + PDynamicShellEntry pEntry = GetDynamicEntry(pDrawStruct->itemID); + if(pEntry) + SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); + break; + } + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT* pMeasureStruct = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam); + PDynamicShellEntry pEntry = GetDynamicEntry(pMeasureStruct->itemID); + if(pEntry) + SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); + break; + } + case WM_MENUCHAR : + /* FIXME */ + break; + default: + ERR("Got unknown message:%d\n", uMsg); + } + return S_OK; } static

9 years, 8 months

[gadamopoulos] 66978: [SHLWAPI] - Implement SHForwardContextMenuMsg according to http://undoc.airesoft.co.uk/shlwapi.dll/SHForwardContextMenuMsg.php CORE-9446 (Part 1/2)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 12:16:29 2015 New Revision: 66978 URL: http://svn.reactos.org/svn/reactos?rev=66978&view=rev Log: [SHLWAPI] - Implement SHForwardContextMenuMsg according to http://undoc.airesoft.co.uk/shlwapi.dll/SHForwardContextMenuMsg.php CORE-9446 (Part 1/2) Added: trunk/reactos/dll/win32/shlwapi/rosordinal.c (with props) Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Mon Mar 30 12:16:29 2015 @@ -17,6 +17,7 @@ path.c reg.c regstream.c + rosordinal.c shlwapi_main.c stopwatch.c string.c Added: trunk/reactos/dll/win32/shlwapi/rosordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/rosordin… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/rosordinal.c (added) +++ trunk/reactos/dll/win32/shlwapi/rosordinal.c [iso-8859-1] Mon Mar 30 12:16:29 2015 @@ -0,0 +1,39 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Misc shell helper functions + * COPYRIGHT: Copyright 2015 Giannis Adamopoulos + */ + +#include "precomp.h" + +/* http://undoc.airesoft.co.uk/shlwapi.dll/SHForwardContextMenuMsg.php */ +HRESULT WINAPI SHForwardContextMenuMsg(IUnknown* pUnk, UINT uMsg, WPARAM wParam, + LPARAM lParam, LRESULT* pResult, BOOL useIContextMenu2) +{ + HRESULT hr; + IContextMenu3* pcmenu3; + IContextMenu2* pcmenu2; + + /* First try to use the IContextMenu3 interface */ + hr = IUnknown_QueryInterface(pUnk, &IID_IContextMenu3, (void**)&pcmenu3); + if (SUCCEEDED(hr)) + { + hr = IContextMenu3_HandleMenuMsg2(pcmenu3, uMsg, wParam, lParam, pResult); + IContextMenu3_Release(pcmenu3); + return hr; + } + + /* Return failure if we can't use the IContextMenu2 interface */ + if(!useIContextMenu2) + return hr; + + /* Now try to use the IContextMenu2 interface */ + hr = IUnknown_QueryInterface(pUnk, &IID_IContextMenu2, (void**)&pcmenu2); + if (FAILED(hr)) + return hr; + + hr = IContextMenu2_HandleMenuMsg(pcmenu2, uMsg, wParam, lParam); + IContextMenu2_Release(pcmenu2); + return hr; +} Propchange: trunk/reactos/dll/win32/shlwapi/rosordinal.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Mon Mar 30 12:16:29 2015 @@ -542,7 +542,7 @@ 542 stdcall -noname GetUIVersion() 543 stdcall -noname CreateColorSpaceWrapW(ptr) gdi32.CreateColorSpaceW 544 stub -noname QuerySourceCreateFromKey -545 stub -noname SHForwardContextMenuMsg +545 stdcall -noname SHForwardContextMenuMsg(ptr long long long ptr long) 546 stub -noname IUnknown_DoContextMenuPopup 547 stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook 548 stub -noname SHAreIconsEqual

9 years, 8 months

[gadamopoulos] 66977: [shlwapi_undoc.h] - Add definition of SHForwardContextMenuMsg

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 11:42:41 2015 New Revision: 66977 URL: http://svn.reactos.org/svn/reactos?rev=66977&view=rev Log: [shlwapi_undoc.h] - Add definition of SHForwardContextMenuMsg Modified: trunk/reactos/include/reactos/shlwapi_undoc.h Modified: trunk/reactos/include/reactos/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlwapi_un… ============================================================================== --- trunk/reactos/include/reactos/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlwapi_undoc.h [iso-8859-1] Mon Mar 30 11:42:41 2015 @@ -51,6 +51,7 @@ HRESULT WINAPI MayExecForward(IUnknown* lpUnknown, INT iUnk, REFGUID pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); HRESULT WINAPI IsQSForward(REFGUID pguidCmdGroup,ULONG cCmds, OLECMD *prgCmds); BOOL WINAPI SHIsChildOrSelf(HWND hParent, HWND hChild); +HRESULT WINAPI SHForwardContextMenuMsg(IUnknown* pUnk, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult, BOOL useIContextMenu2); BOOL WINAPI SHIsEmptyStream(IStream*);

9 years, 8 months

[akhaldi] 66976: [MCIWAVE] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 11:42:30 2015 New Revision: 66976 URL: http://svn.reactos.org/svn/reactos?rev=66976&view=rev Log: [MCIWAVE] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/mciwave/mciwave.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciwave/mciwave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.… ============================================================================== --- trunk/reactos/dll/win32/mciwave/mciwave.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/mciwave.c [iso-8859-1] Mon Mar 30 11:42:30 2015 @@ -446,7 +446,7 @@ TRACE("%s!\n", debugstr_w(*pszTmpFileName)); - if (*pszTmpFileName && (strlenW(*pszTmpFileName) > 0)) { + if (*pszTmpFileName && (*pszTmpFileName)[0]) { *hFile = mmioOpenW(*pszTmpFileName, NULL, MMIO_ALLOCBUF | MMIO_READWRITE | MMIO_CREATE); @@ -472,7 +472,7 @@ HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = fn; - if (strlenW(filename) > 0) { + if (filename[0]) { /* FIXME : what should be done if wmw->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(filename)); @@ -535,7 +535,7 @@ wmw->nUseCount++; - wmw->wInput = wmw->wOutput = (WORD)WAVE_MAPPER; + wmw->wInput = wmw->wOutput = WAVE_MAPPER; wmw->fInput = FALSE; wmw->hWave = 0; wmw->dwStatus = MCI_MODE_NOT_READY; @@ -1120,7 +1120,7 @@ TRACE("Recording (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, end - wmw->dwPosition); - dwRet = waveInStart(wmw->hWave); + waveInStart(wmw->hWave); if (hEvent) SetEvent(hEvent); @@ -1371,13 +1371,13 @@ TRACE("MCI_WAVE_SET_ANYINPUT\n"); if (wmw->wInput != (WORD)lpParms->wInput) WAVE_mciStop(wDevID, MCI_WAIT, NULL); - wmw->wInput = (WORD)WAVE_MAPPER; + wmw->wInput = WAVE_MAPPER; } if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) { TRACE("MCI_WAVE_SET_ANYOUTPUT\n"); if (wmw->wOutput != (WORD)lpParms->wOutput) WAVE_mciStop(wDevID, MCI_WAIT, NULL); - wmw->wOutput = (WORD)WAVE_MAPPER; + wmw->wOutput = WAVE_MAPPER; } /* Set wave format parameters is refused after Open or Record.*/ if (dwFlags & MCI_WAVE_SET_FORMATTAG) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 30 11:42:30 2015 @@ -105,7 +105,7 @@ reactos/dll/win32/mcicda # Synced to Wine-1.7.27 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.37 -reactos/dll/win32/mciwave # Synced to Wine-1.7.27 +reactos/dll/win32/mciwave # Synced to WineStaging-1.7.37 reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 reactos/dll/win32/mlang # Synced to Wine-1.7.27 reactos/dll/win32/mmdevapi # Synced to Wine-1.7.27 @@ -256,7 +256,7 @@ In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files -check Wine current souces first as it may already be fixed. +check Wine current sources first as it may already be fixed. reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27

9 years, 8 months

[gadamopoulos] 66975: [SHLWAPI] - Convert SHGetAllAccessSA to a soft stub in the spec file. Having it as a diff with wine doesn't add anything anyway.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 10:04:26 2015 New Revision: 66975 URL: http://svn.reactos.org/svn/reactos?rev=66975&view=rev Log: [SHLWAPI] - Convert SHGetAllAccessSA to a soft stub in the spec file. Having it as a diff with wine doesn't add anything anyway. Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Mon Mar 30 10:04:26 2015 @@ -5307,10 +5307,3 @@ return ret; } - -#ifdef __REACTOS__ -DWORD WINAPI SHGetAllAccessSA(void) -{ - return 0; -} -#endif Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Mon Mar 30 10:04:26 2015 @@ -551,7 +551,7 @@ 551 stub -noname IShellFolder_CompareIDs 552 stub -noname SHEvaluateSystemCommandTemplate 553 stdcall IsInternetESCEnabled() -554 stdcall -noname SHGetAllAccessSA() +554 stdcall -noname -stub SHGetAllAccessSA() 555 stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) 556 stub -noname SHCoExtensionAllowed 557 stub -noname SHCoCreateExtension

9 years, 8 months

[akhaldi] 66974: [SETUPAPI] Install .Services section optionally. Brought to you by Victor Martinez. CORE-9406

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 09:34:29 2015 New Revision: 66974 URL: http://svn.reactos.org/svn/reactos?rev=66974&view=rev Log: [SETUPAPI] Install .Services section optionally. Brought to you by Victor Martinez. CORE-9406 Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Mon Mar 30 09:34:29 2015 @@ -860,6 +860,7 @@ InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); if (!SetupDiGetDeviceInstallParamsW(hDeviceInfo, NULL, &InstallParams)) goto cleanup; + InstallParams.Flags &= ~(DI_NOVCP | DI_NOBROWSE | DI_QUIETINSTALL); InstallParams.Flags |= Flags & (DI_NOVCP | DI_NOBROWSE | DI_QUIETINSTALL); if (Flags & DI_NOVCP) @@ -939,9 +940,9 @@ if (!ret) goto cleanup; - /* Install .Services section */ + /* OPTIONAL: Install .Services section */ lstrcatW(SectionName, DotServices); - ret = SetupInstallServicesFromInfSectionExW( + SetupInstallServicesFromInfSectionExW( hInf, SectionName, 0, @@ -949,9 +950,6 @@ NULL, NULL, NULL); - if (!ret) - goto cleanup; - ret = TRUE; }

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015