Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60529: [SETUPAPI_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 09:51:37 2013 New Revision: 60529 URL: http://svn.reactos.org/svn/reactos?rev=60529&view=rev Log: [SETUPAPI_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/setupapi/devinst.c trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/parser.c trunk/rostests/winetests/setupapi/testlist.c 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 Oct 5 09:51:37 2013 @@ -1,6 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__) list(APPEND SOURCE devclass.c @@ -15,9 +12,8 @@ testlist.c) add_executable(setupapi_winetest ${SOURCE}) -target_link_libraries(setupapi_winetest wine) set_module_type(setupapi_winetest win32cui) -add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) +add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32) add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) Modified: trunk/rostests/winetests/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devins… ============================================================================== --- trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include <stdio.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -31,8 +31,9 @@ #include "wine/test.h" +static BOOL is_wow64; + /* function pointers */ -static HMODULE hSetupAPI; static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoList)(GUID*,HWND); static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); @@ -40,6 +41,7 @@ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); +static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); @@ -56,13 +58,15 @@ static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); /* This is a unique guid for testing purposes */ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static void init_function_pointers(void) { - hSetupAPI = GetModuleHandleA("setupapi.dll"); + HMODULE hSetupAPI = GetModuleHandleA("setupapi.dll"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); pSetupDiCreateDeviceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoA"); pSetupDiCreateDeviceInfoW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoW"); @@ -83,10 +87,12 @@ pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW"); + pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); pSetupDiSetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyA"); pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW"); pSetupDiGetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyA"); pSetupDiGetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyW"); + pIsWow64Process = (void *)GetProcAddress(hKernel32, "IsWow64Process"); } static void change_reg_permissions(const WCHAR *regkey) @@ -126,7 +132,7 @@ { HDEVINFO set; SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; - BOOL ret; + BOOL ret, retval; SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsA(&guid, NULL, 0, 0); @@ -134,19 +140,23 @@ GetLastError()); SetLastError(0xdeadbeef); - ok(pSetupDiEnumDeviceInfo(set, 0, &devInfo), - "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); - todo_wine - ok(ret, "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - ok(pSetupDiDestroyDeviceInfoList(set), - "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); - - return ret; + ret = pSetupDiEnumDeviceInfo(set, 0, &devInfo); + ok(ret, "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + if(is_wow64) + todo_wine ok(!retval && GetLastError() == ERROR_IN_WOW64, + "SetupDiCallClassInstaller(DIF_REMOVE...) succeeded: %08x\n", GetLastError()); + else + todo_wine ok(retval, + "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiDestroyDeviceInfoList(set); + ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + + return retval; } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -251,6 +261,7 @@ DWORD error; static CHAR notnull[] = "NotNull"; static const WCHAR machine[] = { 'd','u','m','m','y',0 }; + static const WCHAR empty[] = { 0 }; SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ @@ -275,6 +286,14 @@ /* create empty DeviceInfoList */ devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); + + /* destroy DeviceInfoList */ + ret = pSetupDiDestroyDeviceInfoList(devlist); + ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); + + /* create empty DeviceInfoList with empty machine name */ + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); /* destroy DeviceInfoList */ @@ -955,7 +974,6 @@ key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); /* The software key isn't created by default */ - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError()); @@ -1005,8 +1023,8 @@ /* Cleanup */ ret = remove_device(); - todo_wine - ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + if(!is_wow64) + todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -1089,8 +1107,10 @@ { static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + static const char path_wow64[] = + "\\\\?\\root#legacy_bogus#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; static const char path_w2k[] = - "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; detail = HeapAlloc(GetProcessHeap(), 0, dwSize); @@ -1104,10 +1124,13 @@ /* FIXME: This one only worked because old data wasn't removed properly. As soon * as all the tests are cleaned up correctly this has to be (or should be) fixed */ - todo_wine - ok(!lstrcmpiA(path, detail->DevicePath) || - !lstrcmpiA(path_w2k, detail->DevicePath), "Unexpected path %s\n", - detail->DevicePath); + if(is_wow64) + ok(!lstrcmpiA(path_wow64, detail->DevicePath), + "Unexpected path %s\n", detail->DevicePath); + else + todo_wine ok(!lstrcmpiA(path, detail->DevicePath) || + !lstrcmpiA(path_w2k, detail->DevicePath), + "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail); } } @@ -1116,8 +1139,8 @@ /* Cleanup */ ret = remove_device(); - todo_wine - ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + if(!is_wow64) + todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -1226,8 +1249,8 @@ pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); - todo_wine - ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); + if(!is_wow64) + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { @@ -1332,8 +1355,8 @@ pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); - todo_wine - ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); + if(!is_wow64) + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { @@ -1343,23 +1366,182 @@ } } +static void testSetupDiGetINFClassA(void) +{ + static const char inffile[] = "winetest.inf"; + static const char content[] = "[Version]\r\n\r\n"; + + char cn[MAX_PATH]; + char filename[MAX_PATH]; + DWORD count; + BOOL retval; + GUID guid; + HANDLE h; + + if(!pSetupDiGetINFClassA) + { + win_skip("SetupDiGetINFClassA not present\n"); + return; + } + + count = GetTempPathA(MAX_PATH, filename); + if(!count) + { + win_skip("GetTempPathA failed\n"); + return; + } + + strcat(filename, inffile); + DeleteFileA(filename); + + /* not existing file */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) + { + skip("SetupDiGetINFClassA is not implemented\n"); + return; + } + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* missing file wins against other invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, NULL); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_FILE_NOT_FOUND == GetLastError(), + "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + /* test file content */ + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Class", "WINE", filename); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + DeleteFileA(filename); + + WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); + + DeleteFileA(filename); +} + START_TEST(devinst) { - HDEVINFO set; - - init_function_pointers(); - - /* Win9x/WinMe does things totally different so we skip all the tests - * - * We don't want to exclude NT4 so hence this check. - */ - SetLastError(0xdeadbeef); - set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0); - if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Win9x/WinMe has totally different behavior\n"); - return; - } + init_function_pointers(); + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); if (pSetupDiCreateDeviceInfoListExW) test_SetupDiCreateDeviceInfoListEx(); @@ -1381,4 +1563,13 @@ testRegisterAndGetDetail(); testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); -} + + if (!winetest_interactive) + { + win_skip("testSetupDiGetINFClassA(), ROSTESTS-124.\n"); + } + else + { + testSetupDiGetINFClassA(); + } +} Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… ============================================================================== --- trunk/rostests/winetests/setupapi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/install.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -321,6 +321,20 @@ 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 = SetupInstallServicesFromInfSectionA(infhandle, "XSP.InstallPerVer", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); /* TODO: Test the Flags */ } Modified: trunk/rostests/winetests/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/parser… ============================================================================== --- trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] Sat Oct 5 09:51:37 2013 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -424,7 +423,12 @@ if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); - assert( ret ); + ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); + if (!ret) + { + SetupCloseInfFile( hinf ); + continue; + } check_key( &context, key_names[i].key ); 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 Oct 5 09:51:37 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_devclass(void); extern void func_devinst(void);

1 0

[akhaldi] 60528: [PSDK] * Add missing ERROR_IN_WOW64 define.
by akhaldi＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: akhaldi Date: Sat Oct 5 09:50:21 2013 New Revision: 60528 URL: http://svn.reactos.org/svn/reactos?rev=60528&view=rev Log: [PSDK] * Add missing ERROR_IN_WOW64 define. Modified: trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat Oct 5 09:50:21 2013 @@ -334,6 +334,7 @@ #define ERROR_DEVINSTALL_QUEUE_NONNATIVE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x230) #define ERROR_NOT_DISABLEABLE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x231) #define ERROR_CANT_REMOVE_DEVINST (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x232) +#define ERROR_IN_WOW64 (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x235) #define ERROR_INTERFACE_DEVICE_ACTIVE ERROR_DEVICE_INTERFACE_ACTIVE #define ERROR_INTERFACE_DEVICE_REMOVED ERROR_DEVICE_INTERFACE_REMOVED #define ERROR_NO_DEFAULT_INTERFACE_DEVICE ERROR_NO_DEFAULT_DEVICE_INTERFACE

1 0

[ekohl] 60527: [SAMSRV] SampQueryUserAll: Rewrite the handling of the WhichFields variable in order to simplify the support of trusted user information.
by ekohl＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: ekohl Date: Fri Oct 4 22:23:25 2013 New Revision: 60527 URL: http://svn.reactos.org/svn/reactos?rev=60527&view=rev Log: [SAMSRV] SampQueryUserAll: Rewrite the handling of the WhichFields variable in order to simplify the support of trusted user information. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Fri Oct 4 22:23:25 2013 @@ -6443,9 +6443,42 @@ if (!NT_SUCCESS(Status)) goto done; - if (UserObject->Access & USER_READ_GENERAL) - { - /* Get the Name string */ + /* Set the fields to be returned */ + if (UserObject->Trusted) + { + InfoBuffer->All.WhichFields = USER_ALL_READ_GENERAL_MASK | + USER_ALL_READ_LOGON_MASK | + USER_ALL_READ_ACCOUNT_MASK | + USER_ALL_READ_PREFERENCES_MASK | + USER_ALL_READ_TRUSTED_MASK; + } + else + { + InfoBuffer->All.WhichFields = 0; + + if (UserObject->Access & USER_READ_GENERAL) + InfoBuffer->All.WhichFields |= USER_ALL_READ_GENERAL_MASK; + + if (UserObject->Access & USER_READ_LOGON) + InfoBuffer->All.WhichFields |= USER_ALL_READ_LOGON_MASK; + + if (UserObject->Access & USER_READ_ACCOUNT) + InfoBuffer->All.WhichFields |= USER_ALL_READ_ACCOUNT_MASK; + + if (UserObject->Access & USER_READ_PREFERENCES) + InfoBuffer->All.WhichFields |= USER_ALL_READ_PREFERENCES_MASK; + } + + /* Fail, if no fields are to be returned */ + if (InfoBuffer->All.WhichFields == 0) + { + Status = STATUS_ACCESS_DENIED; + goto done; + } + + /* Get the UserName attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERNAME) + { Status = SampGetObjectAttributeString(UserObject, L"Name", &InfoBuffer->All.UserName); @@ -6454,8 +6487,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the FullName string */ + } + + /* Get the FullName attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_FULLNAME) + { Status = SampGetObjectAttributeString(UserObject, L"FullName", &InfoBuffer->All.FullName); @@ -6464,14 +6500,23 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the user ID*/ + } + + /* Get the UserId attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERID) + { InfoBuffer->All.UserId = FixedData.UserId; - - /* Get the primary group ID */ + } + + /* Get the PrimaryGroupId attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PRIMARYGROUPID) + { InfoBuffer->All.PrimaryGroupId = FixedData.PrimaryGroupId; - - /* Get the AdminComment string */ + } + + /* Get the AdminComment attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_ADMINCOMMENT) + { Status = SampGetObjectAttributeString(UserObject, L"AdminComment", &InfoBuffer->All.AdminComment); @@ -6480,8 +6525,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the UserComment string */ + } + + /* Get the UserComment attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERCOMMENT) + { Status = SampGetObjectAttributeString(UserObject, L"UserComment", &InfoBuffer->All.UserComment); @@ -6490,19 +6538,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - InfoBuffer->All.WhichFields |= USER_ALL_READ_GENERAL_MASK; -// USER_ALL_USERNAME | -// USER_ALL_FULLNAME | -// USER_ALL_USERID | -// USER_ALL_PRIMARYGROUPID | -// USER_ALL_ADMINCOMMENT | -// USER_ALL_USERCOMMENT; - } - - if (UserObject->Access & USER_READ_LOGON) - { - /* Get the HomeDirectory string */ + } + + /* Get the HomeDirectory attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_HOMEDIRECTORY) + { Status = SampGetObjectAttributeString(UserObject, L"HomeDirectory", &InfoBuffer->All.HomeDirectory); @@ -6511,8 +6551,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the HomeDirectoryDrive string */ + } + + /* Get the HomeDirectoryDrive attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_HOMEDIRECTORYDRIVE) + { Status = SampGetObjectAttributeString(UserObject, L"HomeDirectoryDrive", &InfoBuffer->Home.HomeDirectoryDrive); @@ -6521,8 +6564,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the ScriptPath string */ + } + + /* Get the ScriptPath attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_SCRIPTPATH) + { Status = SampGetObjectAttributeString(UserObject, L"ScriptPath", &InfoBuffer->All.ScriptPath); @@ -6531,8 +6577,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the ProfilePath string */ + } + + /* Get the ProfilePath attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PROFILEPATH) + { Status = SampGetObjectAttributeString(UserObject, L"ProfilePath", &InfoBuffer->All.ProfilePath); @@ -6541,8 +6590,11 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the WorkStations string */ + } + + /* Get the WorkStations attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_WORKSTATIONS) + { Status = SampGetObjectAttributeString(UserObject, L"WorkStations", &InfoBuffer->All.WorkStations); @@ -6551,8 +6603,25 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - /* Get the LogonHours attribute */ + } + + /* Get the LastLogon attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LASTLOGON) + { + InfoBuffer->All.LastLogon.LowPart = FixedData.LastLogon.LowPart; + InfoBuffer->All.LastLogon.HighPart = FixedData.LastLogon.HighPart; + } + + /* Get the LastLogoff attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LASTLOGOFF) + { + InfoBuffer->All.LastLogoff.LowPart = FixedData.LastLogoff.LowPart; + InfoBuffer->All.LastLogoff.HighPart = FixedData.LastLogoff.HighPart; + } + + /* Get the LogonHours attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LOGONHOURS) + { Status = SampGetLogonHoursAttrbute(UserObject, &InfoBuffer->All.LogonHours); if (!NT_SUCCESS(Status)) @@ -6560,55 +6629,61 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - InfoBuffer->All.LastLogon.LowPart = FixedData.LastLogon.LowPart; - InfoBuffer->All.LastLogon.HighPart = FixedData.LastLogon.HighPart; - - InfoBuffer->All.LastLogoff.LowPart = FixedData.LastLogoff.LowPart; - InfoBuffer->All.LastLogoff.HighPart = FixedData.LastLogoff.HighPart; - + } + + /* Get the BadPasswordCount attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_BADPASSWORDCOUNT) + { InfoBuffer->All.BadPasswordCount = FixedData.BadPasswordCount; - + } + + /* Get the LogonCount attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_LOGONCOUNT) + { InfoBuffer->All.LogonCount = FixedData.LogonCount; - + } + + /* Get the PasswordCanChange attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDCANCHANGE) + { PasswordCanChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, DomainFixedData.MinPasswordAge); InfoBuffer->All.PasswordCanChange.LowPart = PasswordCanChange.LowPart; InfoBuffer->All.PasswordCanChange.HighPart = PasswordCanChange.HighPart; - + } + + /* Get the PasswordMustChange attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDMUSTCHANGE) + { PasswordMustChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, DomainFixedData.MaxPasswordAge); InfoBuffer->All.PasswordMustChange.LowPart = PasswordMustChange.LowPart; InfoBuffer->All.PasswordMustChange.HighPart = PasswordMustChange.HighPart; - - InfoBuffer->All. WhichFields |= USER_ALL_READ_LOGON_MASK; -/* - USER_ALL_HOMEDIRECTORY | - USER_ALL_HOMEDIRECTORYDRIVE | - USER_ALL_SCRIPTPATH | - USER_ALL_PROFILEPATH | - USER_ALL_WORKSTATIONS | - USER_ALL_LASTLOGON | - USER_ALL_LASTLOGOFF | - USER_ALL_LOGONHOURS | - USER_ALL_BADPASSWORDCOUNT | - USER_ALL_LOGONCOUNT; - USER_ALL_PASSWORDCANCHANGE | - USER_ALL_PASSWORDMUSTCHANGE; -*/ - } - - if (UserObject->Access & USER_READ_ACCOUNT) + } + + /* Get the PasswordLastSet attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDLASTSET) { InfoBuffer->All.PasswordLastSet.LowPart = FixedData.PasswordLastSet.LowPart; InfoBuffer->All.PasswordLastSet.HighPart = FixedData.PasswordLastSet.HighPart; - + } + + /* Get the AccountExpires attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_ACCOUNTEXPIRES) + { InfoBuffer->All.AccountExpires.LowPart = FixedData.AccountExpires.LowPart; InfoBuffer->All.AccountExpires.HighPart = FixedData.AccountExpires.HighPart; - + } + + /* Get the UserAccountControl attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_USERACCOUNTCONTROL) + { InfoBuffer->All.UserAccountControl = FixedData.UserAccountControl; - - /* Get the Parameters string */ + } + + /* Get the Parameters attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_PARAMETERS) + { Status = SampGetObjectAttributeString(UserObject, L"Parameters", &InfoBuffer->All.Parameters); @@ -6617,23 +6692,43 @@ TRACE("Status 0x%08lx\n", Status); goto done; } - - InfoBuffer->All. WhichFields |= USER_ALL_READ_ACCOUNT_MASK; -// USER_ALL_PASSWORDLASTSET | -// USER_ALL_ACCOUNTEXPIRES | -// USER_ALL_USERACCOUNTCONTROL | -// USER_ALL_PARAMETERS; - } - - if (UserObject->Access & USER_READ_PREFERENCES) + } + + /* Get the CountryCode attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_COUNTRYCODE) { InfoBuffer->All.CountryCode = FixedData.CountryCode; - + } + + /* Get the CodePage attribute */ + if (InfoBuffer->All.WhichFields & USER_ALL_CODEPAGE) + { InfoBuffer->All.CodePage = FixedData.CodePage; - - InfoBuffer->All. WhichFields |= USER_ALL_READ_PREFERENCES_MASK; -// USER_ALL_COUNTRYCODE | -// USER_ALL_CODEPAGE; + } + + if (InfoBuffer->All.WhichFields & USER_ALL_NTPASSWORDPRESENT) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_LMPASSWORDPRESENT) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_PRIVATEDATA) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_PASSWORDEXPIRED) + { + /* FIXME */ + } + + if (InfoBuffer->All.WhichFields & USER_ALL_SECURITYDESCRIPTOR) + { + /* FIXME */ } *Buffer = InfoBuffer;

1 0

[aandrejevic] 60526: [NTVDM] Properly handle the case when the console framebuffer could not be created.
by aandrejevic＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: aandrejevic Date: Fri Oct 4 21:16:58 2013 New Revision: 60526 URL: http://svn.reactos.org/svn/reactos?rev=60526&view=rev Log: [NTVDM] Properly handle the case when the console framebuffer could not be created. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Oct 4 21:16:58 2013 @@ -488,12 +488,22 @@ if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)) { /* Enter new text mode */ - if (!VgaEnterTextMode(&Resolution)) return; + if (!VgaEnterTextMode(&Resolution)) + { + DisplayMessage(L"An unexpected VGA error occurred while switching into text mode."); + VdmRunning = FALSE; + return; + } } else { /* Enter 8-bit graphics mode */ - if (!VgaEnterGraphicsMode(&Resolution)) return; + if (!VgaEnterGraphicsMode(&Resolution)) + { + DisplayMessage(L"An unexpected VGA error occurred while switching into graphics mode."); + VdmRunning = FALSE; + return; + } } /* Trigger a full update of the screen */ @@ -515,6 +525,12 @@ DWORD Address = (VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG] << 8) + VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG]; DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + + /* + * If console framebuffer is NULL, that means something went wrong + * earlier and this is the final display refresh. + */ + if (ConsoleFramebuffer == NULL) return; /* Check if this is text mode or graphics mode */ if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)

1 0

[aandrejevic] 60525: [SOFT386] Fix bugs in STOS and LODS (only one register is incremented). Implement CMPS and SCAS.
by aandrejevic＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: aandrejevic Date: Fri Oct 4 19:51:11 2013 New Revision: 60525 URL: http://svn.reactos.org/svn/reactos?rev=60525&view=rev Log: [SOFT386] Fix bugs in STOS and LODS (only one register is incremented). Implement CMPS and SCAS. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Fri Oct 4 19:51:11 2013 @@ -5700,8 +5700,113 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeCmps) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + ULONG FirstValue = 0, SecondValue = 0, Result; + ULONG DataSize, DataMask, SignFlag; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xA6); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xA6) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Calculate the mask and sign flag */ + DataMask = (1 << (DataSize * 8)) - 1; + SignFlag = 1 << ((DataSize * 8) - 1); + + /* Read from the first source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &FirstValue, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read from the second source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + FALSE, + &SecondValue, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + FirstValue &= DataMask; + SecondValue &= DataMask; + Result = (FirstValue - SecondValue) & DataMask; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Increment/decrement ESI and EDI */ + if (OperandSize) + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + } + else + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + } + + /* Return success */ + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeStos) @@ -5750,32 +5855,16 @@ return FALSE; } - /* Increment/decrement ESI and EDI */ + /* Increment/decrement EDI */ if (OperandSize) { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; } else { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; } /* Return success */ @@ -5829,32 +5918,16 @@ return FALSE; } - /* Increment/decrement ESI and EDI */ + /* Increment/decrement ESI */ if (OperandSize) { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; } else { - if (State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; - } + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; } /* Return success */ @@ -5863,6 +5936,84 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeScas) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED -} + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue = 0; + ULONG Result; + ULONG DataSize, DataMask, SignFlag; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xAE); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xA6) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Calculate the mask and sign flag */ + DataMask = (1 << (DataSize * 8)) - 1; + SignFlag = 1 << ((DataSize * 8) - 1); + + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + FALSE, + &SecondValue, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + FirstValue &= DataMask; + SecondValue &= DataMask; + Result = (FirstValue - SecondValue) & DataMask; + + /* Update the flags */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Increment/decrement EDI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + + /* Return success */ + return TRUE; +}

1 0

[tkreuzer] 60524: [INTSAFE.H] - Mark UINT_MAX and UINT32_MAX as unsigned
by tkreuzer＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: tkreuzer Date: Fri Oct 4 14:08:27 2013 New Revision: 60524 URL: http://svn.reactos.org/svn/reactos?rev=60524&view=rev Log: [INTSAFE.H] - Mark UINT_MAX and UINT32_MAX as unsigned Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Oct 4 14:08:27 2013 @@ -167,8 +167,8 @@ #define WORD_MAX 0xffff #define INT_MAX 2147483647 #define INT32_MAX 2147483647 -#define UINT_MAX 0xffffffff -#define UINT32_MAX 0xffffffff +#define UINT_MAX 0xffffffffU +#define UINT32_MAX 0xffffffffU #define LONG_MAX 2147483647L #define ULONG_MAX 0xffffffffUL #define DWORD_MAX 0xffffffffUL

1 0

[tkreuzer] 60523: [INTSAFE.H] - Use SAL2 instead of SAL1
by tkreuzer＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: tkreuzer Date: Fri Oct 4 13:39:58 2013 New Revision: 60523 URL: http://svn.reactos.org/svn/reactos?rev=60523&view=rev Log: [INTSAFE.H] - Use SAL2 instead of SAL1 Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Oct 4 13:39:58 2013 @@ -719,7 +719,7 @@ #endif #define DEFINE_SAFE_MULT_U16(_Name, _Type, _Convert) \ -__checkReturn \ +_Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ INTSAFE_NAME(_Name)( \

1 0

[tkreuzer] 60522: [INTSAFE.H] - Rename internal macros and add comments to make it more obvious what the macro does - Add UShortMult
by tkreuzer＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: tkreuzer Date: Fri Oct 4 13:37:25 2013 New Revision: 60522 URL: http://svn.reactos.org/svn/reactos?rev=60522&view=rev Log: [INTSAFE.H] - Rename internal macros and add comments to make it more obvious what the macro does - Add UShortMult Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Fri Oct 4 13:37:25 2013 @@ -119,6 +119,7 @@ C_ASSERT(sizeof(UINT) == 4); C_ASSERT(sizeof(LONG) == 4); C_ASSERT(sizeof(ULONG) == 4); +C_ASSERT(sizeof(DWORD) == 4); C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); /* Undefine these to avoid conflicts with limits.h */ @@ -270,6 +271,7 @@ #endif +/* Convert unsigned to signed or unsigned */ #define DEFINE_SAFE_CONVERT_UTOX(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ @@ -332,7 +334,8 @@ DEFINE_SAFE_CONVERT_UTOX(ULongLongToULongPtr, ULONGLONG, ULONG_PTR) -#define DEFINE_SAFE_CONVERT_ITOU(_Name, _TypeFrom, _TypeTo) \ +/* Convert signed to unsigned */ +#define DEFINE_SAFE_CONVERT_STOU(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ @@ -352,60 +355,61 @@ } \ } -DEFINE_SAFE_CONVERT_ITOU(Int8ToUChar, INT8, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUInt8, INT8, UINT8) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUShort, INT8, USHORT) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUInt, INT8, UINT) -DEFINE_SAFE_CONVERT_ITOU(Int8ToULong, INT8, ULONG) -DEFINE_SAFE_CONVERT_ITOU(Int8ToUIntPtr, INT8, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(Int8ToULongPtr, INT8, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(Int8ToULongLong, INT8, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(ShortToUChar, SHORT, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(ShortToUInt8, SHORT, UINT8) -DEFINE_SAFE_CONVERT_ITOU(ShortToUShort, SHORT, USHORT) -DEFINE_SAFE_CONVERT_ITOU(ShortToUInt, SHORT, UINT) -DEFINE_SAFE_CONVERT_ITOU(ShortToULong, SHORT, ULONG) -DEFINE_SAFE_CONVERT_ITOU(ShortToUIntPtr, SHORT, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(ShortToULongPtr, SHORT, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(ShortToDWordPtr, SHORT, DWORD_PTR) -DEFINE_SAFE_CONVERT_ITOU(ShortToULongLong, SHORT, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(IntToUChar, INT, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(IntToUInt8, INT, UINT8) -DEFINE_SAFE_CONVERT_ITOU(IntToUShort, INT, USHORT) -DEFINE_SAFE_CONVERT_ITOU(IntToUInt, INT, UINT) -DEFINE_SAFE_CONVERT_ITOU(IntToULong, INT, ULONG) -DEFINE_SAFE_CONVERT_ITOU(IntToULongLong, INT, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(LongToUChar, LONG, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(LongToUInt8, LONG, UINT8) -DEFINE_SAFE_CONVERT_ITOU(LongToUShort, LONG, USHORT) -DEFINE_SAFE_CONVERT_ITOU(LongToUInt, LONG, UINT) -DEFINE_SAFE_CONVERT_ITOU(LongToULong, LONG, ULONG) -DEFINE_SAFE_CONVERT_ITOU(LongToUIntPtr, LONG, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongToULongPtr, LONG, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongToULongLong, LONG, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUChar, INT_PTR, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUInt8, INT_PTR, UINT8) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUShort, INT_PTR, USHORT) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUInt, INT_PTR, UINT) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToULong, INT_PTR, ULONG) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToUIntPtr, INT_PTR, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToULongPtr, INT_PTR, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(IntPtrToULongLong, INT_PTR, ULONGLONG) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUChar, LONG_PTR, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUInt8, LONG_PTR, UINT8) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUShort, LONG_PTR, USHORT) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUInt, LONG_PTR, UINT) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToULong, LONG_PTR, ULONG) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToUIntPtr, LONG_PTR, UINT_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToULongLong, LONG_PTR, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(Int8ToUChar, INT8, UCHAR) +DEFINE_SAFE_CONVERT_STOU(Int8ToUInt8, INT8, UINT8) +DEFINE_SAFE_CONVERT_STOU(Int8ToUShort, INT8, USHORT) +DEFINE_SAFE_CONVERT_STOU(Int8ToUInt, INT8, UINT) +DEFINE_SAFE_CONVERT_STOU(Int8ToULong, INT8, ULONG) +DEFINE_SAFE_CONVERT_STOU(Int8ToUIntPtr, INT8, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(Int8ToULongPtr, INT8, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(Int8ToULongLong, INT8, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(ShortToUChar, SHORT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(ShortToUInt8, SHORT, UINT8) +DEFINE_SAFE_CONVERT_STOU(ShortToUShort, SHORT, USHORT) +DEFINE_SAFE_CONVERT_STOU(ShortToUInt, SHORT, UINT) +DEFINE_SAFE_CONVERT_STOU(ShortToULong, SHORT, ULONG) +DEFINE_SAFE_CONVERT_STOU(ShortToUIntPtr, SHORT, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(ShortToULongPtr, SHORT, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(ShortToDWordPtr, SHORT, DWORD_PTR) +DEFINE_SAFE_CONVERT_STOU(ShortToULongLong, SHORT, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(IntToUChar, INT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(IntToUInt8, INT, UINT8) +DEFINE_SAFE_CONVERT_STOU(IntToUShort, INT, USHORT) +DEFINE_SAFE_CONVERT_STOU(IntToUInt, INT, UINT) +DEFINE_SAFE_CONVERT_STOU(IntToULong, INT, ULONG) +DEFINE_SAFE_CONVERT_STOU(IntToULongLong, INT, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(LongToUChar, LONG, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongToUInt8, LONG, UINT8) +DEFINE_SAFE_CONVERT_STOU(LongToUShort, LONG, USHORT) +DEFINE_SAFE_CONVERT_STOU(LongToUInt, LONG, UINT) +DEFINE_SAFE_CONVERT_STOU(LongToULong, LONG, ULONG) +DEFINE_SAFE_CONVERT_STOU(LongToUIntPtr, LONG, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(LongToULongPtr, LONG, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(LongToULongLong, LONG, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUChar, INT_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUInt8, INT_PTR, UINT8) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUShort, INT_PTR, USHORT) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUInt, INT_PTR, UINT) +DEFINE_SAFE_CONVERT_STOU(IntPtrToULong, INT_PTR, ULONG) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUIntPtr, INT_PTR, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToULongPtr, INT_PTR, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToULongLong, INT_PTR, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUChar, LONG_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUInt8, LONG_PTR, UINT8) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUShort, LONG_PTR, USHORT) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUInt, LONG_PTR, UINT) +DEFINE_SAFE_CONVERT_STOU(LongPtrToULong, LONG_PTR, ULONG) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUIntPtr, LONG_PTR, UINT_PTR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToULongLong, LONG_PTR, ULONGLONG) #ifdef _CHAR_UNSIGNED -DEFINE_SAFE_CONVERT_ITOU(ShortToChar, SHORT, UCHAR) -DEFINE_SAFE_CONVERT_ITOU(LongPtrToChar, LONG_PTR, UCHAR) -#endif - - -#define DEFINE_SAFE_CONVERT_ITOI(_Name, _TypeFrom, _TypeTo) \ +DEFINE_SAFE_CONVERT_STOU(ShortToChar, SHORT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToChar, LONG_PTR, UCHAR) +#endif + + +/* Convert signed to signed */ +#define DEFINE_SAFE_CONVERT_STOS(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ @@ -425,28 +429,28 @@ } \ } -DEFINE_SAFE_CONVERT_ITOI(ShortToInt8, SHORT, INT8) -DEFINE_SAFE_CONVERT_ITOI(IntToInt8, INT, INT8) -DEFINE_SAFE_CONVERT_ITOI(IntToShort, INT, SHORT) -DEFINE_SAFE_CONVERT_ITOI(LongToInt8, LONG, INT8) -DEFINE_SAFE_CONVERT_ITOI(LongToShort, LONG, SHORT) -DEFINE_SAFE_CONVERT_ITOI(LongToInt, LONG, INT) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToInt8, INT_PTR, INT8) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToShort, INT_PTR, SHORT) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToInt, INT_PTR, INT) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToLong, INT_PTR, LONG) -DEFINE_SAFE_CONVERT_ITOI(IntPtrToLongPtr, INT_PTR, LONG_PTR) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToInt8, LONG_PTR, INT8) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToShort, LONG_PTR, SHORT) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToInt, LONG_PTR, INT) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToLong, LONG_PTR, LONG) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToIntPtr, LONG_PTR, INT_PTR) -DEFINE_SAFE_CONVERT_ITOI(LongLongToLong, LONGLONG, LONG) -DEFINE_SAFE_CONVERT_ITOI(LongLongToIntPtr, LONGLONG, INT_PTR) -DEFINE_SAFE_CONVERT_ITOI(LongLongToLongPtr, LONGLONG, LONG_PTR) +DEFINE_SAFE_CONVERT_STOS(ShortToInt8, SHORT, INT8) +DEFINE_SAFE_CONVERT_STOS(IntToInt8, INT, INT8) +DEFINE_SAFE_CONVERT_STOS(IntToShort, INT, SHORT) +DEFINE_SAFE_CONVERT_STOS(LongToInt8, LONG, INT8) +DEFINE_SAFE_CONVERT_STOS(LongToShort, LONG, SHORT) +DEFINE_SAFE_CONVERT_STOS(LongToInt, LONG, INT) +DEFINE_SAFE_CONVERT_STOS(IntPtrToInt8, INT_PTR, INT8) +DEFINE_SAFE_CONVERT_STOS(IntPtrToShort, INT_PTR, SHORT) +DEFINE_SAFE_CONVERT_STOS(IntPtrToInt, INT_PTR, INT) +DEFINE_SAFE_CONVERT_STOS(IntPtrToLong, INT_PTR, LONG) +DEFINE_SAFE_CONVERT_STOS(IntPtrToLongPtr, INT_PTR, LONG_PTR) +DEFINE_SAFE_CONVERT_STOS(LongPtrToInt8, LONG_PTR, INT8) +DEFINE_SAFE_CONVERT_STOS(LongPtrToShort, LONG_PTR, SHORT) +DEFINE_SAFE_CONVERT_STOS(LongPtrToInt, LONG_PTR, INT) +DEFINE_SAFE_CONVERT_STOS(LongPtrToLong, LONG_PTR, LONG) +DEFINE_SAFE_CONVERT_STOS(LongPtrToIntPtr, LONG_PTR, INT_PTR) +DEFINE_SAFE_CONVERT_STOS(LongLongToLong, LONGLONG, LONG) +DEFINE_SAFE_CONVERT_STOS(LongLongToIntPtr, LONGLONG, INT_PTR) +DEFINE_SAFE_CONVERT_STOS(LongLongToLongPtr, LONGLONG, LONG_PTR) #ifndef _CHAR_UNSIGNED -DEFINE_SAFE_CONVERT_ITOI(ShortToChar, SHORT, CHAR) -DEFINE_SAFE_CONVERT_ITOI(LongPtrToChar, LONG_PTR, CHAR) +DEFINE_SAFE_CONVERT_STOS(ShortToChar, SHORT, CHAR) +DEFINE_SAFE_CONVERT_STOS(LongPtrToChar, LONG_PTR, CHAR) #endif @@ -466,6 +470,7 @@ #define RtlInt8ToSIZET RtlInt8ToULongPtr #define RtlIntToSizeT RtlIntToUIntPtr #define RtlIntToSIZET RtlIntToULongPtr +#define RtlULongToSSIZET RtlULongToLongPtr #define RtlULongToByte RtlULongToUInt8 #define RtlULongLongToInt64 RtlULongLongToLongLong #define RtlULongLongToLong64 RtlULongLongToLongLong @@ -502,6 +507,7 @@ #define Int8ToSIZET Int8ToULongPtr #define IntToSizeT IntToUIntPtr #define IntToSIZET IntToULongPtr +#define ULongToSSIZET ULongToLongPtr #define ULongToByte ULongToUInt8 #define ULongLongToInt64 ULongLongToLongLong #define ULongLongToLong64 ULongLongToLongLong @@ -657,7 +663,7 @@ + M1Hi * M2Hi * 0x100000000 * 0x100000000 We get an overflow when - a) M1Hi * M2Hi != 0, so when M1Hi or M2Hi are not 0 + a) M1Hi * M2Hi != 0, so when M1Hi and M2Hi are both not 0 b) The product of the nonzero high part and the other low part is larger than 32 bits. c) The addition of the product from b) shifted left by 32 and @@ -711,6 +717,21 @@ DEFINE_SAFE_MULT_U32(SizeTMult, size_t, ULongLongToSizeT) DEFINE_SAFE_MULT_U32(SIZETMult, SIZE_T, ULongLongToSIZET) #endif + +#define DEFINE_SAFE_MULT_U16(_Name, _Type, _Convert) \ +__checkReturn \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type Multiplicand, \ + _In_ _Type Multiplier, \ + _Out_ _Deref_out_range_(==, Multiplicand * Multiplier) _Type* pOutput) \ +{ \ + ULONG Result = ((ULONG)Multiplicand) * ((ULONG)Multiplier); \ + return INTSAFE_NAME(_Convert)(Result, pOutput); \ +} + +DEFINE_SAFE_MULT_U16(UShortMult, USHORT, ULongToUShort) #ifdef _NTINTSAFE_H_INCLUDED_ @@ -731,6 +752,8 @@ #define RtlULong64Sub RtlULongLongSub #define RtlDWord64Sub RtlULongLongSub #define RtlUInt64Sub RtlULongLongSub +#define RtlUInt16Mult RtlUShortMult +#define RtlWordMult RtlUShortMult #ifdef _WIN64 #define RtlIntPtrSub RtlLongLongSub #define RtlLongPtrSub RtlLongLongSub @@ -757,6 +780,8 @@ #define ULong64Sub ULongLongSub #define DWord64Sub ULongLongSub #define UInt64Sub ULongLongSub +#define UInt16Mult UShortMult +#define WordMult UShortMult #ifdef _WIN64 #define IntPtrSub LongLongSub #define LongPtrSub LongLongSub

1 0

[akhaldi] 60521: [LIBWINE] * Use atl100.dll directly to create a registrar instance. CORE-7469
by akhaldi＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: akhaldi Date: Fri Oct 4 11:02:39 2013 New Revision: 60521 URL: http://svn.reactos.org/svn/reactos?rev=60521&view=rev Log: [LIBWINE] * Use atl100.dll directly to create a registrar instance. CORE-7469 Modified: trunk/reactos/lib/3rdparty/libwine/register.c Modified: trunk/reactos/lib/3rdparty/libwine/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/regis… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/register.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/register.c [iso-8859-1] Fri Oct 4 11:02:39 2013 @@ -30,7 +30,7 @@ #include "rpcproxy.h" #include "atliface.h" -static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR atl100W[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; @@ -38,32 +38,25 @@ { IRegistrar *registrar; BOOL do_register; - BOOL uninit; HRESULT result; }; -static HMODULE ole32; -static HRESULT (WINAPI *pCoInitialize)(LPVOID); -static void (WINAPI *pCoUninitialize)(void); -static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); +static HMODULE atl100; +static HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { - if (!pCoCreateInstance) + if (!pAtlCreateRegistrar) { - if (!(ole32 = LoadLibraryW( ole32W )) || - !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || - !(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) || - !(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" ))) + if (!(atl100 = LoadLibraryW( atl100W )) || + !(pAtlCreateRegistrar = (void *)GetProcAddress( atl100, "AtlCreateRegistrar" ))) { info->result = E_NOINTERFACE; return NULL; } } - info->uninit = SUCCEEDED( pCoInitialize( NULL )); - info->result = pCoCreateInstance( &CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, - &IID_IRegistrar, (void **)&info->registrar ); + info->result = pAtlCreateRegistrar( &info->registrar ); if (SUCCEEDED( info->result )) { WCHAR str[MAX_PATH]; @@ -108,11 +101,9 @@ info.registrar = NULL; info.do_register = TRUE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; } @@ -122,10 +113,8 @@ info.registrar = NULL; info.do_register = FALSE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; }

1 0

[jgardou] 60520: [MESA] - fix build CORE-7499
by jgardou＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: jgardou Date: Fri Oct 4 10:51:37 2013 New Revision: 60520 URL: http://svn.reactos.org/svn/reactos?rev=60520&view=rev Log: [MESA] - fix build CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c [iso-8859-1] Fri Oct 4 10:51:37 2013 @@ -88,7 +88,6 @@ #include "bufferobj.h" #include "context.h" #include "cpuinfo.h" -#include "debug.h" #include "depth.h" #include "dlist.h" #include "eval.h" @@ -654,7 +653,6 @@ _mesa_init_color( ctx ); _mesa_init_current( ctx ); _mesa_init_depth( ctx ); - _mesa_init_debug( ctx ); _mesa_init_display_list( ctx ); _mesa_init_eval( ctx ); _mesa_init_feedback( ctx ); @@ -1323,15 +1321,6 @@ check_context_limits(newCtx); - /* We can use this to help debug user's problems. Tell them to set - * the MESA_INFO env variable before running their app. Then the - * first time each context is made current we'll print some useful - * information. - */ - if (_mesa_getenv("MESA_INFO")) { - _mesa_print_info(); - } - newCtx->FirstTimeCurrent = GL_FALSE; } } Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c (removed) @@ -1,617 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.5 - * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. - * Copyright (C) 2009 VMware, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "mtypes.h" -#include "attrib.h" -#include "colormac.h" -#include "enums.h" -#include "formats.h" -#include "hash.h" -#include "imports.h" -#include "debug.h" -#include "get.h" -#include "pixelstore.h" -#include "readpix.h" -#include "texobj.h" - - -static const char * -tex_target_name(GLenum tgt) -{ - static const struct { - GLenum target; - const char *name; - } tex_targets[] = { - { GL_TEXTURE_1D, "GL_TEXTURE_1D" }, - { GL_TEXTURE_2D, "GL_TEXTURE_2D" }, - { GL_TEXTURE_3D, "GL_TEXTURE_3D" }, - { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" } - }; - GLuint i; - for (i = 0; i < Elements(tex_targets); i++) { - if (tex_targets[i].target == tgt) - return tex_targets[i].name; - } - return "UNKNOWN TEX TARGET"; -} - - -void -_mesa_print_state( const char *msg, GLuint state ) -{ - _mesa_debug(NULL, - "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", - msg, - state, - (state & _NEW_MODELVIEW) ? "ctx->ModelView, " : "", - (state & _NEW_PROJECTION) ? "ctx->Projection, " : "", - (state & _NEW_TEXTURE_MATRIX) ? "ctx->TextureMatrix, " : "", - (state & _NEW_COLOR) ? "ctx->Color, " : "", - (state & _NEW_DEPTH) ? "ctx->Depth, " : "", - (state & _NEW_EVAL) ? "ctx->Eval/EvalMap, " : "", - (state & _NEW_FOG) ? "ctx->Fog, " : "", - (state & _NEW_HINT) ? "ctx->Hint, " : "", - (state & _NEW_LIGHT) ? "ctx->Light, " : "", - (state & _NEW_LINE) ? "ctx->Line, " : "", - (state & _NEW_PIXEL) ? "ctx->Pixel, " : "", - (state & _NEW_POINT) ? "ctx->Point, " : "", - (state & _NEW_POLYGON) ? "ctx->Polygon, " : "", - (state & _NEW_POLYGONSTIPPLE) ? "ctx->PolygonStipple, " : "", - (state & _NEW_SCISSOR) ? "ctx->Scissor, " : "", - (state & _NEW_STENCIL) ? "ctx->Stencil, " : "", - (state & _NEW_TEXTURE) ? "ctx->Texture, " : "", - (state & _NEW_TRANSFORM) ? "ctx->Transform, " : "", - (state & _NEW_VIEWPORT) ? "ctx->Viewport, " : "", - (state & _NEW_PACKUNPACK) ? "ctx->Pack/Unpack, " : "", - (state & _NEW_ARRAY) ? "ctx->Array, " : "", - (state & _NEW_RENDERMODE) ? "ctx->RenderMode, " : "", - (state & _NEW_BUFFERS) ? "ctx->Visual, ctx->DrawBuffer,, " : ""); -} - - - -void -_mesa_print_tri_caps( const char *name, GLuint flags ) -{ - _mesa_debug(NULL, - "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s\n", - name, - flags, - (flags & DD_FLATSHADE) ? "flat-shade, " : "", - (flags & DD_SEPARATE_SPECULAR) ? "separate-specular, " : "", - (flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "", - (flags & DD_TRI_TWOSTENCIL) ? "tri-twostencil, " : "", - (flags & DD_TRI_UNFILLED) ? "tri-unfilled, " : "", - (flags & DD_TRI_STIPPLE) ? "tri-stipple, " : "", - (flags & DD_TRI_OFFSET) ? "tri-offset, " : "", - (flags & DD_TRI_SMOOTH) ? "tri-smooth, " : "", - (flags & DD_LINE_SMOOTH) ? "line-smooth, " : "", - (flags & DD_LINE_STIPPLE) ? "line-stipple, " : "", - (flags & DD_POINT_SMOOTH) ? "point-smooth, " : "", - (flags & DD_POINT_ATTEN) ? "point-atten, " : "", - (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : "" - ); -} - - -/** - * Print information about this Mesa version and build options. - */ -void _mesa_print_info( void ) -{ - _mesa_debug(NULL, "Mesa GL_VERSION = %s\n", - (char *) _mesa_GetString(GL_VERSION)); - _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n", - (char *) _mesa_GetString(GL_RENDERER)); - _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n", - (char *) _mesa_GetString(GL_VENDOR)); - _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n", - (char *) _mesa_GetString(GL_EXTENSIONS)); -#if defined(THREADS) - _mesa_debug(NULL, "Mesa thread-safe: YES\n"); -#else - _mesa_debug(NULL, "Mesa thread-safe: NO\n"); -#endif -#if defined(USE_X86_ASM) - _mesa_debug(NULL, "Mesa x86-optimized: YES\n"); -#else - _mesa_debug(NULL, "Mesa x86-optimized: NO\n"); -#endif -#if defined(USE_SPARC_ASM) - _mesa_debug(NULL, "Mesa sparc-optimized: YES\n"); -#else - _mesa_debug(NULL, "Mesa sparc-optimized: NO\n"); -#endif -} - - -/** - * Set the debugging flags. - * - * \param debug debug string - * - * If compiled with debugging support then search for keywords in \p debug and - * enables the verbose debug output of the respective feature. - */ -static void add_debug_flags( const char *debug ) -{ -#ifdef DEBUG - struct debug_option { - const char *name; - GLbitfield flag; - }; - static const struct debug_option debug_opt[] = { - { "varray", VERBOSE_VARRAY }, - { "tex", VERBOSE_TEXTURE }, - { "mat", VERBOSE_MATERIAL }, - { "pipe", VERBOSE_PIPELINE }, - { "driver", VERBOSE_DRIVER }, - { "state", VERBOSE_STATE }, - { "api", VERBOSE_API }, - { "list", VERBOSE_DISPLAY_LIST }, - { "lighting", VERBOSE_LIGHTING }, - { "disassem", VERBOSE_DISASSEM }, - { "draw", VERBOSE_DRAW }, - { "swap", VERBOSE_SWAPBUFFERS } - }; - GLuint i; - - MESA_VERBOSE = 0x0; - for (i = 0; i < Elements(debug_opt); i++) { - if (strstr(debug, debug_opt[i].name) || strcmp(debug, "all") == 0) - MESA_VERBOSE |= debug_opt[i].flag; - } - - /* Debug flag: - */ - if (strstr(debug, "flush")) - MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH; - -#else - (void) debug; -#endif -} - - -void -_mesa_init_debug( struct gl_context *ctx ) -{ - char *c; - c = _mesa_getenv("MESA_DEBUG"); - if (c) - add_debug_flags(c); - - c = _mesa_getenv("MESA_VERBOSE"); - if (c) - add_debug_flags(c); -} - - -/* - * Write ppm file - */ -static void -write_ppm(const char *filename, const GLubyte *buffer, int width, int height, - int comps, int rcomp, int gcomp, int bcomp, GLboolean invert) -{ - FILE *f = fopen( filename, "w" ); - if (f) { - int x, y; - const GLubyte *ptr = buffer; - fprintf(f,"P6\n"); - fprintf(f,"# ppm-file created by osdemo.c\n"); - fprintf(f,"%i %i\n", width,height); - fprintf(f,"255\n"); - fclose(f); - f = fopen( filename, "ab" ); /* reopen in binary append mode */ - for (y=0; y < height; y++) { - for (x = 0; x < width; x++) { - int yy = invert ? (height - 1 - y) : y; - int i = (yy * width + x) * comps; - fputc(ptr[i+rcomp], f); /* write red */ - fputc(ptr[i+gcomp], f); /* write green */ - fputc(ptr[i+bcomp], f); /* write blue */ - } - } - fclose(f); - } - else { - fprintf(stderr, "Unable to create %s in write_ppm()\n", filename); - } -} - - -/** - * Write a texture image to a ppm file. - * \param face cube face in [0,5] - * \param level mipmap level - */ -static void -write_texture_image(struct gl_texture_object *texObj, - GLuint face, GLuint level) -{ - struct gl_texture_image *img = texObj->Image[face][level]; - if (img) { - GET_CURRENT_CONTEXT(ctx); - struct gl_pixelstore_attrib store; - GLubyte *buffer; - char s[100]; - - buffer = (GLubyte *) malloc(img->Width * img->Height - * img->Depth * 4); - - store = ctx->Pack; /* save */ - ctx->Pack = ctx->DefaultPacking; - - ctx->Driver.GetTexImage(ctx, GL_RGBA, GL_UNSIGNED_BYTE, buffer, img); - - /* make filename */ - _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face); - - printf(" Writing image level %u to %s\n", level, s); - write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE); - - ctx->Pack = store; /* restore */ - - free(buffer); - } -} - - -/** - * Write renderbuffer image to a ppm file. - */ -void -_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb) -{ - GET_CURRENT_CONTEXT(ctx); - GLubyte *buffer; - char s[100]; - GLenum format, type; - - if (rb->_BaseFormat == GL_RGB || - rb->_BaseFormat == GL_RGBA) { - format = GL_RGBA; - type = GL_UNSIGNED_BYTE; - } - else { - _mesa_debug(NULL, - "Unsupported BaseFormat 0x%x in " - "_mesa_write_renderbuffer_image()\n", - rb->_BaseFormat); - return; - } - - buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4); - - ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height, - format, type, &ctx->DefaultPacking, buffer); - - /* make filename */ - _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer.ppm"); - _mesa_snprintf(s, sizeof(s), "C:\\renderbuffer.ppm"); - - printf(" Writing renderbuffer image to %s\n", s); - - _mesa_debug(NULL, " Writing renderbuffer image to %s\n", s); - - write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE); - - free(buffer); -} - - -/** How many texture images (mipmap levels, faces) to write to files */ -#define WRITE_NONE 0 -#define WRITE_ONE 1 -#define WRITE_ALL 2 - -static GLuint WriteImages; - - -static void -dump_texture(struct gl_texture_object *texObj, GLuint writeImages) -{ - const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1; - GLboolean written = GL_FALSE; - GLuint i, j; - - printf("Texture %u\n", texObj->Name); - printf(" Target %s\n", tex_target_name(texObj->Target)); - for (i = 0; i < MAX_TEXTURE_LEVELS; i++) { - for (j = 0; j < numFaces; j++) { - struct gl_texture_image *texImg = texObj->Image[j][i]; - if (texImg) { - printf(" Face %u level %u: %d x %d x %d, format %s\n", - j, i, - texImg->Width, texImg->Height, texImg->Depth, - _mesa_get_format_name(texImg->TexFormat)); - if (writeImages == WRITE_ALL || - (writeImages == WRITE_ONE && !written)) { - write_texture_image(texObj, j, i); - written = GL_TRUE; - } - } - } - } -} - - -/** - * Dump a single texture. - */ -void -_mesa_dump_texture(GLuint texture, GLuint writeImages) -{ - GET_CURRENT_CONTEXT(ctx); - struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture); - if (texObj) { - dump_texture(texObj, writeImages); - } -} - - -static void -dump_texture_cb(GLuint id, void *data, void *userData) -{ - struct gl_texture_object *texObj = (struct gl_texture_object *) data; - (void) userData; - dump_texture(texObj, WriteImages); -} - - -/** - * Print basic info about all texture objext to stdout. - * If dumpImages is true, write PPM of level[0] image to a file. - */ -void -_mesa_dump_textures(GLuint writeImages) -{ - GET_CURRENT_CONTEXT(ctx); - WriteImages = writeImages; - _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx); -} - - -static void -dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage) -{ - printf("Renderbuffer: %u x %u IntFormat = %s\n", - rb->Width, rb->Height, - _mesa_lookup_enum_by_nr(rb->InternalFormat)); - if (writeImage) { - _mesa_write_renderbuffer_image(rb); - } -} - - -static void -dump_renderbuffer_cb(GLuint id, void *data, void *userData) -{ - const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data; - (void) userData; - dump_renderbuffer(rb, WriteImages); -} - - -/** - * Print basic info about all renderbuffers to stdout. - * If dumpImages is true, write PPM of level[0] image to a file. - */ -void -_mesa_dump_renderbuffers(GLboolean writeImages) -{ - GET_CURRENT_CONTEXT(ctx); - WriteImages = writeImages; - _mesa_HashWalk(ctx->Shared->RenderBuffers, dump_renderbuffer_cb, ctx); -} - - - -void -_mesa_dump_color_buffer(const char *filename) -{ - GET_CURRENT_CONTEXT(ctx); - const GLuint w = ctx->DrawBuffer->Width; - const GLuint h = ctx->DrawBuffer->Height; - GLubyte *buf; - - buf = (GLubyte *) malloc(w * h * 4); - - _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); - _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1); - _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); - - _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf); - - printf("ReadBuffer %p 0x%x DrawBuffer %p 0x%x\n", - (void *) ctx->ReadBuffer->_ColorReadBuffer, - ctx->ReadBuffer->ColorReadBuffer, - (void *) ctx->DrawBuffer->_ColorDrawBuffer, - ctx->DrawBuffer->ColorDrawBuffer); - printf("Writing %d x %d color buffer to %s\n", w, h, filename); - write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE); - - _mesa_PopClientAttrib(); - - free(buf); -} - - -void -_mesa_dump_depth_buffer(const char *filename) -{ - GET_CURRENT_CONTEXT(ctx); - const GLuint w = ctx->DrawBuffer->Width; - const GLuint h = ctx->DrawBuffer->Height; - GLuint *buf; - GLubyte *buf2; - GLuint i; - - buf = (GLuint *) malloc(w * h * 4); /* 4 bpp */ - buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */ - - _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); - _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1); - _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); - - _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf); - - /* spread 24 bits of Z across R, G, B */ - for (i = 0; i < w * h; i++) { - buf2[i*3+0] = (buf[i] >> 24) & 0xff; - buf2[i*3+1] = (buf[i] >> 16) & 0xff; - buf2[i*3+2] = (buf[i] >> 8) & 0xff; - } - - printf("Writing %d x %d depth buffer to %s\n", w, h, filename); - write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE); - - _mesa_PopClientAttrib(); - - free(buf); - free(buf2); -} - - -void -_mesa_dump_stencil_buffer(const char *filename) -{ - GET_CURRENT_CONTEXT(ctx); - const GLuint w = ctx->DrawBuffer->Width; - const GLuint h = ctx->DrawBuffer->Height; - GLubyte *buf; - GLubyte *buf2; - GLuint i; - - buf = (GLubyte *) malloc(w * h); /* 1 bpp */ - buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */ - - _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); - _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1); - _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); - - _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf); - - for (i = 0; i < w * h; i++) { - buf2[i*3+0] = buf[i]; - buf2[i*3+1] = (buf[i] & 127) * 2; - buf2[i*3+2] = (buf[i] - 128) * 2; - } - - printf("Writing %d x %d stencil buffer to %s\n", w, h, filename); - write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE); - - _mesa_PopClientAttrib(); - - free(buf); - free(buf2); -} - - -void -_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h, - GLenum format, GLenum type) -{ - GLboolean invert = GL_TRUE; - - if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) { - write_ppm(filename, image, w, h, 4, 0, 1, 2, invert); - } - else if (format == GL_BGRA && type == GL_UNSIGNED_BYTE) { - write_ppm(filename, image, w, h, 4, 2, 1, 0, invert); - } - else if (format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE) { - write_ppm(filename, image, w, h, 2, 1, 0, 0, invert); - } - else { - _mesa_problem(NULL, "Unsupported format/type in _mesa_dump_image()"); - } -} - - -/** - * Quick and dirty function to "print" a texture to stdout. - */ -void -_mesa_print_texture(struct gl_context *ctx, struct gl_texture_image *img) -{ - const GLint slice = 0; - GLint srcRowStride; - GLuint i, j, c; - GLubyte *data; - - ctx->Driver.MapTextureImage(ctx, img, slice, - 0, 0, img->Width, img->Height, GL_MAP_READ_BIT, - &data, &srcRowStride); - - if (!data) { - printf("No texture data\n"); - } - else { - /* XXX add more formats or make into a new format utility function */ - switch (img->TexFormat) { - case MESA_FORMAT_A8: - case MESA_FORMAT_L8: - case MESA_FORMAT_I8: - c = 1; - break; - case MESA_FORMAT_AL88: - case MESA_FORMAT_AL88_REV: - c = 2; - break; - case MESA_FORMAT_RGB888: - case MESA_FORMAT_BGR888: - c = 3; - break; - case MESA_FORMAT_RGBA8888: - case MESA_FORMAT_ARGB8888: - c = 4; - break; - default: - _mesa_problem(NULL, "error in PrintTexture\n"); - return; - } - - for (i = 0; i < img->Height; i++) { - for (j = 0; j < img->Width; j++) { - if (c==1) - printf("%02x ", data[0]); - else if (c==2) - printf("%02x%02x ", data[0], data[1]); - else if (c==3) - printf("%02x%02x%02x ", data[0], data[1], data[2]); - else if (c==4) - printf("%02x%02x%02x%02x ", data[0], data[1], data[2], data[3]); - data += (srcRowStride - img->Width) * c; - } - /* XXX use img->ImageStride here */ - printf("\n"); - - } - } - - ctx->Driver.UnmapTextureImage(ctx, img, slice); -} Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h (removed) @@ -1,94 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.1 - * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/** - * \file debug.h - * Debugging functions. - * - * \if subset - * (No-op) - * - * \endif - */ - - -#ifndef _DEBUG_H -#define _DEBUG_H - -#include "glheader.h" -#include "mfeatures.h" - -struct gl_context; -struct gl_texture_image; - -#if _HAVE_FULL_GL - -extern void _mesa_print_tri_caps( const char *name, GLuint flags ); -extern void _mesa_print_enable_flags( const char *msg, GLuint flags ); -extern void _mesa_print_state( const char *msg, GLuint state ); -extern void _mesa_print_info( void ); -extern void _mesa_init_debug( struct gl_context *ctx ); - -#else - -/** No-op */ -#define _mesa_print_state( m, s ) ((void)0) - -/** No-op */ -#define _mesa_print_info() ((void)0) - -/** No-op */ -#define _mesa_init_debug( c ) ((void)0) - -#endif - -extern void -_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb); - -extern void -_mesa_dump_texture(GLuint texture, GLuint writeImages); - -extern void -_mesa_dump_textures(GLuint writeImages); - -extern void -_mesa_dump_renderbuffers(GLboolean writeImages); - -extern void -_mesa_dump_color_buffer(const char *filename); - -extern void -_mesa_dump_depth_buffer(const char *filename); - -extern void -_mesa_dump_stencil_buffer(const char *filename); - -extern void -_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h, - GLenum format, GLenum type); - -extern void -_mesa_print_texture(struct gl_context *ctx, struct gl_texture_image *img); - -#endif Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c [iso-8859-1] Fri Oct 4 10:51:37 2013 @@ -34,7 +34,6 @@ #include "glheader.h" #include "mtypes.h" #include "context.h" -#include "debug.h" #include "macros.h" #include "framebuffer.h" #include "light.h" @@ -487,9 +486,6 @@ if (new_state == _NEW_CURRENT_ATTRIB) goto out; - if (MESA_VERBOSE & VERBOSE_STATE) - _mesa_print_state("_mesa_update_state", new_state); - /* * Now update derived state info */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs