Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60419: [USP10_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:11:42 2013 New Revision: 60419 URL: http://svn.reactos.org/svn/reactos?rev=60419&view=rev Log: [USP10_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/usp10/CMakeLists.txt Modified: trunk/rostests/winetests/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/CMakeList… ============================================================================== --- trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:11:42 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D__WINESRC__) add_executable(usp10_winetest usp10.c testlist.c) -target_link_libraries(usp10_winetest wine) set_module_type(usp10_winetest win32cui) -add_importlibs(usp10_winetest usp10 user32 gdi32 msvcrt kernel32 ntdll) +add_importlibs(usp10_winetest usp10 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET usp10_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 60418: [USP10] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:11:02 2013 New Revision: 60418 URL: http://svn.reactos.org/svn/reactos?rev=60418&view=rev Log: [USP10] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(usp10.dll usp10.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -10,21 +9,16 @@ indic.c indicsyllable.c linebreak.c - usp10.c mirror.c opentype.c shape.c shaping.c + usp10.c ${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/usp10.def) add_library(usp10 SHARED ${SOURCE}) - set_module_type(usp10 win32dll) - target_link_libraries(usp10 wine) - add_importlibs(usp10 advapi32 user32 gdi32 msvcrt kernel32 ntdll) - - add_cd_file(TARGET usp10 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -38,7 +38,7 @@ extern const unsigned short wine_linebreak_table[]; -enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2}; +enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2, b_HL, b_CJ, b_RI}; enum breaking_class {b_r=1, b_s, b_x}; @@ -97,6 +97,7 @@ break; case b_CM: la[i].fCharStop = FALSE; + break; } } @@ -111,6 +112,10 @@ case b_SG: case b_XX: break_class[i] = b_AL; + break; + case b_CJ: + break_class[i] = b_NS; + break; } } @@ -283,6 +288,16 @@ if (i < count-1) else_break(&break_before[i+1],b_x); break; + /* LB21a */ + case b_HL: + if (i < count-2) + switch (break_class[i+1]) + { + case b_HY: + case b_BA: + else_break(&break_before[i+2], b_x); + } + break; /* LB22 */ case b_IN: if (i > 0) @@ -290,6 +305,7 @@ switch (break_class[i-1]) { case b_AL: + case b_HL: case b_ID: case b_IN: case b_NU: @@ -304,12 +320,16 @@ /* LB23 */ if ((break_class[i] == b_ID && break_class[i+1] == b_PO) || (break_class[i] == b_AL && break_class[i+1] == b_NU) || - (break_class[i] == b_NU && break_class[i+1] == b_AL)) + (break_class[i] == b_HL && break_class[i+1] == b_NU) || + (break_class[i] == b_NU && break_class[i+1] == b_AL) || + (break_class[i] == b_NU && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB24 */ if ((break_class[i] == b_PR && break_class[i+1] == b_ID) || (break_class[i] == b_PR && break_class[i+1] == b_AL) || - (break_class[i] == b_PO && break_class[i+1] == b_AL)) + (break_class[i] == b_PR && break_class[i+1] == b_HL) || + (break_class[i] == b_PO && break_class[i+1] == b_AL) || + (break_class[i] == b_PO && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB25 */ @@ -373,19 +393,27 @@ } /* LB28 */ - if (break_class[i] == b_AL && break_class[i+1] == b_AL) + if ((break_class[i] == b_AL && break_class[i+1] == b_AL) || + (break_class[i] == b_AL && break_class[i+1] == b_HL) || + (break_class[i] == b_HL && break_class[i+1] == b_AL) || + (break_class[i] == b_HL && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB29 */ - if (break_class[i] == b_IS && break_class[i+1] == b_AL) + if ((break_class[i] == b_IS && break_class[i+1] == b_AL) || + (break_class[i] == b_IS && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB30 */ - if ((break_class[i] == b_AL || break_class[i] == b_NU) && + if ((break_class[i] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU) && break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + else_break(&break_before[i+1],b_x); + + /* LB30a */ + if (break_class[i] == b_RI && break_class[i+1] == b_RI) else_break(&break_before[i+1],b_x); } } Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… ============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -1,11 +1,11 @@ /* Unicode Indic Syllabic Category */ -/* generated from http://www.unicode.org/Public/6.0.0/ucd/IndicSyllabicCategory.txt */ -/* and from http://www.unicode.org/Public/6.0.0/ucd/IndicMatraCategory.txt */ +/* generated from http://www.unicode.org/Public/6.2.0/ucd/IndicSyllabicCategory.txt */ +/* and from http://www.unicode.org/Public/6.2.0/ucd/IndicMatraCategory.txt */ /* DO NOT EDIT!! */ //#include "wine/unicode.h" -const unsigned short indic_syllabic_table[2624] = +const unsigned short indic_syllabic_table[2704] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -68,19 +68,19 @@ 0x0250, 0x0830, 0x0250, 0x0250, 0x0250, 0x0840, 0x0850, 0x0860, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0870, 0x0250, 0x0250, 0x0880, 0x0890, 0x0250, 0x0250, 0x0250, - 0x08a0, 0x0250, 0x08b0, 0x0250, 0x0250, 0x0250, 0x08c0, 0x08d0, - 0x0250, 0x0250, 0x08e0, 0x08f0, 0x0250, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x0250, 0x0250, 0x0900, 0x0250, 0x0250, 0x0250, - 0x0910, 0x0250, 0x0920, 0x0250, 0x0250, 0x0250, 0x0930, 0x0940, - 0x0950, 0x0250, 0x0250, 0x0960, 0x0970, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x0250, 0x0250, 0x0980, 0x0990, 0x0250, 0x0250, - 0x09a0, 0x0250, 0x0250, 0x09b0, 0x09c0, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x09d0, 0x09e0, 0x09f0, 0x0250, 0x0250, 0x0a00, - 0x0250, 0x0250, 0x0250, 0x0a10, 0x0a20, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, - 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0a30, 0x0250, + 0x08a0, 0x0250, 0x08b0, 0x08c0, 0x0250, 0x0250, 0x08d0, 0x08e0, + 0x0250, 0x0250, 0x08f0, 0x0900, 0x0250, 0x0250, 0x0250, 0x0250, + 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0910, + 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, + 0x0250, 0x0250, 0x0250, 0x0250, 0x0920, 0x0250, 0x0250, 0x0250, + 0x0930, 0x0250, 0x0940, 0x0250, 0x0250, 0x0250, 0x0950, 0x0960, + 0x0970, 0x0250, 0x0250, 0x0980, 0x0990, 0x0250, 0x0250, 0x0250, + 0x0250, 0x0250, 0x0250, 0x0250, 0x09a0, 0x09b0, 0x0250, 0x0250, + 0x09c0, 0x0250, 0x0250, 0x09d0, 0x09e0, 0x0250, 0x0250, 0x0250, + 0x0250, 0x0250, 0x09f0, 0x0a00, 0x0a10, 0x0250, 0x0250, 0x0a20, + 0x0250, 0x0250, 0x0250, 0x0a30, 0x0a40, 0x0250, 0x0a50, 0x0a60, + 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, + 0x0250, 0x0250, 0x0250, 0x0250, 0x0250, 0x0a70, 0x0a80, 0x0250, /* values */ 0x4d00, 0x8700, 0x8000, 0x8000, 0x7100, 0x7100, 0x7100, 0x7100, 0x6900, 0x5900, 0x4800, 0x3f00, 0x3000, 0x1f00, 0x1300, 0x0a00, @@ -289,7 +289,9 @@ 0x0001, 0x000c, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000d, 0x0000, 0x0000, 0x0500, 0x0600, 0x0200, 0x0100, - 0x0500, 0x0500, 0x0105, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0500, 0x0500, 0x0105, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0007, 0x0007, 0x0000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, @@ -297,6 +299,8 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0200, 0x0200, 0x0000, 0x0100, 0x0100, 0x0607, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0002, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, @@ -336,6 +340,12 @@ 0x0500, 0x0000, 0x0100, 0x0300, 0x0300, 0x0100, 0x0507, 0x0013, 0x0012, 0x0013, 0x0012, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0200, 0x0600, 0x0500, 0x0200, 0x0100, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, 0x0e05, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x000a, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0100, 0x0507, 0x0100, 0x0100, 0x0607, 0x0100, 0x0100, 0x0000, 0x0013, 0x0605, 0x0000, 0x0000 }; Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… ============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -1,10 +1,10 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/6.0.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/6.2.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ //#include "wine/unicode.h" -const unsigned short wine_linebreak_table[6800] = +const unsigned short wine_linebreak_table[7056] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -51,137 +51,137 @@ 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x06a0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x06b0, 0x06c0, 0x05b0, 0x06d0, 0x06c0, 0x05b0, - 0x06e0, 0x06f0, 0x0580, 0x0700, 0x0710, 0x05b0, 0x0720, 0x0730, - 0x0740, 0x0750, 0x05b0, 0x05b0, 0x0760, 0x0580, 0x0770, 0x0780, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0790, 0x07a0, 0x07b0, - 0x07c0, 0x07d0, 0x05b0, 0x0580, 0x07e0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x07f0, 0x0800, 0x07b0, 0x05b0, 0x0760, 0x0810, - 0x05b0, 0x0820, 0x0830, 0x0840, 0x05b0, 0x0850, 0x0860, 0x0860, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x0870, 0x05b0, 0x05b0, 0x0880, 0x0580, 0x0890, 0x08a0, 0x08b0, - 0x08c0, 0x08d0, 0x08e0, 0x08f0, 0x0900, 0x0910, 0x0920, 0x0930, - 0x0940, 0x08d0, 0x08e0, 0x0950, 0x0960, 0x0970, 0x0980, 0x0990, - 0x09a0, 0x0690, 0x08e0, 0x09b0, 0x09c0, 0x09d0, 0x0920, 0x09e0, - 0x08c0, 0x08d0, 0x08e0, 0x09b0, 0x09f0, 0x0a00, 0x0920, 0x06b0, - 0x0a10, 0x0a20, 0x0a30, 0x0a40, 0x0a50, 0x0a60, 0x0980, 0x0a70, - 0x0a80, 0x0a90, 0x08e0, 0x0aa0, 0x0ab0, 0x0ac0, 0x0920, 0x0ad0, - 0x0ae0, 0x0a90, 0x08e0, 0x0af0, 0x0ab0, 0x0b00, 0x0920, 0x0b10, - 0x0ae0, 0x0a90, 0x05b0, 0x0b20, 0x0b30, 0x0b40, 0x0920, 0x0b50, - 0x0b60, 0x0b70, 0x05b0, 0x0b80, 0x0b90, 0x0ba0, 0x0860, 0x0bb0, - 0x0bc0, 0x0bd0, 0x0bd0, 0x0be0, 0x0bf0, 0x0c00, 0x0860, 0x0860, - 0x0c10, 0x0c20, 0x0c30, 0x0c40, 0x0c50, 0x0c60, 0x0860, 0x0860, - 0x0c70, 0x0c80, 0x07b0, 0x0c90, 0x08b0, 0x05b0, 0x0ca0, 0x0cb0, - 0x0cc0, 0x0cd0, 0x0580, 0x0ce0, 0x0cf0, 0x0d00, 0x0860, 0x0860, - 0x0bd0, 0x0bd0, 0x0bd0, 0x0bd0, 0x0d10, 0x0bd0, 0x0bd0, 0x0bd0, - 0x0bd0, 0x0d20, 0x05b0, 0x05b0, 0x0d30, 0x05b0, 0x05b0, 0x0ca0, - 0x0d40, 0x0d40, 0x0d40, 0x0d40, 0x0d40, 0x0d40, 0x0d50, 0x0d50, - 0x0d50, 0x0d50, 0x0d60, 0x0d70, 0x0d70, 0x0d70, 0x0d70, 0x0d70, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0d80, 0x0d90, 0x05b0, 0x05b0, - 0x0d80, 0x05b0, 0x05b0, 0x0da0, 0x0db0, 0x0dc0, 0x05b0, 0x05b0, - 0x05b0, 0x0db0, 0x05b0, 0x05b0, 0x05b0, 0x0dd0, 0x0de0, 0x0ca0, - 0x05b0, 0x0df0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0730, - 0x0e00, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x06e0, 0x06f0, 0x0580, 0x0700, 0x0710, 0x0720, 0x0730, 0x0740, + 0x0750, 0x0760, 0x05b0, 0x05b0, 0x0770, 0x0580, 0x0780, 0x0790, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x07a0, 0x07b0, 0x07c0, + 0x07d0, 0x07e0, 0x05b0, 0x0580, 0x07f0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x0800, 0x0810, 0x07c0, 0x05b0, 0x0770, 0x0820, + 0x05b0, 0x0830, 0x0840, 0x0850, 0x05b0, 0x0860, 0x0870, 0x0870, + 0x0870, 0x0870, 0x0880, 0x0870, 0x0870, 0x0870, 0x0890, 0x08a0, + 0x08b0, 0x05b0, 0x05b0, 0x08c0, 0x0580, 0x08d0, 0x08e0, 0x08f0, + 0x0900, 0x0910, 0x0920, 0x0930, 0x0940, 0x0950, 0x0960, 0x0970, + 0x0980, 0x0910, 0x0920, 0x0990, 0x09a0, 0x09b0, 0x09c0, 0x09d0, + 0x09e0, 0x0690, 0x0920, 0x09f0, 0x0a00, 0x0a10, 0x0960, 0x0a20, + 0x0900, 0x0910, 0x0920, 0x09f0, 0x0a30, 0x0a40, 0x0960, 0x06b0, + 0x0a50, 0x0a60, 0x0a70, 0x0a80, 0x0a90, 0x0aa0, 0x09c0, 0x0ab0, + 0x0ac0, 0x0ad0, 0x0920, 0x0ae0, 0x0af0, 0x0b00, 0x0960, 0x0b10, + 0x0b20, 0x0ad0, 0x0920, 0x0b30, 0x0af0, 0x0b40, 0x0960, 0x0b50, + 0x0b20, 0x0ad0, 0x05b0, 0x0b60, 0x0b70, 0x0b80, 0x0960, 0x0b90, + 0x0ba0, 0x0bb0, 0x05b0, 0x0bc0, 0x0bd0, 0x0be0, 0x0870, 0x0bf0, + 0x0c00, 0x0c10, 0x0c10, 0x0c20, 0x0c30, 0x0c40, 0x0870, 0x0870, + 0x0c50, 0x0c60, 0x0c70, 0x0c80, 0x0c90, 0x0ca0, 0x0870, 0x0870, + 0x0cb0, 0x0cc0, 0x07c0, 0x0cd0, 0x08f0, 0x05b0, 0x0ce0, 0x0cf0, + 0x0d00, 0x0d10, 0x0580, 0x0d20, 0x0d30, 0x0d40, 0x0870, 0x0870, + 0x0c10, 0x0c10, 0x0c10, 0x0c10, 0x0d50, 0x0c10, 0x0c10, 0x0c10, + 0x0c10, 0x0d60, 0x05b0, 0x05b0, 0x0d70, 0x05b0, 0x05b0, 0x05b0, + 0x0d80, 0x0d80, 0x0d80, 0x0d80, 0x0d80, 0x0d80, 0x0d90, 0x0d90, + 0x0d90, 0x0d90, 0x0da0, 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0db0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0dc0, 0x0dd0, 0x05b0, 0x05b0, + 0x0dc0, 0x05b0, 0x05b0, 0x0de0, 0x0df0, 0x0e00, 0x05b0, 0x05b0, + 0x05b0, 0x0df0, 0x05b0, 0x05b0, 0x05b0, 0x0e10, 0x0e20, 0x0ce0, + 0x05b0, 0x0e30, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e40, + 0x0e50, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x0e00, 0x0e10, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e20, 0x09d0, - 0x0e30, 0x0e40, 0x05b0, 0x0e50, 0x05b0, 0x0e60, 0x0e30, 0x0e70, - 0x0bd0, 0x0bd0, 0x0bd0, 0x0bd0, 0x0bd0, 0x0e80, 0x0e90, 0x0df0, - 0x0ea0, 0x0e90, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x06b0, - 0x05b0, 0x05b0, 0x0eb0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0d30, - 0x05b0, 0x0ca0, 0x0ec0, 0x0ec0, 0x0ed0, 0x0bd0, 0x0ee0, 0x0ef0, - 0x0bd0, 0x0bd0, 0x0f00, 0x0bd0, 0x0f10, 0x0f20, 0x05b0, 0x05b0, - 0x05b0, 0x0f30, 0x0bd0, 0x0bd0, 0x0bd0, 0x0f40, 0x0bd0, 0x0f50, - 0x0e90, 0x0e90, 0x0ee0, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x0f60, 0x05b0, 0x05b0, 0x0f70, 0x0f80, 0x0f90, 0x0fa0, 0x0fb0, - 0x0fc0, 0x05b0, 0x0fd0, 0x0e90, 0x05b0, 0x05b0, 0x07f0, 0x0fe0, - 0x05b0, 0x05b0, 0x0f70, 0x0ff0, 0x1000, 0x07b0, 0x05b0, 0x1010, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x1020, 0x1030, 0x1040, + 0x0e50, 0x0e60, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e70, 0x0a10, + 0x0e80, 0x0e90, 0x05b0, 0x0ea0, 0x05b0, 0x0eb0, 0x0e80, 0x0ec0, + 0x0c10, 0x0c10, 0x0c10, 0x0c10, 0x0c10, 0x0ed0, 0x0ee0, 0x0e30, + 0x0ef0, 0x0ee0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x06b0, + 0x05b0, 0x05b0, 0x0f00, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0f10, + 0x05b0, 0x0ce0, 0x0f20, 0x0f20, 0x0f30, 0x0c10, 0x0f40, 0x0f50, + 0x0c10, 0x0c10, 0x0f60, 0x0c10, 0x0f70, 0x0f80, 0x05b0, 0x05b0, + 0x05b0, 0x0f90, 0x0c10, 0x0c10, 0x0c10, 0x0fa0, 0x0c10, 0x0fb0, + 0x0ee0, 0x0ee0, 0x0f40, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x0fc0, 0x05b0, 0x05b0, 0x0fd0, 0x0fe0, 0x0ff0, 0x1000, 0x1010, + 0x1020, 0x05b0, 0x1030, 0x07c0, 0x05b0, 0x05b0, 0x0800, 0x1040, + 0x05b0, 0x05b0, 0x0fd0, 0x1050, 0x1060, 0x07c0, 0x05b0, 0x1070, + 0x0870, 0x0870, 0x0870, 0x0870, 0x06b0, 0x1080, 0x1090, 0x10a0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x1050, 0x1060, - 0x05b0, 0x1070, 0x05b0, 0x05b0, 0x1070, 0x1080, 0x05b0, 0x1090, - 0x05b0, 0x05b0, 0x05b0, 0x10a0, 0x10a0, 0x10b0, 0x05b0, 0x10c0, - 0x10d0, 0x10e0, 0x10f0, 0x1100, 0x1110, 0x1120, 0x1130, 0x1140, - 0x1150, 0x0ca0, 0x1160, 0x1170, 0x0860, 0x0580, 0x0580, 0x1180, - 0x1190, 0x11a0, 0x11b0, 0x05b0, 0x05b0, 0x11c0, 0x11d0, 0x11e0, - 0x11f0, 0x11e0, 0x05b0, 0x05b0, 0x05b0, 0x1200, 0x05b0, 0x05b0, - 0x1210, 0x1220, 0x1230, 0x1240, 0x1250, 0x1260, 0x1270, 0x05b0, - 0x1280, 0x1290, 0x12a0, 0x12b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1260, 0x12c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x12d0, - 0x05b0, 0x05b0, 0x12e0, 0x0860, 0x0720, 0x0860, 0x12f0, 0x12f0, - 0x12f0, 0x12f0, 0x12f0, 0x12f0, 0x12f0, 0x12f0, 0x12f0, 0x1300, - 0x12f0, 0x12f0, 0x12f0, 0x12f0, 0x11d0, 0x12f0, 0x12f0, 0x1310, - 0x12f0, 0x1320, 0x1330, 0x1340, 0x1350, 0x1360, 0x1370, 0x05b0, - 0x1380, 0x1390, 0x05b0, 0x05b0, 0x13a0, 0x05b0, 0x13b0, 0x05b0, - 0x05b0, 0x13c0, 0x05b0, 0x13c0, 0x13d0, 0x12f0, 0x13e0, 0x12f0, - 0x06c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x13f0, 0x1400, 0x1410, - 0x12f0, 0x1420, 0x05b0, 0x05b0, 0x1430, 0x05b0, 0x1440, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x10b0, 0x10c0, + 0x05b0, 0x10d0, 0x05b0, 0x05b0, 0x10d0, 0x10e0, 0x05b0, 0x10f0, + 0x05b0, 0x05b0, 0x05b0, 0x1100, 0x1100, 0x1110, 0x05b0, 0x1120, + 0x1130, 0x1140, 0x1150, 0x1160, 0x1170, 0x1180, 0x1190, 0x11a0, + 0x11b0, 0x0ce0, 0x11c0, 0x11d0, 0x0870, 0x0580, 0x0580, 0x11e0, + 0x11f0, 0x1200, 0x1210, 0x05b0, 0x05b0, 0x1220, 0x1230, 0x1240, + 0x1250, 0x1240, 0x05b0, 0x05b0, 0x05b0, 0x1260, 0x05b0, 0x05b0, + 0x1270, 0x1280, 0x1290, 0x12a0, 0x12b0, 0x12c0, 0x12d0, 0x05b0, + 0x12e0, 0x12f0, 0x1300, 0x1310, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1320, 0x1330, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1340, + 0x05b0, 0x05b0, 0x1350, 0x0870, 0x1360, 0x0870, 0x1370, 0x1370, + 0x1370, 0x1370, 0x1370, 0x1370, 0x1370, 0x1370, 0x1370, 0x1380, + 0x1370, 0x1370, 0x1370, 0x1370, 0x1230, 0x1370, 0x1370, 0x1390, + 0x1370, 0x13a0, 0x13b0, 0x13c0, 0x13d0, 0x13e0, 0x13f0, 0x05b0, + 0x1400, 0x1410, 0x05b0, 0x1420, 0x1430, 0x05b0, 0x1440, 0x1450, + 0x05b0, 0x1460, 0x05b0, 0x1470, 0x1480, 0x1490, 0x14a0, 0x14b0, + 0x14c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x14d0, 0x14e0, 0x14f0, + 0x1370, 0x1500, 0x05b0, 0x05b0, 0x1510, 0x05b0, 0x1520, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x1450, 0x1460, 0x05b0, 0x05b0, 0x05b0, 0x1470, 0x05b0, 0x1480, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ca0, 0x1490, 0x0860, 0x0860, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x14a0, 0x14b0, - 0x05b0, 0x05b0, 0x0d30, 0x05b0, 0x05b0, 0x05b0, 0x14c0, 0x14d0, - 0x05b0, 0x12e0, 0x14e0, 0x14e0, 0x14e0, 0x14e0, 0x0580, 0x0580, - 0x14f0, 0x1500, 0x1510, 0x1520, 0x0860, 0x0860, 0x0860, 0x0860, - 0x1530, 0x1540, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1550, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1560, 0x0860, 0x1570, - 0x1580, 0x1590, 0x15a0, 0x15b0, 0x15c0, 0x1530, 0x15d0, 0x1530, - 0x15e0, 0x15f0, 0x1600, 0x1530, 0x15d0, 0x1530, 0x15e0, 0x1610, - 0x1620, 0x1530, 0x1630, 0x1640, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1650, 0x1530, 0x1530, 0x1660, 0x1530, 0x1530, 0x1550, 0x1670, - 0x1530, 0x1650, 0x1530, 0x1530, 0x1680, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1650, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x1530, 0x1690, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, 0x1530, - 0x16a0, 0x1530, 0x1530, 0x1530, 0x16b0, 0x05b0, 0x05b0, 0x1010, - 0x16c0, 0x05b0, 0x16d0, 0x0860, 0x05b0, 0x05b0, 0x14a0, 0x16e0, - 0x05b0, 0x06b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x16f0, + 0x1530, 0x1540, 0x05b0, 0x05b0, 0x05b0, 0x1550, 0x05b0, 0x1560, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ce0, 0x1570, 0x0870, 0x0870, + 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x05b0, 0x05b0, 0x0850, 0x05b0, 0x05b0, 0x0850, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1580, 0x1590, + 0x05b0, 0x05b0, 0x0d70, 0x05b0, 0x05b0, 0x05b0, 0x15a0, 0x15b0, + 0x05b0, 0x1350, 0x15c0, 0x15c0, 0x15c0, 0x15c0, 0x0580, 0x0580, + 0x15d0, 0x15e0, 0x15f0, 0x1600, 0x0870, 0x0870, 0x0870, 0x0870, + 0x1610, 0x1620, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1340, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1630, 0x0870, 0x1640, + 0x1650, 0x1660, 0x1670, 0x1680, 0x1690, 0x1610, 0x16a0, 0x1610, + 0x16b0, 0x16c0, 0x16d0, 0x1610, 0x16a0, 0x1610, 0x16b0, 0x16e0, + 0x16f0, 0x1610, 0x1700, 0x1710, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1720, 0x1610, 0x1610, 0x1730, 0x1610, 0x1610, 0x1340, 0x1740, + 0x1610, 0x1720, 0x1610, 0x1610, 0x1750, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1720, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x1610, 0x1760, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, + 0x1770, 0x1610, 0x1610, 0x1610, 0x1780, 0x05b0, 0x05b0, 0x1070, + 0x1790, 0x05b0, 0x17a0, 0x0870, 0x05b0, 0x05b0, 0x1580, 0x17b0, + 0x05b0, 0x17c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x17d0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x0840, 0x1700, 0x0df0, 0x0860, 0x0860, 0x0860, 0x0860, 0x1710, - 0x1720, 0x05b0, 0x1730, 0x1740, 0x05b0, 0x05b0, 0x05b0, 0x1750, - 0x1760, 0x05b0, 0x05b0, 0x0f70, 0x1770, 0x0e90, 0x0580, 0x1780, - 0x07b0, 0x05b0, 0x1790, 0x05b0, 0x17a0, 0x17b0, 0x0d40, 0x17c0, - 0x0870, 0x05b0, 0x05b0, 0x17d0, 0x17e0, 0x17f0, 0x0860, 0x0860, - 0x05b0, 0x05b0, 0x1800, 0x1050, 0x1810, 0x1820, 0x0bd0, 0x0f00, - 0x0bd0, 0x0bd0, 0x0bd0, 0x0bd0, 0x1830, 0x1840, 0x0860, 0x0860, - 0x1850, 0x1860, 0x14e0, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x0860, 0x0860, 0x0860, 0x0860, 0x05b0, 0x05b0, 0x1870, 0x0e90, - 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, - 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, - 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, - 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, - 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, - 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, - 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, - 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, - 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, - 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, - 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, - 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, - 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, - 0x18a0, 0x1880, 0x1890, 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, - 0x18a0, 0x18b0, 0x18a0, 0x18c0, 0x18a0, 0x1880, 0x1890, 0x18a0, - 0x18b0, 0x18a0, 0x18d0, 0x0d50, 0x18e0, 0x0d70, 0x0d70, 0x18f0, - 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, - 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, 0x1900, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x12e0, 0x1910, 0x05b0, 0x1920, 0x1930, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1700, 0x1940, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x1950, 0x0860, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1960, 0x05b0, 0x05b0, 0x06b0, 0x0860, 0x0860, 0x1970, - 0x0580, 0x1980, 0x1050, 0x1990, 0x19a0, 0x19b0, 0x19c0, 0x10a0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x19d0, - 0x19e0, 0x19f0, 0x1530, 0x1a00, 0x1530, 0x1a10, 0x1a20, 0x1a30, - 0x05b0, 0x1a40, 0x05b0, 0x0840, 0x1a50, 0x1a60, 0x1a70, 0x1a80, + 0x0850, 0x17e0, 0x1360, 0x0870, 0x0870, 0x0870, 0x0870, 0x0b10, + 0x17f0, 0x05b0, 0x1800, 0x1810, 0x05b0, 0x05b0, 0x05b0, 0x1820, + 0x1830, 0x05b0, 0x05b0, 0x0fd0, 0x1840, 0x0ee0, 0x0580, 0x1850, + 0x07c0, 0x05b0, 0x1860, 0x05b0, 0x1870, 0x1880, 0x0d80, 0x1890, + 0x08b0, 0x05b0, 0x05b0, 0x18a0, 0x18b0, 0x18c0, 0x0870, 0x0870, + 0x05b0, 0x05b0, 0x18d0, 0x10b0, 0x18e0, 0x18f0, 0x0c10, 0x0f60, + 0x0c10, 0x0c10, 0x0c10, 0x0c10, 0x1900, 0x1910, 0x0770, 0x1920, + 0x1930, 0x1940, 0x15c0, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x0870, 0x0870, 0x0870, 0x0870, 0x05b0, 0x05b0, 0x1950, 0x0ee0, + 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, + 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, + 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, + 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, + 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, + 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, + 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, + 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, + 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, + 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, + 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, + 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, + 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, + 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, + 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, + 0x1990, 0x1980, 0x19b0, 0x0d90, 0x19c0, 0x0db0, 0x0db0, 0x19d0, + 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, + 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, + 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x1350, 0x19f0, 0x1a00, 0x1a10, 0x1a20, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a30, 0x1a40, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x1a50, 0x0870, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1a60, 0x05b0, 0x05b0, 0x06b0, 0x0870, 0x0870, 0x1a70, + 0x0580, 0x1a80, 0x10b0, 0x1a90, 0x1aa0, 0x1ab0, 0x1ac0, 0x1100, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ad0, + 0x1ae0, 0x1af0, 0x1610, 0x1b00, 0x1610, 0x1b10, 0x1b20, 0x1b30, + 0x05b0, 0x1b40, 0x05b0, 0x0850, 0x1b50, 0x1b60, 0x1b70, 0x1b80, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -230,18 +230,20 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0019, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0019, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x001a, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, 0x001d, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0017, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0026, 0x0026, 0x0026, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001b, 0x001b, 0x001b, 0x0019, 0x0019, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0017, 0x0011, 0x0011, 0x0017, 0x0017, @@ -279,6 +281,12 @@ 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -325,7 +333,7 @@ 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, @@ -406,7 +414,7 @@ 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0011, 0x0011, 0x0023, 0x0023, 0x0011, 0x0011, + 0x001c, 0x001c, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x0021, 0x0021, 0x0021, 0x0021, 0x001d, 0x0021, 0x0021, 0x0006, 0x0021, 0x0021, 0x0022, 0x0006, 0x0017, 0x0017, 0x0017, 0x0017, 0x0017, 0x0006, 0x001d, 0x0017, 0x001d, 0x001d, 0x001d, @@ -431,8 +439,8 @@ 0x001c, 0x001c, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, @@ -457,6 +465,8 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -481,6 +491,8 @@ 0x0017, 0x0017, 0x001d, 0x0004, 0x0004, 0x0004, 0x0006, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0017, 0x0017, 0x001c, 0x001c, @@ -516,7 +528,7 @@ 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, @@ -529,7 +541,7 @@ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, @@ -568,7 +580,7 @@ 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, - 0x001a, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001a, 0x001a, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x0024, 0x001d, 0x001d, @@ -609,12 +621,16 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, + 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, @@ -633,20 +649,32 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, 0x0024, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x0024, 0x0024, + 0x001e, 0x001d, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x0024, - 0x0024, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, + 0x001e, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, - 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x0024, - 0x0024, 0x0024, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001d, 0x001e, + 0x001e, 0x001e, 0x0024, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, + 0x001e, 0x001e, 0x0024, 0x0024, 0x001e, 0x0024, 0x0024, 0x001e, + 0x001e, 0x001e, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0024, 0x0024, 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0024, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0024, 0x0024, 0x001e, 0x001e, 0x001e, + 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x0015, 0x0015, 0x0015, 0x0015, 0x001d, 0x001d, 0x001d, 0x0017, 0x0017, 0x001d, 0x001d, 0x001d, 0x001d, @@ -656,7 +684,7 @@ 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, @@ -671,9 +699,9 @@ 0x0024, 0x0024, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0017, 0x0022, 0x0022, 0x0022, 0x001d, 0x0017, 0x0022, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, @@ -685,14 +713,12 @@ 0x0012, 0x0022, 0x001d, 0x001d, 0x0015, 0x0015, 0x001d, 0x001d, 0x0015, 0x0015, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0022, 0x0022, 0x0022, 0x0022, 0x0017, 0x001d, - 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0025, 0x0025, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, @@ -705,18 +731,18 @@ 0x001e, 0x001e, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x001e, 0x001e, 0x001e, - 0x0011, 0x0016, 0x001e, 0x0016, 0x001e, 0x0016, 0x001e, 0x0016, - 0x001e, 0x0016, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0016, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0016, 0x001e, 0x0016, 0x001e, 0x0016, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x0011, + 0x0011, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, + 0x001e, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0027, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0027, 0x0027, 0x0011, 0x0011, 0x0004, 0x0004, 0x0016, 0x0016, 0x0016, 0x0016, 0x001e, - 0x0016, 0x0016, 0x001e, 0x0016, 0x001e, 0x0016, 0x001e, 0x0016, - 0x001e, 0x0016, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x0016, 0x0016, 0x001e, + 0x0016, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, + 0x001e, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0027, 0x0027, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0016, 0x0027, 0x0016, 0x0016, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, @@ -727,8 +753,8 @@ 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, - 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, + 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, + 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x001e, 0x001e, @@ -741,14 +767,14 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0017, 0x0022, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0004, 0x0004, 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x001d, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, @@ -787,6 +813,8 @@ 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, @@ -812,11 +840,15 @@ 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0004, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0026, 0x0004, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x001d, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0011, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0011, 0x0026, 0x0011, + 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -845,9 +877,9 @@ 0x001e, 0x001e, 0x001e, 0x0012, 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, 0x001e, 0x0013, 0x001e, 0x0012, - 0x0013, 0x0013, 0x0012, 0x0013, 0x0013, 0x0016, 0x001d, 0x0016, - 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, - 0x0016, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0013, 0x0013, 0x0012, 0x0013, 0x0013, 0x0016, 0x001d, 0x0027, + 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, + 0x0027, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0016, 0x0016, Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/6.2.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include <wine/unicode.h> @@ -244,7 +244,7 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0xffff, 0x0001, 0xffff, 0x0000, - 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0xffff, 0x0000, 0x0002, 0x0000, 0xfffe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0xffff, 0x0000, 0x0000, 0x0000, 0x0001, 0xffff, 0x0001, 0xffff, 0x0001, 0xffff, Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -478,6 +478,12 @@ WORD PosCount; GPOS_PosLookupRecord PosLookupRecord[1]; } GPOS_ChainContextPosFormat3_4; + +typedef struct { + WORD PosFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GPOS_ExtensionPosFormat1; /********** * CMAP @@ -1166,6 +1172,25 @@ if (ValueFormat & 0xFF00) FIXME("Unhandled Value Format %x\n",ValueFormat&0xFF00); } +static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 9) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + return (const BYTE *)look + offset; +} + static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { @@ -1175,9 +1200,8 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_SinglePosFormat1 *spf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); + const GPOS_SinglePosFormat1 *spf1 = (const GPOS_SinglePosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(spf1->PosFormat) == 1) { offset = GET_BE_WORD(spf1->Coverage); @@ -1253,9 +1277,8 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_PairPosFormat1 *ppf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - ppf1 = (const GPOS_PairPosFormat1*)((const BYTE*)look+offset); + const GPOS_PairPosFormat1 *ppf1 = (const GPOS_PairPosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(ppf1->PosFormat) == 1) { int index; @@ -1292,7 +1315,7 @@ } else if (GET_BE_WORD(ppf1->PosFormat) == 2) { - const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)ppf1; int index; WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); @@ -1339,13 +1362,11 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_CursivePosFormat1 *cpf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - cpf1 = (const GPOS_CursivePosFormat1*)((const BYTE*)look+offset); + const GPOS_CursivePosFormat1 *cpf1 = (const GPOS_CursivePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(cpf1->PosFormat) == 1) { int index_exit, index_entry; - offset = GET_BE_WORD( cpf1->Coverage ); + WORD offset = GET_BE_WORD( cpf1->Coverage ); index_exit = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index]); if (index_exit != -1 && cpf1->EntryExitRecord[index_exit].ExitAnchor!= 0) { @@ -1389,10 +1410,7 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkBasePosFormat1 *mbpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mbpf1 = (const GPOS_MarkBasePosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkBasePosFormat1 *mbpf1 = (const GPOS_MarkBasePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mbpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mbpf1->MarkCoverage); @@ -1466,10 +1484,7 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkLigPosFormat1 *mlpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mlpf1 = (const GPOS_MarkLigPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkLigPosFormat1 *mlpf1 = (const GPOS_MarkLigPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mlpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mlpf1->MarkCoverage); @@ -1560,10 +1575,7 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkMarkPosFormat1 *mmpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mmpf1 = (const GPOS_MarkMarkPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkMarkPosFormat1 *mmpf1 = (const GPOS_MarkMarkPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mmpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mmpf1->Mark1Coverage); @@ -1590,7 +1602,7 @@ ma = (const GPOS_MarkArray*)((const BYTE*)mmpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return FALSE; } mr = &ma->MarkRecord[mark_index]; @@ -1631,12 +1643,9 @@ for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { int offset; - const GPOS_ChainContextPosFormat3_1 *ccpf3; + const GPOS_ChainContextPosFormat3_1 *ccpf3 = (GPOS_ChainContextPosFormat3_1 *)GPOS_get_subtable(look, j); int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - - offset = GET_BE_WORD(look->SubTable[j]); - ccpf3 = (const GPOS_ChainContextPosFormat3_1*)((const BYTE*)look+offset); if (GET_BE_WORD(ccpf3->PosFormat) == 1) { @@ -1723,11 +1732,33 @@ int offset; const OT_LookupTable *look; int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + WORD type; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 9) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + else + { + WARN("lookup type is Extension Positioning but no extension subtable exists\n"); + } + } + switch (type) { case 1: { @@ -1849,7 +1880,7 @@ return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); } default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return glyph_index+1; } Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -1,10 +1,10 @@ /* Unicode Arabic shaping */ -/* generated from http://www.unicode.org/Public/6.0.0/ucd/ArabicShaping.txt */ +/* generated from http://www.unicode.org/Public/6.2.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ //#include "wine/unicode.h" -const unsigned short wine_shaping_table[2656] = +const unsigned short wine_shaping_table[2752] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, @@ -54,64 +54,64 @@ 0x0410, 0x0420, 0x0430, 0x0440, 0x0450, 0x0460, 0x0470, 0x0480, 0x0490, 0x04a0, 0x04b0, 0x0360, 0x04c0, 0x04d0, 0x04e0, 0x04f0, 0x0340, 0x0340, 0x0500, 0x0510, 0x0520, 0x0530, 0x0540, 0x0550, - 0x0340, 0x0560, 0x0570, 0x0340, 0x0340, 0x0580, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0590, 0x0340, 0x0340, 0x05a0, 0x05b0, 0x05c0, 0x05d0, 0x0340, - 0x05e0, 0x0340, 0x0340, 0x05f0, 0x0600, 0x0340, 0x05d0, 0x0340, - 0x0610, 0x0340, 0x0340, 0x05f0, 0x0620, 0x05e0, 0x0340, 0x0630, - 0x0610, 0x0340, 0x0340, 0x05f0, 0x0640, 0x0340, 0x05d0, 0x0340, - 0x05e0, 0x0340, 0x0340, 0x0650, 0x0600, 0x0660, 0x05d0, 0x0340, - 0x0670, 0x0340, 0x0340, 0x0340, 0x0680, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0690, 0x06a0, 0x06b0, 0x05d0, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0650, 0x06c0, 0x0340, 0x05d0, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0600, 0x0340, 0x05d0, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x06d0, 0x06e0, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x06f0, 0x0700, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0710, 0x0720, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0730, 0x0340, 0x0740, 0x0340, 0x0340, 0x0340, 0x0750, - 0x0760, 0x0770, 0x0360, 0x0780, 0x0660, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0790, 0x07a0, 0x0340, 0x07b0, 0x0510, 0x07c0, - 0x07d0, 0x0350, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0790, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x07e0, 0x0340, 0x07e0, 0x0340, 0x05d0, 0x0340, 0x05d0, - 0x0340, 0x0340, 0x0340, 0x07f0, 0x0800, 0x0810, 0x0340, 0x0340, - 0x0820, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0830, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0840, 0x0850, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0860, 0x0340, 0x0340, 0x0340, 0x0870, 0x0880, 0x0890, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x08a0, 0x0340, 0x0340, 0x08b0, 0x0670, 0x0340, 0x08c0, 0x08a0, - 0x08d0, 0x0340, 0x08e0, 0x0340, 0x0340, 0x0340, 0x08f0, 0x08d0, - 0x0340, 0x0340, 0x0900, 0x0910, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0920, 0x0930, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0940, 0x0900, - 0x0950, 0x0340, 0x0960, 0x0340, 0x0340, 0x0340, 0x0970, 0x0340, + 0x0340, 0x0560, 0x0570, 0x0340, 0x0580, 0x0590, 0x0340, 0x0340, + 0x0340, 0x0340, 0x05a0, 0x0340, 0x0340, 0x0340, 0x05b0, 0x05c0, + 0x05d0, 0x0340, 0x0340, 0x05e0, 0x05f0, 0x0600, 0x0610, 0x0340, + 0x0620, 0x0340, 0x0340, 0x0630, 0x0640, 0x0340, 0x0610, 0x0340, + 0x0650, 0x0340, 0x0340, 0x0630, 0x0660, 0x0620, 0x0340, 0x0670, + 0x0650, 0x0340, 0x0340, 0x0630, 0x0680, 0x0340, 0x0610, 0x0340, + 0x0620, 0x0340, 0x0340, 0x0690, 0x0640, 0x06a0, 0x0610, 0x0340, + 0x06b0, 0x0340, 0x0340, 0x0340, 0x06c0, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x06d0, 0x06e0, 0x06f0, 0x0610, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0690, 0x0700, 0x0340, 0x0610, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0640, 0x0340, 0x0610, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0710, 0x0720, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0730, 0x0740, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0750, 0x0760, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0770, 0x0340, 0x0780, 0x0340, 0x0340, 0x0340, 0x0790, + 0x07a0, 0x07b0, 0x0360, 0x07c0, 0x06a0, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x07d0, 0x07e0, 0x0340, 0x07f0, 0x0510, 0x0800, + 0x0810, 0x0350, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x07d0, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0820, 0x0340, 0x0820, 0x0340, 0x0610, 0x0340, 0x0610, + 0x0340, 0x0340, 0x0340, 0x0830, 0x0840, 0x0850, 0x0340, 0x0340, + 0x0860, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0870, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0880, 0x0890, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x08a0, 0x0340, 0x0340, 0x0340, 0x08b0, 0x08c0, 0x08d0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x08e0, 0x0340, 0x0340, 0x08f0, 0x06b0, 0x0340, 0x0900, 0x08e0, + 0x0910, 0x0340, 0x0920, 0x0340, 0x0340, 0x0340, 0x0930, 0x0910, + 0x0340, 0x0340, 0x0940, 0x0950, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0960, 0x0970, 0x0980, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0990, 0x0940, + 0x09a0, 0x0340, 0x09b0, 0x0340, 0x0340, 0x0340, 0x09c0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0510, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x08d0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0910, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, - 0x0340, 0x0340, 0x0980, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0990, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x09a0, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x08d0, - 0x09b0, 0x0340, 0x06b0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x09c0, 0x0340, 0x0360, 0x08d0, - 0x0340, 0x0340, 0x09d0, 0x0340, 0x09e0, 0x08d0, 0x0340, 0x0340, - 0x0590, 0x0340, 0x0340, 0x09f0, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0a00, 0x0a10, 0x0a20, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0a30, 0x05e0, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0a40, 0x0340, - 0x0340, 0x0a50, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0360, 0x0340, 0x0940, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x09d0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x09e0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x09f0, + 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0910, + 0x0a00, 0x0340, 0x06f0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0980, 0x0340, 0x0360, 0x0910, + 0x0340, 0x0340, 0x0a10, 0x0340, 0x0a20, 0x0910, 0x0340, 0x0340, + 0x05d0, 0x0340, 0x0340, 0x0a30, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0a40, 0x0a50, 0x0a60, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0a70, 0x0620, 0x0340, 0x0a80, 0x06a0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0a90, 0x0340, + 0x0340, 0x0aa0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0360, 0x0340, 0x0990, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0580, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0ab0, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -185,8 +185,16 @@ 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0002, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0002, 0x0004, + 0x0004, 0x0002, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0002, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0002, 0x0004, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0404, 0x0000, 0x0604, 0x0b04, 0x0f04, 0x1004, 0x1204, 0x1304, + 0x0104, 0x0104, 0x0802, 0x0302, 0x3402, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -294,7 +302,7 @@ 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -305,6 +313,8 @@ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -314,15 +324,13 @@ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, @@ -337,10 +345,14 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000 + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000 }; const unsigned short wine_shaping_forms[256][4] = Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -1341,7 +1341,7 @@ if (original == Script_Punctuation2) break; } - if (scriptInformation[scripts[j]].props.fComplex || asian) + if (j >= 0 && (scriptInformation[scripts[j]].props.fComplex || asian)) scripts[i] = scripts[j]; } } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:11:02 2013 @@ -193,7 +193,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.19 reactos/dll/win32/urlmon # Synced to Wine-1.7.1 -reactos/dll/win32/usp10 # Synced to Wine-1.5.26 +reactos/dll/win32/usp10 # Synced to Wine-1.7.1 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to Wine-1.5.26 reactos/dll/win32/version # Autosync

1 0

[akhaldi] 60417: [URLMON_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:09:44 2013 New Revision: 60417 URL: http://svn.reactos.org/svn/reactos?rev=60417&view=rev Log: [URLMON_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt trunk/rostests/winetests/urlmon/generated.c trunk/rostests/winetests/urlmon/misc.c trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/sec_mgr.c trunk/rostests/winetests/urlmon/uri.c trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeLis… ============================================================================== --- trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -1,7 +1,3 @@ - -remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE generated.c @@ -14,7 +10,7 @@ testlist.c) add_executable(urlmon_winetest ${SOURCE}) -target_link_libraries(urlmon_winetest wine uuid) +target_link_libraries(urlmon_winetest uuid) set_module_type(urlmon_winetest win32cui) -add_importlibs(urlmon_winetest urlmon wininet ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(urlmon_winetest urlmon wininet ole32 oleaut32 user32 advapi32 msvcrt kernel32) add_cd_file(TARGET urlmon_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/urlmon/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/generate… ============================================================================== --- trunk/rostests/winetests/urlmon/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/generated.c [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -9,9 +9,11 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#ifndef __REACTOS__ #define WINVER 0x0501 #define _WIN32_IE 0x0501 #define _WIN32_WINNT 0x0501 +#endif #define WINE_NOWINSOCK Modified: trunk/rostests/winetests/urlmon/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r… ============================================================================== --- trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -31,6 +31,7 @@ //#include "windef.h" //#include "winbase.h" #include <winreg.h> +#include <winnls.h> #include <ole2.h> //#include "urlmon.h" @@ -84,6 +85,33 @@ static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); + +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + +static void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +static WCHAR *a2w(const char *str) +{ + WCHAR *ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} static void test_CreateFormatEnum(void) { @@ -442,42 +470,14 @@ } } -static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; -static const WCHAR mimeTextPlain[] = {'t','e','x','t','/','p','l','a','i','n',0}; -static const WCHAR mimeTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; -static const WCHAR mimeTextXml[] = {'t','e','x','t','/','x','m','l',0}; -static const WCHAR mimeAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'o','c','t','e','t','-','s','t','r','e','a','m',0}; -static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; -static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; -static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; -static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; -static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; -static const WCHAR mimeVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; -static const WCHAR mimeVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; -static const WCHAR mimeAppPostscript[] = - {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; -static const WCHAR mimeAppXCompressed[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','c','o','m','p','r','e','s','s','e','d',0}; -static const WCHAR mimeAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; -static const WCHAR mimeAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; -static const WCHAR mimeAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; -static const WCHAR mimeAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; -static const WCHAR mimeAppXMSDownload[] = - {'a','p','p','l','i','c','a','t','i','o','n','/','x','-','m','s','d','o','w','n','l','o','a','d',0}; -static const WCHAR mimeAudioWav[] = {'a','u','d','i','o','/','w','a','v',0}; -static const WCHAR mimeAudioBasic[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; - static const struct { - LPCWSTR url; - LPCWSTR mime; + const WCHAR *url; + const char *mime; HRESULT hres; } mime_tests[] = { - {url1, mimeTextHtml, S_OK}, - {url2, mimeTextHtml, S_OK}, - {url3, mimeTextHtml, S_OK}, + {url1, "text/html", S_OK}, + {url2, "text/html", S_OK}, + {url3, "text/html", S_OK}, {url4, NULL, E_FAIL}, {url5, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, {url6, NULL, E_FAIL}, @@ -584,119 +584,140 @@ static const struct { BYTE *data; DWORD size; - LPCWSTR mime, mime_pjpeg, broken_mime; + const char *mime; + const char *mime_pjpeg; + const char *broken_mime; + const char *url; + const char *proposed_mime; } mime_tests2[] = { - {data1, sizeof(data1), mimeTextPlain, mimeTextPlain}, - {data2, sizeof(data2), mimeAppOctetStream, mimeImagePjpeg}, - {data3, sizeof(data3), mimeAppOctetStream, mimeImagePjpeg}, - {data4, sizeof(data4), mimeAppOctetStream, mimeImagePjpeg}, - {data5, sizeof(data5), mimeTextPlain, mimeTextPlain}, - {data6, sizeof(data6), mimeTextPlain, mimeTextPlain}, - {data7, sizeof(data7), mimeTextHtml, mimeTextPlain}, - {data8, sizeof(data8), mimeTextHtml, mimeTextPlain}, - {data9, sizeof(data9), mimeTextHtml, mimeImagePjpeg}, - {data10, sizeof(data10), mimeTextHtml, mimeTextPlain}, - {data11, sizeof(data11), mimeTextHtml, mimeTextPlain}, - {data12, sizeof(data12), mimeTextHtml, mimeTextPlain}, - {data13, sizeof(data13), mimeTextPlain, mimeTextPlain}, - {data14, sizeof(data14), mimeTextPlain, mimeTextPlain}, - {data15, sizeof(data15), mimeTextPlain, mimeTextPlain}, - {data16, sizeof(data16), mimeImagePjpeg, mimeImagePjpeg}, - {data17, sizeof(data17), mimeAppOctetStream, mimeImagePjpeg}, - {data18, sizeof(data18), mimeTextHtml, mimeImagePjpeg}, - {data19, sizeof(data19), mimeImageGif, mimeImageGif}, - {data20, sizeof(data20), mimeImageGif, mimeImageGif}, - {data21, sizeof(data21), mimeTextPlain, mimeTextPlain}, - {data22, sizeof(data22), mimeImageGif, mimeImageGif}, - {data23, sizeof(data23), mimeTextPlain, mimeTextPlain}, - {data24, sizeof(data24), mimeImageGif, mimeImageGif}, - {data25, sizeof(data25), mimeImageGif, mimeImageGif}, - {data26, sizeof(data26), mimeTextHtml, mimeImageGif}, - {data27, sizeof(data27), mimeTextPlain, mimeTextPlain}, - {data28, sizeof(data28), mimeImageBmp, mimeImageBmp}, - {data29, sizeof(data29), mimeImageBmp, mimeImageBmp}, - {data30, sizeof(data30), mimeAppOctetStream, mimeImagePjpeg}, - {data31, sizeof(data31), mimeTextHtml, mimeImageBmp}, - {data32, sizeof(data32), mimeAppOctetStream, mimeImagePjpeg}, - {data33, sizeof(data33), mimeAppOctetStream, mimeImagePjpeg}, - {data34, sizeof(data34), mimeImageXPng, mimeImageXPng}, - {data35, sizeof(data35), mimeImageXPng, mimeImageXPng}, - {data36, sizeof(data36), mimeAppOctetStream, mimeImagePjpeg}, - {data37, sizeof(data37), mimeTextHtml, mimeImageXPng}, - {data38, sizeof(data38), mimeAppOctetStream, mimeImagePjpeg}, - {data39, sizeof(data39), mimeImageTiff, mimeImageTiff}, - {data40, sizeof(data40), mimeTextHtml, mimeImageTiff}, - {data41, sizeof(data41), mimeTextPlain, mimeTextPlain, mimeImageTiff}, - {data42, sizeof(data42), mimeTextPlain, mimeTextPlain}, - {data43, sizeof(data43), mimeAppOctetStream, mimeImagePjpeg}, - {data44, sizeof(data44), mimeVideoAvi, mimeVideoAvi}, - {data45, sizeof(data45), mimeTextPlain, mimeTextPlain}, - {data46, sizeof(data46), mimeTextPlain, mimeTextPlain}, - {data47, sizeof(data47), mimeTextPlain, mimeTextPlain}, - {data48, sizeof(data48), mimeTextHtml, mimeVideoAvi}, - {data49, sizeof(data49), mimeVideoAvi, mimeVideoAvi}, - {data50, sizeof(data50), mimeVideoMpeg, mimeVideoMpeg}, - {data51, sizeof(data51), mimeVideoMpeg, mimeVideoMpeg}, - {data52, sizeof(data52), mimeAppOctetStream, mimeImagePjpeg}, - {data53, sizeof(data53), mimeAppOctetStream, mimeImagePjpeg}, - {data54, sizeof(data54), mimeTextHtml, mimeVideoMpeg}, - {data55, sizeof(data55), mimeAppXGzip, mimeAppXGzip}, - {data56, sizeof(data56), mimeTextPlain, mimeTextPlain}, - {data57, sizeof(data57), mimeTextHtml, mimeAppXGzip}, - {data58, sizeof(data58), mimeAppOctetStream, mimeImagePjpeg}, - {data59, sizeof(data59), mimeAppXZip, mimeAppXZip}, - {data60, sizeof(data60), mimeTextPlain, mimeTextPlain}, - {data61, sizeof(data61), mimeTextHtml, mimeAppXZip}, - {data62, sizeof(data62), mimeAppJava, mimeAppJava}, - {data63, sizeof(data63), mimeTextPlain, mimeTextPlain}, - {data64, sizeof(data64), mimeTextHtml, mimeAppJava}, - {data65, sizeof(data65), mimeAppPdf, mimeAppPdf}, - {data66, sizeof(data66), mimeTextPlain, mimeTextPlain}, - {data67, sizeof(data67), mimeTextHtml, mimeAppPdf}, - {data68, sizeof(data68), mimeAppXMSDownload, mimeAppXMSDownload}, - {data69, sizeof(data69), mimeTextPlain, mimeTextPlain}, - {data70, sizeof(data70), mimeTextHtml, mimeAppXMSDownload}, - {data71, sizeof(data71), mimeTextRichtext, mimeTextRichtext}, - {data72, sizeof(data72), mimeTextPlain, mimeTextPlain}, - {data73, sizeof(data73), mimeTextPlain, mimeTextPlain}, - {data74, sizeof(data74), mimeTextHtml, mimeTextRichtext}, - {data75, sizeof(data75), mimeAudioWav, mimeAudioWav}, - {data76, sizeof(data76), mimeTextPlain, mimeTextPlain}, - {data77, sizeof(data77), mimeTextPlain, mimeTextPlain}, - {data78, sizeof(data78), mimeTextHtml, mimeTextPlain}, - {data79, sizeof(data79), mimeAppPostscript, mimeAppPostscript}, - {data80, sizeof(data80), mimeTextPlain, mimeTextPlain}, - {data81, sizeof(data81), mimeTextHtml, mimeAppPostscript}, - {data82, sizeof(data82), mimeAudioBasic, mimeAudioBasic}, - {data83, sizeof(data83), mimeTextPlain, mimeTextPlain}, - {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic}, - {data85, sizeof(data85), mimeTextPlain, mimeTextPlain}, - {data86, sizeof(data86), mimeImageTiff, mimeImageTiff, mimeTextPlain}, - {data87, sizeof(data87), mimeTextPlain, mimeTextPlain}, - {data88, sizeof(data88), mimeTextHtml, mimeTextPlain}, - {data89, sizeof(data89), mimeTextHtml, mimeTextPlain}, - {data90, sizeof(data90), mimeTextHtml, mimeTextPlain}, - {data91, sizeof(data91), mimeTextXml, mimeTextPlain}, - {data92, sizeof(data92), mimeTextXml, mimeTextPlain}, - {data93, sizeof(data93), mimeTextXml, mimeTextPlain}, - {data94, sizeof(data94), mimeTextHtml, mimeTextPlain}, - {data95, sizeof(data95), mimeTextXml, mimeTextRichtext}, - {data96, sizeof(data96), mimeTextPlain, mimeTextPlain} + {data1, sizeof(data1), "text/plain"}, + {data2, sizeof(data2), "application/octet-stream", "image/pjpeg"}, + {data3, sizeof(data3), "application/octet-stream", "image/pjpeg"}, + {data4, sizeof(data4), "application/octet-stream", "image/pjpeg"}, + {data5, sizeof(data5), "text/plain"}, + {data6, sizeof(data6), "text/plain"}, + {data7, sizeof(data7), "text/html", "text/plain"}, + {data8, sizeof(data8), "text/html", "text/plain"}, + {data9, sizeof(data9), "text/html", "image/pjpeg"}, + {data10, sizeof(data10), "text/html", "text/plain"}, + {data11, sizeof(data11), "text/html", "text/plain"}, + {data12, sizeof(data12), "text/html", "text/plain"}, + {data13, sizeof(data13), "text/plain"}, + {data14, sizeof(data14), "text/plain"}, + {data15, sizeof(data15), "text/plain"}, + {data16, sizeof(data16), "image/pjpeg"}, + {data17, sizeof(data17), "application/octet-stream", "image/pjpeg"}, + {data18, sizeof(data18), "text/html", "image/pjpeg"}, + {data19, sizeof(data19), "image/gif"}, + {data20, sizeof(data20), "image/gif"}, + {data21, sizeof(data21), "text/plain"}, + {data22, sizeof(data22), "image/gif"}, + {data23, sizeof(data23), "text/plain"}, + {data24, sizeof(data24), "image/gif"}, + {data25, sizeof(data25), "image/gif"}, + {data26, sizeof(data26), "text/html", "image/gif"}, + {data27, sizeof(data27), "text/plain"}, + {data28, sizeof(data28), "image/bmp"}, + {data29, sizeof(data29), "image/bmp"}, + {data30, sizeof(data30), "application/octet-stream", "image/pjpeg"}, + {data31, sizeof(data31), "text/html", "image/bmp"}, + {data32, sizeof(data32), "application/octet-stream", "image/pjpeg"}, + {data33, sizeof(data33), "application/octet-stream", "image/pjpeg"}, + {data34, sizeof(data34), "image/x-png"}, + {data35, sizeof(data35), "image/x-png"}, + {data36, sizeof(data36), "application/octet-stream", "image/pjpeg"}, + {data37, sizeof(data37), "text/html", "image/x-png"}, + {data38, sizeof(data38), "application/octet-stream", "image/pjpeg"}, + {data39, sizeof(data39), "image/tiff"}, + {data40, sizeof(data40), "text/html", "image/tiff"}, + {data41, sizeof(data41), "text/plain", NULL, "image/tiff"}, + {data42, sizeof(data42), "text/plain"}, + {data43, sizeof(data43), "application/octet-stream", "image/pjpeg"}, + {data44, sizeof(data44), "video/avi"}, + {data45, sizeof(data45), "text/plain"}, + {data46, sizeof(data46), "text/plain"}, + {data47, sizeof(data47), "text/plain"}, + {data48, sizeof(data48), "text/html", "video/avi"}, + {data49, sizeof(data49), "video/avi"}, + {data50, sizeof(data50), "video/mpeg"}, + {data51, sizeof(data51), "video/mpeg"}, + {data52, sizeof(data52), "application/octet-stream", "image/pjpeg"}, + {data53, sizeof(data53), "application/octet-stream", "image/pjpeg"}, + {data54, sizeof(data54), "text/html", "video/mpeg"}, + {data55, sizeof(data55), "application/x-gzip-compressed"}, + {data56, sizeof(data56), "text/plain"}, + {data57, sizeof(data57), "text/html", "application/x-gzip-compressed"}, + {data58, sizeof(data58), "application/octet-stream", "image/pjpeg"}, + {data59, sizeof(data59), "application/x-zip-compressed"}, + {data60, sizeof(data60), "text/plain"}, + {data61, sizeof(data61), "text/html", "application/x-zip-compressed"}, + {data62, sizeof(data62), "application/java"}, + {data63, sizeof(data63), "text/plain"}, + {data64, sizeof(data64), "text/html", "application/java"}, + {data65, sizeof(data65), "application/pdf"}, + {data66, sizeof(data66), "text/plain"}, + {data67, sizeof(data67), "text/html", "application/pdf"}, + {data68, sizeof(data68), "application/x-msdownload"}, + {data69, sizeof(data69), "text/plain"}, + {data70, sizeof(data70), "text/html", "application/x-msdownload"}, + {data71, sizeof(data71), "text/richtext"}, + {data72, sizeof(data72), "text/plain"}, + {data73, sizeof(data73), "text/plain"}, + {data74, sizeof(data74), "text/html", "text/richtext"}, + {data75, sizeof(data75), "audio/wav"}, + {data76, sizeof(data76), "text/plain"}, + {data77, sizeof(data77), "text/plain"}, + {data78, sizeof(data78), "text/html", "text/plain"}, + {data79, sizeof(data79), "application/postscript"}, + {data80, sizeof(data80), "text/plain"}, + {data81, sizeof(data81), "text/html", "application/postscript"}, + {data82, sizeof(data82), "audio/basic"}, + {data83, sizeof(data83), "text/plain"}, + {data84, sizeof(data84), "text/html", "audio/basic"}, + {data85, sizeof(data85), "text/plain"}, + {data86, sizeof(data86), "image/tiff", NULL, "text/plain"}, + {data87, sizeof(data87), "text/plain"}, + {data88, sizeof(data88), "text/html", "text/plain"}, + {data89, sizeof(data89), "text/html", "text/plain"}, + {data90, sizeof(data90), "text/html", "text/plain"}, + {data91, sizeof(data91), "text/xml", "text/plain"}, + {data92, sizeof(data92), "text/xml", "text/plain"}, + {data93, sizeof(data93), "text/xml", "text/plain"}, + {data94, sizeof(data94), "text/html", "text/plain"}, + {data95, sizeof(data95), "text/xml", "text/richtext"}, + {data96, sizeof(data96), "text/plain"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, + {NULL, sizeof(data1), "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, + {data2, sizeof(data2), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, + {data10, sizeof(data10), "text/html", NULL, NULL, "http://www.winehq.org/test.css"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, + {data1, sizeof(data1), "text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} }; static void test_FindMimeFromData(void) { + WCHAR *mime, *proposed_mime, *url; HRESULT hres; - LPWSTR mime; BYTE b; int i; + + static const WCHAR app_octet_streamW[] = + {'a','p','p','l','i','c','a','t','i','o','n','/','o','c','t','e','t','-','s','t','r','e','a','m',0}; + static const WCHAR image_pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; + static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n',0}; for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + ok(!strcmp_wa(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); }else { ok(hres == E_FAIL || hres == mime_tests[i].hres, @@ -706,107 +727,72 @@ } mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeTextPlain, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mimeTextPlain), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + ok(!strcmp_wa(mime, "text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeAppOctetStream, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mimeAppOctetStream), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + ok(!strcmp_wa(mime, "application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); } for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) { + url = a2w(mime_tests2[i].url); + proposed_mime = a2w(mime_tests2[i].proposed_mime); + hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, + proposed_mime, 0, &mime, 0); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); + b = !strcmp_wa(mime, mime_tests2[i].mime); + ok(b || broken(mime_tests2[i].broken_mime && !strcmp_wa(mime, mime_tests2[i].broken_mime)), + "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + heap_free(proposed_mime); + heap_free(url); + CoTaskMemFree(mime); + if(!b || url || proposed_mime) + continue; + hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - NULL, 0, &mime, 0); + app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - b = !lstrcmpW(mime, mime_tests2[i].mime); - ok(b || broken(mime_tests2[i].broken_mime && !lstrcmpW(mime, mime_tests2[i].broken_mime)), - "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - if(!b) - continue; - - hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - mimeAppOctetStream, 0, &mime, 0); - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime - && !lstrcmpW(mime, mime_tests2[i].broken_mime)), + ok(!strcmp_wa(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime + && !strcmp_wa(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - mimeTextPlain, 0, &mime, 0); + text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime - && !lstrcmpW(mime, mime_tests2[i].broken_mime)), + ok(!strcmp_wa(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime + && !strcmp_wa(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - mimeTextHtml, 0, &mime, 0); + text_htmlW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) - || !lstrcmpW(mimeTextPlain, mime_tests2[i].mime) || i==92) - ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + if(!strcmp("application/octet-stream", mime_tests2[i].mime) + || !strcmp("text/plain", mime_tests2[i].mime) || i==92) + ok(!strcmp_wa(mime, "text/html"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + ok(!strcmp_wa(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - mimeImagePjpeg, 0, &mime, 0); + image_pjpegW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests2[i].mime_pjpeg) || broken(!lstrcmpW(mime, mime_tests2[i].mime)), - "[%d] wrong mime, got %s\n", i, wine_dbgstr_w(mime)); + ok(!strcmp_wa(mime, mime_tests2[i].mime_pjpeg ? mime_tests2[i].mime_pjpeg : mime_tests2[i].mime) + || broken(!strcmp_wa(mime, mime_tests2[i].mime)), + "[%d] wrong mime, got %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); } - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url4, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, NULL, 0, NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, NULL, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, 0, 0, NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, 0, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); - hres = pFindMimeFromData(NULL, NULL, NULL, 0, mimeTextPlain, 0, &mime, 0); + hres = pFindMimeFromData(NULL, NULL, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); hres = pFindMimeFromData(NULL, NULL, data1, 0, NULL, 0, &mime, 0); @@ -815,12 +801,12 @@ hres = pFindMimeFromData(NULL, url1, data1, 0, NULL, 0, &mime, 0); ok(hres == E_FAIL, "FindMimeFromData failed: %08x, expected E_FAIL\n", hres); - hres = pFindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, &mime, 0); + hres = pFindMimeFromData(NULL, NULL, data1, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); + ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); - hres = pFindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, NULL, 0); + hres = pFindMimeFromData(NULL, NULL, data1, 0, text_plainW, 0, NULL, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); } Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -3729,7 +3729,7 @@ if(!winetest_interactive) { - skip("protocol test skipped, bug 6381\n"); + skip("protocol test skipped, ROSTESTS-38\n"); return; } Modified: trunk/rostests/winetests/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.… ============================================================================== --- trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/sec_mgr.c [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -27,6 +27,7 @@ #define NONAMELESSUNION /* needed for IInternetZoneManagerEx2 */ +#undef _WIN32_IE #define _WIN32_IE 0x0700 #include <wine/test.h> Modified: trunk/rostests/winetests/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -367,6 +367,31 @@ {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file:///z:/test dir/README.txt", 0, S_OK, FALSE, + { + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/z:/test%20dir/README.txt",S_OK}, + {"/z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test dir/README.txt",S_OK}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, { {"urn:nothing:should:happen here",S_OK,FALSE}, @@ -4503,7 +4528,57 @@ {URL_SCHEME_UNKNOWN,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "mailto://", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:",S_OK}, + {"",S_FALSE}, + {"mailto:",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"mailto://",S_OK,FALSE,"mailto:"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mailto://a@b.com", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {".com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"a(a)b.com",S_OK}, + {"a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto://a@b.com",S_OK,FALSE,"mailto:a@b.com"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + } }; typedef struct _invalid_uri { @@ -6933,6 +7008,114 @@ {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org",0, + "mailto://",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:",S_OK}, + {"",S_FALSE}, + {"mailto:",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"mailto://",S_OK,FALSE,"mailto:"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org",0, + "mailto://a@b.com",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {".com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"a(a)b.com",S_OK}, + {"a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto://a@b.com",S_OK,FALSE,"mailto:a@b.com"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -10244,7 +10427,7 @@ todo_wine { ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } } else { @@ -10253,7 +10436,7 @@ hr, prop.expected, i, j); ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } SysFreeString(received); @@ -10561,7 +10744,7 @@ todo_wine { ok(!strcmp_aw(value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", value, wine_dbgstr_w(received), i, j); } } else { @@ -10570,7 +10753,7 @@ hr, prop.expected, i, j); ok(!strcmp_aw(value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", value, wine_dbgstr_w(received), i, j); } SysFreeString(received); Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Sat Sep 28 15:09:44 2013 @@ -153,6 +153,7 @@ DEFINE_EXPECT(SetPriority); DEFINE_EXPECT(GetWindow_IHttpSecurity); DEFINE_EXPECT(GetWindow_IWindowForBindingUI); +DEFINE_EXPECT(GetWindow_ICodeInstall); DEFINE_EXPECT(OnSecurityProblem); static const WCHAR winetest_data_urlW[] = @@ -195,6 +196,7 @@ static BOOL abort_start = FALSE; static BOOL abort_progress = FALSE; static BOOL async_switch = FALSE; +static const char *test_file; static WCHAR file_url[INTERNET_MAX_URL_LENGTH], current_url[INTERNET_MAX_URL_LENGTH]; @@ -1358,6 +1360,8 @@ CHECK_EXPECT(GetWindow_IHttpSecurity); else if(IsEqualGUID(rguidReason, &IID_IWindowForBindingUI)) CHECK_EXPECT2(GetWindow_IWindowForBindingUI); + else if(IsEqualGUID(rguidReason, &IID_ICodeInstall)) + CHECK_EXPECT(GetWindow_ICodeInstall); else ok(0, "Unexpected rguidReason: %s\n", debugstr_guid(rguidReason)); @@ -1892,7 +1896,7 @@ ok(res == hresult, "res = %08x, expected %08x\n", res, binding_hres); ok(!res_str, "incorrect res_str = %s\n", wine_dbgstr_w(res_str)); - if(hresult==S_OK || (abort_start && hresult!=S_FALSE)) { + if(hresult==S_OK || (abort_start && hresult!=S_FALSE) || hresult == REGDB_E_CLASSNOTREG) { ok(IsEqualCLSID(&clsid, &CLSID_NULL), "incorrect protocol CLSID: %s, expected CLSID_NULL\n", debugstr_guid(&clsid)); @@ -3205,7 +3209,7 @@ } } -static void test_BindToObject(int protocol, DWORD flags) +static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres) { IMoniker *mon; HRESULT hres; @@ -3217,6 +3221,7 @@ IBinding *bind; init_bind_test(protocol, BINDTEST_TOOBJECT|flags, TYMED_ISTREAM); + binding_hres = exhres; if(emulate_protocol) CoRegisterClassObject(&CLSID_HTMLDocument, (IUnknown *)&mime_cf, @@ -3287,10 +3292,17 @@ if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) SET_EXPECT(OnProgress_DOWNLOADINGDATA); SET_EXPECT(Obj_OnProgress_ENDDOWNLOADDATA); - SET_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); + if(SUCCEEDED(hres)) + SET_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); SET_EXPECT(Obj_OnProgress_BEGINSYNCOPERATION); + if(exhres == REGDB_E_CLASSNOTREG) { + SET_EXPECT(QueryInterface_IWindowForBindingUI); + SET_EXPECT(QueryService_IWindowForBindingUI); + SET_EXPECT(GetWindow_ICodeInstall); + } SET_EXPECT(Obj_OnProgress_ENDSYNCOPERATION); - SET_EXPECT(OnObjectAvailable); + if(SUCCEEDED(hres)) + SET_EXPECT(OnObjectAvailable); SET_EXPECT(Obj_OnStopBinding); } @@ -3303,10 +3315,10 @@ return; } - /* no point testing the calls if binding didn't even work */ - if (FAILED(hres)) return; - - if(bindf & BINDF_ASYNCHRONOUS) { + if(FAILED(exhres)) { + ok(hres == exhres, "BindToObject failed: %08x, expected %08x\n", hres, exhres); + ok(!unk, "unk = %p, expected NULL\n", unk); + }else if(bindf & BINDF_ASYNCHRONOUS) { ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToObject failed: %08x\n", hres); ok(unk == NULL, "istr should be NULL\n"); }else { @@ -3376,10 +3388,17 @@ if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) CLEAR_CALLED(OnProgress_DOWNLOADINGDATA); CLEAR_CALLED(Obj_OnProgress_ENDDOWNLOADDATA); - CHECK_CALLED(Obj_OnProgress_CLASSIDAVAILABLE); + if(SUCCEEDED(hres)) + CHECK_CALLED(Obj_OnProgress_CLASSIDAVAILABLE); CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION); + if(exhres == REGDB_E_CLASSNOTREG) { + todo_wine CHECK_CALLED(QueryInterface_IWindowForBindingUI); + todo_wine CHECK_CALLED(QueryService_IWindowForBindingUI); + todo_wine CHECK_CALLED(GetWindow_ICodeInstall); + } CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION); - CHECK_CALLED(OnObjectAvailable); + if(SUCCEEDED(hres)) + CHECK_CALLED(OnObjectAvailable); CHECK_CALLED(Obj_OnStopBinding); } @@ -3614,27 +3633,33 @@ MultiByteToWideChar(CP_ACP, 0, file_urlA, -1, file_url, INTERNET_MAX_URL_LENGTH); } -static void create_file(void) +static void create_file(const char *file_name, const char *content) { HANDLE file; DWORD size; CHAR path[MAX_PATH]; - static const char html_doc[] = "<HTML></HTML>"; - - file = CreateFileA(wszIndexHtmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) return; - WriteFile(file, html_doc, sizeof(html_doc)-1, &size, NULL); + if(test_file) + DeleteFileA(test_file); + test_file = file_name; + WriteFile(file, content, strlen(content), &size, NULL); CloseHandle(file); GetCurrentDirectoryA(MAX_PATH, path); lstrcatA(path, "\\"); - lstrcatA(path, wszIndexHtmlA); + lstrcatA(path, file_name); set_file_url(path); +} + +static void create_html_file(void) +{ + create_file(wszIndexHtmlA, "<HTML></HTML>"); } static void create_cache_file(void) @@ -3833,7 +3858,7 @@ complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); - create_file(); + create_html_file(); create_cache_file(); register_protocols(); @@ -3865,7 +3890,7 @@ test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("synchronous http test (to object)...\n"); - test_BindToObject(HTTP_TEST, 0); + test_BindToObject(HTTP_TEST, 0, S_OK); trace("emulated synchronous http test (with cache)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM); @@ -3883,7 +3908,12 @@ test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("synchronous file test (to object)...\n"); - test_BindToObject(FILE_TEST, 0); + test_BindToObject(FILE_TEST, 0, S_OK); + + trace("bind to an object of not registered MIME type...\n"); + create_file("test.winetest", "\x01\x02\x03xxxxxxxxxxxxxxxxxxxxxxxxx"); + test_BindToObject(FILE_TEST, 0, REGDB_E_CLASSNOTREG); + create_html_file(); trace("file test (no callback)...\n"); test_BindToStorage(FILE_TEST, BINDTEST_NO_CALLBACK, TYMED_ISTREAM); @@ -3921,13 +3951,13 @@ test_BindToStorage(HTTP_TEST, 0, TYMED_FILE); trace("http test (to object)...\n"); - test_BindToObject(HTTP_TEST, 0); + test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (short response)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); - test_BindToObject(HTTP_TEST, 0); + test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (abort start binding E_NOTIMPL)...\n"); abort_hres = E_NOTIMPL; @@ -3944,10 +3974,10 @@ test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("emulated http test (to object)...\n"); - test_BindToObject(HTTP_TEST, BINDTEST_EMULATE); + test_BindToObject(HTTP_TEST, BINDTEST_EMULATE, S_OK); trace("emulated http test (to object, redirect)...\n"); - test_BindToObject(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT); + test_BindToObject(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, S_OK); trace("emulated http test (to file)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); @@ -3975,7 +4005,7 @@ test_BindToStorage(ABOUT_TEST, 0, TYMED_FILE); trace("about test (to object)...\n"); - test_BindToObject(ABOUT_TEST, 0); + test_BindToObject(ABOUT_TEST, 0, S_OK); trace("emulated about test...\n"); test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -3984,7 +4014,7 @@ test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated about test (to object)...\n"); - test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE); + test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE, S_OK); trace("emulalated test reporting result in read...\n"); test_BindToStorage(WINETEST_SYNC_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -3996,7 +4026,7 @@ test_BindToStorage(FILE_TEST, 0, TYMED_FILE); trace("file test (to object)...\n"); - test_BindToObject(FILE_TEST, 0); + test_BindToObject(FILE_TEST, 0, S_OK); trace("emulated file test...\n"); test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -4005,7 +4035,7 @@ test_BindToStorage(FILE_TEST, BINDTEST_EMULATE, TYMED_FILE); trace("emulated file test (to object)...\n"); - test_BindToObject(FILE_TEST, BINDTEST_EMULATE); + test_BindToObject(FILE_TEST, BINDTEST_EMULATE, S_OK); trace("emulated its test...\n"); test_BindToStorage(ITS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -4046,7 +4076,7 @@ test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); } - DeleteFileA(wszIndexHtmlA); + DeleteFileA(test_file); DeleteFileA(test_txtA); CloseHandle(complete_event); CloseHandle(complete_event2);

1 0

[akhaldi] 60416: [URLMON] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:08:52 2013 New Revision: 60416 URL: http://svn.reactos.org/svn/reactos?rev=60416&view=rev Log: [URLMON] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/mimefilter.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -7,13 +7,11 @@ -DWINE_REGISTER_DLL -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +#remove_definitions(-D_WIN32_WINNT=0x502) +#add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) - add_rpcproxy_files(urlmon_urlmon.idl) list(APPEND SOURCE @@ -38,13 +36,12 @@ uri.c urlmon_main.c usrmarshal.c - urlmon.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) -add_library(urlmon SHARED ${SOURCE}) +add_library(urlmon SHARED ${SOURCE} urlmon.rc) set_module_type(urlmon win32dll) target_link_libraries(urlmon uuid wine ${PSEH_LIB}) add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 advpack msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -299,16 +299,18 @@ return; } - if(!(clsid_str = get_mime_clsid(binding->mime, &clsid))) { + if((clsid_str = get_mime_clsid(binding->mime, &clsid))) + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); + + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); + + if(clsid_str) { + hres = create_mime_object(binding, &clsid, clsid_str); + heap_free(clsid_str); + }else { FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); - return; - } - - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); - - hres = create_mime_object(binding, &clsid, clsid_str); - heap_free(clsid_str); + hres = REGDB_E_CLASSNOTREG; + } IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_ENDSYNCOPERATION, NULL); binding->clsid = CLSID_NULL; Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -897,8 +897,12 @@ do { read = 0; + if(is_apartment_thread(This)) + This->continue_call++; hres = IInternetProtocol_Read(This->protocol, buf, sizeof(buf)-This->buf_size, &read); + if(is_apartment_thread(This)) + This->continue_call--; if(FAILED(hres) && hres != E_PENDING) return hres; Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -260,3 +260,410 @@ *ppobj = &ret->IInternetProtocol_iface; return S_OK; } + +static BOOL text_richtext_filter(const BYTE *b, DWORD size) +{ + return size > 5 && !memcmp(b, "{\\rtf", 5); +} + +static BOOL text_html_filter(const BYTE *b, DWORD size) +{ + if(size < 6) + return FALSE; + + if((b[0] == '<' + && (b[1] == 'h' || b[1] == 'H') + && (b[2] == 't' || b[2] == 'T') + && (b[3] == 'm' || b[3] == 'M') + && (b[4] == 'l' || b[4] == 'L')) + || (b[0] == '<' + && (b[1] == 'h' || b[1] == 'H') + && (b[2] == 'e' || b[2] == 'E') + && (b[3] == 'a' || b[3] == 'A') + && (b[4] == 'd' || b[4] == 'D'))) return TRUE; + + return FALSE; +} + +static BOOL text_xml_filter(const BYTE *b, DWORD size) +{ + if(size < 7) + return FALSE; + + if(b[0] == '<' && b[1] == '?' + && (b[2] == 'x' || b[2] == 'X') + && (b[3] == 'm' || b[3] == 'M') + && (b[4] == 'l' || b[4] == 'L') + && b[5] == ' ') return TRUE; + + return FALSE; +} + +static BOOL audio_basic_filter(const BYTE *b, DWORD size) +{ + return size > 4 + && b[0] == '.' && b[1] == 's' && b[2] == 'n' && b[3] == 'd'; +} + +static BOOL audio_wav_filter(const BYTE *b, DWORD size) +{ + return size > 12 + && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' + && b[8] == 'W' && b[9] == 'A' && b[10] == 'V' && b[11] == 'E'; +} + +static BOOL image_gif_filter(const BYTE *b, DWORD size) +{ + return size >= 6 + && (b[0] == 'G' || b[0] == 'g') + && (b[1] == 'I' || b[1] == 'i') + && (b[2] == 'F' || b[2] == 'f') + && b[3] == '8' + && (b[4] == '7' || b[4] == '9') + && (b[5] == 'A' || b[5] == 'a'); +} + +static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 0xff && b[1] == 0xd8; +} + +static BOOL image_tiff_filter(const BYTE *b, DWORD size) +{ + static const BYTE magic1[] = {0x4d,0x4d,0x00,0x2a}; + static const BYTE magic2[] = {0x49,0x49,0x2a,0xff}; + + return size >= 4 && (!memcmp(b, magic1, 4) || !memcmp(b, magic2, 4)); +} + +static BOOL image_xpng_filter(const BYTE *b, DWORD size) +{ + static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; + return size > sizeof(xpng_header) && !memcmp(b, xpng_header, sizeof(xpng_header)); +} + +static BOOL image_bmp_filter(const BYTE *b, DWORD size) +{ + return size >= 14 + && b[0] == 0x42 && b[1] == 0x4d + && *(const DWORD *)(b+6) == 0; +} + +static BOOL video_avi_filter(const BYTE *b, DWORD size) +{ + return size > 12 + && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' + && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; +} + +static BOOL video_mpeg_filter(const BYTE *b, DWORD size) +{ + return size > 4 + && !b[0] && !b[1] && b[2] == 0x01 + && (b[3] == 0xb3 || b[3] == 0xba); +} + +static BOOL application_postscript_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == '%' && b[1] == '!'; +} + +static BOOL application_pdf_filter(const BYTE *b, DWORD size) +{ + return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; +} + +static BOOL application_xzip_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 0x50 && b[1] == 0x4b; +} + +static BOOL application_xgzip_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 0x1f && b[1] == 0x8b; +} + +static BOOL application_java_filter(const BYTE *b, DWORD size) +{ + return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; +} + +static BOOL application_xmsdownload(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 'M' && b[1] == 'Z'; +} + +static inline BOOL is_text_plain_char(BYTE b) +{ + if(b < 0x20 && b != '\n' && b != '\r' && b != '\t') + return FALSE; + return TRUE; +} + +static BOOL text_plain_filter(const BYTE *b, DWORD size) +{ + const BYTE *ptr; + + for(ptr = b; ptr < b+size-1; ptr++) { + if(!is_text_plain_char(*ptr)) + return FALSE; + } + + return TRUE; +} + +static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) +{ + return TRUE; +} + +static HRESULT find_mime_from_url(const WCHAR *url, WCHAR **ret) +{ + const WCHAR *ptr; + DWORD res, size; + WCHAR mime[64]; + HKEY hkey; + + static const WCHAR content_typeW[] = {'C','o','n','t','e','n','t',' ','T','y','p','e','\0'}; + + ptr = strrchrW(url, '.'); + if(!ptr) + return E_FAIL; + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey); + if(res != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(res); + + size = sizeof(mime); + res = RegQueryValueExW(hkey, content_typeW, NULL, NULL, (LPBYTE)mime, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(res); + + TRACE("found MIME %s\n", debugstr_w(mime)); + + *ret = CoTaskMemAlloc(size); + memcpy(*ret, mime, size); + return S_OK; +} + +static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; +static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; +static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; +static const WCHAR audio_basicW[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; +static const WCHAR audio_wavW[] = {'a','u','d','i','o','/','w','a','v',0}; +static const WCHAR image_gifW[] = {'i','m','a','g','e','/','g','i','f',0}; +static const WCHAR image_pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; +static const WCHAR image_tiffW[] = {'i','m','a','g','e','/','t','i','f','f',0}; +static const WCHAR image_xpngW[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; +static const WCHAR image_bmpW[] = {'i','m','a','g','e','/','b','m','p',0}; +static const WCHAR video_aviW[] = {'v','i','d','e','o','/','a','v','i',0}; +static const WCHAR video_mpegW[] = {'v','i','d','e','o','/','m','p','e','g',0}; +static const WCHAR app_postscriptW[] = + {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; +static const WCHAR app_pdfW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; +static const WCHAR app_xzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; +static const WCHAR app_xgzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; +static const WCHAR app_javaW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; +static const WCHAR app_xmsdownloadW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','m','s','d','o','w','n','l','o','a','d',0}; +static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; +static const WCHAR app_octetstreamW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; + +static const struct { + const WCHAR *mime; + BOOL (*filter)(const BYTE *,DWORD); +} mime_filters_any_pos[] = { + {text_htmlW, text_html_filter}, + {text_xmlW, text_xml_filter} +}, mime_filters[] = { + {text_richtextW, text_richtext_filter}, + /* {audio_xaiffW, audio_xaiff_filter}, */ + {audio_basicW, audio_basic_filter}, + {audio_wavW, audio_wav_filter}, + {image_gifW, image_gif_filter}, + {image_pjpegW, image_pjpeg_filter}, + {image_tiffW, image_tiff_filter}, + {image_xpngW, image_xpng_filter}, + /* {image_xbitmapW, image_xbitmap_filter}, */ + {image_bmpW, image_bmp_filter}, + /* {image_xjgW, image_xjg_filter}, */ + /* {image_xemfW, image_xemf_filter}, */ + /* {image_xwmfW, image_xwmf_filter}, */ + {video_aviW, video_avi_filter}, + {video_mpegW, video_mpeg_filter}, + {app_postscriptW, application_postscript_filter}, + /* {app_base64W, application_base64_filter}, */ + /* {app_macbinhex40W, application_macbinhex40_filter}, */ + {app_pdfW, application_pdf_filter}, + /* {app_zcompressedW, application_xcompressed_filter}, */ + {app_xzipW, application_xzip_filter}, + {app_xgzipW, application_xgzip_filter}, + {app_javaW, application_java_filter}, + {app_xmsdownloadW, application_xmsdownload}, + {text_plainW, text_plain_filter}, + {app_octetstreamW, application_octet_stream_filter} +}; + +static BOOL is_known_mime_type(const WCHAR *mime) +{ + unsigned i; + + for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(!strcmpW(mime, mime_filters_any_pos[i].mime)) + return TRUE; + } + + for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(!strcmpW(mime, mime_filters[i].mime)) + return TRUE; + } + + return FALSE; +} + +static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *proposed_mime, const WCHAR *url, WCHAR **ret_mime) +{ + int len, i, any_pos_mime = -1; + const WCHAR *ret = NULL; + + if(!buf || !size) { + if(!proposed_mime) + return E_FAIL; + + len = strlenW(proposed_mime)+1; + *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ret_mime) + return E_OUTOFMEMORY; + + memcpy(*ret_mime, proposed_mime, len*sizeof(WCHAR)); + return S_OK; + } + + if(proposed_mime && (!strcmpW(proposed_mime, app_octetstreamW) + || !strcmpW(proposed_mime, text_plainW))) + proposed_mime = NULL; + + if(proposed_mime) { + ret = proposed_mime; + + for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { + any_pos_mime = i; + for(len=size; len>0; len--) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) + break; + } + if(!len) + ret = NULL; + break; + } + } + + if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { + for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(!strcmpW(proposed_mime, mime_filters[i].mime)) { + if(!mime_filters[i].filter(buf, size)) + ret = NULL; + break; + } + } + } + } + + /* Looks like a bug in native implementation, html and xml mimes + * are not looked for if none of them was proposed */ + if(!proposed_mime || any_pos_mime!=-1) { + for(len=size; !ret && len>0; len--) { + for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) { + ret = mime_filters_any_pos[i].mime; + break; + } + } + } + } + + i=0; + while(!ret) { + if(mime_filters[i].filter(buf, size)) + ret = mime_filters[i].mime; + i++; + } + + if(any_pos_mime!=-1 && ret==text_plainW) + ret = mime_filters_any_pos[any_pos_mime].mime; + else if(proposed_mime && ret==app_octetstreamW) { + for(len=size; ret==app_octetstreamW && len>0; len--) { + if(!is_text_plain_char(buf[size-len])) + break; + for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) { + ret = text_plainW; + break; + } + } + } + + if(ret == app_octetstreamW) + ret = proposed_mime; + } + + if(url && (ret == app_octetstreamW || ret == text_plainW)) { + WCHAR *url_mime; + HRESULT hres; + + hres = find_mime_from_url(url, &url_mime); + if(SUCCEEDED(hres)) { + if(!is_known_mime_type(url_mime)) { + *ret_mime = url_mime; + return hres; + } + CoTaskMemFree(url_mime); + } + } + + TRACE("found %s for %s\n", debugstr_w(ret), debugstr_an((const char*)buf, min(32, size))); + + len = strlenW(ret)+1; + *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ret_mime) + return E_OUTOFMEMORY; + + memcpy(*ret_mime, ret, len*sizeof(WCHAR)); + return S_OK; +} + +/*********************************************************************** + * FindMimeFromData (URLMON.@) + * + * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. + */ +HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, + DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, + LPWSTR* ppwzMimeOut, DWORD dwReserved) +{ + TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, + debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); + + if(dwMimeFlags) + WARN("dwMimeFlags=%08x\n", dwMimeFlags); + if(dwReserved) + WARN("dwReserved=%d\n", dwReserved); + + /* pBC seams to not be used */ + + if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) + return E_INVALIDARG; + + if(pwzMimeProposed || pBuffer) + return find_mime_from_buffer(pBuffer, cbSize, pwzMimeProposed, pwzUrl, ppwzMimeOut); + + if(pwzUrl) + return find_mime_from_url(pwzUrl, ppwzMimeOut); + + return E_FAIL; +} Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -78,7 +78,7 @@ if(FAILED(hres)) { protocol_close_connection(protocol); report_result(protocol, hres); - return S_OK; + return hres; } if(protocol->bindf & BINDF_NEEDFILE) { Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -233,7 +233,22 @@ hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl); if(SUCCEEDED(hres)) { - FIXME("use running object table\n"); + hres = IRunningObjectTable_IsRunning(obj_tbl, &This->IMoniker_iface); + if(hres == S_OK) { + IUnknown *unk = NULL; + + TRACE("Found in running object table\n"); + + hres = IRunningObjectTable_GetObject(obj_tbl, &This->IMoniker_iface, &unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + } + + IRunningObjectTable_Release(obj_tbl); + return hres; + } + IRunningObjectTable_Release(obj_tbl); } Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… ============================================================================== --- trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -422,7 +422,7 @@ else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { *ptr += 2; return TRUE; - } else if(check_hierarchical(ptr)) + } else if(data->scheme_type != URL_SCHEME_MAILTO && check_hierarchical(ptr)) return TRUE; *ptr = start; @@ -1917,8 +1917,15 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; - - data->path = *ptr; + const BOOL is_mailto = data->scheme_type == URL_SCHEME_MAILTO; + + if (is_mailto && (*ptr)[0] == '/' && (*ptr)[1] == '/') + { + if ((*ptr)[2]) data->path = *ptr + 2; + else data->path = NULL; + } + else + data->path = *ptr; while(!is_path_delim(**ptr)) { if(**ptr == '%' && known_scheme) { @@ -1938,7 +1945,7 @@ ++(*ptr); } - data->path_len = *ptr - data->path; + if (data->path) data->path_len = *ptr - data->path; TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); return TRUE; @@ -6461,7 +6468,7 @@ return E_OUTOFMEMORY; } - parse_uri(&data, 0); + parse_uri(&data, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME); hr = Uri_Construct(NULL, (void**)&ret); if(FAILED(hr)) { @@ -6800,7 +6807,7 @@ } } - hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative); + hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &relative); if(FAILED(hr)) { *ppCombinedUri = NULL; return hr; Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -157,6 +157,7 @@ break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; process_detach(); DeleteCriticalSection(&tls_cs); break; @@ -696,377 +697,6 @@ return S_OK; } -static BOOL text_richtext_filter(const BYTE *b, DWORD size) -{ - return size > 5 && !memcmp(b, "{\\rtf", 5); -} - -static BOOL text_html_filter(const BYTE *b, DWORD size) -{ - if(size < 6) - return FALSE; - - if((b[0] == '<' - && (b[1] == 'h' || b[1] == 'H') - && (b[2] == 't' || b[2] == 'T') - && (b[3] == 'm' || b[3] == 'M') - && (b[4] == 'l' || b[4] == 'L')) - || (b[0] == '<' - && (b[1] == 'h' || b[1] == 'H') - && (b[2] == 'e' || b[2] == 'E') - && (b[3] == 'a' || b[3] == 'A') - && (b[4] == 'd' || b[4] == 'D'))) return TRUE; - - return FALSE; -} - -static BOOL text_xml_filter(const BYTE *b, DWORD size) -{ - if(size < 7) - return FALSE; - - if(b[0] == '<' && b[1] == '?' - && (b[2] == 'x' || b[2] == 'X') - && (b[3] == 'm' || b[3] == 'M') - && (b[4] == 'l' || b[4] == 'L') - && b[5] == ' ') return TRUE; - - return FALSE; -} - -static BOOL audio_basic_filter(const BYTE *b, DWORD size) -{ - return size > 4 - && b[0] == '.' && b[1] == 's' && b[2] == 'n' && b[3] == 'd'; -} - -static BOOL audio_wav_filter(const BYTE *b, DWORD size) -{ - return size > 12 - && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' - && b[8] == 'W' && b[9] == 'A' && b[10] == 'V' && b[11] == 'E'; -} - -static BOOL image_gif_filter(const BYTE *b, DWORD size) -{ - return size >= 6 - && (b[0] == 'G' || b[0] == 'g') - && (b[1] == 'I' || b[1] == 'i') - && (b[2] == 'F' || b[2] == 'f') - && b[3] == '8' - && (b[4] == '7' || b[4] == '9') - && (b[5] == 'A' || b[5] == 'a'); -} - -static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 0xff && b[1] == 0xd8; -} - -static BOOL image_tiff_filter(const BYTE *b, DWORD size) -{ - static const BYTE magic1[] = {0x4d,0x4d,0x00,0x2a}; - static const BYTE magic2[] = {0x49,0x49,0x2a,0xff}; - - return size >= 4 && (!memcmp(b, magic1, 4) || !memcmp(b, magic2, 4)); -} - -static BOOL image_xpng_filter(const BYTE *b, DWORD size) -{ - static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; - return size > sizeof(xpng_header) && !memcmp(b, xpng_header, sizeof(xpng_header)); -} - -static BOOL image_bmp_filter(const BYTE *b, DWORD size) -{ - return size >= 14 - && b[0] == 0x42 && b[1] == 0x4d - && *(const DWORD *)(b+6) == 0; -} - -static BOOL video_avi_filter(const BYTE *b, DWORD size) -{ - return size > 12 - && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' - && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; -} - -static BOOL video_mpeg_filter(const BYTE *b, DWORD size) -{ - return size > 4 - && !b[0] && !b[1] && b[2] == 0x01 - && (b[3] == 0xb3 || b[3] == 0xba); -} - -static BOOL application_postscript_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == '%' && b[1] == '!'; -} - -static BOOL application_pdf_filter(const BYTE *b, DWORD size) -{ - return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; -} - -static BOOL application_xzip_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 0x50 && b[1] == 0x4b; -} - -static BOOL application_xgzip_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 0x1f && b[1] == 0x8b; -} - -static BOOL application_java_filter(const BYTE *b, DWORD size) -{ - return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; -} - -static BOOL application_xmsdownload(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 'M' && b[1] == 'Z'; -} - -static inline BOOL is_text_plain_char(BYTE b) -{ - if(b < 0x20 && b != '\n' && b != '\r' && b != '\t') - return FALSE; - return TRUE; -} - -static BOOL text_plain_filter(const BYTE *b, DWORD size) -{ - const BYTE *ptr; - - for(ptr = b; ptr < b+size-1; ptr++) { - if(!is_text_plain_char(*ptr)) - return FALSE; - } - - return TRUE; -} - -static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) -{ - return TRUE; -} - -static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *proposed_mime, WCHAR **ret_mime) -{ - LPCWSTR ret = NULL; - int len, i, any_pos_mime = -1; - - static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; - static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; - static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; - static const WCHAR audio_basicW[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; - static const WCHAR audio_wavW[] = {'a','u','d','i','o','/','w','a','v',0}; - static const WCHAR image_gifW[] = {'i','m','a','g','e','/','g','i','f',0}; - static const WCHAR image_pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; - static const WCHAR image_tiffW[] = {'i','m','a','g','e','/','t','i','f','f',0}; - static const WCHAR image_xpngW[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; - static const WCHAR image_bmpW[] = {'i','m','a','g','e','/','b','m','p',0}; - static const WCHAR video_aviW[] = {'v','i','d','e','o','/','a','v','i',0}; - static const WCHAR video_mpegW[] = {'v','i','d','e','o','/','m','p','e','g',0}; - static const WCHAR app_postscriptW[] = - {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; - static const WCHAR app_pdfW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; - static const WCHAR app_xzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; - static const WCHAR app_xgzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; - static const WCHAR app_javaW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'j','a','v','a',0}; - static const WCHAR app_xmsdownloadW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','m','s','d','o','w','n','l','o','a','d',0}; - static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; - static const WCHAR app_octetstreamW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; - - static const struct { - LPCWSTR mime; - BOOL (*filter)(const BYTE *,DWORD); - } mime_filters_any_pos[] = { - {text_htmlW, text_html_filter}, - {text_xmlW, text_xml_filter} - }, mime_filters[] = { - {text_richtextW, text_richtext_filter}, - /* {audio_xaiffW, audio_xaiff_filter}, */ - {audio_basicW, audio_basic_filter}, - {audio_wavW, audio_wav_filter}, - {image_gifW, image_gif_filter}, - {image_pjpegW, image_pjpeg_filter}, - {image_tiffW, image_tiff_filter}, - {image_xpngW, image_xpng_filter}, - /* {image_xbitmapW, image_xbitmap_filter}, */ - {image_bmpW, image_bmp_filter}, - /* {image_xjgW, image_xjg_filter}, */ - /* {image_xemfW, image_xemf_filter}, */ - /* {image_xwmfW, image_xwmf_filter}, */ - {video_aviW, video_avi_filter}, - {video_mpegW, video_mpeg_filter}, - {app_postscriptW, application_postscript_filter}, - /* {app_base64W, application_base64_filter}, */ - /* {app_macbinhex40W, application_macbinhex40_filter}, */ - {app_pdfW, application_pdf_filter}, - /* {app_zcompressedW, application_xcompressed_filter}, */ - {app_xzipW, application_xzip_filter}, - {app_xgzipW, application_xgzip_filter}, - {app_javaW, application_java_filter}, - {app_xmsdownloadW, application_xmsdownload}, - {text_plainW, text_plain_filter}, - {app_octetstreamW, application_octet_stream_filter} - }; - - if(!buf || !size) { - if(!proposed_mime) - return E_FAIL; - - len = strlenW(proposed_mime)+1; - *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ret_mime) - return E_OUTOFMEMORY; - - memcpy(*ret_mime, proposed_mime, len*sizeof(WCHAR)); - return S_OK; - } - - if(proposed_mime && (!strcmpW(proposed_mime, app_octetstreamW) - || !strcmpW(proposed_mime, text_plainW))) - proposed_mime = NULL; - - if(proposed_mime) { - ret = proposed_mime; - - for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { - if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { - any_pos_mime = i; - for(len=size; len>0; len--) { - if(mime_filters_any_pos[i].filter(buf+size-len, len)) - break; - } - if(!len) - ret = NULL; - break; - } - } - - if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { - if(!strcmpW(proposed_mime, mime_filters[i].mime)) { - if(!mime_filters[i].filter(buf, size)) - ret = NULL; - break; - } - } - } - } - - /* Looks like a bug in native implementation, html and xml mimes - * are not looked for if none of them was proposed */ - if(!proposed_mime || any_pos_mime!=-1) { - for(len=size; !ret && len>0; len--) { - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { - if(mime_filters_any_pos[i].filter(buf+size-len, len)) { - ret = mime_filters_any_pos[i].mime; - break; - } - } - } - } - - i=0; - while(!ret) { - if(mime_filters[i].filter(buf, size)) - ret = mime_filters[i].mime; - i++; - } - - if(any_pos_mime!=-1 && ret==text_plainW) - ret = mime_filters_any_pos[any_pos_mime].mime; - else if(proposed_mime && ret==app_octetstreamW) { - for(len=size; ret==app_octetstreamW && len>0; len--) { - if(!is_text_plain_char(buf[size-len])) - break; - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { - if(mime_filters_any_pos[i].filter(buf+size-len, len)) { - ret = text_plainW; - break; - } - } - } - - if(ret == app_octetstreamW) - ret = proposed_mime; - } - TRACE("found %s for %s\n", debugstr_w(ret), debugstr_an((const char*)buf, min(32, size))); - - len = strlenW(ret)+1; - *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ret_mime) - return E_OUTOFMEMORY; - - memcpy(*ret_mime, ret, len*sizeof(WCHAR)); - return S_OK; -} - -/*********************************************************************** - * FindMimeFromData (URLMON.@) - * - * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. - */ -HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, - DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, - LPWSTR* ppwzMimeOut, DWORD dwReserved) -{ - TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, - debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); - - if(dwMimeFlags) - WARN("dwMimeFlags=%08x\n", dwMimeFlags); - if(dwReserved) - WARN("dwReserved=%d\n", dwReserved); - - /* pBC seams to not be used */ - - if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) - return E_INVALIDARG; - - if(pwzMimeProposed || pBuffer) - return find_mime_from_buffer(pBuffer, cbSize, pwzMimeProposed, ppwzMimeOut); - - if(pwzUrl) { - HKEY hkey; - DWORD res, size; - LPCWSTR ptr; - WCHAR mime[64]; - - static const WCHAR wszContentType[] = - {'C','o','n','t','e','n','t',' ','T','y','p','e','\0'}; - - ptr = strrchrW(pwzUrl, '.'); - if(!ptr) - return E_FAIL; - - res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey); - if(res != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(res); - - size = sizeof(mime); - res = RegQueryValueExW(hkey, wszContentType, NULL, NULL, (LPBYTE)mime, &size); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(res); - - *ppwzMimeOut = CoTaskMemAlloc(size); - memcpy(*ppwzMimeOut, mime, size); - return S_OK; - } - - return E_FAIL; -} - /*********************************************************************** * GetClassFileOrMime (URLMON.@) * Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -192,7 +192,7 @@ reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.19 -reactos/dll/win32/urlmon # Synced to Wine-1.5.26 +reactos/dll/win32/urlmon # Synced to Wine-1.7.1 reactos/dll/win32/usp10 # Synced to Wine-1.5.26 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to Wine-1.5.26

1 0

[akhaldi] 60415: [TAPI32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:07:20 2013 New Revision: 60415 URL: http://svn.reactos.org/svn/reactos?rev=60415&view=rev Log: [TAPI32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/tapi32/CMakeLists.txt trunk/reactos/dll/win32/tapi32/assisted.c trunk/reactos/dll/win32/tapi32/line.c trunk/reactos/dll/win32/tapi32/phone.c trunk/reactos/dll/win32/tapi32/tapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(tapi32.dll tapi32.spec) list(APPEND SOURCE @@ -13,12 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def) add_library(tapi32 SHARED ${SOURCE}) - set_module_type(tapi32 win32dll) - target_link_libraries(tapi32 wine) - -add_importlibs(tapi32 msvcrt advapi32 kernel32 ntdll) -add_dependencies(tapi32 psdk) - +add_importlibs(tapi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET tapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/tapi32/assisted.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/assisted.… ============================================================================== --- trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -2,6 +2,7 @@ * TAPI32 Assisted Telephony * * Copyright 1999 Andreas Mohr + * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,50 +34,61 @@ #include <winreg.h> #include <objbase.h> #include <tapi.h> +#include <wine/unicode.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** - * tapiGetLocationInfo (TAPI32.@) + * tapiGetLocationInfoW (TAPI32.@) */ -DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode) +DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) { HKEY hkey, hsubkey; DWORD currid; DWORD valsize; DWORD type; DWORD bufsize; - BYTE buf[100]; - char szlockey[20]; - if(!RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Locations", - &hkey) != ERROR_SUCCESS) { + BYTE buf[200]; + WCHAR szlockey[20]; + + static const WCHAR currentidW[] = {'C','u','r','r','e','n','t','I','D',0}; + static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n','%','u',0}; + static const WCHAR areacodeW[] = {'A','r','e','a','C','o','d','e',0}; + static const WCHAR countryW[] = {'C','o','u','n','t','r','y',0}; + static const WCHAR fmtW[] = {'%','u',0}; + + static const WCHAR locations_keyW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0}; + + if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) { valsize = sizeof( DWORD); - if(!RegQueryValueExA(hkey, "CurrentID", 0, &type, (LPBYTE) &currid, - &valsize) && type == REG_DWORD) { + if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && + type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintf( szlockey, "Location%u", currid); - if( !RegOpenKeyA( hkey, szlockey, &hsubkey)) { - if( lpszCityCode) { + sprintfW( szlockey, locationW, currid); + if( !RegOpenKeyW( hkey, szlockey, &hsubkey)) { + if( citycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "AreaCode", 0, &type, buf, - &bufsize) && type == REG_SZ) { - lstrcpynA( lpszCityCode, (char *) buf, 8); + if( !RegQueryValueExW( hsubkey, areacodeW, 0, &type, buf, &bufsize) && + type == REG_SZ) { + lstrcpynW( citycode, (WCHAR *) buf, 8); } else - lpszCityCode[0] = '\0'; + citycode[0] = '\0'; } - if( lpszCountryCode) { + if( countrycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "Country", 0, &type, buf, - &bufsize) && type == REG_DWORD) - snprintf( lpszCountryCode, 8, "%u", *(LPDWORD) buf ); + if( !RegQueryValueExW( hsubkey, countryW, 0, &type, buf, &bufsize) && + type == REG_DWORD) + snprintfW( countrycode, 8, fmtW, *(LPDWORD) buf ); else - lpszCountryCode[0] = '\0'; + countrycode[0] = '\0'; } - TRACE("(%p \"%s\", %p \"%s\"): success.\n", - lpszCountryCode, debugstr_a(lpszCountryCode), - lpszCityCode, debugstr_a(lpszCityCode)); + TRACE("(%p \"%s\", %p \"%s\"): success.\n", countrycode, debugstr_w(countrycode), + citycode, debugstr_w(citycode)); RegCloseKey( hkey); RegCloseKey( hsubkey); return 0; /* SUCCESS */ @@ -84,9 +96,32 @@ } RegCloseKey( hkey); } - WARN("(%p, %p): failed (no telephony registry entries?).\n", - lpszCountryCode, lpszCityCode); + WARN("(%p, %p): failed (no telephony registry entries?).\n", countrycode, citycode); return TAPIERR_REQUESTFAILED; +} + + +/*********************************************************************** + * tapiGetLocationInfoA (TAPI32.@) + */ +DWORD WINAPI tapiGetLocationInfoA(LPSTR countrycode, LPSTR citycode) +{ + DWORD ret, len; + LPWSTR country, city; + + len = MultiByteToWideChar( CP_ACP, 0, countrycode, -1, NULL, 0 ); + country = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, countrycode, -1, country, len ); + + len = MultiByteToWideChar( CP_ACP, 0, citycode, -1, NULL, 0 ); + city = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, citycode, -1, city, len ); + + ret = tapiGetLocationInfoW(country, city); + + HeapFree( GetProcessHeap(), 0, city ); + HeapFree( GetProcessHeap(), 0, country ); + return ret; } /*********************************************************************** Modified: trunk/reactos/dll/win32/tapi32/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/line.c?re… ============================================================================== --- trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -35,6 +35,7 @@ #include <objbase.h> #include <tapi.h> #include <wine/debug.h> +#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -138,6 +139,15 @@ } /*********************************************************************** + * lineConfigDialogW (TAPI32.@) + */ +DWORD WINAPI lineConfigDialogW(DWORD dwDeviceID, HWND hwndOwner, LPCWSTR lpszDeviceClass) +{ + FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, hwndOwner, debugstr_w(lpszDeviceClass)); + return 0; +} + +/*********************************************************************** * lineConfigDialogEdit (TAPI32.@) */ DWORD WINAPI lineConfigDialogEditA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass, LPVOID const lpDeviceConfigIn, DWORD dwSize, LPVARSTRING lpDeviceConfigOut) @@ -192,6 +202,15 @@ } /*********************************************************************** + * lineDialW (TAPI32.@) + */ +DWORD WINAPI lineDialW(HCALL hCall, LPCWSTR lpszDestAddress, DWORD dwCountryCode) +{ + FIXME("(%p, %s, %08x): stub.\n", hCall, debugstr_w(lpszDestAddress), dwCountryCode); + return 1; +} + +/*********************************************************************** * lineDrop (TAPI32.@) */ DWORD WINAPI lineDrop(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) @@ -299,18 +318,8 @@ return 0; } -typedef struct tagTAPI_CountryInfo -{ - DWORD dwCountryID; - DWORD dwCountryCode; - LPSTR lpCountryName; - LPSTR lpSameAreaRule; - LPSTR lpLongDistanceRule; - LPSTR lpInternationalRule; -} TAPI_CountryInfo; - -/*********************************************************************** - * lineGetCountry (TAPI32.@) +/*********************************************************************** + * lineGetCountryA (TAPI32.@) */ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList) { @@ -470,12 +479,151 @@ } /*********************************************************************** + * lineGetCountryW (TAPI32.@) + */ +DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) +{ + static const WCHAR country_listW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','C','o','u','n','t','r','y',' ','L','i','s','t',0}; + static const WCHAR international_ruleW[] = + {'I','n','t','e','r','n','a','t','i','o','n','a','l','R','u','l','e',0}; + static const WCHAR longdistance_ruleW[] = + {'L','o','n','g','D','i','s','t','a','n','c','e','R','u','l','e',0}; + static const WCHAR samearea_ruleW[] = + {'S','a','m','e','A','r','e','a','R','u','l','e',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR country_codeW[] = + {'C','o','u','n','t','r','y','C','o','d','e',0}; + DWORD total_size, offset, i, num_countries, max_subkey_len; + LINECOUNTRYENTRY *entry; + WCHAR *subkey_name; + HKEY hkey; + + if (!list) return LINEERR_INVALPOINTER; + TRACE("(%08x, %08x, %p(%d))\n", id, version, list, list->dwTotalSize); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, country_listW, &hkey) != ERROR_SUCCESS) + return LINEERR_INIFILECORRUPT; + + total_size = list->dwTotalSize; + offset = sizeof(LINECOUNTRYLIST); + if (total_size < offset) return LINEERR_STRUCTURETOOSMALL; + + memset(list, 0, total_size); + list->dwTotalSize = total_size; + list->dwUsedSize = offset; + list->dwNumCountries = 0; + list->dwCountryListSize = 0; + list->dwCountryListOffset = offset; + + entry = (LINECOUNTRYENTRY *)(list + 1); + + if (RegQueryInfoKeyW(hkey, NULL, NULL, NULL, &num_countries, &max_subkey_len, + NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hkey); + return LINEERR_OPERATIONFAILED; + } + if (id) offset = sizeof(LINECOUNTRYENTRY); + else offset += num_countries * sizeof(LINECOUNTRYENTRY); + + max_subkey_len++; + if (!(subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)))) + { + RegCloseKey(hkey); + return LINEERR_NOMEM; + } + for (i = 0; i < num_countries; i++) + { + DWORD len, size, size_int, size_long, size_name, size_same; + HKEY hsubkey; + + if (RegEnumKeyW(hkey, i, subkey_name, max_subkey_len) != ERROR_SUCCESS) continue; + if (id && (atoiW(subkey_name) != id)) continue; + if (RegOpenKeyW(hkey, subkey_name, &hsubkey) != ERROR_SUCCESS) continue; + + RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, NULL, &size_int); + len = size_int; + + RegQueryValueExW(hsubkey, longdistance_ruleW, NULL, NULL, NULL, &size_long); + len += size_long; + + RegQueryValueExW(hsubkey, nameW, NULL, NULL, NULL, &size_name); + len += size_name; + + RegQueryValueExW(hsubkey, samearea_ruleW, NULL, NULL, NULL, &size_same); + len += size_same; + + if (total_size < offset + len) + { + offset += len; + RegCloseKey(hsubkey); + if (id) break; + continue; + } + list->dwNumCountries++; + list->dwCountryListSize += sizeof(LINECOUNTRYENTRY); + list->dwUsedSize += len + sizeof(LINECOUNTRYENTRY); + + if (id) i = 0; + entry[i].dwCountryID = atoiW(subkey_name); + size = sizeof(DWORD); + RegQueryValueExW(hsubkey, country_codeW, NULL, NULL, (BYTE *)&entry[i].dwCountryCode, &size); + entry[i].dwNextCountryID = 0; + + if (i > 0) entry[i - 1].dwNextCountryID = entry[i].dwCountryID; + + /* add country name */ + entry[i].dwCountryNameSize = size_name; + entry[i].dwCountryNameOffset = offset; + RegQueryValueExW(hsubkey, nameW, NULL, NULL, (BYTE *)list + offset, &size_name); + offset += size_name; + + /* add Same Area Rule */ + entry[i].dwSameAreaRuleSize = size_same; + entry[i].dwSameAreaRuleOffset = offset; + RegQueryValueExW(hsubkey, samearea_ruleW, NULL, NULL, (BYTE *)list + offset, &size_same); + offset += size_same; + + /* add Long Distance Rule */ + entry[i].dwLongDistanceRuleSize = size_long; + entry[i].dwLongDistanceRuleOffset = offset; + RegQueryValueExW(hsubkey, longdistance_ruleW, NULL, NULL, (BYTE *)list + offset, &size_long); + offset += size_long; + + /* add Long Distance Rule */ + entry[i].dwInternationalRuleSize = size_int; + entry[i].dwInternationalRuleOffset = offset; + RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, (BYTE *)list + offset, &size_int); + offset += size_int; + RegCloseKey(hsubkey); + + TRACE("added country %s at %p\n", + debugstr_w((const WCHAR *)((const char *)list + entry[i].dwCountryNameOffset)), &entry[i]); + if (id) break; + } + list->dwNeededSize = offset; + + TRACE("%d available %d required\n", total_size, offset); + + HeapFree(GetProcessHeap(), 0, subkey_name); + RegCloseKey(hkey); + return 0; +} + +/*********************************************************************** * lineGetDevCapsW (TAPI32.@) */ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -486,7 +634,10 @@ DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -538,6 +689,15 @@ DWORD WINAPI lineGetLineDevStatusA(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus) { FIXME("(%p, %p): stub.\n", hLine, lpLineDevStatus); + return 0; +} + +/*********************************************************************** + * lineGetMessage (TAPI32.@) + */ +DWORD WINAPI lineGetMessage(HLINEAPP hLineApp, LPLINEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hLineApp, lpMessage, dwTimeout); return 0; } @@ -818,7 +978,7 @@ strptr = ((LPBYTE) lpTranslateCaps) + lpTranslateCaps->dwCardListOffset + lpTranslateCaps->dwCardListSize; pLocEntry = (LPLINELOCATIONENTRY) (lpTranslateCaps + 1); - /* key with Preferred CardID's */ + /* key with Preferred CardIDs */ if( RegOpenKeyA(HKEY_CURRENT_USER, szLocationsKey, &hkCardLocations) != ERROR_SUCCESS ) hkCardLocations = 0; @@ -1023,6 +1183,16 @@ } /*********************************************************************** + * lineInitializeExW (TAPI32.@) + */ +LONG WINAPI lineInitializeExW(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECALLBACK lpfnCallback, LPCWSTR lpszFriendlyAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPLINEINITIALIZEEXPARAMS lpLineInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphLineApp, hInstance, + lpfnCallback, debugstr_w(lpszFriendlyAppName), lpdwNumDevs, lpdwAPIVersion, lpLineInitializeExParams); + return 0; +} + +/*********************************************************************** * lineMakeCallW (TAPI32.@) */ DWORD WINAPI lineMakeCallW(HLINE hLine, LPHCALL lphCall, LPCWSTR lpszDestAddress, @@ -1083,8 +1253,11 @@ LPLINEEXTENSIONID lpExtensionID ) { - FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, - dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, + dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); *lpdwAPIVersion = dwAPIHighVersion; return 0; } @@ -1366,6 +1539,18 @@ } /*********************************************************************** + * lineTranslateAddressW (TAPI32.@) + */ +DWORD WINAPI lineTranslateAddressW(HLINEAPP hLineApp, DWORD dwDeviceID, + DWORD dwAPIVersion, LPCWSTR lpszAddressIn, DWORD dwCard, + DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput) +{ + FIXME("(%p, %08x, %08x, %s, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + debugstr_w(lpszAddressIn), dwCard, dwTranslateOptions, lpTranslateOutput); + return 0; +} + +/*********************************************************************** * lineTranslateDialog (TAPI32.@) */ DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCSTR lpszAddressIn) @@ -1375,6 +1560,17 @@ } /*********************************************************************** + * lineTranslateDialogW (TAPI32.@) + */ +DWORD WINAPI lineTranslateDialogW(HLINEAPP hLineApp, DWORD dwDeviceID, + DWORD dwAPIVersion, HWND hwndOwner, LPCWSTR lpszAddressIn) +{ + FIXME("(%p, %08x, %08x, %p, %s): stub.\n", hLineApp, dwDeviceID, + dwAPIVersion, hwndOwner, debugstr_w(lpszAddressIn)); + return 0; +} + +/*********************************************************************** * lineUncompleteCall (TAPI32.@) */ DWORD WINAPI lineUncompleteCall(HLINE hLine, DWORD dwCompletionID) Modified: trunk/reactos/dll/win32/tapi32/phone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/phone.c?r… ============================================================================== --- trunk/reactos/dll/win32/tapi32/phone.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/phone.c [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -160,6 +160,15 @@ } /*********************************************************************** + * phoneGetMessage (TAPI32.@) + */ +DWORD WINAPI phoneGetMessage(HPHONEAPP hPhoneApp, LPPHONEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hPhoneApp, lpMessage, dwTimeout); + return 0; +} + +/*********************************************************************** * phoneGetRing (TAPI32.@) */ DWORD WINAPI phoneGetRing(HPHONE hPhone, LPDWORD lpdwRingMode, LPDWORD lpdwVolume) @@ -205,6 +214,26 @@ DWORD WINAPI phoneInitialize(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs) { FIXME("(%p, %p, %p, %s, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs); + return 0; +} + +/*********************************************************************** + * phoneInitializeiExA (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExA(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; + return 0; +} + +/*********************************************************************** + * phoneInitializeiExW (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExW(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCWSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, debugstr_w(lpszAppName), lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; return 0; } Modified: trunk/reactos/dll/win32/tapi32/tapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -30,6 +30,7 @@ @ stdcall lineAccept(long str long) @ stdcall lineAddProvider(str long ptr) lineAddProviderA @ stdcall lineAddProviderA(str long ptr) +@ stdcall lineAddProviderW(wstr long ptr) @ stdcall lineAddToConference(long long) @ stub lineAgentSpecific @ stdcall lineAnswer(long str long) @@ -41,10 +42,10 @@ @ stdcall lineCompleteTransfer(long long ptr long) @ stdcall lineConfigDialog(long long str) lineConfigDialogA @ stdcall lineConfigDialogA(long long str) +@ stdcall lineConfigDialogW(long long wstr) @ stdcall lineConfigDialogEdit(long long str ptr long ptr) lineConfigDialogEditA @ stdcall lineConfigDialogEditA(long long str ptr long ptr) @ stub lineConfigDialogEditW -@ stub lineConfigDialogW @ stdcall lineConfigProvider(long long) @ stub lineCreateAgentA @ stub lineCreateAgentSessionA @@ -55,7 +56,7 @@ @ stdcall lineDevSpecificFeature(long long ptr long) @ stdcall lineDial(long str long) lineDialA @ stdcall lineDialA(long str long) -@ stub lineDialW +@ stdcall lineDialW(long wstr long) @ stdcall lineDrop(long str long) @ stdcall lineForward(long long long ptr long ptr ptr) lineForwardA @ stdcall lineForwardA(long long long ptr long ptr ptr) @@ -97,10 +98,10 @@ @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA @ stdcall lineGetCountryA(long long ptr) -@ stub lineGetCountryW +@ stdcall lineGetCountryW(long long ptr) @ stdcall lineGetDevCaps(long long long long ptr) lineGetDevCapsA @ stdcall lineGetDevCapsA(long long long long ptr) -@ stdcall lineGetDevCapsW(ptr long long long ptr) +@ stdcall lineGetDevCapsW(long long long long ptr) @ stdcall lineGetDevConfig(long ptr str) lineGetDevConfigA @ stdcall lineGetDevConfigA(long ptr str) @ stub lineGetDevConfigW @@ -108,14 +109,14 @@ @ stub lineGetGroupListW @ stdcall lineGetID(long long long long ptr str) lineGetIDA @ stdcall lineGetIDA(long long long long ptr str) -@ stdcall lineGetIDW(ptr long ptr long ptr ptr) +@ stdcall lineGetIDW(long long long long ptr wstr) @ stdcall lineGetIcon(long str ptr) lineGetIconA @ stdcall lineGetIconA(long str ptr) @ stub lineGetIconW @ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA @ stdcall lineGetLineDevStatusA(long ptr) @ stub lineGetLineDevStatusW -@ stub lineGetMessage +@ stdcall lineGetMessage(long ptr long) @ stdcall lineGetNewCalls(long long long ptr) @ stdcall lineGetNumRings(long long ptr) @ stdcall lineGetProviderList(long ptr) lineGetProviderListA @@ -138,10 +139,10 @@ @ stdcall lineHold(long) @ stdcall lineInitialize(ptr long ptr str ptr) @ stdcall lineInitializeExA(ptr long ptr str ptr ptr ptr) -@ stub lineInitializeExW +@ stdcall lineInitializeExW(ptr long ptr wstr ptr ptr ptr) @ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA @ stdcall lineMakeCallA(long ptr str long ptr) -@ stdcall lineMakeCallW(ptr ptr ptr long ptr) +@ stdcall lineMakeCallW(long ptr wstr long ptr) @ stdcall lineMonitorDigits(long long) @ stdcall lineMonitorMedia(long long) @ stdcall lineMonitorTones(long ptr long) @@ -209,10 +210,10 @@ @ stdcall lineSwapHold(long long) @ stdcall lineTranslateAddress(long long long str long long ptr) lineTranslateAddressA @ stdcall lineTranslateAddressA(long long long str long long ptr) -@ stub lineTranslateAddressW +@ stdcall lineTranslateAddressW(long long long wstr long long ptr) @ stdcall lineTranslateDialog(long long long long str) lineTranslateDialogA @ stdcall lineTranslateDialogA(long long long long str) -@ stub lineTranslateDialogW +@ stdcall lineTranslateDialogW(long long long long wstr) @ stdcall lineUncompleteCall(long long) @ stdcall lineUnhold(long) @ stdcall lineUnpark(long long ptr str) lineUnparkA @@ -240,7 +241,7 @@ @ stdcall phoneGetIconA(long str ptr) @ stub phoneGetIconW @ stdcall phoneGetLamp(long long ptr) -@ stub phoneGetMessage +@ stdcall phoneGetMessage(long ptr long) @ stdcall phoneGetRing(long ptr ptr) @ stdcall phoneGetStatus(long ptr) phoneGetStatusA @ stdcall phoneGetStatusA(long ptr) @@ -248,8 +249,8 @@ @ stub phoneGetStatusW @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) -@ stub phoneInitializeExA -@ stub phoneInitializeExW +@ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long) @@ -267,7 +268,7 @@ @ stdcall phoneShutdown(long) @ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA @ stdcall tapiGetLocationInfoA(str str) -@ stub tapiGetLocationInfoW +@ stdcall tapiGetLocationInfoW(wstr wstr) @ stub tapiRequestDrop @ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA @ stdcall tapiRequestMakeCallA(str str str str) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -186,7 +186,7 @@ reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.7.1 -reactos/dll/win32/tapi32 # Autosync +reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 reactos/dll/win32/traffic # Synced to Wine-1.5.19 reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!)

1 0

[akhaldi] 60414: [SXS_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:06:21 2013 New Revision: 60414 URL: http://svn.reactos.org/svn/reactos?rev=60414&view=rev Log: [SXS_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/sxs/CMakeLists.txt trunk/rostests/winetests/sxs/cache.c trunk/rostests/winetests/sxs/testlist.c Modified: trunk/rostests/winetests/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:06:21 2013 @@ -1,14 +1,9 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(sxs_winetest cache.c name.c testlist.c) -target_link_libraries(sxs_winetest wine uuid) set_module_type(sxs_winetest win32cui) -add_importlibs(sxs_winetest sxs msvcrt kernel32 ntdll) +add_importlibs(sxs_winetest sxs msvcrt kernel32) add_cd_file(TARGET sxs_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/sxs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/cache.c?rev… ============================================================================== --- trunk/rostests/winetests/sxs/cache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/cache.c [iso-8859-1] Sat Sep 28 15:06:21 2013 @@ -104,17 +104,17 @@ hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine2W, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr ); + broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine3W, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr ); + broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine4W, NULL ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, NULL ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); GetWindowsDirectoryA( comctl_path1, MAX_PATH ); lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" ); @@ -141,7 +141,7 @@ memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, &info ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); Modified: trunk/rostests/winetests/sxs/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/testlist.c?… ============================================================================== --- trunk/rostests/winetests/sxs/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/testlist.c [iso-8859-1] Sat Sep 28 15:06:21 2013 @@ -1,8 +1,7 @@ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +/* Automatically generated file; DO NOT EDIT!! */ #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cache(void); extern void func_name(void);

1 0

[akhaldi] 60413: [SXS] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:05:24 2013 New Revision: 60413 URL: http://svn.reactos.org/svn/reactos?rev=60413&view=rev Log: [SXS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt trunk/reactos/dll/win32/sxs/cache.c trunk/reactos/dll/win32/sxs/name.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(sxs.dll sxs.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -14,6 +13,5 @@ add_library(sxs SHARED ${SOURCE}) set_module_type(sxs win32dll) target_link_libraries(sxs wine) -add_importlibs(sxs msvcrt oleaut32 ole32 kernel32 ntdll) -add_dependencies(sxs psdk) +add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/sxs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/cache.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/sxs/cache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/cache.c [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -73,7 +73,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { - IUnknown_AddRef( iface ); + IAssemblyCache_AddRef( iface ); *obj = cache; return S_OK; } Modified: trunk/reactos/dll/win32/sxs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/name.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -72,7 +72,7 @@ if (IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IAssemblyName )) { - IUnknown_AddRef( iface ); + IAssemblyName_AddRef( iface ); *obj = name; return S_OK; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -185,7 +185,7 @@ reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.7.1 -reactos/dll/win32/sxs # Synced to Wine-1.5.4 +reactos/dll/win32/sxs # Synced to Wine-1.7.1 reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.19 reactos/dll/win32/twain_32 # Out of sync

1 0

[akhaldi] 60412: [STI_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:04:20 2013 New Revision: 60412 URL: http://svn.reactos.org/svn/reactos?rev=60412&view=rev Log: [STI_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/sti/CMakeLists.txt trunk/rostests/winetests/sti/testlist.c Modified: trunk/rostests/winetests/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sti/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/sti/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:04:20 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(sti_winetest sti.c testlist.c) -target_link_libraries(sti_winetest wine uuid) set_module_type(sti_winetest win32cui) -add_importlibs(sti_winetest ole32 msvcrt kernel32 ntdll) +add_importlibs(sti_winetest ole32 msvcrt kernel32) add_cd_file(TARGET sti_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/sti/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sti/testlist.c?… ============================================================================== --- trunk/rostests/winetests/sti/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sti/testlist.c [iso-8859-1] Sat Sep 28 15:04:20 2013 @@ -1,8 +1,7 @@ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +/* Automatically generated file; DO NOT EDIT!! */ #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_sti(void);

1 0

[akhaldi] 60411: [STI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:03:41 2013 New Revision: 60411 URL: http://svn.reactos.org/svn/reactos?rev=60411&view=rev Log: [STI] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/win32/sti/sti_private.h Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt trunk/reactos/dll/win32/sti/sti_wia.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ @@ -9,19 +6,17 @@ -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(sti.dll sti.spec) list(APPEND SOURCE sti.c sti_main.c - sti.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) add_rpcproxy_files(sti_wia.idl) -add_library(sti SHARED ${SOURCE}) +add_library(sti SHARED ${SOURCE} sti.rc) set_module_type(sti win32dll) target_link_libraries(sti wine uuid ${PSEH_LIB}) add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll) Removed: trunk/reactos/dll/win32/sti/sti_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_private.… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_private.h (removed) @@ -1,32 +0,0 @@ -/* - * STI private definitions - * - * Copyright 2009 Damjan Jovanovic - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __STI_PRIVATE__ -#define __STI_PRIVATE__ - -typedef struct _stillimage -{ - const struct IStillImageWVtbl *lpVtbl; - const struct IUnknownVtbl *lpInternalUnkVtbl; - IUnknown *pUnkOuter; - LONG ref; -} stillimage; - -#endif /* __STI_PRIVATE__ */ Modified: trunk/reactos/dll/win32/sti/sti_wia.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_wia.idl?… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -18,7 +18,6 @@ #include "wia_lh.idl" -#ifdef __WIDL__ [ threading(both), uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) /* IWiaItem */ @@ -30,4 +29,3 @@ uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c) ] coclass StillImage { interface IStillImageW; } -#endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -184,7 +184,7 @@ reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 -reactos/dll/win32/sti # Synced to Wine-1.5.4 +reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.5.4 reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.19

1 0

[akhaldi] 60410: [PSDK] * Update tapi.h.
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 14:59:56 2013 New Revision: 60410 URL: http://svn.reactos.org/svn/reactos?rev=60410&view=rev Log: [PSDK] * Update tapi.h. Modified: trunk/reactos/include/psdk/tapi.h Modified: trunk/reactos/include/psdk/tapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tapi.h?rev=60… ============================================================================== --- trunk/reactos/include/psdk/tapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tapi.h [iso-8859-1] Sat Sep 28 14:59:56 2013 @@ -749,6 +749,15 @@ DWORD dwTranslateResults; } LINETRANSLATEOUTPUT, *LPLINETRANSLATEOUTPUT; +typedef struct linemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} LINEMESSAGE, *LPLINEMESSAGE; + typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); typedef struct _PHONEAPP { @@ -818,6 +827,27 @@ DWORD dwExtensionID2; DWORD dwExtensionID3; } PHONEEXTENSIONID, *LPPHONEEXTENSIONID; + +typedef struct phoneinitializeexparams_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwOptions; + union { + HANDLE hEvent; + HANDLE hCompletionPort; + } Handles; + DWORD dwCompletionKey; +} PHONEINITIALIZEEXPARAMS, *LPPHONEINITIALIZEEXPARAMS; + +typedef struct phonemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} PHONEMESSAGE, *LPPHONEMESSAGE; typedef struct phonestatus_tag { DWORD dwTotalSize;

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