Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[fireball] 36135: - Silence the raised IRQL level warning. - Use a better status code for invalid requests.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 07:41:26 2008 New Revision: 36135 URL: http://svn.reactos.org/svn/reactos?rev=36135&view=rev Log: - Silence the raised IRQL level warning. - Use a better status code for invalid requests. Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c trunk/reactos/drivers/filesystems/fastfat/misc.c Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Thu Sep 11 07:41:26 2008 @@ -289,7 +289,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatReleaseForModWrite\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static NTSTATUS NTAPI @@ -297,7 +297,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatAcquireForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static NTSTATUS NTAPI @@ -305,7 +305,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatReleaseForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } BOOLEAN NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Thu Sep 11 07:41:26 2008 @@ -156,11 +156,6 @@ } else { - if (KeGetCurrentIrql() > PASSIVE_LEVEL) - { - DPRINT1("Vfat is entered at irql = %d\n", KeGetCurrentIrql()); - } - FsRtlEnterFileSystem(); Status = VfatDispatchRequest (IrpContext); FsRtlExitFileSystem();

1 0

[cgutman] 36134: - We must call MiniQueueWorkItem while holding a spin lock
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 04:37:54 2008 New Revision: 36134 URL: http://svn.reactos.org/svn/reactos?rev=36134&view=rev Log: - We must call MiniQueueWorkItem while holding a spin lock Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Sep 11 04:37:54 2008 @@ -238,7 +238,6 @@ */ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - { /* * if the miniport is marked as busy, we queue the packet as a work item, * else we send the packet directly to the miniport. Sending to the miniport @@ -251,8 +250,6 @@ NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to busy\n")); Adapter->MiniportBusy = TRUE; } - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); /* * Test the packet to see if it is a MAC loopback. @@ -269,8 +266,11 @@ if (QueueWorkItem) { MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); return NDIS_STATUS_PENDING; } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); { @@ -306,11 +306,14 @@ if (QueueWorkItem) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n")); return NDIS_STATUS_PENDING; } ASSERT(Adapter->NdisMiniportBlock.DriverHandle); + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); /* * Call the appropriate send handler

1 0

[cwittich] 36133: remove unused parameter from DPRINT
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 04:30:51 2008 New Revision: 36133 URL: http://svn.reactos.org/svn/reactos?rev=36133&view=rev Log: remove unused parameter from DPRINT Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Sep 11 04:30:51 2008 @@ -489,8 +489,7 @@ /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service*/ if (pcbBytesNeeded) { - DPRINT1("Deletion failed due to running dependencies.\n", - lpService->lpServiceName); + DPRINT1("Deletion failed due to running dependencies.\n"); RegCloseKey(hServicesKey); return ERROR_SUCCESS; }

1 0

[cwittich] 36132: fix incorrect buffersize passed to MultiByteToWideChar
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 04:12:13 2008 New Revision: 36132 URL: http://svn.reactos.org/svn/reactos?rev=36132&view=rev Log: fix incorrect buffersize passed to MultiByteToWideChar Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Sep 11 04:12:13 2008 @@ -2927,7 +2927,7 @@ lpDisplayName, -1, lpDisplayNameW, - (wcslen(lpDisplayNameW) + 1) * sizeof(WCHAR)); + wcslen(lpDisplayNameW) + 1); RegSetValueExW(hServiceKey, L"DisplayName", @@ -2997,7 +2997,7 @@ if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) { lpBinaryPathNameW=HeapAlloc(GetProcessHeap(),0, (strlen(lpBinaryPathName)+1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, lpBinaryPathNameW, (wcslen(lpBinaryPathNameW)+1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, lpBinaryPathNameW, wcslen(lpBinaryPathNameW)+1); dwError = RegSetValueExW(hServiceKey, L"ImagePath", 0, @@ -3041,7 +3041,7 @@ lpLoadOrderGroup, -1, lpLoadOrderGroupW, - (wcslen(lpLoadOrderGroupW) + 1) * sizeof(WCHAR)); + wcslen(lpLoadOrderGroupW) + 1); dwError = RegSetValueExW(hServiceKey, L"Group", @@ -3092,7 +3092,7 @@ lpDependencies, dwDependSize, lpDependenciesW, - (wcslen(lpDependenciesW)+1) * sizeof(WCHAR)); + wcslen(lpDependenciesW)+1); dwError = ScmWriteDependencies(hServiceKey, (LPWSTR)lpDependenciesW,

1 0

[cwittich] 36131: fix some heap corruptions in services
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 03:31:52 2008 New Revision: 36131 URL: http://svn.reactos.org/svn/reactos?rev=36131&view=rev Log: fix some heap corruptions in services Modified: trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/groupdb.c [iso-8859-1] Thu Sep 11 03:31:52 2008 @@ -61,7 +61,7 @@ lpGroup = (PSERVICE_GROUP)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(SERVICE_GROUP) + (wcslen(lpGroupName) * sizeof(WCHAR))); + sizeof(SERVICE_GROUP) + ((wcslen(lpGroupName) + 1)* sizeof(WCHAR))); if (lpGroup == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -144,7 +144,7 @@ Group = (PSERVICE_GROUP)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(SERVICE_GROUP) + (wcslen((const wchar_t*) ValueData) * sizeof(WCHAR))); + sizeof(SERVICE_GROUP) + ((wcslen((const wchar_t*) ValueData) + 1) * sizeof(WCHAR))); if (Group == NULL) { return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Sep 11 03:31:52 2008 @@ -164,7 +164,7 @@ Ptr = (MANAGER_HANDLE*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(MANAGER_HANDLE) + wcslen(lpDatabaseName) * sizeof(WCHAR)); + sizeof(MANAGER_HANDLE) + (wcslen(lpDatabaseName) + 1) * sizeof(WCHAR)); if (Ptr == NULL) return ERROR_NOT_ENOUGH_MEMORY;

1 0

[fireball] 36130: Gregor Schneider <grschneider@gmail.com> - Don't cast the floating point number to integer for conversion (numberf was created especially for floating point types) See issue #3585 for more details.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 02:06:22 2008 New Revision: 36130 URL: http://svn.reactos.org/svn/reactos?rev=36130&view=rev Log: Gregor Schneider <grschneider(a)gmail.com> - Don't cast the floating point number to integer for conversion (numberf was created especially for floating point types) See issue #3585 for more details. Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Thu Sep 11 02:06:22 2008 @@ -596,7 +596,7 @@ } else { if ( precision == -1 ) precision = 6; - str = numberf(str, end, (int)_double, base, field_width, precision, flags); + str = numberf(str, end, _double, base, field_width, precision, flags); } continue;

1 0

[arty] 36129: reapply the bitmap patch.
by arty＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: arty Date: Wed Sep 10 22:10:37 2008 New Revision: 36129 URL: http://svn.reactos.org/svn/reactos?rev=36129&view=rev Log: reapply the bitmap patch. Modified: branches/arty-newcc/lib/rtl/bitmap.c Modified: branches/arty-newcc/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/bitmap.c?rev… ============================================================================== --- branches/arty-newcc/lib/rtl/bitmap.c [iso-8859-1] (original) +++ branches/arty-newcc/lib/rtl/bitmap.c [iso-8859-1] Wed Sep 10 22:10:37 2008 @@ -867,14 +867,14 @@ RtlTestBit(PRTL_BITMAP BitMapHeader, ULONG BitNumber) { - PULONG Ptr; + PUCHAR Ptr; if (BitNumber >= BitMapHeader->SizeOfBitMap) return FALSE; - Ptr = (PULONG)BitMapHeader->Buffer + (BitNumber / 32); - - return (BOOLEAN)(*Ptr & (1 << (BitNumber % 32))); + Ptr = (PUCHAR)BitMapHeader->Buffer + (BitNumber / 8); + + return (BOOLEAN)(*Ptr & (1 << (BitNumber % 8))); } /*

1 0

[sginsberg] 36127: - Add missing winnt.h definitions
by sginsberg＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: sginsberg Date: Wed Sep 10 10:30:27 2008 New Revision: 36127 URL: http://svn.reactos.org/svn/reactos?rev=36127&view=rev Log: - Add missing winnt.h definitions Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Sep 10 10:30:27 2008 @@ -3167,6 +3167,49 @@ } SLIST_HEADER,*PSLIST_HEADER; #endif /* !_SLIST_HEADER_ */ +NTSYSAPI +VOID +NTAPI +RtlInitializeSListHead ( + IN PSLIST_HEADER ListHead + ); + +NTSYSAPI +PSLIST_ENTRY +NTAPI +RtlFirstEntrySList ( + IN const SLIST_HEADER *ListHead + ); + +NTSYSAPI +PSLIST_ENTRY +NTAPI +RtlInterlockedPopEntrySList ( + IN PSLIST_HEADER ListHead + ); + +NTSYSAPI +PSLIST_ENTRY +NTAPI +RtlInterlockedPushEntrySList ( + IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY ListEntry + ); + +NTSYSAPI +PSLIST_ENTRY +NTAPI +RtlInterlockedFlushSList ( + IN PSLIST_HEADER ListHead + ); + +NTSYSAPI +WORD +NTAPI +RtlQueryDepthSList ( + IN PSLIST_HEADER ListHead + ); + /* FIXME: Please oh please stop including winnt.h from the DDK... */ #ifndef __NTDDK_H typedef struct _RTL_CRITICAL_SECTION_DEBUG { @@ -4344,9 +4387,6 @@ #endif #if (_WIN32_WINNT >= 0x0501) -typedef enum _HEAP_INFORMATION_CLASS { - HeapCompatibilityInformation -} HEAP_INFORMATION_CLASS; typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation, @@ -4463,6 +4503,56 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #endif +typedef enum _HEAP_INFORMATION_CLASS { + + HeapCompatibilityInformation + +} HEAP_INFORMATION_CLASS; + +NTSYSAPI +DWORD +NTAPI +RtlSetHeapInformation ( + IN PVOID HeapHandle, + IN HEAP_INFORMATION_CLASS HeapInformationClass, + IN PVOID HeapInformation OPTIONAL, + IN SIZE_T HeapInformationLength OPTIONAL + ); + +NTSYSAPI +DWORD +NTAPI +RtlQueryHeapInformation ( + IN PVOID HeapHandle, + IN HEAP_INFORMATION_CLASS HeapInformationClass, + OUT PVOID HeapInformation OPTIONAL, + IN SIZE_T HeapInformationLength OPTIONAL, + OUT PSIZE_T ReturnLength OPTIONAL + ); + +// +// Multiple alloc-free APIS +// + +DWORD +NTAPI +RtlMultipleAllocateHeap ( + IN PVOID HeapHandle, + IN DWORD Flags, + IN SIZE_T Size, + IN DWORD Count, + OUT PVOID * Array + ); + +DWORD +NTAPI +RtlMultipleFreeHeap ( + IN PVOID HeapHandle, + IN DWORD Flags, + IN DWORD Count, + OUT PVOID * Array + ); + typedef enum _PROCESSOR_CACHE_TYPE { CacheUnified, CacheInstruction,

1 0

[sginsberg] 36126: - Patch by hackbunny: "64-bit __sync_val_compare_and_swap is, apparently, not inlined on x86. Go figure." "Add "lock" prefix to cmpxchg8b, just in case"
by sginsberg＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: sginsberg Date: Wed Sep 10 10:02:57 2008 New Revision: 36126 URL: http://svn.reactos.org/svn/reactos?rev=36126&view=rev Log: - Patch by hackbunny: "64-bit __sync_val_compare_and_swap is, apparently, not inlined on x86. Go figure." "Add "lock" prefix to cmpxchg8b, just in case" Modified: trunk/reactos/include/psdk/intrin_x86.h Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] Wed Sep 10 10:02:57 2008 @@ -104,11 +104,6 @@ return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); @@ -233,23 +228,6 @@ { long retval = Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - long long retval = Comperand; - - __asm__ - ( - "cmpxchg8b %[Destination]" : - [retval] "+A" (retval) : - [Destination] "m" (*Destination), - "b" ((unsigned long)((Exchange >> 0) & 0xFFFFFFFF)), - "c" ((unsigned long)((Exchange >> 32) & 0xFFFFFFFF)) : - "memory" - ); - return retval; } @@ -439,6 +417,34 @@ while(y != x); return y; +} + +#endif + +#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) + +static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +#else + +static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +{ + long long retval = Comperand; + + __asm__ + ( + "lock; cmpxchg8b %[Destination]" : + [retval] "+A" (retval) : + [Destination] "m" (*Destination), + "b" ((unsigned long)((Exchange >> 0) & 0xFFFFFFFF)), + "c" ((unsigned long)((Exchange >> 32) & 0xFFFFFFFF)) : + "memory" + ); + + return retval; } #endif

1 0

[cwittich] 36125: sync riched20 to wine 1.1.4
by cwittich＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: cwittich Date: Wed Sep 10 08:35:44 2008 New Revision: 36125 URL: http://svn.reactos.org/svn/reactos?rev=36125&view=rev Log: sync riched20 to wine 1.1.4 Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/table.c trunk/reactos/dll/win32/riched20/wrap.c Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Wed Sep 10 08:35:44 2008 @@ -1410,6 +1410,28 @@ style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to-from, FALSE); + + /* Don't insert text at the end of the table row */ + if (!editor->bEmulateVersion10) { /* v4.1 */ + ME_DisplayItem *para = ME_GetParagraph(editor->pCursors->pRun); + if (para->member.para.nFlags & MEPF_ROWEND) + { + para = para->member.para.next_para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + } + if (para->member.para.nFlags & MEPF_ROWSTART) + { + para = para->member.para.next_para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + } + editor->pCursors[1] = editor->pCursors[0]; + } else { /* v1.0 - 3.0 */ + if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA && + ME_IsInTable(editor->pCursors[0].pRun)) + return 0; + } } else { ME_DisplayItem *para_item; @@ -3663,6 +3685,8 @@ if (((unsigned)wstr)>=' ' || (wstr=='\r' && (GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE)) || wstr=='\t') { + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = ME_GetParagraph(cursor.pRun); int from, to; BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; ME_GetSelection(editor, &from, &to); @@ -3671,13 +3695,13 @@ && !(ctrl_is_down && !editor->bEmulateVersion10) ) { - ME_Cursor cursor = editor->pCursors[0]; ME_DisplayItem *para; BOOL bSelectedRow = FALSE; para = ME_GetParagraph(cursor.pRun); if (ME_IsSelection(editor) && cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + to == ME_GetCursorOfs(editor, 0) && para->member.para.prev_para->type == diParagraph) { para = para->member.para.prev_para; @@ -3688,6 +3712,74 @@ ME_TabPressedInTable(editor, bSelectedRow); ME_CommitUndo(editor); return 0; + } + } else if (!editor->bEmulateVersion10) { /* v4.1 */ + if (para->member.para.nFlags & MEPF_ROWEND) { + if (wstr=='\r') { + /* FIXME: Add a new table row after this row. */ + return 0; + } else if (from == to) { + para = para->member.para.next_para; + if (para->member.para.nFlags & MEPF_ROWSTART) + para = para->member.para.next_para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + } + else if (para == ME_GetParagraph(editor->pCursors[1].pRun) && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* FIXME: Insert a newline before the table. */ + } + } else { /* v1.0 - 3.0 */ + ME_DisplayItem *para = ME_GetParagraph(cursor.pRun); + if (ME_IsInTable(cursor.pRun)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) { + if (wstr=='\r') { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor); + } else { + /* Text should not be inserted at the end of the table. */ + MessageBeep(-1); + } + return 0; + } + } else if (wstr == '\r') { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + WCHAR endl = '\r'; + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } else { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor); + return 0; + } } } /* FIXME maybe it would make sense to call EM_REPLACESEL instead ? */ Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Wed Sep 10 08:35:44 2008 @@ -23,7 +23,7 @@ extern HANDLE me_heap; -static inline void *heap_alloc( size_t len ) +static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) { return HeapAlloc( me_heap, 0, len ); } @@ -33,7 +33,7 @@ return HeapFree( me_heap, 0, ptr ); } -static inline void *heap_realloc( void *ptr, size_t len ) +static inline void __WINE_ALLOC_SIZE(2) *heap_realloc( void *ptr, size_t len ) { return HeapReAlloc( me_heap, 0, ptr, len ); } @@ -296,6 +296,7 @@ ME_DisplayItem *ME_GetTableRowStart(ME_DisplayItem *para); void ME_CheckTablesForCorruption(ME_TextEditor *editor); void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, int nOfs,int *nChars); +ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, ME_DisplayItem *table_row); void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow); struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor); void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef); Modified: trunk/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/table.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] Wed Sep 10 08:35:44 2008 @@ -29,7 +29,7 @@ * Richedit version 1.0 - 3.0: * Tables are implemented in these versions using tabs at the end of cells, * and tab stops to position the cells. The paragraph format flag PFE_TABLE - * will indicate the the paragraph is a table row. Note that in this + * will indicate that the paragraph is a table row. Note that in this * implementation there is one paragraph per table row. * * Richedit version 4.1: @@ -37,7 +37,7 @@ * each with it's own paragraph format, and cells may even contain tables * nested within the cell. * - * There are is also a paragraph at the start of each table row that contains + * There is also a paragraph at the start of each table row that contains * the rows paragraph format (e.g. to change the row alignment to row), and a * paragraph at the end of the table row with the PFE_TABLEROWDELIMITER flag * set. The paragraphs at the start and end of the table row should always be @@ -345,7 +345,7 @@ ME_DisplayItem *pRun; int nCharsToBoundary; - if (this_para->member.para.nCharOfs != nOfs && + if ((this_para->member.para.nCharOfs != nOfs || this_para == end_para) && this_para->member.para.pFmt->dwMask & PFM_TABLE && this_para->member.para.pFmt->wEffects & PFE_TABLE) { @@ -360,27 +360,13 @@ } else if (end_para->member.para.pFmt->dwMask & PFM_TABLE && end_para->member.para.pFmt->wEffects & PFE_TABLE) { - if (this_para == end_para) - { - pRun = c2.pRun; - /* Find the previous tab or end paragraph to use as a delete boundary */ - while (pRun && !(pRun->member.run.nFlags & (MERF_TAB|MERF_ENDPARA))) - pRun = ME_FindItemBack(pRun, diRun); - if (pRun && pRun->member.run.nFlags & MERF_ENDPARA) - { - /* We are in the first cell, and have gone back to the previous - * paragraph, so nothing needs to be protected. */ - pRun = NULL; - } - } else { - /* The deletion starts from before the row, so don't join it with - * previous non-empty paragraphs. */ - pRun = NULL; - if (nOfs > this_para->member.para.nCharOfs) - pRun = ME_FindItemBack(end_para, diRun); - if (!pRun) - pRun = ME_FindItemFwd(end_para, diRun); - } + /* The deletion starts from before the row, so don't join it with + * previous non-empty paragraphs. */ + pRun = NULL; + if (nOfs > this_para->member.para.nCharOfs) + pRun = ME_FindItemBack(end_para, diRun); + if (!pRun) + pRun = ME_FindItemFwd(end_para, diRun); if (pRun) { nCharsToBoundary = ME_GetParagraph(pRun)->member.para.nCharOfs @@ -395,8 +381,8 @@ } } -static ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, - ME_DisplayItem *table_row) +ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, + ME_DisplayItem *table_row) { WCHAR endl = '\r', tab = '\t'; ME_DisplayItem *run; @@ -404,9 +390,13 @@ int i; assert(table_row); + assert(table_row->type == diParagraph); if (!editor->bEmulateVersion10) { /* v4.1 */ ME_DisplayItem *insertedCell, *para, *cell; - cell = ME_FindItemFwd(table_row, diCell); + if (table_row->member.para.nFlags & MEPF_ROWEND) + cell = ME_FindItemBack(table_row, diCell); + else + cell = ME_FindItemFwd(table_row, diCell); run = ME_GetTableRowEnd(table_row)->member.para.next_para; run = ME_FindItemFwd(run, diRun); editor->pCursors[0].pRun = run; @@ -416,12 +406,14 @@ insertedCell = ME_FindItemFwd(para, diCell); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; + insertedCell->member.cell.border = cell->member.cell.border; while (cell->member.cell.next_cell) { cell = cell->member.cell.next_cell; para = ME_InsertTableCellFromCursor(editor); insertedCell = ME_FindItemBack(para, diCell); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; + insertedCell->member.cell.border = cell->member.cell.border; }; ME_InsertTableRowEndFromCursor(editor); /* return the table row start for the inserted paragraph */ Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Wed Sep 10 08:35:44 2008 @@ -377,7 +377,7 @@ } /* will current run fit? */ - if (wc->pt.x + run->nWidth > wc->context->pt.x + wc->nAvailWidth) + if (wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) { int loc = wc->context->pt.x + wc->nAvailWidth - wc->pt.x; /* total white run ? */

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
75
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 September 2008