Ros-dev

ros-dev@reactos.org

1 participants
5790 discussions

Re: [ros-dev] [ros-diffs] [jgardou] 53547: [VGA_NEW] - fix some warnings

by Alex Ionescu

These changes are wrong :( Please use the correct compiler flag instead (-mrtd) Best regards, Alex Ionescu On Sat, Sep 3, 2011 at 5:09 PM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Sat Sep 3 16:09:34 2011 > New Revision: 53547 > > URL: http://svn.reactos.org/svn/reactos?rev=53547&view=rev > Log: > [VGA_NEW] > - fix some warnings > > Modified: > trunk/reactos/drivers/video/miniport/vga_new/vga.c > > Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… > > ============================================================================== > --- trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Sat Sep > 3 16:09:34 2011 > @@ -19,6 +19,7 @@ > // > > VP_STATUS > +NTAPI > VgaFindAdapter( > PVOID HwDeviceExtension, > PVOID HwContext, > @@ -28,11 +29,13 @@ > ); > > BOOLEAN > +NTAPI > VgaInitialize( > PVOID HwDeviceExtension > ); > > BOOLEAN > +NTAPI > VgaStartIO( > PVOID HwDeviceExtension, > PVIDEO_REQUEST_PACKET RequestPacket > @@ -102,6 +105,7 @@ > ); > > VP_STATUS > +NTAPI > GetDeviceDataCallback( > PVOID HwDeviceExtension, > PVOID Context, > @@ -130,7 +134,6 @@ > #pragma alloc_text(PAGE,VgaSetColorLookup) > #endif > > - > > //--------------------------------------------------------------------------- > ULONG > // eVb: 1.3 [GCC] - Add NTAPI for GCC support > @@ -303,9 +306,10 @@ > return initializationStatus; > > } // end DriverEntry() > - > + > > //--------------------------------------------------------------------------- > VP_STATUS > +NTAPI > VgaFindAdapter( > PVOID HwDeviceExtension, > PVOID HwContext, > @@ -383,7 +387,7 @@ > if ((ConfigInfo->AdapterInterfaceType == Internal) && > (VideoPortGetDeviceData(HwDeviceExtension, > VpControllerData, > - &GetDeviceDataCallback, > + GetDeviceDataCallback, > VgaAccessRange) != NO_ERROR)) > { > return ERROR_INVALID_PARAMETER; > @@ -485,9 +489,10 @@ > > > } // VgaFindAdapter() > - > + > > //--------------------------------------------------------------------------- > BOOLEAN > +NTAPI > VgaInitialize( > PVOID HwDeviceExtension > ) > @@ -527,9 +532,10 @@ > return TRUE; > > } // VgaInitialize() > - > + > > //--------------------------------------------------------------------------- > BOOLEAN > +NTAPI > VgaStartIO( > PVOID HwDeviceExtension, > PVIDEO_REQUEST_PACKET RequestPacket > @@ -1440,8 +1446,9 @@ > return ERROR_INVALID_PARAMETER; > > } // end VgaSetColorLookup() > - > + > VP_STATUS > +NTAPI > GetDeviceDataCallback( > PVOID HwDeviceExtension, > PVOID Context, > > >

13 years, 11 months

Re: [ros-dev] [ros-diffs] [jgardou] 53551: - revert r53547, although setting explicitly something which is default isn't a "wrong change" per se.

by Alex Ionescu

It is when it breaks the easyness to sync this code with it's original source and do diffs, sorry for not being clear. I believe the whole driver was carefully commented in the locations where it differs from the original source, and this would've added extra burden. Best regards, Alex Ionescu On Sat, Sep 3, 2011 at 5:44 PM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Sat Sep 3 16:44:49 2011 > New Revision: 53551 > > URL: http://svn.reactos.org/svn/reactos?rev=53551&view=rev > Log: > - revert r53547, although setting explicitly something which is default > isn't a "wrong change" per se. > > Modified: > trunk/reactos/drivers/video/miniport/vga_new/vga.c > > Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… > > ============================================================================== > --- trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Sat Sep > 3 16:44:49 2011 > @@ -19,7 +19,6 @@ > // > > VP_STATUS > -NTAPI > VgaFindAdapter( > PVOID HwDeviceExtension, > PVOID HwContext, > @@ -29,13 +28,11 @@ > ); > > BOOLEAN > -NTAPI > VgaInitialize( > PVOID HwDeviceExtension > ); > > BOOLEAN > -NTAPI > VgaStartIO( > PVOID HwDeviceExtension, > PVIDEO_REQUEST_PACKET RequestPacket > @@ -105,7 +102,6 @@ > ); > > VP_STATUS > -NTAPI > GetDeviceDataCallback( > PVOID HwDeviceExtension, > PVOID Context, > @@ -134,6 +130,7 @@ > #pragma alloc_text(PAGE,VgaSetColorLookup) > #endif > > + > > //--------------------------------------------------------------------------- > ULONG > // eVb: 1.3 [GCC] - Add NTAPI for GCC support > @@ -306,10 +303,9 @@ > return initializationStatus; > > } // end DriverEntry() > - > + > > //--------------------------------------------------------------------------- > VP_STATUS > -NTAPI > VgaFindAdapter( > PVOID HwDeviceExtension, > PVOID HwContext, > @@ -387,7 +383,7 @@ > if ((ConfigInfo->AdapterInterfaceType == Internal) && > (VideoPortGetDeviceData(HwDeviceExtension, > VpControllerData, > - GetDeviceDataCallback, > + &GetDeviceDataCallback, > VgaAccessRange) != NO_ERROR)) > { > return ERROR_INVALID_PARAMETER; > @@ -489,10 +485,9 @@ > > > } // VgaFindAdapter() > - > + > > //--------------------------------------------------------------------------- > BOOLEAN > -NTAPI > VgaInitialize( > PVOID HwDeviceExtension > ) > @@ -532,10 +527,9 @@ > return TRUE; > > } // VgaInitialize() > - > + > > //--------------------------------------------------------------------------- > BOOLEAN > -NTAPI > VgaStartIO( > PVOID HwDeviceExtension, > PVIDEO_REQUEST_PACKET RequestPacket > @@ -1446,9 +1440,8 @@ > return ERROR_INVALID_PARAMETER; > > } // end VgaSetColorLookup() > - > + > VP_STATUS > -NTAPI > GetDeviceDataCallback( > PVOID HwDeviceExtension, > PVOID Context, > > >

13 years, 11 months

Re: [ros-dev] [ros-diffs] [cmihail] 53543: [shell32.dll] - Fix bug related to correct error code returning in delete_files. The value of 1026 was revealed to be returned by windows 2003 server. Score several passed winetest...

by Jérôme Gardou

Hello Claudiu! I notice some weird tab/spaces modifications here. Regards. Jérôme. Le 03/09/2011 16:20, cmihail(a)svn.reactos.org a écrit : > Author: cmihail > Date: Sat Sep 3 14:20:03 2011 > New Revision: 53543 > > URL: http://svn.reactos.org/svn/reactos?rev=53543&view=rev > Log: > [shell32.dll] > - Fix bug related to correct error code returning in delete_files. The value of 1026 was revealed to be returned by windows 2003 server. Score several passed winetests. > - Fix a bug in ShellLink::SetShowCmd and score one more passed winetest > > Modified: > branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp > branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp > >

13 years, 11 months

Re: [ros-dev] [ros-diffs] [rharabien] 53542: [FREELDR] - Introduce WINE-like debug macros ERR, FIXME, WARN and TRACE - Always show ERR and FIXME information - WARN and TRACE are enabled by DebugPrintMask in debug.c as befor...

by Alex Ionescu

And the bug was...? Best regards, Alex Ionescu On Sat, Sep 3, 2011 at 11:56 AM, <rharabien(a)svn.reactos.org> wrote: > Author: rharabien > Date: Sat Sep 3 10:56:36 2011 > New Revision: 53542 > > URL: http://svn.reactos.org/svn/reactos?rev=53542&view=rev > Log: > [FREELDR] > - Introduce WINE-like debug macros ERR, FIXME, WARN and TRACE > - Always show ERR and FIXME information > - WARN and TRACE are enabled by DebugPrintMask in debug.c as before > - Thanks to new macros find bug in CMake livecd creation and fix it > > Modified: > trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c > trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c > trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c > trunk/reactos/boot/freeldr/freeldr/cache/cache.c > trunk/reactos/boot/freeldr/freeldr/debug.c > trunk/reactos/boot/freeldr/freeldr/disk/disk.c > trunk/reactos/boot/freeldr/freeldr/disk/partition.c > trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c > trunk/reactos/boot/freeldr/freeldr/freeldr.c > trunk/reactos/boot/freeldr/freeldr/fs/ext2.c > trunk/reactos/boot/freeldr/freeldr/fs/fat.c > trunk/reactos/boot/freeldr/freeldr/fs/fs.c > trunk/reactos/boot/freeldr/freeldr/fs/iso.c > trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c > trunk/reactos/boot/freeldr/freeldr/fs/pxe.c > trunk/reactos/boot/freeldr/freeldr/include/debug.h > trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c > trunk/reactos/boot/freeldr/freeldr/inifile/parse.c > trunk/reactos/boot/freeldr/freeldr/linuxboot.c > trunk/reactos/boot/freeldr/freeldr/mm/meminit.c > trunk/reactos/boot/freeldr/freeldr/mm/mm.c > trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c > trunk/reactos/boot/freeldr/freeldr/reactos/registry.c > trunk/reactos/boot/freeldr/freeldr/ui/ui.c > trunk/reactos/boot/freeldr/freeldr/windows/conversion.c > trunk/reactos/boot/freeldr/freeldr/windows/peloader.c > trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c > trunk/reactos/boot/freeldr/freeldr/windows/winldr.c > trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c > trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c > > [This mail would be too long, it was shortened to contain the URLs only.] > > Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > > Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… > > Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… > > Modified: trunk/reactos/boot/freeldr/freeldr/debug.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… > > Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… > > Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… > > Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… > > Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… > > Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… > > Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… > > Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… > > Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… > > Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… > > Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… > > Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… > > Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… > > Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… > > Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… > > Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… > > Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… > > Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… > > Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… > > Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > > >

13 years, 11 months

Re: [ros-dev] [ros-diffs] [cmihail] 53541: [shell32.dll] - Don't do some parameter checks, even if MSDN says they're incompatible. Winetests with windows 2003 server as reference tells us msdn lies. (Spotted by Victor Marti...

by Alex Ionescu

Just because the checks aren't in THIS api doesn't mean MSDN lies. Best regards, Alex Ionescu On Sat, Sep 3, 2011 at 11:55 AM, <cmihail(a)svn.reactos.org> wrote: > Author: cmihail > Date: Sat Sep 3 10:55:51 2011 > New Revision: 53541 > > URL: http://svn.reactos.org/svn/reactos?rev=53541&view=rev > Log: > [shell32.dll] > - Don't do some parameter checks, even if MSDN says they're incompatible. > Winetests with windows 2003 server as reference tells us msdn lies. (Spotted > by Victor Martinez) > > Modified: > branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp > > Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp > URL: > http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… > > ============================================================================== > --- branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp > [iso-8859-1] (original) > +++ branches/shell32_new-bringup/dll/win32/shell32/shell32_main.cpp > [iso-8859-1] Sat Sep 3 10:55:51 2011 > @@ -330,9 +330,6 @@ > (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), > dwFileAttributes, > psfi, psfi->dwAttributes, sizeofpsfi, flags); > > - if ( (flags & SHGFI_USEFILEATTRIBUTES) && > - (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL))) > - return FALSE; > if (!path) > return FALSE; > > > >

13 years, 11 months

Re: [ros-dev] [ros-diffs] [cmihail] 53537: [shell32.dll] [FORMATTING] - Format the code to a more acceptable level. This is just for my sanity while sifting through it.

by Timo Kreuzer

Am 03.09.2011 02:08, schrieb cmihail(a)svn.reactos.org: > Author: cmihail > Date: Sat Sep 3 00:08:11 2011 > New Revision: 53537 > > URL:http://svn.reactos.org/svn/reactos?rev=53537&view=rev > Log: > [shell32.dll] > [FORMATTING] > - Format the code to a more acceptable level. This is just for my sanity while sifting through it. > /* skip the remaining spaces */ > - while (*cs==0x0009 || *cs==0x0020) { > + while (*cs==0x0009 || *cs==0x0020) > + { > cs++; > } > if (*cs==0) > Please don't mix tabs and spaces or we'll end up looking like GNU style ;-) Since the file already uses spaces (as we use almost everywhere), please stick to that here. Regards, Timo

13 years, 11 months

Re: [ros-dev] [ros-diffs] [akhaldi] 53527: [WIN32K] * Remove some useless asserts considering cLockObj is DWORD.

by Alex Ionescu

These asserts are not useless. A DWORD can also underflow (due to a bug), hence the point of these ASSERTs -- the only bug is that the ASSERT should cast to LONG. Best regards, Alex Ionescu On Fri, Sep 2, 2011 at 9:23 AM, <akhaldi(a)svn.reactos.org> wrote: > Author: akhaldi > Date: Fri Sep 2 09:23:20 2011 > New Revision: 53527 > > URL: http://svn.reactos.org/svn/reactos?rev=53527&view=rev > Log: > [WIN32K] > * Remove some useless asserts considering cLockObj is DWORD. > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/menu.c > trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c > trunk/reactos/subsystems/win32/win32k/ntuser/window.c > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri > Sep 2 09:23:20 2011 > @@ -74,7 +74,6 @@ > return NULL; > } > > - ASSERT(Menu->head.cLockObj >= 0); > return Menu; > } > > @@ -137,11 +136,8 @@ > { > PMENU_OBJECT Menu = UserGetMenuObject(hMenu); > if (Menu) > - { > - ASSERT(Menu->head.cLockObj >= 0); > - > Menu->head.cLockObj++; > - } > + > return Menu; > } > > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Fri > Sep 2 09:23:20 2011 > @@ -93,8 +93,6 @@ > return NULL; > } > > - ASSERT(Monitor->head.cLockObj >= 0); > - > return Monitor; > } > > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri > Sep 2 09:23:20 2011 > @@ -61,11 +61,8 @@ > > Window = UserGetWindowObject(hWnd); > if (Window) > - { > - ASSERT(Window->head.cLockObj >= 0); > - > Window->head.cLockObj++; > - } > + > return Window; > } > > @@ -86,8 +83,6 @@ > EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); > return NULL; > } > - > - ASSERT(Window->head.cLockObj >= 0); > > return Window; > } > > >

13 years, 11 months

Re: [ros-dev] [ros-diffs] [dchapyshev] 53516: - Fix typos, found by PVS-Studio

by Thomas Faber

Hey again, On 2011-09-01 15:18, dchapyshev(a)svn.reactos.org wrote: > --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Thu Sep 1 13:18:22 2011 > @@ -179,7 +179,7 @@ > pContext->Status = 3; > } > } > - else if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_UNREACHABLE || MIB_IF_OPER_STATUS_DISCONNECTED) > + else if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_UNREACHABLE | MIB_IF_OPER_STATUS_DISCONNECTED) > { > if (pContext->Status != 4) > { > this should more likely be else if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_UNREACHABLE || IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_DISCONNECTED) Some nice fixes right there by the way. :) *hopes this might fix some evil bugs that have been lurking* ;) Thanks, Tom

13 years, 12 months

Re: [ros-dev] [ros-diffs] [dchapyshev] 53513: - Fix wrong macros usage, found by PVS-Studio

by Thomas Faber

Hi, On 2011-09-01 14:34, dchapyshev(a)svn.reactos.org wrote: > --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Thu Sep 1 12:34:51 2011 > @@ -339,7 +339,7 @@ > } > > /* Set all full ULONGs */ > - RtlFillMemoryUlong(Buffer, NumberToSet >> 3, MAXULONG); > + RtlFillMemoryUlong(Buffer, MAXULONG, NumberToSet >> 3); > Buffer += NumberToSet >> 5; > > /* Set what's left */ > > This is wrong. We don't want to fill 4GB of memory :) Regards, Tom

13 years, 12 months

Re: [ros-dev] [ros-diffs] [jgardou] 53503: [WINETESTS/RPCRT4] Until now, rpcrt4 winetests where badly broken : client calls remotely forwarded to serverside functions which called... client side functions. One has to wonder...

by Aleksey Bragin

This breaks RBUILD-based build. More precisely these lines: +  + <define name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</redefine> it seems to be already defined by something. WBR, Aleksey Bragin. -----Original Message----- From: jgardou(a)svn.reactos.org Sent: Wednesday, August 31, 2011 12:49 AM To: ros-diffs(a)reactos.org Subject: [ros-diffs] [jgardou] 53503: [WINETESTS/RPCRT4] Until now, rpcrt4 winetests where badly broken : client calls remotely forwarded to serverside functions which called... client side functions. One has to wonder... Author: jgardou Date: Tue Aug 30 20:49:31 2011 New Revision: 53503 URL: http://svn.reactos.org/svn/reactos?rev=53503&view=rev Log: [WINETESTS/RPCRT4] Until now, rpcrt4 winetests where badly broken : client calls remotely forwarded to serverside functions which called... client side functions. One has to wonder how testbot survived the operation - Cmake : fix that - rbuild : add a hack keeping the old behaviour, because I don't know how to make this right Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild trunk/rostests/winetests/rpcrt4/server.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Tue Aug 30 20:49:31 2011 @@ -5,9 +5,16 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +if(MSVC) + set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_) +else() + set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_) +endif() add_rpc_files(client server.idl) add_rpc_files(server server.idl) +unset(IDL_FLAGS) list(APPEND SOURCE cstub.c Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Tue Aug 30 20:49:31 2011 @@ -12,6 +12,8 @@ <include root="intermediate" base="rpcrt4_winetest">.</include> <define name="__ROS_LONG64__" /> <redefine name="_WIN32_WINNT">0x0500</redefine> +  + <define name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</redefine> <library>wine</library> <library>pseh</library> <library>ole32</library> Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Tue Aug 30 20:49:31 2011 @@ -1542,12 +1542,12 @@ if (pRpcServerRegisterIfEx) { trace("Using RpcServerRegisterIfEx\n"); - status = pRpcServerRegisterIfEx(IServer_v0_0_s_ifspec, NULL, NULL, + status = pRpcServerRegisterIfEx(s_IServer_v0_0_s_ifspec, NULL, NULL, RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); } else - status = RpcServerRegisterIf(IServer_v0_0_s_ifspec, NULL, NULL); + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); status = RpcServerListen(1, 20, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status);

13 years, 12 months

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-dev