Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48086: [NDK] Merge r44053 from amd64 branch: - Add KEXCEPTION_FRAME
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 17:20:46 2010 New Revision: 48086 URL: http://svn.reactos.org/svn/reactos?rev=48086&view=rev Log: [NDK] Merge r44053 from amd64 branch: - Add KEXCEPTION_FRAME Modified: trunk/reactos/ (props changed) trunk/reactos/include/ndk/amd64/ketypes.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 16 17:20:46 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Fri Jul 16 17:20:46 2010 @@ -824,9 +824,41 @@ #define PKTSS PKTSS64 // -// i386 CPUs don't have exception frames -// -typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +// KEXCEPTION_FRAME +// +typedef struct _KEXCEPTION_FRAME +{ + UINT64 P1Home; + UINT64 P2Home; + UINT64 P3Home; + UINT64 P4Home; + UINT64 P5; + UINT64 InitialStack; + M128A Xmm6; + M128A Xmm7; + M128A Xmm8; + M128A Xmm9; + M128A Xmm10; + M128A Xmm11; + M128A Xmm12; + M128A Xmm13; + M128A Xmm14; + M128A Xmm15; + UINT64 TrapFrame; + UINT64 CallbackStack; + UINT64 OutputBuffer; + UINT64 OutputLength; + UINT64 MxCsr; + UINT64 Rbp; + UINT64 Rbx; + UINT64 Rdi; + UINT64 Rsi; + UINT64 R12; + UINT64 R13; + UINT64 R14; + UINT64 R15; + UINT64 Return; +} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; // // Inline function to get current KPRCB

1 0

[tkreuzer] 48085: [NTOSKRNL] Add MM_HIGHEST_VAD_ADDRESS for amd64
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 17:14:53 2010 New Revision: 48085 URL: http://svn.reactos.org/svn/reactos?rev=48085&view=rev Log: [NTOSKRNL] Add MM_HIGHEST_VAD_ADDRESS for amd64 Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri Jul 16 17:14:53 2010 @@ -45,6 +45,9 @@ #define MI_MIN_SECONDARY_COLORS 8 #define MI_SECONDARY_COLORS 64 #define MI_MAX_SECONDARY_COLORS 1024 + +#define MM_HIGHEST_VAD_ADDRESS \ + (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) PULONG64 FORCEINLINE

1 0

[tkreuzer] 48084: [NTOSKRNL] #if out another broken C_ASSERT on amd64
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 16:30:05 2010 New Revision: 48084 URL: http://svn.reactos.org/svn/reactos?rev=48084&view=rev Log: [NTOSKRNL] #if out another broken C_ASSERT on amd64 Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Fri Jul 16 16:30:05 2010 @@ -333,8 +333,10 @@ // // Save it into our double-buffered system page directory // +#ifndef _M_AMD64 /* This seems to be making the assumption that one PDE is one page long */ C_ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); +#endif MmSystemPagePtes[(ULONG_PTR)PointerPte & (PAGE_SIZE - 1) / sizeof(MMPTE)] = TempPte;

1 0

[tkreuzer] 48083: [NTOSKRNL] Comment out a broken C_ASSERT on amd64 to make it compile.
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 15:11:44 2010 New Revision: 48083 URL: http://svn.reactos.org/svn/reactos?rev=48083&view=rev Log: [NTOSKRNL] Comment out a broken C_ASSERT on amd64 to make it compile. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Jul 16 15:11:44 2010 @@ -64,8 +64,10 @@ // if (PointerPde->u.Hard.Valid == 0) { +#ifndef _M_AMD64 /* This seems to be making the assumption that one PDE is one page long */ C_ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); +#endif // // Copy it from our double-mapped system page directory

1 0

[tkreuzer] 48082: [CRT] Move #include <precomp.h> to the top, as precompiled headers must be the first thing that is included or it won't take advantage of being precompiled
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 15:08:03 2010 New Revision: 48082 URL: http://svn.reactos.org/svn/reactos?rev=48082&view=rev Log: [CRT] Move #include <precomp.h> to the top, as precompiled headers must be the first thing that is included or it won't take advantage of being precompiled Modified: trunk/reactos/lib/sdk/crt/misc/assert.c Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Fri Jul 16 15:08:03 2010 @@ -1,9 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ +#include <precomp.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <signal.h> -#include <precomp.h> /*

1 0

[tkreuzer] 48081: [NTOSKRNL] ULONG -> SIZE_T
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 14:56:36 2010 New Revision: 48081 URL: http://svn.reactos.org/svn/reactos?rev=48081&view=rev Log: [NTOSKRNL] ULONG -> SIZE_T Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Fri Jul 16 14:56:36 2010 @@ -170,7 +170,7 @@ VOID NTAPI MmFreeNonCachedMemory(IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { PMDL Mdl; PMMPTE PointerPte;

1 0

[ilardig] 48080: Fix build, sorry. Thanks Timo.
by ilardig＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: ilardig Date: Fri Jul 16 13:37:29 2010 New Revision: 48080 URL: http://svn.reactos.org/svn/reactos?rev=48080&view=rev Log: Fix build, sorry. Thanks Timo. Modified: trunk/reactos/lib/sdk/crt/misc/assert.c Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Fri Jul 16 13:37:29 2010 @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <signal.h> +#include <precomp.h> /* @@ -12,7 +13,7 @@ { /* Assertion failed at foo.c line 45: x<y */ fprintf(stderr, "Assertion failed at %s line %d: %s\n", file, line, msg); - DPRINT1("Assertion failed at %s line %d: %s\n", file, line, msg); + FIXME("Assertion failed at %s line %d: %s\n", file, line, msg); raise(SIGABRT); for(;;); /* eliminate warning by mingw */ }

1 0

[tkreuzer] 48079: Merge r44143 from amd64 branch Initialize MmDebugPte from MiDebugMapping variable instead of using MiAddressToPte for a constant initializer. This way the page can be set dynamically. Use MmDebugPte to determine if ready for mapping physical pages.
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 13:23:43 2010 New Revision: 48079 URL: http://svn.reactos.org/svn/reactos?rev=48079&view=rev Log: Merge r44143 from amd64 branch Initialize MmDebugPte from MiDebugMapping variable instead of using MiAddressToPte for a constant initializer. This way the page can be set dynamically. Use MmDebugPte to determine if ready for mapping physical pages. Modified: trunk/reactos/ (props changed) trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/mminit.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 16 13:23:43 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Jul 16 13:23:43 2010 @@ -46,7 +46,8 @@ extern SIZE_T MmPeakCommitment; extern SIZE_T MmtotalCommitLimitMaximum; -extern BOOLEAN MiDbgReadyForPhysical; +extern PVOID MiDebugMapping; +extern PMMPTE MmDebugPte; struct _KTRAP_FRAME; struct _EPROCESS; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Fri Jul 16 13:23:43 2010 @@ -22,8 +22,8 @@ /* GLOBALS ********************************************************************/ -PMMPTE MmDebugPte = MiAddressToPte(MI_DEBUG_MAPPING); -BOOLEAN MiDbgReadyForPhysical = FALSE; +PVOID MiDebugMapping = MI_DEBUG_MAPPING; +PMMPTE MmDebugPte = NULL; /* FUNCTIONS ******************************************************************/ @@ -49,7 +49,7 @@ // // Check if we are called too early // - if (MiDbgReadyForPhysical == FALSE) + if (MmDebugPte == NULL) { // // The structures we require aren't initialized yet, fail Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Jul 16 13:23:43 2010 @@ -1990,7 +1990,7 @@ MiBuildPagedPool(); /* Debugger physical memory support is now ready to be used */ - MiDbgReadyForPhysical = TRUE; + MmDebugPte = MiAddressToPte(MiDebugMapping); /* Initialize the loaded module list */ MiInitializeLoadedModuleList(LoaderBlock); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Jul 16 13:23:43 2010 @@ -409,7 +409,7 @@ // // Now get the PTE for shared data, and read the PFN that holds it // - PointerPte = MiAddressToPte(KI_USER_SHARED_DATA); + PointerPte = MiAddressToPte((PVOID)KI_USER_SHARED_DATA); ASSERT(PointerPte->u.Hard.Valid == 1); PageFrameNumber = PFN_FROM_PTE(PointerPte);

1 0

[ilardig] 48078: [CRT] Add a debug print to help bugs like 5486.
by ilardig＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: ilardig Date: Fri Jul 16 13:00:02 2010 New Revision: 48078 URL: http://svn.reactos.org/svn/reactos?rev=48078&view=rev Log: [CRT] Add a debug print to help bugs like 5486. Modified: trunk/reactos/lib/sdk/crt/misc/assert.c Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Fri Jul 16 13:00:02 2010 @@ -12,6 +12,7 @@ { /* Assertion failed at foo.c line 45: x<y */ fprintf(stderr, "Assertion failed at %s line %d: %s\n", file, line, msg); + DPRINT1("Assertion failed at %s line %d: %s\n", file, line, msg); raise(SIGABRT); for(;;); /* eliminate warning by mingw */ }

1 0

[dreimer] 48077: [PATCH] user32: DrawText: CJK and Thai line-wrapping [PATCH] appwiz: check if path is valid Both by Katayama Hirofumi
by dreimer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: dreimer Date: Fri Jul 16 12:52:37 2010 New Revision: 48077 URL: http://svn.reactos.org/svn/reactos?rev=48077&view=rev Log: [PATCH] user32: DrawText: CJK and Thai line-wrapping [PATCH] appwiz: check if path is valid Both by Katayama Hirofumi Modified: trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Fri Jul 16 12:52:37 2010 @@ -324,6 +324,7 @@ PROPSHEETPAGE psp; UINT nPages = 0; UINT nLength; + DWORD attrs; PCREATE_LINK_CONTEXT pContext = (PCREATE_LINK_CONTEXT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CREATE_LINK_CONTEXT)); if (!pContext) @@ -337,10 +338,13 @@ /* no directory given */ return FALSE; } - /// - /// FIXME - /// check if path is valid - /// + + attrs = GetFileAttributesW(szPath); + if (attrs == INVALID_FILE_ATTRIBUTES || (attrs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* invalid path */ + return FALSE; + } wcscpy(pContext->szLinkName, szPath); if (pContext->szLinkName[nLength-1] != L'\\') @@ -389,7 +393,7 @@ { WCHAR szFile[MAX_PATH]; - if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + if (MultiByteToWideChar(CP_ACP, 0, (LPSTR) lParam1, -1, szFile, MAX_PATH)) { return ShowCreateShortcutWizard(hwndCPl, szFile); } @@ -401,7 +405,7 @@ CALLBACK NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - return ShowCreateShortcutWizard(hwndCPl, (LPWSTR)lParam1); + return ShowCreateShortcutWizard(hwndCPl, (LPWSTR) lParam1); } LONG @@ -410,7 +414,7 @@ { WCHAR szFile[MAX_PATH]; - if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + if (MultiByteToWideChar(CP_ACP, 0, (LPSTR) lParam1, -1, szFile, MAX_PATH)) { return ShowCreateShortcutWizard(hwndCPl, szFile); } Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Fri Jul 16 12:52:37 2010 @@ -495,6 +495,38 @@ } } +/* Check the character is Chinese, Japanese, Korean and/or Thai */ +inline BOOL IsCJKT(WCHAR wch) +{ + if (0x0E00 <= wch && wch <= 0x0E7F) + return TRUE; /* Thai */ + + if (0x3000 <= wch && wch <= 0x9FFF) + return TRUE; /* CJK */ + + if (0xAC00 <= wch && wch <= 0xD7FF) + return TRUE; /* Korean */ + + if (0xFF00 <= wch && wch <= 0xFFEF) + return TRUE; /* CJK */ + + return FALSE; +} + +/* See http://en.wikipedia.org/wiki/Kinsoku_shori */ +static const WCHAR KinsokuClassA[] = +{ + 0x2010, 0x2013, 0x2019, 0x201D, 0x203C, 0x2047, 0x2048, 0x2049, 0x3001, + 0x3002, 0x3005, 0x3009, 0x300B, 0x300D, 0x300F, 0x3011, 0x3015, 0x3017, + 0x3019, 0x301C, 0x301F, 0x303B, 0x3041, 0x3043, 0x3045, 0x3047, 0x3049, + 0x3063, 0x3083, 0x3085, 0x3087, 0x308E, 0x3095, 0x3096, 0x30A0, 0x30A1, + 0x30A3, 0x30A5, 0x30A7, 0x30A9, 0x30C3, 0x30E3, 0x30E5, 0x30E7, 0x30EE, + 0x30F5, 0x30F6, 0x30FB, 0x30FC, 0x30FD, 0x30FE, 0x31F0, 0x31F1, 0x31F2, + 0x31F3, 0x31F4, 0x31F5, 0x31F6, 0x31F7, 0x31F8, 0x31F9, 0x31FA, 0x31FB, + 0x31FC, 0x31FD, 0x31FE, 0x31FF, 0xFF01, 0xFF09, 0xFF0C, 0xFF0E, 0xFF1A, + 0xFF1B, 0xFF1F, 0xFF3D, 0xFF5D, 0xFF60, 0 +}; + /********************************************************************* * TEXT_WordBreak (static) * @@ -576,9 +608,10 @@ p--; /* the word just fitted */ else { - while (p > str && *(--p) != SPACE) + while (p > str && *(--p) != SPACE && (!IsCJKT(p[1]) || + p[1] == L'\0' || wcschr(KinsokuClassA, p[1]) != NULL)) ; - word_fits = (p != str || *p == SPACE); + word_fits = (p != str || *p == SPACE || IsCJKT(p[1])); } /* If there was one or the first character didn't fit then */ if (word_fits)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010