Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[sginsberg] 69240: [FREELDR] Fix a whole bunch of assumptions about default calling convention being cdecl, mostly in code called from/to assembly. Freeldr now links with /Gz (standard calling conv...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 15 11:07:28 2015 New Revision: 69240 URL: http://svn.reactos.org/svn/reactos?rev=69240&view=rev Log: [FREELDR] Fix a whole bunch of assumptions about default calling convention being cdecl, mostly in code called from/to assembly. Freeldr now links with /Gz (standard calling convention as stdcall), which is what this is all about Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/fs/pxe.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.c [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -19,6 +19,7 @@ } void +__cdecl InitIdt(void) { InitIdtVector(0, i386DivideByZero, 0x8e00); Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -26,7 +26,7 @@ /* FUNCTIONS ******************************************************************/ -VOID BootMain(LPSTR CmdLine) +VOID __cdecl BootMain(LPSTR CmdLine) { CmdLineParse(CmdLine); MachInit(CmdLine); Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -84,7 +84,7 @@ return pPxe; } -extern PXENV_EXIT PxeCallApi(UINT16 Segment, UINT16 Offset, UINT16 Service, VOID *Parameter); +extern PXENV_EXIT __cdecl PxeCallApi(UINT16 Segment, UINT16 Offset, UINT16 Service, VOID *Parameter); BOOLEAN CallPxe(UINT16 Service, PVOID Parameter) { PPXE pxe; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -50,23 +50,23 @@ HARDWARE_PTE Pde[1024]; } PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; -void i386DivideByZero(void); -void i386DebugException(void); -void i386NMIException(void); -void i386Breakpoint(void); -void i386Overflow(void); -void i386BoundException(void); -void i386InvalidOpcode(void); -void i386FPUNotAvailable(void); -void i386DoubleFault(void); -void i386CoprocessorSegment(void); -void i386InvalidTSS(void); -void i386SegmentNotPresent(void); -void i386StackException(void); -void i386GeneralProtectionFault(void); -void i386PageFault(void); -void i386CoprocessorError(void); -void i386AlignmentCheck(void); -void i386MachineCheck(void); +void __cdecl i386DivideByZero(void); +void __cdecl i386DebugException(void); +void __cdecl i386NMIException(void); +void __cdecl i386Breakpoint(void); +void __cdecl i386Overflow(void); +void __cdecl i386BoundException(void); +void __cdecl i386InvalidOpcode(void); +void __cdecl i386FPUNotAvailable(void); +void __cdecl i386DoubleFault(void); +void __cdecl i386CoprocessorSegment(void); +void __cdecl i386InvalidTSS(void); +void __cdecl i386SegmentNotPresent(void); +void __cdecl i386StackException(void); +void __cdecl i386GeneralProtectionFault(void); +void __cdecl i386PageFault(void); +void __cdecl i386CoprocessorError(void); +void __cdecl i386AlignmentCheck(void); +void __cdecl i386MachineCheck(void); /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -44,13 +44,13 @@ VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); /* i386pnp.S */ -ULONG_PTR PnpBiosSupported(VOID); -ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, +ULONG_PTR __cdecl PnpBiosSupported(VOID); +ULONG __cdecl PnpBiosGetDeviceNodeCount(ULONG *NodeSize, ULONG *NodeCount); -ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, +ULONG __cdecl PnpBiosGetDeviceNode(UCHAR *NodeId, UCHAR *NodeBuffer); /* i386pxe.S */ -USHORT PxeCallApi(USHORT Segment, USHORT Offset, USHORT Service, VOID* Parameter); +USHORT __cdecl PxeCallApi(USHORT Segment, USHORT Offset, USHORT Service, VOID* Parameter); /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -114,16 +114,16 @@ // Make sure all memory pointers are in SEG:OFFS format and // not linear addresses, unless the interrupt handler // specifically handles linear addresses. -int Int386(int ivec, REGS* in, REGS* out); +int __cdecl Int386(int ivec, REGS* in, REGS* out); // This macro tests the Carry Flag // If CF is set then the call failed (usually) #define INT386_SUCCESS(regs) ((regs.x.eflags & EFLAGS_CF) == 0) void EnableA20(void); -VOID ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S -VOID Reboot(VOID); // Implemented in boot.S -VOID DetectHardware(VOID); // Implemented in hardware.c +VOID __cdecl ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S +VOID __cdecl Reboot(VOID); // Implemented in boot.S +VOID DetectHardware(VOID); // Implemented in hardware.c #endif /* ! __ASM__ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -119,7 +119,7 @@ #include <arch/mips/arcbios.h> #endif -VOID BootMain(LPSTR CmdLine); +VOID __cdecl BootMain(LPSTR CmdLine); VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); VOID RunLoader(VOID); VOID FrLdrCheckCpuCompatiblity(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/linux.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h [iso-8859-1] Tue Sep 15 11:07:28 2015 @@ -128,8 +128,8 @@ } LINUX_SETUPSECTOR, *PLINUX_SETUPSECTOR; #include <poppack.h> -VOID BootNewLinuxKernel(VOID); // Implemented in linux.S -VOID BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S +VOID __cdecl BootNewLinuxKernel(VOID); // Implemented in linux.S +VOID __cdecl BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S VOID LoadAndBootLinux(IN OperatingSystemItem* OperatingSystem,

9 years, 7 months

[sginsberg] 69239: Fix unexpected side-effect of properly defining CDECL for CRT (how is gcc fine with this?)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 15 10:48:39 2015 New Revision: 69239 URL: http://svn.reactos.org/svn/reactos?rev=69239&view=rev Log: Fix unexpected side-effect of properly defining CDECL for CRT (how is gcc fine with this?) Modified: trunk/reactos/lib/sdk/crt/stdlib/errno.c Modified: trunk/reactos/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/errno.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] Tue Sep 15 10:48:39 2015 @@ -16,7 +16,7 @@ /********************************************************************* * _errno (MSVCRT.@) */ -int CDECL *_errno(void) +int* CDECL _errno(void) { return &(msvcrt_get_thread_data()->thread_errno); }

9 years, 7 months

[sginsberg] 69238: Sprinkle cdecl declarations liberally all around to make a bunch of the base components compile (freeldr compiles but does not link yet). Some of these should really be NTAPI, wo...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 15 10:35:49 2015 New Revision: 69238 URL: http://svn.reactos.org/svn/reactos?rev=69238&view=rev Log: Sprinkle cdecl declarations liberally all around to make a bunch of the base components compile (freeldr compiles but does not link yet). Some of these should really be NTAPI, working on that. Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/apic.h trunk/reactos/hal/halx86/apic/tsc.h trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/up/pic.c trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/lib/3rdparty/libwine/debug_ros.c trunk/reactos/lib/sdk/crt/float/isnan.c trunk/reactos/lib/sdk/crt/math/abs.c trunk/reactos/lib/sdk/crt/math/div.c trunk/reactos/lib/sdk/crt/math/rand_nt.c trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c trunk/reactos/lib/sdk/crt/mem/memccpy.c trunk/reactos/lib/sdk/crt/mem/memchr.c trunk/reactos/lib/sdk/crt/mem/memcmp.c trunk/reactos/lib/sdk/crt/mem/memcpy.c trunk/reactos/lib/sdk/crt/mem/memicmp.c trunk/reactos/lib/sdk/crt/mem/memmove.c trunk/reactos/lib/sdk/crt/mem/memset.c trunk/reactos/lib/sdk/crt/precomp.h trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c trunk/reactos/lib/sdk/crt/search/bsearch.c trunk/reactos/lib/sdk/crt/search/lfind.c trunk/reactos/lib/sdk/crt/search/lsearch.c trunk/reactos/lib/sdk/crt/stdlib/qsort.c trunk/reactos/lib/sdk/crt/string/atoi.c trunk/reactos/lib/sdk/crt/string/atoi64.c trunk/reactos/lib/sdk/crt/string/atol.c trunk/reactos/lib/sdk/crt/string/ctype.c trunk/reactos/lib/sdk/crt/string/iswctype.c trunk/reactos/lib/sdk/crt/string/itoa.c trunk/reactos/lib/sdk/crt/string/itow.c trunk/reactos/lib/sdk/crt/string/stricmp.c trunk/reactos/lib/sdk/crt/string/strlwr.c trunk/reactos/lib/sdk/crt/string/strnicmp.c trunk/reactos/lib/sdk/crt/string/strpbrk.c trunk/reactos/lib/sdk/crt/string/strrev.c trunk/reactos/lib/sdk/crt/string/strstr.c trunk/reactos/lib/sdk/crt/string/strtol.c trunk/reactos/lib/sdk/crt/string/strtoull.c trunk/reactos/lib/sdk/crt/string/strupr.c trunk/reactos/lib/sdk/crt/string/strxspn.h trunk/reactos/lib/sdk/crt/string/wcstol.c trunk/reactos/lib/sdk/crt/string/wcstoul.c trunk/reactos/lib/sdk/crt/string/wtoi64.c trunk/reactos/lib/sdk/crt/wstring/wcscoll.c trunk/reactos/lib/sdk/crt/wstring/wcscspn.c trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c trunk/reactos/lib/sdk/crt/wstring/wcslwr.c trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c trunk/reactos/lib/sdk/crt/wstring/wcsspn.c trunk/reactos/lib/sdk/crt/wstring/wcsstr.c trunk/reactos/lib/sdk/crt/wstring/wcsupr.c trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -80,7 +80,7 @@ } // The wctype table is 144 KB, too much for poor freeldr -int iswctype(wint_t wc, wctype_t wctypeFlags) +int __cdecl iswctype(wint_t wc, wctype_t wctypeFlags) { return _isctype((char)wc, wctypeFlags); } Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -16,7 +16,7 @@ #include <debug.h> #include "apic.h" -void HackEoi(void); +void __cdecl HackEoi(void); #ifndef _M_AMD64 #define APIC_LAZY_IRQL Modified: trunk/reactos/hal/halx86/apic/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.h?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -276,5 +276,5 @@ NTAPI ApicInitializeTimer(ULONG Cpu); -VOID ApicSpuriousService(VOID); - +VOID __cdecl ApicSpuriousService(VOID); + Modified: trunk/reactos/hal/halx86/apic/tsc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.h?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsc.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsc.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ #ifndef __ASM__ -void TscCalibrationISR(void); +void __cdecl TscCalibrationISR(void); extern LARGE_INTEGER HalpCpuClockFrequency; VOID NTAPI HalpInitializeTsc(); Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -14,7 +14,7 @@ #include <debug.h> #include <setjmp.h> -void HalpTrap0D(); +void __cdecl HalpTrap0D(); /* GLOBALS ********************************************************************/ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -42,7 +42,7 @@ typedef VOID -(*PHAL_SW_INTERRUPT_HANDLER)( +(__cdecl *PHAL_SW_INTERRUPT_HANDLER)( VOID ); @@ -501,6 +501,7 @@ ); VOID +__cdecl HalpHardwareInterruptLevel( VOID ); @@ -575,9 +576,9 @@ /* pic.c */ VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts); -VOID HalpApcInterrupt(VOID); -VOID HalpDispatchInterrupt(VOID); -VOID HalpDispatchInterrupt2(VOID); +VOID __cdecl HalpApcInterrupt(VOID); +VOID __cdecl HalpDispatchInterrupt(VOID); +VOID __cdecl HalpDispatchInterrupt2(VOID); DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); @@ -586,8 +587,8 @@ /* timer.c */ VOID NTAPI HalpInitializeClock(VOID); -VOID HalpClockInterrupt(VOID); -VOID HalpProfileInterrupt(VOID); +VOID __cdecl HalpClockInterrupt(VOID); +VOID __cdecl HalpProfileInterrupt(VOID); VOID NTAPI @@ -695,7 +696,7 @@ ); VOID -DECLSPEC_NORETURN +__cdecl HalpRealModeStart( VOID ); Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=69… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -330,8 +330,9 @@ #if defined(__GNUC__) #define HalpDelayedHardwareInterrupt(x) \ - VOID HalpHardwareInterrupt##x(VOID); \ + VOID __cdecl HalpHardwareInterrupt##x(VOID); \ VOID \ + __cdecl \ HalpHardwareInterrupt##x(VOID) \ { \ asm volatile ("int $%c0\n"::"i"(PRIMARY_VECTOR_BASE + x)); \ @@ -340,8 +341,9 @@ #elif defined(_MSC_VER) #define HalpDelayedHardwareInterrupt(x) \ - VOID HalpHardwareInterrupt##x(VOID); \ + VOID __cdecl HalpHardwareInterrupt##x(VOID); \ VOID \ + __cdecl \ HalpHardwareInterrupt##x(VOID) \ { \ __asm \ @@ -375,10 +377,10 @@ /* Handlers for pending interrupts */ PHAL_SW_INTERRUPT_HANDLER SWInterruptHandlerTable[20] = { - KiUnexpectedInterrupt, + (PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt, HalpApcInterrupt, HalpDispatchInterrupt2, - KiUnexpectedInterrupt, + (PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt, HalpHardwareInterrupt0, HalpHardwareInterrupt1, HalpHardwareInterrupt2, @@ -1067,6 +1069,7 @@ } VOID +__cdecl HalpHardwareInterruptLevel(VOID) { PKPCR Pcr = KeGetPcr(); @@ -1347,6 +1350,7 @@ } VOID +__cdecl HalpDispatchInterrupt2(VOID) { ULONG PendingIrqlMask, PendingIrql; Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -299,7 +299,7 @@ #pragma intrinsic(__readcr3) //#pragma intrinsic(__readcr4) // HACK: MSVC is broken -unsigned long ___readcr4(void); +unsigned long __cdecl ___readcr4(void); #define __readcr4 ___readcr4 #pragma intrinsic(__readcr8) #pragma intrinsic(__readdr) Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=69… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -2450,6 +2450,7 @@ _In_ size_t _N); int + __cdecl wmemcmp( _In_reads_(_N) const wchar_t *_S1, _In_reads_(_N) const wchar_t *_S2, Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -188,7 +188,9 @@ VOID ); -VOID +DECLSPEC_NORETURN +VOID +__cdecl KiUnexpectedInterrupt( VOID ); Modified: trunk/reactos/lib/3rdparty/libwine/debug_ros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -9,24 +9,24 @@ #include "debug.c" __MINGW_ATTRIB_MALLOC -void *malloc(size_t size) +void * __cdecl malloc(size_t size) { return LocalAlloc(0, size); } -void free(void *ptr) +void __cdecl free(void *ptr) { LocalFree(ptr); } -void *realloc(void *ptr, size_t size) +void * __cdecl realloc(void *ptr, size_t size) { if (ptr == NULL) return malloc(size); return LocalReAlloc(ptr, size, LMEM_MOVEABLE); } __MINGW_ATTRIB_MALLOC -char *_strdup(const char *str) +char * __cdecl _strdup(const char *str) { char *newstr = malloc(strlen(str) + 1); if (newstr) strcpy(newstr, str); Modified: trunk/reactos/lib/sdk/crt/float/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -26,7 +26,7 @@ /* * @implemented */ -int _isnan(double __x) +int CDECL _isnan(double __x) { union { @@ -40,7 +40,7 @@ /* * @implemented */ -int _finite(double __x) +int CDECL _finite(double __x) { union { Modified: trunk/reactos/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -9,6 +9,7 @@ * @implemented */ int +__cdecl abs(int j) { return j<0 ? -j : j; Modified: trunk/reactos/lib/sdk/crt/math/div.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/div.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/div.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/div.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,6 +5,7 @@ * @implemented */ div_t +CDECL div(int num, int denom) { div_t r; Modified: trunk/reactos/lib/sdk/crt/math/rand_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/rand_nt.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/rand_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/rand_nt.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -9,7 +9,7 @@ /* * @implemented */ -int rand(void) +int __cdecl rand(void) { #if defined(__GNUC__) next = next * 0x5deece66dLL + 11; @@ -23,7 +23,7 @@ /* * @implemented */ -void srand(unsigned seed) +void __cdecl srand(unsigned seed) { next = seed; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbstr… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -22,7 +22,7 @@ /* * @implemented */ -size_t _mbstrlen( const char *str ) +size_t __cdecl _mbstrlen( const char *str ) { size_t len = 0; while(*str) Modified: trunk/reactos/lib/sdk/crt/mem/memccpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memccpy.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memccpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memccpy.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -3,6 +3,7 @@ void * +__cdecl _memccpy (void *to, const void *from,int c,size_t count) { char t; Modified: trunk/reactos/lib/sdk/crt/mem/memchr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memchr.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memchr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memchr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ #pragma function(memchr) #endif /* _MSC_VER */ -void* memchr(const void *s, int c, size_t n) +void* __cdecl memchr(const void *s, int c, size_t n) { if (n) { Modified: trunk/reactos/lib/sdk/crt/mem/memcmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcmp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcmp.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -6,7 +6,7 @@ #pragma function(memcmp) #endif -int memcmp(const void *s1, const void *s2, size_t n) +int __cdecl memcmp(const void *s1, const void *s2, size_t n) { if (n != 0) { const unsigned char *p1 = s1, *p2 = s2; Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcpy.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ #endif /* _MSC_VER */ /* NOTE: This code is a duplicate of memmove implementation! */ -void* memcpy(void* dest, const void* src, size_t count) +void* __cdecl memcpy(void* dest, const void* src, size_t count) { char *char_dest = (char *)dest; char *char_src = (char *)src; Modified: trunk/reactos/lib/sdk/crt/mem/memicmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memicmp.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memicmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memicmp.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,6 +5,7 @@ * @implemented */ int +CDECL _memicmp(const void *s1, const void *s2, size_t n) { if (n != 0) Modified: trunk/reactos/lib/sdk/crt/mem/memmove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memmove.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memmove.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memmove.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -1,7 +1,7 @@ #include <string.h> /* NOTE: This code is duplicated in memcpy function */ -void * memmove(void *dest,const void *src,size_t count) +void * __cdecl memmove(void *dest,const void *src,size_t count) { char *char_dest = (char *)dest; char *char_src = (char *)src; Modified: trunk/reactos/lib/sdk/crt/mem/memset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memset.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memset.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ #pragma function(memset) #endif /* _MSC_VER */ -void* memset(void* src, int val, size_t count) +void* __cdecl memset(void* src, int val, size_t count) { char *char_src = (char *)src; Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -36,6 +36,14 @@ #include <winuser.h> #include <ndk/rtlfuncs.h> +// Our headers are pretty messed up +#undef CDECL +#if defined(_M_IX86) +#define CDECL __cdecl +#else +#define CDECL +#endif + #if !defined(_MSC_VER) #include <stdint.h> #endif Modified: trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vscwpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -15,6 +15,7 @@ int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); int +__cdecl _vscwprintf( const wchar_t *format, va_list argptr) Modified: trunk/reactos/lib/sdk/crt/search/bsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/bsearch… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/bsearch.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/bsearch.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,6 +5,7 @@ * @implemented */ void * +__cdecl bsearch(const void *key, const void *base0, size_t nelem, size_t size, int (__cdecl *cmp)(const void *ck, const void *ce)) { Modified: trunk/reactos/lib/sdk/crt/search/lfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lfind.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -4,7 +4,7 @@ /* * @implemented */ -void *_lfind(const void *key, const void *base, unsigned int *nelp, +void * __cdecl _lfind(const void *key, const void *base, unsigned int *nelp, unsigned int width, int (__cdecl *compar)(const void *, const void *)) { char* char_base = (char*)base; Modified: trunk/reactos/lib/sdk/crt/search/lsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lsearch… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ /* * @implemented */ -void *_lsearch(const void *key, void *base, unsigned int *nelp, unsigned int width, +void * __cdecl _lsearch(const void *key, void *base, unsigned int *nelp, unsigned int width, int (__cdecl *compar)(const void *, const void *)) { void *ret_find = _lfind(key,base,nelp,width,compar); Modified: trunk/reactos/lib/sdk/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -49,7 +49,7 @@ * (And there are only three places where this is done). */ -static void +static void __cdecl qst(size_t size, int (__cdecl *compar)(const void*, const void*), char *base, char *max) { char c, *i, *j, *jj; @@ -176,6 +176,7 @@ * @implemented */ void +__cdecl qsort(void *base0, size_t n, size_t size, int (__cdecl *compar)(const void*, const void*)) { char *base = (char *)base0; Modified: trunk/reactos/lib/sdk/crt/string/atoi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atoi.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atoi.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -6,6 +6,7 @@ * @implemented */ int +CDECL _ttoi(const _TCHAR *str) { return (int)_ttoi64(str); Modified: trunk/reactos/lib/sdk/crt/string/atoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi64.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atoi64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atoi64.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -14,6 +14,7 @@ * @implemented */ __int64 +CDECL _atoi64(const char *nptr) { char *s = (char *)nptr; Modified: trunk/reactos/lib/sdk/crt/string/atol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -4,7 +4,7 @@ /* * @implemented */ -long atol(const char *str) +long CDECL atol(const char *str) { return (long)_atoi64(str); } @@ -12,7 +12,7 @@ /* * @unimplemented */ -int _atoldbl(_LDOUBLE *value, char *str) +int CDECL _atoldbl(_LDOUBLE *value, char *str) { /* FIXME needs error checking for huge/small values */ #if 0 Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -628,7 +628,7 @@ /* * @implemented */ -int isalpha(int c) +int __cdecl isalpha(int c) { return(_isctype(c, _ALPHA)); } @@ -636,7 +636,7 @@ /* * @implemented */ -int isalnum(int c) +int __cdecl isalnum(int c) { return(_isctype(c, _ALPHA | _DIGIT)); } @@ -644,7 +644,7 @@ /* * @implemented */ -int iswalnum(wint_t c) +int __cdecl iswalnum(wint_t c) { return iswctype(c, _ALPHA | _DIGIT); } @@ -652,7 +652,7 @@ /* * @implemented */ -int __isascii(int c) +int __cdecl __isascii(int c) { return ((unsigned char)c <= 0x7f); } @@ -660,7 +660,7 @@ /* * @implemented */ -int iswascii(wint_t c) +int __cdecl iswascii(wint_t c) { return __isascii(c); } @@ -668,7 +668,7 @@ /* * @implemented */ -int iscntrl(int c) +int __cdecl iscntrl(int c) { return(_isctype(c, _CONTROL)); } @@ -676,7 +676,7 @@ /* * @implemented */ -int __iscsym(int c) +int __cdecl __iscsym(int c) { return (c < 127 && (isalnum(c) || (c == '_'))); } @@ -684,7 +684,7 @@ /* * @implemented */ -int __iscsymf(int c) +int __cdecl __iscsymf(int c) { return (c < 127 && (isalpha(c) || (c == '_'))); } @@ -692,7 +692,7 @@ /* * @implemented */ -int isdigit(int c) +int __cdecl isdigit(int c) { return(_isctype(c, _DIGIT)); } @@ -700,7 +700,7 @@ /* * @implemented */ -int isgraph(int c) +int __cdecl isgraph(int c) { return (_isctype (c, _PUNCT | _ALPHA | _DIGIT)); } @@ -708,7 +708,7 @@ /* * @implemented */ -int islower(int c) +int __cdecl islower(int c) { return (_isctype (c, _LOWER)); } @@ -716,7 +716,7 @@ /* * @implemented */ -int isprint(int c) +int __cdecl isprint(int c) { return (_isctype (c, _BLANK | _PUNCT | _ALPHA | _DIGIT)); } @@ -724,7 +724,7 @@ /* * @implemented */ -int ispunct(int c) +int __cdecl ispunct(int c) { return (_isctype (c, _PUNCT)); } @@ -732,7 +732,7 @@ /* * @implemented */ -int isspace(int c) +int __cdecl isspace(int c) { return (_isctype (c, _SPACE)); } @@ -740,7 +740,7 @@ /* * @implemented */ -int isupper(int c) +int __cdecl isupper(int c) { return (_isctype (c, _UPPER)); } @@ -748,7 +748,7 @@ /* * @implemented */ -int isxdigit(int c) +int __cdecl isxdigit(int c) { return (_isctype (c, _HEX)); } @@ -757,7 +757,7 @@ /* * @implemented */ -int iswalpha(wint_t c) +int __cdecl iswalpha(wint_t c) { return (iswctype (c, _ALPHA)); } @@ -765,7 +765,7 @@ /* * @implemented */ -int iswcntrl(wint_t c) +int __cdecl iswcntrl(wint_t c) { return iswctype(c, _CONTROL); } @@ -773,7 +773,7 @@ /* * @implemented */ -int iswdigit(wint_t c) +int __cdecl iswdigit(wint_t c) { return (iswctype (c, _DIGIT)); } @@ -781,7 +781,7 @@ /* * @implemented */ -int iswgraph(wint_t c) +int __cdecl iswgraph(wint_t c) { return iswctype(c,_PUNCT | _ALPHA | _DIGIT); } @@ -789,7 +789,7 @@ /* * @implemented */ -int iswprint(wint_t c) +int __cdecl iswprint(wint_t c) { return iswctype((unsigned short)c,_BLANK | _PUNCT | _ALPHA | _DIGIT); } @@ -798,7 +798,7 @@ /* * @implemented */ -int iswpunct(wint_t c) +int __cdecl iswpunct(wint_t c) { return iswctype(c, _PUNCT); } @@ -806,7 +806,7 @@ /* * @implemented */ -int iswlower(wint_t c) +int __cdecl iswlower(wint_t c) { return (iswctype (c, _LOWER)); } @@ -814,7 +814,7 @@ /* * @implemented */ -int iswupper(wint_t c) +int __cdecl iswupper(wint_t c) { return iswctype(c, _UPPER); } @@ -823,7 +823,7 @@ /* * @implemented */ -int iswspace(wint_t c) +int __cdecl iswspace(wint_t c) { return (iswctype (c, _SPACE)); } @@ -831,7 +831,7 @@ /* * @implemented */ -int iswxdigit(wint_t c) +int __cdecl iswxdigit(wint_t c) { return (iswctype (c, _HEX)); } @@ -840,7 +840,7 @@ /* * @implemented */ -int __toascii(int c) +int __cdecl __toascii(int c) { return((unsigned int)(c) & 0x7f); } @@ -848,7 +848,7 @@ /* * @implemented */ -int _tolower(int c) +int __cdecl _tolower(int c) { if (_isctype (c, _UPPER)) return (c - upalpha); @@ -858,7 +858,7 @@ /* * @implemented */ -int _toupper(int c) +int __cdecl _toupper(int c) { if (_isctype (c, _LOWER)) return (c + upalpha); @@ -868,7 +868,7 @@ /* * @implemented */ -int tolower(int c) +int __cdecl tolower(int c) { if (_isctype (c, _UPPER)) return (c - upalpha); @@ -878,7 +878,7 @@ /* * @implemented */ -int toupper(int c) +int __cdecl toupper(int c) { if (_isctype (c, _LOWER)) return (c + upalpha); @@ -888,7 +888,7 @@ /* * @implemented */ -wint_t towlower(wint_t c) +wint_t __cdecl towlower(wint_t c) { if (iswctype (c, _UPPER)) return (c - upalpha); @@ -898,7 +898,7 @@ /* * @implemented */ -wint_t towupper(wint_t c) +wint_t __cdecl towupper(wint_t c) { if (iswctype (c, _LOWER)) return (c + upalpha); Modified: trunk/reactos/lib/sdk/crt/string/iswctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/iswctyp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/iswctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/iswctype.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ /* * @implemented */ -int iswctype(wint_t wc, wctype_t wctypeFlags) +int __cdecl iswctype(wint_t wc, wctype_t wctypeFlags) { return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); } Modified: trunk/reactos/lib/sdk/crt/string/itoa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itoa.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/itoa.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/itoa.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -6,6 +6,7 @@ * @implemented */ char * +CDECL _i64toa(__int64 value, char *string, int radix) { ULONGLONG val; @@ -125,6 +126,7 @@ * @implemented */ char * +CDECL _ui64toa(unsigned __int64 value, char *string, int radix) { char buffer[65]; @@ -199,6 +201,7 @@ * @implemented */ char * +CDECL _itoa(int value, char *string, int radix) { return _ltoa(value, string, radix); @@ -208,6 +211,7 @@ * @implemented */ char * +CDECL _ltoa(long value, char *string, int radix) { unsigned long val; @@ -328,6 +332,7 @@ * @implemented */ char * +CDECL _ultoa(unsigned long value, char *string, int radix) { char buffer[33]; Modified: trunk/reactos/lib/sdk/crt/string/itow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itow.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/itow.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/itow.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,6 +13,7 @@ * @implemented */ wchar_t * +CDECL _i64tow(__int64 value, wchar_t *string, int radix) { ULONGLONG val; @@ -56,6 +57,7 @@ * @implemented */ int +CDECL _i64tow_s(__int64 value, wchar_t *str, size_t size, int radix) { unsigned __int64 val; @@ -136,6 +138,7 @@ * @implemented */ wchar_t * +CDECL _ui64tow(unsigned __int64 value, wchar_t *string, int radix) { WCHAR buffer[65]; @@ -165,6 +168,7 @@ * @implemented */ int +CDECL _ui64tow_s( unsigned __int64 value, wchar_t *str, size_t size, int radix ) { @@ -204,6 +208,7 @@ * @implemented */ wchar_t * +CDECL _itow(int value, wchar_t *string, int radix) { return _ltow(value, string, radix); @@ -213,6 +218,7 @@ * @implemented */ int +CDECL _itow_s(int value, wchar_t *str, size_t size, int radix) { return _ltow_s(value, str, size, radix); @@ -222,6 +228,7 @@ * @implemented */ wchar_t * +CDECL _ltow(long value, wchar_t *string, int radix) { unsigned long val; @@ -265,6 +272,7 @@ * @implemented */ int +CDECL _ltow_s(long value, wchar_t *str, size_t size, int radix) { unsigned long val; @@ -345,6 +353,7 @@ * @implemented */ wchar_t * +CDECL _ultow(unsigned long value, wchar_t *string, int radix) { WCHAR buffer[33]; Modified: trunk/reactos/lib/sdk/crt/string/stricmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/stricmp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/stricmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/stricmp.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -4,6 +4,7 @@ * @implemented */ int +CDECL _stricmp(const char *s1, const char *s2) { while (toupper(*s1) == toupper(*s2)) @@ -20,6 +21,7 @@ * @implemented */ int +CDECL _strcmpi(const char *s1, const char *s2) { return _stricmp(s1,s2); Modified: trunk/reactos/lib/sdk/crt/string/strlwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strlwr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strlwr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strlwr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -4,7 +4,7 @@ /* * @implemented */ -char * _strlwr(char *x) +char * CDECL _strlwr(char *x) { char *y=x; Modified: trunk/reactos/lib/sdk/crt/string/strnicmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strnicm… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strnicmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strnicmp.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -3,7 +3,7 @@ /* * @implemented */ -int _strnicmp(const char *s1, const char *s2, size_t n) +int CDECL _strnicmp(const char *s1, const char *s2, size_t n) { if (n == 0) Modified: trunk/reactos/lib/sdk/crt/string/strpbrk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strpbrk… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strpbrk.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strpbrk.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -4,7 +4,7 @@ #define BIT_SIZE (CHAR_BIT * sizeof(unsigned long) / sizeof(char)) -char* strpbrk(const char *s1, const char *s2) +char* __cdecl strpbrk(const char *s1, const char *s2) { if (*s2 == 0) { Modified: trunk/reactos/lib/sdk/crt/string/strrev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strrev.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strrev.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strrev.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -char * _strrev(char *s) +char * CDECL _strrev(char *s) { char a, *b, *e; b=e=s; Modified: trunk/reactos/lib/sdk/crt/string/strstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strstr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strstr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strstr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,6 +13,7 @@ * @implemented */ char * +CDECL strstr(const char *s, const char *find) { char c, sc; Modified: trunk/reactos/lib/sdk/crt/string/strtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -4,6 +4,7 @@ * @implemented */ long +CDECL strtol(const char *nptr, char **endptr, int base) { const char *s = nptr; Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -1,6 +1,7 @@ #include <precomp.h> unsigned long long +CDECL strtoull(const char *nptr, char **endptr, int base) { const char *s = nptr; Modified: trunk/reactos/lib/sdk/crt/string/strupr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strupr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strupr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strupr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -char *_strupr(char *x) +char * CDECL _strupr(char *x) { char *y=x; Modified: trunk/reactos/lib/sdk/crt/string/strxspn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strxspn… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strxspn.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strxspn.h [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -2,7 +2,7 @@ #include <limits.h> #include <string.h> -size_t _strxspn(const char *s1, const char *s2) +size_t __cdecl _strxspn(const char *s1, const char *s2) { unsigned char char_map[1 << CHAR_BIT * sizeof(char)]; const unsigned char * us2 = (const unsigned char *)s2; Modified: trunk/reactos/lib/sdk/crt/string/wcstol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstol.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,6 +13,7 @@ * @implemented */ long +CDECL wcstol(const wchar_t *nptr, wchar_t **endptr, int base) { const wchar_t *s = nptr; Modified: trunk/reactos/lib/sdk/crt/string/wcstoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstoul.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstoul.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -10,6 +10,7 @@ * @implemented */ unsigned long +CDECL wcstoul(const wchar_t *nptr, wchar_t **endptr, int base) { const wchar_t *s = nptr; Modified: trunk/reactos/lib/sdk/crt/string/wtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtoi64.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wtoi64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wtoi64.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -14,6 +14,7 @@ * @implemented */ __int64 +CDECL _wtoi64 (const wchar_t *nptr) { int c; @@ -50,6 +51,7 @@ * @unimplemented */ __int64 +CDECL _wcstoi64 (const wchar_t *nptr, wchar_t **endptr, int base) { TRACE("_wcstoi64 is UNIMPLEMENTED\n"); @@ -60,6 +62,7 @@ * @unimplemented */ unsigned __int64 +CDECL _wcstoui64 (const wchar_t *nptr, wchar_t **endptr, int base) { TRACE("_wcstoui64 is UNIMPLEMENTED\n"); Modified: trunk/reactos/lib/sdk/crt/wstring/wcscoll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcscol… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcscoll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcscoll.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @unimplemented */ -int _wcsncoll (const wchar_t *s1, const wchar_t *s2, size_t c) +int CDECL _wcsncoll (const wchar_t *s1, const wchar_t *s2, size_t c) { /* FIXME: handle collates */ return wcsncmp(s1,s2,c); @@ -22,7 +22,7 @@ /* * @unimplemented */ -int _wcsnicoll (const wchar_t *s1, const wchar_t *s2, size_t c) +int CDECL _wcsnicoll (const wchar_t *s1, const wchar_t *s2, size_t c) { /* FIXME: handle collates */ return _wcsnicmp(s1,s2,c); Modified: trunk/reactos/lib/sdk/crt/wstring/wcscspn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcscsp… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcscspn.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcscspn.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -size_t wcscspn(const wchar_t *str,const wchar_t *reject) +size_t CDECL wcscspn(const wchar_t *str,const wchar_t *reject) { wchar_t *s; wchar_t *t; Modified: trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsicm… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -5,7 +5,7 @@ /* * @implemented */ -int _wcsicmp(const wchar_t* cs,const wchar_t * ct) +int CDECL _wcsicmp(const wchar_t* cs,const wchar_t * ct) { while (towlower(*cs) == towlower(*ct)) { Modified: trunk/reactos/lib/sdk/crt/wstring/wcslwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcslwr… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcslwr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcslwr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -wchar_t * _wcslwr(wchar_t *x) +wchar_t * CDECL _wcslwr(wchar_t *x) { wchar_t *y=x; Modified: trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsnic… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -int _wcsnicmp (const wchar_t *cs, const wchar_t *ct, size_t count) +int CDECL _wcsnicmp (const wchar_t *cs, const wchar_t *ct, size_t count) { if (count == 0) return 0; Modified: trunk/reactos/lib/sdk/crt/wstring/wcsspn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsspn… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsspn.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsspn.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -size_t wcsspn(const wchar_t *str,const wchar_t *accept) +size_t CDECL wcsspn(const wchar_t *str,const wchar_t *accept) { wchar_t *s; wchar_t *t; Modified: trunk/reactos/lib/sdk/crt/wstring/wcsstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsstr… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsstr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsstr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -wchar_t *wcsstr(const wchar_t *s,const wchar_t *b) +wchar_t * CDECL wcsstr(const wchar_t *s,const wchar_t *b) { wchar_t *x; wchar_t *y; Modified: trunk/reactos/lib/sdk/crt/wstring/wcsupr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsupr… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsupr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsupr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -wchar_t *_wcsupr(wchar_t *x) +wchar_t * CDECL _wcsupr(wchar_t *x) { wchar_t *y = x; Modified: trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsxfr… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -13,7 +13,7 @@ /* * @implemented */ -size_t wcsxfrm(wchar_t *dst,const wchar_t *src, size_t n) +size_t CDECL wcsxfrm(wchar_t *dst,const wchar_t *src, size_t n) { size_t r = 0; int c; Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -148,7 +148,9 @@ KiEoiHelper(TrapFrame); } -VOID +DECLSPEC_NORETURN +VOID +__cdecl KiUnexpectedInterrupt(VOID) { /* Crash the machine */ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Sep 15 10:35:49 2015 @@ -12,8 +12,8 @@ #define NDEBUG #include <debug.h> -VOID KiFastCallEntry(VOID); -VOID KiFastCallEntryWithSingleStep(VOID); +VOID __cdecl KiFastCallEntry(VOID); +VOID __cdecl KiFastCallEntryWithSingleStep(VOID); extern PVOID FrRestore; VOID FASTCALL Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea);

9 years, 7 months

[rnaumann] 69237: [SHELL32] Add missing icons. Patch by Jared Smudde CORE-9938

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Sep 15 10:28:01 2015 New Revision: 69237 URL: http://svn.reactos.org/svn/reactos?rev=69237&view=rev Log: [SHELL32] Add missing icons. Patch by Jared Smudde CORE-9938 Added: trunk/reactos/dll/win32/shell32/res/icons/1002.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1003.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1005.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1006.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1007.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/133.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/142.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/143.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/144.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/145.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/146.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/147.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/148.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/171.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/176.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/177.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/178.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/179.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/180.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/181.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/193.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/194.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/200.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/223.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/227.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/229.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/231.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/232.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/234.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/241.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/243.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/244.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/247.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/251.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/253.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/256.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/258.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/259.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/26.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/260.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/261.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/262.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/264.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/266.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/267.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/27.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/272.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/273.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/274.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/275.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/276.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/278.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/282.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/283.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/284.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/300.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/301.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/31.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/310.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/311.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/314.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/316.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/320.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/321.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/331.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/337.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/338.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/34.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/42.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/43.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Tue Sep 15 10:28:01 2015 @@ -23,13 +23,15 @@ IDI_SHELL_SEARCH ICON "res/icons/23.ico" IDI_SHELL_HELP ICON "res/icons/24.ico" IDI_SHELL_RUN ICON "res/icons/25.ico" -26 ICON "res/icons/1.ico" -27 ICON "res/icons/1.ico" +IDI_SHELL_SLEEP ICON "res/icons/26.ico" +IDI_SHELL_HARDWARE_REMOVE ICON "res/icons/27.ico" IDI_SHELL_SHUTDOWN ICON "res/icons/28.ico" IDI_SHELL_SHARE ICON "res/icons/29.ico" IDI_SHELL_SHORTCUT ICON "res/icons/30.ico" +IDI_SHELL_FOLDER_WAIT ICON "res/icons/31.ico" IDI_SHELL_EMPTY_RECYCLE_BIN ICON "res/icons/32.ico" IDI_SHELL_FULL_RECYCLE_BIN ICON "res/icons/33.ico" +IDI_SHELL_DIALUP_FOLDER ICON "res/icons/34.ico" IDI_SHELL_DESKTOP ICON "res/icons/35.ico" IDI_SHELL_CONTROL_PANEL2 ICON "res/icons/36.ico" IDI_SHELL_PROGRAMS_FOLDER2 ICON "res/icons/37.ico" @@ -37,12 +39,15 @@ IDI_SHELL_FONTS_FOLDER ICON "res/icons/39.ico" IDI_SHELL_TSKBAR_STARTMENU ICON "res/icons/40.ico" IDI_SHELL_CD_MUSIC ICON "res/icons/41.ico" +IDI_SHELL_TREE ICON "res/icons/42.ico" +IDI_SHELL_COMPUTER_FOLDER ICON "res/icons/43.ico" IDI_SHELL_FAVORITES ICON "res/icons/44.ico" IDI_SHELL_LOGOFF ICON "res/icons/45.ico" IDI_SHELL_EXPLORER ICON "res/icons/46.ico" IDI_SHELL_UPDATE ICON "res/icons/47.ico" IDI_SHELL_LOCKED ICON "res/icons/48.ico" IDI_SHELL_NOT_CONNECTED_HDD ICON "res/icons/54.ico" +IDI_SHELL_MULTIPLE_FILES ICON "res/icons/133.ico" IDI_SHELL_FIND_IN_FILE ICON "res/icons/134.ico" IDI_SHELL_OPEN_WITH ICON "res/icons/135.ico" IDI_SHELL_CONTROL_PANEL3 ICON "res/icons/137.ico" @@ -50,8 +55,13 @@ IDI_SHELL_PRINTER_ADD ICON "res/icons/139.ico" IDI_SHELL_NET_PRINTER ICON "res/icons/140.ico" IDI_SHELL_FILE_PRINTER ICON "res/icons/141.ico" -IDI_SHELL_TRASH_FILE ICON "res/icons/33.ico" //142 -/* TODO 143.ico, 144,ico, 145.ico, 146.ico, 147.ico, 148.ico */ +IDI_SHELL_TRASH_FILE ICON "res/icons/142.ico" +IDI_SHELL_TRASH_FOLDER ICON "res/icons/143.ico" +IDI_SHELL_TRASH_FILE_FOLDER ICON "res/icons/144.ico" +IDI_SHELL_FILE_COPY_DELTE ICON "res/icons/145.ico" +IDI_SHELL_FOLDER_MOVE1 ICON "res/icons/146.ico" +IDI_SHELL_FOLDER_RENAME ICON "res/icons/147.ico" +IDI_SHELL_SETTINGS_FOLDER ICON "res/icons/148.ico" IDI_SHELL_INF_FILE ICON "res/icons/151.ico" IDI_SHELL_TEXT_FILE ICON "res/icons/152.ico" IDI_SHELL_BAT_FILE ICON "res/icons/153.ico" @@ -67,12 +77,17 @@ IDI_SHELL_PRINTER_OK ICON "res/icons/168.ico" IDI_SHELL_NET_PRINTER_OK ICON "res/icons/169.ico" IDI_SHELL_FILE_PRINTER_OK ICON "res/icons/170.ico" -/* TODO: 171.ico */ +IDI_SHELL_CHART ICON "res/icons/171.ico" IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/174.ico" IDI_SHELL_NETWORK_CONNECTIONS ICON "res/icons/175.ico" -/* TODO: 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +IDI_SHELL_NETWORK_CHART ICON "res/icons/176.ico" +IDI_SHELL_VIEW_SETTINGS ICON "res/icons/177.ico" +IDI_SHELL_INTERNET_CHART ICON "res/icons/178.ico" +IDI_SHELL_COMPUTER_SYNC ICON "res/icons/179.ico" +IDI_SHELL_COMPUTER_WINDOW ICON "res/icons/180.ico" +IDI_SHELL_COMPUTER_DESKTOP ICON "res/icons/181.ico" /* Folder Options, General dialog */ IDI_SHELL_SHOW_COMMON_TASKS ICON "res/icons/182.ico" @@ -82,60 +97,77 @@ IDI_SHELL_SINGLE_CLICK_TO_OPEN ICON "res/icons/186.ico" IDI_SHELL_DOUBLE_CLICK_TO_OPEN ICON "res/icons/187.ico" -/* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN1 ICON "res/icons/191.ico" IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico" - +IDI_SHELL_WEB_FOLDERS ICON "res/icons/193.ico" +IDI_SHELL_SECURITY ICON "res/icons/194.ico" +/* TODO: 196.ico, 197.ico, 198.ico, 199.ico */ +IDI_SHELL_NO ICON "res/icons/200.ico" IDI_SHELL_FOLDER_OPTIONS ICON "res/icons/210.ico" IDI_SHELL_USERS2 ICON "res/icons/220.ico" IDI_SHELL_TURN_OFF ICON "res/icons/221.ico" -/* TODO: 223.ico */ +IDI_SHELL_PAGES ICON "res/icons/223.ico" IDI_SHELL_DVD_ROM ICON "res/icons/222.ico" IDI_SHELL_MOVIE_FILE ICON "res/icons/224.ico" IDI_SHELL_MUSIC_FILE ICON "res/icons/225.ico" IDI_SHELL_PICTURE_FILE ICON "res/icons/226.ico" -/* TODO: 227.ico */ +IDI_SHELL_MULTIMEDIA_FILE ICON "res/icons/227.ico" IDI_SHELL_CD_MUSIC2 ICON "res/icons/228.ico" -/* TODO: 229.ico */ +IDI_SHELL_MOUSE ICON "res/icons/229.ico" IDI_SHELL_ZIP_DRIVE2 ICON "res/icons/312.ico" //230 -/* TODO: 231.ico, 232.ico */ +IDI_SHELL_ARROWN_DOWN ICON "res/icons/231.ico" +IDI_SHELL_ARROWN_DOWN1 ICON "res/icons/232.ico" IDI_SHELL_FDD ICON "res/icons/233.ico" -/* TODO: 234.ico */ +IDI_SHELL_NO_DRIVE ICON "res/icons/234.ico" IDI_SHELL_MY_DOCUMENTS ICON "res/icons/235.ico" IDI_SHELL_MY_PICTURES ICON "res/icons/236.ico" IDI_SHELL_MY_MUSIC ICON "res/icons/237.ico" IDI_SHELL_MY_MOVIES ICON "res/icons/238.ico" IDI_SHELL_WEB_BROWSER2 ICON "res/icons/512.ico" //239 IDI_SHELL_FULL_RECYCLE_BIN2 ICON "res/icons/240.ico" -/* TODO: 241.ico */ +IDI_SHELL_FILE_MOVE ICON "res/icons/241.ico" IDI_SHELL_RENAME ICON "res/icons/242.ico" -/* TODO: 243.ico, 244.ico */ +IDI_SHELL_FILES ICON "res/icons/243.ico" +IDI_SHELL_MOVE_INTERNET ICON "res/icons/244.ico" IDI_SHELL_PRINTER3 ICON "res/icons/245.ico" IDI_SHELL_ICON_246 ICON "res/icons/246.ico" -/* TODO: 247.ico */ +IDI_SHELL_WEB_MUSIC ICON "res/icons/247.ico" IDI_SHELL_CAMERA ICON "res/icons/248.ico" IDI_SHELL_SLIDE_SHOW ICON "res/icons/249.ico" IDI_SHELL_DISPLAY ICON "res/icons/250.ico" -/* TODO: 251.ico */ +IDI_SHELL_WEB_PICS ICON "res/icons/251.ico" IDI_SHELL_PRINT_PICS ICON "res/icons/252.ico" -/* TODO: 253.ico */ +IDI_SHELL_FILE_CHECK ICON "res/icons/253.ico" IDI_SHELL_EMPTY_RECYCLE_BIN3 ICON "res/icons/254.ico" IDI_SHELL_ICON_255 ICON "res/icons/255.ico" +IDI_SHELL_FOLDER_MOVE2 ICON "res/icons/256.ico" IDI_SHELL_NETWORK_CONNECTIONS2 ICON "res/icons/257.ico" -/* TODO: 256.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ +IDI_SHELL_NEW_NETWORK_FOLDER ICON "res/icons/258.ico" +IDI_SHELL_NETWORK_HOME ICON "res/icons/259.ico" +IDI_SHELL_CD_EDIT ICON "res/icons/260.ico" +IDI_SHELL_CD_ERASE ICON "res/icons/261.ico" +IDI_SHELL_CD_DELETE ICON "res/icons/262.ico" IDI_SHELL_HELP1 ICON "res/icons/263.ico" -/* TODO: 264.ico */ +IDI_SHELL_FOLDER_POINT ICON "res/icons/264.ico" IDI_SHELL_SENDMAIL ICON "res/icons/265.ico" -/* TODO: 266.ico, 267.ico */ +IDI_SHELL_CD_POINT ICON "res/icons/266.ico" +IDI_SHELL_SHARED_FOLDER ICON "res/icons/267.ico" IDI_SHELL_ACCESSABILITY ICON "res/icons/268.ico" IDI_SHELL_USERS ICON "res/icons/269.ico" IDI_SHELL_SCREEN_COLORS ICON "res/icons/270.ico" IDI_SHELL_ADD_REM_PROGRAMS ICON "res/icons/271.ico" -/* TODO: 272.ico, 273.ico, 274.ico, 275.ico, 276.ico */ +IDI_SHELL_PRINTER_MOUSE ICON "res/icons/272.ico" +IDI_SHELL_INTERNET_STATUS ICON "res/icons/273.ico" +IDI_SHELL_SYSTEM_GEAR ICON "res/icons/274.ico" +IDI_SHELL_PIE_CHART ICON "res/icons/275.ico" +IDI_SHELL_INTERNET_DATE ICON "res/icons/276.ico" IDI_SHELL_TUNES ICON "res/icons/277.ico" -/* TODO: 278.ico */ +IDI_SHELL_CMD ICON "res/icons/278.ico" IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico" -/* TODO: 280.ico, 281.ico, 282.ico, 283.ico, 284.ico */ +//IDI_SHELL_WINDOWS_SEARCH ICON "res/icons/281.ico" +IDI_SHELL_COMPUTER_TEXT ICON "res/icons/282.ico" +IDI_SHELL_OSK ICON "res/icons/283.ico" +IDI_SHELL_ICON_284 ICON "res/icons/284.ico" IDI_SHELL_HELP_FILE ICON "res/icons/289.ico" IDI_SHELL_GO ICON "res/icons/290.ico" IDI_SHELL_DVD_DRIVE ICON "res/icons/291.ico" @@ -147,7 +179,8 @@ IDI_SHELL_DVD_RAM ICON "res/icons/297.ico" IDI_SHELL_DVDR_ROM ICON "res/icons/298.ico" IDI_SHELL_MP3_PLAYER ICON "res/icons/299.ico" -/* TODO: 300.ico, 301.ico */ +IDI_SHELL_SERVER ICON "res/icons/300.ico" +IDI_SHELL_SERVER1 ICON "res/icons/301.ico" IDI_SHELL_CD_ROM1 ICON "res/icons/302.ico" /* TODO: 303.ico */ IDI_SHELL_DVD_ROM1 ICON "res/icons/304.ico" @@ -155,16 +188,18 @@ /* TODO: 306.ico, 307.ico */ IDI_SHELL_SMART_MEDIA ICON "res/icons/308.ico" IDI_SHELL_CAMERA1 ICON "res/icons/309.ico" -/* TODO: 310.ico, 311.ico */ +IDI_SHELL_PHONE ICON "res/icons/310.ico" +IDI_SHELL_WEB_PRINTER ICON "res/icons/311.ico" IDI_SHELL_JAZ_DRIVE ICON "res/icons/312.ico" IDI_SHELL_ZIP_DRIVE ICON "res/icons/313.ico" -/* TODO: 314.ico */ +IDI_SHELL_PDA ICON "res/icons/314.ico" IDI_SHELL_SCANNER ICON "res/icons/315.ico" -/* TODO: 316.ico */ +IDI_SHELL_IMAGING_DEVICES ICON "res/icons/316.ico" IDI_SHELL_CAMCORDER ICON "res/icons/317.ico" IDI_SHELL_DVDRW_ROM ICON "res/icons/318.ico" IDI_SHELL_NEW_FOLDER ICON "res/icons/319.ico" -/* TODO: 320.ico, 321.ico */ +IDI_SHELL_CD_POINT1 ICON "res/icons/320.ico" +IDI_SHELL_CONTROL_PANEL4 ICON "res/icons/321.ico" IDI_SHELL_FAVOTITES ICON "res/icons/322.ico" IDI_SHELL_SEARCH1 ICON "res/icons/323.ico" IDI_SHELL_HELP2 ICON "res/icons/324.ico" @@ -174,13 +209,18 @@ IDI_SHELL_RUN1 ICON "res/icons/328.ico" IDI_SHELL_SHUTDOWN1 ICON "res/icons/329.ico" IDI_SHELL_CONTROL_PANEL1 ICON "res/icons/330.ico" -/* TODO: 331.ico, 337.ico, 338.ico */ +IDI_SHELL_DISCONNECT ICON "res/icons/331.ico" +IDI_SHELL_SEARCH_DIRECTORY ICON "res/icons/337.ico" +IDI_SHELL_DELETE_PERMANENTLY ICON "res/icons/338.ico" IDI_SHELL_WEB_BROWSER ICON "res/icons/512.ico" IDI_SHELL_IDEA ICON "res/icons/1001.ico" -IDI_SHELL_PRINTER_OK2 ICON "res/icons/168.ico" //1002 -/* TODO: 1002.ico, 1003.ico */ +IDI_SHELL_PRINTER_OK2 ICON "res/icons/1002.ico" +IDI_SHELL_SERVER_OK ICON "res/icons/1003.ico" IDI_SHELL_HELP_FILE1 ICON "res/icons/1004.ico" -/* TODO: 1005.ico, 1006.ico, 1007.ico, 1008.ico, 1009.ico, 1010.ico, 1011.ico */ +IDI_SHELL_FILE_MOVE1 ICON "res/icons/1005.ico" +IDI_SHELL_FILE_PRINT ICON "res/icons/1006.ico" +IDI_SHELL_FILE_OK ICON "res/icons/1007.ico" +/* TODO: 1008.ico, 1009.ico, 1010.ico, 1011.ico */ IDI_SHELL_SHUTDOWN2 ICON "res/icons/8240.ico" IDI_SHELL_DELETE1 ICON "res/icons/16710.ico" IDI_SHELL_DELETE2 ICON "res/icons/16715.ico" Added: trunk/reactos/dll/win32/shell32/res/icons/1002.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1002.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1003.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1003.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1005.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1005.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1006.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1006.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1007.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1007.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/133.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/133.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/142.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/142.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/143.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/143.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/144.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/144.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/145.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/145.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/146.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/146.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/147.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/147.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/148.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/148.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/171.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/171.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/176.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/176.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/177.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/177.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/178.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/178.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/179.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/179.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/180.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/180.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/181.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/181.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/193.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/193.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/194.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/194.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/200.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/200.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/223.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/223.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/227.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/227.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/229.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/229.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/231.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/231.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/232.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/232.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/234.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/234.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/241.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/241.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/243.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/243.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/244.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/244.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/247.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/247.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/251.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/251.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/253.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/253.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/256.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/256.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/258.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/258.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/259.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/259.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/26.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/26.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/260.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/260.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/261.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/261.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/262.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/262.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/264.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/264.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/266.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/266.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/267.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/267.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/27.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/27.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/272.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/272.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/273.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/273.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/274.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/274.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/275.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/275.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/276.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/276.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/278.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/278.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/282.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/282.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/283.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/283.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/284.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/284.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/300.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/300.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/301.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/301.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/31.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/31.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/310.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/310.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/311.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/311.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/314.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/314.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/316.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/316.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/320.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/320.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/321.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/321.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/331.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/331.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/337.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/337.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/338.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/338.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/34.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/34.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/42.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/42.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/43.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/43.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Tue Sep 15 10:28:01 2015 @@ -335,14 +335,15 @@ #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 #define IDI_SHELL_RUN 25 -/* TODO: 26.ico, 27.ico */ +#define IDI_SHELL_SLEEP 26 +#define IDI_SHELL_HARDWARE_REMOVE 27 #define IDI_SHELL_SHUTDOWN 28 #define IDI_SHELL_SHARE 29 #define IDI_SHELL_SHORTCUT 30 -#define IDI_SHELL_FOLDER_OPEN_SMALL 31 /* ??? */ +#define IDI_SHELL_FOLDER_WAIT 31 #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 #define IDI_SHELL_FULL_RECYCLE_BIN 33 -/* TODO: 34.ico */ +#define IDI_SHELL_DIALUP_FOLDER 34 #define IDI_SHELL_DESKTOP 35 #define IDI_SHELL_CONTROL_PANEL2 36 #define IDI_SHELL_PROGRAMS_FOLDER2 37 @@ -350,14 +351,15 @@ #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_TSKBAR_STARTMENU 40 #define IDI_SHELL_CD_MUSIC 41 -/* TODO: 42.ico, 43.ico */ +#define IDI_SHELL_TREE 42 +#define IDI_SHELL_COMPUTER_FOLDER 43 #define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_LOGOFF 45 #define IDI_SHELL_EXPLORER 46 #define IDI_SHELL_UPDATE 47 #define IDI_SHELL_LOCKED 48 #define IDI_SHELL_NOT_CONNECTED_HDD 54 -/* TODO: 133.ico */ +#define IDI_SHELL_MULTIPLE_FILES 133 #define IDI_SHELL_FIND_IN_FILE 134 #define IDI_SHELL_OPEN_WITH 135 #define IDI_SHELL_CONTROL_PANEL3 137 @@ -366,7 +368,12 @@ #define IDI_SHELL_NET_PRINTER 140 #define IDI_SHELL_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 -/* TODO: 143.ico, 144,ico, 145.ico, 146.ico, 147.ico, 148.ico */ +#define IDI_SHELL_TRASH_FOLDER 143 +#define IDI_SHELL_TRASH_FILE_FOLDER 144 +#define IDI_SHELL_FILE_COPY_DELTE 145 +#define IDI_SHELL_FOLDER_MOVE1 146 +#define IDI_SHELL_FOLDER_RENAME 147 +#define IDI_SHELL_SETTINGS_FOLDER 148 #define IDI_SHELL_INF_FILE 151 #define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_BAT_FILE 153 @@ -382,66 +389,98 @@ #define IDI_SHELL_PRINTER_OK 168 #define IDI_SHELL_NET_PRINTER_OK 169 #define IDI_SHELL_FILE_PRINTER_OK 170 -/* TODO: 171.ico */ +#define IDI_SHELL_CHART 171 #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES2 173 #define IDI_SHELL_EXTENDED_PROPERTIES 174 #define IDI_SHELL_NETWORK_CONNECTIONS 175 - -/* TODO: 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +#define IDI_SHELL_NETWORK_CHART 176 +#define IDI_SHELL_VIEW_SETTINGS 177 +#define IDI_SHELL_INTERNET_CHART 178 +#define IDI_SHELL_COMPUTER_SYNC 179 +#define IDI_SHELL_COMPUTER_WINDOW 180 +#define IDI_SHELL_COMPUTER_DESKTOP 181 + +/* Folder Options, General dialog */ +#define IDI_SHELL_SHOW_COMMON_TASKS 182 +#define IDI_SHELL_CLASSIC_FOLDERS 183 +#define IDI_SHELL_OPEN_IN_SOME_WINDOW 184 +#define IDI_SHELL_OPEN_IN_NEW_WINDOW 185 +#define IDI_SHELL_SINGLE_CLICK_TO_OPEN 186 +#define IDI_SHELL_DOUBLE_CLICK_TO_OPEN 187 + #define IDI_SHELL_EMPTY_RECYCLE_BIN1 191 #define IDI_SHELL_FULL_RECYCLE_BIN1 192 -/* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ +#define IDI_SHELL_WEB_FOLDERS 193 +#define IDI_SHELL_SECURITY 194 +/* TODO: 196.ico, 197.ico, 198.ico, 199.ico */ +#define IDI_SHELL_NO 200 #define IDI_SHELL_FOLDER_OPTIONS 210 #define IDI_SHELL_USERS2 220 #define IDI_SHELL_TURN_OFF 221 #define IDI_SHELL_DVD_ROM 222 -/* TODO: 223.ico */ +#define IDI_SHELL_PAGES 223 #define IDI_SHELL_MOVIE_FILE 224 #define IDI_SHELL_MUSIC_FILE 225 #define IDI_SHELL_PICTURE_FILE 226 -/* TODO: 227.ico */ +#define IDI_SHELL_MULTIMEDIA_FILE 227 #define IDI_SHELL_CD_MUSIC2 228 -/* TODO: 229.ico */ +#define IDI_SHELL_MOUSE 229 #define IDI_SHELL_ZIP_DRIVE2 230 -/* TODO: 231.ico, 232.ico */ +#define IDI_SHELL_ARROWN_DOWN 231 +#define IDI_SHELL_ARROWN_DOWN1 232 #define IDI_SHELL_FDD 233 -/* TODO: 234.ico */ +#define IDI_SHELL_NO_DRIVE 234 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 #define IDI_SHELL_MY_MOVIES 238 #define IDI_SHELL_WEB_BROWSER2 239 #define IDI_SHELL_FULL_RECYCLE_BIN2 240 -/* TODO: 241.ico */ -#define IDI_SHELL_RENAME 242 -/* TODO: 243.ico, 244.ico */ +#define IDI_SHELL_FILE_MOVE 241 +#define IDI_SHELL_RENAME 242 +#define IDI_SHELL_FILES 243 +#define IDI_SHELL_MOVE_INTERNET 244 #define IDI_SHELL_PRINTER3 245 #define IDI_SHELL_ICON_246 246 -/* TODO: 247.ico */ +#define IDI_SHELL_WEB_MUSIC 247 #define IDI_SHELL_CAMERA 248 #define IDI_SHELL_SLIDE_SHOW 249 #define IDI_SHELL_DISPLAY 250 -/* TODO: 251.ico */ +#define IDI_SHELL_WEB_PICS 251 #define IDI_SHELL_PRINT_PICS 252 -/* TODO: 253.ico */ +#define IDI_SHELL_FILE_CHECK 253 #define IDI_SHELL_EMPTY_RECYCLE_BIN3 254 #define IDI_SHELL_ICON_255 255 +#define IDI_SHELL_FOLDER_MOVE2 256 #define IDI_SHELL_NETWORK_CONNECTIONS2 257 -/* TODO: 256.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ +#define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_NETWORK_HOME 259 +#define IDI_SHELL_CD_EDIT 260 +#define IDI_SHELL_CD_ERASE 261 +#define IDI_SHELL_CD_DELETE 262 #define IDI_SHELL_HELP1 263 -/* TODO: 264.ico */ +#define IDI_SHELL_FOLDER_POINT 264 #define IDI_SHELL_SENDMAIL 265 -/* TODO: 266.ico, 267.ico */ +#define IDI_SHELL_CD_POINT 266 +#define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_ACCESSABILITY 268 #define IDI_SHELL_USERS 269 #define IDI_SHELL_SCREEN_COLORS 270 #define IDI_SHELL_ADD_REM_PROGRAMS 271 -/* TODO: 272.ico, 273.ico, 274.ico, 275.ico, 276.ico */ +#define IDI_SHELL_PRINTER_MOUSE 272 +#define IDI_SHELL_INTERNET_STATUS 273 +#define IDI_SHELL_SYSTEM_GEAR 274 +#define IDI_SHELL_PIE_CHART 275 +#define IDI_SHELL_INTERNET_DATE 276 #define IDI_SHELL_TUNES 277 -/* TODO: 278.ico */ +#define IDI_SHELL_CMD 278 +#define IDI_SHELL_CMD 278 #define IDI_SHELL_USER_ACCOUNTS 279 -/* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ +#define IDI_SHELL_WINDOWS_SEARCH 281 +#define IDI_SHELL_COMPUTER_TEXT 282 +#define IDI_SHELL_OSK 283 +#define IDI_SHELL_ICON_284 284 #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_GO 290 #define IDI_SHELL_DVD_DRIVE 291 @@ -453,7 +492,8 @@ #define IDI_SHELL_DVD_RAM 297 #define IDI_SHELL_DVDR_ROM 298 #define IDI_SHELL_MP3_PLAYER 299 -/* TODO: 300.ico, 301.ico */ +#define IDI_SHELL_SERVER 300 +#define IDI_SHELL_SERVER1 301 #define IDI_SHELL_CD_ROM1 302 /* TODO: 303.ico */ #define IDI_SHELL_DVD_ROM1 304 @@ -461,16 +501,18 @@ /* TODO: 306.ico, 307.ico */ #define IDI_SHELL_SMART_MEDIA 308 #define IDI_SHELL_CAMERA1 309 -/* TODO: 310.ico, 311.ico */ +#define IDI_SHELL_PHONE 310 +#define IDI_SHELL_WEB_PRINTER 311 #define IDI_SHELL_JAZ_DRIVE 312 #define IDI_SHELL_ZIP_DRIVE 313 -/* TODO: 314.ico */ +#define IDI_SHELL_PDA 314 #define IDI_SHELL_SCANNER 315 -/* TODO: 316.ico */ +#define IDI_SHELL_IMAGING_DEVICES 316 #define IDI_SHELL_CAMCORDER 317 #define IDI_SHELL_DVDRW_ROM 318 #define IDI_SHELL_NEW_FOLDER 319 -/* TODO: 320.ico, 321.ico */ +#define IDI_SHELL_CD_POINT1 320 +#define IDI_SHELL_CONTROL_PANEL4 321 #define IDI_SHELL_FAVOTITES 322 #define IDI_SHELL_SEARCH1 323 #define IDI_SHELL_HELP2 324 @@ -480,13 +522,18 @@ #define IDI_SHELL_RUN1 328 #define IDI_SHELL_SHUTDOWN1 329 #define IDI_SHELL_CONTROL_PANEL1 330 -/* TODO: 331.ico, 337.ico, 338.ico, 512.ico */ +#define IDI_SHELL_DISCONNECT 331 +#define IDI_SHELL_SEARCH_DIRECTORY 337 +#define IDI_SHELL_DELETE_PERMANENTLY 338 #define IDI_SHELL_WEB_BROWSER 512 #define IDI_SHELL_IDEA 1001 #define IDI_SHELL_PRINTER_OK2 1002 -/* TODO: 1003.ico */ +#define IDI_SHELL_SERVEROK 1003 #define IDI_SHELL_HELP_FILE1 1004 -/* TODO: 1005.ico, 1006.ico, 1007.ico, 1008.ico, 1009.ico, 1010.ico, 1011.ico */ +#define IDI_SHELL_FILE_MOVE1 1005 +#define IDI_SHELL_FILE_PRINT 1006 +#define IDI_SHELL_FILE_OK 1007 +/* TODO: 1008.ico, 1009.ico, 1010.ico, 1011.ico */ #define IDI_SHELL_SHUTDOWN2 8240 #define IDI_SHELL_DELETE1 16710 @@ -494,14 +541,6 @@ #define IDI_SHELL_DELETE3 16717 #define IDI_SHELL_DELETE4 16718 #define IDI_SHELL_DELETE5 16721 - -/* Icons for Folder Options (ID's identical to Windows XP SP3) */ -#define IDI_SHELL_SHOW_COMMON_TASKS 182 -#define IDI_SHELL_CLASSIC_FOLDERS 183 -#define IDI_SHELL_OPEN_IN_SOME_WINDOW 184 -#define IDI_SHELL_OPEN_IN_NEW_WINDOW 185 -#define IDI_SHELL_SINGLE_CLICK_TO_OPEN 186 -#define IDI_SHELL_DOUBLE_CLICK_TO_OPEN 187 /* * AVI resources

9 years, 7 months

[tfaber] 69236: [MSFS] - Use a NULL timeout for infinite waits instead of waiting for 100 ns. CORE-10188 #resolve - Wait for available read data in user mode to handle thread termination - Return S...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Sep 15 09:40:30 2015 New Revision: 69236 URL: http://svn.reactos.org/svn/reactos?rev=69236&view=rev Log: [MSFS] - Use a NULL timeout for infinite waits instead of waiting for 100 ns. CORE-10188 #resolve - Wait for available read data in user mode to handle thread termination - Return STATUS_IO_TIMEOUT also for a zero-length timeout. Fixes Wine tests - Avoid MmGetSystemAddressForMdl - Acquiring a mutex is not a UserRequest Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Tue Sep 15 09:40:30 2015 @@ -54,7 +54,7 @@ #define KeLockMutex(x) KeWaitForSingleObject(x, \ - UserRequest, \ + Executive, \ KernelMode, \ FALSE, \ NULL); Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Tue Sep 15 09:40:30 2015 @@ -29,6 +29,7 @@ ULONG LengthRead = 0; PVOID Buffer; NTSTATUS Status; + PLARGE_INTEGER Timeout; DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -52,16 +53,21 @@ Length = IoStack->Parameters.Read.Length; if (Irp->MdlAddress) - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); else Buffer = Irp->UserBuffer; + if (Fcb->TimeOut.QuadPart == -1LL) + Timeout = NULL; + else + Timeout = &Fcb->TimeOut; + Status = KeWaitForSingleObject(&Fcb->MessageEvent, UserRequest, - KernelMode, + UserMode, FALSE, - &Fcb->TimeOut); - if (NT_SUCCESS(Status)) + Timeout); + if (Status != STATUS_USER_APC) { if (Fcb->MessageCount > 0) { @@ -84,7 +90,7 @@ KeClearEvent(&Fcb->MessageEvent); } } - else if (Fcb->TimeOut.QuadPart != 0LL) + else { /* No message found after waiting */ Status = STATUS_IO_TIMEOUT; @@ -135,7 +141,7 @@ Length = IoStack->Parameters.Write.Length; if (Irp->MdlAddress) - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); else Buffer = Irp->UserBuffer;

9 years, 7 months

[rnaumann] 69235: [NOTEPAD] Use the correct class name for Notepad. Now we use the same as Wine and Windows. Patch by Ricardo Hanke CORE-5629

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Sep 15 07:26:09 2015 New Revision: 69235 URL: http://svn.reactos.org/svn/reactos?rev=69235&view=rev Log: [NOTEPAD] Use the correct class name for Notepad. Now we use the same as Wine and Windows. Patch by Ricardo Hanke CORE-5629 Modified: trunk/reactos/base/applications/notepad/main.c Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Tue Sep 15 07:26:09 2015 @@ -587,7 +587,7 @@ MONITORINFO info; INT x, y; - static const TCHAR className[] = _T("NPClass"); + static const TCHAR className[] = _T("Notepad"); static const TCHAR winName[] = _T("Notepad"); switch (GetUserDefaultUILanguage())

9 years, 7 months

[hbelusca] 69234: [ASM] Fix the file header description. Consistently use .endm for closing a macro started with .macro. [NTVDM] - Add "_clean" targets to generated asm16 targets. - Fix CMake depen...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Sep 15 01:59:14 2015 New Revision: 69234 URL: http://svn.reactos.org/svn/reactos?rev=69234&view=rev Log: [ASM] Fix the file header description. Consistently use .endm for closing a macro started with .macro. [NTVDM] - Add "_clean" targets to generated asm16 targets. - Fix CMake dependency generation in a somewhat hackish way: I don't know how to cleanly specify the location of generated files for custom targets. And it is also hackish because in a CMake custom command which depends on the COMMAND.COM target, I also need to explicitely say that the command depends on the output file created by the COMMAND.COM target... - Add COMMAND.COM to the CD files, even if NTVDM doesn't use an external command.com for now. CORE-5221 Modified: trunk/reactos/include/asm/asm.inc trunk/reactos/subsystems/mvdm/asm16.cmake trunk/reactos/subsystems/mvdm/dos/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=69… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Tue Sep 15 01:59:14 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/include/amd64/asmmacro.S + * FILE: include/asm/asm.inc * PURPOSE: ASM macros for GAS and MASM/ML64 * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -315,15 +315,14 @@ .macro absolute address __absolute__address__ = \address -ENDM +.endm .macro resb name, size \name = __absolute__address__ __absolute__address__ = __absolute__address__ + \size -ENDM +.endm .macro UNIMPLEMENTED2 file, line, func - jmp 3f 1: .asciz "\func" 2: .asciz \file Modified: trunk/reactos/subsystems/mvdm/asm16.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/asm16.cmak… ============================================================================== --- trunk/reactos/subsystems/mvdm/asm16.cmake [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/asm16.cmake [iso-8859-1] Tue Sep 15 01:59:14 2015 @@ -38,6 +38,7 @@ # many ASM files is by concatenating them into a single one and # compile the resulting file. concatenate_files(${_concatenated_asm_file} ${_source_file_list}) + set_source_files_properties(${_concatenated_asm_file} PROPERTIES GENERATED TRUE) ## ## All this part is the same as CreateBootSectorTarget @@ -53,9 +54,11 @@ # COMMAND objcopy --output-target binary --image-base 0x${_base_address} ${_object_file} ${_binary_file} DEPENDS ${_object_file} native-obj2bin) - set_source_files_properties(${_object_file} ${_binary_file} PROPERTIES GENERATED TRUE) - add_custom_target(${_target} ALL DEPENDS ${_binary_file}) + # set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${_target} SUFFIX ".bin") + set_target_properties(${_target} PROPERTIES LOCATION_${CMAKE_BUILD_TYPE} ${_binary_file}) ## Support of $<TARGET_FILE:xxx> is limited to add_executable() or add_library() + set_target_properties(${_target} PROPERTIES LOCATION ${_binary_file}) ## Support of $<TARGET_FILE:xxx> is limited to add_executable() or add_library() + add_clean_target(${_target}) endfunction() else() @@ -93,6 +96,7 @@ # many ASM files is by concatenating them into a single one and # compile the resulting file. concatenate_files(${_concatenated_asm_file} ${_source_file_list}) + set_source_files_properties(${_concatenated_asm_file} PROPERTIES GENERATED TRUE) ## ## All this part is the same as CreateBootSectorTarget @@ -113,9 +117,11 @@ COMMAND native-obj2bin ${_object_file} ${_binary_file} ${_base_address} DEPENDS ${_object_file} native-obj2bin) - set_source_files_properties(${_object_file} ${_preprocessed_asm_file} ${_binary_file} PROPERTIES GENERATED TRUE) - add_custom_target(${_target} ALL DEPENDS ${_binary_file}) + # set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${_target} SUFFIX ".bin") + set_target_properties(${_target} PROPERTIES LOCATION_${CMAKE_BUILD_TYPE} ${_binary_file}) ## Support of $<TARGET_FILE:xxx> is limited to add_executable() or add_library() + set_target_properties(${_target} PROPERTIES LOCATION ${_binary_file}) ## Support of $<TARGET_FILE:xxx> is limited to add_executable() or add_library() + add_clean_target(${_target}) endfunction() endif() Modified: trunk/reactos/subsystems/mvdm/dos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/dos/CMakeL… ============================================================================== --- trunk/reactos/subsystems/mvdm/dos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/dos/CMakeLists.txt [iso-8859-1] Tue Sep 15 01:59:14 2015 @@ -1,3 +1,4 @@ include_directories(${REACTOS_SOURCE_DIR}/subsystems/mvdm/dos) add_asm16_bin(command ${CMAKE_CURRENT_BINARY_DIR}/command.com 0x0100 command.S) +add_cd_file(TARGET command DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Tue Sep 15 01:59:14 2015 @@ -4,10 +4,14 @@ ##################################### # Generate the integrated COMMAND.COM # + +# Retrieve the full path to the generated file of the 'command' target +get_target_property(_command_com_file command LOCATION) + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/command_com.c ${CMAKE_CURRENT_BINARY_DIR}/command_com.h - COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../dos/command.com ${CMAKE_CURRENT_BINARY_DIR}/command_com.c ${CMAKE_CURRENT_BINARY_DIR}/command_com.h BIN CommandCom - DEPENDS native-bin2c command) + COMMAND native-bin2c ${_command_com_file} ${CMAKE_CURRENT_BINARY_DIR}/command_com.c ${CMAKE_CURRENT_BINARY_DIR}/command_com.h BIN CommandCom + DEPENDS native-bin2c command ${_command_com_file}) ##################################### include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486)

9 years, 7 months

[jimtabor] 69233: [User32] - Patch by Alex Henrie : Send BM_SETCHECK before WM_CAPTURECHANGED and add tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Sep 15 00:15:16 2015 New Revision: 69233 URL: http://svn.reactos.org/svn/reactos?rev=69233&view=rev Log: [User32] - Patch by Alex Henrie : Send BM_SETCHECK before WM_CAPTURECHANGED and add tests. Modified: trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Tue Sep 15 00:15:16 2015 @@ -408,7 +408,6 @@ break; } SendMessageW( hWnd, BM_SETSTATE, FALSE, 0 ); - ReleaseCapture(); GetClientRect( hWnd, &rect ); if (uMsg == WM_KEYUP || PtInRect( &rect, pt )) { @@ -428,6 +427,7 @@ } BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); } + ReleaseCapture(); break; case WM_CAPTURECHANGED:

9 years, 7 months

[pschweitzer] 69232: [MOUNTMGR] Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED: - Implement MountMgrVolumeMountPointDeleteed() - Rename a struct var to reflect its real usage

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 14 22:30:13 2015 New Revision: 69232 URL: http://svn.reactos.org/svn/reactos?rev=69232&view=rev Log: [MOUNTMGR] Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED: - Implement MountMgrVolumeMountPointDeleteed() - Rename a struct var to reflect its real usage Modified: trunk/reactos/drivers/filters/mountmgr/database.c trunk/reactos/drivers/filters/mountmgr/device.c trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/mountmgr.c Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Mon Sep 14 22:30:13 2015 @@ -1464,7 +1464,7 @@ /* Recreate the entry from the previous one */ NewEntry->EntrySize = Entry->EntrySize + NewUniqueId->UniqueIdLength - OldUniqueId->UniqueIdLength; - NewEntry->DatabaseOffset = Entry->DatabaseOffset; + NewEntry->EntryReferences = Entry->EntryReferences; NewEntry->SymbolicNameOffset = sizeof(DATABASE_ENTRY); NewEntry->SymbolicNameLength = Entry->SymbolicNameLength; NewEntry->UniqueIdOffset = Entry->SymbolicNameLength + sizeof(DATABASE_ENTRY); Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Mon Sep 14 22:30:13 2015 @@ -1813,7 +1813,8 @@ DbName.Buffer = (PWSTR)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset); if (RtlEqualUnicodeString(&TargetVolumeName, &DbName, TRUE)) { - ++DatabaseEntry->DatabaseOffset; + /* Reference ourselves and update the entry */ + ++DatabaseEntry->EntryReferences; Status = WriteRemoteDatabaseEntry(RemoteDatabase, Offset, DatabaseEntry); FreePool(DatabaseEntry); Found = TRUE; @@ -1852,7 +1853,7 @@ /* Fill it in */ DatabaseEntry->EntrySize = EntrySize; - DatabaseEntry->DatabaseOffset = 1; + DatabaseEntry->EntryReferences = 1; DatabaseEntry->SymbolicNameOffset = sizeof(DATABASE_ENTRY); DatabaseEntry->SymbolicNameLength = TargetVolumeName.Length; DatabaseEntry->UniqueIdOffset = TargetVolumeName.Length + sizeof(DATABASE_ENTRY); @@ -1926,15 +1927,217 @@ return STATUS_SUCCESS; } +/* + * @implemented + */ + NTSTATUS MountMgrVolumeMountPointDeleted(IN PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp, IN NTSTATUS LockStatus) { - UNREFERENCED_PARAMETER(DeviceExtension); - UNREFERENCED_PARAMETER(Irp); - UNREFERENCED_PARAMETER(LockStatus); - return STATUS_NOT_IMPLEMENTED; + LONG Offset; + NTSTATUS Status; + PLIST_ENTRY Entry; + HANDLE RemoteDatabase; + PDATABASE_ENTRY DatabaseEntry; + PUNIQUE_ID_REPLICATE UniqueIdReplicate; + PASSOCIATED_DEVICE_ENTRY AssociatedEntry; + PDEVICE_INFORMATION DeviceInformation, TargetDeviceInformation; + UNICODE_STRING LinkTarget, SourceDeviceName, SourceSymbolicName, TargetVolumeName, VolumeName, DbName; + + /* Initialize string */ + LinkTarget.Length = 0; + LinkTarget.MaximumLength = 0xC8; + LinkTarget.Buffer = AllocatePool(LinkTarget.MaximumLength); + if (LinkTarget.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* If the mount point was deleted, then, it changed! + * Also use it to query some information + */ + Status = MountMgrVolumeMountPointChanged(DeviceExtension, Irp, LockStatus, &SourceDeviceName, &SourceSymbolicName, &TargetVolumeName); + /* Pending means DB are under synchronization, bail out */ + if (Status == STATUS_PENDING) + { + FreePool(LinkTarget.Buffer); + FreePool(SourceDeviceName.Buffer); + FreePool(SourceSymbolicName.Buffer); + return STATUS_SUCCESS; + } + else if (!NT_SUCCESS(Status)) + { + FreePool(LinkTarget.Buffer); + return Status; + } + + /* Query the device information */ + Status = FindDeviceInfo(DeviceExtension, &SourceDeviceName, FALSE, &DeviceInformation); + if (!NT_SUCCESS(Status)) + { + /* If it failed, first try to get volume name */ + Status = QueryVolumeName(0, NULL, &SourceDeviceName, &LinkTarget, &VolumeName); + if (!NT_SUCCESS(Status)) + { + /* Then, try to read the symlink */ + Status = MountMgrQuerySymbolicLink(&SourceDeviceName, &LinkTarget); + if (!NT_SUCCESS(Status)) + { + FreePool(LinkTarget.Buffer); + FreePool(SourceDeviceName.Buffer); + FreePool(SourceSymbolicName.Buffer); + return Status; + } + } + else + { + FreePool(VolumeName.Buffer); + } + + FreePool(SourceDeviceName.Buffer); + + SourceDeviceName.Length = LinkTarget.Length; + SourceDeviceName.MaximumLength = LinkTarget.MaximumLength; + SourceDeviceName.Buffer = LinkTarget.Buffer; + + /* Now that we have the correct source, reattempt to query information */ + Status = FindDeviceInfo(DeviceExtension, &SourceDeviceName, FALSE, &DeviceInformation); + if (!NT_SUCCESS(Status)) + { + FreePool(SourceDeviceName.Buffer); + FreePool(SourceSymbolicName.Buffer); + return Status; + } + } + + FreePool(SourceDeviceName.Buffer); + + /* Get information about target device */ + Status = FindDeviceInfo(DeviceExtension, &TargetVolumeName, FALSE, &TargetDeviceInformation); + if (!NT_SUCCESS(Status)) + { + FreePool(SourceSymbolicName.Buffer); + return Status; + } + + /* Open the remote database */ + RemoteDatabase = OpenRemoteDatabase(DeviceInformation, TRUE); + if (RemoteDatabase == 0) + { + FreePool(SourceSymbolicName.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Browse all the entries */ + Offset = 0; + for (;;) + { + DatabaseEntry = GetRemoteDatabaseEntry(RemoteDatabase, Offset); + if (DatabaseEntry == NULL) + { + /* We didn't find ourselves, that's infortunate! */ + FreePool(SourceSymbolicName.Buffer); + CloseRemoteDatabase(RemoteDatabase); + return STATUS_INVALID_PARAMETER; + } + + /* Try to find ourselves */ + DbName.MaximumLength = DatabaseEntry->SymbolicNameLength; + DbName.Length = DbName.MaximumLength; + DbName.Buffer = (PWSTR)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset); + if (RtlEqualUnicodeString(&TargetVolumeName, &DbName, TRUE)) + { + break; + } + + Offset += DatabaseEntry->EntrySize; + FreePool(DatabaseEntry); + } + + /* Dereference ourselves */ + DatabaseEntry->EntryReferences--; + if (DatabaseEntry->EntryReferences == 0) + { + /* If we're still referenced, just update the entry */ + Status = WriteRemoteDatabaseEntry(RemoteDatabase, Offset, DatabaseEntry); + } + else + { + /* Otherwise, delete the entry */ + Status = DeleteRemoteDatabaseEntry(RemoteDatabase, Offset); + if (!NT_SUCCESS(Status)) + { + FreePool(DatabaseEntry); + FreePool(SourceSymbolicName.Buffer); + CloseRemoteDatabase(RemoteDatabase); + return Status; + } + + /* Also, delete our unique ID replicated record */ + for (Entry = DeviceInformation->ReplicatedUniqueIdsListHead.Flink; + Entry != &DeviceInformation->ReplicatedUniqueIdsListHead; + Entry = Entry->Flink) + { + UniqueIdReplicate = CONTAINING_RECORD(Entry, UNIQUE_ID_REPLICATE, ReplicatedUniqueIdsListEntry); + + if (UniqueIdReplicate->UniqueId->UniqueIdLength == DatabaseEntry->UniqueIdLength && + RtlCompareMemory(UniqueIdReplicate->UniqueId->UniqueId, + (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), + DatabaseEntry->UniqueIdLength) == DatabaseEntry->UniqueIdLength) + { + break; + } + } + + /* It has to exist! */ + if (Entry == &DeviceInformation->ReplicatedUniqueIdsListHead) + { + FreePool(DatabaseEntry); + FreePool(SourceSymbolicName.Buffer); + CloseRemoteDatabase(RemoteDatabase); + return STATUS_UNSUCCESSFUL; + } + + /* Remove it and free it */ + RemoveEntryList(&UniqueIdReplicate->ReplicatedUniqueIdsListEntry); + FreePool(UniqueIdReplicate->UniqueId); + FreePool(UniqueIdReplicate); + } + + /* We're done with the remote database */ + FreePool(DatabaseEntry); + CloseRemoteDatabase(RemoteDatabase); + + /* Check write operation succeed */ + if (!NT_SUCCESS(Status)) + { + FreePool(SourceSymbolicName.Buffer); + return Status; + } + + /* Try to find our associated device entry */ + for (Entry = TargetDeviceInformation->AssociatedDevicesHead.Flink; + Entry != &TargetDeviceInformation->AssociatedDevicesHead; + Entry = Entry->Flink) + { + AssociatedEntry = CONTAINING_RECORD(Entry, ASSOCIATED_DEVICE_ENTRY, AssociatedDevicesEntry); + + /* If found, delete it */ + if (AssociatedEntry->DeviceInformation == DeviceInformation && + RtlEqualUnicodeString(&AssociatedEntry->String, &SourceSymbolicName, TRUE)) + { + RemoveEntryList(&AssociatedEntry->AssociatedDevicesEntry); + FreePool(AssociatedEntry->String.Buffer); + FreePool(AssociatedEntry); + break; + } + } + + /* We're done! */ + FreePool(SourceSymbolicName.Buffer); + return STATUS_SUCCESS; } /* Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Mon Sep 14 22:30:13 2015 @@ -102,7 +102,7 @@ typedef struct _DATABASE_ENTRY { ULONG EntrySize; // 0x00 - ULONG DatabaseOffset; // 0x04 + ULONG EntryReferences; // 0x04 USHORT SymbolicNameOffset; // 0x08 USHORT SymbolicNameLength; // 0x0A USHORT UniqueIdOffset; // 0x0C @@ -328,6 +328,12 @@ IN PDATABASE_ENTRY Entry ); +NTSTATUS +DeleteRemoteDatabaseEntry( + IN HANDLE Database, + IN LONG StartingOffset +); + /* device.c */ DRIVER_DISPATCH MountMgrDeviceControl; Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Mon Sep 14 22:30:13 2015 @@ -48,7 +48,6 @@ * - MountMgrQueryDosVolumePaths * - MountMgrQueryVolumePaths * - MountMgrValidateBackPointer - * - MountMgrVolumeMountPointDeleted * - ReconcileThisDatabaseWithMasterWorker */

9 years, 7 months

[pschweitzer] 69231: [MEH] Meh.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 14 22:10:47 2015 New Revision: 69231 URL: http://svn.reactos.org/svn/reactos?rev=69231&view=rev Log: [MEH] Meh. Modified: trunk/reactos/drivers/filters/mountmgr/device.c Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Mon Sep 14 22:10:47 2015 @@ -1725,7 +1725,7 @@ FreePool(LinkTarget.Buffer); FreePool(SourceDeviceName.Buffer); FreePool(SourceSymbolicName.Buffer); - return STATUS_STATUS; + return STATUS_SUCCESS; } else if (!NT_SUCCESS(Status)) {

9 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015