Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 01/01: [KERNEL32_APITEST] More power to ConsoleCP testcase (#2187)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07e1f6ed47521cc5ef7f7… commit 07e1f6ed47521cc5ef7f76009c175d030354345a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 29 13:12:39 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 29 13:12:39 2019 +0900 [KERNEL32_APITEST] More power to ConsoleCP testcase (#2187) Strengthen kernel32_apitest ConsoleCP testcase for COMMON_LVB_LEADING_BYTE and COMMON_LVB_TRAILING_BYTE attributes. CORE-12451 --- modules/rostests/apitests/kernel32/ConsoleCP.c | 638 ++++++++++++++++++++++++- 1 file changed, 629 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/kernel32/ConsoleCP.c b/modules/rostests/apitests/kernel32/ConsoleCP.c index 3a381977ed4..315f182761a 100644 --- a/modules/rostests/apitests/kernel32/ConsoleCP.c +++ b/modules/rostests/apitests/kernel32/ConsoleCP.c @@ -18,9 +18,10 @@ #define ATTR \ (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) -static const WCHAR u0414[] = { 0x0414, 0 }; /* Д */ -static const WCHAR u9580[] = { 0x9580, 0 }; /* 門 */ -static const WCHAR ideograph_space = (WCHAR)0x3000; /* fullwidth space */ +static const WCHAR u0414[] = {0x0414, 0}; /* Д */ +static const WCHAR u9580[] = {0x9580, 0}; /* 門 */ +static const WCHAR space[] = {L' ', 0}; +static const WCHAR ideograph_space = (WCHAR)0x3000; /* fullwidth space */ static LCID lcidJapanese = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT); static LCID lcidRussian = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT), SORT_DEFAULT); static BOOL s_bIs8Plus; @@ -73,8 +74,7 @@ static void test_cp855(HANDLE hConOut) ret = GetConsoleScreenBufferInfo(hConOut, &csbi); ok(ret, "GetConsoleScreenBufferInfo failed\n"); trace("csbi.dwSize.X:%d, csbi.dwSize.Y:%d\n", csbi.dwSize.X, csbi.dwSize.Y); - count = csbi.dwSize.X * 3 / 2; - trace("count: %d\n", count); + count = 200; /* "\u0414" */ { @@ -263,11 +263,13 @@ static void test_cp932(HANDLE hConOut) DWORD oldcp; int n; DWORD len; - COORD c; + COORD c, buffSize; CONSOLE_SCREEN_BUFFER_INFO csbi; int count; WCHAR str[32]; - WORD attr; + WORD attr, attrs[4]; + CHAR_INFO buff[16]; + SMALL_RECT sr; if (!IsValidCodePage(932)) { @@ -289,8 +291,7 @@ static void test_cp932(HANDLE hConOut) ret = GetConsoleScreenBufferInfo(hConOut, &csbi); ok(ret, "GetConsoleScreenBufferInfo failed\n"); trace("csbi.dwSize.X:%d, csbi.dwSize.Y:%d\n", csbi.dwSize.X, csbi.dwSize.Y); - count = csbi.dwSize.X * 3 / 2; - trace("count: %d\n", count); + count = 200; /* "\u0414" */ { @@ -470,6 +471,625 @@ static void test_cp932(HANDLE hConOut) } } + /* COMMON_LVB_LEADING_BYTE and COMMON_LVB_TRAILING_BYTE for u0414 */ + { + /* set cursor */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* fill by 'A' */ + ret = FillConsoleOutputCharacterW(hConOut, L'A', csbi.dwSize.X * 2, c, &len); + ok_int(ret, 1); + ok_long(len, csbi.dwSize.X * 2); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + ZeroMemory(&sr, sizeof(sr)); + sr.Right = buffSize.X - 1; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, buffSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + ok_int(buff[0].Char.UnicodeChar, L'A'); + ok_int(buff[0].Attributes, ATTR); + + /* read attr */ + ret = ReadConsoleOutputAttribute(hConOut, &attr, 1, c, &len); + ok_int(ret, 1); + ok_int(attr, ATTR); + ok_long(len, 1); + + /* read char */ + c.X = c.Y = 0; + memset(str, 0x7F, sizeof(str)); + ret = ReadConsoleOutputCharacterW(hConOut, str, 4, c, &len); + ok_int(ret, 1); + ok_int(str[0], L'A'); + ok_int(str[1], L'A'); + ok_int(str[2], L'A'); + ok_int(str[3], L'A'); + + /* set cursor */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* write u0414 */ + ret = WriteConsoleW(hConOut, u0414, 1, &len, NULL); + ok_int(ret, 1); + ok_long(len, 1); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + ZeroMemory(&sr, sizeof(sr)); + sr.Right = buffSize.X - 1; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, buffSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + if (s_bIs8Plus) + { + ok_int(buff[0].Char.UnicodeChar, 0x0414); + ok_int(buff[0].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[1].Char.UnicodeChar, 0x0414); + ok_int(buff[1].Attributes, ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(buff[0].Char.UnicodeChar, 0x0414); + ok_int(buff[0].Attributes, ATTR); + ok_int(buff[1].Char.UnicodeChar, L'A'); + ok_int(buff[1].Attributes, ATTR); + } + ok_int(buff[2].Char.UnicodeChar, L'A'); + ok_int(buff[2].Attributes, ATTR); + ok_int(buff[3].Char.UnicodeChar, L'A'); + ok_int(buff[3].Attributes, ATTR); + + /* read attr */ + ret = ReadConsoleOutputAttribute(hConOut, attrs, ARRAYSIZE(attrs), c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + ok_int(attrs[0], ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(attrs[1], ATTR | COMMON_LVB_TRAILING_BYTE); + ok_int(attrs[2], ATTR); + ok_int(attrs[3], ATTR); + + /* read char */ + c.X = c.Y = 0; + memset(str, 0x7F, sizeof(str)); + ret = ReadConsoleOutputCharacterW(hConOut, str, 4, c, &len); + ok_int(ret, 1); + ok_int(str[0], 0x0414); + ok_int(str[1], L'A'); + ok_int(str[2], L'A'); + if (s_bIs8Plus) + ok_int(str[3], 0); + else + ok_int(str[3], 0x7F7F); + + /* set cursor */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* write u0414 */ + ret = WriteConsoleW(hConOut, u0414, 1, &len, NULL); + ok_int(ret, 1); + ok_long(len, 1); + + /* read output */ + c.X = c.Y = 0; + ZeroMemory(&sr, sizeof(sr)); + sr.Right = buffSize.X - 1; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, buffSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + if (s_bIs8Plus) + { + ok_int(buff[0].Char.UnicodeChar, 0x0414); + ok_int(buff[0].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[1].Char.UnicodeChar, 0x0414); + ok_int(buff[1].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[2].Char.UnicodeChar, 0x0414); + ok_int(buff[2].Attributes, ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(buff[0].Char.UnicodeChar, L' '); + ok_int(buff[0].Attributes, ATTR); + ok_int(buff[1].Char.UnicodeChar, 0x0414); + ok_int(buff[1].Attributes, ATTR); + ok_int(buff[2].Char.UnicodeChar, L'A'); + ok_int(buff[2].Attributes, ATTR); + } + ok_int(buff[3].Char.UnicodeChar, L'A'); + ok_int(buff[3].Attributes, ATTR); + + /* read attr */ + c.X = c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, attrs, ARRAYSIZE(attrs), c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + if (s_bIs8Plus) + ok_int(attrs[0], ATTR | COMMON_LVB_LEADING_BYTE); + else + ok_int(attrs[0], ATTR); + ok_int(attrs[1], ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(attrs[2], ATTR | COMMON_LVB_TRAILING_BYTE); + ok_int(attrs[3], ATTR); + + /* read char */ + c.X = c.Y = 0; + memset(str, 0x7F, sizeof(str)); + ret = ReadConsoleOutputCharacterW(hConOut, str, 4, c, &len); + ok_int(ret, 1); + if (s_bIs8Plus) + { + ok_int(str[0], 0x0414); + ok_int(str[1], 0x0414); + ok_int(str[2], L'A'); + ok_int(str[3], 0); + } + else + { + ok_int(str[0], L' '); + ok_int(str[1], 0x0414); + ok_int(str[2], L'A'); + ok_int(str[3], 0x7F7F); + } + + /* set cursor */ + c.X = csbi.dwSize.X - 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* write u0414 */ + WriteConsoleW(hConOut, u0414, 1, &len, NULL); + ok_int(ret, 1); + ok_long(len, 1); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + sr.Left = csbi.dwSize.X - 2; + sr.Top = 0; + sr.Right = csbi.dwSize.X - 1; + sr.Bottom = 0; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, csbi.dwSize.X - 2); + ok_int(sr.Top, 0); + ok_int(sr.Right, csbi.dwSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + ok_int(buff[0].Char.UnicodeChar, L'A'); + ok_int(buff[0].Attributes, ATTR); + ok_int(buff[1].Char.UnicodeChar, L'A'); + ok_int(buff[1].Attributes, ATTR); + + /* read attrs */ + c.X = csbi.dwSize.X - 2; + c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, attrs, ARRAYSIZE(attrs), c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + ok_int(attrs[0], ATTR); + ok_int(attrs[1], ATTR); + + /* read char */ + ret = ReadConsoleOutputCharacterW(hConOut, str, 2, c, &len); + ok_int(ret, 1); + ok_int(str[0], L'A'); + ok_int(str[1], L'A'); + + /* fill by 'A' */ + c.X = c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, L'A', 10, c, &len); + ok_int(ret, 1); + ok_long(len, 10); + + /* fill by u0414 */ + c.X = 1; + c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, 0x0414, 1, c, &len); + c.X = c.Y = 0; + ok_int(ret, 1); + ok_long(len, 1); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + sr.Left = 0; + sr.Top = 0; + sr.Right = 4; + sr.Bottom = 0; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, 4); + ok_int(sr.Bottom, 0); + + /* check buff */ + ok_int(buff[0].Char.UnicodeChar, 'A'); + ok_int(buff[0].Attributes, ATTR); + if (s_bIs8Plus) + { + ok_int(buff[1].Char.UnicodeChar, 0x0414); + ok_int(buff[1].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[2].Char.UnicodeChar, 0x0414); + ok_int(buff[2].Attributes, ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(buff[1].Char.UnicodeChar, L' '); + ok_int(buff[1].Attributes, ATTR); + ok_int(buff[2].Char.UnicodeChar, 'A'); + ok_int(buff[2].Attributes, ATTR); + } + ok_int(buff[3].Char.UnicodeChar, 'A'); + ok_int(buff[3].Attributes, ATTR); + ok_int(buff[4].Char.UnicodeChar, 'A'); + ok_int(buff[4].Attributes, ATTR); + + /* read attrs */ + c.X = 0; + c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, attrs, 4, c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + ok_int(attrs[0], ATTR); + if (s_bIs8Plus) + { + ok_int(attrs[1], ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(attrs[2], ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(attrs[1], ATTR); + ok_int(attrs[2], ATTR); + } + ok_int(attrs[3], ATTR); + } + + /* COMMON_LVB_LEADING_BYTE and COMMON_LVB_TRAILING_BYTE for u9580 */ + { + /* set cursor */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* fill by 'A' */ + ret = FillConsoleOutputCharacterW(hConOut, L'A', csbi.dwSize.X * 2, c, &len); + ok_int(ret, 1); + ok_long(len, csbi.dwSize.X * 2); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + ZeroMemory(&sr, sizeof(sr)); + sr.Right = buffSize.X - 1; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, buffSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + ok_int(buff[0].Char.UnicodeChar, L'A'); + ok_int(buff[0].Attributes, ATTR); + + /* read attr */ + ret = ReadConsoleOutputAttribute(hConOut, &attr, 1, c, &len); + ok_int(ret, 1); + ok_int(attr, ATTR); + ok_long(len, 1); + + /* read char */ + memset(str, 0x7F, sizeof(str)); + ret = ReadConsoleOutputCharacterW(hConOut, str, 2, c, &len); + ok_int(ret, 1); + ok_int(str[0], L'A'); + ok_int(str[1], L'A'); + + /* set cursor */ + c.X = 0; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* write u9580 */ + ret = WriteConsoleW(hConOut, u9580, 1, &len, NULL); + ok_int(ret, 1); + ok_long(len, 1); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + ZeroMemory(&sr, sizeof(sr)); + sr.Right = buffSize.X - 1; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, buffSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + if (s_bIs8Plus) + { + ok_int(buff[0].Char.UnicodeChar, 0x9580); + ok_int(buff[0].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[1].Char.UnicodeChar, 0x9580); + ok_int(buff[1].Attributes, ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(buff[0].Char.UnicodeChar, 0x9580); + ok_int(buff[0].Attributes, ATTR); + ok_int(buff[1].Char.UnicodeChar, L'A'); + ok_int(buff[1].Attributes, ATTR); + } + ok_int(buff[2].Char.UnicodeChar, L'A'); + ok_int(buff[2].Attributes, ATTR); + ok_int(buff[3].Char.UnicodeChar, L'A'); + ok_int(buff[3].Attributes, ATTR); + + /* read attr */ + ret = ReadConsoleOutputAttribute(hConOut, attrs, ARRAYSIZE(attrs), c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + + ok_int(attrs[0], ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(attrs[1], ATTR | COMMON_LVB_TRAILING_BYTE); + ok_int(attrs[2], ATTR); + ok_int(attrs[3], ATTR); + + /* read char */ + c.X = c.Y = 0; + memset(str, 0x7F, sizeof(str)); + ret = ReadConsoleOutputCharacterW(hConOut, str, 4, c, &len); + ok_int(ret, 1); + ok_int(str[0], 0x9580); + ok_int(str[1], L'A'); + ok_int(str[2], L'A'); + if (s_bIs8Plus) + ok_int(str[3], 0); + else + ok_int(str[3], 0x7F7F); + + /* set cursor */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* write u9580 */ + ret = WriteConsoleW(hConOut, u9580, 1, &len, NULL); + ok_int(ret, 1); + ok_long(len, 1); + + /* read output */ + c.X = c.Y = 0; + ZeroMemory(&sr, sizeof(sr)); + sr.Right = buffSize.X - 1; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, buffSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + if (s_bIs8Plus) + { + ok_int(buff[0].Char.UnicodeChar, 0x9580); + ok_int(buff[0].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[1].Char.UnicodeChar, 0x9580); + ok_int(buff[1].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[2].Char.UnicodeChar, 0x9580); + ok_int(buff[2].Attributes, ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(buff[0].Char.UnicodeChar, L' '); + ok_int(buff[0].Attributes, ATTR); + ok_int(buff[1].Char.UnicodeChar, 0x9580); + ok_int(buff[1].Attributes, ATTR); + ok_int(buff[2].Char.UnicodeChar, L'A'); + ok_int(buff[2].Attributes, ATTR); + } + ok_int(buff[3].Char.UnicodeChar, L'A'); + ok_int(buff[3].Attributes, ATTR); + + /* read attr */ + c.X = c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, attrs, ARRAYSIZE(attrs), c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + + if (s_bIs8Plus) + { + ok_int(attrs[0], ATTR | COMMON_LVB_LEADING_BYTE); + } + else + { + ok_int(attrs[0], ATTR); + } + ok_int(attrs[1], ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(attrs[2], ATTR | COMMON_LVB_TRAILING_BYTE); + ok_int(attrs[3], ATTR); + + /* set cursor */ + c.X = csbi.dwSize.X - 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + + /* write u9580 */ + WriteConsoleW(hConOut, u9580, 1, &len, NULL); + ok_int(ret, 1); + ok_long(len, 1); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + sr.Left = csbi.dwSize.X - 2; + sr.Top = 0; + sr.Right = csbi.dwSize.X - 1; + sr.Bottom = 0; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, csbi.dwSize.X - 2); + ok_int(sr.Top, 0); + ok_int(sr.Right, csbi.dwSize.X - 1); + ok_int(sr.Bottom, 0); + + /* check buff */ + ok_int(buff[0].Char.UnicodeChar, 'A'); + ok_int(buff[0].Attributes, ATTR); + ok_int(buff[1].Char.UnicodeChar, 'A'); + ok_int(buff[1].Attributes, ATTR); + + /* read attr */ + c.X = csbi.dwSize.X - 2; + c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, attrs, ARRAYSIZE(attrs), c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + ok_int(attrs[0], ATTR); + ok_int(attrs[1], ATTR); + + /* read char */ + memset(str, 0x7F, sizeof(str)); + ret = ReadConsoleOutputCharacterW(hConOut, str, 2, c, &len); + ok_int(ret, 1); + ok_int(str[0], L'A'); + ok_int(str[1], L'A'); + + /* fill by 'A' */ + c.X = c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, L'A', 10, c, &len); + ok_int(ret, 1); + ok_long(len, 10); + + /* fill by u9580 */ + c.X = 1; + c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, 0x9580, 1, c, &len); + c.X = c.Y = 0; + ok_int(ret, 1); + ok_long(len, 1); + + /* reset buff */ + buffSize.X = ARRAYSIZE(buff); + buffSize.Y = 1; + memset(buff, 0x7F, sizeof(buff)); + + /* read output */ + c.X = c.Y = 0; + sr.Left = 0; + sr.Top = 0; + sr.Right = 4; + sr.Bottom = 0; + ret = ReadConsoleOutputW(hConOut, buff, buffSize, c, &sr); + ok_int(ret, 1); + ok_int(sr.Left, 0); + ok_int(sr.Top, 0); + ok_int(sr.Right, 4); + ok_int(sr.Bottom, 0); + + /* check buff */ + ok_int(buff[0].Char.UnicodeChar, 'A'); + ok_int(buff[0].Attributes, ATTR); + if (s_bIs8Plus) + { + ok_int(buff[1].Char.UnicodeChar, 0x9580); + ok_int(buff[1].Attributes, ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(buff[2].Char.UnicodeChar, 0x9580); + ok_int(buff[2].Attributes, ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(buff[1].Char.UnicodeChar, L' '); + ok_int(buff[1].Attributes, ATTR); + ok_int(buff[2].Char.UnicodeChar, 'A'); + ok_int(buff[2].Attributes, ATTR); + } + ok_int(buff[3].Char.UnicodeChar, 'A'); + ok_int(buff[3].Attributes, ATTR); + ok_int(buff[4].Char.UnicodeChar, 'A'); + ok_int(buff[4].Attributes, ATTR); + + /* read attrs */ + c.X = 0; + c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, attrs, 4, c, &len); + ok_int(ret, 1); + ok_long(len, ARRAYSIZE(attrs)); + ok_int(attrs[0], ATTR); + if (s_bIs8Plus) + { + ok_int(attrs[1], ATTR | COMMON_LVB_LEADING_BYTE); + ok_int(attrs[2], ATTR | COMMON_LVB_TRAILING_BYTE); + } + else + { + ok_int(attrs[1], ATTR); + ok_int(attrs[2], ATTR); + } + ok_int(attrs[3], ATTR); + } + /* Restore code page */ SetConsoleOutputCP(oldcp); }

4 years, 12 months

[reactos] 01/01: [MSPAINT] Revert LoadDIBFromFile for workaround (#2186)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be40a0e29611fb45e4b31… commit be40a0e29611fb45e4b314c81be373774808b1c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 28 22:30:21 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 28 22:30:21 2019 +0900 [MSPAINT] Revert LoadDIBFromFile for workaround (#2186) CORE-16566 --- base/applications/mspaint/CMakeLists.txt | 2 +- base/applications/mspaint/dib.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index b59a2ee4193..b07e10d4ce0 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -34,6 +34,6 @@ add_rc_deps(rsrc.rc ${mspaint_rc_deps}) add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) target_link_libraries(mspaint uuid) -add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 gdiplus advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) +add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 8dc5453f5b6..dbe9003d667 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -83,8 +83,9 @@ void ShowFileLoadError(LPCTSTR name) void LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) { - using namespace Gdiplus; - Bitmap img(CStringW(name), FALSE); // always use WCHAR string + CImage img; + img.Load(name); + *hBitmap = img.Detach(); if (!hBitmap) { @@ -92,8 +93,6 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, i return; } - img.GetHBITMAP(Color(255, 255, 255), hBitmap); - // update time and size HANDLE hFile = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); @@ -112,9 +111,10 @@ LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, i if (size) *size = GetFileSize(hFile, NULL); - // update hRes and vRes - *hRes = (int) (img.GetHorizontalResolution() * 1000 / 25.4); - *vRes = (int) (img.GetVerticalResolution() * 1000 / 25.4); + HDC hScreenDC = GetDC(NULL); + *hRes = (int)(GetDeviceCaps(hScreenDC, LOGPIXELSX) * 1000 / 25.4); + *vRes = (int)(GetDeviceCaps(hScreenDC, LOGPIXELSY) * 1000 / 25.4); + ReleaseDC(NULL, hScreenDC); CloseHandle(hFile); }

4 years, 12 months

[reactos] 02/02: [REACTOS] Exclude some modules from clang-format

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e92ab76d0d60314c49207… commit e92ab76d0d60314c49207be3930f9e6b9f92aea6 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Dec 27 19:47:07 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 28 01:23:49 2019 +0200 [REACTOS] Exclude some modules from clang-format --- drivers/network/tcpip/.clang-format | 4 ++++ sdk/lib/3rdparty/.clang-format | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/network/tcpip/.clang-format b/drivers/network/tcpip/.clang-format new file mode 100644 index 00000000000..ef2ae21fafa --- /dev/null +++ b/drivers/network/tcpip/.clang-format @@ -0,0 +1,4 @@ +--- +DisableFormat: true +SortIncludes: false +... diff --git a/sdk/lib/3rdparty/.clang-format b/sdk/lib/3rdparty/.clang-format new file mode 100644 index 00000000000..ef2ae21fafa --- /dev/null +++ b/sdk/lib/3rdparty/.clang-format @@ -0,0 +1,4 @@ +--- +DisableFormat: true +SortIncludes: false +...

4 years, 12 months

[reactos] 01/02: [REACTOS] Introduce .clang-format file And set up a Travis job for checking formatting on PRs

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c64aed86af2f79d95287… commit 0c64aed86af2f79d95287b899cd8ff10b2ae208b Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 24 13:55:30 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 28 01:23:49 2019 +0200 [REACTOS] Introduce .clang-format file And set up a Travis job for checking formatting on PRs --- .clang-format | 35 +++++++++++++++++++++++++++++++++++ .travis.yml | 31 +++++++++++++++++++++++++++---- sdk/tools/check_code_format.sh | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 4 deletions(-) diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000000..f7e2e07f624 --- /dev/null +++ b/.clang-format @@ -0,0 +1,35 @@ +# full manual is at https://clang.llvm.org/docs/ClangFormatStyleOptions.html +--- +BasedOnStyle: Microsoft + +IndentWidth: 4 +UseTab: Never + +IndentCaseLabels: true + +AllowAllArgumentsOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false + +BinPackParameters: false +BinPackArguments: true + +# This applies to () [] <> +AlignAfterOpenBracket: AlwaysBreak + +# Always break before braces +BreakBeforeBraces: Allman + +# return type on it's own line +AlwaysBreakAfterReturnType: All + +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +... diff --git a/.travis.yml b/.travis.yml index a91c8c95fd9..01e6d118601 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,35 @@ -language: bash +dist: bionic +language: cpp + +addons: + apt: + sources: + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + packages: + clang-format-9 git: - depth: 5 + depth: 1 + +env: + global: + - DO_BUILD=0 + - DO_CHECK=0 + - CLFORMAT_BINARY=clang-format-9 + jobs: + - DO_BUILD=1 + - DO_CHECK=1 -before_script: +before_install: + - ln -s /usr/share/clang/clang-format-9/clang-format-diff.py ./sdk/tools/; - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz - tar -xzf RosBE.tar.gz - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && ninja -k 0 && ninja bootcd' > tmp_file script: - - ./RosBEBinFull/RosBE.sh < tmp_file + - if [ $DO_BUILD == "1" ]; then + ./RosBEBinFull/RosBE.sh < tmp_file; + elif [ $DO_CHECK == "1" ]; then + ./sdk/tools/check_code_format.sh; + fi diff --git a/sdk/tools/check_code_format.sh b/sdk/tools/check_code_format.sh new file mode 100755 index 00000000000..8b282a15d13 --- /dev/null +++ b/sdk/tools/check_code_format.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# Copyright (c) 2017 Google Inc. + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Script to determine if source code in Pull Request is properly formatted. +# Exits with non 0 exit code if formatting is needed. +# +# This script assumes to be invoked at the project root directory. + +BASE_BRANCH=${1:-master} + +FILES_TO_CHECK=$(git diff --name-only ${BASE_BRANCH} | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$") + +if [ -z "${FILES_TO_CHECK}" ]; then + echo "No source code to check for formatting." + exit 0 +fi + +FORMAT_DIFF=$(git diff -U0 ${BASE_BRANCH} -- ${FILES_TO_CHECK} | python3 ./sdk/tools/clang-format-diff.py -binary ${CLFORMAT_BINARY} -p1 -style=file) + +if [ -z "${FORMAT_DIFF}" ]; then + echo "All source code in PR properly formatted." + exit 0 +else + echo "Found formatting errors!" + echo "${FORMAT_DIFF}" + exit 1 +fi

4 years, 12 months

[reactos] 03/03: [CMAKE] Update baseaddresses with gcc 8.3

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b4dbec1401463aabca27… commit 5b4dbec1401463aabca27789c8931cb24cfd8e27 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 27 19:52:21 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 27 19:52:21 2019 +0100 [CMAKE] Update baseaddresses with gcc 8.3 --- sdk/cmake/baseaddress.cmake | 766 ++++++++++++++++++------------------- sdk/cmake/baseaddress_dwarf.cmake | 768 +++++++++++++++++++------------------- sdk/cmake/baseaddress_msvc.cmake | 748 ++++++++++++++++++------------------- 3 files changed, 1141 insertions(+), 1141 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index 528e0b91108..819fd9d5642 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -2,388 +2,388 @@ # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c5d0000) -set(baseaddress_msvcrt 0x7c520000) -set(baseaddress_advapi32 0x7c470000) -set(baseaddress_gdi32 0x7c3c0000) +set(baseaddress_kernel32 0x7c5b0000) +set(baseaddress_msvcrt 0x7c4e0000) +set(baseaddress_advapi32 0x7c410000) +set(baseaddress_gdi32 0x7c350000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c370000) -set(baseaddress_dnsapi 0x7c320000) -set(baseaddress_icmp 0x7c2f0000) -set(baseaddress_iphlpapi 0x7c2a0000) -set(baseaddress_ws2_32 0x7c250000) -set(baseaddress_ws2help 0x7c220000) -set(baseaddress_shlwapi 0x7c170000) -set(baseaddress_rpcrt4 0x7c0a0000) -set(baseaddress_comctl32 0x7bec0000) -set(baseaddress_ole32 0x7bcd0000) -set(baseaddress_winspool 0x7bc80000) -set(baseaddress_winmm 0x7bbc0000) -set(baseaddress_comdlg32 0x7bab0000) -set(baseaddress_shell32 0x7b1b0000) -set(baseaddress_lz32 0x7b190000) -set(baseaddress_version 0x7b160000) -set(baseaddress_oleaut32 0x7af90000) -set(baseaddress_setupapi 0x7ae10000) -set(baseaddress_mpr 0x7add0000) -set(baseaddress_crypt32 0x7acc0000) -set(baseaddress_wininet 0x7ac00000) -set(baseaddress_urlmon 0x7ab00000) -set(baseaddress_psapi 0x7aad0000) -set(baseaddress_imm32 0x7aa90000) -set(baseaddress_msvfw32 0x7aa40000) -set(baseaddress_dbghelp 0x7a990000) -set(baseaddress_devmgr 0x7a8a0000) -set(baseaddress_msacm32 0x7a860000) -set(baseaddress_netapi32 0x7a7d0000) -set(baseaddress_powrprof 0x7a7a0000) -set(baseaddress_secur32 0x7a750000) -set(baseaddress_wintrust 0x7a6f0000) -set(baseaddress_avicap32 0x7a6c0000) -set(baseaddress_cabinet 0x7a670000) -set(baseaddress_dsound 0x7a5f0000) -set(baseaddress_glu32 0x7a500000) -set(baseaddress_opengl32 0x7a3e0000) -set(baseaddress_riched20 0x7a320000) -set(baseaddress_smdll 0x7a300000) -set(baseaddress_userenv 0x7a2b0000) -set(baseaddress_uxtheme 0x7a250000) -set(baseaddress_cryptui 0x7a1a0000) -set(baseaddress_csrsrv 0x7a170000) -set(baseaddress_basesrv 0x7a140000) -set(baseaddress_winsrv 0x7a090000) -set(baseaddress_dplayx 0x7a020000) -set(baseaddress_gdiplus 0x79f40000) -set(baseaddress_msimg32 0x79f10000) -set(baseaddress_mswsock 0x79ee0000) -set(baseaddress_oledlg 0x79e90000) -set(baseaddress_rasapi32 0x79e60000) -set(baseaddress_rsaenh 0x79df0000) -set(baseaddress_samlib 0x79db0000) -set(baseaddress_sensapi 0x79d80000) -set(baseaddress_sfc_os 0x79d50000) -set(baseaddress_snmpapi 0x79d20000) -set(baseaddress_spoolss 0x79ce0000) -set(baseaddress_usp10 0x79c70000) -set(baseaddress_access 0x79be0000) -set(baseaddress_acgenral 0x79bc0000) -set(baseaddress_aclayers 0x79b90000) -set(baseaddress_acledit 0x79b60000) -set(baseaddress_aclui 0x79b20000) -set(baseaddress_acppage 0x79ab0000) -set(baseaddress_activeds 0x79a80000) -set(baseaddress_actxprxy 0x79840000) -set(baseaddress_advapi32_vista 0x79820000) -set(baseaddress_advpack 0x797e0000) -set(baseaddress_amstream 0x79790000) -set(baseaddress_apphelp 0x79740000) -set(baseaddress_appwiz 0x796c0000) -set(baseaddress_atl 0x79680000) -set(baseaddress_atl100 0x79640000) -set(baseaddress_atl80 0x79600000) -set(baseaddress_authz 0x795d0000) -set(baseaddress_avifil32 0x79550000) -set(baseaddress_batt 0x79520000) -set(baseaddress_bcrypt 0x794f0000) -set(baseaddress_beepmidi 0x794c0000) -set(baseaddress_browseui 0x79310000) -set(baseaddress_bthci 0x792e0000) -set(baseaddress_cards 0x79220000) -set(baseaddress_cfgmgr32 0x791f0000) -set(baseaddress_clusapi 0x791c0000) -set(baseaddress_cmicpl 0x79180000) -set(baseaddress_comcat 0x79150000) -set(baseaddress_compstui 0x79120000) -set(baseaddress_console 0x790c0000) -set(baseaddress_credui 0x79080000) -set(baseaddress_crtdll 0x79010000) -set(baseaddress_cryptdlg 0x78fe0000) -set(baseaddress_cryptdll 0x78fb0000) -set(baseaddress_cryptext 0x78f80000) -set(baseaddress_cryptnet 0x78f50000) -set(baseaddress_custom 0x78f20000) -set(baseaddress_d3d8 0x78ec0000) -set(baseaddress_d3d8thk 0x78ea0000) -set(baseaddress_d3d9 0x78e30000) -set(baseaddress_d3dcompiler_43 0x78d80000) -set(baseaddress_d3drm 0x78ce0000) -set(baseaddress_d3dwine 0x78ae0000) -set(baseaddress_d3dx9_24 0x78ab0000) -set(baseaddress_d3dx9_25 0x78a70000) -set(baseaddress_d3dx9_26 0x78a40000) -set(baseaddress_d3dx9_27 0x78a10000) -set(baseaddress_d3dx9_28 0x789e0000) -set(baseaddress_d3dx9_29 0x789b0000) -set(baseaddress_d3dx9_30 0x78980000) -set(baseaddress_d3dx9_31 0x78950000) -set(baseaddress_d3dx9_32 0x78920000) -set(baseaddress_d3dx9_33 0x788f0000) -set(baseaddress_d3dx9_34 0x788c0000) -set(baseaddress_d3dx9_35 0x78890000) -set(baseaddress_d3dx9_36 0x78790000) -set(baseaddress_d3dx9_37 0x78760000) -set(baseaddress_d3dx9_38 0x78730000) -set(baseaddress_d3dx9_39 0x78700000) -set(baseaddress_d3dx9_40 0x786d0000) -set(baseaddress_d3dx9_41 0x786a0000) -set(baseaddress_d3dx9_42 0x78670000) -set(baseaddress_d3dx9_43 0x78640000) -set(baseaddress_d3dxof 0x78600000) -set(baseaddress_dciman32 0x785d0000) -set(baseaddress_dcomlaunch 0x785a0000) -set(baseaddress_ddraw 0x784e0000) -set(baseaddress_desk 0x78440000) -set(baseaddress_deskadp 0x78410000) -set(baseaddress_deskmon 0x783e0000) -set(baseaddress_devcpux 0x783b0000) -set(baseaddress_devenum 0x78360000) -set(baseaddress_dinput 0x78300000) -set(baseaddress_dinput8 0x782a0000) -set(baseaddress_dmusic 0x78250000) -set(baseaddress_dnsrslvr 0x78220000) -set(baseaddress_dplay 0x781f0000) -set(baseaddress_dpnhpast 0x781c0000) -set(baseaddress_dxdiagn 0x78170000) -set(baseaddress_dxtn 0x78150000) -set(baseaddress_esent 0x78120000) -set(baseaddress_faultrep 0x780f0000) -set(baseaddress_fltlib 0x780c0000) -set(baseaddress_fmifs 0x780a0000) -set(baseaddress_fontext 0x78030000) -set(baseaddress_fontsub 0x78000000) -set(baseaddress_framedyn 0x77fc0000) -set(baseaddress_getuname 0x76b00000) -set(baseaddress_halxbox 0x76970000) -set(baseaddress_hdwwiz 0x768f0000) -set(baseaddress_hhctrl 0x768a0000) -set(baseaddress_hid 0x76870000) -set(baseaddress_hlink 0x76830000) -set(baseaddress_hnetcfg 0x767f0000) -set(baseaddress_httpapi 0x767c0000) -set(baseaddress_iccvid 0x76790000) -set(baseaddress_ieframe 0x76690000) -set(baseaddress_iernonce 0x76660000) -set(baseaddress_imaadp32.acm 0x76630000) -set(baseaddress_imagehlp 0x76600000) -set(baseaddress_inetcomm 0x765a0000) -set(baseaddress_inetcpl 0x76540000) -set(baseaddress_inetmib1 0x76510000) -set(baseaddress_initpki 0x764e0000) -set(baseaddress_input 0x76480000) -set(baseaddress_inseng 0x76440000) -set(baseaddress_intl 0x763d0000) -set(baseaddress_iologmsg 0x763b0000) -set(baseaddress_itircl 0x76380000) -set(baseaddress_itss 0x76340000) -set(baseaddress_joy 0x76300000) -set(baseaddress_jscript 0x761e0000) -set(baseaddress_jsproxy 0x761b0000) -set(baseaddress_kbdeo 0x76190000) -set(baseaddress_kbdrost 0x76170000) -set(baseaddress_kbsdll 0x76140000) -set(baseaddress_kernel32_vista 0x76120000) -set(baseaddress_ksuser 0x760f0000) -set(baseaddress_libjpeg 0x76060000) -set(baseaddress_libpng 0x75fd0000) -set(baseaddress_libtiff 0x75f00000) -set(baseaddress_libtirpc 0x75ea0000) -set(baseaddress_libxslt 0x75be0000) -set(baseaddress_load_notifications 0x75bc0000) -set(baseaddress_loadperf 0x75b90000) -set(baseaddress_localmon 0x75b60000) -set(baseaddress_localspl 0x75b20000) -set(baseaddress_localspl_apitest 0x75af0000) -set(baseaddress_localui 0x75ac0000) -set(baseaddress_lpk 0x75a90000) -set(baseaddress_lsasrv 0x75a10000) -set(baseaddress_main 0x75970000) -set(baseaddress_mapi32 0x75930000) -set(baseaddress_mbedtls 0x75890000) -set(baseaddress_mciavi32 0x75850000) -set(baseaddress_mcicda 0x75820000) -set(baseaddress_mciqtz32 0x757e0000) -set(baseaddress_mciseq 0x757b0000) -set(baseaddress_mciwave 0x75780000) -set(baseaddress_mgmtapi 0x75750000) -set(baseaddress_midimap 0x75720000) -set(baseaddress_mlang 0x756e0000) -set(baseaddress_mmdrv 0x756b0000) -set(baseaddress_mmsys 0x755d0000) -set(baseaddress_modemui 0x75560000) -set(baseaddress_mprapi 0x75530000) -set(baseaddress_msacm32.drv 0x75500000) -set(baseaddress_msadp32.acm 0x754d0000) -set(baseaddress_msafd 0x75490000) -set(baseaddress_mscat32 0x75460000) -set(baseaddress_mscms 0x75430000) -set(baseaddress_mscoree 0x753e0000) -set(baseaddress_msctf 0x75380000) -set(baseaddress_msdmo 0x75350000) -set(baseaddress_msftedit 0x75320000) -set(baseaddress_msg711.acm 0x752f0000) -set(baseaddress_msgina 0x75240000) -set(baseaddress_msgsm32.acm 0x75210000) -set(baseaddress_mshtml 0x74f00000) -set(baseaddress_msi 0x74d50000) -set(baseaddress_msimtf 0x74d20000) -set(baseaddress_msisip 0x74cf0000) -set(baseaddress_msisys 0x74cc0000) -set(baseaddress_mspatcha 0x74c90000) -set(baseaddress_msports 0x74c50000) -set(baseaddress_msrle32 0x74c20000) -set(baseaddress_mssign32 0x74bf0000) -set(baseaddress_mssip32 0x74bc0000) -set(baseaddress_mstask 0x74b80000) -set(baseaddress_msv1_0 0x74b50000) +set(baseaddress_dhcpcsvc 0x7c300000) +set(baseaddress_dnsapi 0x7c2a0000) +set(baseaddress_icmp 0x7c270000) +set(baseaddress_iphlpapi 0x7c220000) +set(baseaddress_ws2_32 0x7c1d0000) +set(baseaddress_ws2help 0x7c1a0000) +set(baseaddress_shlwapi 0x7c0e0000) +set(baseaddress_rpcrt4 0x7bff0000) +set(baseaddress_comctl32 0x7bdd0000) +set(baseaddress_ole32 0x7bb80000) +set(baseaddress_winspool 0x7bb30000) +set(baseaddress_winmm 0x7ba70000) +set(baseaddress_comdlg32 0x7b950000) +set(baseaddress_shell32 0x7b020000) +set(baseaddress_lz32 0x7b000000) +set(baseaddress_version 0x7afd0000) +set(baseaddress_oleaut32 0x7adb0000) +set(baseaddress_setupapi 0x7ac20000) +set(baseaddress_mpr 0x7abd0000) +set(baseaddress_crypt32 0x7aaa0000) +set(baseaddress_wininet 0x7a9c0000) +set(baseaddress_urlmon 0x7a890000) +set(baseaddress_psapi 0x7a860000) +set(baseaddress_imm32 0x7a820000) +set(baseaddress_msvfw32 0x7a7d0000) +set(baseaddress_dbghelp 0x7a710000) +set(baseaddress_devmgr 0x7a620000) +set(baseaddress_msacm32 0x7a5d0000) +set(baseaddress_netapi32 0x7a530000) +set(baseaddress_powrprof 0x7a500000) +set(baseaddress_secur32 0x7a4a0000) +set(baseaddress_wintrust 0x7a440000) +set(baseaddress_avicap32 0x7a410000) +set(baseaddress_cabinet 0x7a3b0000) +set(baseaddress_dsound 0x7a320000) +set(baseaddress_glu32 0x7a200000) +set(baseaddress_opengl32 0x7a0b0000) +set(baseaddress_riched20 0x79fe0000) +set(baseaddress_smdll 0x79fc0000) +set(baseaddress_userenv 0x79f60000) +set(baseaddress_uxtheme 0x79ef0000) +set(baseaddress_cryptui 0x79e30000) +set(baseaddress_csrsrv 0x79df0000) +set(baseaddress_basesrv 0x79dc0000) +set(baseaddress_winsrv 0x79d00000) +set(baseaddress_dplayx 0x79c90000) +set(baseaddress_gdiplus 0x79b80000) +set(baseaddress_msimg32 0x79b50000) +set(baseaddress_mswsock 0x79b20000) +set(baseaddress_oledlg 0x79ad0000) +set(baseaddress_rasapi32 0x79aa0000) +set(baseaddress_rsaenh 0x79a30000) +set(baseaddress_samlib 0x799f0000) +set(baseaddress_sensapi 0x799c0000) +set(baseaddress_sfc_os 0x79990000) +set(baseaddress_snmpapi 0x79960000) +set(baseaddress_spoolss 0x79920000) +set(baseaddress_usp10 0x79890000) +set(baseaddress_access 0x79800000) +set(baseaddress_acgenral 0x797d0000) +set(baseaddress_aclayers 0x797a0000) +set(baseaddress_acledit 0x79770000) +set(baseaddress_aclui 0x79730000) +set(baseaddress_acppage 0x796c0000) +set(baseaddress_activeds 0x79690000) +set(baseaddress_actxprxy 0x793b0000) +set(baseaddress_advapi32_vista 0x79380000) +set(baseaddress_advpack 0x79340000) +set(baseaddress_amstream 0x792e0000) +set(baseaddress_apphelp 0x79290000) +set(baseaddress_appwiz 0x79210000) +set(baseaddress_atl 0x791c0000) +set(baseaddress_atl100 0x79170000) +set(baseaddress_atl80 0x79120000) +set(baseaddress_authz 0x790f0000) +set(baseaddress_avifil32 0x79060000) +set(baseaddress_batt 0x79030000) +set(baseaddress_bcrypt 0x79000000) +set(baseaddress_beepmidi 0x78fd0000) +set(baseaddress_browseui 0x78e10000) +set(baseaddress_bthci 0x78de0000) +set(baseaddress_cards 0x78d20000) +set(baseaddress_cfgmgr32 0x78cf0000) +set(baseaddress_clusapi 0x78cb0000) +set(baseaddress_cmicpl 0x78c70000) +set(baseaddress_comcat 0x78c40000) +set(baseaddress_compstui 0x78c10000) +set(baseaddress_console 0x78bb0000) +set(baseaddress_credui 0x78b60000) +set(baseaddress_crtdll 0x78af0000) +set(baseaddress_cryptdlg 0x78ab0000) +set(baseaddress_cryptdll 0x78a80000) +set(baseaddress_cryptext 0x78a50000) +set(baseaddress_cryptnet 0x78a10000) +set(baseaddress_custom 0x789e0000) +set(baseaddress_d3d8 0x78980000) +set(baseaddress_d3d8thk 0x78960000) +set(baseaddress_d3d9 0x788f0000) +set(baseaddress_d3dcompiler_43 0x78820000) +set(baseaddress_d3drm 0x78780000) +set(baseaddress_d3dwine 0x78530000) +set(baseaddress_d3dx9_24 0x78500000) +set(baseaddress_d3dx9_25 0x784c0000) +set(baseaddress_d3dx9_26 0x78490000) +set(baseaddress_d3dx9_27 0x78460000) +set(baseaddress_d3dx9_28 0x78430000) +set(baseaddress_d3dx9_29 0x78400000) +set(baseaddress_d3dx9_30 0x783d0000) +set(baseaddress_d3dx9_31 0x783a0000) +set(baseaddress_d3dx9_32 0x78370000) +set(baseaddress_d3dx9_33 0x78340000) +set(baseaddress_d3dx9_34 0x78310000) +set(baseaddress_d3dx9_35 0x782e0000) +set(baseaddress_d3dx9_36 0x781b0000) +set(baseaddress_d3dx9_37 0x78180000) +set(baseaddress_d3dx9_38 0x78150000) +set(baseaddress_d3dx9_39 0x78120000) +set(baseaddress_d3dx9_40 0x780f0000) +set(baseaddress_d3dx9_41 0x780c0000) +set(baseaddress_d3dx9_42 0x78090000) +set(baseaddress_d3dx9_43 0x78060000) +set(baseaddress_d3dxof 0x78010000) +set(baseaddress_dciman32 0x77fe0000) +set(baseaddress_dcomlaunch 0x77fb0000) +set(baseaddress_ddraw 0x77ee0000) +set(baseaddress_desk 0x77e30000) +set(baseaddress_deskadp 0x77df0000) +set(baseaddress_deskmon 0x77dc0000) +set(baseaddress_devcpux 0x77d90000) +set(baseaddress_devenum 0x77d40000) +set(baseaddress_dinput 0x77cd0000) +set(baseaddress_dinput8 0x77c60000) +set(baseaddress_dmusic 0x77c10000) +set(baseaddress_dnsrslvr 0x77be0000) +set(baseaddress_dplay 0x779f0000) +set(baseaddress_dpnhpast 0x779c0000) +set(baseaddress_dxdiagn 0x77970000) +set(baseaddress_dxtn 0x77940000) +set(baseaddress_esent 0x77900000) +set(baseaddress_faultrep 0x778d0000) +set(baseaddress_fltlib 0x778a0000) +set(baseaddress_fmifs 0x77880000) +set(baseaddress_fontext 0x77820000) +set(baseaddress_fontsub 0x777f0000) +set(baseaddress_framedyn 0x777b0000) +set(baseaddress_getuname 0x76d40000) +set(baseaddress_halxbox 0x76bb0000) +set(baseaddress_hdwwiz 0x76b30000) +set(baseaddress_hhctrl 0x76ad0000) +set(baseaddress_hid 0x76a90000) +set(baseaddress_hlink 0x76a50000) +set(baseaddress_hnetcfg 0x76a10000) +set(baseaddress_httpapi 0x769e0000) +set(baseaddress_iccvid 0x769b0000) +set(baseaddress_ieframe 0x768d0000) +set(baseaddress_iernonce 0x768a0000) +set(baseaddress_imaadp32.acm 0x76870000) +set(baseaddress_imagehlp 0x76830000) +set(baseaddress_inetcomm 0x767c0000) +set(baseaddress_inetcpl 0x76760000) +set(baseaddress_inetmib1 0x76730000) +set(baseaddress_initpki 0x76700000) +set(baseaddress_input 0x76690000) +set(baseaddress_inseng 0x76650000) +set(baseaddress_intl 0x765d0000) +set(baseaddress_iologmsg 0x765b0000) +set(baseaddress_itircl 0x76580000) +set(baseaddress_itss 0x76530000) +set(baseaddress_joy 0x764f0000) +set(baseaddress_jscript 0x76370000) +set(baseaddress_jsproxy 0x76340000) +set(baseaddress_kbdeo 0x76320000) +set(baseaddress_kbdrost 0x76300000) +set(baseaddress_kbsdll 0x762d0000) +set(baseaddress_kernel32_vista 0x762b0000) +set(baseaddress_ksuser 0x76280000) +set(baseaddress_libjpeg 0x761e0000) +set(baseaddress_libpng 0x76130000) +set(baseaddress_libtiff 0x76040000) +set(baseaddress_libtirpc 0x75fe0000) +set(baseaddress_libxslt 0x75ca0000) +set(baseaddress_load_notifications 0x75c80000) +set(baseaddress_loadperf 0x75c50000) +set(baseaddress_localmon 0x75c20000) +set(baseaddress_localspl 0x75bd0000) +set(baseaddress_localspl_apitest 0x75ba0000) +set(baseaddress_localui 0x75b70000) +set(baseaddress_lpk 0x75b40000) +set(baseaddress_lsasrv 0x75ac0000) +set(baseaddress_main 0x75a20000) +set(baseaddress_mapi32 0x759d0000) +set(baseaddress_mbedtls 0x75920000) +set(baseaddress_mciavi32 0x758e0000) +set(baseaddress_mcicda 0x758b0000) +set(baseaddress_mciqtz32 0x75870000) +set(baseaddress_mciseq 0x75830000) +set(baseaddress_mciwave 0x757f0000) +set(baseaddress_mgmtapi 0x757c0000) +set(baseaddress_midimap 0x75790000) +set(baseaddress_mlang 0x75750000) +set(baseaddress_mmdrv 0x75720000) +set(baseaddress_mmsys 0x75640000) +set(baseaddress_modemui 0x755c0000) +set(baseaddress_mprapi 0x75580000) +set(baseaddress_msacm32.drv 0x75550000) +set(baseaddress_msadp32.acm 0x75520000) +set(baseaddress_msafd 0x754d0000) +set(baseaddress_mscat32 0x754a0000) +set(baseaddress_mscms 0x75460000) +set(baseaddress_mscoree 0x75400000) +set(baseaddress_msctf 0x753a0000) +set(baseaddress_msdmo 0x75370000) +set(baseaddress_msftedit 0x75340000) +set(baseaddress_msg711.acm 0x75310000) +set(baseaddress_msgina 0x75260000) +set(baseaddress_msgsm32.acm 0x75230000) +set(baseaddress_mshtml 0x74f70000) +set(baseaddress_msi 0x74d90000) +set(baseaddress_msimtf 0x74d60000) +set(baseaddress_msisip 0x74d30000) +set(baseaddress_msisys 0x74d00000) +set(baseaddress_mspatcha 0x74cd0000) +set(baseaddress_msports 0x74c90000) +set(baseaddress_msrle32 0x74c50000) +set(baseaddress_mssign32 0x74c20000) +set(baseaddress_mssip32 0x74bf0000) +set(baseaddress_mstask 0x74bb0000) +set(baseaddress_msv1_0 0x74b80000) set(baseaddress_msvcrt20 0x74a80000) -set(baseaddress_msvcrt40 0x749b0000) -set(baseaddress_msvcrt_crt_dll_startup 0x74980000) -set(baseaddress_msvidc32 0x74950000) -set(baseaddress_msxml 0x74920000) -set(baseaddress_msxml2 0x748f0000) -set(baseaddress_msxml3 0x74510000) -set(baseaddress_msxml3r 0x744f0000) -set(baseaddress_msxml4 0x744b0000) -set(baseaddress_msxml6 0x74470000) -set(baseaddress_mycomput 0x74450000) -set(baseaddress_ncpa 0x74420000) -set(baseaddress_nddeapi 0x743f0000) -set(baseaddress_netcfgx 0x74340000) -set(baseaddress_netevent 0x74310000) -set(baseaddress_netid 0x742c0000) -set(baseaddress_netlogon 0x74290000) -set(baseaddress_netmsg 0x74110000) -set(baseaddress_netplwiz 0x740e0000) -set(baseaddress_netshell 0x74010000) -set(baseaddress_newdev 0x73fb0000) -set(baseaddress_nfs41_np 0x73f80000) -set(baseaddress_normaliz 0x73f50000) -set(baseaddress_notifyhook 0x73f20000) -set(baseaddress_npptools 0x73ef0000) -set(baseaddress_ntdll_vista 0x73ed0000) -set(baseaddress_ntdsapi 0x73ea0000) -set(baseaddress_ntlanman 0x73e70000) -set(baseaddress_ntmarta 0x73e40000) -set(baseaddress_ntobjshex 0x73da0000) -set(baseaddress_objsel 0x73d70000) -set(baseaddress_odbc32 0x73d20000) -set(baseaddress_odbccp32 0x73cf0000) -set(baseaddress_odbccp32i 0x73cc0000) -set(baseaddress_oleacc 0x73c20000) -set(baseaddress_olecli32 0x73bf0000) -set(baseaddress_olepro32 0x73bc0000) -set(baseaddress_olesvr32 0x73b90000) -set(baseaddress_olethk32 0x73b60000) -set(baseaddress_openglcfg 0x73b30000) -set(baseaddress_pdh 0x73af0000) -set(baseaddress_pidgen 0x73ac0000) -set(baseaddress_pifmgr 0x73a50000) -set(baseaddress_powercfg 0x739e0000) -set(baseaddress_printui 0x739b0000) -set(baseaddress_propsys 0x73970000) -set(baseaddress_pstorec 0x73940000) -set(baseaddress_qedit 0x738f0000) -set(baseaddress_qmgr 0x738b0000) -set(baseaddress_qmgrprxy 0x73840000) -set(baseaddress_quartz 0x736b0000) -set(baseaddress_query 0x73680000) -set(baseaddress_rasadhlp 0x73650000) -set(baseaddress_rasdlg 0x73480000) -set(baseaddress_rasman 0x73450000) -set(baseaddress_redirtest1 0x73420000) -set(baseaddress_redirtest2 0x733f0000) -set(baseaddress_resutils 0x733c0000) -set(baseaddress_riched32 0x73390000) -set(baseaddress_rsabase 0x73370000) -set(baseaddress_rshell 0x732c0000) -set(baseaddress_samsrv 0x73250000) -set(baseaddress_sccbase 0x73220000) -set(baseaddress_schannel 0x731e0000) -set(baseaddress_schedsvc 0x731b0000) -set(baseaddress_scrrun 0x73150000) -set(baseaddress_security 0x73130000) -set(baseaddress_sendmail 0x730d0000) -set(baseaddress_serialui 0x730a0000) -set(baseaddress_sfc 0x73070000) -set(baseaddress_shdoclc 0x73030000) -set(baseaddress_shdocvw 0x72fe0000) -set(baseaddress_shellbtrfs 0x72e30000) -set(baseaddress_shfolder 0x72e10000) -set(baseaddress_shimgvw 0x72dc0000) -set(baseaddress_shsvcs 0x72d90000) -set(baseaddress_slbcsp 0x72d60000) -set(baseaddress_sndblst 0x72d30000) -set(baseaddress_softpub 0x72d10000) -set(baseaddress_srclient 0x72ce0000) -set(baseaddress_srvsvc 0x72cb0000) -set(baseaddress_sti 0x72c70000) -set(baseaddress_stobject 0x72bd0000) -set(baseaddress_streamci 0x72ba0000) -set(baseaddress_sxs 0x72b70000) -set(baseaddress_sysdm 0x72a70000) -set(baseaddress_syssetup 0x72940000) -set(baseaddress_t2embed 0x72910000) -set(baseaddress_tapi32 0x728d0000) -set(baseaddress_tapiui 0x72850000) -set(baseaddress_telephon 0x72820000) -set(baseaddress_testvdd 0x727f0000) -set(baseaddress_themeui 0x727d0000) -set(baseaddress_timedate 0x72760000) -set(baseaddress_traffic 0x72730000) -set(baseaddress_twain_32 0x72700000) -set(baseaddress_ubtrfs 0x726d0000) -set(baseaddress_ucdfs 0x726b0000) -set(baseaddress_uext2 0x72670000) -set(baseaddress_ufat 0x72630000) -set(baseaddress_ufatx 0x72610000) -set(baseaddress_uffs 0x725f0000) -set(baseaddress_umpnpmgr 0x725b0000) -set(baseaddress_untfs 0x72590000) -set(baseaddress_updspapi 0x72560000) -set(baseaddress_ureiserfs 0x72540000) -set(baseaddress_url 0x72510000) -set(baseaddress_usrmgr 0x724c0000) -set(baseaddress_vbscript 0x72410000) -set(baseaddress_vdmdbg 0x723e0000) -set(baseaddress_verifier 0x723c0000) -set(baseaddress_vfd 0x72360000) -set(baseaddress_vssapi 0x72330000) -set(baseaddress_w32time 0x72300000) -set(baseaddress_wbemdisp 0x722b0000) -set(baseaddress_wbemprox 0x72240000) -set(baseaddress_wdmaud.drv 0x72080000) -set(baseaddress_win32u 0x72050000) -set(baseaddress_win32u_2k3sp2 0x72020000) -set(baseaddress_win32u_xpsp2 0x71ff0000) -set(baseaddress_windowscodecs 0x71ea0000) -set(baseaddress_windowscodecsext 0x71e70000) -set(baseaddress_wined3dcfg 0x71e40000) -set(baseaddress_winemp3.acm 0x71dc0000) -set(baseaddress_winfax 0x71d90000) -set(baseaddress_wing32 0x71d60000) -set(baseaddress_winhttp 0x71cf0000) -set(baseaddress_winprint 0x71cc0000) -set(baseaddress_winscard 0x71c90000) -set(baseaddress_winsta 0x71c60000) -set(baseaddress_wkssvc 0x71c30000) -set(baseaddress_wlanapi 0x71c00000) -set(baseaddress_wldap32 0x71bc0000) -set(baseaddress_wlnotify 0x71b90000) -set(baseaddress_wmi 0x71b70000) -set(baseaddress_wmisvc 0x71b40000) -set(baseaddress_wmiutils 0x71b10000) -set(baseaddress_wmvcore 0x71ac0000) -set(baseaddress_wshirda 0x71a90000) -set(baseaddress_wshom 0x71a40000) -set(baseaddress_wshtcpip 0x71a10000) -set(baseaddress_wsock32 0x719e0000) -set(baseaddress_wtsapi32 0x719b0000) -set(baseaddress_wuapi 0x71970000) -set(baseaddress_wuauserv 0x71940000) -set(baseaddress_xinput1_1 0x71910000) -set(baseaddress_xinput1_2 0x718e0000) -set(baseaddress_xinput1_3 0x718b0000) -set(baseaddress_xinput9_1_0 0x71880000) -set(baseaddress_xmllite 0x71840000) -set(baseaddress_xolehlp 0x71810000) -set(baseaddress_zipfldr 0x71730000) +set(baseaddress_msvcrt40 0x74980000) +set(baseaddress_msvcrt_crt_dll_startup 0x74950000) +set(baseaddress_msvidc32 0x74920000) +set(baseaddress_msxml 0x748f0000) +set(baseaddress_msxml2 0x748c0000) +set(baseaddress_msxml3 0x74490000) +set(baseaddress_msxml3r 0x74470000) +set(baseaddress_msxml4 0x74430000) +set(baseaddress_msxml6 0x743f0000) +set(baseaddress_mycomput 0x743d0000) +set(baseaddress_ncpa 0x743a0000) +set(baseaddress_nddeapi 0x74370000) +set(baseaddress_netcfgx 0x742c0000) +set(baseaddress_netevent 0x74290000) +set(baseaddress_netid 0x74240000) +set(baseaddress_netlogon 0x74200000) +set(baseaddress_netmsg 0x74080000) +set(baseaddress_netplwiz 0x74050000) +set(baseaddress_netshell 0x73f80000) +set(baseaddress_newdev 0x73f20000) +set(baseaddress_nfs41_np 0x73ef0000) +set(baseaddress_normaliz 0x73ec0000) +set(baseaddress_notifyhook 0x73e90000) +set(baseaddress_npptools 0x73e60000) +set(baseaddress_ntdll_vista 0x73e40000) +set(baseaddress_ntdsapi 0x73e10000) +set(baseaddress_ntlanman 0x73de0000) +set(baseaddress_ntmarta 0x73db0000) +set(baseaddress_ntobjshex 0x73d10000) +set(baseaddress_objsel 0x73ce0000) +set(baseaddress_odbc32 0x73c90000) +set(baseaddress_odbccp32 0x73c50000) +set(baseaddress_odbccp32i 0x73c20000) +set(baseaddress_oleacc 0x73b80000) +set(baseaddress_olecli32 0x73b50000) +set(baseaddress_olepro32 0x73b20000) +set(baseaddress_olesvr32 0x73af0000) +set(baseaddress_olethk32 0x73ac0000) +set(baseaddress_openglcfg 0x73a90000) +set(baseaddress_pdh 0x73a50000) +set(baseaddress_pidgen 0x73a20000) +set(baseaddress_pifmgr 0x739b0000) +set(baseaddress_powercfg 0x73940000) +set(baseaddress_printui 0x73910000) +set(baseaddress_propsys 0x738c0000) +set(baseaddress_pstorec 0x73890000) +set(baseaddress_qedit 0x73840000) +set(baseaddress_qmgr 0x73800000) +set(baseaddress_qmgrprxy 0x73780000) +set(baseaddress_quartz 0x735b0000) +set(baseaddress_query 0x73580000) +set(baseaddress_rasadhlp 0x73550000) +set(baseaddress_rasdlg 0x73380000) +set(baseaddress_rasman 0x73340000) +set(baseaddress_redirtest1 0x73310000) +set(baseaddress_redirtest2 0x732e0000) +set(baseaddress_resutils 0x732b0000) +set(baseaddress_riched32 0x73280000) +set(baseaddress_rsabase 0x73260000) +set(baseaddress_rshell 0x731b0000) +set(baseaddress_samsrv 0x73130000) +set(baseaddress_sccbase 0x73100000) +set(baseaddress_schannel 0x730c0000) +set(baseaddress_schedsvc 0x73090000) +set(baseaddress_scrrun 0x73030000) +set(baseaddress_security 0x73010000) +set(baseaddress_sendmail 0x72fc0000) +set(baseaddress_serialui 0x72f90000) +set(baseaddress_sfc 0x72f60000) +set(baseaddress_shdoclc 0x72f20000) +set(baseaddress_shdocvw 0x72ed0000) +set(baseaddress_shellbtrfs 0x72c90000) +set(baseaddress_shfolder 0x72c70000) +set(baseaddress_shimgvw 0x72c20000) +set(baseaddress_shsvcs 0x72bf0000) +set(baseaddress_slbcsp 0x72bc0000) +set(baseaddress_sndblst 0x72b80000) +set(baseaddress_softpub 0x72b60000) +set(baseaddress_srclient 0x72b30000) +set(baseaddress_srvsvc 0x72b00000) +set(baseaddress_sti 0x72ac0000) +set(baseaddress_stobject 0x72a20000) +set(baseaddress_streamci 0x729f0000) +set(baseaddress_sxs 0x729b0000) +set(baseaddress_sysdm 0x728b0000) +set(baseaddress_syssetup 0x72780000) +set(baseaddress_t2embed 0x72750000) +set(baseaddress_tapi32 0x72710000) +set(baseaddress_tapiui 0x72690000) +set(baseaddress_telephon 0x72660000) +set(baseaddress_testvdd 0x72630000) +set(baseaddress_themeui 0x72610000) +set(baseaddress_timedate 0x72590000) +set(baseaddress_traffic 0x72560000) +set(baseaddress_twain_32 0x72530000) +set(baseaddress_ubtrfs 0x72500000) +set(baseaddress_ucdfs 0x724e0000) +set(baseaddress_uext2 0x724a0000) +set(baseaddress_ufat 0x72460000) +set(baseaddress_ufatx 0x72440000) +set(baseaddress_uffs 0x72420000) +set(baseaddress_umpnpmgr 0x723e0000) +set(baseaddress_untfs 0x723c0000) +set(baseaddress_updspapi 0x72390000) +set(baseaddress_ureiserfs 0x72370000) +set(baseaddress_url 0x72340000) +set(baseaddress_usrmgr 0x722e0000) +set(baseaddress_vbscript 0x72230000) +set(baseaddress_vdmdbg 0x72200000) +set(baseaddress_verifier 0x721e0000) +set(baseaddress_vfd 0x72180000) +set(baseaddress_vssapi 0x72150000) +set(baseaddress_w32time 0x72120000) +set(baseaddress_wbemdisp 0x720d0000) +set(baseaddress_wbemprox 0x72060000) +set(baseaddress_wdmaud.drv 0x71e90000) +set(baseaddress_win32u 0x71e60000) +set(baseaddress_win32u_2k3sp2 0x71e30000) +set(baseaddress_win32u_xpsp2 0x71e00000) +set(baseaddress_windowscodecs 0x71c80000) +set(baseaddress_windowscodecsext 0x71c50000) +set(baseaddress_wined3dcfg 0x71c20000) +set(baseaddress_winemp3.acm 0x71b80000) +set(baseaddress_winfax 0x71b50000) +set(baseaddress_wing32 0x71b20000) +set(baseaddress_winhttp 0x71ab0000) +set(baseaddress_winprint 0x71a80000) +set(baseaddress_winscard 0x71a50000) +set(baseaddress_winsta 0x71a20000) +set(baseaddress_wkssvc 0x719f0000) +set(baseaddress_wlanapi 0x719c0000) +set(baseaddress_wldap32 0x71980000) +set(baseaddress_wlnotify 0x71950000) +set(baseaddress_wmi 0x71930000) +set(baseaddress_wmisvc 0x71900000) +set(baseaddress_wmiutils 0x718c0000) +set(baseaddress_wmvcore 0x71870000) +set(baseaddress_wshirda 0x71840000) +set(baseaddress_wshom 0x717f0000) +set(baseaddress_wshtcpip 0x717c0000) +set(baseaddress_wsock32 0x71790000) +set(baseaddress_wtsapi32 0x71760000) +set(baseaddress_wuapi 0x71720000) +set(baseaddress_wuauserv 0x716f0000) +set(baseaddress_xinput1_1 0x716c0000) +set(baseaddress_xinput1_2 0x71690000) +set(baseaddress_xinput1_3 0x71660000) +set(baseaddress_xinput9_1_0 0x71630000) +set(baseaddress_xmllite 0x715e0000) +set(baseaddress_xolehlp 0x715b0000) +set(baseaddress_zipfldr 0x714d0000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 251837579e0..c77f4f8e7aa 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -2,388 +2,388 @@ # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c560000) -set(baseaddress_msvcrt 0x7c440000) -set(baseaddress_advapi32 0x7c340000) -set(baseaddress_gdi32 0x7c260000) +set(baseaddress_kernel32 0x7c4f0000) +set(baseaddress_msvcrt 0x7c310000) +set(baseaddress_advapi32 0x7c1d0000) +set(baseaddress_gdi32 0x7c060000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c200000) -set(baseaddress_dnsapi 0x7c190000) -set(baseaddress_icmp 0x7c160000) -set(baseaddress_iphlpapi 0x7c100000) -set(baseaddress_ws2_32 0x7c090000) -set(baseaddress_ws2help 0x7c060000) -set(baseaddress_shlwapi 0x7bf80000) -set(baseaddress_rpcrt4 0x7be60000) -set(baseaddress_comctl32 0x7bc20000) -set(baseaddress_ole32 0x7b950000) -set(baseaddress_winspool 0x7b8e0000) -set(baseaddress_winmm 0x7b810000) -set(baseaddress_comdlg32 0x7b6e0000) -set(baseaddress_shell32 0x7ac10000) -set(baseaddress_lz32 0x7abf0000) -set(baseaddress_version 0x7abb0000) -set(baseaddress_oleaut32 0x7a960000) -set(baseaddress_setupapi 0x7a7b0000) -set(baseaddress_mpr 0x7a760000) -set(baseaddress_crypt32 0x7a5f0000) -set(baseaddress_wininet 0x7a4f0000) -set(baseaddress_urlmon 0x7a380000) -set(baseaddress_psapi 0x7a340000) -set(baseaddress_imm32 0x7a2f0000) -set(baseaddress_msvfw32 0x7a2a0000) -set(baseaddress_dbghelp 0x7a1a0000) -set(baseaddress_devmgr 0x7a080000) -set(baseaddress_msacm32 0x7a030000) -set(baseaddress_netapi32 0x79f60000) -set(baseaddress_powrprof 0x79f20000) -set(baseaddress_secur32 0x79eb0000) -set(baseaddress_wintrust 0x79e40000) -set(baseaddress_avicap32 0x79e10000) -set(baseaddress_cabinet 0x79db0000) -set(baseaddress_dsound 0x79d10000) -set(baseaddress_glu32 0x79bc0000) -set(baseaddress_opengl32 0x79a80000) -set(baseaddress_riched20 0x79990000) -set(baseaddress_smdll 0x79970000) -set(baseaddress_userenv 0x79910000) -set(baseaddress_uxtheme 0x79890000) -set(baseaddress_cryptui 0x797d0000) -set(baseaddress_csrsrv 0x79790000) -set(baseaddress_basesrv 0x79750000) -set(baseaddress_winsrv 0x79680000) -set(baseaddress_dplayx 0x795f0000) -set(baseaddress_gdiplus 0x794b0000) -set(baseaddress_msimg32 0x79480000) -set(baseaddress_mswsock 0x79440000) -set(baseaddress_oledlg 0x793e0000) -set(baseaddress_rasapi32 0x793a0000) -set(baseaddress_rsaenh 0x79320000) -set(baseaddress_samlib 0x792d0000) -set(baseaddress_sensapi 0x792a0000) -set(baseaddress_sfc_os 0x79270000) -set(baseaddress_snmpapi 0x79230000) -set(baseaddress_spoolss 0x791e0000) -set(baseaddress_usp10 0x79140000) -set(baseaddress_access 0x790b0000) -set(baseaddress_acgenral 0x79080000) -set(baseaddress_aclayers 0x79040000) -set(baseaddress_acledit 0x79010000) -set(baseaddress_aclui 0x78fc0000) -set(baseaddress_acppage 0x78f20000) -set(baseaddress_activeds 0x78ef0000) -set(baseaddress_actxprxy 0x78c00000) -set(baseaddress_advapi32_vista 0x78bd0000) -set(baseaddress_advpack 0x78b80000) -set(baseaddress_amstream 0x78b10000) -set(baseaddress_apphelp 0x78ab0000) -set(baseaddress_appwiz 0x78a20000) -set(baseaddress_atl 0x789c0000) -set(baseaddress_atl100 0x78970000) -set(baseaddress_atl80 0x78910000) -set(baseaddress_authz 0x788e0000) -set(baseaddress_avifil32 0x78850000) -set(baseaddress_batt 0x78820000) -set(baseaddress_bcrypt 0x787e0000) -set(baseaddress_beepmidi 0x787b0000) -set(baseaddress_browseui 0x78510000) -set(baseaddress_bthci 0x784e0000) -set(baseaddress_cards 0x78410000) -set(baseaddress_cfgmgr32 0x783e0000) -set(baseaddress_clusapi 0x783a0000) -set(baseaddress_cmicpl 0x78360000) -set(baseaddress_comcat 0x78330000) -set(baseaddress_compstui 0x78300000) -set(baseaddress_console 0x78290000) -set(baseaddress_credui 0x78240000) -set(baseaddress_crtdll 0x781c0000) -set(baseaddress_cryptdlg 0x78180000) -set(baseaddress_cryptdll 0x78150000) -set(baseaddress_cryptext 0x78120000) -set(baseaddress_cryptnet 0x780e0000) -set(baseaddress_custom 0x780b0000) -set(baseaddress_d3d8 0x78030000) -set(baseaddress_d3d8thk 0x78010000) -set(baseaddress_d3d9 0x77f70000) -set(baseaddress_d3dcompiler_43 0x77e80000) -set(baseaddress_d3drm 0x77db0000) -set(baseaddress_d3dwine 0x77740000) -set(baseaddress_d3dx9_24 0x77710000) -set(baseaddress_d3dx9_25 0x776c0000) -set(baseaddress_d3dx9_26 0x77690000) -set(baseaddress_d3dx9_27 0x77660000) -set(baseaddress_d3dx9_28 0x77630000) -set(baseaddress_d3dx9_29 0x77600000) -set(baseaddress_d3dx9_30 0x775c0000) -set(baseaddress_d3dx9_31 0x77590000) -set(baseaddress_d3dx9_32 0x77560000) -set(baseaddress_d3dx9_33 0x77530000) -set(baseaddress_d3dx9_34 0x77500000) -set(baseaddress_d3dx9_35 0x774d0000) -set(baseaddress_d3dx9_36 0x77370000) -set(baseaddress_d3dx9_37 0x77340000) -set(baseaddress_d3dx9_38 0x77310000) -set(baseaddress_d3dx9_39 0x772e0000) -set(baseaddress_d3dx9_40 0x772b0000) -set(baseaddress_d3dx9_41 0x77280000) -set(baseaddress_d3dx9_42 0x77250000) -set(baseaddress_d3dx9_43 0x77220000) -set(baseaddress_d3dxof 0x771d0000) -set(baseaddress_dciman32 0x771a0000) -set(baseaddress_dcomlaunch 0x77170000) -set(baseaddress_ddraw 0x77070000) -set(baseaddress_desk 0x76fb0000) -set(baseaddress_deskadp 0x76f70000) -set(baseaddress_deskmon 0x76f30000) -set(baseaddress_devcpux 0x76f00000) -set(baseaddress_devenum 0x76ea0000) -set(baseaddress_dinput 0x76e20000) -set(baseaddress_dinput8 0x76da0000) -set(baseaddress_dmusic 0x76d30000) -set(baseaddress_dnsrslvr 0x76d00000) -set(baseaddress_dplay 0x76cd0000) -set(baseaddress_dpnhpast 0x76ca0000) -set(baseaddress_dxdiagn 0x76c40000) -set(baseaddress_dxtn 0x76c10000) -set(baseaddress_esent 0x76bd0000) -set(baseaddress_faultrep 0x76ba0000) -set(baseaddress_fltlib 0x76b70000) -set(baseaddress_fmifs 0x76b40000) -set(baseaddress_fontext 0x76aa0000) -set(baseaddress_fontsub 0x76a70000) -set(baseaddress_framedyn 0x76a20000) -set(baseaddress_getuname 0x75fb0000) -set(baseaddress_halxbox 0x75e00000) -set(baseaddress_hdwwiz 0x75d80000) -set(baseaddress_hhctrl 0x75d10000) -set(baseaddress_hid 0x75cd0000) -set(baseaddress_hlink 0x75c80000) -set(baseaddress_hnetcfg 0x75c20000) -set(baseaddress_httpapi 0x75be0000) -set(baseaddress_iccvid 0x75ba0000) -set(baseaddress_ieframe 0x75a60000) -set(baseaddress_iernonce 0x75a20000) -set(baseaddress_imaadp32.acm 0x759e0000) -set(baseaddress_imagehlp 0x759a0000) -set(baseaddress_inetcomm 0x75910000) -set(baseaddress_inetcpl 0x758a0000) -set(baseaddress_inetmib1 0x75860000) -set(baseaddress_initpki 0x75830000) -set(baseaddress_input 0x757c0000) -set(baseaddress_inseng 0x75770000) -set(baseaddress_intl 0x756f0000) -set(baseaddress_iologmsg 0x756d0000) -set(baseaddress_itircl 0x756a0000) -set(baseaddress_itss 0x75640000) -set(baseaddress_joy 0x755f0000) -set(baseaddress_jscript 0x75450000) -set(baseaddress_jsproxy 0x75410000) -set(baseaddress_kbdeo 0x753f0000) -set(baseaddress_kbdrost 0x753d0000) -set(baseaddress_kbsdll 0x753a0000) -set(baseaddress_kernel32_vista 0x75370000) -set(baseaddress_ksuser 0x75340000) -set(baseaddress_libjpeg 0x75280000) -set(baseaddress_libpng 0x751d0000) -set(baseaddress_libtiff 0x750d0000) -set(baseaddress_libtirpc 0x75050000) -set(baseaddress_libxslt 0x74cd0000) -set(baseaddress_load_notifications 0x74ca0000) -set(baseaddress_loadperf 0x74c70000) -set(baseaddress_localmon 0x74c30000) -set(baseaddress_localspl 0x74bd0000) -set(baseaddress_localspl_apitest 0x74ba0000) -set(baseaddress_localui 0x74b60000) -set(baseaddress_lpk 0x74b20000) -set(baseaddress_lsasrv 0x74a80000) -set(baseaddress_main 0x749e0000) -set(baseaddress_mapi32 0x74980000) -set(baseaddress_mbedtls 0x748b0000) -set(baseaddress_mciavi32 0x74860000) -set(baseaddress_mcicda 0x74820000) -set(baseaddress_mciqtz32 0x747d0000) -set(baseaddress_mciseq 0x74790000) -set(baseaddress_mciwave 0x74750000) -set(baseaddress_mgmtapi 0x74720000) -set(baseaddress_midimap 0x746e0000) -set(baseaddress_mlang 0x74690000) -set(baseaddress_mmdrv 0x74660000) -set(baseaddress_mmsys 0x74570000) -set(baseaddress_modemui 0x744f0000) -set(baseaddress_mprapi 0x744b0000) -set(baseaddress_msacm32.drv 0x74470000) -set(baseaddress_msadp32.acm 0x74440000) -set(baseaddress_msafd 0x743f0000) -set(baseaddress_mscat32 0x743c0000) -set(baseaddress_mscms 0x74380000) -set(baseaddress_mscoree 0x74310000) -set(baseaddress_msctf 0x74290000) -set(baseaddress_msdmo 0x74250000) -set(baseaddress_msftedit 0x74220000) -set(baseaddress_msg711.acm 0x741f0000) -set(baseaddress_msgina 0x74130000) -set(baseaddress_msgsm32.acm 0x74100000) -set(baseaddress_mshtml 0x73c50000) -set(baseaddress_msi 0x739d0000) -set(baseaddress_msimtf 0x73990000) -set(baseaddress_msisip 0x73960000) -set(baseaddress_msisys 0x73930000) -set(baseaddress_mspatcha 0x738f0000) -set(baseaddress_msports 0x738b0000) -set(baseaddress_msrle32 0x73870000) -set(baseaddress_mssign32 0x73840000) -set(baseaddress_mssip32 0x73810000) -set(baseaddress_mstask 0x737c0000) -set(baseaddress_msv1_0 0x73790000) -set(baseaddress_msvcrt20 0x73660000) -set(baseaddress_msvcrt40 0x73520000) -set(baseaddress_msvcrt_crt_dll_startup 0x734f0000) -set(baseaddress_msvidc32 0x734b0000) -set(baseaddress_msxml 0x73470000) -set(baseaddress_msxml2 0x73430000) -set(baseaddress_msxml3 0x72f10000) -set(baseaddress_msxml3r 0x72ef0000) -set(baseaddress_msxml4 0x72ea0000) -set(baseaddress_msxml6 0x72e50000) -set(baseaddress_mycomput 0x72e30000) -set(baseaddress_ncpa 0x72e00000) -set(baseaddress_nddeapi 0x72dc0000) -set(baseaddress_netcfgx 0x72d00000) -set(baseaddress_netevent 0x72cd0000) -set(baseaddress_netid 0x72c80000) -set(baseaddress_netlogon 0x72c40000) -set(baseaddress_netmsg 0x72ac0000) -set(baseaddress_netplwiz 0x72a90000) -set(baseaddress_netshell 0x729a0000) -set(baseaddress_newdev 0x72930000) -set(baseaddress_nfs41_np 0x72900000) -set(baseaddress_normaliz 0x728d0000) -set(baseaddress_notifyhook 0x728a0000) -set(baseaddress_npptools 0x72870000) -set(baseaddress_ntdll_vista 0x72840000) -set(baseaddress_ntdsapi 0x72800000) -set(baseaddress_ntlanman 0x727d0000) -set(baseaddress_ntmarta 0x727a0000) -set(baseaddress_ntobjshex 0x726c0000) -set(baseaddress_objsel 0x72680000) -set(baseaddress_odbc32 0x72620000) -set(baseaddress_odbccp32 0x725e0000) -set(baseaddress_odbccp32i 0x725b0000) -set(baseaddress_oleacc 0x72500000) -set(baseaddress_olecli32 0x724c0000) -set(baseaddress_olepro32 0x72490000) -set(baseaddress_olesvr32 0x72460000) -set(baseaddress_olethk32 0x72430000) -set(baseaddress_openglcfg 0x723f0000) -set(baseaddress_pdh 0x723a0000) -set(baseaddress_pidgen 0x72370000) -set(baseaddress_pifmgr 0x72300000) -set(baseaddress_powercfg 0x72290000) -set(baseaddress_printui 0x72250000) -set(baseaddress_propsys 0x72200000) -set(baseaddress_pstorec 0x721c0000) -set(baseaddress_qedit 0x72150000) -set(baseaddress_qmgr 0x72100000) -set(baseaddress_qmgrprxy 0x72080000) -set(baseaddress_quartz 0x71e60000) -set(baseaddress_query 0x71e30000) -set(baseaddress_rasadhlp 0x71e00000) -set(baseaddress_rasdlg 0x71c20000) -set(baseaddress_rasman 0x71be0000) -set(baseaddress_redirtest1 0x71bb0000) -set(baseaddress_redirtest2 0x71b80000) -set(baseaddress_resutils 0x71b40000) -set(baseaddress_riched32 0x71b10000) -set(baseaddress_rsabase 0x71af0000) -set(baseaddress_rshell 0x719f0000) -set(baseaddress_samsrv 0x71960000) -set(baseaddress_sccbase 0x71930000) -set(baseaddress_schannel 0x718e0000) -set(baseaddress_schedsvc 0x718a0000) -set(baseaddress_scrrun 0x71830000) -set(baseaddress_security 0x71810000) -set(baseaddress_sendmail 0x717a0000) -set(baseaddress_serialui 0x71770000) -set(baseaddress_sfc 0x71740000) -set(baseaddress_shdoclc 0x71700000) -set(baseaddress_shdocvw 0x716a0000) -set(baseaddress_shellbtrfs 0x71490000) -set(baseaddress_shfolder 0x71470000) -set(baseaddress_shimgvw 0x71420000) -set(baseaddress_shsvcs 0x713e0000) -set(baseaddress_slbcsp 0x713b0000) -set(baseaddress_sndblst 0x71370000) -set(baseaddress_softpub 0x71350000) -set(baseaddress_srclient 0x71320000) -set(baseaddress_srvsvc 0x712e0000) -set(baseaddress_sti 0x71290000) -set(baseaddress_stobject 0x711d0000) -set(baseaddress_streamci 0x711a0000) -set(baseaddress_sxs 0x71160000) -set(baseaddress_sysdm 0x71050000) -set(baseaddress_syssetup 0x70f10000) -set(baseaddress_t2embed 0x70ee0000) -set(baseaddress_tapi32 0x70e90000) -set(baseaddress_tapiui 0x70e10000) -set(baseaddress_telephon 0x70de0000) -set(baseaddress_testvdd 0x70db0000) -set(baseaddress_themeui 0x70d90000) -set(baseaddress_timedate 0x70d10000) -set(baseaddress_traffic 0x70ce0000) -set(baseaddress_twain_32 0x70ca0000) -set(baseaddress_ubtrfs 0x70c70000) -set(baseaddress_ucdfs 0x70c50000) -set(baseaddress_uext2 0x70c10000) -set(baseaddress_ufat 0x70bd0000) -set(baseaddress_ufatx 0x70ba0000) -set(baseaddress_uffs 0x70b80000) -set(baseaddress_umpnpmgr 0x70b40000) -set(baseaddress_untfs 0x70b20000) -set(baseaddress_updspapi 0x70af0000) -set(baseaddress_ureiserfs 0x70ad0000) -set(baseaddress_url 0x70aa0000) -set(baseaddress_usrmgr 0x70a40000) -set(baseaddress_vbscript 0x70960000) -set(baseaddress_vdmdbg 0x70930000) -set(baseaddress_verifier 0x70900000) -set(baseaddress_vfd 0x70890000) -set(baseaddress_vssapi 0x70850000) -set(baseaddress_w32time 0x70820000) -set(baseaddress_wbemdisp 0x707c0000) -set(baseaddress_wbemprox 0x70720000) -set(baseaddress_wdmaud.drv 0x70550000) -set(baseaddress_win32u 0x70520000) -set(baseaddress_win32u_2k3sp2 0x704f0000) -set(baseaddress_win32u_xpsp2 0x704c0000) -set(baseaddress_windowscodecs 0x702e0000) -set(baseaddress_windowscodecsext 0x702a0000) -set(baseaddress_wined3dcfg 0x70260000) -set(baseaddress_winemp3.acm 0x701c0000) -set(baseaddress_winfax 0x70190000) -set(baseaddress_wing32 0x70160000) -set(baseaddress_winhttp 0x700e0000) -set(baseaddress_winprint 0x700b0000) -set(baseaddress_winscard 0x70070000) -set(baseaddress_winsta 0x70030000) -set(baseaddress_wkssvc 0x6fff0000) -set(baseaddress_wlanapi 0x6ffb0000) -set(baseaddress_wldap32 0x6ff50000) -set(baseaddress_wlnotify 0x6ff20000) -set(baseaddress_wmi 0x6ff00000) -set(baseaddress_wmisvc 0x6fed0000) -set(baseaddress_wmiutils 0x6fe80000) -set(baseaddress_wmvcore 0x6fe20000) -set(baseaddress_wshirda 0x6fdf0000) -set(baseaddress_wshom 0x6fd90000) -set(baseaddress_wshtcpip 0x6fd60000) -set(baseaddress_wsock32 0x6fd30000) -set(baseaddress_wtsapi32 0x6fcf0000) -set(baseaddress_wuapi 0x6fca0000) -set(baseaddress_wuauserv 0x6fc70000) -set(baseaddress_xinput1_1 0x6fc40000) -set(baseaddress_xinput1_2 0x6fc10000) -set(baseaddress_xinput1_3 0x6fbe0000) -set(baseaddress_xinput9_1_0 0x6fbb0000) -set(baseaddress_xmllite 0x6fb50000) -set(baseaddress_xolehlp 0x6fb10000) -set(baseaddress_zipfldr 0x6f9b0000) +set(baseaddress_dhcpcsvc 0x7bff0000) +set(baseaddress_dnsapi 0x7bf40000) +set(baseaddress_icmp 0x7bf10000) +set(baseaddress_iphlpapi 0x7be90000) +set(baseaddress_ws2_32 0x7be00000) +set(baseaddress_ws2help 0x7bdc0000) +set(baseaddress_shlwapi 0x7bc80000) +set(baseaddress_rpcrt4 0x7bb10000) +set(baseaddress_comctl32 0x7b850000) +set(baseaddress_ole32 0x7b4a0000) +set(baseaddress_winspool 0x7b400000) +set(baseaddress_winmm 0x7b320000) +set(baseaddress_comdlg32 0x7b1a0000) +set(baseaddress_shell32 0x7a3a0000) +set(baseaddress_lz32 0x7a380000) +set(baseaddress_version 0x7a340000) +set(baseaddress_oleaut32 0x7a050000) +set(baseaddress_setupapi 0x79df0000) +set(baseaddress_mpr 0x79d90000) +set(baseaddress_crypt32 0x79be0000) +set(baseaddress_wininet 0x79aa0000) +set(baseaddress_urlmon 0x798a0000) +set(baseaddress_psapi 0x79860000) +set(baseaddress_imm32 0x79800000) +set(baseaddress_msvfw32 0x79790000) +set(baseaddress_dbghelp 0x79640000) +set(baseaddress_devmgr 0x794c0000) +set(baseaddress_msacm32 0x79460000) +set(baseaddress_netapi32 0x79360000) +set(baseaddress_powrprof 0x79320000) +set(baseaddress_secur32 0x792a0000) +set(baseaddress_wintrust 0x79210000) +set(baseaddress_avicap32 0x791d0000) +set(baseaddress_cabinet 0x79160000) +set(baseaddress_dsound 0x79080000) +set(baseaddress_glu32 0x78ee0000) +set(baseaddress_opengl32 0x78d50000) +set(baseaddress_riched20 0x78c10000) +set(baseaddress_smdll 0x78be0000) +set(baseaddress_userenv 0x78b50000) +set(baseaddress_uxtheme 0x78ac0000) +set(baseaddress_cryptui 0x789f0000) +set(baseaddress_csrsrv 0x789a0000) +set(baseaddress_basesrv 0x78960000) +set(baseaddress_winsrv 0x78860000) +set(baseaddress_dplayx 0x787a0000) +set(baseaddress_gdiplus 0x785f0000) +set(baseaddress_msimg32 0x785b0000) +set(baseaddress_mswsock 0x78570000) +set(baseaddress_oledlg 0x78500000) +set(baseaddress_rasapi32 0x784b0000) +set(baseaddress_rsaenh 0x78410000) +set(baseaddress_samlib 0x783b0000) +set(baseaddress_sensapi 0x78370000) +set(baseaddress_sfc_os 0x78340000) +set(baseaddress_snmpapi 0x78300000) +set(baseaddress_spoolss 0x782a0000) +set(baseaddress_usp10 0x781f0000) +set(baseaddress_access 0x78150000) +set(baseaddress_acgenral 0x78120000) +set(baseaddress_aclayers 0x780e0000) +set(baseaddress_acledit 0x780b0000) +set(baseaddress_aclui 0x78050000) +set(baseaddress_acppage 0x77f90000) +set(baseaddress_activeds 0x77f50000) +set(baseaddress_actxprxy 0x77640000) +set(baseaddress_advapi32_vista 0x77610000) +set(baseaddress_advpack 0x775b0000) +set(baseaddress_amstream 0x774f0000) +set(baseaddress_apphelp 0x77480000) +set(baseaddress_appwiz 0x773d0000) +set(baseaddress_atl 0x77350000) +set(baseaddress_atl100 0x772e0000) +set(baseaddress_atl80 0x77270000) +set(baseaddress_authz 0x77230000) +set(baseaddress_avifil32 0x77160000) +set(baseaddress_batt 0x77130000) +set(baseaddress_bcrypt 0x770f0000) +set(baseaddress_beepmidi 0x770c0000) +set(baseaddress_browseui 0x76cd0000) +set(baseaddress_bthci 0x76c90000) +set(baseaddress_cards 0x76bc0000) +set(baseaddress_cfgmgr32 0x76b80000) +set(baseaddress_clusapi 0x76b40000) +set(baseaddress_cmicpl 0x76af0000) +set(baseaddress_comcat 0x76ac0000) +set(baseaddress_compstui 0x76a80000) +set(baseaddress_console 0x76a10000) +set(baseaddress_credui 0x769b0000) +set(baseaddress_crtdll 0x76910000) +set(baseaddress_cryptdlg 0x768c0000) +set(baseaddress_cryptdll 0x76880000) +set(baseaddress_cryptext 0x76840000) +set(baseaddress_cryptnet 0x767f0000) +set(baseaddress_custom 0x767b0000) +set(baseaddress_d3d8 0x76710000) +set(baseaddress_d3d8thk 0x766f0000) +set(baseaddress_d3d9 0x76630000) +set(baseaddress_d3dcompiler_43 0x76500000) +set(baseaddress_d3drm 0x763e0000) +set(baseaddress_d3dwine 0x76060000) +set(baseaddress_d3dx9_24 0x76020000) +set(baseaddress_d3dx9_25 0x75fd0000) +set(baseaddress_d3dx9_26 0x75f90000) +set(baseaddress_d3dx9_27 0x75f50000) +set(baseaddress_d3dx9_28 0x75f10000) +set(baseaddress_d3dx9_29 0x75ed0000) +set(baseaddress_d3dx9_30 0x75e90000) +set(baseaddress_d3dx9_31 0x75e50000) +set(baseaddress_d3dx9_32 0x75e10000) +set(baseaddress_d3dx9_33 0x75dd0000) +set(baseaddress_d3dx9_34 0x75d90000) +set(baseaddress_d3dx9_35 0x75d50000) +set(baseaddress_d3dx9_36 0x75b80000) +set(baseaddress_d3dx9_37 0x75b40000) +set(baseaddress_d3dx9_38 0x75b00000) +set(baseaddress_d3dx9_39 0x75ac0000) +set(baseaddress_d3dx9_40 0x75a80000) +set(baseaddress_d3dx9_41 0x75a40000) +set(baseaddress_d3dx9_42 0x75a00000) +set(baseaddress_d3dx9_43 0x759c0000) +set(baseaddress_d3dxof 0x75950000) +set(baseaddress_dciman32 0x75910000) +set(baseaddress_dcomlaunch 0x758e0000) +set(baseaddress_ddraw 0x757a0000) +set(baseaddress_desk 0x75650000) +set(baseaddress_deskadp 0x75600000) +set(baseaddress_deskmon 0x755b0000) +set(baseaddress_devcpux 0x75580000) +set(baseaddress_devenum 0x75500000) +set(baseaddress_dinput 0x75450000) +set(baseaddress_dinput8 0x753a0000) +set(baseaddress_dmusic 0x75310000) +set(baseaddress_dnsrslvr 0x752d0000) +set(baseaddress_dplay 0x752a0000) +set(baseaddress_dpnhpast 0x75260000) +set(baseaddress_dxdiagn 0x751e0000) +set(baseaddress_dxtn 0x751b0000) +set(baseaddress_esent 0x75170000) +set(baseaddress_faultrep 0x75130000) +set(baseaddress_fltlib 0x750f0000) +set(baseaddress_fmifs 0x750c0000) +set(baseaddress_fontext 0x74fe0000) +set(baseaddress_fontsub 0x74fa0000) +set(baseaddress_framedyn 0x74f50000) +set(baseaddress_getuname 0x744d0000) +set(baseaddress_halxbox 0x742c0000) +set(baseaddress_hdwwiz 0x74230000) +set(baseaddress_hhctrl 0x74190000) +set(baseaddress_hid 0x74140000) +set(baseaddress_hlink 0x740d0000) +set(baseaddress_hnetcfg 0x74050000) +set(baseaddress_httpapi 0x74000000) +set(baseaddress_iccvid 0x73fc0000) +set(baseaddress_ieframe 0x73dd0000) +set(baseaddress_iernonce 0x73d90000) +set(baseaddress_imaadp32.acm 0x73d50000) +set(baseaddress_imagehlp 0x73d00000) +set(baseaddress_inetcomm 0x73c30000) +set(baseaddress_inetcpl 0x73bb0000) +set(baseaddress_inetmib1 0x73b70000) +set(baseaddress_initpki 0x73b30000) +set(baseaddress_input 0x73ab0000) +set(baseaddress_inseng 0x73a40000) +set(baseaddress_intl 0x739b0000) +set(baseaddress_iologmsg 0x73990000) +set(baseaddress_itircl 0x73950000) +set(baseaddress_itss 0x738e0000) +set(baseaddress_joy 0x73890000) +set(baseaddress_jscript 0x735b0000) +set(baseaddress_jsproxy 0x73560000) +set(baseaddress_kbdeo 0x73540000) +set(baseaddress_kbdrost 0x73520000) +set(baseaddress_kbsdll 0x734f0000) +set(baseaddress_kernel32_vista 0x734c0000) +set(baseaddress_ksuser 0x73490000) +set(baseaddress_libjpeg 0x733a0000) +set(baseaddress_libpng 0x732b0000) +set(baseaddress_libtiff 0x73130000) +set(baseaddress_libtirpc 0x72fe0000) +set(baseaddress_libxslt 0x72ba0000) +set(baseaddress_load_notifications 0x72b70000) +set(baseaddress_loadperf 0x72b30000) +set(baseaddress_localmon 0x72ae0000) +set(baseaddress_localspl 0x72a60000) +set(baseaddress_localspl_apitest 0x72a20000) +set(baseaddress_localui 0x729e0000) +set(baseaddress_lpk 0x72990000) +set(baseaddress_lsasrv 0x728d0000) +set(baseaddress_main 0x72810000) +set(baseaddress_mapi32 0x727a0000) +set(baseaddress_mbedtls 0x72690000) +set(baseaddress_mciavi32 0x72630000) +set(baseaddress_mcicda 0x725f0000) +set(baseaddress_mciqtz32 0x72590000) +set(baseaddress_mciseq 0x72550000) +set(baseaddress_mciwave 0x72500000) +set(baseaddress_mgmtapi 0x724c0000) +set(baseaddress_midimap 0x72480000) +set(baseaddress_mlang 0x72420000) +set(baseaddress_mmdrv 0x723e0000) +set(baseaddress_mmsys 0x722f0000) +set(baseaddress_modemui 0x72270000) +set(baseaddress_mprapi 0x72230000) +set(baseaddress_msacm32.drv 0x721f0000) +set(baseaddress_msadp32.acm 0x721b0000) +set(baseaddress_msafd 0x72150000) +set(baseaddress_mscat32 0x72110000) +set(baseaddress_mscms 0x720c0000) +set(baseaddress_mscoree 0x72020000) +set(baseaddress_msctf 0x71f60000) +set(baseaddress_msdmo 0x71f10000) +set(baseaddress_msftedit 0x71ed0000) +set(baseaddress_msg711.acm 0x71e90000) +set(baseaddress_msgina 0x71dc0000) +set(baseaddress_msgsm32.acm 0x71d80000) +set(baseaddress_mshtml 0x715b0000) +set(baseaddress_msi 0x71240000) +set(baseaddress_msimtf 0x711f0000) +set(baseaddress_msisip 0x711b0000) +set(baseaddress_msisys 0x71170000) +set(baseaddress_mspatcha 0x71130000) +set(baseaddress_msports 0x710e0000) +set(baseaddress_msrle32 0x71090000) +set(baseaddress_mssign32 0x71050000) +set(baseaddress_mssip32 0x71010000) +set(baseaddress_mstask 0x70fb0000) +set(baseaddress_msv1_0 0x70f70000) +set(baseaddress_msvcrt20 0x70d80000) +set(baseaddress_msvcrt40 0x70b90000) +set(baseaddress_msvcrt_crt_dll_startup 0x70b60000) +set(baseaddress_msvidc32 0x70b20000) +set(baseaddress_msxml 0x70ae0000) +set(baseaddress_msxml2 0x70aa0000) +set(baseaddress_msxml3 0x70430000) +set(baseaddress_msxml3r 0x70410000) +set(baseaddress_msxml4 0x703c0000) +set(baseaddress_msxml6 0x70370000) +set(baseaddress_mycomput 0x70350000) +set(baseaddress_ncpa 0x70320000) +set(baseaddress_nddeapi 0x702e0000) +set(baseaddress_netcfgx 0x701f0000) +set(baseaddress_netevent 0x701c0000) +set(baseaddress_netid 0x70160000) +set(baseaddress_netlogon 0x70110000) +set(baseaddress_netmsg 0x6ff90000) +set(baseaddress_netplwiz 0x6ff50000) +set(baseaddress_netshell 0x6fe10000) +set(baseaddress_newdev 0x6fd90000) +set(baseaddress_nfs41_np 0x6fd50000) +set(baseaddress_normaliz 0x6fd20000) +set(baseaddress_notifyhook 0x6fce0000) +set(baseaddress_npptools 0x6fca0000) +set(baseaddress_ntdll_vista 0x6fc70000) +set(baseaddress_ntdsapi 0x6fc30000) +set(baseaddress_ntlanman 0x6fbf0000) +set(baseaddress_ntmarta 0x6fbb0000) +set(baseaddress_ntobjshex 0x6faa0000) +set(baseaddress_objsel 0x6fa50000) +set(baseaddress_odbc32 0x6f9e0000) +set(baseaddress_odbccp32 0x6f990000) +set(baseaddress_odbccp32i 0x6f960000) +set(baseaddress_oleacc 0x6f890000) +set(baseaddress_olecli32 0x6f850000) +set(baseaddress_olepro32 0x6f810000) +set(baseaddress_olesvr32 0x6f7d0000) +set(baseaddress_olethk32 0x6f790000) +set(baseaddress_openglcfg 0x6f750000) +set(baseaddress_pdh 0x6f700000) +set(baseaddress_pidgen 0x6f6c0000) +set(baseaddress_pifmgr 0x6f650000) +set(baseaddress_powercfg 0x6f5b0000) +set(baseaddress_printui 0x6f570000) +set(baseaddress_propsys 0x6f500000) +set(baseaddress_pstorec 0x6f4c0000) +set(baseaddress_qedit 0x6f420000) +set(baseaddress_qmgr 0x6f3b0000) +set(baseaddress_qmgrprxy 0x6f310000) +set(baseaddress_quartz 0x6ef90000) +set(baseaddress_query 0x6ef50000) +set(baseaddress_rasadhlp 0x6ef20000) +set(baseaddress_rasdlg 0x6ed40000) +set(baseaddress_rasman 0x6ecf0000) +set(baseaddress_redirtest1 0x6ecc0000) +set(baseaddress_redirtest2 0x6ec90000) +set(baseaddress_resutils 0x6ec50000) +set(baseaddress_riched32 0x6ec10000) +set(baseaddress_rsabase 0x6ebf0000) +set(baseaddress_rshell 0x6ea40000) +set(baseaddress_samsrv 0x6e990000) +set(baseaddress_sccbase 0x6e950000) +set(baseaddress_schannel 0x6e8f0000) +set(baseaddress_schedsvc 0x6e8b0000) +set(baseaddress_scrrun 0x6e820000) +set(baseaddress_security 0x6e800000) +set(baseaddress_sendmail 0x6e780000) +set(baseaddress_serialui 0x6e740000) +set(baseaddress_sfc 0x6e710000) +set(baseaddress_shdoclc 0x6e6d0000) +set(baseaddress_shdocvw 0x6e660000) +set(baseaddress_shellbtrfs 0x6e2d0000) +set(baseaddress_shfolder 0x6e2b0000) +set(baseaddress_shimgvw 0x6e250000) +set(baseaddress_shsvcs 0x6e210000) +set(baseaddress_slbcsp 0x6e1d0000) +set(baseaddress_sndblst 0x6e180000) +set(baseaddress_softpub 0x6e160000) +set(baseaddress_srclient 0x6e130000) +set(baseaddress_srvsvc 0x6e0e0000) +set(baseaddress_sti 0x6e080000) +set(baseaddress_stobject 0x6df90000) +set(baseaddress_streamci 0x6df50000) +set(baseaddress_sxs 0x6df00000) +set(baseaddress_sysdm 0x6dd90000) +set(baseaddress_syssetup 0x6dc30000) +set(baseaddress_t2embed 0x6dbf0000) +set(baseaddress_tapi32 0x6db90000) +set(baseaddress_tapiui 0x6db10000) +set(baseaddress_telephon 0x6dad0000) +set(baseaddress_testvdd 0x6da90000) +set(baseaddress_themeui 0x6da70000) +set(baseaddress_timedate 0x6d9f0000) +set(baseaddress_traffic 0x6d9b0000) +set(baseaddress_twain_32 0x6d970000) +set(baseaddress_ubtrfs 0x6d940000) +set(baseaddress_ucdfs 0x6d920000) +set(baseaddress_uext2 0x6d8d0000) +set(baseaddress_ufat 0x6d880000) +set(baseaddress_ufatx 0x6d850000) +set(baseaddress_uffs 0x6d830000) +set(baseaddress_umpnpmgr 0x6d7d0000) +set(baseaddress_untfs 0x6d7b0000) +set(baseaddress_updspapi 0x6d770000) +set(baseaddress_ureiserfs 0x6d750000) +set(baseaddress_url 0x6d710000) +set(baseaddress_usrmgr 0x6d6a0000) +set(baseaddress_vbscript 0x6d590000) +set(baseaddress_vdmdbg 0x6d560000) +set(baseaddress_verifier 0x6d530000) +set(baseaddress_vfd 0x6d490000) +set(baseaddress_vssapi 0x6d450000) +set(baseaddress_w32time 0x6d410000) +set(baseaddress_wbemdisp 0x6d3a0000) +set(baseaddress_wbemprox 0x6d2d0000) +set(baseaddress_wdmaud.drv 0x6d0c0000) +set(baseaddress_win32u 0x6d090000) +set(baseaddress_win32u_2k3sp2 0x6d060000) +set(baseaddress_win32u_xpsp2 0x6d030000) +set(baseaddress_windowscodecs 0x6cd80000) +set(baseaddress_windowscodecsext 0x6cd40000) +set(baseaddress_wined3dcfg 0x6cd00000) +set(baseaddress_winemp3.acm 0x6cc30000) +set(baseaddress_winfax 0x6cbf0000) +set(baseaddress_wing32 0x6cbc0000) +set(baseaddress_winhttp 0x6cb10000) +set(baseaddress_winprint 0x6cad0000) +set(baseaddress_winscard 0x6ca90000) +set(baseaddress_winsta 0x6ca40000) +set(baseaddress_wkssvc 0x6ca00000) +set(baseaddress_wlanapi 0x6c9b0000) +set(baseaddress_wldap32 0x6c950000) +set(baseaddress_wlnotify 0x6c910000) +set(baseaddress_wmi 0x6c8f0000) +set(baseaddress_wmisvc 0x6c8c0000) +set(baseaddress_wmiutils 0x6c870000) +set(baseaddress_wmvcore 0x6c7f0000) +set(baseaddress_wshirda 0x6c7c0000) +set(baseaddress_wshom 0x6c750000) +set(baseaddress_wshtcpip 0x6c710000) +set(baseaddress_wsock32 0x6c6e0000) +set(baseaddress_wtsapi32 0x6c6a0000) +set(baseaddress_wuapi 0x6c630000) +set(baseaddress_wuauserv 0x6c600000) +set(baseaddress_xinput1_1 0x6c5d0000) +set(baseaddress_xinput1_2 0x6c5a0000) +set(baseaddress_xinput1_3 0x6c560000) +set(baseaddress_xinput9_1_0 0x6c530000) +set(baseaddress_xmllite 0x6c4c0000) +set(baseaddress_xolehlp 0x6c480000) +set(baseaddress_zipfldr 0x6c2b0000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 66e69f53a0b..1e560b9dece 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -13,377 +13,377 @@ set(baseaddress_icmp 0x7c420000) set(baseaddress_iphlpapi 0x7c3e0000) set(baseaddress_ws2_32 0x7c3b0000) set(baseaddress_ws2help 0x7c390000) -set(baseaddress_shlwapi 0x7c320000) -set(baseaddress_rpcrt4 0x7c280000) -set(baseaddress_comctl32 0x7c130000) -set(baseaddress_ole32 0x7bfe0000) -set(baseaddress_winspool 0x7bfa0000) -set(baseaddress_winmm 0x7bf00000) -set(baseaddress_comdlg32 0x7be20000) -set(baseaddress_shell32 0x7b640000) -set(baseaddress_lz32 0x7b620000) -set(baseaddress_version 0x7b5f0000) -set(baseaddress_oleaut32 0x7b4c0000) -set(baseaddress_setupapi 0x7b390000) -set(baseaddress_mpr 0x7b360000) -set(baseaddress_crypt32 0x7b290000) -set(baseaddress_wininet 0x7b200000) -set(baseaddress_urlmon 0x7b150000) -set(baseaddress_psapi 0x7b130000) -set(baseaddress_imm32 0x7b100000) -set(baseaddress_msvfw32 0x7b0c0000) -set(baseaddress_dbghelp 0x7b040000) -set(baseaddress_devmgr 0x7af90000) -set(baseaddress_msacm32 0x7af50000) -set(baseaddress_netapi32 0x7aee0000) -set(baseaddress_powrprof 0x7aec0000) -set(baseaddress_secur32 0x7ae80000) -set(baseaddress_wintrust 0x7ae40000) -set(baseaddress_avicap32 0x7ae20000) -set(baseaddress_cabinet 0x7ade0000) -set(baseaddress_dsound 0x7ad80000) -set(baseaddress_glu32 0x7ad00000) -set(baseaddress_opengl32 0x7ac20000) -set(baseaddress_riched20 0x7ab90000) -set(baseaddress_smdll 0x7ab70000) -set(baseaddress_userenv 0x7ab30000) -set(baseaddress_uxtheme 0x7aae0000) -set(baseaddress_cryptui 0x7aa40000) -set(baseaddress_csrsrv 0x7aa10000) -set(baseaddress_basesrv 0x7a9e0000) -set(baseaddress_winsrv 0x7a970000) -set(baseaddress_dplayx 0x7a920000) -set(baseaddress_gdiplus 0x7a880000) -set(baseaddress_msimg32 0x7a860000) -set(baseaddress_mswsock 0x7a840000) -set(baseaddress_oledlg 0x7a800000) -set(baseaddress_rasapi32 0x7a7d0000) -set(baseaddress_rsaenh 0x7a780000) -set(baseaddress_samlib 0x7a750000) -set(baseaddress_sensapi 0x7a730000) -set(baseaddress_sfc_os 0x7a710000) -set(baseaddress_snmpapi 0x7a6f0000) -set(baseaddress_spoolss 0x7a6c0000) -set(baseaddress_usp10 0x7a660000) -set(baseaddress_access 0x7a5e0000) -set(baseaddress_acgenral 0x7a5c0000) -set(baseaddress_aclayers 0x7a5a0000) -set(baseaddress_acledit 0x7a580000) -set(baseaddress_aclui 0x7a550000) -set(baseaddress_acppage 0x7a510000) -set(baseaddress_activeds 0x7a4f0000) -set(baseaddress_actxprxy 0x7a370000) -set(baseaddress_advapi32_vista 0x7a350000) -set(baseaddress_advpack 0x7a320000) -set(baseaddress_amstream 0x7a2f0000) -set(baseaddress_apphelp 0x7a2b0000) -set(baseaddress_appwiz 0x7a240000) -set(baseaddress_atl 0x7a210000) -set(baseaddress_atl100 0x7a1e0000) -set(baseaddress_atl80 0x7a1b0000) -set(baseaddress_authz 0x7a190000) -set(baseaddress_avifil32 0x7a140000) -set(baseaddress_batt 0x7a120000) -set(baseaddress_bcrypt 0x7a0f0000) -set(baseaddress_beepmidi 0x7a0d0000) -set(baseaddress_browseui 0x79fc0000) -set(baseaddress_bthci 0x79fa0000) -set(baseaddress_cards 0x79ee0000) -set(baseaddress_cfgmgr32 0x79ec0000) -set(baseaddress_clusapi 0x79e90000) -set(baseaddress_cmicpl 0x79e60000) -set(baseaddress_comcat 0x79e40000) -set(baseaddress_compstui 0x79e20000) -set(baseaddress_console 0x79dd0000) -set(baseaddress_credui 0x79d90000) -set(baseaddress_crtdll 0x79d50000) -set(baseaddress_cryptdlg 0x79d20000) -set(baseaddress_cryptdll 0x79d00000) -set(baseaddress_cryptext 0x79ce0000) -set(baseaddress_cryptnet 0x79cb0000) -set(baseaddress_custom 0x79c90000) -set(baseaddress_d3d8 0x79c50000) -set(baseaddress_d3d8thk 0x79c30000) -set(baseaddress_d3d9 0x79be0000) -set(baseaddress_d3dcompiler_43 0x79b50000) -set(baseaddress_d3drm 0x79ae0000) -set(baseaddress_d3dwine 0x79950000) -set(baseaddress_d3dx9_24 0x79930000) -set(baseaddress_d3dx9_25 0x79900000) -set(baseaddress_d3dx9_26 0x798e0000) -set(baseaddress_d3dx9_27 0x798c0000) -set(baseaddress_d3dx9_28 0x798a0000) -set(baseaddress_d3dx9_29 0x79880000) -set(baseaddress_d3dx9_30 0x79850000) -set(baseaddress_d3dx9_31 0x79830000) -set(baseaddress_d3dx9_32 0x79810000) -set(baseaddress_d3dx9_33 0x797f0000) -set(baseaddress_d3dx9_34 0x797d0000) -set(baseaddress_d3dx9_35 0x797b0000) -set(baseaddress_d3dx9_36 0x796f0000) -set(baseaddress_d3dx9_37 0x796d0000) -set(baseaddress_d3dx9_38 0x796b0000) -set(baseaddress_d3dx9_39 0x79690000) -set(baseaddress_d3dx9_40 0x79670000) -set(baseaddress_d3dx9_41 0x79650000) -set(baseaddress_d3dx9_42 0x79630000) -set(baseaddress_d3dx9_43 0x79610000) -set(baseaddress_d3dxof 0x795e0000) -set(baseaddress_dciman32 0x795c0000) -set(baseaddress_dcomlaunch 0x795a0000) -set(baseaddress_ddraw 0x79510000) -set(baseaddress_desk 0x79480000) -set(baseaddress_deskadp 0x79450000) -set(baseaddress_deskmon 0x79420000) -set(baseaddress_devcpux 0x79400000) -set(baseaddress_devenum 0x793d0000) -set(baseaddress_dinput 0x79390000) -set(baseaddress_dinput8 0x79350000) -set(baseaddress_dmusic 0x79310000) -set(baseaddress_dnsrslvr 0x792f0000) -set(baseaddress_dplay 0x792d0000) -set(baseaddress_dpnhpast 0x792b0000) -set(baseaddress_dxdiagn 0x79280000) -set(baseaddress_dxtn 0x79260000) -set(baseaddress_esent 0x79230000) -set(baseaddress_faultrep 0x79210000) -set(baseaddress_fltlib 0x791f0000) -set(baseaddress_fmifs 0x791d0000) -set(baseaddress_fontext 0x791a0000) -set(baseaddress_fontsub 0x79180000) -set(baseaddress_framedyn 0x79160000) -set(baseaddress_getuname 0x78700000) -set(baseaddress_halxbox 0x78590000) -set(baseaddress_hdwwiz 0x78520000) -set(baseaddress_hhctrl 0x784e0000) -set(baseaddress_hid 0x784c0000) -set(baseaddress_hlink 0x78490000) -set(baseaddress_hnetcfg 0x78460000) -set(baseaddress_httpapi 0x78430000) -set(baseaddress_iccvid 0x78410000) -set(baseaddress_ieframe 0x78380000) -set(baseaddress_iernonce 0x78350000) -set(baseaddress_imaadp32.acm 0x78330000) -set(baseaddress_imagehlp 0x78300000) -set(baseaddress_inetcomm 0x782b0000) -set(baseaddress_inetcpl 0x78260000) -set(baseaddress_inetmib1 0x78240000) -set(baseaddress_initpki 0x78220000) -set(baseaddress_input 0x781c0000) -set(baseaddress_inseng 0x78190000) -set(baseaddress_intl 0x78130000) -set(baseaddress_iologmsg 0x78110000) -set(baseaddress_itircl 0x780f0000) -set(baseaddress_itss 0x780c0000) -set(baseaddress_joy 0x78080000) -set(baseaddress_jscript 0x77fd0000) -set(baseaddress_jsproxy 0x77fb0000) -set(baseaddress_kbdeo 0x77f90000) -set(baseaddress_kbdrost 0x77f70000) -set(baseaddress_kbsdll 0x77f50000) -set(baseaddress_kernel32_vista 0x77f30000) -set(baseaddress_ksuser 0x77f10000) -set(baseaddress_libjpeg 0x77eb0000) -set(baseaddress_libpng 0x77e50000) -set(baseaddress_libtiff 0x77db0000) -set(baseaddress_libtirpc 0x77d70000) -set(baseaddress_libxslt 0x77c50000) -set(baseaddress_load_notifications 0x77c30000) -set(baseaddress_loadperf 0x77c10000) -set(baseaddress_localmon 0x77bf0000) -set(baseaddress_localspl 0x77bc0000) -set(baseaddress_localspl_apitest 0x77ba0000) -set(baseaddress_localui 0x77b70000) -set(baseaddress_lpk 0x77b40000) -set(baseaddress_lsasrv 0x779c0000) -set(baseaddress_main 0x77940000) -set(baseaddress_mapi32 0x77910000) -set(baseaddress_mbedtls 0x778a0000) -set(baseaddress_mciavi32 0x77870000) -set(baseaddress_mcicda 0x77840000) -set(baseaddress_mciqtz32 0x77810000) -set(baseaddress_mciseq 0x777e0000) -set(baseaddress_mciwave 0x777b0000) -set(baseaddress_mgmtapi 0x77790000) -set(baseaddress_midimap 0x77770000) -set(baseaddress_mlang 0x77740000) -set(baseaddress_mmdrv 0x77720000) -set(baseaddress_mmsys 0x77650000) -set(baseaddress_modemui 0x775e0000) -set(baseaddress_mprapi 0x775b0000) -set(baseaddress_msacm32.drv 0x77580000) -set(baseaddress_msadp32.acm 0x77560000) -set(baseaddress_msafd 0x77530000) -set(baseaddress_mscat32 0x77510000) -set(baseaddress_mscms 0x774e0000) -set(baseaddress_mscoree 0x774a0000) -set(baseaddress_msctf 0x77460000) -set(baseaddress_msdmo 0x77440000) -set(baseaddress_msftedit 0x77420000) -set(baseaddress_msg711.acm 0x77400000) -set(baseaddress_msgina 0x77370000) -set(baseaddress_msgsm32.acm 0x77350000) -set(baseaddress_mshtml 0x771c0000) -set(baseaddress_msi 0x77080000) -set(baseaddress_msimtf 0x77060000) -set(baseaddress_msisip 0x77040000) -set(baseaddress_msisys 0x77020000) -set(baseaddress_mspatcha 0x77000000) -set(baseaddress_msports 0x76fd0000) -set(baseaddress_msrle32 0x76fa0000) -set(baseaddress_mssign32 0x76f80000) -set(baseaddress_mssip32 0x76f60000) -set(baseaddress_mstask 0x76f30000) -set(baseaddress_msv1_0 0x76f00000) -set(baseaddress_msvcrt20 0x76e70000) -set(baseaddress_msvcrt40 0x76de0000) -set(baseaddress_msvcrt_crt_dll_startup 0x76dc0000) -set(baseaddress_msvidc32 0x76da0000) -set(baseaddress_msxml 0x76d70000) -set(baseaddress_msxml2 0x76d40000) -set(baseaddress_msxml3 0x76b60000) -set(baseaddress_msxml3r 0x76b40000) -set(baseaddress_msxml4 0x76b00000) -set(baseaddress_msxml6 0x76ac0000) -set(baseaddress_mycomput 0x76aa0000) -set(baseaddress_ncpa 0x76a80000) -set(baseaddress_nddeapi 0x76a60000) -set(baseaddress_netcfgx 0x769d0000) -set(baseaddress_netevent 0x769a0000) -set(baseaddress_netid 0x76960000) -set(baseaddress_netlogon 0x76930000) -set(baseaddress_netmsg 0x767b0000) -set(baseaddress_netplwiz 0x76790000) -set(baseaddress_netshell 0x76710000) -set(baseaddress_newdev 0x766c0000) -set(baseaddress_nfs41_np 0x766a0000) -set(baseaddress_normaliz 0x76680000) -set(baseaddress_notifyhook 0x76660000) -set(baseaddress_npptools 0x76640000) -set(baseaddress_ntdll_vista 0x76620000) -set(baseaddress_ntdsapi 0x765f0000) -set(baseaddress_ntlanman 0x765d0000) -set(baseaddress_ntmarta 0x765b0000) -set(baseaddress_ntobjshex 0x76550000) -set(baseaddress_objsel 0x76530000) -set(baseaddress_odbc32 0x764f0000) -set(baseaddress_odbccp32 0x764c0000) -set(baseaddress_odbccp32i 0x764a0000) -set(baseaddress_oleacc 0x76450000) -set(baseaddress_olecli32 0x76430000) -set(baseaddress_olepro32 0x76410000) -set(baseaddress_olesvr32 0x763f0000) -set(baseaddress_olethk32 0x763d0000) -set(baseaddress_openglcfg 0x763a0000) -set(baseaddress_pdh 0x76370000) -set(baseaddress_pidgen 0x76350000) -set(baseaddress_pifmgr 0x762e0000) -set(baseaddress_powercfg 0x76280000) -set(baseaddress_printui 0x76260000) -set(baseaddress_propsys 0x76220000) -set(baseaddress_pstorec 0x76200000) -set(baseaddress_qedit 0x761d0000) -set(baseaddress_qmgr 0x761a0000) -set(baseaddress_qmgrprxy 0x76150000) -set(baseaddress_quartz 0x76040000) -set(baseaddress_query 0x76020000) -set(baseaddress_rasadhlp 0x76000000) -set(baseaddress_rasdlg 0x75e40000) -set(baseaddress_rasman 0x75e10000) -set(baseaddress_redirtest1 0x75df0000) -set(baseaddress_redirtest2 0x75dd0000) -set(baseaddress_resutils 0x75db0000) -set(baseaddress_riched32 0x75d90000) -set(baseaddress_rsabase 0x75d70000) -set(baseaddress_rshell 0x75d20000) -set(baseaddress_samsrv 0x75cc0000) -set(baseaddress_sccbase 0x75ca0000) -set(baseaddress_schannel 0x75c70000) -set(baseaddress_schedsvc 0x75c50000) -set(baseaddress_scrrun 0x75c10000) -set(baseaddress_security 0x75bf0000) -set(baseaddress_sendmail 0x75bc0000) -set(baseaddress_serialui 0x75ba0000) -set(baseaddress_sfc 0x75b80000) -set(baseaddress_shdoclc 0x75b40000) -set(baseaddress_shdocvw 0x75b00000) -set(baseaddress_shellbtrfs 0x75a30000) -set(baseaddress_shfolder 0x75a10000) -set(baseaddress_shimgvw 0x759d0000) -set(baseaddress_shsvcs 0x759b0000) -set(baseaddress_slbcsp 0x75990000) -set(baseaddress_sndblst 0x75970000) -set(baseaddress_softpub 0x75950000) -set(baseaddress_srclient 0x75930000) -set(baseaddress_srvsvc 0x75900000) -set(baseaddress_sti 0x758d0000) -set(baseaddress_stobject 0x75870000) -set(baseaddress_streamci 0x75850000) -set(baseaddress_sxs 0x75830000) -set(baseaddress_sysdm 0x75740000) -set(baseaddress_syssetup 0x75620000) -set(baseaddress_t2embed 0x75600000) -set(baseaddress_tapi32 0x755d0000) -set(baseaddress_tapiui 0x75550000) -set(baseaddress_telephon 0x75530000) -set(baseaddress_testvdd 0x75510000) -set(baseaddress_themeui 0x754f0000) -set(baseaddress_timedate 0x75480000) -set(baseaddress_traffic 0x75460000) -set(baseaddress_twain_32 0x75440000) -set(baseaddress_ubtrfs 0x75420000) -set(baseaddress_ucdfs 0x75400000) -set(baseaddress_uext2 0x753d0000) -set(baseaddress_ufat 0x753a0000) -set(baseaddress_ufatx 0x75380000) -set(baseaddress_uffs 0x75360000) -set(baseaddress_umpnpmgr 0x75330000) -set(baseaddress_untfs 0x75310000) -set(baseaddress_updspapi 0x752f0000) -set(baseaddress_ureiserfs 0x752d0000) -set(baseaddress_url 0x752b0000) -set(baseaddress_usrmgr 0x75260000) -set(baseaddress_vbscript 0x751f0000) -set(baseaddress_vdmdbg 0x751d0000) -set(baseaddress_verifier 0x751b0000) -set(baseaddress_vfd 0x75180000) -set(baseaddress_vssapi 0x75150000) -set(baseaddress_w32time 0x75130000) -set(baseaddress_wbemdisp 0x750f0000) -set(baseaddress_wbemprox 0x750a0000) -set(baseaddress_wdmaud.drv 0x74f10000) -set(baseaddress_win32u 0x74ef0000) -set(baseaddress_win32u_2k3sp2 0x74ed0000) -set(baseaddress_win32u_xpsp2 0x74eb0000) -set(baseaddress_windowscodecs 0x74dd0000) -set(baseaddress_windowscodecsext 0x74db0000) -set(baseaddress_wined3dcfg 0x74d80000) -set(baseaddress_winemp3.acm 0x74d10000) -set(baseaddress_winfax 0x74cf0000) -set(baseaddress_wing32 0x74cd0000) -set(baseaddress_winhttp 0x74c90000) -set(baseaddress_winprint 0x74c70000) -set(baseaddress_winscard 0x74c50000) -set(baseaddress_winsta 0x74c20000) -set(baseaddress_wkssvc 0x74c00000) -set(baseaddress_wlanapi 0x74be0000) -set(baseaddress_wldap32 0x74bb0000) -set(baseaddress_wlnotify 0x74b80000) -set(baseaddress_wmi 0x74b60000) -set(baseaddress_wmisvc 0x74b40000) -set(baseaddress_wmiutils 0x74b10000) -set(baseaddress_wmvcore 0x74ae0000) -set(baseaddress_wshirda 0x74ac0000) -set(baseaddress_wshom 0x74a90000) -set(baseaddress_wshtcpip 0x74a70000) -set(baseaddress_wsock32 0x74a50000) -set(baseaddress_wtsapi32 0x74a30000) -set(baseaddress_wuapi 0x74a00000) -set(baseaddress_wuauserv 0x749e0000) -set(baseaddress_xinput1_1 0x749c0000) -set(baseaddress_xinput1_2 0x749a0000) -set(baseaddress_xinput1_3 0x74980000) -set(baseaddress_xinput9_1_0 0x74960000) -set(baseaddress_xmllite 0x74930000) -set(baseaddress_xolehlp 0x74910000) -set(baseaddress_zipfldr 0x748b0000) +set(baseaddress_shlwapi 0x7c310000) +set(baseaddress_rpcrt4 0x7c270000) +set(baseaddress_comctl32 0x7c120000) +set(baseaddress_ole32 0x7bfd0000) +set(baseaddress_winspool 0x7bf90000) +set(baseaddress_winmm 0x7bef0000) +set(baseaddress_comdlg32 0x7be10000) +set(baseaddress_shell32 0x7b630000) +set(baseaddress_lz32 0x7b610000) +set(baseaddress_version 0x7b5e0000) +set(baseaddress_oleaut32 0x7b4b0000) +set(baseaddress_setupapi 0x7b370000) +set(baseaddress_mpr 0x7b340000) +set(baseaddress_crypt32 0x7b270000) +set(baseaddress_wininet 0x7b1e0000) +set(baseaddress_urlmon 0x7b130000) +set(baseaddress_psapi 0x7b110000) +set(baseaddress_imm32 0x7b0e0000) +set(baseaddress_msvfw32 0x7b0a0000) +set(baseaddress_dbghelp 0x7b020000) +set(baseaddress_devmgr 0x7af70000) +set(baseaddress_msacm32 0x7af30000) +set(baseaddress_netapi32 0x7aec0000) +set(baseaddress_powrprof 0x7aea0000) +set(baseaddress_secur32 0x7ae60000) +set(baseaddress_wintrust 0x7ae20000) +set(baseaddress_avicap32 0x7ae00000) +set(baseaddress_cabinet 0x7adc0000) +set(baseaddress_dsound 0x7ad60000) +set(baseaddress_glu32 0x7ace0000) +set(baseaddress_opengl32 0x7ac00000) +set(baseaddress_riched20 0x7ab70000) +set(baseaddress_smdll 0x7ab50000) +set(baseaddress_userenv 0x7ab10000) +set(baseaddress_uxtheme 0x7aac0000) +set(baseaddress_cryptui 0x7aa20000) +set(baseaddress_csrsrv 0x7a9f0000) +set(baseaddress_basesrv 0x7a9c0000) +set(baseaddress_winsrv 0x7a950000) +set(baseaddress_dplayx 0x7a900000) +set(baseaddress_gdiplus 0x7a860000) +set(baseaddress_msimg32 0x7a840000) +set(baseaddress_mswsock 0x7a820000) +set(baseaddress_oledlg 0x7a7e0000) +set(baseaddress_rasapi32 0x7a7b0000) +set(baseaddress_rsaenh 0x7a760000) +set(baseaddress_samlib 0x7a730000) +set(baseaddress_sensapi 0x7a710000) +set(baseaddress_sfc_os 0x7a6f0000) +set(baseaddress_snmpapi 0x7a6d0000) +set(baseaddress_spoolss 0x7a6a0000) +set(baseaddress_usp10 0x7a640000) +set(baseaddress_access 0x7a5c0000) +set(baseaddress_acgenral 0x7a5a0000) +set(baseaddress_aclayers 0x7a580000) +set(baseaddress_acledit 0x7a560000) +set(baseaddress_aclui 0x7a530000) +set(baseaddress_acppage 0x7a4f0000) +set(baseaddress_activeds 0x7a4d0000) +set(baseaddress_actxprxy 0x7a350000) +set(baseaddress_advapi32_vista 0x7a330000) +set(baseaddress_advpack 0x7a300000) +set(baseaddress_amstream 0x7a2d0000) +set(baseaddress_apphelp 0x7a290000) +set(baseaddress_appwiz 0x7a220000) +set(baseaddress_atl 0x7a1f0000) +set(baseaddress_atl100 0x7a1c0000) +set(baseaddress_atl80 0x7a190000) +set(baseaddress_authz 0x7a170000) +set(baseaddress_avifil32 0x7a110000) +set(baseaddress_batt 0x7a0f0000) +set(baseaddress_bcrypt 0x7a0c0000) +set(baseaddress_beepmidi 0x7a0a0000) +set(baseaddress_browseui 0x79f90000) +set(baseaddress_bthci 0x79f70000) +set(baseaddress_cards 0x79eb0000) +set(baseaddress_cfgmgr32 0x79e90000) +set(baseaddress_clusapi 0x79e60000) +set(baseaddress_cmicpl 0x79e30000) +set(baseaddress_comcat 0x79e10000) +set(baseaddress_compstui 0x79df0000) +set(baseaddress_console 0x79da0000) +set(baseaddress_credui 0x79d60000) +set(baseaddress_crtdll 0x79d20000) +set(baseaddress_cryptdlg 0x79cf0000) +set(baseaddress_cryptdll 0x79cd0000) +set(baseaddress_cryptext 0x79cb0000) +set(baseaddress_cryptnet 0x79c80000) +set(baseaddress_custom 0x79c60000) +set(baseaddress_d3d8 0x79c20000) +set(baseaddress_d3d8thk 0x79c00000) +set(baseaddress_d3d9 0x79bb0000) +set(baseaddress_d3dcompiler_43 0x79b20000) +set(baseaddress_d3drm 0x79ab0000) +set(baseaddress_d3dwine 0x79910000) +set(baseaddress_d3dx9_24 0x798f0000) +set(baseaddress_d3dx9_25 0x798c0000) +set(baseaddress_d3dx9_26 0x798a0000) +set(baseaddress_d3dx9_27 0x79880000) +set(baseaddress_d3dx9_28 0x79860000) +set(baseaddress_d3dx9_29 0x79840000) +set(baseaddress_d3dx9_30 0x79810000) +set(baseaddress_d3dx9_31 0x797f0000) +set(baseaddress_d3dx9_32 0x797d0000) +set(baseaddress_d3dx9_33 0x797b0000) +set(baseaddress_d3dx9_34 0x79790000) +set(baseaddress_d3dx9_35 0x79770000) +set(baseaddress_d3dx9_36 0x796b0000) +set(baseaddress_d3dx9_37 0x79690000) +set(baseaddress_d3dx9_38 0x79670000) +set(baseaddress_d3dx9_39 0x79650000) +set(baseaddress_d3dx9_40 0x79630000) +set(baseaddress_d3dx9_41 0x79610000) +set(baseaddress_d3dx9_42 0x795f0000) +set(baseaddress_d3dx9_43 0x795d0000) +set(baseaddress_d3dxof 0x795a0000) +set(baseaddress_dciman32 0x79580000) +set(baseaddress_dcomlaunch 0x79560000) +set(baseaddress_ddraw 0x794d0000) +set(baseaddress_desk 0x79440000) +set(baseaddress_deskadp 0x79410000) +set(baseaddress_deskmon 0x793e0000) +set(baseaddress_devcpux 0x793c0000) +set(baseaddress_devenum 0x79390000) +set(baseaddress_dinput 0x79350000) +set(baseaddress_dinput8 0x79310000) +set(baseaddress_dmusic 0x792d0000) +set(baseaddress_dnsrslvr 0x792b0000) +set(baseaddress_dplay 0x79290000) +set(baseaddress_dpnhpast 0x79270000) +set(baseaddress_dxdiagn 0x79240000) +set(baseaddress_dxtn 0x79220000) +set(baseaddress_esent 0x791f0000) +set(baseaddress_faultrep 0x791d0000) +set(baseaddress_fltlib 0x791b0000) +set(baseaddress_fmifs 0x79190000) +set(baseaddress_fontext 0x79160000) +set(baseaddress_fontsub 0x79140000) +set(baseaddress_framedyn 0x79120000) +set(baseaddress_getuname 0x786c0000) +set(baseaddress_halxbox 0x78550000) +set(baseaddress_hdwwiz 0x784e0000) +set(baseaddress_hhctrl 0x784a0000) +set(baseaddress_hid 0x78480000) +set(baseaddress_hlink 0x78450000) +set(baseaddress_hnetcfg 0x78420000) +set(baseaddress_httpapi 0x783f0000) +set(baseaddress_iccvid 0x783d0000) +set(baseaddress_ieframe 0x78340000) +set(baseaddress_iernonce 0x78310000) +set(baseaddress_imaadp32.acm 0x782f0000) +set(baseaddress_imagehlp 0x782c0000) +set(baseaddress_inetcomm 0x78270000) +set(baseaddress_inetcpl 0x78220000) +set(baseaddress_inetmib1 0x78200000) +set(baseaddress_initpki 0x781e0000) +set(baseaddress_input 0x78180000) +set(baseaddress_inseng 0x78150000) +set(baseaddress_intl 0x780f0000) +set(baseaddress_iologmsg 0x780d0000) +set(baseaddress_itircl 0x780b0000) +set(baseaddress_itss 0x78080000) +set(baseaddress_joy 0x78040000) +set(baseaddress_jscript 0x77f90000) +set(baseaddress_jsproxy 0x77f70000) +set(baseaddress_kbdeo 0x77f50000) +set(baseaddress_kbdrost 0x77f30000) +set(baseaddress_kbsdll 0x77f10000) +set(baseaddress_kernel32_vista 0x77ef0000) +set(baseaddress_ksuser 0x77ed0000) +set(baseaddress_libjpeg 0x77e70000) +set(baseaddress_libpng 0x77e10000) +set(baseaddress_libtiff 0x77d70000) +set(baseaddress_libtirpc 0x77d30000) +set(baseaddress_libxslt 0x77c10000) +set(baseaddress_load_notifications 0x77bf0000) +set(baseaddress_loadperf 0x77bd0000) +set(baseaddress_localmon 0x77bb0000) +set(baseaddress_localspl 0x77b80000) +set(baseaddress_localspl_apitest 0x77b60000) +set(baseaddress_localui 0x77b30000) +set(baseaddress_lpk 0x779f0000) +set(baseaddress_lsasrv 0x77990000) +set(baseaddress_main 0x77910000) +set(baseaddress_mapi32 0x778e0000) +set(baseaddress_mbedtls 0x77870000) +set(baseaddress_mciavi32 0x77840000) +set(baseaddress_mcicda 0x77810000) +set(baseaddress_mciqtz32 0x777e0000) +set(baseaddress_mciseq 0x777b0000) +set(baseaddress_mciwave 0x77780000) +set(baseaddress_mgmtapi 0x77760000) +set(baseaddress_midimap 0x77740000) +set(baseaddress_mlang 0x77710000) +set(baseaddress_mmdrv 0x776f0000) +set(baseaddress_mmsys 0x77620000) +set(baseaddress_modemui 0x775b0000) +set(baseaddress_mprapi 0x77580000) +set(baseaddress_msacm32.drv 0x77550000) +set(baseaddress_msadp32.acm 0x77530000) +set(baseaddress_msafd 0x77500000) +set(baseaddress_mscat32 0x774e0000) +set(baseaddress_mscms 0x774b0000) +set(baseaddress_mscoree 0x77470000) +set(baseaddress_msctf 0x77430000) +set(baseaddress_msdmo 0x77410000) +set(baseaddress_msftedit 0x773f0000) +set(baseaddress_msg711.acm 0x773d0000) +set(baseaddress_msgina 0x77340000) +set(baseaddress_msgsm32.acm 0x77320000) +set(baseaddress_mshtml 0x77190000) +set(baseaddress_msi 0x77030000) +set(baseaddress_msimtf 0x77010000) +set(baseaddress_msisip 0x76ff0000) +set(baseaddress_msisys 0x76fd0000) +set(baseaddress_mspatcha 0x76fb0000) +set(baseaddress_msports 0x76f80000) +set(baseaddress_msrle32 0x76f50000) +set(baseaddress_mssign32 0x76f30000) +set(baseaddress_mssip32 0x76f10000) +set(baseaddress_mstask 0x76ee0000) +set(baseaddress_msv1_0 0x76eb0000) +set(baseaddress_msvcrt20 0x76e20000) +set(baseaddress_msvcrt40 0x76d90000) +set(baseaddress_msvcrt_crt_dll_startup 0x76d70000) +set(baseaddress_msvidc32 0x76d50000) +set(baseaddress_msxml 0x76d20000) +set(baseaddress_msxml2 0x76cf0000) +set(baseaddress_msxml3 0x76b10000) +set(baseaddress_msxml3r 0x76af0000) +set(baseaddress_msxml4 0x76ab0000) +set(baseaddress_msxml6 0x76a70000) +set(baseaddress_mycomput 0x76a50000) +set(baseaddress_ncpa 0x76a30000) +set(baseaddress_nddeapi 0x76a10000) +set(baseaddress_netcfgx 0x76980000) +set(baseaddress_netevent 0x76950000) +set(baseaddress_netid 0x76910000) +set(baseaddress_netlogon 0x768e0000) +set(baseaddress_netmsg 0x76760000) +set(baseaddress_netplwiz 0x76740000) +set(baseaddress_netshell 0x766c0000) +set(baseaddress_newdev 0x76670000) +set(baseaddress_nfs41_np 0x76650000) +set(baseaddress_normaliz 0x76630000) +set(baseaddress_notifyhook 0x76610000) +set(baseaddress_npptools 0x765f0000) +set(baseaddress_ntdll_vista 0x765d0000) +set(baseaddress_ntdsapi 0x765a0000) +set(baseaddress_ntlanman 0x76580000) +set(baseaddress_ntmarta 0x76560000) +set(baseaddress_ntobjshex 0x76500000) +set(baseaddress_objsel 0x764e0000) +set(baseaddress_odbc32 0x764a0000) +set(baseaddress_odbccp32 0x76470000) +set(baseaddress_odbccp32i 0x76450000) +set(baseaddress_oleacc 0x76400000) +set(baseaddress_olecli32 0x763e0000) +set(baseaddress_olepro32 0x763c0000) +set(baseaddress_olesvr32 0x763a0000) +set(baseaddress_olethk32 0x76380000) +set(baseaddress_openglcfg 0x76350000) +set(baseaddress_pdh 0x76320000) +set(baseaddress_pidgen 0x76300000) +set(baseaddress_pifmgr 0x76290000) +set(baseaddress_powercfg 0x76230000) +set(baseaddress_printui 0x76210000) +set(baseaddress_propsys 0x761d0000) +set(baseaddress_pstorec 0x761b0000) +set(baseaddress_qedit 0x76180000) +set(baseaddress_qmgr 0x76150000) +set(baseaddress_qmgrprxy 0x76100000) +set(baseaddress_quartz 0x75ff0000) +set(baseaddress_query 0x75fd0000) +set(baseaddress_rasadhlp 0x75fb0000) +set(baseaddress_rasdlg 0x75df0000) +set(baseaddress_rasman 0x75dc0000) +set(baseaddress_redirtest1 0x75da0000) +set(baseaddress_redirtest2 0x75d80000) +set(baseaddress_resutils 0x75d60000) +set(baseaddress_riched32 0x75d40000) +set(baseaddress_rsabase 0x75d20000) +set(baseaddress_rshell 0x75cd0000) +set(baseaddress_samsrv 0x75c70000) +set(baseaddress_sccbase 0x75c50000) +set(baseaddress_schannel 0x75c20000) +set(baseaddress_schedsvc 0x75c00000) +set(baseaddress_scrrun 0x75bc0000) +set(baseaddress_security 0x75ba0000) +set(baseaddress_sendmail 0x75b70000) +set(baseaddress_serialui 0x75b50000) +set(baseaddress_sfc 0x75b30000) +set(baseaddress_shdoclc 0x75af0000) +set(baseaddress_shdocvw 0x75ab0000) +set(baseaddress_shellbtrfs 0x759e0000) +set(baseaddress_shfolder 0x759c0000) +set(baseaddress_shimgvw 0x75980000) +set(baseaddress_shsvcs 0x75960000) +set(baseaddress_slbcsp 0x75940000) +set(baseaddress_sndblst 0x75920000) +set(baseaddress_softpub 0x75900000) +set(baseaddress_srclient 0x758e0000) +set(baseaddress_srvsvc 0x758b0000) +set(baseaddress_sti 0x75880000) +set(baseaddress_stobject 0x75820000) +set(baseaddress_streamci 0x75800000) +set(baseaddress_sxs 0x757e0000) +set(baseaddress_sysdm 0x756f0000) +set(baseaddress_syssetup 0x755d0000) +set(baseaddress_t2embed 0x755b0000) +set(baseaddress_tapi32 0x75580000) +set(baseaddress_tapiui 0x75500000) +set(baseaddress_telephon 0x754e0000) +set(baseaddress_testvdd 0x754c0000) +set(baseaddress_themeui 0x754a0000) +set(baseaddress_timedate 0x75430000) +set(baseaddress_traffic 0x75410000) +set(baseaddress_twain_32 0x753f0000) +set(baseaddress_ubtrfs 0x753d0000) +set(baseaddress_ucdfs 0x753b0000) +set(baseaddress_uext2 0x75380000) +set(baseaddress_ufat 0x75350000) +set(baseaddress_ufatx 0x75330000) +set(baseaddress_uffs 0x75310000) +set(baseaddress_umpnpmgr 0x752e0000) +set(baseaddress_untfs 0x752c0000) +set(baseaddress_updspapi 0x752a0000) +set(baseaddress_ureiserfs 0x75280000) +set(baseaddress_url 0x75260000) +set(baseaddress_usrmgr 0x75210000) +set(baseaddress_vbscript 0x751a0000) +set(baseaddress_vdmdbg 0x75180000) +set(baseaddress_verifier 0x75160000) +set(baseaddress_vfd 0x75130000) +set(baseaddress_vssapi 0x75100000) +set(baseaddress_w32time 0x750e0000) +set(baseaddress_wbemdisp 0x750a0000) +set(baseaddress_wbemprox 0x75050000) +set(baseaddress_wdmaud.drv 0x74ec0000) +set(baseaddress_win32u 0x74ea0000) +set(baseaddress_win32u_2k3sp2 0x74e80000) +set(baseaddress_win32u_xpsp2 0x74e60000) +set(baseaddress_windowscodecs 0x74d80000) +set(baseaddress_windowscodecsext 0x74d60000) +set(baseaddress_wined3dcfg 0x74d30000) +set(baseaddress_winemp3.acm 0x74cc0000) +set(baseaddress_winfax 0x74ca0000) +set(baseaddress_wing32 0x74c80000) +set(baseaddress_winhttp 0x74c30000) +set(baseaddress_winprint 0x74c10000) +set(baseaddress_winscard 0x74bf0000) +set(baseaddress_winsta 0x74bc0000) +set(baseaddress_wkssvc 0x74ba0000) +set(baseaddress_wlanapi 0x74b80000) +set(baseaddress_wldap32 0x74b50000) +set(baseaddress_wlnotify 0x74b20000) +set(baseaddress_wmi 0x74b00000) +set(baseaddress_wmisvc 0x74ae0000) +set(baseaddress_wmiutils 0x74ab0000) +set(baseaddress_wmvcore 0x74a80000) +set(baseaddress_wshirda 0x74a60000) +set(baseaddress_wshom 0x74a30000) +set(baseaddress_wshtcpip 0x74a10000) +set(baseaddress_wsock32 0x749f0000) +set(baseaddress_wtsapi32 0x749d0000) +set(baseaddress_wuapi 0x749a0000) +set(baseaddress_wuauserv 0x74980000) +set(baseaddress_xinput1_1 0x74960000) +set(baseaddress_xinput1_2 0x74940000) +set(baseaddress_xinput1_3 0x74920000) +set(baseaddress_xinput9_1_0 0x74900000) +set(baseaddress_xmllite 0x748d0000) +set(baseaddress_xolehlp 0x748b0000) +set(baseaddress_zipfldr 0x74850000)

4 years, 12 months

[reactos] 02/03: [SDK] Add usage / help to gen_baseaddress.py

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f6a1c916492db2f5a4a8… commit 9f6a1c916492db2f5a4a8fabe00edde84f2a2aa9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 27 19:51:20 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 27 19:51:20 2019 +0100 [SDK] Add usage / help to gen_baseaddress.py --- sdk/tools/gen_baseaddress.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index f214012a982..e709dfb9822 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -4,7 +4,19 @@ LICENSE: MIT (https://spdx.org/licenses/MIT) PURPOSE: Update baseaddresses of all modules COPYRIGHT: Copyright 2017,2018 Mark Jansen (mark.jansen(a)reactos.org) ''' + from __future__ import print_function, absolute_import, division + +USAGE = """ +This script will update the baseaddresses of all modules, based on the build output. + +Specify the build output dir as commandline argument to the script: +`python gen_baseaddress.py C:\\Users\\Mark\\reactos\\output-MinGW-i386` + +Multiple directories can be specified: +`python gen_baseaddress r:/build/msvc r:/build/gcc` +""" + import os import struct import sys @@ -15,6 +27,7 @@ except ImportError: print('# Please install pefile from pip or https://github.com/erocarrera/pefile') sys.exit(-1) + ALL_EXTENSIONS = ( '.dll', '.acm', '.ax', '.cpl', '.drv', '.ocx' ) @@ -365,10 +378,14 @@ def main(): dirs = sys.argv[1:] if len(dirs) < 1: trydir = os.getcwd() - print('# No path specified, trying', trydir) + print(USAGE) + print('No path specified, trying the working directory: ', trydir) dirs = [trydir] for onedir in dirs: - run_dir(onedir) + if onedir.lower() in ['-help', '/help', '/h', '-h', '/?', '-?']: + print(USAGE) + else: + run_dir(onedir) if __name__ == '__main__':

4 years, 12 months

[reactos] 01/03: Change whitespace so gcc 8.3 wont falsely complain about misleading indentation

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67d10c5b17e540ff60f14… commit 67d10c5b17e540ff60f1410135fed2b2951abf13 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 27 19:50:23 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 27 19:50:23 2019 +0100 Change whitespace so gcc 8.3 wont falsely complain about misleading indentation --- .../rostests/win32/comctl32/buttonvistest/buttonvistest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp b/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp index 4249a53ee80..266a8eee970 100644 --- a/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp +++ b/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp @@ -174,7 +174,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, CreateWnd(hWnd, L"Static", L"Button V6 with imagelist and no themes", 0, 4, -1); CreateButtonSet(hWnd, &hwnd[60], 4, 0, BS_PUSHBUTTON); CreateButtonSet(hWnd, &hwnd[65], 5, 0, BS_DEFPUSHBUTTON); - CreateButtonSet(hWnd, &hwnd[70], 4, 5, BS_PUSHBUTTON|WS_DISABLED); + CreateButtonSet(hWnd, &hwnd[70], 4, 5, BS_PUSHBUTTON|WS_DISABLED); CreateButtonSet(hWnd, &hwnd[75], 5, 5, BS_GROUPBOX); CreateButtonSet(hWnd, &hwnd[80], 4, 10, BS_CHECKBOX); CreateButtonSet(hWnd, &hwnd[85], 5, 10, BS_RADIOBUTTON); @@ -182,8 +182,8 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, for (int i = 30; i < 90; i++) SetWindowTheme(hwnd[i], L"", L""); - for (int i = 60; i< 90; i++) - SendMessageW(hwnd[i], BCM_SETIMAGELIST, 0, (LPARAM)&btniml); + for (int i = 60; i< 90; i++) + SendMessageW(hwnd[i], BCM_SETIMAGELIST, 0, (LPARAM)&btniml); CreateWnd(hWnd, L"Static", L"Button V6 with themes and imagelist", 0, 6, -1); CreateButtonSet(hWnd, &hwnd[120], 6, 0, BS_PUSHBUTTON); @@ -201,8 +201,8 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, CreateButtonSet(hWnd, &hwnd[110], 8, 10, BS_CHECKBOX); CreateButtonSet(hWnd, &hwnd[115], 9, 10, BS_RADIOBUTTON); - for (int i = 120; i< 150; i++) - SendMessageW(hwnd[i], BCM_SETIMAGELIST, 0, (LPARAM)&btniml); + for (int i = 120; i< 150; i++) + SendMessageW(hwnd[i], BCM_SETIMAGELIST, 0, (LPARAM)&btniml); if (bActivated) DeactivateActCtx(0, cookie);

4 years, 12 months

[reactos] 01/01: [NTDLL:LDR] Add a print on illegal DLL relocation.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d3f52a2caaccf5484aca… commit 8d3f52a2caaccf5484aca2beb581c35a10ba0cee Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Dec 27 17:01:15 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Dec 27 17:02:26 2019 +0100 [NTDLL:LDR] Add a print on illegal DLL relocation. --- dll/ntdll/ldr/ldrutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 4c1adbf7810..7f04bb46055 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1417,6 +1417,8 @@ SkipCheck: HardErrorParameters[0] = (ULONG_PTR)&IllegalDll; HardErrorParameters[1] = (ULONG_PTR)&OverlapDll; + DPRINT1("Illegal DLL relocation! %wZ overlaps %wZ\n", &OverlapDll, &IllegalDll); + /* Raise the error */ ZwRaiseHardError(STATUS_ILLEGAL_DLL_RELOCATION, 2,

4 years, 12 months

[reactos] 01/01: This was not meant to be committed!

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d32e96d60253b0100987e… commit d32e96d60253b0100987e78e696fd4a57c7314bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 26 17:19:11 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 26 17:19:11 2019 +0100 This was not meant to be committed! This reverts commit 5e14dbd6481f29f9f3b666e64b5bfd74ac887f73. --- ntoskrnl/kd/kdinit.c | 6 ++++-- ntoskrnl/kd/kdio.c | 31 ++++++--------------------- ntoskrnl/kdbg/kdb.c | 60 ++++++++++++---------------------------------------- 3 files changed, 24 insertions(+), 73 deletions(-) diff --git a/ntoskrnl/kd/kdinit.c b/ntoskrnl/kd/kdinit.c index 0de4c73fe5f..a73ec17ecad 100644 --- a/ntoskrnl/kd/kdinit.c +++ b/ntoskrnl/kd/kdinit.c @@ -39,8 +39,9 @@ extern ANSI_STRING KdpLogFileName; /* PRIVATE FUNCTIONS *********************************************************/ -static INIT_FUNCTION +INIT_FUNCTION PCHAR +NTAPI KdpGetDebugMode(PCHAR Currentp2) { PCHAR p1, p2 = Currentp2; @@ -134,8 +135,9 @@ KdpGetDebugMode(PCHAR Currentp2) return p2; } -static INIT_FUNCTION +INIT_FUNCTION VOID +NTAPI KdpCallInitRoutine(ULONG BootPhase) { PLIST_ENTRY CurrentEntry; diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 1291e823cfb..4921d6af7c2 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -423,12 +423,10 @@ KdpScreenAcquire(VOID) InbvEnableDisplayString(TRUE); InbvSetScrollRegion(0, 0, 639, 479); } - else - { - DbgPrint("********* -----> Could NOT acquire SCREEN!! <----- *********\n"); - } } +// extern VOID NTAPI InbvSetDisplayOwnership(IN BOOLEAN DisplayOwned); + VOID KdpScreenRelease(VOID) { @@ -436,6 +434,7 @@ KdpScreenRelease(VOID) InbvCheckDisplayOwnership()) { /* Release the display */ + // InbvSetDisplayOwnership(FALSE); InbvNotifyDisplayOwnershipLost(NULL); } } @@ -633,14 +632,6 @@ KdpPromptString( USHORT i; ULONG DummyScanCode; -/*************************/ - /**/if (!(KdbDebugState & KD_DEBUG_KDSERIAL))/**/ - KbdDisableMouse(); - /* Take control of the display */ - if (KdpDebugMode.Screen) - KdpScreenAcquire(); -/*************************/ - StringChar.Buffer = &Response; StringChar.Length = StringChar.MaximumLength = sizeof(Response); @@ -657,8 +648,8 @@ KdpPromptString( /* Acquire the printing spinlock without waiting at raised IRQL */ OldIrql = KdpAcquireLock(&KdpSerialSpinLock); - // if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) - // KbdDisableMouse(); + if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) + KbdDisableMouse(); /* Loop the whole string */ for (i = 0; i < ResponseString->MaximumLength; i++) @@ -720,8 +711,8 @@ KdpPromptString( /* Return the length */ ResponseString->Length = i; - // if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) - // KbdEnableMouse(); + if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) + KbdEnableMouse(); /* Release the spinlock */ KdpReleaseLock(&KdpSerialSpinLock, OldIrql); @@ -730,14 +721,6 @@ KdpPromptString( *StringChar.Buffer = '\n'; KdpPrintString(&StringChar); -/*************************/ - /* Release the display */ - if (KdpDebugMode.Screen) - KdpScreenRelease(); - /**/if (!(KdbDebugState & KD_DEBUG_KDSERIAL))/**/ - KbdEnableMouse(); -/*************************/ - /* Success; we don't need to resend */ return FALSE; } diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index 1eabd45b10c..d2a890276fe 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -1216,11 +1216,11 @@ KdbpInternalEnter(VOID) PVOID SavedInitialStack, SavedStackBase, SavedKernelStack; ULONG SavedStackLimit; - // KbdDisableMouse(); + KbdDisableMouse(); - // /* Take control of the display */ - // if (KdpDebugMode.Screen) - // KdpScreenAcquire(); + /* Take control of the display */ + if (KdpDebugMode.Screen) + KdpScreenAcquire(); /* Call the interface's main loop on a different stack */ Thread = PsGetCurrentThread(); @@ -1241,11 +1241,11 @@ KdbpInternalEnter(VOID) Thread->Tcb.StackLimit = SavedStackLimit; Thread->Tcb.KernelStack = SavedKernelStack; - // /* Release the display */ - // if (KdpDebugMode.Screen) - // KdpScreenRelease(); + /* Release the display */ + if (KdpDebugMode.Screen) + KdpScreenRelease(); - // KbdEnableMouse(); + KbdEnableMouse(); } static ULONG @@ -1356,13 +1356,6 @@ KdbEnterDebuggerException( EnterConditionMet = FALSE; } -/*************************/ - KbdDisableMouse(); - /* Take control of the display */ - if (KdpDebugMode.Screen) - KdpScreenAcquire(); -/*************************/ - /* If we stopped on one of our breakpoints then let the user know */ KdbLastBreakPointNr = -1; KdbEnteredOnSingleStep = FALSE; @@ -1538,9 +1531,7 @@ KdbEnterDebuggerException( { if (!EnterConditionMet) { - // return kdHandleException; - ContinueType = kdHandleException; - goto cleanup_quit; + return kdHandleException; } KdbpPrint("\nEntered debugger on unexpected debug trap!\n"); @@ -1555,9 +1546,7 @@ KdbEnterDebuggerException( } if (!EnterConditionMet) { - // return kdHandleException; - ContinueType = kdHandleException; - goto cleanup_quit; + return kdHandleException; } KdbpPrint("\nEntered debugger on embedded INT3 at 0x%04x:0x%08x.\n", @@ -1571,8 +1560,7 @@ KdbEnterDebuggerException( if (!EnterConditionMet) { - // return ContinueType; - goto cleanup_quit; + return ContinueType; } KdbpPrint("\nEntered debugger on %s-chance exception (Exception Code: 0x%x) (%s)\n", @@ -1628,9 +1616,7 @@ KdbEnterDebuggerException( if (InterlockedIncrement(&KdbEntryCount) > 1) { __writeeflags(OldEflags); - // return kdHandleException; - ContinueType = kdHandleException; - goto cleanup_quit; + return kdHandleException; } /* Call the main loop */ @@ -1683,14 +1669,6 @@ KdbEnterDebuggerException( } continue_execution: - -/*************************/ - /* Release the display */ - if (KdpDebugMode.Screen) - KdpScreenRelease(); - KbdEnableMouse(); -/*************************/ - /* Clear debug status */ if (ExceptionCode == STATUS_BREAKPOINT) /* FIXME: Why clear DR6 on INT3? */ { @@ -1710,17 +1688,6 @@ continue_execution: } } - return ContinueType; - -cleanup_quit: - -/*************************/ - /* Release the display */ - if (KdpDebugMode.Screen) - KdpScreenRelease(); - KbdEnableMouse(); -/*************************/ - return ContinueType; } @@ -1732,8 +1699,7 @@ KdbpGetCommandLineSettings( { #define CONST_STR_LEN(x) (sizeof(x)/sizeof(x[0]) - 1) - /* Loop through the switches */ - for (; p1 && *p1; p1 = strchr(p1, ' ')) + while (p1 && (p1 = strchr(p1, ' '))) { /* Skip other spaces */ while (*p1 == ' ') ++p1;

4 years, 12 months

[reactos] 02/02: [SETUPLIB] Register the \DosDevices\?: drive letter from installation time in the correct SYSTEM\MountedDevices registry key, i.e. the one of the ReactOS being currently installed. CORE-15575

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51cb3cc6b240ed623bf56… commit 51cb3cc6b240ed623bf56274a77ff78d14668480 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 26 17:16:04 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 26 17:16:14 2019 +0100 [SETUPLIB] Register the \DosDevices\?: drive letter from installation time in the correct SYSTEM\MountedDevices registry key, i.e. the one of the ReactOS being currently installed. CORE-15575 However I now hit a separate bug (see the report) that still prevent the drive letter to be correctly assigned at reboot. --- base/setup/lib/utils/partlist.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 5c094e31123..2e635954134 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -11,6 +11,7 @@ #include "partlist.h" #include "fsutil.h" +#include "registry.h" #define NDEBUG #include <debug.h> @@ -3972,13 +3973,13 @@ SetMountedDeviceValue( IN ULONG Signature, IN LARGE_INTEGER StartingOffset) { + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - WCHAR ValueNameBuffer[16]; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\MountedDevices"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"SYSTEM\\MountedDevices"); UNICODE_STRING ValueName; - REG_DISK_MOUNT_INFO MountInfo; - NTSTATUS Status; + WCHAR ValueNameBuffer[16]; HANDLE KeyHandle; + REG_DISK_MOUNT_INFO MountInfo; RtlStringCchPrintfW(ValueNameBuffer, ARRAYSIZE(ValueNameBuffer), L"\\DosDevices\\%c:", Letter); @@ -3987,12 +3988,12 @@ SetMountedDeviceValue( InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, - NULL, + GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), NULL); - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { Status = NtCreateKey(&KeyHandle, @@ -4003,7 +4004,6 @@ SetMountedDeviceValue( REG_OPTION_NON_VOLATILE, NULL); } - if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status);

4 years, 12 months

← Newer
1
2
3
4
5
6
7
8
9
...
23
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 December 2019