Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[ilardig] 51669: [KERNEL32_WINETEST] Sam Arun Raj Seeniraj: Update kernel32 winetests for dos device. See bug 993 for details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Tue May 10 16:11:30 2011 New Revision: 51669 URL: http://svn.reactos.org/svn/reactos?rev=51669&view=rev Log: [KERNEL32_WINETEST] Sam Arun Raj Seeniraj: Update kernel32 winetests for dos device. See bug 993 for details. Modified: trunk/rostests/winetests/kernel32/dosdev.c Modified: trunk/rostests/winetests/kernel32/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/dosdev… ============================================================================== --- trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] Tue May 10 16:11:30 2011 @@ -25,204 +25,362 @@ #include "winbase.h" #include "winerror.h" -static void test_DefineDosDeviceA1(void) +#define SUBST_DRIVE_LETTER 'M' +#define SUBST_DRIVE "M:" +#define SUBST_DRIVE_NON_EXIST_DIR "M:\\deadbeef" +#define SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR "M:\\" +#define SUBST_DRIVE_SEARCH "M:\\*" +#define SUBST_DRIVE_LOWERCASE "m:" +#define SUBST_DRIVE_LOWERCASE_SEARCH "m:\\*" +#define SUBST_DRIVE2_LETTER 'R' +#define SUBST_DRIVE2 "R:" +#define SUBST_DRIVE2_WITH_TRAILING_PATH_SEPERATOR "R:\\" +#define SUBST_DRIVE2_SEARCH "R:\\*" + +static void test_DefineDosDeviceA(void) { - /* Test using lowercase drive letters */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "m:"; + CHAR Buffer[MAX_PATH], Target[MAX_PATH]; BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); + UINT CharCount; + HANDLE hnd; + WIN32_FIND_DATAA Data; + UINT SystemDriveType, DriveType1, DriveType2; + DWORD dwMaskPrev, dwMaskCur; + CHAR c; + + /* Choose the symbolic link target */ + CharCount = GetSystemWindowsDirectoryA(Target, MAX_PATH); + ok(CharCount > 0, "Failed to get windows directory\n"); + c = Target[3]; + Target[3] = '\0'; + SystemDriveType = GetDriveTypeA(Target); + Target[3] = c; + + /* Test with a subst drive pointing to another substed drive */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, Target); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + Result = DefineDosDeviceA(0, SUBST_DRIVE2, SUBST_DRIVE); + ok(Result, "Failed to subst drive\n"); + DriveType2 = GetDriveTypeA(SUBST_DRIVE2_WITH_TRAILING_PATH_SEPERATOR); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE2_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE2_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + ok(DriveType1 == DriveType2, "subst drive types don't match\n"); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + ok(DriveType2 == SystemDriveType, "subst drive types don't match\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Target); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + hnd = FindFirstFileA(SUBST_DRIVE2_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail, we removed the target\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE2, SUBST_DRIVE); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + Result = QueryDosDeviceA(SUBST_DRIVE2, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test using lowercase drive letter */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE_LOWERCASE, Target); ok(Result, "Failed to subst drive using lowercase drive letter\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE_LOWERCASE, Target); ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); + Result = QueryDosDeviceA(SUBST_DRIVE_LOWERCASE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test remove without using DDD_EXACT_MATCH_ON_REMOVE */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, Target); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, SUBST_DRIVE, NULL); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test multiple adds and multiple removes in add order */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test multiple adds and multiple removes in reverse order */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp2") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp1") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test multiple adds and multiple removes out of order */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp4"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp5"); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp5") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp5"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp4"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test with trailing '\' appended to TargetPath */ + dwMaskPrev = GetLogicalDrives(); + strcpy_s(Buffer, MAX_PATH, Target); + strcat_s(Buffer, MAX_PATH, "\\\\\\"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, Buffer); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Buffer); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test with trailing '\' appended to TargetPath and DDD_RAW_TARGET_PATH flag */ + dwMaskPrev = GetLogicalDrives(); + strcpy_s(Buffer, MAX_PATH, "\\??\\"); + strcat_s(Buffer, MAX_PATH, Target); + strcat_s(Buffer, MAX_PATH, "\\\\\\"); + Result = DefineDosDeviceA(DDD_RAW_TARGET_PATH, SUBST_DRIVE, Buffer); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when they shouldn't\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "GetLastError() reports unexpected error code\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, SUBST_DRIVE, NULL); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test using trailing \ against drive letter */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR, Target); + ok(!Result, "Subst drive using trailing path seperator, this should not happen\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + ok(!(dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is set when it shouldn't\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR, Target); + ok(!Result, "Removing Subst drive using trailing path seperator passed when it should fail\n"); + Result = QueryDosDeviceA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present when it should not be created in the first place\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test using arbitary string, not necessarily a DOS drive letter */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, "!QHello:", Target); + ok(Result, "Failed to subst drive using non-DOS drive name\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, "!QHello:", Target); + ok(Result, "Failed to subst drive using non-DOS drive name\n"); + Result = QueryDosDeviceA("!QHello:", Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test by subst a drive to itself */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, SUBST_DRIVE); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, SUBST_DRIVE); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test by subst a drive to an non-existent folder under itself */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, SUBST_DRIVE_NON_EXIST_DIR); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, SUBST_DRIVE_NON_EXIST_DIR); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); } -static void test_DefineDosDeviceA2(void) +static void test_QueryDosDeviceA(void) { - /* Test using trailing \ against drive letter */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "Q:\\"; + CHAR Buffer[MAX_PATH], Target[MAX_PATH]; BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(!Result, "Subst drive using trailing path seperator\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(!Result, "Subst drive using trailing path seperator\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present when it should not be created in the first place\n"); -} - -static void test_DefineDosDeviceA3(void) -{ - /* Test using arbitary string, not necessarily a DOS drive letter */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "!QHello:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using non-DOS drive name\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using non-DOS drive name\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA4(void) -{ - /* Test remove without using DDD_EXACT_MATCH_ON_REMOVE */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, Drive, NULL); - ok(Result, "Failed to remove subst drive using NULL Target name\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA5(void) -{ - /* Test multiple adds and multiple removes in add order */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA6(void) -{ - /* Test multiple adds and multiple removes in reverse order */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp2") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp1") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA7(void) -{ - /* Test multiple adds and multiple removes out of order */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp4"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp5"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp5") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp5"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp4"); - ok(Result, "Failed to remove subst drive\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); + UINT CharCount; + + /* Choose the symbolic link target */ + CharCount = GetSystemWindowsDirectoryA(Target, MAX_PATH); + ok(CharCount > 0, "Failed to get windows directory\n"); + + Result = DefineDosDeviceA(0, SUBST_DRIVE, Target); + ok(Result, "Failed to subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, 0); + ok(!Result, "Should fail as the buffer passed is supposed to be small\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() reports unexpected error code\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "failed to get target path\n"); + ok(_strnicmp(Buffer, "\\??\\", 4) == 0, "The target returned does have correct prefix set\n"); + ok(stricmp(&Buffer[4], Target) == 0, "The target returned does not match the one set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Target); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + + /* This will try to retrieve all existing MS-DOS device names */ + Result = QueryDosDeviceA(NULL, Buffer, 0); + ok(!Result, "Should fail as the buffer passed is supposed to be small\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() reports unexpected error code\n"); } START_TEST(dosdev) { - test_DefineDosDeviceA1(); - test_DefineDosDeviceA2(); - test_DefineDosDeviceA3(); - test_DefineDosDeviceA4(); - test_DefineDosDeviceA5(); - test_DefineDosDeviceA6(); - test_DefineDosDeviceA7(); + test_DefineDosDeviceA(); + test_QueryDosDeviceA(); }

13 years, 7 months

[fireball] 51668: [NTDLL] - Result of LdrQueryImageFileExecutionOptions() shouldn't be used as a return status. Always reset it to STATUS_SUCCESS whatever the function returns. See bug #6231 for mo...

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 10 16:05:59 2011 New Revision: 51668 URL: http://svn.reactos.org/svn/reactos?rev=51668&view=rev Log: [NTDLL] - Result of LdrQueryImageFileExecutionOptions() shouldn't be used as a return status. Always reset it to STATUS_SUCCESS whatever the function returns. See bug #6231 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Tue May 10 16:05:59 2011 @@ -591,6 +591,9 @@ sizeof(ULONG), NULL); if (!NT_SUCCESS(Status)) BreakOnDllLoad = 0; + + /* Reset status back to STATUS_SUCCESS */ + Status = STATUS_SUCCESS; } /* Break if aksed */

13 years, 7 months

[fireball] 51667: Sam Arun Raj Seeniraj: [WIN32CSR.DLL] - Removed previous hack in CsrDefineDosDevice() that was stripping off extra trailing path separators. [SUBST.EXE] - The help message was not...

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 10 15:48:54 2011 New Revision: 51667 URL: http://svn.reactos.org/svn/reactos?rev=51667&view=rev Log: Sam Arun Raj Seeniraj: [WIN32CSR.DLL] - Removed previous hack in CsrDefineDosDevice() that was stripping off extra trailing path separators. [SUBST.EXE] - The help message was not show aligned properly, fixing that. See issue #993 for more details. Modified: trunk/reactos/base/system/subst/lang/en-US.rc trunk/reactos/base/system/subst/lang/es-ES.rc trunk/reactos/base/system/subst/lang/it-IT.rc trunk/reactos/subsystems/win32/csrss/win32csr/file.c Modified: trunk/reactos/base/system/subst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/en-… ============================================================================== --- trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] Tue May 10 15:48:54 2011 @@ -8,9 +8,11 @@ IDS_INVALID_PARAMETER2 "Invalid parameter - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Drive already SUBSTed\n" IDS_FAILED_WITH_ERROCODE "Failed with error code 0x%x: %s\n" - IDS_USAGE "Associates a path with a drive letter.\n\nSUBST [drive1: [drive2:]path]\nSUBST drive1: /D\n\n drive1: \ - Specifies a virtual drive to which you want to assign a path.\n \ - [drive2:]path Specifies a physical drive and path you want to assign to\n \ - a virtual drive.\n /D \ - Deletes a substituted (virtual) drive.\n\nType SUBST with no parameters to display a list of current virtual drives.\n" + IDS_USAGE "Associates a path with a drive letter.\n\n\ +SUBST [drive1: [drive2:]path]\n\ +SUBST drive1: /D\n\n\ + drive1: Specifies a virtual drive to which you want to assign a path.\n\ + [drive2:]path Specifies a physical drive and path you want to assign to\n a virtual drive.\n\ + /D Deletes a substituted (virtual) drive.\n\n\ +Type SUBST with no parameters to display a list of current virtual drives.\n" END Modified: trunk/reactos/base/system/subst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/es-… ============================================================================== --- trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] Tue May 10 15:48:54 2011 @@ -8,9 +8,11 @@ IDS_INVALID_PARAMETER2 "Parámetro incorrecto - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Unidad ya sustituida\n" IDS_FAILED_WITH_ERROCODE "Falla con código de error 0x%x: %s\n" - IDS_USAGE "Asocia una ruta con una letra de unidad.\n\nSUBST [unidad1: [unidad2:]ruta]\nSUBST unidad1: /D\n\n unidad1: \ - Especifica una unidad virtual a la cual se quiere asignar una ruta.\n \ - [unidad2:]ruta Especifica una unidad física y una ruta a la cual asignar\n \ - una unidad virtual.\n /D \ - Elimina una unidad (virtual) substituida.\n\nEscribir SUBST sin parámetros para mostrar una lista de las unidades virtuales actuales.\n" + IDS_USAGE "Asocia una ruta con una letra de unidad.\n\n\ +SUBST [unidad1: [unidad2:]ruta]\n\ +SUBST unidad1: /D\n\n\ + unidad1: Especifica una unidad virtual a la cual se quiere asignar una ruta.\n\ + [unidad2:]ruta Especifica una unidad física y una ruta a la cual asignar\n una unidad virtual.\n\ + /D Elimina una unidad (virtual) substituida.\n\n\ +Escribir SUBST sin parámetros para mostrar una lista de las unidades virtuales actuales.\n" END Modified: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… ============================================================================== --- trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] Tue May 10 15:48:54 2011 @@ -8,9 +8,11 @@ IDS_INVALID_PARAMETER2 "Parametro errato - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Unità già sostituita\n" IDS_FAILED_WITH_ERROCODE "Interruzione con codice di errore 0x%x: %s\n" - IDS_USAGE "Associa un percorso ad una lettera di unità.\n\nSUBST [unità1: [unità2:]percorso]\nSUBST unità1: /D\n\n unità1: \ - Specifica un'unità virtuale alla quale assegnare un percorso.\n \ - [unità2:]percorso Specifica un'unità fisica e un percorso da assegnare ad una\n \ - unità virtuale.\n /D \ - Elimina un'unità (virtuale) sostituita.\n\nDigitare SUBST senza parametri per mostrare un elenco delle unità virtuali attuali.\n" + IDS_USAGE "Associa un percorso ad una lettera di unità.\n\n\ +SUBST [unità1: [unità2:]percorso]\n\ +SUBST unità1: /D\n\n\ + unità1: Specifica un'unità virtuale alla quale assegnare un percorso.\n\ + [unità2:]percorso Specifica un'unità fisica e un percorso da assegnare ad una\n unità virtuale.\n\ + /D Elimina un'unità (virtuale) sostituita.\n\n\ +Digitare SUBST senza parametri per mostrare un elenco delle unità virtuali attuali.\n" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] Tue May 10 15:48:54 2011 @@ -98,17 +98,6 @@ RequestLinkTarget = &Request->Data.DefineDosDeviceRequest.TargetName; - /* - * Strip off any trailing '\', if we leave a trailing slash the drive remains non-accessible. - * So working around it for now. - * FIXME: Need to fix this in the object manager ObpLookupObjectName()??, and remove this when the its fixed. - */ - while (RequestLinkTarget->Length >= sizeof(WCHAR) && - RequestLinkTarget->Buffer[(RequestLinkTarget->Length/sizeof(WCHAR)) - 1] == L'\\') - { - RequestLinkTarget->Length -= sizeof(WCHAR); - } - lpBuffer = (PWSTR) RtlAllocateHeap(Win32CsrApiHeap, HEAP_ZERO_MEMORY, RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR));

13 years, 7 months

[fireball] 51666: [NTOSKRNL] - Sam Arun Raj Seeniraj: ObpLookupObjectName() used to reparse endlessly when a symlink points to itself, preventing this by limiting number of reparse attemtps. See is...

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 10 15:43:55 2011 New Revision: 51666 URL: http://svn.reactos.org/svn/reactos?rev=51666&view=rev Log: [NTOSKRNL] - Sam Arun Raj Seeniraj: ObpLookupObjectName() used to reparse endlessly when a symlink points to itself, preventing this by limiting number of reparse attemtps. See issue #993 for more details. Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Tue May 10 15:43:55 2011 @@ -544,7 +544,7 @@ } /* Reparse */ - while (Reparse) + while (Reparse && MaxReparse) { /* Get the name */ RemainingName = *ObjectName; @@ -795,6 +795,7 @@ { /* Reparse again */ Reparse = TRUE; + --MaxReparse; /* Start over from root if we got sent back there */ if ((Status == STATUS_REPARSE_OBJECT) ||

13 years, 7 months

[fireball] 51665: [NTOSKRNL] - Make ObpParseSymbolicLink properly handle the case when target path has a trailing path separator. Based on findings by Samarunraj. See issue #993 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 10 15:09:36 2011 New Revision: 51665 URL: http://svn.reactos.org/svn/reactos?rev=51665&view=rev Log: [NTOSKRNL] - Make ObpParseSymbolicLink properly handle the case when target path has a trailing path separator. Based on findings by Samarunraj. See issue #993 for more details. Modified: trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Tue May 10 15:09:36 2011 @@ -374,7 +374,7 @@ POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)ParsedObject; PUNICODE_STRING TargetPath; PWSTR NewTargetPath; - ULONG LengthUsed, MaximumLength; + ULONG LengthUsed, MaximumLength, TempLength; NTSTATUS Status; PAGED_CODE(); @@ -411,9 +411,39 @@ return STATUS_OBJECT_TYPE_MISMATCH; } + /* Check if this symlink is bound to a specific object */ + if (SymlinkObject->LinkTargetObject) + { + UNIMPLEMENTED; + } + /* Set the target path and length */ TargetPath = &SymlinkObject->LinkTarget; - LengthUsed = TargetPath->Length + RemainingName->Length; + TempLength = TargetPath->Length; + + /* + * Strip off the extra trailing '\', if we don't do this we will end up + * adding a extra '\' between TargetPath and RemainingName + * causing caller's like ObpLookupObjectName() to fail. + */ + if (TempLength && RemainingName->Length) + { + /* The target and remaining names aren't empty, so check for slashes */ + if ((TargetPath->Buffer[TempLength / sizeof(WCHAR) - 1] == + OBJ_NAME_PATH_SEPARATOR) && + (RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + /* Reduce the length by one to cut off the extra '\' */ + TempLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + } + + /* Calculate the new length */ + LengthUsed = TempLength + RemainingName->Length; + + /* Check if it's not too much */ + if (LengthUsed > 0xFFF0) + return STATUS_NAME_TOO_LONG; /* Optimization: check if the new name is shorter */ if (FullPath->MaximumLength <= LengthUsed) @@ -436,13 +466,13 @@ if (RemainingName->Length) { /* Copy the new path */ - RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TargetPath->Length), + RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TempLength), RemainingName->Buffer, RemainingName->Length); } /* Copy the target path and null-terminate it */ - RtlCopyMemory(NewTargetPath, TargetPath->Buffer, TargetPath->Length); + RtlCopyMemory(NewTargetPath, TargetPath->Buffer, TempLength); NewTargetPath[LengthUsed / sizeof(WCHAR)] = UNICODE_NULL; /* If the optimization didn't work, free the old buffer */

13 years, 7 months

[spetreolle] 51664: [CMAKE] Dereference non existing targets : buildno_header, kernel_zw, kernel_napi, subsystem_napi Spotted by msbuild.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue May 10 13:15:51 2011 New Revision: 51664 URL: http://svn.reactos.org/svn/reactos?rev=51664&view=rev Log: [CMAKE] Dereference non existing targets : buildno_header, kernel_zw, kernel_napi, subsystem_napi Spotted by msbuild. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=516… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue May 10 13:15:51 2011 @@ -170,7 +170,7 @@ macro(set_module_type MODULE TYPE) - add_dependencies(${MODULE} psdk buildno_header) + add_dependencies(${MODULE} psdk) if(${IS_CPP}) target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) endif() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=516… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue May 10 13:15:51 2011 @@ -66,7 +66,7 @@ endmacro() macro(set_module_type MODULE TYPE) - add_dependencies(${MODULE} psdk buildno_header) + add_dependencies(${MODULE} psdk) if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Tue May 10 13:15:51 2011 @@ -446,7 +446,7 @@ add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) -add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi asm) +add_dependencies(ntoskrnl psdk bugcodes asm) add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Tue May 10 13:15:51 2011 @@ -195,7 +195,7 @@ add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) -add_dependencies(win32k gendib_generated subsystem_napi) +add_dependencies(win32k gendib_generated) add_cab_target(win32k 1) add_importlib_target(win32k.spec)

13 years, 7 months

[ekohl] 51663: [NTOSKRNL] Fix two typos, one spotted by Gabriel Ilardi and the other one spotted by me.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue May 10 12:31:11 2011 New Revision: 51663 URL: http://svn.reactos.org/svn/reactos?rev=51663&view=rev Log: [NTOSKRNL] Fix two typos, one spotted by Gabriel Ilardi and the other one spotted by me. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue May 10 12:31:11 2011 @@ -1957,7 +1957,7 @@ InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, - 0, + NULL, NULL); Status = NtCreateKey(&KeyHandle, @@ -1969,7 +1969,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create key &wZ (Status: %08lx)\n", &KeyName, Status); + DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); return; }

13 years, 7 months

[tkreuzer] 51662: [GDI FONT DRIVER] - Fix size of the inverse lookup table - Add more pointer checks to FtfdInitKerningPairs - sort the FD_KERNINGPAIR array

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 10 10:16:10 2011 New Revision: 51662 URL: http://svn.reactos.org/svn/reactos?rev=51662&view=rev Log: [GDI FONT DRIVER] - Fix size of the inverse lookup table - Add more pointer checks to FtfdInitKerningPairs - sort the FD_KERNINGPAIR array Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Tue May 10 10:16:10 2011 @@ -268,7 +268,8 @@ TRACE("FtfdInitGlyphSet()\n"); /* Allocate an array of WCHARs */ - pwcReverseTable = EngAllocMem(0, pface->ftface->num_glyphs, 'dftF'); + cjSize = pface->cGlyphs * sizeof(WCHAR); + pwcReverseTable = EngAllocMem(0, cjSize, 'dftF'); if (!pwcReverseTable) { WARN("EngAllocMem() failed.\n"); @@ -303,6 +304,7 @@ for (i = 0, cRuns = 0; i < pface->cMappings && index; i++) { /* Create an entry in the reverse lookup table */ + ASSERT(index < pface->cGlyphs); pwcReverseTable[index] = wcCurrent; /* Use index as glyph handle */ @@ -355,6 +357,8 @@ return FMT_UNKNOWN; } +static +ULONG FtfdGetFileFormat( PFTFD_FILE pfile) { Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Tue May 10 10:16:10 2011 @@ -407,6 +407,21 @@ return nPairs; } +INT +__cdecl +CompareKernPair( + FD_KERNINGPAIR *pkp1, + FD_KERNINGPAIR *pkp2) +{ + ULONG ul1, ul2; + ul1 = pkp1->wcFirst + 65536 * pkp1->wcSecond; + ul2 = pkp2->wcFirst + 65536 * pkp2->wcSecond; + if (ul1 < ul2) return -1; + if (ul1 > ul2) return 1; + return 0; +} + + VOID NTAPI FtfdInitKerningPairs( @@ -415,33 +430,65 @@ PFTFD_FILE pfile = pface->pfile; PTT_KERNING_TABLE pKernTable; PTT_KERNING_SUBTABLE pSubTable; - ULONG i, j, cPairs = 0; + ULONG cjSize, i, j, cPairs = 0; FD_KERNINGPAIR *pKernPair; HGLYPH hgLeft, hgRight; - -__debugbreak(); + USHORT nTables; + ULONG_PTR ulLastAddress; + +//__debugbreak(); /* Get the kern table for the face */ pKernTable = FtfdFindTrueTypeTable(pfile->pvView, - pfile->cjView, - pface->iFace, - 'nrek', - NULL); - - if (!pKernTable || pKernTable->usVersion != 0) - { - TRACE("Couldn't find kerning table\n"); + pfile->cjView, + pface->iFace, + 'nrek', + &cjSize); + + if (!pKernTable || cjSize < sizeof(TT_KERNING_TABLE) || + pKernTable->usVersion != 0) + { + TRACE("Couldn't find a valid kerning table\n"); return; } - // FIXME: do an overflow check + nTables = GETW(&pKernTable->nTables); + ulLastAddress = (ULONG_PTR)pKernTable + cjSize; + + /* Loop all subtables */ pSubTable = &pKernTable->subtable; - for (i = 0; i < pKernTable->nTables; i++) - { - /* Only type 0 is interesting */ + for (i = 0; i < nTables; i++) + { + /* Check if the subtable is accessible */ + if ((ULONG_PTR)pSubTable + sizeof(TT_KERNING_SUBTABLE) > ulLastAddress) + { + __debugbreak(); + return; + } + + /* Get the table size and check if its valid */ + cjSize = GETW(&pSubTable->usLength); + if ((ULONG_PTR)pSubTable + cjSize > ulLastAddress) + { + __debugbreak(); + return; + } + + /* Check version */ if (GETW(&pSubTable->usVersion) == 0) + { + /* Get number of kerning pairs and check id its valid */ cPairs += GETW(&pSubTable->format0.nPairs); + if ((ULONG_PTR)&pSubTable->format0.akernpair[cPairs] > ulLastAddress) + { + __debugbreak(); + return; + } + } + + /* Go to next subtable */ + pSubTable = (PVOID)((PCHAR)pSubTable + cjSize); } if (cPairs == 0) @@ -450,7 +497,7 @@ } /* Allocate an FD_KERNINGPAIR array */ - pKernPair = EngAllocMem(0, (cPairs + 1) * sizeof(FD_KERNINGPAIR), '1234'); + pKernPair = EngAllocMem(0, (cPairs + 1) * sizeof(FD_KERNINGPAIR), 'dftF'); pface->pKerningPairs = pKernPair; if (!pKernPair) { @@ -460,34 +507,46 @@ /* Loop all subtables again */ pSubTable = &pKernTable->subtable; - for (i = 0; i < pKernTable->nTables; i++) - { - /* Only type 0 is interesting */ - if (GETW(&pSubTable->usVersion) != 0) continue; - - /* Loop all kern pairs in the table */ - for (j = 0; j < GETW(&pSubTable->format0.nPairs); j++) - { - /* Get the glyph handles for the kerning */ - hgLeft = GETW(&pSubTable->format0.akernpair[j].usLeft); - hgRight = GETW(&pSubTable->format0.akernpair[j].usRight); - - /* Windows wants WCHARs, convert them */ - pKernPair->wcFirst = pface->pwcReverseTable[hgLeft]; - pKernPair->wcSecond = pface->pwcReverseTable[hgLeft]; - pKernPair->fwdKern = GETW(&pSubTable->format0.akernpair[j].fwdValue); - pKernPair++; + for (i = 0; i < nTables; i++) + { + /* Check version */ + if (GETW(&pSubTable->usVersion) == 0) + { + /* Loop all kern pairs in the table */ + for (j = 0; j < GETW(&pSubTable->format0.nPairs); j++) + { + /* Get the glyph handles for the kerning */ + hgLeft = GETW(&pSubTable->format0.akernpair[j].usLeft); + hgRight = GETW(&pSubTable->format0.akernpair[j].usRight); + + /* Make sure we are inside the range */ + if (hgLeft >= pface->cGlyphs) hgLeft = 0; + if (hgRight >= pface->cGlyphs) hgRight = 0; + + /* Windows wants WCHARs, convert them */ + pKernPair->wcFirst = pface->pwcReverseTable[hgLeft]; + pKernPair->wcSecond = pface->pwcReverseTable[hgLeft]; + pKernPair->fwdKern = GETW(&pSubTable->format0.akernpair[j].fwdValue); + pKernPair++; + } } /* Go to next subtable */ - pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); - } - - /* Zero terminate last FD_KERNINGPAIR entry */ + pSubTable = (PVOID)((PCHAR)pSubTable + GETW(&pSubTable->usLength)); + } + + /* Zero terminate array */ pKernPair->wcFirst = 0; pKernPair->wcSecond = 0; pKernPair->fwdKern = 0; + /* Sort the array */ + EngSort((PBYTE)pface->pKerningPairs, + sizeof(FD_KERNINGPAIR), + cPairs, + (SORTCOMP)CompareKernPair); + + /* Set the number of kernpairs in the IFIMETRICS */ pface->ifiex.ifi.cKerningPairs = cPairs; }

13 years, 7 months

[ilardig] 51661: [USETUP] - Fix Italian formatting.

by ilardig＠svn.reactos.org

Author: ilardig Date: Tue May 10 09:12:13 2011 New Revision: 51661 URL: http://svn.reactos.org/svn/reactos?rev=51661&view=rev Log: [USETUP] - Fix Italian formatting. Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Tue May 10 09:12:13 2011 @@ -382,7 +382,7 @@ { 3, 14, - "Layout di tastiera:", + " Layout di tastiera:", TEXT_STYLE_NORMAL }, {

13 years, 7 months

[tkreuzer] 51660: [GDI FONT DRIVER] - Implement retrieving kerning pairs. since the freetype suport for kerning is verylimited, it is done completely without freetype suport, by usig the TrueType '...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 9 19:54:07 2011 New Revision: 51660 URL: http://svn.reactos.org/svn/reactos?rev=51660&view=rev Log: [GDI FONT DRIVER] - Implement retrieving kerning pairs. since the freetype suport for kerning is verylimited, it is done completely without freetype suport, by usig the TrueType 'kern' table. For some unknown reason Windows likes to have the kerning pairs as WCHARs instead of glyph handles, as they are provided. This is quite bad, as in theory there could be multiple mappings from WCHARs to the same glyph. But this should probably almost never happen in combination with kerning, so we use a short path and simply translate the glyph indices into WCHARs as if it was unambiguous. Code is completely untested due to the lack of a font with kerning data. Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Mon May 9 19:54:07 2011 @@ -263,8 +263,18 @@ ULONG i, cRuns, cjSize; HGLYPH * phglyphs; WCHAR wcCurrent, wcPrev; + PWCHAR pwcReverseTable; TRACE("FtfdInitGlyphSet()\n"); + + /* Allocate an array of WCHARs */ + pwcReverseTable = EngAllocMem(0, pface->ftface->num_glyphs, 'dftF'); + if (!pwcReverseTable) + { + WARN("EngAllocMem() failed.\n"); + return NULL; + } + /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) @@ -292,6 +302,9 @@ wcPrev = wcCurrent = (WCHAR)FT_Get_First_Char(ftface, &index); for (i = 0, cRuns = 0; i < pface->cMappings && index; i++) { + /* Create an entry in the reverse lookup table */ + pwcReverseTable[index] = wcCurrent; + /* Use index as glyph handle */ phglyphs[i] = (HGLYPH)index; @@ -317,15 +330,10 @@ TRACE("Done with font tree, %d runs\n", pGlyphSet->cRuns); pface->pGlyphSet = pGlyphSet; + pface->pwcReverseTable = pwcReverseTable; return pGlyphSet; } -VOID -FtfdInitKerningPairs( - PFTFD_FACE pface) -{ - //WARN("unimplemented\n"); -} static ULONG @@ -633,7 +641,7 @@ return NULL; } - /* get pointer to the requested face */ + /* Get pointer to the requested face */ pface = pfile->apface[iFace - 1]; switch (iMode) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Mon May 9 19:54:07 2011 @@ -17,6 +17,7 @@ #include FT_TYPE1_TABLES_H #include FT_MULTIPLE_MASTERS_H #include FT_TRIGONOMETRY_H + extern FT_Library gftlibrary; @@ -92,6 +93,7 @@ ULONG cGlyphs; ULONG cMappings; ULONG cRuns; + PWCHAR pwcReverseTable; FD_GLYPHSET *pGlyphSet; FD_KERNINGPAIR *pKerningPairs; FTFD_IFIMETRICS ifiex; @@ -329,3 +331,8 @@ FtfdGetWinMetrics( PFTFD_FACE pface, PIFIMETRICS pifi); + +VOID +NTAPI +FtfdInitKerningPairs( + PFTFD_FACE pface); Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Mon May 9 19:54:07 2011 @@ -315,7 +315,6 @@ PTT_OS2_DATA pOs2; /* Get the OS/2 table for the face */ - // FIXME: get the right table for the face, when multiple faces pOs2 = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, '2/SO', NULL); if (!pOs2) { @@ -364,6 +363,133 @@ return TRUE; } +ULONG +NTAPI +FtfdGetNumberOfKerningPairs( + PFTFD_FACE pface) +{ + PFTFD_FILE pfile = pface->pfile; + PTT_KERNING_TABLE pKerning; + PTT_KERNING_SUBTABLE pSubTable; + ULONG i, nPairs = 0; + +__debugbreak(); + + /* Get the kern table for the face */ + pKerning = FtfdFindTrueTypeTable(pfile->pvView, + pfile->cjView, + pface->iFace, + 'nrek', + NULL); + if (!pKerning) + { + WARN("Couldn't find kerning table\n"); + return 0; + } + + if (pKerning->usVersion != 0) + { + WARN("Found unknown version %lx\n", pKerning->usVersion); + return 0; + } + + /* Start with the first subtable */ + pSubTable = &pKerning->subtable; + + /* Loop all subtables */ + for (i = 0; i < pKerning->nTables; i++) + { + nPairs += GETW(&pSubTable->format0.nPairs); + pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); + } + + TRACE("Got %ld kerning pairs\n", nPairs); + return nPairs; +} + +VOID +NTAPI +FtfdInitKerningPairs( + PFTFD_FACE pface) +{ + PFTFD_FILE pfile = pface->pfile; + PTT_KERNING_TABLE pKernTable; + PTT_KERNING_SUBTABLE pSubTable; + ULONG i, j, cPairs = 0; + FD_KERNINGPAIR *pKernPair; + HGLYPH hgLeft, hgRight; + +__debugbreak(); + + /* Get the kern table for the face */ + pKernTable = FtfdFindTrueTypeTable(pfile->pvView, + pfile->cjView, + pface->iFace, + 'nrek', + NULL); + + if (!pKernTable || pKernTable->usVersion != 0) + { + TRACE("Couldn't find kerning table\n"); + return; + } + + // FIXME: do an overflow check + /* Loop all subtables */ + pSubTable = &pKernTable->subtable; + for (i = 0; i < pKernTable->nTables; i++) + { + /* Only type 0 is interesting */ + if (GETW(&pSubTable->usVersion) == 0) + cPairs += GETW(&pSubTable->format0.nPairs); + } + + if (cPairs == 0) + { + return; + } + + /* Allocate an FD_KERNINGPAIR array */ + pKernPair = EngAllocMem(0, (cPairs + 1) * sizeof(FD_KERNINGPAIR), '1234'); + pface->pKerningPairs = pKernPair; + if (!pKernPair) + { + WARN("EngAllocMem failed\n"); + return; + } + + /* Loop all subtables again */ + pSubTable = &pKernTable->subtable; + for (i = 0; i < pKernTable->nTables; i++) + { + /* Only type 0 is interesting */ + if (GETW(&pSubTable->usVersion) != 0) continue; + + /* Loop all kern pairs in the table */ + for (j = 0; j < GETW(&pSubTable->format0.nPairs); j++) + { + /* Get the glyph handles for the kerning */ + hgLeft = GETW(&pSubTable->format0.akernpair[j].usLeft); + hgRight = GETW(&pSubTable->format0.akernpair[j].usRight); + + /* Windows wants WCHARs, convert them */ + pKernPair->wcFirst = pface->pwcReverseTable[hgLeft]; + pKernPair->wcSecond = pface->pwcReverseTable[hgLeft]; + pKernPair->fwdKern = GETW(&pSubTable->format0.akernpair[j].fwdValue); + pKernPair++; + } + + /* Go to next subtable */ + pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); + } + + /* Zero terminate last FD_KERNINGPAIR entry */ + pKernPair->wcFirst = 0; + pKernPair->wcSecond = 0; + pKernPair->fwdKern = 0; + + pface->ifiex.ifi.cKerningPairs = cPairs; +} /** Public Interface **********************************************************/ Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Mon May 9 19:54:07 2011 @@ -14,6 +14,8 @@ return (((ULONG)pj[0]) << 24) | (((ULONG)pj[1]) << 16) | (((ULONG)pj[2]) << 8) | ((ULONG)pj[3]); } + +#include <pshpack1.h> typedef struct _TT_COLLECTION { @@ -43,7 +45,6 @@ } TT_FILE_HEADER, *PTT_FILE_HEADER; -#include <pshpack1.h> typedef struct _TT_OS2_DATA { USHORT version; // 0x0004 @@ -92,4 +93,38 @@ USHORT usBreakChar; USHORT usMaxContext; } TT_OS2_DATA, *PTT_OS2_DATA; + +typedef struct _TT_KERNPAIR +{ + USHORT usLeft; + USHORT usRight; + FWORD fwdValue; +} TT_KERNPAIR, *PTT_KERNPAIR; + +typedef struct _TT_KERNING_FORMAT_0 +{ + USHORT nPairs; + USHORT usSearchRange; + USHORT usEntrySelector; + USHORT usRangeShift; + TT_KERNPAIR akernpair[1]; +} TT_KERNING_FORMAT_0, *PTT_KERNING_FORMAT_0; + +typedef struct _TT_KERNING_SUBTABLE +{ + USHORT usVersion; + USHORT usLength; + USHORT usCoverage; + //// + TT_KERNING_FORMAT_0 format0; +} TT_KERNING_SUBTABLE, *PTT_KERNING_SUBTABLE; + +typedef struct _TT_KERNING_TABLE +{ + USHORT usVersion; + USHORT nTables; + //// + TT_KERNING_SUBTABLE subtable; +} TT_KERNING_TABLE, *PTT_KERNING_TABLE; + #include <poppack.h>

13 years, 7 months

← Newer
1
...
34
35
36
37
38
39
40
...
52
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 May 2011