Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[tfaber] 62975: [SETUPAPI_WINETEST] - Move the devclass test to apitests, since it is not a Wine test

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 26 10:58:40 2014 New Revision: 62975 URL: http://svn.reactos.org/svn/reactos?rev=62975&view=rev Log: [SETUPAPI_WINETEST] - Move the devclass test to apitests, since it is not a Wine test Added: trunk/rostests/apitests/setupapi/ trunk/rostests/apitests/setupapi/CMakeLists.txt (with props) trunk/rostests/apitests/setupapi/devclass.c - copied, changed from r62928, trunk/rostests/winetests/setupapi/devclass.c trunk/rostests/apitests/setupapi/testlist.c (with props) Removed: trunk/rostests/winetests/setupapi/devclass.c Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/setupapi/testlist.c Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat Apr 26 10:58:40 2014 @@ -13,6 +13,7 @@ add_subdirectory(msvcrt) add_subdirectory(ntdll) add_subdirectory(powrprof) +add_subdirectory(setupapi) add_subdirectory(shell32) add_subdirectory(psapi) add_subdirectory(user32) Added: trunk/rostests/apitests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/setupapi/CMakeLists.txt (added) +++ trunk/rostests/apitests/setupapi/CMakeLists.txt [iso-8859-1] Sat Apr 26 10:58:40 2014 @@ -0,0 +1,5 @@ + +add_executable(setupapi_apitest devclass.c testlist.c) +set_module_type(setupapi_apitest win32cui) +add_importlibs(setupapi_apitest advapi32 setupapi msvcrt kernel32) +add_cd_file(TARGET setupapi_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/setupapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/rostests/apitests/setupapi/devclass.c (from r62928, trunk/rostests/winetests/setupapi/devclass.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/devclas… ============================================================================== --- trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] Sat Apr 26 10:58:40 2014 @@ -22,8 +22,6 @@ #include <stdarg.h> #include <stdio.h> -#undef __WINESRC__ -#undef __ROS_LONG64__ #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -34,6 +32,10 @@ #include "wine/test.h" +#define ok_lasterr(err) \ + ok( GetLastError() == (err), \ + "Expected error %lx, got %lx\n", (DWORD)(err), GetLastError() ) + static GUID test_class_guid = { 0x4d36e967, 0xe325, 0x11ce, { 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 } }; static char test_class_name[MAX_CLASS_NAME_LEN] = "DiskDrive"; @@ -65,14 +67,12 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiBuildClassInfoList( 0, NULL, 0, NULL ), "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); ok( !SetupDiBuildClassInfoList( 0, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok_lasterr( ERROR_INSUFFICIENT_BUFFER ); guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); if ( !guid_list ) @@ -104,14 +104,12 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, NULL ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( "", NULL, 0, &required_size ), @@ -121,8 +119,7 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( test_class_name, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok_lasterr( ERROR_INSUFFICIENT_BUFFER ); ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); @@ -153,20 +150,17 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, NULL ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); + ok_lasterr( ERROR_INVALID_CLASS ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); + ok_lasterr( ERROR_INVALID_CLASS ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( &test_class_guid, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok_lasterr( ERROR_INSUFFICIENT_BUFFER ); ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu\n", MAX_CLASS_NAME_LEN, required_size ); @@ -198,20 +192,17 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, NULL ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( &test_class_guid, NULL, 0, &required_size ), "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok_lasterr( ERROR_INSUFFICIENT_BUFFER ); ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); ok( required_size < LINE_LEN, "Expected < %u, got %lu\n", LINE_LEN, required_size ); @@ -239,8 +230,7 @@ device_info = SetupDiGetClassDevs( NULL, NULL, NULL, 0 ); ok( device_info == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_ALLCLASSES ); @@ -254,8 +244,7 @@ device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_DEVICEINTERFACE ); ok( device_info == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); + ok_lasterr( ERROR_INVALID_PARAMETER ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( &test_class_guid, NULL, NULL, 0 ); @@ -269,8 +258,7 @@ device_info = SetupDiGetClassDevs( NULL, "(invalid enumerator)", NULL, DIGCF_ALLCLASSES ); ok( device_info == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_DATA, - "Expected error %lx, got %lx\n", ERROR_INVALID_DATA, GetLastError() ); + ok_lasterr( ERROR_INVALID_DATA ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, "Root", NULL, DIGCF_ALLCLASSES ); @@ -290,29 +278,25 @@ hkey = SetupDiOpenClassRegKeyExA( NULL, 0, 0, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); + ok_lasterr( ERROR_INVALID_FLAGS ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER | DIOCR_INTERFACE, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); + ok_lasterr( ERROR_INVALID_FLAGS ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); + ok_lasterr( ERROR_INVALID_CLASS ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INTERFACE, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); + ok_lasterr( ERROR_INVALID_CLASS ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); Added: trunk/rostests/apitests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/testlis… ============================================================================== --- trunk/rostests/apitests/setupapi/testlist.c (added) +++ trunk/rostests/apitests/setupapi/testlist.c [iso-8859-1] Sat Apr 26 10:58:40 2014 @@ -0,0 +1,12 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_devclass(void); + +const struct test winetest_testlist[] = +{ + { "devclass", func_devclass }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/setupapi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Sat Apr 26 10:58:40 2014 @@ -1,6 +1,5 @@ list(APPEND SOURCE - devclass.c devinst.c diskspace.c install.c @@ -15,7 +14,3 @@ set_module_type(setupapi_winetest win32cui) add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32) add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - add_target_compile_flags(setupapi_winetest "-Wno-error=format") -endif() Removed: trunk/rostests/winetests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devcla… ============================================================================== --- trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devclass.c (removed) @@ -1,347 +0,0 @@ -/* - * SetupAPI device class-related functions tests - * - * Copyright 2006 Hervé Poussineau - * - * 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 <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#undef __WINESRC__ -#undef __ROS_LONG64__ -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "cfgmgr32.h" -#include "setupapi.h" - -#include "wine/test.h" - -static GUID test_class_guid = { 0x4d36e967, 0xe325, 0x11ce, { 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 } }; -static char test_class_name[MAX_CLASS_NAME_LEN] = "DiskDrive"; - -static const char *debugstr_guid(const GUID *guid) -{ - static char guidSTR1[39]; - static char guidSTR2[39]; - char* guidSTR; - static BOOL index; - - if (!guid) return NULL; - - index = !index; - guidSTR = index ? guidSTR1 : guidSTR2; - - snprintf(guidSTR, sizeof(guidSTR1), - "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return guidSTR; -} - -static void test_SetupDiBuildClassInfoList(void) -{ - LPGUID guid_list = NULL; - DWORD required_size, size; - - SetLastError( 0xdeadbeef ); - ok( !SetupDiBuildClassInfoList( 0, NULL, 0, NULL ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiBuildClassInfoList( 0, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - - guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); - if ( !guid_list ) - return; - - SetLastError( 0xdeadbeef ); - ok( SetupDiBuildClassInfoList( 0, guid_list, required_size, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - SetLastError( 0xdeadbeef ); - ok( SetupDiBuildClassInfoList( 0, guid_list, required_size + 1, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - - if ( size > 0 ) - { - /* That's better to use the first class found, as we know for sure that it exists */ - memcpy(&test_class_guid, &guid_list[0], sizeof( GUID ) ); - SetupDiClassNameFromGuidA( &test_class_guid, test_class_name, sizeof( test_class_name ), NULL ); - } - HeapFree( GetProcessHeap(), 0, guid_list ); -} - -static void test_SetupDiClassGuidsFromNameA(void) -{ - LPGUID guid_list = NULL; - DWORD required_size, size; - - SetLastError( 0xdeadbeef ); - ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, NULL ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( SetupDiClassGuidsFromNameA( "", NULL, 0, &required_size ), - "Error reported %lx\n", GetLastError() ); - ok( required_size == 0, "Expected 0, got %lu\n", required_size ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiClassGuidsFromNameA( test_class_name, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); - - guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); - if ( !guid_list ) - return; - - SetLastError( 0xdeadbeef ); - ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); - SetLastError( 0xdeadbeef ); - ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size + 1, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); - - HeapFree( GetProcessHeap(), 0, guid_list ); -} - -static void test_SetupDiClassNameFromGuidA(void) -{ - CHAR* class_name = NULL; - DWORD required_size, size; - - SetLastError( 0xdeadbeef ); - ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, NULL ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiClassNameFromGuidA( &test_class_guid, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); - ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu\n", MAX_CLASS_NAME_LEN, required_size ); - - class_name = HeapAlloc( GetProcessHeap(), 0, required_size ); - if ( !class_name ) - return; - - SetLastError( 0xdeadbeef ); - ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - ok( !strcmp( class_name, test_class_name ), - "Expected %s, got %s\n", test_class_name, class_name ); - SetLastError( 0xdeadbeef ); - ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size + 1, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - ok( !strcmp( class_name, test_class_name ), - "Expected %s, got %s\n", test_class_name, class_name ); - - HeapFree( GetProcessHeap(), 0, class_name ); -} - -static void test_SetupDiGetClassDescriptionA(void) -{ - CHAR* class_desc = NULL; - DWORD required_size, size; - - SetLastError( 0xdeadbeef ); - ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, NULL ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - ok( !SetupDiGetClassDescriptionA( &test_class_guid, NULL, 0, &required_size ), - "Fail expected\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); - ok( required_size < LINE_LEN, "Expected < %u, got %lu\n", LINE_LEN, required_size ); - - class_desc = HeapAlloc( GetProcessHeap(), 0, required_size ); - if ( !class_desc ) - return; - - SetLastError( 0xdeadbeef ); - ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - SetLastError( 0xdeadbeef ); - ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size + 1, &size ), - "Error reported %lx\n", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); - - HeapFree( GetProcessHeap(), 0, class_desc ); -} - -static void test_SetupDiGetClassDevsA(void) -{ - HDEVINFO device_info; - - SetLastError( 0xdeadbeef ); - device_info = SetupDiGetClassDevs( NULL, NULL, NULL, 0 ); - ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_ALLCLASSES ); - ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx\n", GetLastError() ); - SetLastError( 0xdeadbeef ); - ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_DEVICEINTERFACE ); - ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); - - SetLastError( 0xdeadbeef ); - device_info = SetupDiGetClassDevs( &test_class_guid, NULL, NULL, 0 ); - ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx\n", GetLastError() ); - SetLastError( 0xdeadbeef ); - ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - device_info = SetupDiGetClassDevs( NULL, "(invalid enumerator)", NULL, DIGCF_ALLCLASSES ); - ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_DATA, - "Expected error %lx, got %lx\n", ERROR_INVALID_DATA, GetLastError() ); - - SetLastError( 0xdeadbeef ); - device_info = SetupDiGetClassDevs( NULL, "Root", NULL, DIGCF_ALLCLASSES ); - ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx\n", GetLastError() ); - SetLastError( 0xdeadbeef ); - ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx\n", GetLastError() ); -} - -static void test_SetupDiOpenClassRegKeyExA(void) -{ - HKEY hkey; - LONG err; - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( NULL, 0, 0, NULL, NULL ); - ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER | DIOCR_INTERFACE, NULL, NULL ); - ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INTERFACE, NULL, NULL ); - ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected\n" ); - ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); - err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INTERFACE, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); - err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); - - SetLastError( 0xdeadbeef ); - hkey = SetupDiOpenClassRegKeyExA( &test_class_guid, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); - err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); - - err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", 0, KEY_SET_VALUE, &hkey); - ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); -} - -START_TEST(devclass) -{ - test_SetupDiBuildClassInfoList(); - test_SetupDiClassGuidsFromNameA(); - test_SetupDiClassNameFromGuidA(); - test_SetupDiGetClassDescriptionA(); - test_SetupDiGetClassDevsA(); - test_SetupDiOpenClassRegKeyExA(); -} Modified: trunk/rostests/winetests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/testli… ============================================================================== --- trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] Sat Apr 26 10:58:40 2014 @@ -3,7 +3,6 @@ #define STANDALONE #include <wine/test.h> -extern void func_devclass(void); extern void func_devinst(void); extern void func_diskspace(void); extern void func_install(void); @@ -15,7 +14,6 @@ const struct test winetest_testlist[] = { - { "devclass", func_devclass }, { "devinst", func_devinst }, { "diskspace", func_diskspace }, { "install", func_install },

10 years, 8 months

[tfaber] 62974: [NTDLL_WINETEST] - Skip LdrAddRefDll test to avoid crashing. CORE-8102

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 26 10:36:24 2014 New Revision: 62974 URL: http://svn.reactos.org/svn/reactos?rev=62974&view=rev Log: [NTDLL_WINETEST] - Skip LdrAddRefDll test to avoid crashing. CORE-8102 Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Sat Apr 26 10:36:24 2014 @@ -1500,6 +1500,14 @@ return; } +#ifdef __REACTOS__ + if (!winetest_interactive) + { + skip("Skipping LdrAddRefDll tests. See CORE-8102\n"); + return; + } +#endif + mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); ret = FreeLibrary(mod);

10 years, 8 months

[aandrejevic] 62973: [NTVDM] DPRINT1 the error code returned by DosLoadExecutable.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Apr 26 09:40:55 2014 New Revision: 62973 URL: http://svn.reactos.org/svn/reactos?rev=62973&view=rev Log: [NTVDM] DPRINT1 the error code returned by DosLoadExecutable. Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Apr 26 09:40:55 2014 @@ -1283,6 +1283,7 @@ LPCSTR ProgramName, PDOS_EXEC_PARAM_BLOCK Parameters) { + DWORD Result; DWORD BinaryType; LPVOID Environment = NULL; VDM_COMMAND_INFO CommandInfo; @@ -1361,14 +1362,15 @@ GetNextVDMCommand(&CommandInfo); /* Load the executable */ - if (DosLoadExecutable(LoadType, - AppName, - CmdLine, - Env, - &Parameters->StackLocation, - &Parameters->EntryPoint) != ERROR_SUCCESS) - { - DisplayMessage(L"Could not load '%S'", AppName); + Result= DosLoadExecutable(LoadType, + AppName, + CmdLine, + Env, + &Parameters->StackLocation, + &Parameters->EntryPoint); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not load '%S'. Error: %u", AppName, Result); break; } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Apr 26 09:40:55 2014 @@ -379,6 +379,7 @@ DWORD WINAPI CommandThreadProc(LPVOID Parameter) { + DWORD Result; VDM_COMMAND_INFO CommandInfo; CHAR CmdLine[MAX_PATH]; CHAR AppName[MAX_PATH]; @@ -414,14 +415,11 @@ /* Start the process from the command line */ DPRINT1("Starting '%s'...\n", AppName); - if (DosLoadExecutable(DOS_LOAD_AND_EXECUTE, - AppName, - CmdLine, - Env, - NULL, - NULL) != ERROR_SUCCESS) - { - DisplayMessage(L"Could not start '%S'", AppName); + + Result = DosLoadExecutable(DOS_LOAD_AND_EXECUTE, AppName, CmdLine, Env, NULL, NULL); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); break; } @@ -437,6 +435,8 @@ INT wmain(INT argc, WCHAR *argv[]) { + DWORD Result; + #ifdef STANDALONE CHAR ApplicationName[MAX_PATH]; CHAR CommandLine[DOS_CMDLINE_LENGTH]; @@ -506,15 +506,17 @@ #else /* Start the process from the command line */ - DPRINT1("Starting '%s'...\n", CommandLine); - if (DosLoadExecutable(DOS_LOAD_AND_EXECUTE, - ApplicationName, - CommandLine, - GetEnvironmentStrings(), - NULL, - NULL) != ERROR_SUCCESS) - { - DisplayMessage(L"Could not start '%S'", ApplicationName); + DPRINT1("Starting '%s'...\n", ApplicationName); + + Result = DosLoadExecutable(DOS_LOAD_AND_EXECUTE, + ApplicationName, + CommandLine, + GetEnvironmentStrings(), + NULL, + NULL); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result); goto Cleanup; }

10 years, 8 months

[aandrejevic] 62972: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Apr 26 08:57:17 2014 New Revision: 62972 URL: http://svn.reactos.org/svn/reactos?rev=62972&view=rev Log: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process). Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Apr 26 08:57:17 2014 @@ -383,15 +383,13 @@ Mcb->OwnerPsp = NewOwner; } - - -static WORD DosCopyEnvironmentBlock(WORD SourceSegment, LPCSTR ProgramName) -{ - PCHAR Ptr, SourceBuffer, DestBuffer = NULL; +static WORD DosCopyEnvironmentBlock(LPCVOID Environment, LPCSTR ProgramName) +{ + PCHAR Ptr, DestBuffer = NULL; ULONG TotalSize = 0; WORD DestSegment; - Ptr = SourceBuffer = (PCHAR)SEG_OFF_TO_PTR(SourceSegment, 0); + Ptr = (PCHAR)Environment; /* Calculate the size of the environment block */ while (*Ptr) @@ -408,7 +406,7 @@ DestSegment = DosAllocateMemory((WORD)((TotalSize + 0x0F) >> 4), NULL); if (!DestSegment) return 0; - Ptr = SourceBuffer; + Ptr = (PCHAR)Environment; DestBuffer = (PCHAR)SEG_OFF_TO_PTR(DestSegment, 0); while (*Ptr) @@ -1042,57 +1040,51 @@ PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; } -BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock) -{ - BOOLEAN Success = FALSE, AllocatedEnvBlock = FALSE; +DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, + IN LPCSTR ExecutablePath, + IN LPCSTR CommandLine, + IN PVOID Environment, + OUT PDWORD StackLocation OPTIONAL, + OUT PDWORD EntryPoint OPTIONAL) +{ + DWORD Result = ERROR_SUCCESS; HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; LPBYTE Address = NULL; - LPSTR ProgramFilePath, Parameters[256]; - CHAR CommandLineCopy[DOS_CMDLINE_LENGTH]; - CHAR ParamString[DOS_CMDLINE_LENGTH]; - DWORD ParamCount = 0; WORD Segment = 0; + WORD EnvBlock = 0; WORD MaxAllocSize; DWORD i, FileSize, ExeSize; PIMAGE_DOS_HEADER Header; PDWORD RelocationTable; PWORD RelocWord; - DPRINT("DosCreateProcess: CommandLine \"%s\", EnvBlock 0x%04X\n", - CommandLine, - EnvBlock); - - /* Save a copy of the command line */ - strcpy(CommandLineCopy, CommandLine); - - /* Get the file name of the executable */ - ProgramFilePath = strtok(CommandLineCopy, " \t"); - - /* Load the parameters in the local array */ - while ((ParamCount < sizeof(Parameters)/sizeof(Parameters[0])) - && ((Parameters[ParamCount] = strtok(NULL, " \t")) != NULL)) - { - ParamCount++; - } - - ZeroMemory(ParamString, sizeof(ParamString)); - - /* Store the parameters in a string */ - for (i = 0; i < ParamCount; i++) - { - strncat(ParamString, Parameters[i], DOS_CMDLINE_LENGTH - strlen(ParamString) - 1); - strncat(ParamString, " ", DOS_CMDLINE_LENGTH - strlen(ParamString) - 1); + DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", + LoadType, + ExecutablePath, + CommandLine, + Environment, + StackLocation, + EntryPoint); + + if (LoadType == DOS_LOAD_OVERLAY) + { + DPRINT1("Overlay loading is not supported yet.\n"); + return ERROR_NOT_SUPPORTED; } /* Open a handle to the executable */ - FileHandle = CreateFileA(ProgramFilePath, + FileHandle = CreateFileA(ExecutablePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (FileHandle == INVALID_HANDLE_VALUE) goto Cleanup; + if (FileHandle == INVALID_HANDLE_VALUE) + { + Result = GetLastError(); + goto Cleanup; + } /* Get the file size */ FileSize = GetFileSize(FileHandle, NULL); @@ -1104,23 +1096,26 @@ 0, 0, NULL); - if (FileMapping == NULL) goto Cleanup; + if (FileMapping == NULL) + { + Result = GetLastError(); + goto Cleanup; + } /* Map the file into memory */ Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); - if (Address == NULL) goto Cleanup; - - /* Did we get an environment segment? */ - if (!EnvBlock) - { - /* Set a flag to know if the environment block was allocated here */ - AllocatedEnvBlock = TRUE; - - /* No, copy the one from the parent */ - EnvBlock = DosCopyEnvironmentBlock((CurrentPsp != SYSTEM_PSP) - ? SEGMENT_TO_PSP(CurrentPsp)->EnvBlock - : SYSTEM_ENV_BLOCK, - ProgramFilePath); + if (Address == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Copy the environment block to DOS memory */ + EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); + if (EnvBlock == 0) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } /* Check if this is an EXE file or a COM file */ @@ -1152,11 +1147,15 @@ } /* Check if at least the lowest allocation was successful */ - if (Segment == 0) goto Cleanup; + if (Segment == 0) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } /* Initialize the PSP */ DosInitializePsp(Segment, - ParamString, + CommandLine, (WORD)ExeSize, EnvBlock); @@ -1184,21 +1183,22 @@ *RelocWord += Segment + (sizeof(DOS_PSP) >> 4); } - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the location from the header */ - EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, - Header->e_sp); - - /* Execute */ - CurrentPsp = Segment; - DiskTransferArea = MAKELONG(0x80, Segment); - EmulatorExecute(Segment + Header->e_cs + (sizeof(DOS_PSP) >> 4), - Header->e_ip); - - Success = TRUE; + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Set the initial segment registers */ + setDS(Segment); + setES(Segment); + + /* Set the stack to the location from the header */ + EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, + Header->e_sp); + + /* Execute */ + CurrentPsp = Segment; + DiskTransferArea = MAKELONG(0x80, Segment); + EmulatorExecute(Segment + Header->e_cs + (sizeof(DOS_PSP) >> 4), + Header->e_ip); + } } else { @@ -1208,11 +1208,19 @@ DosAllocateMemory(0xFFFF, &MaxAllocSize); /* Make sure it's enough for the whole program and the PSP */ - if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) goto Cleanup; + if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) + { + Result = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } /* Allocate all of it */ Segment = DosAllocateMemory(MaxAllocSize, NULL); - if (Segment == 0) goto Cleanup; + if (Segment == 0) + { + Result = ERROR_ARENA_TRASHED; + goto Cleanup; + } /* The process owns its own memory */ DosChangeMemoryOwner(Segment, Segment); @@ -1225,36 +1233,37 @@ /* Initialize the PSP */ DosInitializePsp(Segment, - ParamString, + CommandLine, MaxAllocSize, EnvBlock); - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the last word of the segment */ - EmulatorSetStack(Segment, 0xFFFE); - - /* - * Set the value on the stack to 0, so that a near return - * jumps to PSP:0000 which has the exit code. - */ - *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; - - /* Execute */ - CurrentPsp = Segment; - DiskTransferArea = MAKELONG(0x80, Segment); - EmulatorExecute(Segment, 0x100); - - Success = TRUE; + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Set the initial segment registers */ + setDS(Segment); + setES(Segment); + + /* Set the stack to the last word of the segment */ + EmulatorSetStack(Segment, 0xFFFE); + + /* + * Set the value on the stack to 0, so that a near return + * jumps to PSP:0000 which has the exit code. + */ + *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; + + /* Execute */ + CurrentPsp = Segment; + DiskTransferArea = MAKELONG(0x80, Segment); + EmulatorExecute(Segment, 0x100); + } } Cleanup: - if (!Success) + if (Result != ERROR_SUCCESS) { /* It was not successful, cleanup the DOS memory */ - if (AllocatedEnvBlock) DosFreeMemory(EnvBlock); + if (EnvBlock) DosFreeMemory(EnvBlock); if (Segment) DosFreeMemory(Segment); } @@ -1267,7 +1276,118 @@ /* Close the file handle */ if (FileHandle != INVALID_HANDLE_VALUE) CloseHandle(FileHandle); - return Success; + return Result; +} + +WORD DosCreateProcess(DOS_EXEC_TYPE LoadType, + LPCSTR ProgramName, + PDOS_EXEC_PARAM_BLOCK Parameters) +{ + DWORD BinaryType; + LPVOID Environment = NULL; + VDM_COMMAND_INFO CommandInfo; + CHAR CmdLine[MAX_PATH]; + CHAR AppName[MAX_PATH]; + CHAR PifFile[MAX_PATH]; + CHAR Desktop[MAX_PATH]; + CHAR Title[MAX_PATH]; + CHAR Env[MAX_PATH]; + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInfo; + + /* Get the binary type */ + if (!GetBinaryTypeA(ProgramName, &BinaryType)) return GetLastError(); + + /* Did the caller specify an environment segment? */ + if (Parameters->Environment) + { + /* Yes, use it instead of the parent one */ + Environment = SEG_OFF_TO_PTR(Parameters->Environment, 0); + } + + /* Set up the startup info structure */ + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOA)); + StartupInfo.cb = sizeof(STARTUPINFOA); + + /* Create the process */ + if (!CreateProcessA(ProgramName, + FAR_POINTER(Parameters->CommandLine), + NULL, + NULL, + FALSE, + 0, + Environment, + NULL, + &StartupInfo, + &ProcessInfo)) + { + return GetLastError(); + } + + /* Check the type of the program */ + switch (BinaryType) + { + /* These are handled by NTVDM */ + case SCS_DOS_BINARY: + case SCS_WOW_BINARY: + { + /* Clear the structure */ + ZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Initialize the structure members */ + CommandInfo.VDMState = VDM_NOT_READY; + CommandInfo.CmdLine = CmdLine; + CommandInfo.CmdLen = sizeof(CmdLine); + CommandInfo.AppName = AppName; + CommandInfo.AppLen = sizeof(AppName); + CommandInfo.PifFile = PifFile; + CommandInfo.PifLen = sizeof(PifFile); + CommandInfo.Desktop = Desktop; + CommandInfo.DesktopLen = sizeof(Desktop); + CommandInfo.Title = Title; + CommandInfo.TitleLen = sizeof(Title); + CommandInfo.Env = Env; + CommandInfo.EnvLen = sizeof(Env); + + /* Get the VDM command information */ + if (!GetNextVDMCommand(&CommandInfo)) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + + /* Increment the re-entry count */ + CommandInfo.VDMState = VDM_INC_REENTER_COUNT; + GetNextVDMCommand(&CommandInfo); + + /* Load the executable */ + if (DosLoadExecutable(LoadType, + AppName, + CmdLine, + Env, + &Parameters->StackLocation, + &Parameters->EntryPoint) != ERROR_SUCCESS) + { + DisplayMessage(L"Could not load '%S'", AppName); + break; + } + + break; + } + + /* Not handled by NTVDM */ + default: + { + /* Wait for the process to finish executing */ + WaitForSingleObject(ProcessInfo.hProcess, INFINITE); + } + } + + /* Close the handles */ + CloseHandle(ProcessInfo.hProcess); + CloseHandle(ProcessInfo.hThread); + + return ERROR_SUCCESS; } VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode) @@ -2345,6 +2465,27 @@ break; } + /* Execute */ + case 0x4B: + { + DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)getAL(); + LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); + PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); + WORD ErrorCode = DosCreateProcess(LoadType, ProgramName, ParamBlock); + + if (ErrorCode == ERROR_SUCCESS) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ErrorCode); + } + + break; + } + /* Terminate With Return Code */ case 0x4C: { Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sat Apr 26 08:57:17 2014 @@ -52,6 +52,13 @@ DOS_ALLOC_BEST_FIT, DOS_ALLOC_LAST_FIT }; + +typedef enum +{ + DOS_LOAD_AND_EXECUTE = 0x00, + DOS_LOAD_ONLY = 0x01, + DOS_LOAD_OVERLAY = 0x03 +} DOS_EXEC_TYPE; #pragma pack(push, 1) @@ -136,6 +143,19 @@ CHAR FileName[13]; } DOS_FIND_FILE_BLOCK, *PDOS_FIND_FILE_BLOCK; +typedef struct _DOS_EXEC_PARAM_BLOCK +{ + /* Input variables */ + WORD Environment; + DWORD CommandLine; + DWORD FirstFcb; + DWORD SecondFcb; + + /* Output variables */ + DWORD StackLocation; + DWORD EntryPoint; +} DOS_EXEC_PARAM_BLOCK, *PDOS_EXEC_PARAM_BLOCK; + #pragma pack(pop) /* FUNCTIONS ******************************************************************/ @@ -169,7 +189,19 @@ WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten); VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); -BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); +DWORD DosLoadExecutable( + IN DOS_EXEC_TYPE LoadType, + IN LPCSTR ExecutablePath, + IN LPCSTR CommandLine, + IN PVOID Environment, + OUT PDWORD StackLocation OPTIONAL, + OUT PDWORD EntryPoint OPTIONAL +); +WORD DosCreateProcess( + DOS_EXEC_TYPE LoadType, + LPCSTR ProgramName, + PDOS_EXEC_PARAM_BLOCK Parameters +); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Apr 26 08:57:17 2014 @@ -385,6 +385,7 @@ CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; CHAR Title[MAX_PATH]; + CHAR Env[MAX_PATH]; UNREFERENCED_PARAMETER(Parameter); @@ -405,13 +406,20 @@ CommandInfo.DesktopLen = sizeof(Desktop); CommandInfo.Title = Title; CommandInfo.TitleLen = sizeof(Title); + CommandInfo.Env = Env; + CommandInfo.EnvLen = sizeof(Env); /* Wait for the next available VDM */ if (!GetNextVDMCommand(&CommandInfo)) break; /* Start the process from the command line */ DPRINT1("Starting '%s'...\n", AppName); - if (!DosCreateProcess(AppName, 0)) + if (DosLoadExecutable(DOS_LOAD_AND_EXECUTE, + AppName, + CmdLine, + Env, + NULL, + NULL) != ERROR_SUCCESS) { DisplayMessage(L"Could not start '%S'", AppName); break; @@ -430,17 +438,20 @@ INT wmain(INT argc, WCHAR *argv[]) { #ifdef STANDALONE - + CHAR ApplicationName[MAX_PATH]; CHAR CommandLine[DOS_CMDLINE_LENGTH]; - if (argc == 2 && argv[1] != NULL) - { - WideCharToMultiByte(CP_ACP, 0, argv[1], -1, CommandLine, sizeof(CommandLine), NULL, NULL); + if (argc >= 2) + { + WideCharToMultiByte(CP_ACP, 0, argv[1], -1, ApplicationName, sizeof(ApplicationName), NULL, NULL); + + if (argc >= 3) WideCharToMultiByte(CP_ACP, 0, argv[2], -1, CommandLine, sizeof(CommandLine), NULL, NULL); + else strcpy(CommandLine, ""); } else { wprintf(L"\nReactOS Virtual DOS Machine\n\n" - L"Usage: NTVDM <executable>\n"); + L"Usage: NTVDM <executable> [<parameters>]\n"); return 0; } @@ -496,9 +507,14 @@ /* Start the process from the command line */ DPRINT1("Starting '%s'...\n", CommandLine); - if (!DosCreateProcess(CommandLine, 0)) - { - DisplayMessage(L"Could not start '%S'", CommandLine); + if (DosLoadExecutable(DOS_LOAD_AND_EXECUTE, + ApplicationName, + CommandLine, + GetEnvironmentStrings(), + NULL, + NULL) != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'", ApplicationName); goto Cleanup; }

10 years, 8 months

[aandrejevic] 62972: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process).

by aandrejevic＠svn.reactos.org

10 years, 8 months

[aandrejevic] 62972: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process).

by aandrejevic＠svn.reactos.org

10 years, 8 months

[aandrejevic] 62972: [NTVDM] Rewrite DosCreateProcess, separating the loading code into DosLoadExecutable. Implement INT 21h function AH = 0x4B (Create Process).

by aandrejevic＠svn.reactos.org

10 years, 8 months

[tfaber] 62971: [CRT] - Import commit 638c8e38 (Don't overwrite unmatched string in scanf) from Wine. Fixes crash in msvcrt_winetest:scanf

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 25 22:02:26 2014 New Revision: 62971 URL: http://svn.reactos.org/svn/reactos?rev=62971&view=rev Log: [CRT] - Import commit 638c8e38 (Don't overwrite unmatched string in scanf) from Wine. Fixes crash in msvcrt_winetest:scanf Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Fri Apr 25 22:02:26 2014 @@ -359,7 +359,7 @@ if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; widecharstring: { /* read a word into a wchar_t* */ @@ -375,7 +375,7 @@ if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; /* 'c' and 'C work analogously to 's' and 'S' as described

10 years, 8 months

[fireball] 62970: [WIN32K] - Indeed Win32kProcessCallout may be called for a process with an already created Win32 Process Info. Handle it like in trunk. Found and fixed by Kamil Hornicek.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 25 21:36:32 2014 New Revision: 62970 URL: http://svn.reactos.org/svn/reactos?rev=62970&view=rev Log: [WIN32K] - Indeed Win32kProcessCallout may be called for a process with an already created Win32 Process Info. Handle it like in trunk. Found and fixed by Kamil Hornicek. Modified: branches/arwinss/arwinss/server/main/init.c Modified: branches/arwinss/arwinss/server/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/ini… ============================================================================== --- branches/arwinss/arwinss/server/main/init.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/main/init.c [iso-8859-1] Fri Apr 25 21:36:32 2014 @@ -113,14 +113,20 @@ PPROCESSINFO Win32Process; NTSTATUS Status; - DPRINT("Enter Win32kProcessCallback\n"); - /* Get the Win32 Process */ Win32Process = PsGetProcessWin32Process(Process); - DPRINT("Win32Process %p, Create %d\n", Win32Process, Create); - if (Create && !Win32Process) + DPRINT("Win32kProcessCallback(): Win32Process %p, Create %d\n", Win32Process, Create); + if (Create) { DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + + /* We might be called with an already allocated win32 process */ + if (Win32Process) + { + /* There is no more to do for us (this is a success code!) */ + Status = STATUS_ALREADY_WIN32; + return Status; + } /* Allocate one if needed */ /* FIXME - lock the process */ @@ -189,7 +195,6 @@ UserLeave(); } - DPRINT("Leave Win32kProcessCallback\n"); return STATUS_SUCCESS; }

10 years, 8 months

[fireball] 62969: [USER32] - Make a proper stub for RegisterUserApiHook(), as it's actually being called.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Apr 25 21:28:22 2014 New Revision: 62969 URL: http://svn.reactos.org/svn/reactos?rev=62969&view=rev Log: [USER32] - Make a proper stub for RegisterUserApiHook(), as it's actually being called. Modified: branches/arwinss/arwinss/client/user32/user32.spec branches/arwinss/arwinss/client/user32/user_main.c Modified: branches/arwinss/arwinss/client/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] Fri Apr 25 21:28:22 2014 @@ -571,7 +571,7 @@ @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) -@ stub RegisterUserApiHook +@ stdcall RegisterUserApiHook(ptr) @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() Modified: branches/arwinss/arwinss/client/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user_main.c [iso-8859-1] Fri Apr 25 21:28:22 2014 @@ -370,5 +370,12 @@ BOOL WINAPI UnregisterUserApiHook(VOID) { + TRACE(": stub\n"); return TRUE; } + +BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah) +{ + TRACE(": stub\n"); + return TRUE; +}

10 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
50
Older →

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 April 2014