Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[jimtabor] 33857: Sorry, I should have spotted this when I was in here.. I think this takes care of the leak and crash. Wine testing is back with the same errors. So we are good to go.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 12:45:18 2008 New Revision: 33857 URL: http://svn.reactos.org/svn/reactos?rev=33857&view=rev Log: Sorry, I should have spotted this when I was in here.. I think this takes care of the leak and crash. Wine testing is back with the same errors. So we are good to go. Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Jun 4 12:45:18 2008 @@ -95,7 +95,7 @@ // If dwPenStyle is PS_COSMETIC, the width must be set to 1. if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) - goto EEXIT; + goto ExitCleanup; switch (dwPenStyle & PS_STYLE_MASK) { @@ -109,7 +109,7 @@ case PS_ALTERNATE: /* PS_ALTERNATE is applicable only for cosmetic pens */ - if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto EEXIT; + if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto ExitCleanup; PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; @@ -137,7 +137,7 @@ case PS_INSIDEFRAME: /* FIXME: does it need some additional work? */ /* PS_INSIDEFRAME is applicable only for geometric pens */ - if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto EEXIT; + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto ExitCleanup; PenObject->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME); break; @@ -162,7 +162,7 @@ if(all_zero || has_neg) { - goto EEXIT; + goto ExitCleanup; } } /* FIXME: what style here? */ @@ -175,8 +175,13 @@ PENOBJ_UnlockPen(PenObject); return hPen; -EEXIT: +ExitCleanup: SetLastWin32Error(ERROR_INVALID_PARAMETER); + if (PenObject->pStyle) + { + ExFreePool(PenObject->pStyle); + PenObject->pStyle = NULL; + } PENOBJ_UnlockPen(PenObject); if (bOldStylePen) PENOBJ_FreePenByHandle(hPen); @@ -339,11 +344,6 @@ bOldStylePen, hBrush); - if (!hPen && pSafeStyle) - { - ExFreePool(pSafeStyle); - } -// BRUSH_Cleanup takes care of pSafeStyle when deleteing the pen return hPen; }

1 0

[tkreuzer] 33856: - fix mem leak when failing to create an extpen with penstyles - rename a tag, change a tag, remove unused tag
by tkreuzer＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: tkreuzer Date: Wed Jun 4 11:15:24 2008 New Revision: 33856 URL: http://svn.reactos.org/svn/reactos?rev=33856&view=rev Log: - fix mem leak when failing to create an extpen with penstyles - rename a tag, change a tag, remove unused tag Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Wed Jun 4 11:15:24 2008 @@ -62,7 +62,6 @@ #define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ #define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ #define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ -#define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ #define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ #define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ #define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ @@ -71,13 +70,13 @@ #define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ #define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ #define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ -#define TAG_EXTPEN TAG('X', 'P', 'E', 'N') /* extpen */ +#define TAG_PENSTYLES TAG('G', 's', 't', 'y') /* pen styles */ /* Eng objects */ #define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ #define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ #define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ -#define TAG_FONTOBJ TAG('F', 'N', 'T', 'O') /* font object */ +#define TAG_FONTOBJ TAG('G', 'f', 'n', 't') /* font object */ #define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ #define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ #define TAG_BITMAPOBJ TAG('B', 'M', 'P', 'O') /* bitmap object */ Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Jun 4 11:15:24 2008 @@ -301,7 +301,7 @@ if (dwStyleCount > 0) { - pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), TAG_EXTPEN); + pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), TAG_PENSTYLES); if (!pSafeStyle) { SetLastNtError(ERROR_NOT_ENOUGH_MEMORY); @@ -338,7 +338,12 @@ cjDIB, bOldStylePen, hBrush); -// BRUSH_Cleanup takes care of pSafeStyle + + if (!hPen && pSafeStyle) + { + ExFreePool(pSafeStyle); + } +// BRUSH_Cleanup takes care of pSafeStyle when deleteing the pen return hPen; }

1 0

[jimtabor] 33855: Prevent a crash if the list is empty and check for zero. If (List is Empty! DCE!) is called before the crash, this means we have a thread that is not finished running before shutdown. There is a proper way for handling this
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 11:07:47 2008 New Revision: 33855 URL: http://svn.reactos.org/svn/reactos?rev=33855&view=rev Log: Prevent a crash if the list is empty and check for zero. If (List is Empty! DCE!) is called before the crash, this means we have a thread that is not finished running before shutdown. There is a proper way for handling this Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed Jun 4 11:07:47 2008 @@ -632,6 +632,7 @@ KeEnterCriticalRegion(); do { + if (!pDCE) break; if (pDCE->hwndCurrent == Window->hSelf) { if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/ @@ -651,6 +652,7 @@ Window->Wnd->Style & CS_OWNDC) /* owned DCE*/ { pDCE = DceFreeDCE(pDCE, FALSE); + if (!pDCE) break; Window->Dce = NULL; continue; }

1 0

[fireball] 33854: - libcntpr does not need console/file versions of scanf.
by fireball＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: fireball Date: Wed Jun 4 05:52:54 2008 New Revision: 33854 URL: http://svn.reactos.org/svn/reactos?rev=33854&view=rev Log: - libcntpr does not need console/file versions of scanf. Modified: trunk/reactos/lib/sdk/crt/wine/scanf.c Modified: trunk/reactos/lib/sdk/crt/wine/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] Wed Jun 4 05:52:54 2008 @@ -57,6 +57,7 @@ return -1; } +#ifndef _LIBCNT_ /* vfscanf */ #undef WIDE_SCANF #undef CONSOLE @@ -68,6 +69,7 @@ #undef CONSOLE #undef STRING #include "scanf.h" +#endif /* vsscanf */ #undef WIDE_SCANF @@ -81,6 +83,7 @@ #define STRING 1 #include "scanf.h" +#ifndef _LIBCNT_ /* vcscanf */ #undef WIDE_SCANF #define CONSOLE 1 @@ -144,6 +147,7 @@ va_end(valist); return res; } +#endif /********************************************************************* @@ -175,7 +179,7 @@ return res; } - +#ifndef _LIBCNT_ /********************************************************************* * _cscanf (MSVCRT.@) */ @@ -189,3 +193,4 @@ va_end(valist); return res; } +#endif

1 0

[fireball] 33853: - Fix crtdll build.
by fireball＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: fireball Date: Wed Jun 4 05:41:17 2008 New Revision: 33853 URL: http://svn.reactos.org/svn/reactos?rev=33853&view=rev Log: - Fix crtdll build. Modified: trunk/reactos/dll/win32/crtdll/crtdll.def Modified: trunk/reactos/dll/win32/crtdll/crtdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.de… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.def [iso-8859-1] Wed Jun 4 05:41:17 2008 @@ -502,7 +502,7 @@ sprintf=crt_sprintf sqrt=NTDLL.sqrt srand -sscanf=crt_sscanf +sscanf strcat strchr strcmp=NTDLL.strcmp

1 0

[fireball] 33852: - Misc cleanup of kmtest. - Add paged/nonpaged pools test routines. - Comment out invocations of other tests temporary.
by fireball＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: fireball Date: Wed Jun 4 04:50:19 2008 New Revision: 33852 URL: http://svn.reactos.org/svn/reactos?rev=33852&view=rev Log: - Misc cleanup of kmtest. - Add paged/nonpaged pools test routines. - Comment out invocations of other tests temporary. Added: trunk/rostests/drivers/kmtest/ntos_pools.c (with props) Modified: trunk/rostests/drivers/kmtest/deviface.c trunk/rostests/drivers/kmtest/deviface_test.c trunk/rostests/drivers/kmtest/kmtest.c trunk/rostests/drivers/kmtest/kmtest.rbuild trunk/rostests/drivers/kmtest/ntos_ex.c trunk/rostests/drivers/kmtest/ntos_io.c trunk/rostests/drivers/kmtest/ntos_ob.c Modified: trunk/rostests/drivers/kmtest/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/deviface.c… ============================================================================== --- trunk/rostests/drivers/kmtest/deviface.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/deviface.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -70,7 +70,7 @@ * function worked correctly. */ -NTSTATUS STDCALL +NTSTATUS NTAPI ReactOS_IoGetDeviceInterfaces( IN CONST GUID *InterfaceClassGuid, IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, Modified: trunk/rostests/drivers/kmtest/deviface_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/deviface_t… ============================================================================== --- trunk/rostests/drivers/kmtest/deviface_test.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/deviface_test.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -31,21 +31,21 @@ /* PRIVATE FUNCTIONS **********************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI (*IoGetDeviceInterfaces_Func)( IN CONST GUID *InterfaceClassGuid, IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, IN ULONG Flags, OUT PWSTR *SymbolicLinkList); -NTSTATUS STDCALL +NTSTATUS NTAPI ReactOS_IoGetDeviceInterfaces( IN CONST GUID *InterfaceClassGuid, IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, IN ULONG Flags, OUT PWSTR *SymbolicLinkList); -VOID FASTCALL DeviceInterfaceTest_Func() +VOID DeviceInterfaceTest_Func() { NTSTATUS Status; PWSTR SymbolicLinkList; @@ -134,7 +134,7 @@ "IoRegisterDeviceInterface returned 0x%08lX\n", Status); } -VOID FASTCALL NtoskrnlIoDeviceInterface() +VOID NtoskrnlIoDeviceInterface() { StartTest(); Modified: trunk/rostests/drivers/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.c?r… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -103,10 +103,11 @@ /* * Test Declarations */ -VOID FASTCALL NtoskrnlIoMdlTest(); -VOID FASTCALL NtoskrnlIoDeviceInterface(); -VOID FASTCALL NtoskrnlObTest(); -VOID FASTCALL NtoskrnlExecutiveTests(); +VOID NtoskrnlIoMdlTest(); +VOID NtoskrnlIoDeviceInterface(); +VOID NtoskrnlObTest(); +VOID NtoskrnlExecutiveTests(); +VOID NtoskrnlPoolsTest(); /* * DriverEntry @@ -117,10 +118,12 @@ PUNICODE_STRING RegistryPath) { DbgPrint("\n===============================================\nKernel Mode Regression Test driver starting...\n"); - NtoskrnlExecutiveTests(); - NtoskrnlIoDeviceInterface(); - NtoskrnlIoMdlTest(); - NtoskrnlObTest(); + //NtoskrnlExecutiveTests(); + //NtoskrnlIoDeviceInterface(); + //NtoskrnlIoMdlTest(); + //NtoskrnlObTest(); + //NtoskrnlObTest(); + NtoskrnlPoolsTest(); - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.rbu… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -10,5 +10,6 @@ <file>ntos_ex.c</file> <file>ntos_io.c</file> <file>ntos_ob.c</file> + <file>ntos_pools.c</file> <file>kmtest.rc</file> </module> Modified: trunk/rostests/drivers/kmtest/ntos_ex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_ex.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_ex.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_ex.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -173,7 +173,6 @@ /* PUBLIC FUNCTIONS ***********************************************************/ VOID -FASTCALL NtoskrnlExecutiveTests() { ExTimerTest(); Modified: trunk/rostests/drivers/kmtest/ntos_io.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_io.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_io.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_io.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -30,7 +30,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID FASTCALL NtoskrnlIoMdlTest() +VOID NtoskrnlIoMdlTest() { PMDL Mdl; PIRP Irp; Modified: trunk/rostests/drivers/kmtest/ntos_ob.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_ob.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_ob.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_ob.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -487,7 +487,6 @@ /* PUBLIC FUNCTIONS ***********************************************************/ VOID -FASTCALL NtoskrnlObTest() { StartTest(); Added: trunk/rostests/drivers/kmtest/ntos_pools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_pools… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_pools.c (added) +++ trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] Wed Jun 4 04:50:19 2008 @@ -1,0 +1,134 @@ +/* + * NTOSKRNL Pools test routines KM-Test + * ReactOS Kernel Mode Regression Testing framework + * + * Copyright 2008 Aleksey Bragin <aleksey(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES *******************************************************************/ + +#include <ddk/ntddk.h> +#include <ntifs.h> +#include <ndk/ntndk.h> +#include "kmtest.h" + +//#define NDEBUG +#include "debug.h" + +#define TAG_POOLTEST TAG('P','t','s','t') + +/* PRIVATE FUNCTIONS ***********************************************************/ + +VOID +PoolsTest() +{ + PVOID Ptr; + ULONG AllocSize, i, AllocNumber; + PVOID *Allocs; + + StartTest(); + + // Stress-test nonpaged pool + for (i=1; i<10000; i++) + { + // make up some increasing, a bit irregular size + AllocSize = i*10; + + if (i % 10) + AllocSize++; + + if (i % 25) + AllocSize += 13; + + // start with non-paged pool + Ptr = ExAllocatePoolWithTag(NonPagedPool, AllocSize, TAG_POOLTEST); + + // it may fail due to no-memory condition + if (!Ptr) break; + + // try to fully fill it + RtlFillMemory(Ptr, AllocSize, 0xAB); + + // free it + ExFreePoolWithTag(Ptr, TAG_POOLTEST); + } + + // now paged one + for (i=1; i<10000; i++) + { + // make up some increasing, a bit irregular size + AllocSize = i*50; + + if (i % 10) + AllocSize++; + + if (i % 25) + AllocSize += 13; + + // start with non-paged pool + Ptr = ExAllocatePoolWithTag(PagedPool, AllocSize, TAG_POOLTEST); + + // it may fail due to no-memory condition + if (!Ptr) break; + + // try to fully fill it + RtlFillMemory(Ptr, AllocSize, 0xAB); + + // free it + ExFreePoolWithTag(Ptr, TAG_POOLTEST); + } + + // test super-big allocations + /*AllocSize = 2UL * 1024 * 1024 * 1024; + Ptr = ExAllocatePoolWithTag(NonPagedPool, AllocSize, TAG_POOLTEST); + ok(Ptr == NULL, "Allocating 2Gb of nonpaged pool should fail\n"); + + Ptr = ExAllocatePoolWithTag(PagedPool, AllocSize, TAG_POOLTEST); + ok(Ptr == NULL, "Allocating 2Gb of paged pool should fail\n");*/ + + // now test allocating lots of small/medium blocks + AllocNumber = 100000; + Allocs = ExAllocatePoolWithTag(PagedPool, sizeof(Allocs) * AllocNumber, TAG_POOLTEST); + + // alloc blocks + for (i=0; i<AllocNumber; i++) + { + AllocSize = 42; + Allocs[i] = ExAllocatePoolWithTag(NonPagedPool, AllocSize, TAG_POOLTEST); + } + + // now free them + for (i=0; i<AllocNumber; i++) + { + ExFreePoolWithTag(Allocs[i], TAG_POOLTEST); + } + + + ExFreePoolWithTag(Allocs, TAG_POOLTEST); + + + FinishTest("NTOSKRNL Pools Tests"); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +NtoskrnlPoolsTest() +{ + PoolsTest(); +} Propchange: trunk/rostests/drivers/kmtest/ntos_pools.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 33851: - Misc ctype wine sync.
by fireball＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: fireball Date: Wed Jun 4 04:45:12 2008 New Revision: 33851 URL: http://svn.reactos.org/svn/reactos?rev=33851&view=rev Log: - Misc ctype wine sync. Modified: trunk/reactos/lib/sdk/crt/string/ctype.c Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Wed Jun 4 04:45:12 2008 @@ -379,7 +379,7 @@ */ int __iscsym(int c) { - return(isalnum(c)||(c == '_')); + return (c < 127 && (isalnum(c) || (c == '_'))); } /* @@ -387,7 +387,7 @@ */ int __iscsymf(int c) { - return(isalpha(c)||(c == '_')); + return (c < 127 && (isalpha(c) || (c == '_'))); } /*

1 0

[fireball] 33850: - Remove duplicated sscanf wrapper. - Sync scanf.c / scanf.h with Wine.
by fireball＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: fireball Date: Wed Jun 4 04:10:40 2008 New Revision: 33850 URL: http://svn.reactos.org/svn/reactos?rev=33850&view=rev Log: - Remove duplicated sscanf wrapper. - Sync scanf.c / scanf.h with Wine. Removed: trunk/reactos/lib/sdk/crt/string/sscanf.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/wine/scanf.c trunk/reactos/lib/sdk/crt/wine/scanf.h Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Wed Jun 4 04:10:40 2008 @@ -148,7 +148,6 @@ <file>itow.c</file> <file>mbstowcs_nt.c</file> <file>splitp.c</file> - <file>sscanf.c</file> <file>strtol.c</file> <file>strtoul.c</file> <file>strtoull.c</file> @@ -158,6 +157,10 @@ <file>wtoi64.c</file> <file>wtoi.c</file> <file>wtol.c</file> + </directory> + + <directory name="wine"> + <file>scanf.c</file> </directory> <directory name="wstring"> Removed: trunk/reactos/lib/sdk/crt/string/sscanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/sscanf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/sscanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/sscanf.c (removed) @@ -1,50 +1,0 @@ -#include <precomp.h> - -#include <wchar.h> -#include <ctype.h> - -#define NDEBUG -#include <internal/debug.h> - -#ifndef TRACE -#define TRACE DPRINT -#endif -#define WARN DPRINT1 - - -#define EOF (-1) - -/* helper function for *scanf. Returns the value of character c in the - * given base, or -1 if the given character is not a digit of the base. - */ -static int char2digit(char c, int base) { - if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0'); - if (base<=10) return -1; - if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10); - if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10); - return -1; -} - -/* vsscanf */ -#undef WIDE_SCANF -#undef CONSOLE -#define STRING 1 - -#ifdef _MSC_VER -#define debugstr_a(x) x -#endif - -#include "wine/scanf.h" - -int sscanf(const char *str, const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vsscanf(str, format, valist); - va_end(valist); - return res; -} - -/*EOF */ Modified: trunk/reactos/lib/sdk/crt/wine/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] Wed Jun 4 04:10:40 2008 @@ -20,7 +20,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <precomp.h> @@ -149,7 +149,7 @@ /********************************************************************* * sscanf (MSVCRT.@) */ -int crt_sscanf(const char *str, const char *format, ...) +int sscanf(const char *str, const char *format, ...) { va_list valist; int res; Modified: trunk/reactos/lib/sdk/crt/wine/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.h?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/scanf.h [iso-8859-1] Wed Jun 4 04:10:40 2008 @@ -20,7 +20,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifdef WIDE_SCANF @@ -73,12 +73,6 @@ #endif /* STRING */ #endif /* CONSOLE */ -/********************************************************************* - * Implemented based on - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/h… - * Extended by C. Scott Ananian <cananian(a)alumni.princeton.edu> to handle - * more types of format spec. - */ _FUNCTION_ { int rd = 0, consumed = 0; int nch; @@ -98,412 +92,389 @@ if (nch == _EOF_) return _EOF_RET; while (*format) { - /* a whitespace character in the format string causes scanf to read, - * but not store, all consecutive white-space characters in the input - * up to the next non-white-space character. One white space character - * in the input matches any number (including zero) and combination of - * white-space characters in the input. */ - if (_ISSPACE_(*format)) { + /* a whitespace character in the format string causes scanf to read, + * but not store, all consecutive white-space characters in the input + * up to the next non-white-space character. One white space character + * in the input matches any number (including zero) and combination of + * white-space characters in the input. */ + if (_ISSPACE_(*format)) { /* skip whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); } - /* a format specification causes scanf to read and convert characters - * in the input into values of a specified type. The value is assigned - * to an argument in the argument list. Format specifications have - * the form %[*][width][{h | l | I64 | L}]type */ + /* a format specification causes scanf to read and convert characters + * in the input into values of a specified type. The value is assigned + * to an argument in the argument list. Format specifications have + * the form %[*][width][{h | l | I64 | L}]type */ else if (*format == '%') { int st = 0; int suppress = 0; int width = 0; - int base, number_signed; - int h_prefix = 0; - int l_prefix = 0; - int L_prefix = 0; - int w_prefix = 0; - int prefix_finished = 0; - int I64_prefix = 0; + int base; + int h_prefix = 0; + int l_prefix = 0; + int L_prefix = 0; + int w_prefix = 0; + int prefix_finished = 0; + int I64_prefix = 0; format++; - /* look for leading asterisk, which means 'suppress assignment of - * this field'. */ - if (*format=='*') { - format++; - suppress=1; - } - /* look for width specification */ - while (_ISDIGIT_(*format)) { - width*=10; - width+=*format++ - '0'; - } - if (width==0) width=-1; /* no width spec seen */ - /* read prefix (if any) */ - while (!prefix_finished) { - switch(*format) { - case 'h': h_prefix = 1; break; - case 'l': l_prefix = 1; break; - case 'w': w_prefix = 1; break; - case 'L': L_prefix = 1; break; - case 'I': - if (*(format + 1) == '6' && - *(format + 2) == '4') { - I64_prefix = 1; - format += 2; - } - break; - default: - prefix_finished = 1; - } - if (!prefix_finished) format++; - } - /* read type */ + /* look for leading asterisk, which means 'suppress assignment of + * this field'. */ + if (*format=='*') { + format++; + suppress=1; + } + /* look for width specification */ + while (_ISDIGIT_(*format)) { + width*=10; + width+=*format++ - '0'; + } + if (width==0) width=-1; /* no width spec seen */ + /* read prefix (if any) */ + while (!prefix_finished) { + switch(*format) { + case 'h': h_prefix = 1; break; + case 'l': l_prefix = 1; break; + case 'w': w_prefix = 1; break; + case 'L': L_prefix = 1; break; + case 'I': + if (*(format + 1) == '6' && + *(format + 2) == '4') { + I64_prefix = 1; + format += 2; + } + break; + default: + prefix_finished = 1; + } + if (!prefix_finished) format++; + } + /* read type */ switch(*format) { - case 'x': - case 'X': /* hexadecimal integer. */ - base = 16; number_signed = 0; - goto number; - case 'o': /* octal integer */ - base = 8; number_signed = 0; - goto number; - case 'u': /* unsigned decimal integer */ - base = 10; number_signed = 0; - goto number; - case 'd': /* signed decimal integer */ - base = 10; number_signed = 1; - goto number; - case 'i': /* generic integer */ - base = 10; number_signed = 1; - number: { - /* read an integer */ - ULONGLONG cur = 0; - int negative = 0; - int seendigit=0; + case 'x': + case 'X': /* hexadecimal integer. */ + base = 16; + goto number; + case 'o': /* octal integer */ + base = 8; + goto number; + case 'u': /* unsigned decimal integer */ + base = 10; + goto number; + case 'd': /* signed decimal integer */ + base = 10; + goto number; + case 'i': /* generic integer */ + base = 0; + number: { + /* read an integer */ + ULONGLONG cur = 0; + int negative = 0; + int seendigit=0; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* get sign */ - if (number_signed && (nch == '-' || - nch == '+')) { - negative = (nch=='-'); - nch = _GETC_(file); - if (width>0) width--; - } - /* look for leading indication of base */ - if (width!=0 && nch == '0') { - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - if (width!=0 && (nch=='x' || nch=='X')) { - if (base==0) - base=16; - if (base==16) { - nch = _GETC_(file); - if (width>0) width--; - seendigit=0; - } - } else if (base==0) - base = 8; - } - /* throw away leading zeros */ - while (width!=0 && nch=='0') { - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } - if (width!=0 && _CHAR2DIGIT_(nch, base)!=-1) { - cur = _CHAR2DIGIT_(nch, base); - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } + if (nch == '-' || nch == '+') { + negative = (nch=='-'); + nch = _GETC_(file); + if (width>0) width--; + } + /* look for leading indication of base */ + if (width!=0 && nch == '0') { + nch = _GETC_(file); + if (width>0) width--; + seendigit=1; + if (width!=0 && (nch=='x' || nch=='X')) { + if (base==0) + base=16; + if (base==16) { + nch = _GETC_(file); + if (width>0) width--; + seendigit=0; + } + } else if (base==0) + base = 8; + } + /* format %i without indication of base */ + if (base==0) + base = 10; + /* throw away leading zeros */ + while (width!=0 && nch=='0') { + nch = _GETC_(file); + if (width>0) width--; + seendigit=1; + } + if (width!=0 && _CHAR2DIGIT_(nch, base)!=-1) { + cur = _CHAR2DIGIT_(nch, base); + nch = _GETC_(file); + if (width>0) width--; + seendigit=1; + } /* read until no more digits */ while (width!=0 && (nch!=_EOF_) && _CHAR2DIGIT_(nch, base)!=-1) { cur = cur*base + _CHAR2DIGIT_(nch, base); nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } - /* okay, done! */ - if (!seendigit) break; /* not a valid number */ + if (width>0) width--; + seendigit=1; + } + /* okay, done! */ + if (!seendigit) break; /* not a valid number */ st = 1; if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur - if (number_signed) { - if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); - else if (h_prefix) _SET_NUMBER_(short int); - else _SET_NUMBER_(int); - } else { - if (negative) { - WARN("Dropping sign in reading a negative number into an unsigned value"); - negative = 0; - } - if (I64_prefix) _SET_NUMBER_(ULONGLONG); - else if (l_prefix) _SET_NUMBER_(unsigned long int); - else if (h_prefix) - _SET_NUMBER_(unsigned short int); - else _SET_NUMBER_(unsigned int); - } - } + if (I64_prefix) _SET_NUMBER_(LONGLONG); + else if (l_prefix) _SET_NUMBER_(long int); + else if (h_prefix) _SET_NUMBER_(short int); + else _SET_NUMBER_(int); + } } break; - case 'e': - case 'E': - case 'f': - case 'g': + case 'e': + case 'E': + case 'f': + case 'g': case 'G': { /* read a float */ long double cur = 0; - int negative = 0; + int negative = 0; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - /* get sign. */ + /* get sign. */ if (nch == '-' || nch == '+') { - negative = (nch=='-'); - if (width>0) width--; - if (width==0) break; - nch = _GETC_(file); - } - /* get first digit. */ - if ('.' != nch) { - if (!_ISDIGIT_(nch)) break; - cur = (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + negative = (nch=='-'); + if (width>0) width--; + if (width==0) break; + nch = _GETC_(file); + } + /* get first digit. */ + if ('.' != nch) { + if (!_ISDIGIT_(nch)) break; + cur = (nch - '0'); + nch = _GETC_(file); + if (width>0) width--; + /* read until no more digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { cur = cur*10 + (nch - '0'); nch = _GETC_(file); - if (width>0) width--; - } - } else { - cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ - } - /* handle decimals */ + if (width>0) width--; + } + } else { + cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ + } + /* handle decimals */ if (width!=0 && nch == '.') { float dec = 1; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { dec /= 10; cur += dec * (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } } - /* handle exponent */ - if (width!=0 && (nch == 'e' || nch == 'E')) { - int exponent = 0, negexp = 0; - float expcnt; - nch = _GETC_(file); - if (width>0) width--; - /* possible sign on the exponent */ - if (width!=0 && (nch=='+' || nch=='-')) { - negexp = (nch=='-'); + /* handle exponent */ + if (width!=0 && (nch == 'e' || nch == 'E')) { + int exponent = 0, negexp = 0; + float expcnt; + nch = _GETC_(file); + if (width>0) width--; + /* possible sign on the exponent */ + if (width!=0 && (nch=='+' || nch=='-')) { + negexp = (nch=='-'); nch = _GETC_(file); - if (width>0) width--; - } - /* exponent digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - exponent *= 10; - exponent += (nch - '0'); + if (width>0) width--; + } + /* exponent digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + exponent *= 10; + exponent += (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } - /* update 'cur' with this exponent. */ - expcnt = negexp ? .1 : 10; - while (exponent!=0) { - if (exponent&1) - cur*=expcnt; - exponent/=2; - expcnt=expcnt*expcnt; - } - } + /* update 'cur' with this exponent. */ + expcnt = negexp ? .1 : 10; + while (exponent!=0) { + if (exponent&1) + cur*=expcnt; + exponent/=2; + expcnt=expcnt*expcnt; + } + } st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(long double); - else if (l_prefix) _SET_NUMBER_(double); - else _SET_NUMBER_(float); - } + if (L_prefix) _SET_NUMBER_(long double); + else if (l_prefix) _SET_NUMBER_(double); + else _SET_NUMBER_(float); + } } break; - /* According to - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html… - * 's' reads a character string in a call to fscanf - * and 'S' a wide character string and vice versa in a - * call to fwscanf. The 'h', 'w' and 'l' prefixes override - * this behaviour. 'h' forces reading char * but 'l' and 'w' - * force reading WCHAR. */ - case 's': - if (w_prefix || l_prefix) goto widecharstring; - else if (h_prefix) goto charstring; -#ifdef WIDE_SCANF - else goto widecharstring; -#else /* WIDE_SCANF */ - else goto charstring; -#endif /* WIDE_SCANF */ - case 'S': - if (w_prefix || l_prefix) goto widecharstring; - else if (h_prefix) goto charstring; -#ifdef WIDE_SCANF - else goto charstring; -#else /* WIDE_SCANF */ - else goto widecharstring; -#endif /* WIDE_SCANF */ - charstring: { /* read a word into a char */ - char*str = suppress ? NULL : va_arg(ap, char*); - char*sptr = str; + /* According to msdn, + * 's' reads a character string in a call to fscanf + * and 'S' a wide character string and vice versa in a + * call to fwscanf. The 'h', 'w' and 'l' prefixes override + * this behaviour. 'h' forces reading char * but 'l' and 'w' + * force reading WCHAR. */ + case 's': + if (w_prefix || l_prefix) goto widecharstring; + else if (h_prefix) goto charstring; +#ifdef WIDE_SCANF + else goto widecharstring; +#else /* WIDE_SCANF */ + else goto charstring; +#endif /* WIDE_SCANF */ + case 'S': + if (w_prefix || l_prefix) goto widecharstring; + else if (h_prefix) goto charstring; +#ifdef WIDE_SCANF + else goto charstring; +#else /* WIDE_SCANF */ + else goto widecharstring; +#endif /* WIDE_SCANF */ + charstring: { /* read a word into a char */ + char *sptr = suppress ? NULL : va_arg(ap, char*); /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* read until whitespace */ while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - st++; - nch = _GETC_(file); - if (width>0) width--; + st++; + nch = _GETC_(file); + if (width>0) width--; } /* terminate */ if (!suppress) *sptr = 0; } break; - widecharstring: { /* read a word into a wchar_t* */ - wchar_t*str = - suppress ? NULL : va_arg(ap, wchar_t*); - wchar_t*sptr = str; + widecharstring: { /* read a word into a wchar_t* */ + wchar_t *sptr = suppress ? NULL : va_arg(ap, wchar_t*); /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* read until whitespace */ while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { if (!suppress) *sptr++ = _WIDE2SUPPORTED_(nch); - st++; - nch = _GETC_(file); - if (width>0) width--; + st++; + nch = _GETC_(file); + if (width>0) width--; } /* terminate */ if (!suppress) *sptr = 0; } break; /* 'c' and 'C work analogously to 's' and 'S' as described - * above */ - case 'c': - if (w_prefix || l_prefix) goto widecharacter; - else if (h_prefix) goto character; -#ifdef WIDE_SCANF - else goto widecharacter; -#else /* WIDE_SCANF */ - else goto character; -#endif /* WIDE_SCANF */ - case 'C': - if (w_prefix || l_prefix) goto widecharacter; - else if (h_prefix) goto character; -#ifdef WIDE_SCANF - else goto character; -#else /* WIDE_SCANF */ - else goto widecharacter; -#endif /* WIDE_SCANF */ - character: { /* read single character into char */ - if (nch!=_EOF_) { - if (!suppress) { - char*c = va_arg(ap, char*); - *c = _CHAR2SUPPORTED_(nch); - } - st = 1; - nch = _GETC_(file); - } - } - break; - widecharacter: { /* read single character into a wchar_t */ - if (nch!=_EOF_) { - if (!suppress) { - wchar_t*c = va_arg(ap, wchar_t*); - *c = _WIDE2SUPPORTED_(nch); - } - nch = _GETC_(file); - st = 1; - } - } - break; - case 'n': { - if (!suppress) { - int*n = va_arg(ap, int*); - - /* - *n = consumed - (nch!=_EOF_); - - FIXME: The above is the Wine version and it doesnt work in ros - when %n is at end of input string (return one too many). - But does it fail in Wine too?? If so wine also needs fixin. - -Gunnar - */ - - *n = consumed - 1; - } - /* This is an odd one: according to the standard, - * "Execution of a %n directive does not increment the - * assignment count returned at the completion of - * execution" even if it wasn't suppressed with the - * '*' flag. The Corrigendum to the standard seems - * to contradict this (comment out the assignment to - * suppress below if you want to implement these - * alternate semantics) but the windows program I'm - * looking at expects the behavior I've coded here - * (which happens to be what glibc does as well). - */ - suppress = 1; - st = 1; - } - break; - case '[': { + * above */ + case 'c': + if (w_prefix || l_prefix) goto widecharacter; + else if (h_prefix) goto character; +#ifdef WIDE_SCANF + else goto widecharacter; +#else /* WIDE_SCANF */ + else goto character; +#endif /* WIDE_SCANF */ + case 'C': + if (w_prefix || l_prefix) goto widecharacter; + else if (h_prefix) goto character; +#ifdef WIDE_SCANF + else goto character; +#else /* WIDE_SCANF */ + else goto widecharacter; +#endif /* WIDE_SCANF */ + character: { /* read single character into char */ + char *str = suppress ? NULL : va_arg(ap, char*); + if (width == -1) width = 1; + while ((width != 0) && (nch != _EOF_)) + { + if (!suppress) *str++ = _CHAR2SUPPORTED_(nch); + st++; + width--; + nch = _GETC_(file); + } + } + break; + widecharacter: { /* read single character into a wchar_t */ + wchar_t *str = suppress ? NULL : va_arg(ap, wchar_t*); + if (width == -1) width = 1; + while ((width != 0) && (nch != _EOF_)) + { + if (!suppress) *str++ = _WIDE2SUPPORTED_(nch); + st++; + width--; + nch = _GETC_(file); + } + } + break; + case 'n': { + if (!suppress) { + int*n = va_arg(ap, int*); + *n = consumed - 1; + } + /* This is an odd one: according to the standard, + * "Execution of a %n directive does not increment the + * assignment count returned at the completion of + * execution" even if it wasn't suppressed with the + * '*' flag. The Corrigendum to the standard seems + * to contradict this (comment out the assignment to + * suppress below if you want to implement these + * alternate semantics) but the windows program I'm + * looking at expects the behavior I've coded here + * (which happens to be what glibc does as well). + */ + suppress = 1; + st = 1; + } + break; + case '[': { _CHAR_ *str = suppress ? NULL : va_arg(ap, _CHAR_*); _CHAR_ *sptr = str; - RTL_BITMAP bitMask; + RTL_BITMAP bitMask; ULONG *Mask; - int invert = 0; /* Set if we are NOT to find the chars */ - - /* Init our bitmap */ + int invert = 0; /* Set if we are NOT to find the chars */ + + /* Init our bitmap */ #ifdef _LIBCNT_ - Mask = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); + Mask = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); #else - Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); + Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); #endif - RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); - - /* Read the format */ - format++; - if(*format == '^') { - invert = 1; - format++; - } - if(*format == ']') { - RtlSetBits(&bitMask, ']', 1); - format++; - } + RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); + + /* Read the format */ + format++; + if(*format == '^') { + invert = 1; + format++; + } + if(*format == ']') { + RtlSetBits(&bitMask, ']', 1); + format++; + } while(*format && (*format != ']')) { - /* According to: - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/h… - * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ - if((*format == '-') && (*(format + 1) != ']')) { - if ((*(format - 1)) < *(format + 1)) - RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); - else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); - format++; - } else - RtlSetBits(&bitMask, *format, 1); - format++; - } + /* According to msdn: + * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ + if((*format == '-') && (*(format + 1) != ']')) { + if ((*(format - 1)) < *(format + 1)) + RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); + else + RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); + format++; + } else + RtlSetBits(&bitMask, *format, 1); + format++; + } /* read until char is not suitable */ while ((width != 0) && (nch != _EOF_)) { - if(!invert) { - if(RtlAreBitsSet(&bitMask, nch, 1)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - } else - break; - } else { - if(RtlAreBitsClear(&bitMask, nch, 1)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - } else - break; - } + if(!invert) { + if(RtlAreBitsSet(&bitMask, nch, 1)) { + if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); + } else + break; + } else { + if(RtlAreBitsClear(&bitMask, nch, 1)) { + if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); + } else + break; + } st++; nch = _GETC_(file); if (width>0) width--; @@ -511,20 +482,20 @@ /* terminate */ if (!suppress) *sptr = 0; #ifdef _LIBCNT_ - RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); + RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); #else - HeapFree(GetProcessHeap(), 0, Mask); + HeapFree(GetProcessHeap(), 0, Mask); #endif } break; default: - /* From spec: "if a percent sign is followed by a character - * that has no meaning as a format-control character, that - * character and the following characters are treated as - * an ordinary sequence of characters, that is, a sequence - * of characters that must match the input. For example, - * to specify that a percent-sign character is to be input, - * use %%." */ + /* From spec: "if a percent sign is followed by a character + * that has no meaning as a format-control character, that + * character and the following characters are treated as + * an ordinary sequence of characters, that is, a sequence + * of characters that must match the input. For example, + * to specify that a percent-sign character is to be input, + * use %%." */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); if (nch==*format) { @@ -537,18 +508,18 @@ if (st && !suppress) rd++; else if (!st) break; } - /* a non-white-space character causes scanf to read, but not store, - * a matching non-white-space character. */ + /* a non-white-space character causes scanf to read, but not store, + * a matching non-white-space character. */ else { /* check for character match */ if (nch == *format) { - nch = _GETC_(file); + nch = _GETC_(file); } else break; } format++; } if (nch!=_EOF_) { - _UNGETC_(nch, file); + _UNGETC_(nch, file); } TRACE("returning %d\n", rd); return rd;

1 0

[jimtabor] 33849: No need to do it twice.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 01:10:49 2008 New Revision: 33849 URL: http://svn.reactos.org/svn/reactos?rev=33849&view=rev Log: No need to do it twice. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Jun 4 01:10:49 2008 @@ -1506,8 +1506,6 @@ // Set this Brush to inaccessible mode and to an Owner of NONE. // if (OwnerMask == GDI_OBJ_HMGR_NONE) Owner = OwnerMask; - // Deny user access to User Data. - pEntry->UserData = NULL; // This hBR is inaccessible! if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, Owner)) return FALSE;

1 0

[gbrunmar] 33848: * Fixes 14 wine tests for the edit control * Indentation fixes
by gbrunmar＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: gbrunmar Date: Wed Jun 4 01:08:37 2008 New Revision: 33848 URL: http://svn.reactos.org/svn/reactos?rev=33848&view=rev Log: * Fixes 14 wine tests for the edit control * Indentation fixes Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Wed Jun 4 01:08:37 2008 @@ -256,7 +256,7 @@ /* * WM_XXX message handlers */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c); +static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c); static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_Copy(EDITSTATE *es); @@ -869,20 +869,20 @@ } break; - case WM_IME_CHAR: - if (!unicode) - { - WCHAR charW; - CHAR strng[2]; - - strng[0] = wParam >> 8; - strng[1] = wParam & 0xff; - if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); - else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); - EDIT_WM_Char(es, charW); - break; - } - /* fall through */ + case WM_IME_CHAR: + if (!unicode) + { + WCHAR charW; + CHAR strng[2]; + + strng[0] = wParam >> 8; + strng[1] = wParam & 0xff; + if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); + else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); + result = EDIT_WM_Char(es, charW); + break; + } + /* fall through */ case WM_CHAR: { WCHAR charW; @@ -901,7 +901,7 @@ SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0); break; } - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } @@ -4090,7 +4090,7 @@ * WM_CHAR * */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) +static BOOL EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; @@ -4161,6 +4161,8 @@ } break; } + + return TRUE; }

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
44
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 June 2008