Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 39124: kdcom: add SYNC_PACKET_ID for PACKET_TYPE_KD_DEBUG_IO to make debugprints work.
by tkreuzer＠svn.reactos.org 27 Jan '09

27 Jan '09

Author: tkreuzer Date: Mon Jan 26 18:55:03 2009 New Revision: 39124 URL: http://svn.reactos.org/svn/reactos?rev=39124&view=rev Log: kdcom: add SYNC_PACKET_ID for PACKET_TYPE_KD_DEBUG_IO to make debugprints work. Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 26 18:55:03 2009 @@ -814,6 +814,12 @@ MessageData->Length); } + // FIXME: this looks wrong, but makes dbgprints work + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + CurrentPacketId |= SYNC_PACKET_ID; + } + /* Set the packet id */ Packet.PacketId = CurrentPacketId; @@ -842,6 +848,7 @@ /* Did we succeed? */ if (RcvCode == KdPacketReceived) { + CurrentPacketId &= ~SYNC_PACKET_ID; break; } @@ -849,7 +856,7 @@ if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { /* No response, silently fail. */ - return; +// return; } /* Packet timed out, send it again */

1 0

[khornicek] 39123: - fix build
by khornicek＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: khornicek Date: Mon Jan 26 17:36:40 2009 New Revision: 39123 URL: http://svn.reactos.org/svn/reactos?rev=39123&view=rev Log: - fix build Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Mon Jan 26 17:36:40 2009 @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL // Dialog @@ -539,7 +539,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "AngstrÃ¶m" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomila units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "CentimÃ¨tres" IDS_LENGTH_CHAINS_UK "Chains (UK)"

1 0

[dgorbachev] 39122: Update Czech keyboard layout. Patch from Radek Liska. Bug #4031.
by dgorbachev＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: dgorbachev Date: Mon Jan 26 17:04:22 2009 New Revision: 39122 URL: http://svn.reactos.org/svn/reactos?rev=39122&view=rev Log: Update Czech keyboard layout. Patch from Radek Liska. Bug #4031. Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] Mon Jan 26 17:04:22 2009 @@ -3,7 +3,7 @@ * Copyright (C) 2008 ReactOS * License: LGPL, see: LGPL.txt * - * Based on kbdcz1.dll + * Based on kbdcz1.dll and kbdsk.dll * modified by Radek Liska (radekliska att gmail ddot com) */ @@ -135,78 +135,93 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Keys that do not have shift states */ - { VK_TAB, NOCAPS, {'\t','\t'} }, - { VK_ADD, NOCAPS, {'+', '+'} }, - { VK_SUBTRACT, NOCAPS, {'-', '-'} }, - { VK_MULTIPLY, NOCAPS, {'*', '*'} }, - { VK_DIVIDE, NOCAPS, {'/', '/'} }, - { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, - { VK_SPACE, NOCAPS, {' ', ' '} }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_ESCAPE, NOCAPS, {'\x1b', '\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' ' } }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* normal - shift - ctrl */ - /* The alphabet */ - { 'A', CAPS, {'a', 'A', 0x01} }, - { 'C', CAPS, {'c', 'C', 0x03} }, - { 'D', CAPS, {'d', 'D', 0x04} }, - { 'F', CAPS, {'f', 'F', 0x06} }, - { 'G', CAPS, {'g', 'G', 0x07} }, - { 'H', CAPS, {'h', 'H', 0x08} }, - { 'I', CAPS, {'i', 'I', 0x09} }, - { 'J', CAPS, {'j', 'J', 0x0a} }, - { 'K', CAPS, {'k', 'K', 0x0b} }, - { 'L', CAPS, {'l', 'L', 0x0c} }, - { 'M', CAPS, {'m', 'M', 0x0d} }, - { 'O', CAPS, {'o', 'O', 0x0f} }, - { 'P', CAPS, {'p', 'P', 0x10} }, - { 'Q', CAPS, {'q', 'Q', 0x11} }, - { 'R', CAPS, {'r', 'R', 0x12} }, - { 'S', CAPS, {'s', 'S', 0x13} }, - { 'T', CAPS, {'t', 'T', 0x14} }, - { 'U', CAPS, {'u', 'U', 0x15} }, - { 'V', CAPS, {'v', 'V', 0x16} }, - { 'W', CAPS, {'w', 'W', 0x17} }, - { 'X', CAPS, {'x', 'X', 0x18} }, - { 'Y', CAPS, {'y', 'Y', 0x19} }, - { 'Z', CAPS, {'z', 'Z', 0x1a} }, /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_OEM_102, NOCAPS, {'\\', '|', 0x1c /*FS*/} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n' } }, { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, shifted, control, Alt+Gr */ - { '1', NOCAPS, {'+', '1', WCH_NONE, '!' } }, - { '2', NOCAPS, {0x011b, '2', 0, '@' } }, // e with caron - { '3', NOCAPS, {0x0161, '3', WCH_NONE, '#' } }, // s with caron - { '4', NOCAPS, {0x010d, '4', WCH_NONE, '$' } }, // c with caron - { '5', NOCAPS, {0x0159, '5', WCH_NONE, '%' } }, // r with caron - { '6', NOCAPS, {0x017e, '6', 0x1e, '^' } }, // z with caron - { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '&' } }, // y with acute - { '8', NOCAPS, {0x00e1, '8', WCH_NONE, '*' } }, // a with acute - { '9', NOCAPS, {0x00ed, '9', WCH_NONE, '(' } }, // i with acute - { '0', NOCAPS, {0x00e9, '0', WCH_NONE, ')' } }, // e with acute - { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, '=' } }, // dead letters - acute, caron - { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS death - { VK_OEM_MINUS, NOCAPS, {'=', '%', 0x1f, '-' } }, - { VK_OEM_1, NOCAPS, {0x016f, '\"', WCH_NONE, ';' } }, // u with ring - { VK_OEM_7, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00a4 } }, // section sign - { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, '[' } }, // u with acute - { VK_OEM_5, NOCAPS, {WCH_DEAD, 0x2018, WCH_NONE, '\\' } }, // diaeresis, left single quotation mark - { VK_EMPTY, 0, {0x00a8, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 death - { VK_OEM_6, NOCAPS, {')', '(', WCH_NONE, ']' } }, - { VK_OEM_3, NOCAPS, {';', WCH_DEAD, WCH_NONE, '`' } }, // ring - { VK_EMPTY, 0, {WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE } }, // VK_OEM_3 death - { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<' } }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>' } }, - { 'E', CAPS, {'e', 'E', 0x05, 0x20AC } }, // symbol for euro (currency) - { 'B', CAPS, {'b', 'B', 0x02, '{' } }, // left bracker - { 'N', CAPS, {'n', 'N', 0x0e, '}' } }, // right bracket - { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*' } }, + /* The numbers */ + { '1', NOCAPS, { '+', '1', WCH_NONE, '~' } }, + { '2', NOCAPS, { 0x011b, '2', 0, WCH_DEAD } }, // e with caron + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x02c7 } }, // 2 dead letter + { '3', NOCAPS, { 0x0161, '3', WCH_NONE, WCH_DEAD } }, // s with caron + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x005e } }, // 3 dead letter + { '4', NOCAPS, { 0x010d, '4', WCH_NONE, WCH_DEAD } }, // c with caron + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x02d8 } }, // 4 dead letter + { '5', NOCAPS, { 0x0159, '5', WCH_NONE, WCH_DEAD } }, // r with caron + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00b0 } }, // 5 dead letter + { '6', NOCAPS, { 0x017e, '6', 0x1e, WCH_DEAD } }, // z with caron + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x02db } }, // 6 dead letter + { '7', NOCAPS, { 0x00fd, '7', WCH_NONE, WCH_DEAD } }, // y with acute + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, '`' } }, // 7 dead letter + { '8', NOCAPS, { 0x00e1, '8', WCH_NONE, WCH_DEAD } }, // a with acute + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00b7 } }, // 8 dead letter + { '9', NOCAPS, { 0x00ed, '9', WCH_NONE, WCH_DEAD } }, // i with acute + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4 } }, // 9 dead letter + { '0', NOCAPS, { 0x00e9, '0', WCH_NONE, WCH_DEAD } }, // e with acute + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd } }, // 0 dead letter + + /* The misc */ + { VK_OEM_MINUS, NOCAPS, { '=', '%', WCH_NONE, WCH_DEAD } }, // diaeresis + { VK_EMPTY, NOCAPS, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8 } }, // VK_OEM_MINUS dead letter + { VK_OEM_PLUS, NOCAPS, { WCH_DEAD, WCH_DEAD, WCH_NONE, 0x00b8 } }, // dead letters - acute, caron + { VK_EMPTY, NOCAPS, { 0x00b4, 0x02c7, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS dead letter + { VK_OEM_1, NOCAPS, { 0x016f, '\"', WCH_NONE, '$' } }, // u with ring + { VK_OEM_7, NOCAPS, { '§', '!', WCH_NONE, 0x00df } }, // section sign + { VK_OEM_4, NOCAPS, { 0x00fa, '/', WCH_NONE, 0x00f7 } }, // u with acute + { VK_OEM_5, NOCAPS, { WCH_DEAD, 0x2018, WCH_NONE, 0x00a4 } }, // diaeresis, left single quotation mark + { VK_EMPTY, NOCAPS, { 0x00a8, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 dead letter + { VK_OEM_6, NOCAPS, { ')', '(', WCH_NONE, 0x00d7 } }, + { VK_OEM_3, NOCAPS, { ';', WCH_DEAD, WCH_NONE, WCH_NONE } }, // diacritic ring + { VK_EMPTY, NOCAPS, { WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE } }, // VK_OEM_3 dead letter + { VK_OEM_COMMA, NOCAPS, { ',', '?', WCH_NONE, '<' } }, + { VK_OEM_PERIOD, NOCAPS, { '.', ':', WCH_NONE, '>' } }, + { VK_OEM_2, NOCAPS, { '-', '_', WCH_NONE, '*' } }, + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, WCH_NONE } }, + { 'B', CAPS, {'b', 'B', 0x02, '{' } }, + { 'C', CAPS, {'c', 'C', 0x03, '&' } }, + { 'D', CAPS, {'d', 'D', 0x04, 0x0110 } }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20AC } }, + { 'F', CAPS, {'f', 'F', 0x06, '[' } }, + { 'G', CAPS, {'g', 'G', 0x07, ']' } }, + { 'H', CAPS, {'h', 'H', 0x08, WCH_NONE } }, + { 'I', CAPS, {'i', 'I', 0x09, WCH_NONE } }, + { 'J', CAPS, {'j', 'J', 0x0a, WCH_NONE } }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0142 } }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0141 } }, + { 'M', CAPS, {'m', 'M', 0x0d, WCH_NONE } }, + { 'N', CAPS, {'n', 'N', 0x0e, '}' } }, + { 'O', CAPS, {'o', 'O', 0x0f, WCH_NONE } }, + { 'P', CAPS, {'p', 'P', 0x10, WCH_NONE } }, + { 'Q', CAPS, {'q', 'Q', 0x11, '\\' } }, + { 'R', CAPS, {'r', 'R', 0x12, WCH_NONE } }, + { 'S', CAPS, {'s', 'S', 0x13, WCH_NONE } }, + { 'T', CAPS, {'t', 'T', 0x14, WCH_NONE } }, + { 'U', CAPS, {'u', 'U', 0x15, WCH_NONE } }, + { 'V', CAPS, {'v', 'V', 0x16, '@' } }, + { 'W', CAPS, {'w', 'W', 0x17, '|' } }, + { 'X', CAPS, {'x', 'X', 0x18, '#' } }, + { 'Y', CAPS, {'y', 'Y', 0x19, WCH_NONE } }, + { 'Z', CAPS, {'z', 'Z', 0x1a, WCH_NONE } }, { 0, 0 } }; @@ -372,16 +387,16 @@ { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis - { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round - { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round - { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > round + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with ring + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with ring + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > ring { 0, 0, 0 }, }; ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a1" L"hacek", // caron - L"\x00b4" L"carka", // acute - L"\x005e" L"krouzek", // round + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // ring NULL }; @@ -393,7 +408,7 @@ /* character from vk tables */ vk_to_wchar_master_table, - /* diacritical marks -- */ + /* diacritical marks */ dead_key, /* Key names */ @@ -419,4 +434,3 @@ PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { return &keyboard_layout_table; } -

1 0

[tkreuzer] 39121: rsym64: instead of stripping sections from the middle of the PE, convert them to bss sections to make windows happy and keep the files small. Thanks to kjk for finding the problem.
by tkreuzer＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: tkreuzer Date: Mon Jan 26 16:48:54 2009 New Revision: 39121 URL: http://svn.reactos.org/svn/reactos?rev=39121&view=rev Log: rsym64: instead of stripping sections from the middle of the PE, convert them to bss sections to make windows happy and keep the files small. Thanks to kjk for finding the problem. Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Mon Jan 26 16:48:54 2009 @@ -802,8 +802,7 @@ pName = File->Strings + index; // Hack, simply remove all sections with long names - if (strcmp(pName, ".eh_frame") != 0) - File->UseSection[i] = 0; + File->UseSection[i] = 0; } /* Chek if we have the eh_frame section */ @@ -816,7 +815,7 @@ /* Increase number of used sections */ if (File->UseSection[i]) - File->UsedSections++; + File->UsedSections = i+1; } @@ -829,19 +828,25 @@ CurrentPos = ROUND_UP(CurrentPos, Alignment); /* Create new section headers */ - for (i = 0, j = 0; i < File->AllSections; i++) - { - if (File->UseSection[i]) - { - /* Copy section header */ - File->NewSectionHeaders[j] = - File->SectionHeaders[i]; - /* Fix Offset into File */ - File->NewSectionHeaders[j].PointerToRawData = - File->SectionHeaders[i].PointerToRawData ? CurrentPos : 0; - CurrentPos += File->NewSectionHeaders[j].SizeOfRawData; - j++; - } + for (i = 0, j = 0; i < File->UsedSections; i++) + { + /* Copy section header */ + File->NewSectionHeaders[j] = File->SectionHeaders[i]; + + /* Shall we strip the section? */ + if (File->UseSection[i] == 0) + { + /* Make it a bss section */ + File->NewSectionHeaders[j].PointerToRawData = 0; + File->NewSectionHeaders[j].SizeOfRawData = 0; + File->NewSectionHeaders[j].Characteristics = 0xC0500080; + } + + /* Fix Offset into File */ + File->NewSectionHeaders[j].PointerToRawData = + File->NewSectionHeaders[j].PointerToRawData ? CurrentPos : 0; + CurrentPos += File->NewSectionHeaders[j].SizeOfRawData; + j++; } if (File->eh_frame.idx == -1)

1 0

[hyperion] 39120: Begin moving rules out of modulehandler.cpp and into makefile include rules.mak, where they will be more readable and manageable. Currently implemented: target C compiler and target C++ compiler rules. Please do a clean build if possible. Testing with unusual output paths appreciated Supersedes r39111, with the following amendments: added tools/rbuild/backend/mingw/rules.mak The wrong function was being used to calculate the path of generated files: implement the right function
by hyperion＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: hyperion Date: Mon Jan 26 16:44:56 2009 New Revision: 39120 URL: http://svn.reactos.org/svn/reactos?rev=39120&view=rev Log: Begin moving rules out of modulehandler.cpp and into makefile include rules.mak, where they will be more readable and manageable. Currently implemented: target C compiler and target C++ compiler rules. Please do a clean build if possible. Testing with unusual output paths appreciated Supersedes r39111, with the following amendments: added tools/rbuild/backend/mingw/rules.mak The wrong function was being used to calculate the path of generated files: implement the right function, and use it Added: trunk/reactos/tools/rbuild/backend/mingw/rules.mak - copied, changed from r39111, trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Jan 26 16:44:56 2009 @@ -519,6 +519,8 @@ void MingwBackend::GenerateGlobalVariables () const { + fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); + if ( configuration.Dependencies == FullDependencies ) { fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Jan 26 16:44:56 2009 @@ -1239,16 +1239,7 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(intermediate_path_noext).tlb $(source)\n", "$(intermediate_dir)$(SEP)", NULL ); -Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" - "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" - "\t$(ECHO_DEPENDS)\n" - "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" - "-include $(intermediate_path_unique).o.d\n" - "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", +Rule gccRule ( "$(eval $(call RBUILD_GCC_RULE,$(module_name),$(source),$(dependencies),$(compiler_flags)))\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" @@ -1256,16 +1247,7 @@ "\t$(ECHO_HOSTCC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); -Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" - "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" - "\t$(ECHO_DEPENDS)\n" - "\t${gpp} -MF $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" - "-include $(intermediate_path_unique).o.d\n" - "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", +Rule gppRule ( "$(eval $(call RBUILD_GPP_RULE,$(module_name),$(source),$(dependencies),$(compiler_flags)))\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" Copied: trunk/reactos/tools/rbuild/backend/mingw/rules.mak (from r39111, trunk/reactos/tools/rbuild/backend/mingw/rules.mak) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Mon Jan 26 16:44:56 2009 @@ -1,14 +1,16 @@ RBUILD_fullpath=${subst <<<,,${subst $(SEP)<<<,,${subst /,$(SEP),${subst \\,$(SEP),$(1)}}<<<}} RBUILD_compress_prefix=${subst >>>,,${subst >>>$($(2)),$$($(2)),>>>$(1)}} +RBUILD_compress_prefixes=${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,$(1),INTERMEDIATE},OUTPUT},CDOUTPUT},TEMPORARY},INSTALL} -RBUILD_compress_prefixes=${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,$(1),INTERMEDIATE},OUTPUT},CDOUTPUT},TEMPORARY},INSTALL} +RBUILD_strip_prefix=${subst >>>,,${subst >>>$($(2)),,>>>$(1)}} +RBUILD_strip_prefixes=${subst >>>,,${subst >>>$(SEP),,>>>${call RBUILD_strip_prefix,${call RBUILD_strip_prefix,${call RBUILD_strip_prefix,${call RBUILD_strip_prefix,${call RBUILD_strip_prefix,$(1),INTERMEDIATE},OUTPUT},CDOUTPUT},TEMPORARY},INSTALL}}} #(module, source) RBUILD_intermediate_path_unique=${call RBUILD_intermediate_dir,$(2)}$(SEP)$(basename $(notdir $(2)))_$(1) #(source) -RBUILD_intermediate_dir=${call RBUILD_fullpath,$(value INTERMEDIATE)$(SEP)$(dir ${call RBUILD_compress_prefixes,$(1)})} +RBUILD_intermediate_dir=${call RBUILD_fullpath,$(value INTERMEDIATE)$(SEP)$(dir ${call RBUILD_strip_prefixes,$(1)})} #(module, source, dependencies, cflags) define RBUILD_GCC_RULE

1 0

[dgorbachev] 39119: Calculator update by Radek Liska (with some changes). Bug #4064.
by dgorbachev＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: dgorbachev Date: Mon Jan 26 16:27:19 2009 New Revision: 39119 URL: http://svn.reactos.org/svn/reactos?rev=39119&view=rev Log: Calculator update by Radek Liska (with some changes). Bug #4064. Modified: trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/resource.h Modified: trunk/reactos/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con… ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -7,6 +7,7 @@ The base units for all categories are: + ANGLE..........degrees AREA...........square meters CONSUMPTION....kilometers per liter CURRENCY.......Euro @@ -15,9 +16,10 @@ POWER..........Watt PRESSURE.......Pascal TEMPERATURE....kelvin + TIME...........seconds VELOCITY.......meters per second VOLUME.........liter - WEIGHT.........kilogram + WEIGHT.........gram The '$' character is used as "what you read into the display". */ @@ -40,6 +42,17 @@ #define DECLARE_CONV_END \ { 0, NULL, NULL }, + +/* + 1 gradian = 0.9 deg + 1 radian = 57.29577951308233 deg +*/ +static const conv_t conv_ANGLE[] = { + DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") + DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") + DECLARE_CONV_UNIT(ANGLE, RADIANS, "$*180/P", "$*P/180") + DECLARE_CONV_END +}; /* 1 acre ................ = 4840 square yd = 4046,8564224 mq @@ -131,6 +144,7 @@ DECLARE_CONV_UNIT(CURRENCY, AUSTRIAN_SCHILLING, "$/13,7603", "$*13,7603") DECLARE_CONV_UNIT(CURRENCY, BELGIAN_FRANC, "$/40,3399", "$*40,3399") DECLARE_CONV_UNIT(CURRENCY, CYPRIOT_POUND, "$/0,585274","$*0,585274") + DECLARE_CONV_UNIT(CURRENCY, CZECH_KORUNA, "$/27,9766", "$*27,9766") DECLARE_CONV_UNIT(CURRENCY, DEUTSCHE_MARK, "$/1,9558", "$*1,9558") DECLARE_CONV_UNIT(CURRENCY, DUTCH_GUILDER, "$/2,20371", "$*2,20371") DECLARE_CONV_UNIT(CURRENCY, EURO, "$", "$") @@ -149,9 +163,13 @@ }; /* - 1 15^C ..... = 4.1855 J + 1 cal15 .... = 4.1855 J + 1 BTU ...... = 1055.056 J 1 ERG ...... = 0.0000001 J + 1 EV ....... = 0.000000000000000000160217653 J + 1 Foot-Pound = 1.3558179483314004 J 1 IT calorie = 4.1868 J + 1 KCa ...... = 4186.8 J 1 KJ ....... = 1000 J 1 KWh ...... = 3600 J 1 IUNS ..... = 4.182 J @@ -159,8 +177,12 @@ */ static const conv_t conv_ENERGY[] = { DECLARE_CONV_UNIT(ENERGY, 15_C_CALORIES, "$*4.1855", "$/4.1855") + DECLARE_CONV_UNIT(ENERGY, BTUS, "$*1055.056", "$/1055.056") DECLARE_CONV_UNIT(ENERGY, ERGS, "$*.0000001", "$/.0000001") + DECLARE_CONV_UNIT(ENERGY, EVS, "$*.000000000000000000160217653", "$/.000000000000000000160217653") + DECLARE_CONV_UNIT(ENERGY, FOOT_POUNDS, "$*1.3558179483314004", "$/1.3558179483314004") DECLARE_CONV_UNIT(ENERGY, IT_CALORIES, "$*4.1868", "$/4.1868") + DECLARE_CONV_UNIT(ENERGY, IT_KILOCALORIES, "$*4186.8", "$/4186.8") DECLARE_CONV_UNIT(ENERGY, JOULES, "$", "$") DECLARE_CONV_UNIT(ENERGY, KILOJOULES, "$*1000", "$/1000") DECLARE_CONV_UNIT(ENERGY, KILOWATT_HOURS, "$*3600", "$/3600") @@ -171,7 +193,7 @@ /* 1 angstrom ....... = 0.0000000001 m - 1 astronomila unit = 149598000000 m + 1 astronomical unit= 149598000000 m 1 barleycorn ..... = 1/3 inch = 0.9144/108 m 1 cm ............. = 1/100 m 1 chain uk ....... = 22 yards = 22*0.9144 m @@ -195,6 +217,7 @@ 1 lar ............ = 1 light year ..... = 9460730472580800 m 1 link uk ........ = 0.01 chains = 0.22*0.9144 m + 1 micron ......... = 0.000001 m 1 mile ........... = 1760 yards = 1609.344 m 1 millimeter ..... = 1/1000 m 1 nautical mile .. = 1852 m @@ -203,6 +226,7 @@ 1 pica ........... = yard/216 = 0.9144/216 m 1 ri japan ....... = 1 ri korea ....... = + 1 rod ............ = 5.0292 m 1 sawk ........... = 1 sen ............ = 1 shaku .......... = 10/33 m @@ -216,7 +240,7 @@ */ static const conv_t conv_LENGTH[] = { DECLARE_CONV_UNIT(LENGTH, ANGSTROMS, "$*0.0000000001", "$/0.0000000001") - DECLARE_CONV_UNIT(LENGTH, ASTRONOMILA_UNITS, "$*149598000000", "$/149598000000") + DECLARE_CONV_UNIT(LENGTH, ASTRONOMICAL_UNITS, "$*149598000000", "$/149598000000") DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS, "$*0.9144/108", "$/0.9144*108") DECLARE_CONV_UNIT(LENGTH, CENTIMETERS, "$/100", "$*100") DECLARE_CONV_UNIT(LENGTH, CHAINS_UK, "$*20.1168", "$/20.1168") @@ -242,12 +266,14 @@ DECLARE_CONV_UNIT(LENGTH, LIGHT_YEARS, "$*9460730472580800", "$/9460730472580800") DECLARE_CONV_UNIT(LENGTH, LINKS_UK, "$*0.201168", "$/0.201168") DECLARE_CONV_UNIT(LENGTH, METERS, "$", "$") + DECLARE_CONV_UNIT(LENGTH, MICRONS, "$*0.000001", "$/0.000001") DECLARE_CONV_UNIT(LENGTH, MILES, "$*1609.344", "$/1609.344") DECLARE_CONV_UNIT(LENGTH, MILLIMETERS, "$/1000", "$*1000") DECLARE_CONV_UNIT(LENGTH, NAUTICAL_MILES, "$*1852", "$/1852") // DECLARE_CONV_UNIT(LENGTH, NIEU, "$", "$") DECLARE_CONV_UNIT(LENGTH, PARSECS, "$*30856800000000000", "$/30856800000000000") DECLARE_CONV_UNIT(LENGTH, PICAS, "$*0.9144/216", "$/0.9144*216") + DECLARE_CONV_UNIT(LENGTH, RODS, "$*5.0292", "$/5.0292") // DECLARE_CONV_UNIT(LENGTH, RI_JAPAN, "$", "$") // DECLARE_CONV_UNIT(LENGTH, RI_KOREA, "$", "$") // DECLARE_CONV_UNIT(LENGTH, SAWK, "$", "$") @@ -264,30 +290,58 @@ }; /* + 1 BTU/min = 17.5842642 W + 1 Foot-pound/minute = 0.02259696580552333 W 1 hp = 745.69987158227022 W 1 KW = 1000 W 1 MW = 1000000 W */ static const conv_t conv_POWER[] = { - DECLARE_CONV_UNIT(POWER, HORSEPOWER, "$*745.69987158227022", "$/745.69987158227022") - DECLARE_CONV_UNIT(POWER, KILOWATTS, "$*1000", "$/1000") - DECLARE_CONV_UNIT(POWER, MEGAWATTS, "$*1000000", "$/1000000") - DECLARE_CONV_UNIT(POWER, WATTS, "$", "$") + DECLARE_CONV_UNIT(POWER, BTUS_PER_MINUTE, "$*17.5842642", "$/17.5842642") + DECLARE_CONV_UNIT(POWER, FPS_PER_MINUTE, "$*0.02259696580552333", "$/0.02259696580552333") + DECLARE_CONV_UNIT(POWER, HORSEPOWER, "$*745.69987158227022", "$/745.69987158227022") + DECLARE_CONV_UNIT(POWER, KILOWATTS, "$*1000", "$/1000") + DECLARE_CONV_UNIT(POWER, MEGAWATTS, "$*1000000", "$/1000000") + DECLARE_CONV_UNIT(POWER, WATTS, "$", "$") DECLARE_CONV_END }; /* 1 ATM = 101325 Pa 1 BAR = 100000 Pa + 1 hPa = 100 Pa + 1 kPa = 1000 Pa 1 mm HG = 133.322 Pa 1 psi = 6894.757 Pa */ static const conv_t conv_PRESSURE[] = { DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES, "$*101325", "$/101325") DECLARE_CONV_UNIT(PRESSURE, BARS, "$*100000", "$/100000") + DECLARE_CONV_UNIT(PRESSURE, HECTOPASCALS, "$*100", "$/100") + DECLARE_CONV_UNIT(PRESSURE, KILOPASCALS, "$*1000", "$/1000") DECLARE_CONV_UNIT(PRESSURE, MM_OF_MERCURY, "$*133.322", "$/133.322") DECLARE_CONV_UNIT(PRESSURE, PASCALS, "$", "$") DECLARE_CONV_UNIT(PRESSURE, PSI, "$*6894.757", "$/6894.757") + DECLARE_CONV_END +}; + +/* + 1 day ....... = 86400 s + 1 hour ...... = 3600 s + 1 microsecond = 0.000001 s + 1 millisecond = 0.001 s + 1 minute .... = 60 s + 1 week ...... = 669600 s +*/ +static const conv_t conv_TIME[] = { + DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60") + DECLARE_CONV_UNIT(TIME, DAYS, "$*86400", "$/86400") + DECLARE_CONV_UNIT(TIME, HOURS, "$*3600", "$/3600") + DECLARE_CONV_UNIT(TIME, MILISECONDS, "$*0.001", "$/0.001") + DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001") + DECLARE_CONV_UNIT(TIME, SECONDS, "$", "$") + DECLARE_CONV_UNIT(TIME, WEEKS, "$*604800", "$/604800") + DECLARE_CONV_UNIT(TIME, YEARS, "$*31556952", "$/31556952") DECLARE_CONV_END }; @@ -305,14 +359,18 @@ }; /* - 1 f/h = 0.3048 m/s + 1 cm/s = 0.01 m/s + 1 f/h = 0.0000846666667 m/s + 1 f/s = 0.3048 m/s 1 Km/h = 10/36 m/s -> 0.27778 m/s 1 knot = 18.52/36 m/s -> 0.51444444 m/s 1 mach = 340.3 m/s 1 mph = 0.44704 m/s */ static const conv_t conv_VELOCITY[] = { - DECLARE_CONV_UNIT(VELOCITY, FEET_HOUR, "$*.3048", "$/.3048") + DECLARE_CONV_UNIT(VELOCITY, CMS_SECOND, "$*.01", "$/.01") + DECLARE_CONV_UNIT(VELOCITY, FEET_SECOND, "$*.3048", "$/.3048") + DECLARE_CONV_UNIT(VELOCITY, FEET_HOUR, "$*.0000846666667", "$/.0000846666667") DECLARE_CONV_UNIT(VELOCITY, KILOMETERS_HOUR, "$*10/36", "$*36/10") DECLARE_CONV_UNIT(VELOCITY, KNOTS, "$*18.52/36", "$*36/18.52") DECLARE_CONV_UNIT(VELOCITY, MACH, "$*340.3", "$/340.3") @@ -418,8 +476,8 @@ 1 stone ........... = 6350.29318 g 1 tamlung ......... = 1 ton ............. = 1000000 g - 1 ton uk .......... = 1016046.9088 g - 1 ton us .......... = 907184.74 g + 1 ton uk .......... = 1016046.9088 g // long ton + 1 ton us .......... = 907184.74 g // short ton */ static const conv_t conv_WEIGHT[] = { DECLARE_CONV_UNIT(WEIGHT, BAHT, "$*12.244", "$/12.244") @@ -452,6 +510,7 @@ }; static const conv_category_t conv_table[] = { + DECLARE_CONV_CAT(ANGLE) DECLARE_CONV_CAT(AREA) DECLARE_CONV_CAT(CONSUMPTION) DECLARE_CONV_CAT(CURRENCY) @@ -459,6 +518,7 @@ DECLARE_CONV_CAT(LENGTH) DECLARE_CONV_CAT(POWER) DECLARE_CONV_CAT(PRESSURE) + DECLARE_CONV_CAT(TIME) DECLARE_CONV_CAT(TEMPERATURE) DECLARE_CONV_CAT(VELOCITY) DECLARE_CONV_CAT(VOLUME) Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Øñòí",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Äñòí",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Îñì",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Äâîè÷",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Øñòí",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Äñòí",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Îñì",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Äâîè÷",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Îáð",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -341,38 +337,37 @@ SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE BEGIN POPUP "&Îáðàáîòêà" BEGIN - MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE END POPUP "Èçãëåä" BEGIN - MENUITEM "Îáèêíîâåí", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM "Îáèêíîâåí", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR MENUITEM "Ãðàäóñè\tF2", IDM_VIEW_DEG, CHECKED MENUITEM "Ðàäèàíè\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Ãðàäîâå\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED + MENUITEM "Ãðàäîâå\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT + MENUITEM "Ïîìîù", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT END END @@ -380,32 +375,32 @@ BEGIN POPUP "&Îáðàáîòêà" BEGIN - MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE END POPUP "Èçãëåä" BEGIN - MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Øåñòíaäåñåòè÷åí\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñåòè÷åí\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Îñìè÷åí\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâîè÷åí\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR MENUITEM "×äóìà\tF12", IDM_VIEW_QWORD, CHECKED MENUITEM "Ääóìà\tF2", IDM_VIEW_DWORD, CHECKED MENUITEM "Äóìà\tF3", IDM_VIEW_WORD, CHECKED MENUITEM "Áàéò\tF4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR - MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT + MENUITEM "Ïîìîù", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT END END @@ -413,22 +408,22 @@ BEGIN POPUP "&Îáðàáîòêà" BEGIN - MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Çàïîìíÿíå\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Ïîñòàâÿíå\tCTRL-V", IDM_EDIT_PASTE END POPUP "Èçãëåä" BEGIN - MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED + MENUITEM "Ñòàíäàðòíî", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷åí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçóâàíå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_VIEW_GROUP, CHECKED END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT + MENUITEM "Ïîìîù", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Çà ReactOS Calc", IDM_HELP_ABOUT END END @@ -444,6 +439,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Úãúë" IDS_CONV_AREA "Ïëîù" IDS_CONV_CONSUMPTION "Ïîòðåáëåíèå (äâèãàòåëè)" IDS_CONV_CURRENCY "Ïàðè÷íè åäèíèöè" @@ -452,9 +448,18 @@ IDS_CONV_POWER "Ìîùíîñò" IDS_CONV_PRESSURE "Íàëÿãàíå" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_TIME "Âðåìå" IDS_CONV_VELOCITY "Ñêîðîñò" IDS_CONV_VOLUME "Îáåì" IDS_CONV_WEIGHT "Òåãëî" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Ãðàäóñè" + IDS_ANGLE_GRADIANS "Ãðàäè" + IDS_ANGLE_RADIANS "Ðàäèàíè" END // TYPES OF AREAS @@ -511,9 +516,10 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "×åøêà êðîíà" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_EURO "Åâðî" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" @@ -530,12 +536,16 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C êàëîðèè" + IDS_ENERGY_15_C_CALORIES "15-ãðàäóñíè êàëîðèè" + IDS_ENERGY_BTUS "Áðèòàíñêè òåðìàëíè åäèíèöè" IDS_ENERGY_ERGS "Åðãîâå" + IDS_ENERGY_EVS "Åëåêòðîíâîëòè" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "Ìåæäóíàðîäíè òàáëè÷íè êàëîðèè" + IDS_ENERGY_IT_KILOCALORIES "Ìåæäóíàðîäíè òàáëè÷íè êèëîêàëîðèè" IDS_ENERGY_JOULES "Äæàóëè" IDS_ENERGY_KILOJOULES "Êèëîäæàóëè" - IDS_ENERGY_KILOWATT_HOURS "Êèëîâàò/ ÷àñîâå" + IDS_ENERGY_KILOWATT_HOURS "Êèëîâàò÷àñîâå" IDS_ENERGY_NUTRITION_CALORIES "Õðàíèòåëíè êàëîðèè" IDS_ENERGY_TH_CALORIES "Òîïëèííè êàëîðèè" END @@ -544,7 +554,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Àíãñòðüîìè" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Àñòðîíîìè÷åñêà åäèíèöà" IDS_LENGTH_BARLEYCORNS "Å÷åìè÷åíè çúðíà" IDS_LENGTH_CENTIMETERS "Ñàíòèìåòðè" IDS_LENGTH_CHAINS_UK "Âåðèãè (ÎÊ)" @@ -570,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "Ñâåòëèííè ãîäèíè" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Ìåòðè" + IDS_LENGTH_MICRONS "Ìèêðîìåòðè" IDS_LENGTH_MILES "Ìèëè" IDS_LENGTH_MILLIMETERS "Ìèëèìåòðè" IDS_LENGTH_NAUTICAL_MILES "Ìîðñêè ìèëè" @@ -578,6 +589,7 @@ IDS_LENGTH_PICAS "Äâàíàäåñåòêè (ïèêè)" IDS_LENGTH_RI_JAPAN "Ri (ÿïîíñêè)" IDS_LENGTH_RI_KOREA "Ri (êîðåéñêè)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -593,6 +605,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "Êîíñêè ñèëè" IDS_POWER_KILOWATTS "Êèëîâàòîâå" IDS_POWER_MEGAWATTS "Ìåãàâàòîâå" @@ -604,6 +618,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Àòìîñôåðè" IDS_PRESSURE_BARS "Áàðîâå" + IDS_PRESSURE_HECTOPASCALS "Õåêòîïàñêàëè" + IDS_PRESSURE_KILOPASCALS "Êèëîïàñêàëè" IDS_PRESSURE_MM_OF_MERCURY "Ìèëèìåòðè æèâà÷åí ñòúëá" IDS_PRESSURE_PASCALS "Ïàñêàëè" IDS_PRESSURE_PSI "Ïàóíäîâå íà êâàäðàòåí öîë" @@ -618,10 +634,25 @@ IDS_TEMPERATURE_RANKINE "Ðàíêèí" END +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Äíè" + IDS_TIME_HOURS "×àñè" + IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè" + IDS_TIME_MILISECONDS "Ìèëèñåêóíäè" + IDS_TIME_MINUTES "Ìèíóòè" + IDS_TIME_SECONDS "Ñåêóíäè" + IDS_TIME_WEEKS "Ñåäìèöè" + IDS_TIME_YEARS "Ãîäèíè" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Ñàíòèìåòðè/÷àñ" IDS_VELOCITY_FEET_HOUR "Ñòúïêè/÷àñ" + IDS_VELOCITY_FEET_SECOND "Ñòúïêè/ñåêóíäà" IDS_VELOCITY_KILOMETERS_HOUR "Êèëîìåòðè/÷àñ" IDS_VELOCITY_KNOTS "Âúçëè" IDS_VELOCITY_MACH "Ìàõîâå" Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -1,6 +1,6 @@ /* FILE: base/applications/calc/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-12-29 + * UPDATED: 2009-01-25 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -444,6 +444,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_TIME "Èas" IDS_CONV_LENGTH "Délka" IDS_CONV_ENERGY "Energie" IDS_CONV_WEIGHT "Hmotnost" @@ -451,10 +452,19 @@ IDS_CONV_VOLUME "Objem" IDS_CONV_AREA "Plocha" IDS_CONV_VELOCITY "Rychlost" - IDS_CONV_CONSUMPTION "Spotøeba (motory)" + IDS_CONV_CONSUMPTION "Spotøeba" IDS_CONV_TEMPERATURE "Teplota" IDS_CONV_PRESSURE "Tlak" + IDS_CONV_ANGLE "Úhel" IDS_CONV_POWER "Výkon" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_GRADIANS "Grady" + IDS_ANGLE_RADIANS "Radiány" + IDS_ANGLE_DEGREES "Stupnì" END // TYPES OF AREAS @@ -510,6 +520,7 @@ BEGIN IDS_CURRENCY_BELGIAN_FRANC "Belgický frank" + IDS_CURRENCY_CZECH_KORUNA "Èeská koruna" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finská marka" IDS_CURRENCY_FRENCH_FRANC "Francouzský frank" @@ -531,12 +542,16 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C kalorie" + IDS_ENERGY_15_C_CALORIES "15 °C kalorie" + IDS_ENERGY_BTUS "Britské termální jednotky" + IDS_ENERGY_EVS "Elektronvolty" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_ERGS "Ergy" IDS_ENERGY_JOULES "Jouly" IDS_ENERGY_KILOJOULES "Kilojouly" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hodiny" IDS_ENERGY_IT_CALORIES "Mezinárodní kalorie" + IDS_ENERGY_IT_KILOCALORIES "Mezinárodní kilokalorie" IDS_ENERGY_NUTRITION_CALORIES "Nutrièní kalorie" IDS_ENERGY_TH_CALORIES "Termochemické kalorie" END @@ -545,7 +560,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angströmy" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomické jednotky" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomické jednotky" IDS_LENGTH_BARLEYCORNS "Barleycorny" IDS_LENGTH_CENTIMETERS "Centimetry" IDS_LENGTH_CHAINS_UK "Chains (Gunter's chains) (UK)" @@ -568,6 +583,7 @@ IDS_LENGTH_LAR "Lar" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Metry" + IDS_LENGTH_MICRONS "Mikrony" IDS_LENGTH_MILES "Míle" IDS_LENGTH_MILLIMETERS "Milimetry" IDS_LENGTH_NAUTICAL_MILES "Námoøní míle" @@ -577,6 +593,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japonsko)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -594,6 +611,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "Britské termální jednotky za minutu" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds za minutu" IDS_POWER_HORSEPOWER "Koòské síly" IDS_POWER_KILOWATTS "Kilowatty" IDS_POWER_MEGAWATTS "Megawatty" @@ -605,6 +624,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmosféry" IDS_PRESSURE_BARS "Bary" + IDS_PRESSURE_HECTOPASCALS "Hektopascaly" + IDS_PRESSURE_KILOPASCALS "Kilopascaly" IDS_PRESSURE_PSI "Libry na ètvercový palec" IDS_PRESSURE_MM_OF_MERCURY "Milimetry rtuového sloupce" IDS_PRESSURE_PASCALS "Pascaly" @@ -619,14 +640,29 @@ IDS_TEMPERATURE_RANKINE "Rankina" END +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Dny" + IDS_TIME_HOURS "Hodiny" + IDS_TIME_MICROSECONDS "Mikrosekundy" + IDS_TIME_MILISECONDS "Milisekundy" + IDS_TIME_MINUTES "Minuty" + IDS_TIME_SECONDS "Sekundy" + IDS_TIME_YEARS "Roky" + IDS_TIME_WEEKS "Týdny" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_KILOMETERS_HOUR "Kilometry/hodinu" + IDS_VELOCITY_CMS_SECOND "Centimetry za hodinu" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometry za hodinu" IDS_VELOCITY_MACH "Machy" - IDS_VELOCITY_METERS_SECOND "Metry/sekundu" - IDS_VELOCITY_MILES_HOUR "Míle/hodinu" - IDS_VELOCITY_FEET_HOUR "Stopy/hodinu" + IDS_VELOCITY_METERS_SECOND "Metry za sekundu" + IDS_VELOCITY_MILES_HOUR "Míle za hodinu" + IDS_VELOCITY_FEET_HOUR "Stopy za hodinu" + IDS_VELOCITY_FEET_SECOND "Stopy za sekundu" IDS_VELOCITY_KNOTS "Uzly" END Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -540,7 +540,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angströms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomische Einheiten" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomische Einheiten" IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHOU "Chou" Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -439,6 +439,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Angle" IDS_CONV_AREA "Area" IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" @@ -447,9 +448,18 @@ IDS_CONV_POWER "Power" IDS_CONV_PRESSURE "Pressure" IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_TIME "Time" IDS_CONV_VELOCITY "Velocity" IDS_CONV_VOLUME "Volume" IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Degrees" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_RADIANS "Radians" END // TYPES OF AREAS @@ -506,6 +516,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" IDS_CURRENCY_EURO "Euro" @@ -525,9 +536,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_BTUS "British Thermal Units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" @@ -539,7 +554,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -565,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "Light years" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MICRONS "Microns" IDS_LENGTH_MILES "Miles" IDS_LENGTH_MILLIMETERS "Millimeters" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" @@ -573,6 +589,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -588,6 +605,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" IDS_POWER_MEGAWATTS "Megawatts" @@ -599,6 +618,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "Hectopascals" + IDS_PRESSURE_KILOPASCALS "Kilopascals" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" IDS_PRESSURE_PASCALS "Pascals" IDS_PRESSURE_PSI "Pounds-force per square inch" @@ -613,10 +634,25 @@ IDS_TEMPERATURE_RANKINE "Rankine" END +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Days" + IDS_TIME_HOURS "Hours" + IDS_TIME_MICROSECONDS "Microseconds" + IDS_TIME_MILISECONDS "Miliseconds" + IDS_TIME_MINUTES "Minutes" + IDS_TIME_SECONDS "Seconds" + IDS_TIME_WEEKS "Weeks" + IDS_TIME_YEARS "Years" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Centimeters/hour" IDS_VELOCITY_FEET_HOUR "Feet/hour" + IDS_VELOCITY_FEET_SECOND "Feet/second" IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -549,7 +549,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centímetros" IDS_LENGTH_CHAINS_UK "Cadenas (UK)" Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -539,7 +539,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstrom" - IDS_LENGTH_ASTRONOMILA_UNITS "Unità astronomiche" + IDS_LENGTH_ASTRONOMICAL_UNITS "Unità astronomiche" IDS_LENGTH_BARLEYCORNS "Barleycorn" IDS_LENGTH_CENTIMETERS "Centimetri" IDS_LENGTH_CHAINS_UK "Catene (GB)" Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -543,7 +543,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -544,7 +544,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -540,7 +540,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -551,7 +551,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angsztremów" - IDS_LENGTH_ASTRONOMILA_UNITS "Jednostek Astronomicznych" + IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostek Astronomicznych" IDS_LENGTH_BARLEYCORNS "Palców" IDS_LENGTH_CENTIMETERS "Centimetrów" IDS_LENGTH_CHAINS_UK "Chains (UK)" Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -341,7 +337,6 @@ SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -436,7 +431,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "Êàëüêóëÿòîð ReactOS - ñâîáîäíîå ïðîãðàììíîå îáåñïåöåíèå, ðàñïðîñòðàíÿþùååñÿ ïî ëèöåíçèè GNU GPL.\r\n\r\nÂû ìîæåòå ïîëó÷èòü êîïèþ ëèöåíçèè GNU GPL çäåñü:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nÏîëó÷èòü ïåðåâåäåííóþ íà âàø ÿçûê êîïèþ ëèöåíçèè GNU GPL ìîæíî çäåñü:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_STRING_LICENSE "Êàëüêóëÿòîð ReactOS - ñâîáîäíîå ïðîãðàììíîå îáåñïåöåíèå, ðàñïðîñòðàíÿþùååñÿ ïî ëèöåíçèè GNU GPL.\r\n\r\nÂû ìîæåòå ïîëó÷èòü êîïèþ ëèöåíçèè GNU GPL çäåñü:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nÎçíàêîìèòüñÿ c ïåðåâîäîì ëèöåíçèè GNU GPL ìîæíî çäåñü:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Îøèáêà" IDS_QUICKHELP "Áûñòðàÿ ñïðàâêà" END @@ -444,6 +439,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Óãîë" IDS_CONV_AREA "Ïëîùàäü" IDS_CONV_CONSUMPTION "Ðàñõîä òîïëèâà (äâèãàòåëè)" IDS_CONV_CURRENCY "Âàëþòà" @@ -452,9 +448,18 @@ IDS_CONV_POWER "Ìîùíîñòü" IDS_CONV_PRESSURE "Äàâëåíèå" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_TIME "Âðåìÿ" IDS_CONV_VELOCITY "Ñêîðîñòü" IDS_CONV_VOLUME "Îáúåì" IDS_CONV_WEIGHT "Âåñ" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "ãðàäóñ" + IDS_ANGLE_GRADIANS "ãðàä" + IDS_ANGLE_RADIANS "ðàäèàí" END // TYPES OF AREAS @@ -511,6 +516,7 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Àâñòðàëèéñêèé øèëëèíã" IDS_CURRENCY_BELGIAN_FRANC "Áåëüãèéñêèé ôðàíê" IDS_CURRENCY_CYPRIOT_POUND "Êèïðèîòñêèé ôóíò" + IDS_CURRENCY_CZECH_KORUNA "×åøñêàÿ êðîíà" IDS_CURRENCY_DEUTSCHE_MARK "Íåìåöêàÿ ìàðêà" IDS_CURRENCY_DUTCH_GUILDER "Ãîëëàíäñêèé ãóëüäåí" IDS_CURRENCY_EURO "Åâðî" @@ -530,9 +536,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "êàëîðèÿ ïàòíàäöàòèãðàäóñíàÿ" + IDS_ENERGY_15_C_CALORIES "êàëîðèÿ ïÿòíàäöàòèãðàäóñíàÿ" + IDS_ENERGY_BTUS "áðèòàíñêàÿ òåïëîâàÿ åäèíèöà" IDS_ENERGY_ERGS "ýðã" + IDS_ENERGY_EVS "ýëåêòðîíâîëüò" + IDS_ENERGY_FOOT_POUNDS "ôóòîôóíò" IDS_ENERGY_IT_CALORIES "êàëîðèÿ ìåæäóíàðîäíàÿ" + IDS_ENERGY_IT_KILOCALORIES "êèëîêàëîðèÿ ìåæäóíàðîäíàÿ" IDS_ENERGY_JOULES "äæîóëü" IDS_ENERGY_KILOJOULES "êèëîäæîóëü" IDS_ENERGY_KILOWATT_HOURS "êèëîâàòò-÷àñ" @@ -544,7 +554,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "àíãñòðåì" - IDS_LENGTH_ASTRONOMILA_UNITS "àñòðîíîìè÷åñêàÿ åäåíèöà" + IDS_LENGTH_ASTRONOMICAL_UNITS "àñòðîíîìè÷åñêàÿ åäåíèöà" IDS_LENGTH_BARLEYCORNS "áàðëåéêîðí" IDS_LENGTH_CENTIMETERS "ñàíòèìåòð" IDS_LENGTH_CHAINS_UK "÷åéí (áðèòàíñêèé)" @@ -570,6 +580,7 @@ IDS_LENGTH_LIGHT_YEARS "ñâåòîâîé ãîä" IDS_LENGTH_LINKS_UK "ëèíê (áðèòàíñêèé)" IDS_LENGTH_METERS "ìåòð" + IDS_LENGTH_MICRONS "ìèêðîìåòð" IDS_LENGTH_MILES "ìèëÿ" IDS_LENGTH_MILLIMETERS "ìèëëèìåòð" IDS_LENGTH_NAUTICAL_MILES "ìîðñêàÿ ìèëÿ" @@ -578,6 +589,7 @@ IDS_LENGTH_PICAS "ïèêà" IDS_LENGTH_RI_JAPAN "ðè (ÿïîíñêàÿ)" IDS_LENGTH_RI_KOREA "ðè (êîðåéñêàÿ)" + IDS_LENGTH_RODS "ðîä" IDS_LENGTH_SAWK "ñîóê" IDS_LENGTH_SEN "ñåí" IDS_LENGTH_SHAKU "øàêó" @@ -593,7 +605,9 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "ëîøàäèííàÿ ñèëà" + IDS_POWER_BTUS_PER_MINUTE "áðèòàíñêàÿ òåïëîâàÿ åäèíèöà â ìèíóòó" + IDS_POWER_FPS_PER_MINUTE "ôóòîôóíò â ìèíóòó" + IDS_POWER_HORSEPOWER "ëîøàäèíàÿ ñèëà" IDS_POWER_KILOWATTS "êèëîâàòò" IDS_POWER_MEGAWATTS "ìåãàâàòò" IDS_POWER_WATTS "âàòò" @@ -604,6 +618,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "àòìîñôåðà (ôèçè÷åñêàÿ)" IDS_PRESSURE_BARS "áàð" + IDS_PRESSURE_HECTOPASCALS "ãåêòîïàñêàëü" + IDS_PRESSURE_KILOPASCALS "êèëîïàñêàëü" IDS_PRESSURE_MM_OF_MERCURY "ìèëëèìåòð ðòóòíîãî ñòîëáà" IDS_PRESSURE_PASCALS "ïàñêàëü" IDS_PRESSURE_PSI "ôóíò íà êâàäðàòíûé äþéì" @@ -618,15 +634,30 @@ IDS_TEMPERATURE_RANKINE "ãðàäóñ (ïî øêàëå Rankine)" END +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "äåíü" + IDS_TIME_HOURS "÷àñ" + IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà" + IDS_TIME_MILISECONDS "ìèëëèñåêóíäà" + IDS_TIME_MINUTES "ìèíóòà" + IDS_TIME_SECONDS "ñåêóíäà" + IDS_TIME_WEEKS "íåäåëÿ" + IDS_TIME_YEARS "ãîä" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "ñàíòèìåòð â ÷àñ" IDS_VELOCITY_FEET_HOUR "ôóò â ÷àñ" - IDS_VELOCITY_KILOMETERS_HOUR "êèëîìåòð/÷àñ" + IDS_VELOCITY_FEET_SECOND "ôóò â ñåêóíäó" + IDS_VELOCITY_KILOMETERS_HOUR "êèëîìåòð â ÷àñ" IDS_VELOCITY_KNOTS "óçåë" IDS_VELOCITY_MACH "ìàõ" IDS_VELOCITY_METERS_SECOND "ìåòð â ñåêóíäó" - IDS_VELOCITY_MILES_HOUR "ìèëü â ÷àñ" + IDS_VELOCITY_MILES_HOUR "ìèëÿ â ÷àñ" END // TYPES OF VOLUMES @@ -646,8 +677,8 @@ IDS_VOLUME_FLUID_OUNCES_UK "æèäêàÿ óíöèÿ (áðèòàíñêàÿ)" IDS_VOLUME_FLUID_OUNCES_US "æèäêàÿ óíöèÿ (ÑØÀ)" IDS_VOLUME_GALLONS_UK "ãàëëîí (áðèòàíñêèé)" - IDS_VOLUME_GALLONS_DRY_US "ãàëëîí (äëÿ æèäêîñòåé, ÑØÀ)" - IDS_VOLUME_GALLONS_LIQUID_US "ãàëëîí (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_GALLONS_DRY_US "ãàëëîí (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_GALLONS_LIQUID_US "ãàëëîí (äëÿ æèäêîñòåé, ÑØÀ)" IDS_VOLUME_GOU "ãîó" IDS_VOLUME_HOP "õîï" IDS_VOLUME_ICCE "èêêý" @@ -656,11 +687,11 @@ IDS_VOLUME_MAL "ìàëü" IDS_VOLUME_MILLILITERS "ìèëëèëèòð" IDS_VOLUME_PINTS_UK "ïèíòà (áðèòàíñêàÿ)" - IDS_VOLUME_PINTS_DRY_US "ïèíòà (äëÿ æèäêîñòåé, ÑØÀ)" - IDS_VOLUME_PINTS_LIQUID_US "ïèíòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_PINTS_DRY_US "ïèíòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_PINTS_LIQUID_US "ïèíòà (äëÿ æèäêîñòåé, ÑØÀ)" IDS_VOLUME_QUARTS_UK "êâàðòà (áðèòàíñêàÿ)" - IDS_VOLUME_QUARTS_DRY_US "êâàðòà (äëÿ æèäêîñòåé, ÑØÀ)" - IDS_VOLUME_QUARTS_LIQUID_US "êâàðòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_QUARTS_DRY_US "êâàðòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_QUARTS_LIQUID_US "êâàðòà (äëÿ æèäêîñòåé, ÑØÀ)" IDS_VOLUME_SEKI "ñýêè" IDS_VOLUME_SYOU "ñ¸" IDS_VOLUME_TANANLOUNG "òàíàíëóíã" @@ -687,7 +718,7 @@ IDS_WEIGHT_LIANG_CHINA "ëèàíã (êèòàéñêèé)" IDS_WEIGHT_LIANG_TAIWAN "ëèàíã (òàéâàíü)" IDS_WEIGHT_MONME "ìîíì" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíöèÿ (àìåðèêàíñêàÿ)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíöèÿ (òîðãîâàÿ)" IDS_WEIGHT_OUNCES_TROY "óíöèÿ (òðîéñêàÿ)" IDS_WEIGHT_POUNDS "ôóíò" IDS_WEIGHT_QUINTAL_METRIC "êâèíòàë (ìåòðè÷åñêèé)" @@ -695,6 +726,6 @@ IDS_WEIGHT_STONES "ñòîóí" IDS_WEIGHT_TAMLUNG "òàìëóíã" IDS_WEIGHT_TONNES "òîííà" - IDS_WEIGHT_TONS_UK "òîííà (UK)" - IDS_WEIGHT_TONS_US "òîííà (US)" -END + IDS_WEIGHT_TONS_UK "òîííà (áðèòàíñêàÿ)" + IDS_WEIGHT_TONS_US "òîííà (ÑØÀ)" +END Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -548,7 +548,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimetre" IDS_LENGTH_CHAINS_UK "Chains (UK)" Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -1,6 +1,6 @@ /* * ReactOS Calc (Thai resource file) - * Last modified: 2008-12-29 + * Last modified: 2009-01-27 */ LANGUAGE LANG_THAI, SUBLANG_DEFAULT @@ -444,6 +444,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "ÁØÁ" IDS_CONV_AREA "¾×é¹·Õè" IDS_CONV_CONSUMPTION "Consumption (engines)" IDS_CONV_CURRENCY "Currencies" @@ -452,9 +453,18 @@ IDS_CONV_POWER "Power" IDS_CONV_PRESSURE "Pressure" IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_TIME "àÇÅÒ" IDS_CONV_VELOCITY "Velocity" IDS_CONV_VOLUME "Volume" IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Í§ÈÒ" + IDS_ANGLE_GRADIANS "à¡Ãà´ÕÂ¹" + IDS_ANGLE_RADIANS "àÃà´ÕÂ¹" END // TYPES OF AREAS @@ -511,9 +521,10 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "Czech koruna" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_EURO "ÂÙâÃ" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" @@ -530,9 +541,13 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_15_C_CALORIES "15 ^0C á¤ÅÍÃÕ" + IDS_ENERGY_BTUS "British Thermal Units" IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" @@ -544,7 +559,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -570,6 +585,7 @@ IDS_LENGTH_LIGHT_YEARS "Light years" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MICRONS "Microns" IDS_LENGTH_MILES "Miles" IDS_LENGTH_MILLIMETERS "Millimeters" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" @@ -578,6 +594,7 @@ IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -593,6 +610,8 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" IDS_POWER_HORSEPOWER "Horsepower" IDS_POWER_KILOWATTS "Kilowatts" IDS_POWER_MEGAWATTS "Megawatts" @@ -604,6 +623,8 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "Hectopascals" + IDS_PRESSURE_KILOPASCALS "Kilopascals" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" IDS_PRESSURE_PASCALS "Pascals" IDS_PRESSURE_PSI "Pounds-force per square inch" @@ -618,10 +639,25 @@ IDS_TEMPERATURE_RANKINE "Rankine" END +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Days" + IDS_TIME_HOURS "Hours" + IDS_TIME_MICROSECONDS "Microseconds" + IDS_TIME_MILISECONDS "Miliseconds" + IDS_TIME_MINUTES "Minutes" + IDS_TIME_SECONDS "Seconds" + IDS_TIME_WEEKS "Weeks" + IDS_TIME_YEARS "Years" +END + // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Centimeters/hour" IDS_VELOCITY_FEET_HOUR "Feet/hour" + IDS_VELOCITY_FEET_SECOND "Feet/second" IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Calculator * LICENSE: GPL - See COPYING in the top level directory - * FILE: rosapps/roscalc/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for roscalc + * FILE: base/applications/calc/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS Calc * TRANSLATOR: Artem Reznikov */ @@ -17,14 +17,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -249,10 +245,10 @@ LTEXT "Êàòåãîð³ÿ:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Âèõ³äíà âåëè÷èíà (""ç""):",IDC_STATIC,4,49,56,8 + LTEXT "Âèõ³äíà âåëè÷èíà (\"ç\"):",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Ê³íöåâà âåëè÷èíà (""â""):",IDC_STATIC,4,76,56,8 + LTEXT "Ê³íöåâà âåëè÷èíà (\"â\"):",IDC_STATIC,4,76,56,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | @@ -349,7 +345,6 @@ SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -452,6 +447,7 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN + IDS_CONV_ANGLE "Êóò" IDS_CONV_AREA "Ïëîùà" IDS_CONV_CONSUMPTION "Âèòðàòà ïàëèâà (äâèãóíè)" IDS_CONV_CURRENCY "Âàëþòà" @@ -460,9 +456,18 @@ IDS_CONV_POWER "Ïîòóæí³ñòü" IDS_CONV_PRESSURE "Òèñê" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_TIME "×àñ" IDS_CONV_VELOCITY "Øâèäê³ñòü" IDS_CONV_VOLUME "Îá'ºì" IDS_CONV_WEIGHT "Âàãà" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "ãðàäóñ" + IDS_ANGLE_GRADIANS "ãðàä" + IDS_ANGLE_RADIANS "ðàä³àí" END // TYPES OF AREAS @@ -493,7 +498,7 @@ IDS_AREA_SQUARE_INCHES "Square inches" IDS_AREA_SQUARE_KILOMETERS "Square kilometers" IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" + IDS_AREA_SQUARE_METER "êâàäðàòíèé ìåòð" IDS_AREA_SQUARE_MILES "Square miles" IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" IDS_AREA_SQUARE_SHAKU "Square shaku" @@ -519,9 +524,10 @@ IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_CZECH_KORUNA "×åñüêà êðîíà" IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_EURO "ªâðî" IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" IDS_CURRENCY_FRENCH_FRANC "French franc" IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" @@ -538,21 +544,25 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" - IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_IT_CALORIES "International Table calories" - IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_15_C_CALORIES "êàëîð³ÿ 15-ãðàäóñíà" + IDS_ENERGY_BTUS "áðèòàíñüêà òåïëîâà îäèíèöÿ" + IDS_ENERGY_ERGS "åðã" + IDS_ENERGY_EVS "åëåêòðîíâîëüò" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_IT_CALORIES "êàëîð³ÿ ì³æíàðîäíà" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "äæîóëü" IDS_ENERGY_KILOJOULES "Kilojoules" IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_TH_CALORIES "êàëîð³ÿ òåðìîõ³ì³÷íà" END // TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_ANGSTROMS "àíãñòðåì" + IDS_LENGTH_ASTRONOMICAL_UNITS "àñòðîíîì³÷íà îäèíèöÿ" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeters" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -575,17 +585,19 @@ IDS_LENGTH_KEUB "Keub" IDS_LENGTH_KILOMETERS "Kilometers" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LIGHT_YEARS "ñâ³òëîâèé ð³ê" IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" + IDS_LENGTH_METERS "ìåòð" + IDS_LENGTH_MICRONS "ì³êðîìåòð" + IDS_LENGTH_MILES "ìèëÿ" + IDS_LENGTH_MILLIMETERS "ì³ë³ìåòð" IDS_LENGTH_NAUTICAL_MILES "Nautical miles" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PARSECS "ïàðñåê" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -601,10 +613,12 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "Horsepower" - IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" - IDS_POWER_WATTS "Watts" + IDS_POWER_BTUS_PER_MINUTE "áðèòàíñüêà òåïëîâà îäèíèöÿ çà õâèëèíó" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" + IDS_POWER_HORSEPOWER "ê³íñüêà ñèëà" + IDS_POWER_KILOWATTS "ê³ëîâàò" + IDS_POWER_MEGAWATTS "ìåãàâàò" + IDS_POWER_WATTS "âàò" END // TYPE OF PRESSURES @@ -612,25 +626,42 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmospheres" IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "ãåêòîïàñêàëü" + IDS_PRESSURE_KILOPASCALS "ê³ëîïàñêàëü" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PASCALS "ïàñêàëü" IDS_PRESSURE_PSI "Pounds-force per square inch" END // TYPES OF TEMPERATURES STRINGTABLE DISCARDABLE BEGIN - IDS_TEMPERATURE_CELSIUS "Celsius" - IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" - IDS_TEMPERATURE_KELVIN "Kelvin" - IDS_TEMPERATURE_RANKINE "Rankine" + IDS_TEMPERATURE_CELSIUS "ãðàäóñ (çà øêàëîþ Öåëüñ³ÿ)" + IDS_TEMPERATURE_FAHRENHEIT "ãðàäóñ (çà øêàëîþ Ôàðåíãåéòà)" + IDS_TEMPERATURE_KELVIN "ãðàäóñ (çà øêàëîþ Êåëüâ³íà)" + IDS_TEMPERATURE_RANKINE "ãðàäóñ (çà øêàëîþ Ðàíê³íà)" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "äîáà" + IDS_TIME_HOURS "ãîäèíà" + IDS_TIME_MICROSECONDS "ì³êðîñåêóíäà" + IDS_TIME_MILISECONDS "ì³ë³ñåêóíäà" + IDS_TIME_MINUTES "õâèëèíà" + IDS_TIME_SECONDS "ñåêóíäà" + IDS_TIME_WEEKS "òèæäåíü" + IDS_TIME_YEARS "ð³ê" END // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN + IDS_VELOCITY_CMS_SECOND "Centimeters/hour" IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" + IDS_VELOCITY_FEET_SECOND "Feet/second" + IDS_VELOCITY_KILOMETERS_HOUR "ê³ëîìåòð çà ãîäèíó" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" IDS_VELOCITY_METERS_SECOND "Meters/second" @@ -695,9 +726,9 @@ IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" - IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíö³ÿ òîðãîâåëüíà" + IDS_WEIGHT_OUNCES_TROY "óíö³ÿ òðîéñüêà" + IDS_WEIGHT_POUNDS "ôóíò" IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_STONES "Stones" Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Mon Jan 26 16:27:19 2009 @@ -104,226 +104,256 @@ #define IDC_BUTTON_RSH 1093 /* TYPES OF CONVERSIONS */ -#define IDS_CONV_AREA 2000 -#define IDS_CONV_CONSUMPTION 2001 -#define IDS_CONV_CURRENCY 2002 -#define IDS_CONV_ENERGY 2003 -#define IDS_CONV_LENGTH 2004 -#define IDS_CONV_POWER 2005 -#define IDS_CONV_PRESSURE 2006 -#define IDS_CONV_TEMPERATURE 2007 -#define IDS_CONV_VELOCITY 2008 -#define IDS_CONV_VOLUME 2009 -#define IDS_CONV_WEIGHT 2010 +#define IDS_CONV_ANGLE 2000 +#define IDS_CONV_AREA 2001 +#define IDS_CONV_CONSUMPTION 2002 +#define IDS_CONV_CURRENCY 2003 +#define IDS_CONV_ENERGY 2004 +#define IDS_CONV_LENGTH 2005 +#define IDS_CONV_POWER 2006 +#define IDS_CONV_PRESSURE 2007 +#define IDS_CONV_TEMPERATURE 2008 +#define IDS_CONV_TIME 2009 +#define IDS_CONV_VELOCITY 2010 +#define IDS_CONV_VOLUME 2011 +#define IDS_CONV_WEIGHT 2012 + +/* TYPES OF ANGLES */ +#define IDS_ANGLE_DEGREES 2100 +#define IDS_ANGLE_GRADIANS 2101 +#define IDS_ANGLE_RADIANS 2102 /* TYPES OF AREAS */ -#define IDS_AREA_ACRES 2100 -#define IDS_AREA_ACRES_BRAZIL 2101 -#define IDS_AREA_ACRES_FRANCE 2102 -#define IDS_AREA_ACRES_SCOTS 2103 -#define IDS_AREA_ACRES_US 2104 -#define IDS_AREA_ARES 2105 -#define IDS_AREA_CHOU 2106 -#define IDS_AREA_DANBO 2107 -#define IDS_AREA_HECTARES 2108 -#define IDS_AREA_JEONGBO 2109 -#define IDS_AREA_MORGEN_HUNGARY 2110 -#define IDS_AREA_MU 2111 -#define IDS_AREA_PING 2112 -#define IDS_AREA_PYEONG 2113 -#define IDS_AREA_PYEONGBANGJA 2114 -#define IDS_AREA_RAI 2115 -#define IDS_AREA_SE 2116 -#define IDS_AREA_SQUARE_CENTIMETERS 2117 -#define IDS_AREA_SQUARE_CHR 2118 -#define IDS_AREA_SQUARE_FATHOMS 2119 -#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2120 -#define IDS_AREA_SQUARE_FEET 2121 -#define IDS_AREA_SQUARE_INCHES 2122 -#define IDS_AREA_SQUARE_KILOMETERS 2123 -#define IDS_AREA_SQUARE_LAR 2124 -#define IDS_AREA_SQUARE_METER 2125 -#define IDS_AREA_SQUARE_MILES 2126 -#define IDS_AREA_SQUARE_MILLIMETERS 2127 -#define IDS_AREA_SQUARE_SHAKU 2128 -#define IDS_AREA_SQUARE_TSUEN 2129 -#define IDS_AREA_SQUARE_VA 2130 -#define IDS_AREA_SQUARE_YARD 2131 -#define IDS_AREA_TAN 2132 -#define IDS_AREA_TSUBO 2133 +#define IDS_AREA_ACRES 2200 +#define IDS_AREA_ACRES_BRAZIL 2201 +#define IDS_AREA_ACRES_FRANCE 2202 +#define IDS_AREA_ACRES_SCOTS 2203 +#define IDS_AREA_ACRES_US 2204 +#define IDS_AREA_ARES 2205 +#define IDS_AREA_CHOU 2206 +#define IDS_AREA_DANBO 2207 +#define IDS_AREA_HECTARES 2208 +#define IDS_AREA_JEONGBO 2209 +#define IDS_AREA_MORGEN_HUNGARY 2210 +#define IDS_AREA_MU 2211 +#define IDS_AREA_PING 2212 +#define IDS_AREA_PYEONG 2213 +#define IDS_AREA_PYEONGBANGJA 2214 +#define IDS_AREA_RAI 2215 +#define IDS_AREA_SE 2216 +#define IDS_AREA_SQUARE_CENTIMETERS 2217 +#define IDS_AREA_SQUARE_CHR 2218 +#define IDS_AREA_SQUARE_FATHOMS 2219 +#define IDS_AREA_SQUARE_FATHOMS_HUNGARY 2220 +#define IDS_AREA_SQUARE_FEET 2221 +#define IDS_AREA_SQUARE_INCHES 2222 +#define IDS_AREA_SQUARE_KILOMETERS 2223 +#define IDS_AREA_SQUARE_LAR 2224 +#define IDS_AREA_SQUARE_METER 2225 +#define IDS_AREA_SQUARE_MILES 2226 +#define IDS_AREA_SQUARE_MILLIMETERS 2227 +#define IDS_AREA_SQUARE_SHAKU 2228 +#define IDS_AREA_SQUARE_TSUEN 2229 +#define IDS_AREA_SQUARE_VA 2230 +#define IDS_AREA_SQUARE_YARD 2231 +#define IDS_AREA_TAN 2232 +#define IDS_AREA_TSUBO 2233 /* TYPES OF COMSUMPTIONS */ -#define IDS_CONSUMPTION_KM_PER_L 2200 -#define IDS_CONSUMPTION_L_PER_100_KM 2201 -#define IDS_CONSUMPTION_MILES_GALLON_UK 2202 -#define IDS_CONSUMPTION_MILES_GALLON_US 2203 +#define IDS_CONSUMPTION_KM_PER_L 2300 +#define IDS_CONSUMPTION_L_PER_100_KM 2301 +#define IDS_CONSUMPTION_MILES_GALLON_UK 2302 +#define IDS_CONSUMPTION_MILES_GALLON_US 2303 /* TYPES OF CURRENCIES */ -#define IDS_CURRENCY_AUSTRIAN_SCHILLING 2300 -#define IDS_CURRENCY_BELGIAN_FRANC 2301 -#define IDS_CURRENCY_CYPRIOT_POUND 2302 -#define IDS_CURRENCY_DEUTSCHE_MARK 2303 -#define IDS_CURRENCY_DUTCH_GUILDER 2304 -#define IDS_CURRENCY_EURO 2305 -#define IDS_CURRENCY_FINNISH_MARKKA 2306 -#define IDS_CURRENCY_FRENCH_FRANC 2307 -#define IDS_CURRENCY_GREEK_DRACHMA 2308 -#define IDS_CURRENCY_IRISH_POUND 2309 -#define IDS_CURRENCY_ITALIAN_LIRA 2310 -#define IDS_CURRENCY_LUXEMBOURG_FRANC 2311 -#define IDS_CURRENCY_MALTESE_LIRA 2312 -#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2313 -#define IDS_CURRENCY_SLOVAK_KORUNA 2314 -#define IDS_CURRENCY_SLOVENIAN_TOLAR 2315 -#define IDS_CURRENCY_SPANISH_PESETA 2316 +#define IDS_CURRENCY_AUSTRIAN_SCHILLING 2400 +#define IDS_CURRENCY_BELGIAN_FRANC 2401 +#define IDS_CURRENCY_CYPRIOT_POUND 2402 +#define IDS_CURRENCY_CZECH_KORUNA 2403 +#define IDS_CURRENCY_DEUTSCHE_MARK 2404 +#define IDS_CURRENCY_DUTCH_GUILDER 2405 +#define IDS_CURRENCY_EURO 2406 +#define IDS_CURRENCY_FINNISH_MARKKA 2407 +#define IDS_CURRENCY_FRENCH_FRANC 2408 +#define IDS_CURRENCY_GREEK_DRACHMA 2409 +#define IDS_CURRENCY_IRISH_POUND 2410 +#define IDS_CURRENCY_ITALIAN_LIRA 2411 +#define IDS_CURRENCY_LUXEMBOURG_FRANC 2412 +#define IDS_CURRENCY_MALTESE_LIRA 2413 +#define IDS_CURRENCY_PORTOGUESE_ESCUDO 2414 +#define IDS_CURRENCY_SLOVAK_KORUNA 2415 +#define IDS_CURRENCY_SLOVENIAN_TOLAR 2416 +#define IDS_CURRENCY_SPANISH_PESETA 2417 /* TYPES OF ENERGIES */ -#define IDS_ENERGY_15_C_CALORIES 2400 -#define IDS_ENERGY_ERGS 2401 -#define IDS_ENERGY_IT_CALORIES 2402 -#define IDS_ENERGY_JOULES 2403 -#define IDS_ENERGY_KILOJOULES 2404 -#define IDS_ENERGY_KILOWATT_HOURS 2405 -#define IDS_ENERGY_NUTRITION_CALORIES 2406 -#define IDS_ENERGY_TH_CALORIES 2407 +#define IDS_ENERGY_15_C_CALORIES 2500 +#define IDS_ENERGY_BTUS 2501 +#define IDS_ENERGY_ERGS 2502 +#define IDS_ENERGY_EVS 2503 +#define IDS_ENERGY_FOOT_POUNDS 2504 +#define IDS_ENERGY_IT_CALORIES 2505 +#define IDS_ENERGY_IT_KILOCALORIES 2506 +#define IDS_ENERGY_JOULES 2507 +#define IDS_ENERGY_KILOJOULES 2508 +#define IDS_ENERGY_KILOWATT_HOURS 2509 +#define IDS_ENERGY_NUTRITION_CALORIES 2510 +#define IDS_ENERGY_TH_CALORIES 2511 /* TYPES OF LENGTHS */ -#define IDS_LENGTH_ANGSTROMS 2500 -#define IDS_LENGTH_ASTRONOMILA_UNITS 2501 -#define IDS_LENGTH_BARLEYCORNS 2502 -#define IDS_LENGTH_CENTIMETERS 2503 -#define IDS_LENGTH_CHAINS_UK 2504 -#define IDS_LENGTH_CHI 2505 -#define IDS_LENGTH_CHOU 2506 -#define IDS_LENGTH_CHR 2507 -#define IDS_LENGTH_CUN 2508 -#define IDS_LENGTH_FATHOMS 2509 -#define IDS_LENGTH_FATHOMS_HUNGARY 2510 -#define IDS_LENGTH_FEET 2511 -#define IDS_LENGTH_FURLONGS 2512 -#define IDS_LENGTH_GAN 2513 -#define IDS_LENGTH_HANDS 2514 -#define IDS_LENGTH_HUNH 2515 -#define IDS_LENGTH_INCHES 2516 -#define IDS_LENGTH_JA 2517 -#define IDS_LENGTH_JEONG 2518 -#define IDS_LENGTH_KABIET 2519 -#define IDS_LENGTH_KEN 2520 -#define IDS_LENGTH_KEUB 2521 -#define IDS_LENGTH_KILOMETERS 2522 -#define IDS_LENGTH_LAR 2523 -#define IDS_LENGTH_LIGHT_YEARS 2524 -#define IDS_LENGTH_LINKS_UK 2525 -#define IDS_LENGTH_METERS 2526 -#define IDS_LENGTH_MILES 2527 -#define IDS_LENGTH_MILLIMETERS 2528 -#define IDS_LENGTH_NAUTICAL_MILES 2529 -#define IDS_LENGTH_NIEU 2530 -#define IDS_LENGTH_PARSECS 2531 -#define IDS_LENGTH_PICAS 2532 -#define IDS_LENGTH_RI_JAPAN 2533 -#define IDS_LENGTH_RI_KOREA 2534 -#define IDS_LENGTH_SAWK 2535 -#define IDS_LENGTH_SEN 2536 -#define IDS_LENGTH_SHAKU 2537 -#define IDS_LENGTH_SPAN 2538 -#define IDS_LENGTH_SUN 2539 -#define IDS_LENGTH_TSUEN 2540 -#define IDS_LENGTH_VA 2541 -#define IDS_LENGTH_YARDS 2542 -#define IDS_LENGTH_YOTE 2543 -#define IDS_LENGTH_ZHANG 2544 +#define IDS_LENGTH_ANGSTROMS 2600 +#define IDS_LENGTH_ASTRONOMICAL_UNITS 2601 +#define IDS_LENGTH_BARLEYCORNS 2602 +#define IDS_LENGTH_CENTIMETERS 2603 +#define IDS_LENGTH_CHAINS_UK 2604 +#define IDS_LENGTH_CHI 2605 +#define IDS_LENGTH_CHOU 2606 +#define IDS_LENGTH_CHR 2607 +#define IDS_LENGTH_CUN 2608 +#define IDS_LENGTH_FATHOMS 2609 +#define IDS_LENGTH_FATHOMS_HUNGARY 2610 +#define IDS_LENGTH_FEET 2611 +#define IDS_LENGTH_FURLONGS 2612 +#define IDS_LENGTH_GAN 2613 +#define IDS_LENGTH_HANDS 2614 +#define IDS_LENGTH_HUNH 2615 +#define IDS_LENGTH_INCHES 2616 +#define IDS_LENGTH_JA 2617 +#define IDS_LENGTH_JEONG 2618 +#define IDS_LENGTH_KABIET 2619 +#define IDS_LENGTH_KEN 2620 +#define IDS_LENGTH_KEUB 2621 +#define IDS_LENGTH_KILOMETERS 2622 +#define IDS_LENGTH_LAR 2623 +#define IDS_LENGTH_LIGHT_YEARS 2624 +#define IDS_LENGTH_LINKS_UK 2625 +#define IDS_LENGTH_METERS 2626 +#define IDS_LENGTH_MICRONS 2627 +#define IDS_LENGTH_MILES 2628 +#define IDS_LENGTH_MILLIMETERS 2629 +#define IDS_LENGTH_NAUTICAL_MILES 2630 +#define IDS_LENGTH_NIEU 2631 +#define IDS_LENGTH_PARSECS 2632 +#define IDS_LENGTH_PICAS 2633 +#define IDS_LENGTH_RODS 2634 +#define IDS_LENGTH_RI_JAPAN 2635 +#define IDS_LENGTH_RI_KOREA 2636 +#define IDS_LENGTH_SAWK 2637 +#define IDS_LENGTH_SEN 2638 +#define IDS_LENGTH_SHAKU 2639 +#define IDS_LENGTH_SPAN 2640 +#define IDS_LENGTH_SUN 2641 +#define IDS_LENGTH_TSUEN 2642 +#define IDS_LENGTH_VA 2643 +#define IDS_LENGTH_YARDS 2644 +#define IDS_LENGTH_YOTE 2645 +#define IDS_LENGTH_ZHANG 2646 /* TYPES OF POWERS */ -#define IDS_POWER_HORSEPOWER 2600 -#define IDS_POWER_KILOWATTS 2601 -#define IDS_POWER_MEGAWATTS 2602 -#define IDS_POWER_WATTS 2603 +#define IDS_POWER_BTUS_PER_MINUTE 2700 +#define IDS_POWER_FPS_PER_MINUTE 2701 +#define IDS_POWER_HORSEPOWER 2702 +#define IDS_POWER_KILOWATTS 2703 +#define IDS_POWER_MEGAWATTS 2704 +#define IDS_POWER_WATTS 2705 /* TYPE OF PRESSURES */ -#define IDS_PRESSURE_ATMOSPHERES 2701 -#define IDS_PRESSURE_BARS 2702 -#define IDS_PRESSURE_MM_OF_MERCURY 2703 -#define IDS_PRESSURE_PASCALS 2704 -#define IDS_PRESSURE_PSI 2705 +#define IDS_PRESSURE_ATMOSPHERES 2800 +#define IDS_PRESSURE_BARS 2801 +#define IDS_PRESSURE_HECTOPASCALS 2802 +#define IDS_PRESSURE_KILOPASCALS 2803 +#define IDS_PRESSURE_MM_OF_MERCURY 2804 +#define IDS_PRESSURE_PASCALS 2805 +#define IDS_PRESSURE_PSI 2806 /* TYPES OF TEMPERATURES */ -#define IDS_TEMPERATURE_CELSIUS 2800 -#define IDS_TEMPERATURE_FAHRENHEIT 2801 -#define IDS_TEMPERATURE_KELVIN 2802 -#define IDS_TEMPERATURE_RANKINE 2803 +#define IDS_TEMPERATURE_CELSIUS 2900 +#define IDS_TEMPERATURE_FAHRENHEIT 2901 +#define IDS_TEMPERATURE_KELVIN 2902 +#define IDS_TEMPERATURE_RANKINE 2903 + +/* TYPE OF TIME */ +#define IDS_TIME_DAYS 3001 +#define IDS_TIME_HOURS 3002 +#define IDS_TIME_MICROSECONDS 3003 +#define IDS_TIME_MILISECONDS 3004 +#define IDS_TIME_MINUTES 3005 +#define IDS_TIME_SECONDS 3006 +#define IDS_TIME_WEEKS 3007 +#define IDS_TIME_YEARS 3008 /* TYPES OF VELOCITIES */ -#define IDS_VELOCITY_FEET_HOUR 2900 -#define IDS_VELOCITY_KILOMETERS_HOUR 2901 -#define IDS_VELOCITY_KNOTS 2902 -#define IDS_VELOCITY_MACH 2903 -#define IDS_VELOCITY_METERS_SECOND 2904 -#define IDS_VELOCITY_MILES_HOUR 2905 +#define IDS_VELOCITY_CMS_SECOND 3100 +#define IDS_VELOCITY_FEET_SECOND 3101 +#define IDS_VELOCITY_FEET_HOUR 3102 +#define IDS_VELOCITY_KILOMETERS_HOUR 3103 +#define IDS_VELOCITY_KNOTS 3104 +#define IDS_VELOCITY_MACH 3105 +#define IDS_VELOCITY_METERS_SECOND 3106 +#define IDS_VELOCITY_MILES_HOUR 3107 /* TYPES OF VOLUMES */ -#define IDS_VOLUME_BARRELS_UK 3000 -#define IDS_VOLUME_BARRELS_OIL 3001 -#define IDS_VOLUME_BUN 3002 -#define IDS_VOLUME_BUSHELS_UK 3003 -#define IDS_VOLUME_BUSHELS_US 3004 -#define IDS_VOLUME_CUBIC_CENTIMETERS 3005 -#define IDS_VOLUME_CUBIC_FEET 3006 -#define IDS_VOLUME_CUBIC_INCHES 3007 -#define IDS_VOLUME_CUBIC_METERS 3008 -#define IDS_VOLUME_CUBIC_YARDS 3009 -#define IDS_VOLUME_DOE 3010 -#define IDS_VOLUME_FLUID_OUNCES_UK 3011 -#define IDS_VOLUME_FLUID_OUNCES_US 3012 -#define IDS_VOLUME_GALLONS_UK 3013 -#define IDS_VOLUME_GALLONS_DRY_US 3014 -#define IDS_VOLUME_GALLONS_LIQUID_US 3015 -#define IDS_VOLUME_GOU 3016 -#define IDS_VOLUME_HOP 3017 -#define IDS_VOLUME_ICCE 3018 -#define IDS_VOLUME_KWIAN 3019 -#define IDS_VOLUME_LITERS 3020 -#define IDS_VOLUME_MAL 3021 -#define IDS_VOLUME_MILLILITERS 3022 -#define IDS_VOLUME_PINTS_UK 3023 -#define IDS_VOLUME_PINTS_DRY_US 3024 -#define IDS_VOLUME_PINTS_LIQUID_US 3025 -#define IDS_VOLUME_QUARTS_UK 3026 -#define IDS_VOLUME_QUARTS_DRY_US 3027 -#define IDS_VOLUME_QUARTS_LIQUID_US 3028 -#define IDS_VOLUME_SEKI 3029 -#define IDS_VOLUME_SYOU 3030 -#define IDS_VOLUME_TANANLOUNG 3031 -#define IDS_VOLUME_TANG 3032 -#define IDS_VOLUME_TO 3033 +#define IDS_VOLUME_BARRELS_UK 3200 +#define IDS_VOLUME_BARRELS_OIL 3201 +#define IDS_VOLUME_BUN 3202 +#define IDS_VOLUME_BUSHELS_UK 3203 +#define IDS_VOLUME_BUSHELS_US 3204 +#define IDS_VOLUME_CUBIC_CENTIMETERS 3205 +#define IDS_VOLUME_CUBIC_FEET 3206 +#define IDS_VOLUME_CUBIC_INCHES 3207 +#define IDS_VOLUME_CUBIC_METERS 3208 +#define IDS_VOLUME_CUBIC_YARDS 3209 +#define IDS_VOLUME_DOE 3210 +#define IDS_VOLUME_FLUID_OUNCES_UK 3211 +#define IDS_VOLUME_FLUID_OUNCES_US 3212 +#define IDS_VOLUME_GALLONS_UK 3213 +#define IDS_VOLUME_GALLONS_DRY_US 3214 +#define IDS_VOLUME_GALLONS_LIQUID_US 3215 +#define IDS_VOLUME_GOU 3216 +#define IDS_VOLUME_HOP 3217 +#define IDS_VOLUME_ICCE 3218 +#define IDS_VOLUME_KWIAN 3219 +#define IDS_VOLUME_LITERS 3220 +#define IDS_VOLUME_MAL 3221 +#define IDS_VOLUME_MILLILITERS 3222 +#define IDS_VOLUME_PINTS_UK 3223 +#define IDS_VOLUME_PINTS_DRY_US 3224 +#define IDS_VOLUME_PINTS_LIQUID_US 3225 +#define IDS_VOLUME_QUARTS_UK 3226 +#define IDS_VOLUME_QUARTS_DRY_US 3227 +#define IDS_VOLUME_QUARTS_LIQUID_US 3228 +#define IDS_VOLUME_SEKI 3229 +#define IDS_VOLUME_SYOU 3230 +#define IDS_VOLUME_TANANLOUNG 3231 +#define IDS_VOLUME_TANG 3232 +#define IDS_VOLUME_TO 3233 /* TYPES OF WEIGHTS */ -#define IDS_WEIGHT_BAHT 3100 -#define IDS_WEIGHT_CARATS 3101 -#define IDS_WEIGHT_CHUNG 3102 -#define IDS_WEIGHT_DON 3103 -#define IDS_WEIGHT_GEUN 3104 -#define IDS_WEIGHT_GRAMS 3105 -#define IDS_WEIGHT_GWAN 3106 -#define IDS_WEIGHT_HARB 3107 -#define IDS_WEIGHT_JIN_CHINA 3108 -#define IDS_WEIGHT_JIN_TAIWAN 3109 -#define IDS_WEIGHT_KAN 3110 -#define IDS_WEIGHT_KILOGRAMS 3111 -#define IDS_WEIGHT_KIN 3112 -#define IDS_WEIGHT_LIANG_CHINA 3113 -#define IDS_WEIGHT_LIANG_TAIWAN 3114 -#define IDS_WEIGHT_MONME 3115 -#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3116 -#define IDS_WEIGHT_OUNCES_TROY 3117 -#define IDS_WEIGHT_POUNDS 3118 -#define IDS_WEIGHT_QUINTAL_METRIC 3119 -#define IDS_WEIGHT_SALOUNG 3120 -#define IDS_WEIGHT_STONES 3121 -#define IDS_WEIGHT_TAMLUNG 3122 -#define IDS_WEIGHT_TONNES 3123 -#define IDS_WEIGHT_TONS_UK 3124 -#define IDS_WEIGHT_TONS_US 3125 +#define IDS_WEIGHT_BAHT 3300 +#define IDS_WEIGHT_CARATS 3301 +#define IDS_WEIGHT_CHUNG 3302 +#define IDS_WEIGHT_DON 3303 +#define IDS_WEIGHT_GEUN 3304 +#define IDS_WEIGHT_GRAMS 3305 +#define IDS_WEIGHT_GWAN 3306 +#define IDS_WEIGHT_HARB 3307 +#define IDS_WEIGHT_JIN_CHINA 3308 +#define IDS_WEIGHT_JIN_TAIWAN 3309 +#define IDS_WEIGHT_KAN 3310 +#define IDS_WEIGHT_KILOGRAMS 3311 +#define IDS_WEIGHT_KIN 3312 +#define IDS_WEIGHT_LIANG_CHINA 3313 +#define IDS_WEIGHT_LIANG_TAIWAN 3314 +#define IDS_WEIGHT_MONME 3315 +#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3316 +#define IDS_WEIGHT_OUNCES_TROY 3317 +#define IDS_WEIGHT_POUNDS 3318 +#define IDS_WEIGHT_QUINTAL_METRIC 3319 +#define IDS_WEIGHT_SALOUNG 3320 +#define IDS_WEIGHT_STONES 3321 +#define IDS_WEIGHT_TAMLUNG 3322 +#define IDS_WEIGHT_TONNES 3323 +#define IDS_WEIGHT_TONS_UK 3324 +#define IDS_WEIGHT_TONS_US 3325 /* MENU */ #define IDM_EDIT_COPY 40002

1 0

[cgutman] 39118: - Add a temporary hack for the double-freeing issue that memtrack keeps catching - I would use my branch for this but I am doing some work on it that has broken some things for now
by cgutman＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: cgutman Date: Mon Jan 26 14:45:01 2009 New Revision: 39118 URL: http://svn.reactos.org/svn/reactos?rev=39118&view=rev Log: - Add a temporary hack for the double-freeing issue that memtrack keeps catching - I would use my branch for this but I am doing some work on it that has broken some things for now Modified: trunk/reactos/lib/drivers/ip/network/ip.c Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Jan 26 14:45:01 2009 @@ -310,7 +310,10 @@ NCE = NBLocateNeighbor(&IF->Unicast); if (NCE) { - TCPDisposeInterfaceData( IF->TCPContext ); + if ( IF->TCPContext ) { + TCPDisposeInterfaceData( IF->TCPContext ); + IF->TCPContext = NULL; + } TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask)));

1 0

[khornicek] 39117: - update Mesa to version 7.3 - add reactos.diff - disable broken OS SSE exception test, bug was filled for this but it's not needed anyway - remove unused drivers
by khornicek＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: khornicek Date: Mon Jan 26 14:42:55 2009 New Revision: 39117 URL: http://svn.reactos.org/svn/reactos?rev=39117&view=rev Log: - update Mesa to version 7.3 - add reactos.diff - disable broken OS SSE exception test, bug was filled for this but it's not needed anyway - remove unused drivers Added: trunk/reactos/dll/3rdparty/mesa32/reactos.diff (with props) trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi_getproc.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/api_exec.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/api_exec.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/clear.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/clear.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/dlopen.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/dlopen.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/ffvertex_prog.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/ffvertex_prog.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/mcompiler.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/mfeatures.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/multisample.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/multisample.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/pixelstore.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/pixelstore.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/readpix.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/readpix.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/scissor.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/scissor.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/texenv.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/texenv.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/texgen.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/texgen.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/texparam.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/main/texparam.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_cache.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_cache.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_noise.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_noise.h (with props) trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_debug.c (with props) trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_rasterpos.c (with props) Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/amesa.h trunk/reactos/dll/3rdparty/mesa32/include/GL/fxmesa.h trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_sarea.h trunk/reactos/dll/3rdparty/mesa32/include/GL/uglglutshapes.h trunk/reactos/dll/3rdparty/mesa32/include/GL/uglmesa.h trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa.h trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_x.h trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_xf86.h trunk/reactos/dll/3rdparty/mesa32/mesa3d_icd_fix_ros.patch trunk/reactos/dll/3rdparty/mesa32/src/drivers/beos/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/directfb/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/dos/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/dri/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/fbdev/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/ggi/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/glide/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/osmesa/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/svga/ trunk/reactos/dll/3rdparty/mesa32/src/drivers/x11/ Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glext.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glu.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glx.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glxext.h trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_interface.h trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/sarea.h trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/mesa.def trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wmesa.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def trunk/reactos/dll/3rdparty/mesa32/src/glapi/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/glapi/dispatch.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapitable.h trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.h trunk/reactos/dll/3rdparty/mesa32/src/main/api_arrayelt.c trunk/reactos/dll/3rdparty/mesa32/src/main/api_loopback.c trunk/reactos/dll/3rdparty/mesa32/src/main/api_noop.c trunk/reactos/dll/3rdparty/mesa32/src/main/api_validate.c trunk/reactos/dll/3rdparty/mesa32/src/main/arrayobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.c trunk/reactos/dll/3rdparty/mesa32/src/main/blend.c trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.c trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.h trunk/reactos/dll/3rdparty/mesa32/src/main/colormac.h trunk/reactos/dll/3rdparty/mesa32/src/main/colortab.c trunk/reactos/dll/3rdparty/mesa32/src/main/config.h trunk/reactos/dll/3rdparty/mesa32/src/main/context.c trunk/reactos/dll/3rdparty/mesa32/src/main/context.h trunk/reactos/dll/3rdparty/mesa32/src/main/dd.h trunk/reactos/dll/3rdparty/mesa32/src/main/debug.c trunk/reactos/dll/3rdparty/mesa32/src/main/depthstencil.c trunk/reactos/dll/3rdparty/mesa32/src/main/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/main/dispatch.c trunk/reactos/dll/3rdparty/mesa32/src/main/dlist.c trunk/reactos/dll/3rdparty/mesa32/src/main/drawpix.c trunk/reactos/dll/3rdparty/mesa32/src/main/drawpix.h trunk/reactos/dll/3rdparty/mesa32/src/main/enable.c trunk/reactos/dll/3rdparty/mesa32/src/main/enums.c trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c trunk/reactos/dll/3rdparty/mesa32/src/main/fbobject.c trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.c trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.h trunk/reactos/dll/3rdparty/mesa32/src/main/get.c trunk/reactos/dll/3rdparty/mesa32/src/main/getstring.c trunk/reactos/dll/3rdparty/mesa32/src/main/glheader.h trunk/reactos/dll/3rdparty/mesa32/src/main/histogram.c trunk/reactos/dll/3rdparty/mesa32/src/main/histogram.h trunk/reactos/dll/3rdparty/mesa32/src/main/image.c trunk/reactos/dll/3rdparty/mesa32/src/main/image.h trunk/reactos/dll/3rdparty/mesa32/src/main/imports.c trunk/reactos/dll/3rdparty/mesa32/src/main/imports.h trunk/reactos/dll/3rdparty/mesa32/src/main/light.c trunk/reactos/dll/3rdparty/mesa32/src/main/macros.h trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.c trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.h trunk/reactos/dll/3rdparty/mesa32/src/main/mm.c trunk/reactos/dll/3rdparty/mesa32/src/main/mm.h trunk/reactos/dll/3rdparty/mesa32/src/main/mtypes.h trunk/reactos/dll/3rdparty/mesa32/src/main/pixel.c trunk/reactos/dll/3rdparty/mesa32/src/main/pixel.h trunk/reactos/dll/3rdparty/mesa32/src/main/points.c trunk/reactos/dll/3rdparty/mesa32/src/main/points.h trunk/reactos/dll/3rdparty/mesa32/src/main/queryobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/queryobj.h trunk/reactos/dll/3rdparty/mesa32/src/main/rastpos.c trunk/reactos/dll/3rdparty/mesa32/src/main/shaders.c trunk/reactos/dll/3rdparty/mesa32/src/main/state.c trunk/reactos/dll/3rdparty/mesa32/src/main/state.h trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress.c trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress_s3tc.c trunk/reactos/dll/3rdparty/mesa32/src/main/texenvprogram.c trunk/reactos/dll/3rdparty/mesa32/src/main/texenvprogram.h trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.c trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.h trunk/reactos/dll/3rdparty/mesa32/src/main/texformat_tmp.h trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.c trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.h trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/texrender.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.h trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.h trunk/reactos/dll/3rdparty/mesa32/src/main/varray.c trunk/reactos/dll/3rdparty/mesa32/src/main/varray.h trunk/reactos/dll/3rdparty/mesa32/src/main/version.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_clip.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_norm.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_util.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_xform.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_matrix.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_matrix.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_translate.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_vector.c trunk/reactos/dll/3rdparty/mesa32/src/math/m_vector.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_xform.h trunk/reactos/dll/3rdparty/mesa32/src/ppc/common_ppc.c trunk/reactos/dll/3rdparty/mesa32/src/ppc/common_ppc_features.h trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogparse.c trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogparse.h trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram.c trunk/reactos/dll/3rdparty/mesa32/src/shader/atifragshader.c trunk/reactos/dll/3rdparty/mesa32/src/shader/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/shader/grammar/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/shader/grammar/grammar_crt.c trunk/reactos/dll/3rdparty/mesa32/src/shader/grammar/grammar_mesa.h trunk/reactos/dll/3rdparty/mesa32/src/shader/nvfragparse.c trunk/reactos/dll/3rdparty/mesa32/src/shader/nvprogram.c trunk/reactos/dll/3rdparty/mesa32/src/shader/nvvertparse.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_debug.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.h trunk/reactos/dll/3rdparty/mesa32/src/shader/program.c trunk/reactos/dll/3rdparty/mesa32/src/shader/program.h trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.c trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_120_core_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_common_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_fragment_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin.gc trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core.gc trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_fragment_builtin_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_directives.syn trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_directives_syn.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader.syn trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader_syn.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_vertex_builtin.gc trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_vertex_builtin_gc.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_function.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_function.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_log.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_mem.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_preprocess.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_preprocess.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_print.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_simplify.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_storage.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.h trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.h trunk/reactos/dll/3rdparty/mesa32/src/sparc/norm.S trunk/reactos/dll/3rdparty/mesa32/src/sparc/sparc.c trunk/reactos/dll/3rdparty/mesa32/src/sparc/sparc.h trunk/reactos/dll/3rdparty/mesa32/src/sparc/xform.S trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aaline.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aaline.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aalinetemp.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatriangle.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatriangle.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_accum.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_accum.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_alpha.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_alpha.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_atifragshader.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_bitmap.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blend.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blend.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blit.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_buffers.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_context.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_copypix.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_depth.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_depth.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_feedback.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_feedback.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fog.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fog.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_imaging.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_lines.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_lines.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_logic.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_logic.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_masking.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_masking.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_points.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_points.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_readpix.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_spantemp.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texcombine.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texcombine.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texfilter.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texfilter.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texstore.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.h trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_zoom.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_zoom.h trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.c trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.h trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_triangle.c trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_triangle.h trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_vb.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_draw.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_pipeline.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_cull.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_fog.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_light.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_normals.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_points.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_render.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_texgen.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_texmat.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_vertex.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex_generic.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex_sse.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vp_build.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vp_build.h trunk/reactos/dll/3rdparty/mesa32/src/tnl/tnl.h trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo.h trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_context.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_context.h trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_api.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_array.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_draw.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_eval.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split_inplace.c trunk/reactos/dll/3rdparty/mesa32/src/x86-64/Makefile trunk/reactos/dll/3rdparty/mesa32/src/x86-64/x86-64.c trunk/reactos/dll/3rdparty/mesa32/src/x86-64/x86-64.h trunk/reactos/dll/3rdparty/mesa32/src/x86-64/xform4.S trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow.c trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow.h trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_normal.S trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform1.S trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform2.S trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform3.S trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform4.S trunk/reactos/dll/3rdparty/mesa32/src/x86/clip_args.h trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86.c trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_asm.S trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_asm.h trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_features.h trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_macros.h trunk/reactos/dll/3rdparty/mesa32/src/x86/gen_matypes.c trunk/reactos/dll/3rdparty/mesa32/src/x86/glapi_x86.S trunk/reactos/dll/3rdparty/mesa32/src/x86/mmx_blend.S trunk/reactos/dll/3rdparty/mesa32/src/x86/norm_args.h trunk/reactos/dll/3rdparty/mesa32/src/x86/rtasm/x86sse.c trunk/reactos/dll/3rdparty/mesa32/src/x86/sse.c trunk/reactos/dll/3rdparty/mesa32/src/x86/sse.h trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_normal.S trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform1.S trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform2.S trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform3.S trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform4.S trunk/reactos/dll/3rdparty/mesa32/src/x86/x86.c trunk/reactos/dll/3rdparty/mesa32/src/x86/x86.h trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_cliptest.S trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_xform2.S trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_xform3.S trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_xform4.S trunk/reactos/dll/3rdparty/mesa32/src/x86/xform_args.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/amesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/fxmesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glxext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/dri_sarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/internal/sarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/uglglutshapes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/uglmesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Removed: trunk/reactos/dll/3rdparty/mesa32/include/GL/xmesa_xf86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… Removed: trunk/reactos/dll/3rdparty/mesa32/mesa3d_icd_fix_ros.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa3d… Added: trunk/reactos/dll/3rdparty/mesa32/reactos.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/reacto… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/mesa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wmesa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Added: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi_getproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapitable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_arrayelt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/api_exec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_noop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/arrayobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/blend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/clear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/clear.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/colormac.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/colortab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/depthstencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/dlopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/dlopen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/drawpix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/enums.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/fbobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/ffvertex_prog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/ffvertex_prog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/getstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/glheader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/histogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/histogram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/image.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/imports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/macros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/mcompiler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/mfeatures.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mipmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/multisample.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/multisample.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/pixel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/pixel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/pixelstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/pixelstore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/points.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/queryobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/queryobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/rastpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/readpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/readpix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/scissor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/scissor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/shaders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/state.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texcompress_s3tc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/texenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/texenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texenvprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texenvprogram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/texgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/texgen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Added: trunk/reactos/dll/3rdparty/mesa32/src/main/texparam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_norm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_xform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_matrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_translate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_vector.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_vector.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_xform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/ppc/common_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/pp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/ppc/common_ppc_features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/pp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/arbprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/atifragshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/grammar/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/grammar/grammar_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/grammar/grammar_mesa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/nvfragparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/nvprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/nvvertparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_cache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_execute.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_noise.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_noise.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_parameter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_statevars.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_uniform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/program.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Added: trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_120_core_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_common_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_builtin_120_fragment_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin.gc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_common_builtin_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core.gc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_core_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_fragment_builtin_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_directives.syn URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_pp_directives_syn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader.syn URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_shader_syn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_vertex_builtin.gc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/library/slang_vertex_builtin_gc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_builtin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_function.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_operation.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile_variable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_ir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_log.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_preprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_preprocess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_simplify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_storage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_typeinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/sparc/norm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/sparc/sparc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/sparc/sparc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/sparc/xform.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sp… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aaline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aaline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aalinetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatriangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_aatriangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_accum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_accum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_alpha.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_alpha.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_atifragshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blend.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_blit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_buffers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_copypix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_depth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_depth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_feedback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_feedback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_imaging.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_lines.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_logic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_logic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_masking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_masking.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_points.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_readpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_spantemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texcombine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texcombine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texfilter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_zoom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_zoom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_triangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast_setup/ss_vb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_pipeline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Added: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_rasterpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_cull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_fog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_normals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_render.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_texgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_texmat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vb_vertex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vertex_sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vp_build.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_vp_build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/tnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_split_inplace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/x86-64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/x86-64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86-64/xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_normal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform1.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/3dnow_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/clip_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/common_x86_macros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/gen_matypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/glapi_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/mmx_blend.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/norm_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/rtasm/x86sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_normal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform1.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/sse_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_cliptest.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/x86_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/xform_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8…

1 0

[fireball] 39116: Giannis Adamopoulos <johnyadams@hotmail.com> - Correctly assign NtSystemRoot and remove assumption that number of partitions equals number of harddisks. - Remove a hack from IopApplyRosCdromArcHack. Fixes LiveCD issues. See issue #3170 for more details.
by fireball＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: fireball Date: Mon Jan 26 14:00:59 2009 New Revision: 39116 URL: http://svn.reactos.org/svn/reactos?rev=39116&view=rev Log: Giannis Adamopoulos <johnyadams(a)hotmail.com> - Correctly assign NtSystemRoot and remove assumption that number of partitions equals number of harddisks. - Remove a hack from IopApplyRosCdromArcHack. Fixes LiveCD issues. See issue #3170 for more details. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Mon Jan 26 14:00:59 2009 @@ -47,7 +47,9 @@ IN UCHAR DriveType, IN ULONG Signature, IN LARGE_INTEGER StartingOffset, - IN HANDLE hKey) + IN HANDLE hKey, + IN PUNICODE_STRING BootDevice, + OUT PUCHAR NtSystemPath) { WCHAR DriveNameBuffer[16]; UNICODE_STRING DriveName; @@ -128,6 +130,14 @@ DPRINT1("ZwCreateValueKey failed for %wZ, status=%x\n", &DriveName, Status); } } + + /* Check if this is a boot partition */ + if (RtlCompareUnicodeString(PartitionName, BootDevice, FALSE) == 0) + { + /* Set NtSystemPath to that partition's disk letter */ + *NtSystemPath = 'A' + DriveNumber; + } + return TRUE; } @@ -420,6 +430,11 @@ PKEY_VALUE_PARTIAL_INFORMATION PartialInformation; PREG_DISK_MOUNT_INFO DiskMountInfo; ULONG RDiskCount; + UNICODE_STRING BootDevice; + + Status = RtlAnsiStringToUnicodeString(&BootDevice, + NtDeviceName, + TRUE); DPRINT("xHalIoAssignDriveLetters()\n"); @@ -612,7 +627,9 @@ DOSDEVICE_DRIVE_FIXED, DiskMountInfo->Signature, DiskMountInfo->StartingOffset, - NULL); + NULL, + &BootDevice, + NtSystemPath); /* Mark the partition as assigned */ LayoutArray[i]->PartitionEntry[j].RewritePartition = TRUE; } @@ -662,7 +679,9 @@ DOSDEVICE_DRIVE_FIXED, LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey); + hKey, + &BootDevice, + NtSystemPath); /* Mark the partition as assigned */ LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; } @@ -702,7 +721,9 @@ DOSDEVICE_DRIVE_FIXED, LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey); + hKey, + &BootDevice, + NtSystemPath); /* Mark the partition as assigned */ LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; } @@ -741,7 +762,9 @@ DOSDEVICE_DRIVE_FIXED, LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey); + hKey, + &BootDevice, + NtSystemPath); /* Mark the partition as assigned */ LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; } @@ -776,7 +799,9 @@ DOSDEVICE_DRIVE_FIXED, LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey); + hKey, + &BootDevice, + NtSystemPath); /* Mark the partition as assigned */ LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; } @@ -812,7 +837,9 @@ DOSDEVICE_DRIVE_FIXED, LayoutArray[DiskNumber]->Signature, LayoutArray[DiskNumber]->PartitionEntry[j].StartingOffset, - hKey); + hKey, + &BootDevice, + NtSystemPath); /* Mark the partition as assigned */ LayoutArray[DiskNumber]->PartitionEntry[j].RewritePartition = TRUE; } @@ -844,7 +871,9 @@ DOSDEVICE_DRIVE_REMOVABLE, 0, RtlConvertLongToLargeInteger(0), - hKey); + hKey, + &BootDevice, + NtSystemPath); } } } @@ -875,7 +904,9 @@ DOSDEVICE_DRIVE_REMOVABLE, 0, RtlConvertLongToLargeInteger(0), - hKey); + hKey, + &BootDevice, + NtSystemPath); } /* Assign cdrom drives */ @@ -895,7 +926,9 @@ DOSDEVICE_DRIVE_CDROM, 0, RtlConvertLongToLargeInteger(0), - hKey); + hKey, + &BootDevice, + NtSystemPath); } /* Anything else to do? */ Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Mon Jan 26 14:00:59 2009 @@ -114,8 +114,6 @@ /* Return whether this is the CD or not */ if ((InitIsWinPEMode) || (ExpInTextModeSetup)) { - /* Hack until IoAssignDriveLetters is fixed */ - swprintf(SharedUserData->NtSystemRoot, L"%c:\\%hs", 'C' + DeviceNumber, RosSysPath); return TRUE; }

1 0

[janderwald] 39115: - Use InterlockedIncrement, InterlockedDecrement over intrinsics - Fix ordering of IDmaChannelSlaveVtbl which led to an infinite loop - Add a few guids - Fix parameter for KeWaitForSingleObject (spotted by Christoph) - Also check for IID_IPort in IPortTopology - Fix priority boost IServiceGroup
by janderwald＠svn.reactos.org 26 Jan '09

26 Jan '09

Author: janderwald Date: Mon Jan 26 11:38:22 2009 New Revision: 39115 URL: http://svn.reactos.org/svn/reactos?rev=39115&view=rev Log: - Use InterlockedIncrement, InterlockedDecrement over intrinsics - Fix ordering of IDmaChannelSlaveVtbl which led to an infinite loop - Add a few guids - Fix parameter for KeWaitForSingleObject (spotted by Christoph) - Also check for IID_IPort in IPortTopology - Fix priority boost IServiceGroup Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -68,7 +68,7 @@ DPRINT("IDmaChannelSlave_AddRef: This %p\n", This); - return _InterlockedIncrement(&This->ref); + return InterlockedIncrement(&This->ref); } ULONG @@ -78,7 +78,7 @@ { IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; - _InterlockedDecrement(&This->ref); + InterlockedDecrement(&This->ref); DPRINT("IDmaChannelSlave_Release: This %p new ref %u\n", This, This->ref); @@ -102,7 +102,7 @@ IDmaChannelSlave_fnAllocateBuffer( IN IDmaChannelSlave * iface, IN ULONG BufferSize, - IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) { IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; @@ -125,6 +125,8 @@ This->BufferSize = BufferSize; This->AllocatedBufferSize = BufferSize; + DPRINT1("IDmaChannelSlave_fnAllocateBuffer Success Buffer %u Address %ull\n", BufferSize, This->Address); + return STATUS_SUCCESS; } @@ -185,7 +187,7 @@ return; } - This->pAdapter->DmaOperations->FreeCommonBuffer(This->pAdapter, This->AllocatedBufferSize, This->Address, This->Buffer, TRUE); + This->pAdapter->DmaOperations->FreeCommonBuffer(This->pAdapter, This->AllocatedBufferSize, This->Address, This->Buffer, FALSE); This->Buffer = NULL; This->AllocatedBufferSize = 0; This->Address.QuadPart = 0LL; @@ -458,8 +460,8 @@ IDmaChannelSlave_fnSystemAddress, IDmaChannelSlave_fnPhysicalAdress, IDmaChannelSlave_fnGetAdapterObject, + IDmaChannelSlave_fnCopyTo, IDmaChannelSlave_fnCopyFrom, - IDmaChannelSlave_fnCopyTo, /* IDmaChannelSlave methods */ IDmaChannelSlave_fnStart, IDmaChannelSlave_fnStop, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -19,13 +19,13 @@ const GUID CLSID_MiniportDriverFmSynth; const GUID CLSID_MiniportDriverFmSynthWithVol; +const GUID IID_IPort = {0xb4c90a25L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IDrmPort = {0x286D3DF8L, 0xCA22, 0x4E2E, {0xB9, 0xBC, 0x20, 0xB4, 0xF0, 0xE2, 0x01, 0xCE}}; const GUID IID_IDrmPort2 = {0x1ACCE59CL, 0x7311, 0x4B6B, {0x9F, 0xBA, 0xCC, 0x3B, 0xA5, 0x9A, 0xCD, 0xCE}}; const GUID IID_IInterruptSync = {0x22C6AC63L, 0x851B, 0x11D0, {0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE}}; const GUID IID_IPortWavePci = {0xb4c90a50L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IAdapterPowerManagement = {0x793417D0L, 0x35FE, 0x11D1, {0xAD, 0x08, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0xB0}}; - const GUID IID_IMiniportWaveCyclic = {0xb4c90a27L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IPortWaveCyclic = {0xb4c90a26L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; @@ -41,6 +41,18 @@ const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}}; const GUID IID_IPortEvents = {0xA80F29C4L, 0x5498, 0x11D2, {0x95, 0xD9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3}}; +//FIXME +// +const GUID KS_CATEGORY_AUDIO = {0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KS_CATEGORY_RENDER = {0x65E8773E, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KS_CATEGORY_CAPTURE = {0x65E8773D, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KS_CATEGORY_TOPOLOGY = {0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00}}; + + +const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; + /// /// undocumented guids Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -322,7 +322,7 @@ if (Status == STATUS_PENDING) { /* not yet, lets wait a bit */ - KeWaitForSingleObject(&Event, Executive, FALSE, FALSE, NULL); + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = STATUS_SUCCESS; } DPRINT1("Returning status %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -70,6 +70,7 @@ DPRINT1("IPortTopology_fnQueryInterface\n"); if (IsEqualGUIDAligned(refiid, &IID_IPortTopology) || + IsEqualGUIDAligned(refiid, &IID_IPort) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = &This->lpVtbl; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -10,6 +10,7 @@ <library>drmk</library> <library>rtl</library> <library>hal</library> + <library>libcntpr</library> <file>api.c</file> <file>connection.c</file> <file>dll.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -17,7 +17,10 @@ #include "interfaces.h" #include <ks.h> +#include <ksmedia.h> #include <stdio.h> +#include <math.h> +#include <intrin.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Mon Jan 26 11:38:22 2009 @@ -177,7 +177,7 @@ { IServiceGroupImpl * This = (IServiceGroupImpl*)DeferredContext; IServiceGroup_fnRequestService((IServiceGroup*)DeferredContext); - KeSetEvent(&This->DpcEvent, 0, FALSE); + KeSetEvent(&This->DpcEvent, IO_SOUND_INCREMENT, FALSE); } @@ -243,7 +243,7 @@ }; /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI PcNewServiceGroup(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs