Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 37924: revert 37889 (still consuses rsym)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 8 01:33:04 2008 New Revision: 37924 URL: http://svn.reactos.org/svn/reactos?rev=37924&view=rev Log: revert 37889 (still consuses rsym) Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Dec 8 01:33:04 2008 @@ -1434,9 +1434,6 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); - // FIXME! workaround until rsym can extract line numbers from DWARF - fprintf ( fMakefile, - "\t$(Q)${objcopy} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile, @@ -2018,6 +2015,16 @@ linkerflags ); } + if ( IsStaticLibrary ( module ) && module.isStartupLib ) + { + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cxxflagsMacro.c_str () ); + } + fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] Mon Dec 8 01:33:04 2008 @@ -745,17 +745,13 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = project.LookupProperty( name->value ); - const string *PropertyValue; - const string EmptyString; - - if (property) - { - PropertyValue = &property->value; - } - else - { - // Property does not exist, treat it as being empty - PropertyValue = &EmptyString; + if ( !property ) + { + // Property not found + throw InvalidOperationException ( __FILE__, + __LINE__, + "Test on unknown property '%s' at %s", + name->value.c_str (), e.location.c_str () ); } const XMLAttribute* value; @@ -763,7 +759,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( *PropertyValue == value->value ); + bool equality = ( property->value == value->value ); if ( equality == negate ) { // Failed, skip this element Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Mon Dec 8 01:33:04 2008 @@ -399,17 +399,13 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = LookupProperty( name->value ); - const string *PropertyValue; - const string EmptyString; - - if (property) + if ( !property ) { - PropertyValue = &property->value; - } - else - { - // Property does not exist, treat it as being empty - PropertyValue = &EmptyString; + // Property not found + throw InvalidOperationException ( __FILE__, + __LINE__, + "Test on unknown property '%s' at %s", + name->value.c_str (), e.location.c_str () ); } const XMLAttribute* value; @@ -417,7 +413,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( *PropertyValue == value->value ); + bool equality = ( property->value == value->value ); if ( equality == negate ) { // Failed, skip this element

15 years, 9 months

[tkreuzer] 37923: revert 37475 and 37818

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 8 01:32:09 2008 New Revision: 37923 URL: http://svn.reactos.org/svn/reactos?rev=37923&view=rev Log: revert 37475 and 37818 Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Mon Dec 8 01:32:09 2008 @@ -1265,7 +1265,7 @@ HARDWARE_PTE PageDirectoryPte; ULONGLONG Filler; }; - HANDLE Session; + ULONG Session; CHAR ImageFileName[16]; LIST_ENTRY JobLinks; PVOID LockedPagesList; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] Mon Dec 8 01:32:09 2008 @@ -682,7 +682,7 @@ if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ - Process->Session = UlongToPtr(SessionInfo.SessionId); + Process->Session = SessionInfo.SessionId; /* Check if the process also has a PEB */ if (Process->Peb)

15 years, 9 months

[jimtabor] 37922: - Patch by hto: Suspicious code in User32.dll, see bug 3935.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 7 21:34:22 2008 New Revision: 37922 URL: http://svn.reactos.org/svn/reactos?rev=37922&view=rev Log: - Patch by hto: Suspicious code in User32.dll, see bug 3935. Modified: trunk/reactos/dll/win32/user32/windows/font.c 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] Sun Dec 7 21:34:22 2008 @@ -676,9 +676,10 @@ assert (max >= n); max -= n; while (n--) + { if (*start_str++ == PREFIX && max--) start_str++; - else; + } start_count -= (start_str - str_on_entry); } else @@ -736,7 +737,6 @@ str++; ns--; } - else; i++; } return result;

15 years, 9 months

[dgorbachev] 37921: Put inline functions into header files.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 7 17:40:23 2008 New Revision: 37921 URL: http://svn.reactos.org/svn/reactos?rev=37921&view=rev Log: Put inline functions into header files. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/hal/halx86/include/apic.h trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -162,9 +162,9 @@ DWORD dwDataSize, LPVOID lpRawData); -__inline void LogfFreeRecord(LPVOID Rec); +/* eventlog.c */ +extern HANDLE MyHeap; -/* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header); VOID PRINT_RECORD(PEVENTLOGRECORD pRec); @@ -185,4 +185,9 @@ /* rpc.c */ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter); +static __inline void LogfFreeRecord(LPVOID Rec) +{ + HeapFree(MyHeap, 0, Rec); +} + #endif /* __EVENTLOG_H__ */ Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -14,7 +14,6 @@ static LIST_ENTRY LogFileListHead; static CRITICAL_SECTION LogFileListCs; -extern HANDLE MyHeap; /* FUNCTIONS ****************************************************************/ @@ -898,8 +897,3 @@ *lpRecSize = dwRecSize; return Buffer; } - -__inline void LogfFreeRecord(LPVOID Rec) -{ - HeapFree(MyHeap, 0, Rec); -} Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -15,7 +15,6 @@ HANDLE ConnectPortHandle = NULL; HANDLE MessagePortHandle = NULL; -extern HANDLE MyHeap; extern BOOL onLiveCD; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/apic.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -93,10 +93,10 @@ #define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ #define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ +#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ +#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ +#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ +#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ #define APIC_LVT3_DM (0x7 << 8) #define APIC_LVT3_IIPP (0x1 << 13) @@ -117,10 +117,10 @@ #define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ #define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ +#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ +#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ +#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ +#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ #define APIC_LVT3_DM (0x7 << 8) #define APIC_LVT3_IIPP (0x1 << 13) @@ -185,30 +185,92 @@ } CPU_INFO, *PCPU_INFO; extern ULONG CPUCount; /* Total number of CPUs */ -extern ULONG BootCPU; /* Bootstrap processor */ +extern ULONG BootCPU; /* Bootstrap processor */ extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ +extern PULONG APICBase; /* Virtual address of local APIC */ +extern ULONG lastregr[MAX_CPU]; /* For debugging */ +extern ULONG lastvalr[MAX_CPU]; +extern ULONG lastregw[MAX_CPU]; +extern ULONG lastvalw[MAX_CPU]; /* Prototypes */ - -__inline VOID APICWrite(ULONG Offset, ULONG Value); -__inline ULONG APICRead(ULONG Offset); VOID APICSendIPI(ULONG Target, ULONG Mode); VOID APICSetup(VOID); VOID HaliInitBSP(VOID); VOID APICSyncArbIDs(VOID); -__inline VOID APICSendEOI(VOID); VOID APICCalibrateTimer(ULONG CPU); VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); +static __inline ULONG _APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} + +#if 0 +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#else +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregw[CPU] = Offset; + lastvalw[CPU] = Value; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#endif + +#if 0 +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} +#else +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregr[CPU] = Offset; + lastvalr[CPU] = 0; + + p = (PULONG)((ULONG)APICBase + Offset); + + lastvalr[CPU] = *p; + return lastvalr[CPU]; +} +#endif + static __inline ULONG ThisCPU(VOID) { return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; } - -#endif - +static __inline VOID APICSendEOI(VOID) +{ + // Send the EOI + APICWrite(APIC_EOI, 0); +} + +#endif /* __INTERNAL_HAL_APIC_H */ /* EOF */ - Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=3… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sun Dec 7 17:40:23 2008 @@ -223,72 +223,6 @@ APICWrite(APIC_SIVR, tmp); } - -__inline ULONG _APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG)APICBase + Offset); - return *p; -} - -#if 0 -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - - p = (PULONG)((ULONG)APICBase + Offset); - - *p = Value; -} -#else -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregw[CPU] = Offset; - lastvalw[CPU] = Value; - - p = (PULONG)((ULONG)APICBase + Offset); - - *p = Value; -} -#endif - - -#if 0 -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG)APICBase + Offset); - return *p; -} -#else -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregr[CPU] = Offset; - lastvalr[CPU] = 0; - - p = (PULONG)((ULONG)APICBase + Offset); - - lastvalr[CPU] = *p; - return lastvalr[CPU]; -} -#endif - -__inline VOID APICSendEOI(VOID) -{ - // Send the EOI - APICWrite(APIC_EOI, 0); -} - static VOID APICDumpBit(ULONG base) { ULONG v, i, j; @@ -317,7 +251,6 @@ ULONG v, ver, maxlvt; ULONG r1, r2, w1, w2; ULONG CPU = ThisCPU();; - r1 = lastregr[CPU];

15 years, 9 months

[dgorbachev] 37920: Remove WINVER, committed in r37916.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 7 16:03:22 2008 New Revision: 37920 URL: http://svn.reactos.org/svn/reactos?rev=37920&view=rev Log: Remove WINVER, committed in r37916. Modified: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c Modified: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] (original) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] Sun Dec 7 16:03:22 2008 @@ -5,8 +5,6 @@ * PURPOSE: Application for testing the CRT API's (wcstombs and wctomb) and the Win32 API WideCharToMultiByte for the Unicode to MultiByte string conversion * COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> */ - -#define WINVER 0x0500 /* WC_NO_BEST_FIT_CHARS */ #include <windows.h> #include <stdio.h>

15 years, 9 months

[dgorbachev] 37919: Silence GCC warnings.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 7 15:52:22 2008 New Revision: 37919 URL: http://svn.reactos.org/svn/reactos?rev=37919&view=rev Log: Silence GCC warnings. Modified: trunk/reactos/base/applications/cmdutils/more/more.c trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/settings.c trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/powercfg/powershemes.c trunk/reactos/dll/cpl/sysdm/startrec.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/palette.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/newdev/wizard.c trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/drivers/directx/dxapi/main.c trunk/reactos/drivers/directx/dxg/main.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/setup/blue/font.c trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/include/reactos/wine/library.h trunk/reactos/include/reactos/wine/winbase16.h trunk/reactos/lib/fslib/ext2lib/Inode.c trunk/reactos/lib/fslib/ext2lib/Memory.c trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c trunk/reactos/lib/sdk/crt/string/wcs.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/rtl/misc.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -114,7 +114,7 @@ if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) { - if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) + if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < (int)(4096 / sizeof(TCHAR))) { CharToOem(buff, buff); ConOutPuts(buff); @@ -145,7 +145,7 @@ 0); if (hFile == INVALID_HANDLE_VALUE) { - if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) + if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < (int)(sizeof(szMsg) / sizeof(TCHAR))) { _stprintf(buff, szMsg, szFullPath); CharToOem(buff, buff); Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -283,7 +283,7 @@ BITMAP bitmap; DWORD Result = 0; DWORD iDevNum = 0; - INT i; + DWORD i; DISPLAY_DEVICE displayDevice; PGLOBAL_DATA pGlobalData; @@ -333,7 +333,7 @@ else /* FIXME: incomplete! */ { PMONSL_MONINFO pMonitors; - INT i; + DWORD i; SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); @@ -341,7 +341,7 @@ pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); if (pMonitors) { - INT hack = 1280; + DWORD hack = 1280; for (i = 0; i < Result; i++) { pMonitors[i].Position.x = hack * i; @@ -817,7 +817,7 @@ case WM_DESTROY: { - INT i; + DWORD i; PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; while (Current != NULL) Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=37… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -42,7 +42,7 @@ HKEY hKey; TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH]; DWORD dwIndex = 0, dwType, dwSize; - INT Count = 0, i, j; + UINT Count = 0, i, j; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -214,7 +214,7 @@ DWORD dwBufLen; TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; HANDLE hLib; - int i, j, k; + unsigned i, j, k; wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -37,7 +37,7 @@ Count = SetupGetLineCount(hIntlInf, _T("CodePages")); if (Count <= 0) return FALSE; - for (Number = 0; Number < Count; Number++) + for (Number = 0; Number < (UINT)Count; Number++) { if (SetupGetLineByIndex(hIntlInf, _T("CodePages"), Number, &infCont) && SetupGetIntField(&infCont, 0, (PINT)&uiCPage)) Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -169,7 +169,7 @@ memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); - if(uiIndex != CB_ERR) + if(uiIndex != (UINT)CB_ERR) { SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -775,7 +775,7 @@ LRESULT lResult; lResult = SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); - if (lResult != CB_ERR && lResult != pStartInfo->dwCrashDumpEnabled) + if (lResult != CB_ERR && lResult != (LRESULT)pStartInfo->dwCrashDumpEnabled) { if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { @@ -786,7 +786,7 @@ SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir); } - pStartInfo->dwCrashDumpEnabled = lResult; + pStartInfo->dwCrashDumpEnabled = (DWORD)lResult; SetCrashDlgItems(hwndDlg, pStartInfo); } } Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -553,7 +553,7 @@ szDayLen, &TextSize)) { - RECT rcHighlight = {0}; + RECT rcHighlight = { 0, 0, 0, 0 }; rcText.left = rcCell.left + (infoPtr->CellSize.cx / 2) - (TextSize.cx / 2); rcText.top = rcCell.top + (infoPtr->CellSize.cy / 2) - (TextSize.cy / 2); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -786,7 +786,7 @@ IN LPCSTR lpSubKey OPTIONAL, IN HKEY hKeyDest) { - UNICODE_STRING SubKeyName = {0}; + UNICODE_STRING SubKeyName = { 0, 0, NULL }; LONG Ret; if (lpSubKey != NULL && @@ -816,7 +816,7 @@ IN HKEY hKey, OUT PHKEY phkResult) { - UNICODE_STRING MachineName = {0}; + UNICODE_STRING MachineName = { 0, 0, NULL }; LONG Ret; if (lpMachineName != NULL && @@ -1414,7 +1414,7 @@ IN LPCSTR lpSubKey OPTIONAL, IN LPCSTR lpValueName OPTIONAL) { - UNICODE_STRING SubKey = {0}, ValueName = {0}; + UNICODE_STRING SubKey = { 0, 0, NULL }, ValueName = { 0, 0, NULL }; LONG Ret; if (lpSubKey != NULL && @@ -1828,7 +1828,7 @@ RegDeleteTreeA(IN HKEY hKey, IN LPCSTR lpSubKey OPTIONAL) { - UNICODE_STRING SubKeyName = {0}; + UNICODE_STRING SubKeyName = { 0, 0, NULL }; LONG Ret; if (lpSubKey != NULL && Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -1530,7 +1530,7 @@ OUT PSID pSid, IN OUT DWORD* cbSid) { - int i; + unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); if (DomainSid != NULL) @@ -1576,7 +1576,7 @@ IsWellKnownSid(IN PSID pSid, IN WELL_KNOWN_SID_TYPE WellKnownSidType) { - int i; + unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) @@ -1638,7 +1638,7 @@ } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i; for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -660,10 +660,10 @@ DeviceInfo* device_info, MIDIHDR* header) { - int index = 0; + unsigned int index = 0; UCHAR* midi_bytes = (UCHAR*) header->lpData; - int msg_index = 0; + unsigned int msg_index = 0; UCHAR msg[3]; /* Initialize the buffer */ Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -53,11 +53,11 @@ PVOID *Reserved) { adns_state astate; - int quflags = 0, i; + int quflags = 0; int adns_error; adns_answer *answer; LPSTR CurrentName; - unsigned CNameLoop; + unsigned i, CNameLoop; *QueryResultSet = 0; Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -911,7 +911,7 @@ } // Poorly written apps are not ReactOS problem! // We fix it here if the size is larger than the default size. - if( cbSize > sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); + if( cbSize > (int)sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); Result = NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); // Should handle the copy. Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -86,11 +86,8 @@ UINT cEntries, LPPALETTEENTRY ppe) { - PALETTEENTRY ippe[256]; - - if (cEntries < 0) return 0; - else - { + PALETTEENTRY ippe[256]; + if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); else @@ -103,9 +100,9 @@ if (iStartIndex < 256) { - INT Index = 256 - iStartIndex; - - if ( Index >= cEntries ) Index = cEntries; + UINT Index = 256 - iStartIndex; + + if ( Index > cEntries ) Index = cEntries; RtlCopyMemory( ppe, &ippe[iStartIndex], @@ -113,8 +110,8 @@ } } } - } - return 0; + + return 0; } UINT Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -90,7 +90,8 @@ if ( GetRegionData(hRgn, cRgnDSize, pRgnData) ) { HRGN hRgnex; - INT i, SaveL = pRgnData->rdh.rcBound.left; + UINT i; + INT SaveL = pRgnData->rdh.rcBound.left; pRgnData->rdh.rcBound.left = Width - pRgnData->rdh.rcBound.right; pRgnData->rdh.rcBound.right = Width - SaveL; if (pRgnData->rdh.nCount > 0) Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -232,7 +232,7 @@ CLIENT_ID ClientId; /* If we don't have a PID, look it up */ - if (dwProcessId == -1) dwProcessId = (DWORD)CsrGetProcessId(); + if (dwProcessId == -1U) dwProcessId = (DWORD)CsrGetProcessId(); /* Open a handle to the process */ ClientId.UniqueThread = NULL; Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -216,7 +216,7 @@ ULONG ErrorParameters[4]; ULONG ErrorResponse; - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters >= 2) { switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) @@ -269,7 +269,7 @@ /* Print a stack trace. */ DbgPrint("Unhandled exception\n"); DbgPrint("ExceptionCode: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionCode); - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters == 2) { DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); @@ -312,7 +312,7 @@ ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode; ErrorParameters[1] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionAddress; - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) { /* get the type of operation that caused the access violation */ ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0]; Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -88,7 +88,7 @@ 0, 0, &NLS_FormatsCS, { &NLS_FormatsCS_debug.ProcessLocksList, &NLS_FormatsCS_debug.ProcessLocksList }, - 0, 0, 0, 0 + 0, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -532,7 +532,7 @@ SetThreadPriority(HANDLE hThread, int nPriority) { - ULONG Prio = nPriority; + LONG Prio = nPriority; NTSTATUS Status; /* Check if values forcing saturation should be used */ @@ -549,7 +549,7 @@ Status = NtSetInformationThread(hThread, ThreadBasePriority, &Prio, - sizeof(ULONG)); + sizeof(LONG)); if (!NT_SUCCESS(Status)) { /* Failure */ Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -24,7 +24,7 @@ LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; ULONG SocketCount = 0; PSOCKET_INFORMATION *Sockets = NULL; -LIST_ENTRY SockHelpersListHead = {NULL}; +LIST_ENTRY SockHelpersListHead = { NULL, NULL }; ULONG SockAsyncThreadRefCount; HANDLE SockAsyncHelperAfdHandle; HANDLE SockAsyncCompletionPort; Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -650,7 +650,9 @@ } } else + { /* FIXME */; + } return TRUE; default: Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -395,7 +395,7 @@ lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR)); /* Try and open the driver by filename */ - if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) + if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) ) goto the_end; /* If we got here, the file wasn't found. So we assume the caller @@ -407,7 +407,7 @@ if ( DRIVER_GetLibName(lpDriverName, lsn, libName, sizeof(libName)) ) { /* Now we have the filename, we can try and load it */ - if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) + if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) ) goto the_end; } Modified: trunk/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/main… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/main.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -110,7 +110,7 @@ dwFunctionNum -= DD_FIRST_DXAPI; if ((lpvOutBuffer == NULL) || - (dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) || + /*(dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) ||*/ (dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) || (gDxApiEntryPoint[dwFunctionNum].pfn == NULL) || (cbInBuffer != tblCheckInBuffer[dwFunctionNum]) || Modified: trunk/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/main.c… ============================================================================== --- trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -43,7 +43,7 @@ { PDRVFN drv_func; - INT i; + UINT i; /* Test see if the data is vaild we got from win32k.sys */ if ((SizeEngDrv != sizeof(DRVENABLEDATA)) || Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -357,7 +357,7 @@ RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy); /* Check if we could write more but are not able to */ - if (*BufferLength < FCB->PathNameU.Length + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < FCB->PathNameU.Length + (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) { /* Return number of bytes written */ *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -58,7 +58,7 @@ OID_802_3_MAC_OPTIONS }; -DRIVER_INFORMATION DriverInfo = {0}; +DRIVER_INFORMATION DriverInfo = { NULL, NULL, { NULL, NULL } }; NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1); @@ -161,7 +161,7 @@ PNDIS_RESOURCE_LIST AssignedResources; UINT BufferSize = 0; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - int i; + UINT i; NdisMQueryAdapterResources(Status, WrapperConfigurationContext, Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -143,7 +143,7 @@ if(NT_SUCCESS(Status)) { - if(!bFoundFile && atoi(FileName) == CodePage) + if(!bFoundFile && (UINT32)atoi(FileName) == CodePage) { // We got the correct file. // Save the offset and loop through the rest of the file table to find the position, where the actual data starts. Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -1637,7 +1637,7 @@ KdPrint2((PRINT_PREFIX "SIISETCLK\n")); GetPciConfig1(0x8a, tmp8); if ((tmp8 & 0x30) != 0x10) - ChangePciConfig1(0x8a, (a & 0xcf | 0x10)); + ChangePciConfig1(0x8a, (a & 0xcf) | 0x10); GetPciConfig1(0x8a, tmp8); if ((tmp8 & 0x30) != 0x10) { KdPrint2((PRINT_PREFIX "Sil 0680 could not set ATA133 clock\n")); Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -1078,7 +1078,7 @@ UCHAR ChildDescriptor[256]; ULONG ChildId; ULONG Unused; - INT i; + UINT i; DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL) @@ -1155,7 +1155,7 @@ #ifndef NDEBUG if (ChildType == Monitor) { - INT j; + UINT j; PUCHAR p = ChildDescriptor; INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildId); for (j = 0; j < sizeof (ChildDescriptor); j += 8) Modified: trunk/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/libra… ============================================================================== --- trunk/reactos/include/reactos/wine/library.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/library.h [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -180,10 +180,10 @@ #ifdef __i386__ # ifdef __GNUC__ # define __DEFINE_GET_SEG(seg) \ - extern inline unsigned short wine_get_##seg(void) \ + static inline unsigned short wine_get_##seg(void) \ { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } # define __DEFINE_SET_SEG(seg) \ - extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } + static inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } # elif defined(_MSC_VER) # define __DEFINE_GET_SEG(seg) \ extern inline unsigned short wine_get_##seg(void) \ Modified: trunk/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… ============================================================================== --- trunk/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -520,7 +520,7 @@ BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); /* Some optimizations */ -extern inline LPVOID WINAPI MapSL( SEGPTR segptr ) +static inline LPVOID WINAPI MapSL( SEGPTR segptr ) { return (char *)wine_ldt_copy.base[SELECTOROF(segptr) >> __AHSHIFT] + OFFSETOF(segptr); } Modified: trunk/reactos/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Inode.c?… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -348,11 +348,11 @@ bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG *dwRet) { - ULONG dwSizes[4] = {12, 1, 1, 1}; + ULONG dwSizes[4] = { 12, 1, 1, 1 }; ULONG Index = 0; ULONG dwBlk = 0; PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; - int i; + UINT i; bool bRet = false; Index = block; Modified: trunk/reactos/lib/fslib/ext2lib/Memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Memory.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Memory.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Memory.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -93,8 +93,7 @@ PEXT2_BLOCK_BITMAP bmap) { bool retval; - ULONG group_blk, start_blk, last_blk, new_blk, blk; - int j; + ULONG group_blk, start_blk, last_blk, new_blk, blk, j; group_blk = fs->ext2_sb->s_first_data_block + (group * fs->ext2_sb->s_blocks_per_group); Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -885,7 +885,7 @@ * kludgy hack of using the UUID to derive a random jitter value. */ { - int i, val; + ULONG i, val; for (i = 0, val = 0 ; i < sizeof(Ext2Sb.s_uuid); i++) val += Ext2Sb.s_uuid[i]; Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -40,6 +40,7 @@ #include <sys/utime.h> #include <direct.h> + int *__p__fmode(void); int *__p___mb_cur_max(void); @@ -3323,4 +3324,4 @@ /********************************************************************* * __badioinfo (MSVCRT.@) */ -ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; +ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT, { 0, } }; Modified: trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -7,12 +7,12 @@ size_t mbstowcs (wchar_t *widechar, const char *multibyte, size_t number) { int bytes; - int n = 0; + size_t n = 0; while (n < number) { if ((bytes = mbtowc (widechar, multibyte, MB_LEN_MAX)) < 0) - return -1; + return (size_t) -1; if (bytes == 0) { *widechar = (wchar_t) '\0'; Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -430,7 +430,7 @@ /* pf_integer_conv: prints x to buf, including alternate formats and additional precision digits, but not field characters or the sign */ -static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, +static void pf_integer_conv( char *buf, unsigned int buf_len, pf_flags *flags, LONGLONG x ) { unsigned int base; @@ -679,8 +679,8 @@ * Includes extra bytes: 1 byte for null, 1 byte for sign, 4 bytes for exponent, 2 bytes for alternate formats, 1 byte for a decimal, and 1 byte for an additional float digit. */ - int x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; + unsigned x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10; if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len ); @@ -702,8 +702,8 @@ * Includes extra bytes: 1 byte for null, 1 byte for sign, 4 bytes for exponent, 2 bytes for alternate formats, 1 byte for a decimal, and 1 byte for an additional float digit. */ - int x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; + unsigned x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10; if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len ); Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -245,7 +245,7 @@ PCHAR PartialString = NULL, BiosVersion; CHAR CpuString[48]; PVOID BaseAddress = NULL; - LARGE_INTEGER ViewBase = {{0}}; + LARGE_INTEGER ViewBase = {{0, 0}}; ULONG_PTR VideoRomBase; PCHAR CurrentVersion; extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -844,13 +844,13 @@ case DbgKmExceptionApi: /* Look at the exception code */ - if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) { /* Update this as a breakpoint exception */ WaitStateChange->NewState = DbgBreakpointStateChange; } - else if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + else if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == STATUS_SINGLE_STEP) { /* Update this as a single step exception */ Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -39,7 +39,8 @@ NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - ULONG i, MaxLength; + LONG i; + ULONG MaxLength; if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sun Dec 7 15:52:22 2008 @@ -629,7 +629,7 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { - SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; + SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = { NULL, 0, NULL, NULL }; KPROCESSOR_MODE PreviousMode; PTOKEN Token; NTSTATUS Status;

15 years, 9 months

[dgorbachev] 37918: Remove stray semicolon, change indentation.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 7 15:49:30 2008 New Revision: 37918 URL: http://svn.reactos.org/svn/reactos?rev=37918&view=rev Log: Remove stray semicolon, change indentation. Modified: trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] Sun Dec 7 15:49:30 2008 @@ -70,31 +70,33 @@ InitRadioButtons(HWND hWnd) { HKEY hKey; - - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\Display"), - 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - TCHAR szBuf[64]; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\Display"), + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuf[64]; DWORD dwSize = 64; if (RegQueryValueEx(hKey, _T("DynaSettingsChange"), 0, NULL, - (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS); - - switch (_ttoi(szBuf)) - { - case 0: - SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); - break; - case 1: - SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); - break; - case 3: - SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); - break; - } + (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + switch (_ttoi(szBuf)) + { + case 0: + SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); + break; + case 1: + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); + break; + case 3: + SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); + break; + } + } RegCloseKey(hKey); - } + } } INT_PTR CALLBACK @@ -115,7 +117,7 @@ DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); - InitFontSizeList(hwndDlg); + InitFontSizeList(hwndDlg); InitRadioButtons(hwndDlg); Ret = TRUE;

15 years, 9 months

[dgorbachev] 37917: Add missing parentheses.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 7 15:48:44 2008 New Revision: 37917 URL: http://svn.reactos.org/svn/reactos?rev=37917&view=rev Log: Add missing parentheses. Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Sun Dec 7 15:48:44 2008 @@ -478,7 +478,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) + if (!(This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK)) { DX_STUB_str("DDERR_UNSUPPORTED"); return DDERR_UNSUPPORTED; @@ -539,7 +539,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP)) { return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Sun Dec 7 15:48:44 2008 @@ -260,7 +260,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) { return DDERR_GENERIC; }

15 years, 9 months

[dgorbachev] 37916: Use WC_NO_BEST_FIT_CHARS flag for WideCharToMultiByte(). Bug #3903.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 7 15:46:16 2008 New Revision: 37916 URL: http://svn.reactos.org/svn/reactos?rev=37916&view=rev Log: Use WC_NO_BEST_FIT_CHARS flag for WideCharToMultiByte(). Bug #3903. Modified: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c Modified: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] (original) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] Sun Dec 7 15:46:16 2008 @@ -5,6 +5,8 @@ * PURPOSE: Application for testing the CRT API's (wcstombs and wctomb) and the Win32 API WideCharToMultiByte for the Unicode to MultiByte string conversion * COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> */ + +#define WINVER 0x0500 /* WC_NO_BEST_FIT_CHARS */ #include <windows.h> #include <stdio.h> @@ -200,39 +202,39 @@ puts("Win32-Tests"); puts("-----------"); - ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == -28, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(1252, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == 63, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1251, WC_NO_BEST_FIT_CHARS, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == -16, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1251, WC_NO_BEST_FIT_CHARS, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 1, "ret is %d", ret); OK(mbc == 97, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* This call triggers the last Win32 error */ - ret = WideCharToMultiByte(1252, 0, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); OK(mbc == 84, "mbc is %d", mbc); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); @@ -241,7 +243,7 @@ /* WideCharToMultiByte mustn't add any null character automatically. So in this case, we should get the same string again, even if we only copied the first three bytes. */ - ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 3, "ret is %d", ret); OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); @@ -249,71 +251,71 @@ ZeroMemory(mbs, 5); /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ - ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 3, "ret is %d", ret); OK(!strcmp(mbs, "Th?"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* Double-byte tests */ - ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); OK(!strcmp(mbs, "µH©Ò"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(950, 0, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar == FALSE"); OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); ZeroMemory(mbs, 5); - ret = WideCharToMultiByte(950, 0, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 2, "ret is %d", ret); OK(!strcmp(mbs, "µH"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* Length-only tests */ - ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); - OK(ret == 1, "ret is %d", ret); - if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); - OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - - ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); - OK(ret == 5, "ret is %d", ret); - if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); - OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - - ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); OK(ret == 2, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); - ret = WideCharToMultiByte(950, 0, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(950, WC_NO_BEST_FIT_CHARS, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); /* Abnormal uses of WideCharToMultiByte */ - ret = WideCharToMultiByte(1252, 0, NULL, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, NULL, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(0, 0, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(0, WC_NO_BEST_FIT_CHARS, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); OK(ret == 5, "ret is %d", ret); OK(!strcmp(mbs, "??"), "mbs is %s", mbs); if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); - ret = WideCharToMultiByte(1252, 0, wcs, -1, (LPSTR)wcs, 5, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, (LPSTR)wcs, 5, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, -1, NULL, bUsedDefaultChar); + ret = WideCharToMultiByte(1252, WC_NO_BEST_FIT_CHARS, wcs, -1, mbs, -1, NULL, bUsedDefaultChar); OK(ret == 0, "ret is %d", ret); OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); SetLastError(0xdeadbeef);

15 years, 9 months

[dgoette] 37915: * code cleanup * some bugfixes

by dgoette＠svn.reactos.org

15 years, 9 months

← Newer
1
...
55
56
57
58
59
60
61
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008