Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[ion] 13264: Fix bugs on optimized build, fix RtlpDispatchException gobbling up ebx (thx ge), remove obsolete files

by ion＠svn.reactos.com

Fix bugs on optimized build, fix RtlpDispatchException gobbling up ebx (thx ge), remove obsolete files Modified: trunk/reactos/lib/comctl32/listview.c Deleted: trunk/reactos/lib/ntdll/rtl/i386/except.s Modified: trunk/reactos/lib/rtl/i386/except.s Modified: trunk/reactos/lib/rtl/i386/exception.c Deleted: trunk/reactos/ntoskrnl/rtl/i386/except.s _____ Modified: trunk/reactos/lib/comctl32/listview.c --- trunk/reactos/lib/comctl32/listview.c 2005-01-25 01:22:10 UTC (rev 13263) +++ trunk/reactos/lib/comctl32/listview.c 2005-01-25 01:23:23 UTC (rev 13264) @@ -7254,9 +7254,11 @@ LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 ); ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 ); + PFNLVCOMPARE CompareFunction = infoPtr->pfnCompare; /* Forward the call to the client defined callback */ - return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort ); + + return (CompareFunction)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort ); } /*** _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/except.s --- trunk/reactos/lib/ntdll/rtl/i386/except.s 2005-01-25 01:22:10 UTC (rev 13263) +++ trunk/reactos/lib/ntdll/rtl/i386/except.s 2005-01-25 01:23:23 UTC (rev 13264) @@ -1,291 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: User-mode exception support for IA-32 - * FILE: lib/ntdll/rtl/i386/except.s - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * NOTES: This file is shared with ntoskrnl/rtl/i386/except.s. - * Please keep them in sync. - */ - -#define EXCEPTION_UNWINDING 0x02 - -#define EREC_FLAGS 0x04 - -#define ExceptionContinueExecution 0 -#define ExceptionContinueSearch 1 -#define ExceptionNestedException 2 -#define ExceptionCollidedUnwind 3 - -.globl _RtlpExecuteHandlerForException -.globl _RtlpExecuteHandlerForUnwind - -#define CONTEXT_FLAGS 0x00 -#define CONTEXT_SEGGS 0x8C -#define CONTEXT_SEGFS 0x90 -#define CONTEXT_SEGES 0x94 -#define CONTEXT_SEGDS 0x98 -#define CONTEXT_EDI 0x9C -#define CONTEXT_ESI 0xA0 -#define CONTEXT_EBX 0xA4 -#define CONTEXT_EDX 0xA8 -#define CONTEXT_ECX 0xAC -#define CONTEXT_EAX 0xB0 -#define CONTEXT_EBP 0xB4 -#define CONTEXT_EIP 0xB8 -#define CONTEXT_SEGCS 0xBC -#define CONTEXT_EFLAGS 0xC0 -#define CONTEXT_ESP 0xC4 -#define CONTEXT_SEGSS 0xC8 - - -#define RCC_CONTEXT 0x08 - -// EAX = value to print -_do_debug: - pushal - pushl %eax - call _AsmDebug@4 - popal - ret - -#ifndef __NTOSKRNL__ - -// -// VOID -// RtlpCaptureContext(PCONTEXT pContext); -// -// Parameters: -// [ESP+08h] - PCONTEXT_X86 pContext -// Registers: -// None -// Returns: -// Nothing -// Notes: -// Grabs the current CPU context. -.globl _RtlpCaptureContext -_RtlpCaptureContext: - pushl %ebp - movl %esp, %ebp - movl RCC_CONTEXT(%ebp), %edx // EDX = Address of context structure - - cld - pushf - pop %eax - movl %eax, CONTEXT_EFLAGS(%edx) - xorl %eax, %eax - movl %eax, CONTEXT_EAX(%edx) - movl %eax, CONTEXT_EBX(%edx) - movl %eax, CONTEXT_ECX(%edx) - movl %eax, CONTEXT_EDX(%edx) - movl %eax, CONTEXT_ESI(%edx) - movl %eax, CONTEXT_EDI(%edx) - movl %cs, %eax - movl %eax, CONTEXT_SEGCS(%edx) - movl %ds, %eax - movl %eax, CONTEXT_SEGDS(%edx) - movl %es, %eax - movl %eax, CONTEXT_SEGES(%edx) - movl %fs, %eax - movl %eax, CONTEXT_SEGFS(%edx) - movl %gs, %eax - movl %eax, CONTEXT_SEGGS(%edx) - movl %ss, %eax - movl %eax, CONTEXT_SEGSS(%edx) - - // - // STACK LAYOUT: - (ESP to put in context structure) - // - RETURN ADDRESS OF CALLER OF CALLER - // - EBP OF CALLER OF CALLER - // ... - // - RETURN ADDRESS OF CALLER - // - EBP OF CALLER - // ... - // - - // Get return address of the caller of the caller of this function - movl %ebp, %ebx - //movl 4(%ebx), %eax // EAX = return address of caller - movl (%ebx), %ebx // EBX = EBP of caller - - movl 4(%ebx), %eax // EAX = return address of caller of caller - movl (%ebx), %ebx // EBX = EBP of caller of caller - - movl %eax, CONTEXT_EIP(%edx) // EIP = return address of caller of caller - movl %ebx, CONTEXT_EBP(%edx) // EBP = EBP of caller of caller - addl $8, %ebx - movl %ebx, CONTEXT_ESP(%edx) // ESP = EBP of caller of caller + 8 - - movl %ebp, %esp - popl %ebp - ret - -#endif /* !__NTOSKRNL__ */ - -#define REH_ERECORD 0x08 -#define REH_RFRAME 0x0C -#define REH_CONTEXT 0x10 -#define REH_DCONTEXT 0x14 -#define REH_EROUTINE 0x18 - -// Parameters: -// None -// Registers: -// [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord -// [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame -// [EBP+10h] - PVOID Context -// [EBP+14h] - PVOID DispatcherContext -// [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine -// EDX - Address of protecting exception handler -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// Setup the protecting exception handler and call the exception -// handler in the right context. -_RtlpExecuteHandler: - pushl %ebp - movl %esp, %ebp - pushl REH_RFRAME(%ebp) - - pushl %edx - pushl %fs:0x0 - movl %esp, %fs:0x0 - - // Prepare to call the exception handler - pushl REH_DCONTEXT(%ebp) - pushl REH_CONTEXT(%ebp) - pushl REH_RFRAME(%ebp) - pushl REH_ERECORD(%ebp) - - // Now call the exception handler - movl REH_EROUTINE(%ebp), %eax - call *%eax - - cmpl $-1, %fs:0x0 - jne .reh_stack_looks_ok - - // This should not happen - pushl 0 - pushl 0 - pushl 0 - pushl 0 - call _RtlAssert@16 - -.reh_loop: - jmp .reh_loop - -.reh_stack_looks_ok: - movl %fs:0x0, %esp - - // Return to the 'front-end' for this function - popl %fs:0x0 - movl %ebp, %esp - popl %ebp - ret - - -#define REP_ERECORD 0x04 -#define REP_RFRAME 0x08 -#define REP_CONTEXT 0x0C -#define REP_DCONTEXT 0x10 - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// This exception handler protects the exception handling -// mechanism by detecting nested exceptions. -_RtlpExceptionProtector: - movl $ExceptionContinueSearch, %eax - movl REP_ERECORD(%esp), %ecx - testl $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx) - jnz .rep_end - - // Unwinding is not taking place, so return ExceptionNestedException - - // Set DispatcherContext field to the exception registration for the - // exception handler that executed when a nested exception occurred - movl REP_DCONTEXT(%esp), %ecx - movl REP_RFRAME(%esp), %eax - movl %eax, (%ecx) - movl $ExceptionNestedException, %eax - -.rep_end: - ret - - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// Front-end -_RtlpExecuteHandlerForException: - movl $_RtlpExceptionProtector, %edx - jmp _RtlpExecuteHandler - - -#define RUP_ERECORD 0x04 -#define RUP_RFRAME 0x08 -#define RUP_CONTEXT 0x0C -#define RUP_DCONTEXT 0x10 - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// This exception handler protects the exception handling -// mechanism by detecting collided unwinds. -_RtlpUnwindProtector: - movl $ExceptionContinueSearch, %eax - movl %ecx, RUP_ERECORD(%esp) - testl $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx) - jz .rup_end - - // Unwinding is taking place, so return ExceptionCollidedUnwind - - movl RUP_RFRAME(%esp), %ecx - movl RUP_DCONTEXT(%esp), %edx - - // Set DispatcherContext field to the exception registration for the - // exception handler that executed when a collision occurred - movl RUP_RFRAME(%ecx), %eax - movl %eax, (%edx) - movl $ExceptionCollidedUnwind, %eax - -.rup_end: - ret - - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -_RtlpExecuteHandlerForUnwind: - movl $_RtlpUnwindProtector, %edx - jmp _RtlpExecuteHandler _____ Modified: trunk/reactos/lib/rtl/i386/except.s --- trunk/reactos/lib/rtl/i386/except.s 2005-01-25 01:22:10 UTC (rev 13263) +++ trunk/reactos/lib/rtl/i386/except.s 2005-01-25 01:23:23 UTC (rev 13264) @@ -68,6 +68,7 @@ _RtlpCaptureContext: pushl %ebp movl %esp, %ebp + pushl %ebx movl RCC_CONTEXT(%ebp), %edx // EDX = Address of context structure cld @@ -117,6 +118,7 @@ addl $8, %ebx movl %ebx, CONTEXT_ESP(%edx) // ESP = EBP of caller of caller + 8 + popl %ebx movl %ebp, %esp popl %ebp ret _____ Modified: trunk/reactos/lib/rtl/i386/exception.c --- trunk/reactos/lib/rtl/i386/exception.c 2005-01-25 01:22:10 UTC (rev 13263) +++ trunk/reactos/lib/rtl/i386/exception.c 2005-01-25 01:23:23 UTC (rev 13264) @@ -13,7 +13,7 @@ #include <windows.h> #include <string.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Deleted: trunk/reactos/ntoskrnl/rtl/i386/except.s --- trunk/reactos/ntoskrnl/rtl/i386/except.s 2005-01-25 01:22:10 UTC (rev 13263) +++ trunk/reactos/ntoskrnl/rtl/i386/except.s 2005-01-25 01:23:23 UTC (rev 13264) @@ -1,291 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Kernel-mode exception support for IA-32 - * FILE: ntoskrnl/rtl/i386/except.s - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * NOTES: This file is shared with lib/ntdll/rtl/i386/except.s. - * Please keep them in sync. - */ - -#define EXCEPTION_UNWINDING 0x02 - -#define EREC_FLAGS 0x04 - -#define ExceptionContinueExecution 0 -#define ExceptionContinueSearch 1 -#define ExceptionNestedException 2 -#define ExceptionCollidedUnwind 3 - -.globl _RtlpExecuteHandlerForException -.globl _RtlpExecuteHandlerForUnwind - -#define CONTEXT_FLAGS 0x00 -#define CONTEXT_SEGGS 0x8C -#define CONTEXT_SEGFS 0x90 -#define CONTEXT_SEGES 0x94 -#define CONTEXT_SEGDS 0x98 -#define CONTEXT_EDI 0x9C -#define CONTEXT_ESI 0xA0 -#define CONTEXT_EBX 0xA4 -#define CONTEXT_EDX 0xA8 -#define CONTEXT_ECX 0xAC -#define CONTEXT_EAX 0xB0 -#define CONTEXT_EBP 0xB4 -#define CONTEXT_EIP 0xB8 -#define CONTEXT_SEGCS 0xBC -#define CONTEXT_EFLAGS 0xC0 -#define CONTEXT_ESP 0xC4 -#define CONTEXT_SEGSS 0xC8 - - -#define RCC_CONTEXT 0x08 - -// EAX = value to print -_do_debug: - pushal - pushl %eax - call _AsmDebug@4 - popal - ret - -#ifndef __NTOSKRNL__ - -// -// VOID -// RtlpCaptureContext(PCONTEXT pContext); -// -// Parameters: -// [ESP+08h] - PCONTEXT_X86 pContext -// Registers: -// None -// Returns: -// Nothing -// Notes: -// Grabs the current CPU context. -.globl _RtlpCaptureContext -_RtlpCaptureContext: - pushl %ebp - movl %esp, %ebp - movl RCC_CONTEXT(%ebp), %edx // EDX = Address of context structure - - cld - pushf - pop %eax - movl %eax, CONTEXT_EFLAGS(%edx) - xorl %eax, %eax - movl %eax, CONTEXT_EAX(%edx) - movl %eax, CONTEXT_EBX(%edx) - movl %eax, CONTEXT_ECX(%edx) - movl %eax, CONTEXT_EDX(%edx) - movl %eax, CONTEXT_ESI(%edx) - movl %eax, CONTEXT_EDI(%edx) - movl %cs, %eax - movl %eax, CONTEXT_SEGCS(%edx) - movl %ds, %eax - movl %eax, CONTEXT_SEGDS(%edx) - movl %es, %eax - movl %eax, CONTEXT_SEGES(%edx) - movl %fs, %eax - movl %eax, CONTEXT_SEGFS(%edx) - movl %gs, %eax - movl %eax, CONTEXT_SEGGS(%edx) - movl %ss, %eax - movl %eax, CONTEXT_SEGSS(%edx) - - // - // STACK LAYOUT: - (ESP to put in context structure) - // - RETURN ADDRESS OF CALLER OF CALLER - // - EBP OF CALLER OF CALLER - // ... - // - RETURN ADDRESS OF CALLER - // - EBP OF CALLER - // ... - // - - // Get return address of the caller of the caller of this function - movl %ebp, %ebx - //movl 4(%ebx), %eax // EAX = return address of caller - movl (%ebx), %ebx // EBX = EBP of caller - - movl 4(%ebx), %eax // EAX = return address of caller of caller - movl (%ebx), %ebx // EBX = EBP of caller of caller - - movl %eax, CONTEXT_EIP(%edx) // EIP = return address of caller of caller - movl %ebx, CONTEXT_EBP(%edx) // EBP = EBP of caller of caller - addl $8, %ebx - movl %ebx, CONTEXT_ESP(%edx) // ESP = EBP of caller of caller + 8 - - movl %ebp, %esp - popl %ebp - ret - -#endif /* !__NTOSKRNL__ */ - -#define REH_ERECORD 0x08 -#define REH_RFRAME 0x0C -#define REH_CONTEXT 0x10 -#define REH_DCONTEXT 0x14 -#define REH_EROUTINE 0x18 - -// Parameters: -// None -// Registers: -// [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord -// [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame -// [EBP+10h] - PVOID Context -// [EBP+14h] - PVOID DispatcherContext -// [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine -// EDX - Address of protecting exception handler -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// Setup the protecting exception handler and call the exception -// handler in the right context. -_RtlpExecuteHandler: - pushl %ebp - movl %esp, %ebp - pushl REH_RFRAME(%ebp) - - pushl %edx - pushl %fs:0x0 - movl %esp, %fs:0x0 - - // Prepare to call the exception handler - pushl REH_DCONTEXT(%ebp) - pushl REH_CONTEXT(%ebp) - pushl REH_RFRAME(%ebp) - pushl REH_ERECORD(%ebp) - - // Now call the exception handler - movl REH_EROUTINE(%ebp), %eax - call *%eax - - cmpl $-1, %fs:0x0 - jne .reh_stack_looks_ok - - // This should not happen - pushl 0 - pushl 0 - pushl 0 - pushl 0 - call _RtlAssert@16 - -.reh_loop: - jmp .reh_loop - -.reh_stack_looks_ok: - movl %fs:0x0, %esp - - // Return to the 'front-end' for this function - popl %fs:0x0 - movl %ebp, %esp - popl %ebp - ret - - -#define REP_ERECORD 0x04 -#define REP_RFRAME 0x08 -#define REP_CONTEXT 0x0C -#define REP_DCONTEXT 0x10 - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// This exception handler protects the exception handling -// mechanism by detecting nested exceptions. -_RtlpExceptionProtector: - movl $ExceptionContinueSearch, %eax - movl REP_ERECORD(%esp), %ecx - testl $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx) - jnz .rep_end - - // Unwinding is not taking place, so return ExceptionNestedException - - // Set DispatcherContext field to the exception registration for the - // exception handler that executed when a nested exception occurred - movl REP_DCONTEXT(%esp), %ecx - movl REP_RFRAME(%esp), %eax - movl %eax, (%ecx) - movl $ExceptionNestedException, %eax - -.rep_end: - ret - - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// Front-end -_RtlpExecuteHandlerForException: - movl $_RtlpExceptionProtector, %edx - jmp _RtlpExecuteHandler - - -#define RUP_ERECORD 0x04 -#define RUP_RFRAME 0x08 -#define RUP_CONTEXT 0x0C -#define RUP_DCONTEXT 0x10 - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -// Notes: -// This exception handler protects the exception handling -// mechanism by detecting collided unwinds. -_RtlpUnwindProtector: - movl $ExceptionContinueSearch, %eax - movl %ecx, RUP_ERECORD(%esp) - testl $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx) - jz .rup_end - - // Unwinding is taking place, so return ExceptionCollidedUnwind - - movl RUP_RFRAME(%esp), %ecx - movl RUP_DCONTEXT(%esp), %edx - - // Set DispatcherContext field to the exception registration for the - // exception handler that executed when a collision occurred - movl RUP_RFRAME(%ecx), %eax - movl %eax, (%edx) - movl $ExceptionCollidedUnwind, %eax - -.rup_end: - ret - - -// Parameters: -// [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord -// [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+0Ch] - PCONTEXT Context -// [ESP+10h] - PVOID DispatcherContext -// [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler -// Registers: -// None -// Returns: -// EXCEPTION_DISPOSITION -_RtlpExecuteHandlerForUnwind: - movl $_RtlpUnwindProtector, %edx - jmp _RtlpExecuteHandler

19 years, 11 months

[sedwards] 13263: sync'd more of Wine setupapi. Added stubs and such.

by sedwards＠svn.reactos.com

sync'd more of Wine setupapi. Added stubs and such. Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-01-25 01:21:38 UTC (rev 13262) +++ trunk/reactos/lib/setupapi/devinst.c 2005-01-25 01:22:10 UTC (rev 13263) @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" @@ -29,6 +32,7 @@ #include "winnls.h" #include "setupapi.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "rpc.h" #include "rpcdce.h" @@ -1133,3 +1137,57 @@ debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); return FALSE; } + +/********************************************************************** * + * SetupDiSetClassInstallParamsA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetClassInstallParamsA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_CLASSINSTALL_HEADER ClassInstallParams, + DWORD ClassInstallParamsSize) +{ + FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, + ClassInstallParams->InstallFunction, ClassInstallParamsSize); + return FALSE; +} + +/********************************************************************** * + * SetupDiCallClassInstaller (SETUPAPI.@) + */ +BOOL WINAPI SetupDiCallClassInstaller( + DWORD InstallFunction, + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstallParamsA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +{ + FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + return FALSE; +} + +/********************************************************************** * + * SetupDiOpenDevRegKey (SETUPAPI.@) + */ +HKEY WINAPI SetupDiOpenDevRegKey( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + REGSAM samDesired) +{ + FIXME("%p %p %ld %ld %ld %lx\n", DeviceInfoSet, DeviceInfoData, + Scope, HwProfile, KeyType, samDesired); + return INVALID_HANDLE_VALUE; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-01-25 01:21:38 UTC (rev 13262) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-01-25 01:22:10 UTC (rev 13263) @@ -1,18 +1,195 @@ +@ stub AcquireSCMLock +@ stub AddMiniIconToList @ stub AddTagToGroupOrderListEntry @ stub AppendStringToMultiSz @ stub AssertFail +@ stub CMP_Init_Detection +@ stub CMP_RegisterNotification +@ stub CMP_Report_LogOn +@ stub CMP_UnregisterNotification +@ stub CMP_WaitNoPendingInstallEvents +@ stub CMP_WaitServices +@ stub CM_Add_Empty_Log_Conf +@ stub CM_Add_Empty_Log_Conf_Ex +@ stub CM_Add_IDA +@ stub CM_Add_IDW +@ stub CM_Add_ID_ExA +@ stub CM_Add_ID_ExW +@ stub CM_Add_Range +@ stub CM_Add_Res_Des +@ stub CM_Add_Res_Des_Ex +@ stub CM_Connect_MachineA @ stdcall CM_Connect_MachineW(wstr ptr) +@ stub CM_Create_DevNodeA +@ stub CM_Create_DevNodeW +@ stub CM_Create_DevNode_ExA +@ stub CM_Create_DevNode_ExW +@ stub CM_Create_Range_List +@ stub CM_Delete_Class_Key +@ stub CM_Delete_Class_Key_Ex +@ stub CM_Delete_DevNode_Key +@ stub CM_Delete_DevNode_Key_Ex +@ stub CM_Delete_Range +@ stub CM_Detect_Resource_Conflict +@ stub CM_Detect_Resource_Conflict_Ex +@ stub CM_Disable_DevNode +@ stub CM_Disable_DevNode_Ex @ stdcall CM_Disconnect_Machine(long) +@ stub CM_Dup_Range_List +@ stub CM_Enable_DevNode +@ stub CM_Enable_DevNode_Ex +@ stub CM_Enumerate_Classes +@ stub CM_Enumerate_Classes_Ex +@ stub CM_Enumerate_EnumeratorsA +@ stub CM_Enumerate_EnumeratorsW +@ stub CM_Enumerate_Enumerators_ExA +@ stub CM_Enumerate_Enumerators_ExW +@ stub CM_Find_Range +@ stub CM_First_Range +@ stub CM_Free_Log_Conf +@ stub CM_Free_Log_Conf_Ex @ stub CM_Free_Log_Conf_Handle +@ stub CM_Free_Range_List +@ stub CM_Free_Res_Des +@ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle +@ stub CM_Get_Child +@ stub CM_Get_Child_Ex +@ stub CM_Get_Class_Key_NameA +@ stub CM_Get_Class_Key_NameW +@ stub CM_Get_Class_Key_Name_ExA +@ stub CM_Get_Class_Key_Name_ExW +@ stub CM_Get_Class_NameA +@ stub CM_Get_Class_NameW +@ stub CM_Get_Class_Name_ExA +@ stub CM_Get_Class_Name_ExW +@ stub CM_Get_Depth +@ stub CM_Get_Depth_Ex +@ stub CM_Get_DevNode_Registry_PropertyA +@ stub CM_Get_DevNode_Registry_PropertyW +@ stub CM_Get_DevNode_Registry_Property_ExA +@ stub CM_Get_DevNode_Registry_Property_ExW +@ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex +@ stub CM_Get_Device_IDA +@ stub CM_Get_Device_IDW +@ stub CM_Get_Device_ID_ExA @ stub CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) +@ stub CM_Get_Device_ID_ListW +@ stub CM_Get_Device_ID_List_ExA +@ stub CM_Get_Device_ID_List_ExW +@ stub CM_Get_Device_ID_List_SizeA +@ stub CM_Get_Device_ID_List_SizeW +@ stub CM_Get_Device_ID_List_Size_ExA +@ stub CM_Get_Device_ID_List_Size_ExW +@ stub CM_Get_Device_ID_Size +@ stub CM_Get_Device_ID_Size_Ex +@ stub CM_Get_Device_Interface_AliasA +@ stub CM_Get_Device_Interface_AliasW +@ stub CM_Get_Device_Interface_Alias_ExA +@ stub CM_Get_Device_Interface_Alias_ExW +@ stub CM_Get_Device_Interface_ListA +@ stub CM_Get_Device_Interface_ListW +@ stub CM_Get_Device_Interface_List_ExA +@ stub CM_Get_Device_Interface_List_ExW +@ stub CM_Get_Device_Interface_List_SizeA +@ stub CM_Get_Device_Interface_List_SizeW +@ stub CM_Get_Device_Interface_List_Size_ExA +@ stub CM_Get_Device_Interface_List_Size_ExW +@ stub CM_Request_Device_EjectA +@ stub CM_Request_Device_EjectW +@ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex +@ stub CM_Get_Global_State +@ stub CM_Get_Global_State_Ex +@ stub CM_Get_HW_Prof_FlagsA +@ stub CM_Get_HW_Prof_FlagsW +@ stub CM_Get_HW_Prof_Flags_ExA +@ stub CM_Get_HW_Prof_Flags_ExW +@ stub CM_Get_Hardware_Profile_InfoA +@ stub CM_Get_Hardware_Profile_InfoW +@ stub CM_Get_Hardware_Profile_Info_ExA +@ stub CM_Get_Hardware_Profile_Info_ExW +@ stub CM_Get_Log_Conf_Priority +@ stub CM_Get_Log_Conf_Priority_Ex +@ stub CM_Get_Next_Log_Conf +@ stub CM_Get_Next_Log_Conf_Ex +@ stub CM_Get_Next_Res_Des @ stub CM_Get_Next_Res_Des_Ex +@ stub CM_Get_Parent +@ stub CM_Get_Parent_Ex +@ stub CM_Get_Res_Des_Data @ stub CM_Get_Res_Des_Data_Ex +@ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex +@ stub CM_Get_Sibling +@ stub CM_Get_Sibling_Ex +@ stub CM_Get_Version +@ stub CM_Get_Version_Ex +@ stub CM_Intersect_Range_List +@ stub CM_Invert_Range_List +@ stub CM_Is_Dock_Station_Present +@ stub CM_Locate_DevNodeA +@ stub CM_Locate_DevNodeW +@ stub CM_Locate_DevNode_ExA @ stub CM_Locate_DevNode_ExW +@ stub CM_Merge_Range_List +@ stub CM_Modify_Res_Des +@ stub CM_Modify_Res_Des_Ex +@ stub CM_Move_DevNode +@ stub CM_Move_DevNode_Ex +@ stub CM_Next_Range +@ stub CM_Open_Class_KeyA +@ stub CM_Open_Class_KeyW +@ stub CM_Open_Class_Key_ExA +@ stub CM_Open_Class_Key_ExW +@ stub CM_Open_DevNode_Key +@ stub CM_Open_DevNode_Key_Ex +@ stub CM_Query_Arbitrator_Free_Data +@ stub CM_Query_Arbitrator_Free_Data_Ex +@ stub CM_Query_Arbitrator_Free_Size +@ stub CM_Query_Arbitrator_Free_Size_Ex +@ stub CM_Query_Remove_SubTree +@ stub CM_Query_Remove_SubTree_Ex +@ stub CM_Reenumerate_DevNode @ stub CM_Reenumerate_DevNode_Ex +@ stub CM_Register_Device_Driver +@ stub CM_Register_Device_Driver_Ex +@ stub CM_Register_Device_InterfaceA +@ stub CM_Register_Device_InterfaceW +@ stub CM_Register_Device_Interface_ExA +@ stub CM_Register_Device_Interface_ExW +@ stub CM_Remove_SubTree +@ stub CM_Remove_SubTree_Ex +@ stub CM_Remove_Unmarked_Children +@ stub CM_Remove_Unmarked_Children_Ex +@ stub CM_Request_Eject_PC +@ stub CM_Reset_Children_Marks +@ stub CM_Reset_Children_Marks_Ex +@ stub CM_Run_Detection +@ stub CM_Run_Detection_Ex +@ stub CM_Set_DevNode_Problem +@ stub CM_Set_DevNode_Problem_Ex +@ stub CM_Set_DevNode_Registry_PropertyA +@ stub CM_Set_DevNode_Registry_PropertyW +@ stub CM_Set_DevNode_Registry_Property_ExA +@ stub CM_Set_DevNode_Registry_Property_ExW +@ stub CM_Set_HW_Prof +@ stub CM_Set_HW_Prof_Ex +@ stub CM_Set_HW_Prof_FlagsA +@ stub CM_Set_HW_Prof_FlagsW +@ stub CM_Set_HW_Prof_Flags_ExA +@ stub CM_Set_HW_Prof_Flags_ExW +@ stub CM_Setup_DevNode +@ stub CM_Setup_DevNode_Ex +@ stub CM_Test_Range_Available +@ stub CM_Uninstall_DevNode +@ stub CM_Uninstall_DevNode_Ex +@ stub CM_Unregister_Device_InterfaceA +@ stub CM_Unregister_Device_InterfaceW +@ stub CM_Unregister_Device_Interface_ExA +@ stub CM_Unregister_Device_Interface_ExW @ stub CaptureAndConvertAnsiArg @ stub CaptureStringArg @ stub CenterWindowRelativeToParent @@ -26,14 +203,17 @@ @ stub ExtensionPropSheetPageProc @ stub FileExists @ stub FreeStringArray +@ stub GetCurrentDriverSigningPolicy @ stub GetNewInfName @ stub GetSetFileTimestamp @ stub GetVersionInfoFromImage @ stub InfIsFromOemLocation +@ stub InstallCatalog @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA @ stdcall InstallHinfSectionA(long long str long) @ stdcall InstallHinfSectionW(long long wstr long) @ stub InstallStop +@ stub InstallStopEx @ stub IsUserAdmin @ stub LookUpStringInTable @ stub MemoryInitialize @@ -66,6 +246,7 @@ @ stub SetupCancelTemporarySourceList @ stdcall SetupCloseFileQueue(ptr) @ stdcall SetupCloseInfFile(long) +@ stub SetupCloseLog @ stdcall SetupCommitFileQueue(long long ptr ptr) SetupCommitFileQueueW @ stdcall SetupCommitFileQueueA(long long ptr ptr) @ stdcall SetupCommitFileQueueW(long long ptr ptr) @@ -88,7 +269,7 @@ @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr) @ stdcall SetupDiBuildClassInfoListExW(long ptr long ptr wstr ptr) @ stub SetupDiBuildDriverInfoList -@ stub SetupDiCallClassInstaller +@ stdcall SetupDiCallClassInstaller(long ptr ptr) @ stub SetupDiCancelDriverInfoSearch @ stub SetupDiChangeState @ stdcall SetupDiClassGuidsFromNameA(str ptr long ptr) @@ -104,10 +285,12 @@ @ stub SetupDiCreateDeviceInfoA @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) -@ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) +@ stdcall SetupDiCreateDeviceInfoListExW(ptr long str ptr) @ stub SetupDiCreateDeviceInfoW @ stub SetupDiDeleteDevRegKey @ stub SetupDiDeleteDeviceInfo +@ stub SetupDiDeleteDeviceInterfaceData +@ stub SetupDiDeleteDeviceRegKey @ stub SetupDiDestroyClassImageList @ stdcall SetupDiDestroyDeviceInfoList(long) @ stub SetupDiDestroyDriverInfoList @@ -131,13 +314,14 @@ @ stdcall SetupDiGetClassDevsW(ptr ptr long long) @ stub SetupDiGetClassImageIndex @ stub SetupDiGetClassImageList +@ stub SetupDiGetClassImageListExA @ stub SetupDiGetClassImageListExW @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW @ stub SetupDiGetDeviceInfoListClass @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) -@ stub SetupDiGetDeviceInstallParamsA +@ stdcall SetupDiGetDeviceInstallParamsA(ptr ptr ptr) @ stub SetupDiGetDeviceInstallParamsW @ stub SetupDiGetDeviceInstanceIdA @ stub SetupDiGetDeviceInstanceIdW @@ -151,8 +335,12 @@ @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) @ stub SetupDiGetHwProfileFriendlyNameA +@ stub SetupDiGetHwProfileFriendlyNameExA +@ stub SetupDiGetHwProfileFriendlyNameExW @ stub SetupDiGetHwProfileFriendlyNameW @ stub SetupDiGetHwProfileList +@ stub SetupDiGetHwProfileListExA +@ stub SetupDiGetHwProfileListExW @ stub SetupDiGetINFClassA @ stub SetupDiGetINFClassW @ stub SetupDiGetSelectedDevice @@ -160,6 +348,8 @@ @ stub SetupDiGetSelectedDriverW @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) +@ stub SetupDiInstallClassExA +@ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice @ stub SetupDiInstallDriverFiles @@ -168,15 +358,18 @@ @ stdcall SetupDiOpenClassRegKey(ptr long) @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr) @ stdcall SetupDiOpenClassRegKeyExW(ptr long long wstr ptr) -@ stub SetupDiOpenDevRegKey +@ stdcall SetupDiOpenDevRegKey(ptr ptr long long long long) @ stub SetupDiOpenDeviceInfoA @ stub SetupDiOpenDeviceInfoW +@ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey +@ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stub SetupDiRegisterDeviceInfo @ stub SetupDiRemoveDevice +@ stub SetupDiRemoveDeviceInterface @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv -@ stub SetupDiSetClassInstallParamsA +@ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stub SetupDiSetClassInstallParamsW @ stub SetupDiSetDeviceInstallParamsA @ stub SetupDiSetDeviceInstallParamsW @@ -187,6 +380,7 @@ @ stub SetupDiSetSelectedDevice @ stub SetupDiSetSelectedDriverA @ stub SetupDiSetSelectedDriverW +@ stub SetupDiUnremoveDevice @ stub SetupDuplicateDiskSpaceListA @ stub SetupDuplicateDiskSpaceListW @ stdcall SetupFindFirstLineA(long str str ptr) @@ -196,6 +390,8 @@ @ stdcall SetupFindNextMatchLineW(ptr wstr ptr) @ stub SetupFreeSourceListA @ stub SetupFreeSourceListW +@ stub SetupGetBackupInformationA +@ stub SetupGetBackupInformationW @ stdcall SetupGetBinaryField(ptr long ptr long ptr) @ stdcall SetupGetFieldCount(ptr) @ stub SetupGetFileCompressionInfoA @@ -206,6 +402,7 @@ @ stub SetupGetInfFileListW @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) @ stub SetupGetInfInformationW +@ stub SetupGetInfSections @ stdcall SetupGetIntField(ptr long ptr) @ stdcall SetupGetLineByIndexA(long str long ptr) @ stdcall SetupGetLineByIndexW(long wstr long ptr) @@ -238,9 +435,13 @@ @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) @ stdcall SetupInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr) @ stub SetupInstallServicesFromInfSectionA +@ stub SetupInstallServicesFromInfSectionExA +@ stub SetupInstallServicesFromInfSectionExW @ stub SetupInstallServicesFromInfSectionW @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) +@ stub SetupLogErrorA +@ stub SetupLogErrorW @ stub SetupLogFileA @ stub SetupLogFileW @ stdcall SetupOpenAppendInfFileA(str long ptr) @@ -301,6 +502,8 @@ @ stub SetupSetDirectoryIdExA @ stub SetupSetDirectoryIdExW @ stdcall SetupSetDirectoryIdW(long long wstr) +@ stub SetupFileQueueAlternatePlatformA +@ stub SetupFileQueueAlternatePlatformW @ stdcall SetupSetFileQueueFlags(long long long) @ stub SetupSetPlatformPathOverrideA @ stub SetupSetPlatformPathOverrideW @@ -326,14 +529,24 @@ @ stub TakeOwnershipOfFile @ stub UnicodeToMultiByte @ stub UnmapAndCloseFile +@ stub VerifyCatalogFile +@ stub VerifyFile +@ stub pSetupAccessRunOnceNodeList @ stub pSetupAddMiniIconToList @ stub pSetupAddTagToGroupOrderListEntry @ stub pSetupAppendStringToMultiSz +@ stub pSetupDestroyRunOnceNodeList @ stub pSetupDirectoryIdToPath @ stub pSetupGetField +@ stub pSetupGetGlobalFlags @ stub pSetupGetOsLoaderDriveAndPath +@ stub pSetupGetQueueFlags @ stub pSetupGetVersionDatum @ stub pSetupGuidFromString @ stub pSetupIsGuidNull @ stub pSetupMakeSurePathExists +@ stub pSetupSetGlobalFlags +@ stub pSetupSetQueueFlags +@ stub pSetupSetSystemSourceFlags @ stub pSetupStringFromGuid +@ stub pSetupVerifyQueuedCatalogs

19 years, 11 months

[sedwards] 13262: update to latest setupapi.h

by sedwards＠svn.reactos.com

update to latest setupapi.h Modified: trunk/reactos/include/wine/setupapi.h _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-01-25 00:28:45 UTC (rev 13261) +++ trunk/reactos/include/wine/setupapi.h 2005-01-25 01:21:38 UTC (rev 13262) @@ -156,6 +156,59 @@ #define MAX_SUBTITLE_LEN 256 #define SP_MAX_MACHINENAME_LENGTH (MAX_PATH + 3) +typedef UINT DI_FUNCTION; + +typedef struct _SP_CLASSINSTALL_HEADER +{ + DWORD cbSize; + DI_FUNCTION InstallFunction; +} SP_CLASSINSTALL_HEADER, *PSP_CLASSINSTALL_HEADER; + +typedef struct _SP_PROPCHANGE_PARAMS +{ + SP_CLASSINSTALL_HEADER ClassInstallHeader; + DWORD StateChange; + DWORD Scope; + DWORD HwProfile; +} SP_PROPCHANGE_PARAMS, *PSP_PROPCHANGE_PARAMS; + +#define DICS_ENABLE 0x00000001 +#define DICS_DISABLE 0x00000002 +#define DICS_PROPCHANGE 0x00000003 +#define DICS_START 0x00000004 +#define DICS_STOP 0x00000005 + +typedef struct _SP_DEVINSTALL_PARAMS_A +{ + DWORD cbSize; + DWORD Flags; + DWORD FlagsEx; + HWND hwndParent; + PSP_FILE_CALLBACK_A InstallMsgHandler; + PVOID InstallMsgHandlerContext; + HSPFILEQ FileQueue; + ULONG_PTR ClassInstallReserved; + DWORD Reserved; + CHAR DriverPath[MAX_PATH]; +} SP_DEVINSTALL_PARAMS_A, *PSP_DEVINSTALL_PARAMS_A; + +typedef struct _SP_DEVINSTALL_PARAMS_W +{ + DWORD cbSize; + DWORD Flags; + DWORD FlagsEx; + HWND hwndParent; + PSP_FILE_CALLBACK_W InstallMsgHandler; + PVOID InstallMsgHandlerContext; + HSPFILEQ FileQueue; + ULONG_PTR ClassInstallReserved; + DWORD Reserved; + WCHAR DriverPath[MAX_PATH]; +} SP_DEVINSTALL_PARAMS_W, *PSP_DEVINSTALL_PARAMS_W; + +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DEVINSTALL_PARAMS) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DEVINSTALL_PARAMS) + /* Device Information structure (references a device instance that is a member of a device information set) */ typedef struct _SP_DEVINFO_DATA @@ -397,7 +450,6 @@ #define FLG_REGSVR_DLLREGISTER 0x00000001 #define FLG_REGSVR_DLLINSTALL 0x00000002 -/* */ #define DI_NOVCP 0x00000008 /* Class installer function codes */ @@ -559,7 +611,7 @@ #define ERROR_NO_SUCH_INTERFACE_DEVICE ERROR_NO_SUCH_DEVICE_INTERFACE #define ERROR_NOT_INSTALLED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x1000) -/* Flags for SetupDiGetClassDevs */ +/* flags for SetupDiGetClassDevs */ #define DIGCF_DEFAULT 0x00000001 #define DIGCF_PRESENT 0x00000002 #define DIGCF_ALLCLASSES 0x00000004 @@ -612,14 +664,6 @@ #define SPDRP_INSTALL_STATE 0x00000022 #define SPDRP_MAXIMUM_PROPERTY 0x00000023 - -LPWSTR WINAPI DuplicateString(LPCWSTR lpSrc); -VOID WINAPI MyFree(LPVOID lpMem); -LPVOID WINAPI MyMalloc(DWORD dwSize); -LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize); - -LONG WINAPI QueryRegistryValue(HKEY, LPCWSTR, LPBYTE *, LPDWORD, LPDWORD); - void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show ); void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, INT show ); #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) @@ -738,7 +782,6 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID *,LPCSTR,HWND,DWORD); HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID *,LPCWSTR,HWND,DWORD); #define SetupDiGetClassDevs WINELIB_NAME_AW(SetupDiGetClassDevs) - BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, @@ -752,7 +795,6 @@ HKEY WINAPI SetupDiOpenClassRegKeyExA(const GUID*, REGSAM, DWORD, PCSTR, PVOID); HKEY WINAPI SetupDiOpenClassRegKeyExW(const GUID*, REGSAM, DWORD, PCWSTR, PVOID); #define SetupDiOpenClassRegKeyEx WINELIB_NAME_AW(SetupDiOpenClassRegKeyEx) - BOOL WINAPI SetupInstallFilesFromInfSectionA( HINF, HINF, HSPFILEQ, PCSTR, PCSTR, UINT ); BOOL WINAPI SetupInstallFilesFromInfSectionW( HINF, HINF, HSPFILEQ, PCWSTR, PCWSTR, UINT ); #define SetupInstallFilesFromInfSection WINELIB_NAME_AW(SetupInstallFilesFromInfSection)

19 years, 11 months

[hbirr] 13261: - Enabled SYSENTER/SYSEXIT for application processors on smp machines.

by hbirr＠svn.reactos.com

- Enabled SYSENTER/SYSEXIT for application processors on smp machines. Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-01-25 00:05:56 UTC (rev 13260) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-01-25 00:28:45 UTC (rev 13261) @@ -43,7 +43,7 @@ BOOLEAN Ke386Pae = FALSE; BOOLEAN Ke386PaeEnabled = FALSE; BOOLEAN Ke386GlobalPagesEnabled = FALSE; -ULONG KiFastSystemCallDisable = 0; +ULONG KiFastSystemCallDisable = 1; /* FUNCTIONS *****************************************************************/ @@ -192,6 +192,18 @@ KeInitDpc(Pcr); + if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) + { + extern void KiFastCallEntry(void); + + /* CS Selector of the target segment. */ + Ke386Wrmsr(0x174, KERNEL_CS, 0); + /* Target ESP. */ + Ke386Wrmsr(0x175, 0, 0); + /* Target EIP. */ + Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); + } + /* * It is now safe to process interrupts */ @@ -412,6 +424,7 @@ ULONG ResultLength; KEY_VALUE_PARTIAL_INFORMATION ValueData; NTSTATUS Status; + ULONG FastSystemCallDisable = 0; SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = FALSE; @@ -457,7 +470,7 @@ &ValueData, sizeof(ValueData), &ResultLength); - RtlMoveMemory(&KiFastSystemCallDisable, ValueData.Data, sizeof(ULONG)); + RtlMoveMemory(&FastSystemCallDisable, ValueData.Data, sizeof(ULONG)); NtClose(KeyHandle); } @@ -465,21 +478,12 @@ } else { /* Disable SYSENTER/SYSEXIT, because the CPU doesn't support it */ - KiFastSystemCallDisable = 1; + FastSystemCallDisable = 1; } - if (!KiFastSystemCallDisable) { + if (FastSystemCallDisable) { - /* Use SYSENTER */ - SharedUserData->SystemCall[0] = 0x8B; - SharedUserData->SystemCall[1] = 0xD4; - SharedUserData->SystemCall[2] = 0x0F; - SharedUserData->SystemCall[3] = 0x34; - SharedUserData->SystemCall[4] = 0xC3; - - } else { - /* Use INT2E */ SharedUserData->SystemCall[0] = 0x8D; SharedUserData->SystemCall[1] = 0x54; @@ -488,5 +492,17 @@ SharedUserData->SystemCall[4] = 0xCD; SharedUserData->SystemCall[5] = 0x2E; SharedUserData->SystemCall[6] = 0xC3; + + } else { + + /* Use SYSENTER */ + SharedUserData->SystemCall[0] = 0x8B; + SharedUserData->SystemCall[1] = 0xD4; + SharedUserData->SystemCall[2] = 0x0F; + SharedUserData->SystemCall[3] = 0x34; + SharedUserData->SystemCall[4] = 0xC3; + + /* Enable SYSENTER/SYSEXIT */ + KiFastSystemCallDisable = 0; } }

19 years, 11 months

[weiden] 13260: return error status in case probing the parameters failed in IoCreateFile()

by weiden＠svn.reactos.com

return error status in case probing the parameters failed in IoCreateFile() Modified: trunk/reactos/ntoskrnl/io/create.c _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-01-24 23:59:30 UTC (rev 13259) +++ trunk/reactos/ntoskrnl/io/create.c 2005-01-25 00:05:56 UTC (rev 13260) @@ -409,6 +409,11 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } } else {

19 years, 11 months

[weiden] 13259: some more parameter checks in IoCreateFile()

by weiden＠svn.reactos.com

some more parameter checks in IoCreateFile() Modified: trunk/reactos/include/ddk/iodef.h Modified: trunk/reactos/ntoskrnl/io/create.c _____ Modified: trunk/reactos/include/ddk/iodef.h --- trunk/reactos/include/ddk/iodef.h 2005-01-24 23:23:38 UTC (rev 13258) +++ trunk/reactos/include/ddk/iodef.h 2005-01-24 23:59:30 UTC (rev 13259) @@ -163,7 +163,8 @@ /* * IoCreateFile options */ -#define IO_NO_PARAMETER_CHECKING 0x100 +#define IO_NO_PARAMETER_CHECKING 0x0100 +#define IO_CHECK_CREATE_PARAMETERS 0x0200 /* * Possible flags for the device object flags _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-01-24 23:23:38 UTC (rev 13258) +++ trunk/reactos/ntoskrnl/io/create.c 2005-01-24 23:59:30 UTC (rev 13259) @@ -337,13 +337,15 @@ IN ULONG Options) { PFILE_OBJECT FileObject; - NTSTATUS Status; PIRP Irp; PIO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE AccessMode; HANDLE LocalFileHandle; IO_STATUS_BLOCK LocalIoStatusBlock; + LARGE_INTEGER SafeAllocationSize; + PVOID SystemEaBuffer = NULL; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("IoCreateFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -357,12 +359,79 @@ LocalFileHandle = 0; - PreviousMode = ExGetPreviousMode(); + if(Options & IO_NO_PARAMETER_CHECKING) + AccessMode = KernelMode; + else + AccessMode = ExGetPreviousMode(); + + if(AccessMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(FileHandle, + sizeof(HANDLE), + sizeof(ULONG)); + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + if(AllocationSize != NULL) + { + ProbeForRead(AllocationSize, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + SafeAllocationSize = *AllocationSize; + } + else + SafeAllocationSize.QuadPart = 0; - Status = ObCreateObject(0 == (Options & IO_NO_PARAMETER_CHECKING) ? PreviousMode : KernelMode, + if(EaBuffer != NULL && EaLength > 0) + { + ProbeForRead(EaBuffer, + EaLength, + sizeof(ULONG)); + + /* marshal EaBuffer */ + SystemEaBuffer = ExAllocatePool(NonPagedPool, + EaLength); + if(SystemEaBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_LEAVE; + } + + RtlCopyMemory(SystemEaBuffer, + EaBuffer, + EaLength); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + if(AllocationSize != NULL) + SafeAllocationSize = *AllocationSize; + else + SafeAllocationSize.QuadPart = 0; + + if(EaBuffer != NULL && EaLength > 0) + { + SystemEaBuffer = EaBuffer; + } + } + + if(Options & IO_CHECK_CREATE_PARAMETERS) + { + DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); + } + + Status = ObCreateObject(AccessMode, IoFileObjectType, ObjectAttributes, - PreviousMode, + AccessMode, NULL, sizeof(FILE_OBJECT), 0, @@ -426,16 +495,13 @@ //trigger FileObject/Event dereferencing Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; + Irp->RequestorMode = AccessMode; Irp->UserIosb = &LocalIoStatusBlock; - Irp->AssociatedIrp.SystemBuffer = EaBuffer; + Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; Irp->Tail.Overlay.AuxiliaryBuffer = NULL; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserEvent = &FileObject->Event; - if (AllocationSize) - { - Irp->Overlay.AllocationSize = *AllocationSize; - } + Irp->Overlay.AllocationSize = SafeAllocationSize; /* * Get the stack location for the new @@ -458,7 +524,7 @@ StackLoc->Parameters.Create.Options |= (CreateDisposition << 24); StackLoc->Parameters.Create.FileAttributes = (USHORT)FileAttributes; StackLoc->Parameters.Create.ShareAccess = (USHORT)ShareAccess; - StackLoc->Parameters.Create.EaLength = EaLength; + StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; break; case CreateFileTypeNamedPipe: @@ -492,7 +558,7 @@ { KeWaitForSingleObject(&FileObject->Event, Executive, - PreviousMode, + AccessMode, FALSE, NULL); Status = LocalIoStatusBlock.Status; @@ -507,32 +573,24 @@ } else { - if (KernelMode == PreviousMode || 0 != (Options & IO_NO_PARAMETER_CHECKING)) - { - *FileHandle = LocalFileHandle; - *IoStatusBlock = LocalIoStatusBlock; - } - else - { - _SEH_TRY - { - ProbeForWrite(FileHandle, - sizeof(HANDLE), - sizeof(ULONG)); - *FileHandle = LocalFileHandle; - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - *IoStatusBlock = LocalIoStatusBlock; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + _SEH_TRY + { + *FileHandle = LocalFileHandle; + *IoStatusBlock = LocalIoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } + /* cleanup EABuffer if captured */ + if(AccessMode != KernelMode && SystemEaBuffer != NULL) + { + ExFreePool(SystemEaBuffer); + } + ASSERT_IRQL(PASSIVE_LEVEL); DPRINT("Finished IoCreateFile() (*FileHandle) %x\n", (*FileHandle));

19 years, 11 months

[hbirr] 13258: - Fixed my last commit.

by hbirr＠svn.reactos.com

- Fixed my last commit. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-24 22:58:54 UTC (rev 13257) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-24 23:23:38 UTC (rev 13258) @@ -2792,7 +2792,7 @@ KernelMode, FALSE, Delay); - if(!NT_SUCCESS(Status) || STATUS_TIMEOUT) + if(!NT_SUCCESS(Status) || Status == STATUS_TIMEOUT) { #ifndef NDEBUG if(Status == STATUS_TIMEOUT)

19 years, 11 months

[hbirr] 13257: - Interpret STATUS_TIMEOUT as error in PsLockProcess.

by hbirr＠svn.reactos.com

- Interpret STATUS_TIMEOUT as error in PsLockProcess. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-24 22:02:09 UTC (rev 13256) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-24 22:58:54 UTC (rev 13257) @@ -2792,7 +2792,7 @@ KernelMode, FALSE, Delay); - if(!NT_SUCCESS(Status)) + if(!NT_SUCCESS(Status) || STATUS_TIMEOUT) { #ifndef NDEBUG if(Status == STATUS_TIMEOUT)

19 years, 11 months

[gvg] 13256: Implement IO_NO_PARAMETER_CHECKING flag

by gvg＠svn.reactos.com

Implement IO_NO_PARAMETER_CHECKING flag Modified: trunk/reactos/include/ddk/iodef.h Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c _____ Modified: trunk/reactos/include/ddk/iodef.h --- trunk/reactos/include/ddk/iodef.h 2005-01-24 21:25:27 UTC (rev 13255) +++ trunk/reactos/include/ddk/iodef.h 2005-01-24 22:02:09 UTC (rev 13256) @@ -161,6 +161,11 @@ #define SL_INVOKE_ON_ERROR 0x80 /* + * IoCreateFile options + */ +#define IO_NO_PARAMETER_CHECKING 0x100 + +/* * Possible flags for the device object flags */ #define DO_UNLOAD_PENDING 0x00000001 _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-01-24 21:25:27 UTC (rev 13255) +++ trunk/reactos/ntoskrnl/io/create.c 2005-01-24 22:02:09 UTC (rev 13256) @@ -321,7 +321,7 @@ * @implemented */ NTSTATUS STDCALL -IoCreateFile(OUT PHANDLE FileHandle, +IoCreateFile(OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, @@ -341,7 +341,9 @@ PIRP Irp; PIO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode; + HANDLE LocalFileHandle; + IO_STATUS_BLOCK LocalIoStatusBlock; DPRINT("IoCreateFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -350,14 +352,14 @@ ASSERT_IRQL(PASSIVE_LEVEL); - if (IoStatusBlock == NULL) - return STATUS_ACCESS_VIOLATION; + if (IoStatusBlock == NULL || FileHandle == NULL) + return STATUS_ACCESS_VIOLATION; - *FileHandle = 0; + LocalFileHandle = 0; PreviousMode = ExGetPreviousMode(); - Status = ObCreateObject(PreviousMode, + Status = ObCreateObject(0 == (Options & IO_NO_PARAMETER_CHECKING) ? PreviousMode : KernelMode, IoFileObjectType, ObjectAttributes, PreviousMode, @@ -380,7 +382,7 @@ DesiredAccess, 0, NULL, - FileHandle); + &LocalFileHandle); if (!NT_SUCCESS(Status)) { DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); @@ -418,14 +420,14 @@ Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); if (Irp == NULL) { - ZwClose(*FileHandle); + ZwClose(LocalFileHandle); return STATUS_UNSUCCESSFUL; } //trigger FileObject/Event dereferencing Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; + Irp->UserIosb = &LocalIoStatusBlock; Irp->AssociatedIrp.SystemBuffer = EaBuffer; Irp->Tail.Overlay.AuxiliaryBuffer = NULL; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -493,7 +495,7 @@ PreviousMode, FALSE, NULL); - Status = IoStatusBlock->Status; + Status = LocalIoStatusBlock.Status; } if (!NT_SUCCESS(Status)) { @@ -501,8 +503,35 @@ FileObject->DeviceObject = NULL; FileObject->Vpb = NULL; - ZwClose(*FileHandle); + ZwClose(LocalFileHandle); } + else + { + if (KernelMode == PreviousMode || 0 != (Options & IO_NO_PARAMETER_CHECKING)) + { + *FileHandle = LocalFileHandle; + *IoStatusBlock = LocalIoStatusBlock; + } + else + { + _SEH_TRY + { + ProbeForWrite(FileHandle, + sizeof(HANDLE), + sizeof(ULONG)); + *FileHandle = LocalFileHandle; + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + *IoStatusBlock = LocalIoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } ASSERT_IRQL(PASSIVE_LEVEL); _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-01-24 21:25:27 UTC (rev 13255) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-01-24 22:02:09 UTC (rev 13256) @@ -833,7 +833,7 @@ 0, CreateFileTypeNone, NULL, - SL_OPEN_PAGING_FILE); + SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); RtlReleaseCapturedUnicodeString(&CapturedFileName, PreviousMode, FALSE);

19 years, 11 months

[mf] 13255: adjust properties (CRLF line endlings, ignores)

by mf＠svn.reactos.com

adjust properties (CRLF line endlings, ignores) Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Modified: trunk/reactos/subsys/system/explorer/explorer.dsw Modified: trunk/reactos/subsys/system/explorer/make_explorer.dsp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsp --- trunk/reactos/subsys/system/explorer/explorer.dsp 2005-01-24 21:21:17 UTC (rev 13254) +++ trunk/reactos/subsys/system/explorer/explorer.dsp 2005-01-24 21:25:27 UTC (rev 13255) @@ -1,789 +1,789 @@ -# Microsoft Developer Studio Project File - Name="explorer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=explorer - Win32 WineDll -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "explorer.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "explorer.mak" CFG="explorer - Win32 WineDll" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "explorer - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 Debug Release" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 Unicode Release" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 _NO_COMUTIL" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 WineRelease" (based on "Win32 (x86) Console Application") -!MESSAGE "explorer - Win32 WineDll" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "explorer - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O1 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /Yu"precomp.h" /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 Debug Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DRelease" -# PROP BASE Intermediate_Dir "DRelease" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "DRelease" -# PROP Intermediate_Dir "DRelease" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_ROS_" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "URelease" -# PROP BASE Intermediate_Dir "URelease" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "URelease" -# PROP Intermediate_Dir "URelease" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /Yu"precomp.h" /FD /c -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 Unicode Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "UDebug" -# PROP BASE Intermediate_Dir "UDebug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "UDebug" -# PROP Intermediate_Dir "UDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 _NO_COMUTIL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "explorer___Win32__NO_COMUTIL" -# PROP BASE Intermediate_Dir "explorer___Win32__NO_COMUTIL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "_NO_COMUTIL" -# PROP Intermediate_Dir "_NO_COMUTIL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_ROS_" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "_NO_COMUTIL" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Win32" -# PROP BASE Intermediate_Dir "Win32" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32" -# PROP Intermediate_Dir "Win32" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_ROS_" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Win32/wexplorer.exe" /pdbtype:sept /delayload:oleaut32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 WineRelease" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "explorer___Win32_WineRelease" -# PROP BASE Intermediate_Dir "explorer___Win32_WineRelease" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "WineRelease" -# PROP Intermediate_Dir "WineRelease" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_ROS_" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /Yu"precomp.h" /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /incremental:no /machine:I386 /out:"WineRelease/wexplorer.exe" /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "explorer - Win32 WineDll" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "explorer___Win32_WineDll" -# PROP BASE Intermediate_Dir "explorer___Win32_WineDll" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "WineDll" -# PROP Intermediate_Dir "WineDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_ROS_" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /Yu"precomp.h" /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none /debug -# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /out:"WineDll/wexplorer.exe" /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "explorer - Win32 Release" -# Name "explorer - Win32 Debug" -# Name "explorer - Win32 Debug Release" -# Name "explorer - Win32 Unicode Release" -# Name "explorer - Win32 Unicode Debug" -# Name "explorer - Win32 _NO_COMUTIL" -# Name "explorer - Win32" -# Name "explorer - Win32 WineRelease" -# Name "explorer - Win32 WineDll" -# Begin Group "utility" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\utility\dragdropimpl.cpp -# End Source File -# Begin Source File - -SOURCE=.\utility\dragdropimpl.h -# End Source File -# Begin Source File - -SOURCE=.\utility\shellbrowserimpl.cpp -# End Source File -# Begin Source File - -SOURCE=.\utility\shellbrowserimpl.h -# End Source File -# Begin Source File - -SOURCE=.\utility\shellclasses.cpp -# End Source File -# Begin Source File - -SOURCE=.\utility\shellclasses.h -# End Source File -# Begin Source File - -SOURCE=.\utility\treedroptarget.h -# End Source File -# Begin Source File - -SOURCE=.\utility\utility.cpp -# End Source File -# Begin Source File - -SOURCE=.\utility\utility.h -# End Source File -# Begin Source File - -SOURCE=.\utility\window.cpp -# End Source File -# Begin Source File - -SOURCE=.\utility\window.h -# End Source File -# Begin Source File - -SOURCE=.\utility\xmlstorage.cpp -# End Source File -# Begin Source File - -SOURCE=.\utility\xmlstorage.h -# End Source File -# End Group -# Begin Group "resources" - -# PROP Default_Filter "bmp,ico" -# Begin Source File - -SOURCE=.\res\action.ico -# End Source File -# Begin Source File - -SOURCE=.\res\appicon.ico -# End Source File -# Begin Source File - -SOURCE=.\res\apps.ico -# End Source File -# Begin Source File - -SOURCE=.\res\arrow.ico -# End Source File -# Begin Source File - -SOURCE=.\res\arrow_dwn.ico -# End Source File -# Begin Source File - -SOURCE=.\res\arrow_up.ico -# End Source File -# Begin Source File - -SOURCE=.\res\arrowsel.ico -# End Source File -# Begin Source File - -SOURCE=.\res\computer.ico -# End Source File -# Begin Source File - -SOURCE=.\res\config.ico -# End Source File -# Begin Source File - -SOURCE=.\res\documents.ico -# End Source File -# Begin Source File - -SOURCE=.\res\dot.ico -# End Source File -# Begin Source File - -SOURCE=.\res\dot_red.ico -# End Source File -# Begin Source File - -SOURCE=.\res\dot_trans.ico -# End Source File -# Begin Source File - -SOURCE=.\res\drivebar.bmp -# End Source File -# Begin Source File - -SOURCE=".\explorer-jp.rc" -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\res\explorer.ico -# End Source File -# Begin Source File - -SOURCE=.\explorer_intres.h -# End Source File -# Begin Source File - -SOURCE=.\explorer_intres.rc -# End Source File -# Begin Source File - -SOURCE=.\res\favorites.ico -# End Source File -# Begin Source File - -SOURCE=.\res\floating.ico -# End Source File -# Begin Source File - -SOURCE=.\res\folder.ico -# End Source File -# Begin Source File - -SOURCE=.\res\icoali10.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig0.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig1.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig2.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig3.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig4.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig5.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig6.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig7.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig8.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\icoalig9.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\images.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\info.ico -# End Source File -# Begin Source File - -SOURCE=.\res\logoff.ico -# End Source File -# Begin Source File - -SOURCE=.\res\logov.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\logov16.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\logov256.bmp -# End Source File -# Begin Source File - -SOURCE=.\res\network.ico -# End Source File -# Begin Source File - -SOURCE=.\res\notify_l.ico -# End Source File -# Begin Source File - -SOURCE=.\res\notify_r.ico -# End Source File -# Begin Source File - -SOURCE=.\res\printer.ico -# End Source File -# Begin Source File - -SOURCE=.\res\reactos.ico -# End Source File -# Begin Source File - -SOURCE=".\res\ros-big.ico" -# End Source File -# Begin Source File - -SOURCE=".\res\search-doc.ico" -# End Source File -# Begin Source File - -SOURCE=.\res\search.ico -# End Source File -# Begin Source File - -SOURCE=.\res\speaker.ico -# End Source File -# Begin Source File - -SOURCE=.\res\startmenu.ico -# End Source File -# Begin Source File - -SOURCE=.\res\toolbar.bmp -# End Source File -# End Group -# Begin Group "taskbar" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\taskbar\desktopbar.cpp -# End Source File -# Begin Source File - -SOURCE=.\taskbar\desktopbar.h -# End Source File -# Begin Source File - -SOURCE=.\taskbar\favorites.cpp -# End Source File -# Begin Source File - -SOURCE=.\taskbar\favorites.h -# End Source File -# Begin Source File - -SOURCE=.\notifyhook\notifyhook.h -# End Source File -# Begin Source File - -SOURCE=.\taskbar\quicklaunch.cpp -# End Source File -# Begin Source File - -SOURCE=.\taskbar\quicklaunch.h -# End Source File -# Begin Source File - -SOURCE=.\taskbar\startmenu.cpp -# End Source File -# Begin Source File - -SOURCE=.\taskbar\startmenu.h -# End Source File -# Begin Source File - -SOURCE=.\taskbar\taskbar.cpp -# End Source File -# Begin Source File - -SOURCE=.\taskbar\taskbar.h -# End Source File -# Begin Source File - -SOURCE=.\taskbar\traynotify.cpp -# End Source File -# Begin Source File - -SOURCE=.\taskbar\traynotify.h -# End Source File -# End Group -# Begin Group "desktop" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\desktop\desktop.cpp -# End Source File -# Begin Source File - -SOURCE=.\desktop\desktop.h -# End Source File -# End Group -# Begin Group "doc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\doc\changes.txt -# End Source File -# Begin Source File - -SOURCE=.\doc\readme.txt -# End Source File -# Begin Source File - -SOURCE=.\doc\TODO.txt -# End Source File -# End Group -# Begin Group "shell" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\shell\entries.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\entries.h -# End Source File -# Begin Source File - -SOURCE=.\shell\fatfs.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\fatfs.h -# End Source File -# Begin Source File - -SOURCE=.\shell\filechild.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\filechild.h -# End Source File -# Begin Source File - -SOURCE=.\shell\mainframe.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\mainframe.h -# End Source File -# Begin Source File - -SOURCE=.\shell\ntobjfs.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\ntobjfs.h -# End Source File -# Begin Source File - -SOURCE=.\shell\pane.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\pane.h -# End Source File -# Begin Source File - -SOURCE=.\shell\regfs.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\regfs.h -# End Source File -# Begin Source File - -SOURCE=.\shell\shellbrowser.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\shellbrowser.h -# End Source File -# Begin Source File - -SOURCE=.\shell\shellfs.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\shellfs.h -# End Source File -# Begin Source File - -SOURCE=.\shell\startup.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\shell\unixfs.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\shell\unixfs.h -# End Source File -# Begin Source File - -SOURCE=.\shell\webchild.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\webchild.h -# End Source File -# Begin Source File - -SOURCE=.\shell\winfs.cpp -# End Source File -# Begin Source File - -SOURCE=.\shell\winfs.h -# End Source File -# End Group -# Begin Group "dialogs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\dialogs\searchprogram.cpp -# End Source File -# Begin Source File - -SOURCE=.\dialogs\searchprogram.h -# End Source File -# Begin Source File - -SOURCE=.\dialogs\settings.cpp -# End Source File -# Begin Source File - -SOURCE=.\dialogs\settings.h -# End Source File -# End Group -# Begin Group "main" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\explorer.cpp -# End Source File -# Begin Source File - -SOURCE=.\explorer.h -# End Source File -# Begin Source File - -SOURCE=.\externals.h -# End Source File -# Begin Source File - -SOURCE=.\globals.h -# End Source File -# Begin Source File - -SOURCE=".\i386-stub-win32.c" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\precomp.cpp -# ADD CPP /Yc"precomp.h" -# End Source File -# Begin Source File - -SOURCE=.\precomp.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="explorer" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=explorer - Win32 WineDll +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "explorer.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "explorer.mak" CFG="explorer - Win32 WineDll" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "explorer - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 Debug Release" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 Unicode Release" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 _NO_COMUTIL" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 WineRelease" (based on "Win32 (x86) Console Application") +!MESSAGE "explorer - Win32 WineDll" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "explorer - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O1 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "explorer - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "explorer - Win32 Debug Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "DRelease" +# PROP BASE Intermediate_Dir "DRelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "DRelease" +# PROP Intermediate_Dir "DRelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_ROS_" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "explorer - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "URelease" +# PROP BASE Intermediate_Dir "URelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "URelease" +# PROP Intermediate_Dir "URelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /libpath:"Release" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "explorer - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "UDebug" +# PROP BASE Intermediate_Dir "UDebug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "UDebug" +# PROP Intermediate_Dir "UDebug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"Debug" /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "explorer - Win32 _NO_COMUTIL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "explorer___Win32__NO_COMUTIL" +# PROP BASE Intermediate_Dir "explorer___Win32__NO_COMUTIL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "_NO_COMUTIL" +# PROP Intermediate_Dir "_NO_COMUTIL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_ROS_" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "_NO_COMUTIL" /D "WIN32" /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "explorer - Win32" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Win32" +# PROP BASE Intermediate_Dir "Win32" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32" +# PROP Intermediate_Dir "Win32" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" [truncated at 1000 lines; 1142 more skipped]

19 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005