Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[jimtabor] 16541: Start integrating and implementing key board functions. More Wine porting with ROS.

by jimtabor＠svn.reactos.com

Start integrating and implementing key board functions. More Wine porting with ROS. Modified: trunk/reactos/include/win32k/ntuser.h _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-07-12 01:56:14 UTC (rev 16540) +++ trunk/reactos/include/win32k/ntuser.h 2005-07-12 02:45:33 UTC (rev 16541) @@ -187,6 +187,8 @@ #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x0d #define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0x10 #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 +#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 +#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 DWORD STDCALL NtUserCallOneParam( @@ -741,6 +743,11 @@ DWORD Unknown1, DWORD Unknown2); +HKL +STDCALL +NtUserGetKeyboardLayout( + DWORD dwThreadid); + DWORD STDCALL NtUserGetKeyboardLayoutList( @@ -759,10 +766,15 @@ DWORD STDCALL -NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); +NtUserGetKeyboardType( + DWORD TypeFlag); DWORD STDCALL +NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); + +DWORD +STDCALL NtUserGetKeyState( DWORD Unknown0);

19 years, 3 months

[ion] 16540: Partial patch of larger rosrtl removal patch. This one merely is a structure fix patch, and renames/corrects RTL_USER_PROCESS_INFORMATION (which had the totally wrong names) as well as updates the TEB to the latest version. It also fixes SECTION_IMAGE_INFORMATION to have the right format and names. Also, some callers of CreateProcessW are modified to not send a constant string as lpCommandLine (this was illegal and will crash on Windows/my patch). INITIAL_TEB was also renamed to the

by ion＠svn.reactos.com

Partial patch of larger rosrtl removal patch. This one merely is a structure fix patch, and renames/corrects RTL_USER_PROCESS_INFORMATION (which had the totally wrong names) as well as updates the TEB to the latest version. It also fixes SECTION_IMAGE_INFORMATION to have the right format and names. Also, some callers of CreateProcessW are modified to not send a constant string as lpCommandLine (this was illegal and will crash on Windows/my patch). INITIAL_TEB was also renamed to the more correct fields, although they won't make sense with the current rosrtl/rtl implementation, the names will only make sense with the next patch. Finally NtTerminateThread was fixed to support sending NULL as handle, and PspExitThread was updated to work with the new FreestackOnExit flag, both of which will be used in the next patch. Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/lib/gdi32/main/dllmain.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/handle.c Modified: trunk/reactos/lib/kernel32/misc/ldr.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/lib/kernel32/synch/wait.c Modified: trunk/reactos/lib/kernel32/thread/fiber.c Modified: trunk/reactos/lib/kernel32/thread/fls.c Modified: trunk/reactos/lib/ntdll/dbg/debug.c Modified: trunk/reactos/lib/ntdll/rtl/path.c Modified: trunk/reactos/lib/rosrtl/thread/i386/context.c Modified: trunk/reactos/lib/rosrtl/thread/stack.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ldr/init.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/debug.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.h Modified: trunk/reactos/subsys/system/winlogon/winlogon.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/fixmes.txt 2005-07-12 01:56:14 UTC (rev 16540) @@ -26,14 +26,15 @@ - Object Directory + implementation doesn't match NT (Alex) [obtypes.h] Priority 3: + - Some RTL Structures need review (Alex) [rtltypes.h] - Pushlock support is needed to fix EPROCESS (Alex) [pstypes.h] - MADDRESS_SPACE must be converted into the NT Type (Alex) [pstypes.h, mmtypes.h] Priority 4: - FIXED: Kernel and Memory Types are not architecture-specific (Eric) [ketypes.h, mmtypes.h] - - Win32K Builds with windows.h [extypes.h, ketypes.h] + - Win32K Builds with windows.h (Filip, bugzilla id 666) [extypes.h, ketypes.h] Priority 5: - LPC Types are totally wrong. [lpctypes.h] - Missing System Info Classes [zwtypes.h] - - Process Priority Classes are messed up [pstypes.h] \ No newline at end of file + - Process Priority Classes are messed up (Alex) [pstypes.h] _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/pstypes.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -93,12 +93,6 @@ struct _ETHREAD; -typedef struct _CURDIR -{ - UNICODE_STRING DosPath; - PVOID Handle; -} CURDIR, *PCURDIR; - typedef struct _DESCRIPTOR_TABLE_ENTRY { ULONG Selector; @@ -181,75 +175,101 @@ typedef struct _INITIAL_TEB { + PVOID PreviousStackBase; + PVOID PreviousStackLimit; PVOID StackBase; PVOID StackLimit; - PVOID StackCommit; - PVOID StackCommitMax; - PVOID StackReserved; + PVOID AllocatedStackBase; } INITIAL_TEB, *PINITIAL_TEB; +typedef struct _TEB_ACTIVE_FRAME_CONTEXT +{ + ULONG Flags; + LPSTR FrameName; +} TEB_ACTIVE_FRAME_CONTEXT, *PTEB_ACTIVE_FRAME_CONTEXT; + +typedef struct _TEB_ACTIVE_FRAME +{ + ULONG Flags; + struct _TEB_ACTIVE_FRAME *Previous; + PTEB_ACTIVE_FRAME_CONTEXT Context; +} TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME; + typedef struct _TEB { - NT_TIB Tib; /* 00h */ - PVOID EnvironmentPointer; /* 1Ch */ - CLIENT_ID Cid; /* 20h */ - PVOID ActiveRpcInfo; /* 28h */ - PVOID ThreadLocalStoragePointer; /* 2Ch */ - struct _PEB *Peb; /* 30h */ - ULONG LastErrorValue; /* 34h */ - ULONG CountOfOwnedCriticalSections; /* 38h */ - PVOID CsrClientThread; /* 3Ch */ - struct _W32THREAD* Win32ThreadInfo; /* 40h */ - ULONG Win32ClientInfo[0x1F]; /* 44h */ - PVOID WOW32Reserved; /* C0h */ - LCID CurrentLocale; /* C4h */ - ULONG FpSoftwareStatusRegister; /* C8h */ - PVOID SystemReserved1[0x36]; /* CCh */ - PVOID Spare1; /* 1A4h */ - LONG ExceptionCode; /* 1A8h */ - UCHAR SpareBytes1[0x28]; /* 1ACh */ - PVOID SystemReserved2[0xA]; /* 1D4h */ - GDI_TEB_BATCH GdiTebBatch; /* 1FCh */ - ULONG gdiRgn; /* 6DCh */ - ULONG gdiPen; /* 6E0h */ - ULONG gdiBrush; /* 6E4h */ - CLIENT_ID RealClientId; /* 6E8h */ - PVOID GdiCachedProcessHandle; /* 6F0h */ - ULONG GdiClientPID; /* 6F4h */ - ULONG GdiClientTID; /* 6F8h */ - PVOID GdiThreadLocaleInfo; /* 6FCh */ - PVOID UserReserved[5]; /* 700h */ - PVOID glDispatchTable[0x118]; /* 714h */ - ULONG glReserved1[0x1A]; /* B74h */ - PVOID glReserved2; /* BDCh */ - PVOID glSectionInfo; /* BE0h */ - PVOID glSection; /* BE4h */ - PVOID glTable; /* BE8h */ - PVOID glCurrentRC; /* BECh */ - PVOID glContext; /* BF0h */ - NTSTATUS LastStatusValue; /* BF4h */ - UNICODE_STRING StaticUnicodeString; /* BF8h */ - WCHAR StaticUnicodeBuffer[0x105]; /* C00h */ - PVOID DeallocationStack; /* E0Ch */ - PVOID TlsSlots[0x40]; /* E10h */ - LIST_ENTRY TlsLinks; /* F10h */ - PVOID Vdm; /* F18h */ - PVOID ReservedForNtRpc; /* F1Ch */ - PVOID DbgSsReserved[0x2]; /* F20h */ - ULONG HardErrorDisabled; /* F28h */ - PVOID Instrumentation[0x10]; /* F2Ch */ - PVOID WinSockData; /* F6Ch */ - ULONG GdiBatchCount; /* F70h */ - USHORT _Spare2; /* F74h */ - BOOLEAN IsFiber; /* F76h */ - UCHAR Spare3; /* F77h */ - ULONG _Spare4; /* F78h */ - ULONG _Spare5; /* F7Ch */ - PVOID ReservedForOle; /* F80h */ - ULONG WaitingOnLoaderLock; /* F84h */ - ULONG _Unknown[11]; /* F88h */ - PVOID FlsSlots; /* FB4h */ - PVOID WineDebugInfo; /* Needed for WINE DLL's */ + NT_TIB Tib; /* 00h */ + PVOID EnvironmentPointer; /* 1Ch */ + CLIENT_ID Cid; /* 20h */ + PVOID ActiveRpcHandle; /* 28h */ + PVOID ThreadLocalStoragePointer; /* 2Ch */ + struct _PEB *ProcessEnvironmentBlock; /* 30h */ + ULONG LastErrorValue; /* 34h */ + ULONG CountOfOwnedCriticalSections; /* 38h */ + PVOID CsrClientThread; /* 3Ch */ + struct _W32THREAD* Win32ThreadInfo; /* 40h */ + ULONG User32Reserved[0x1A]; /* 44h */ + ULONG UserReserved[5]; /* ACh */ + PVOID WOW32Reserved; /* C0h */ + LCID CurrentLocale; /* C4h */ + ULONG FpSoftwareStatusRegister; /* C8h */ + PVOID SystemReserved1[0x36]; /* CCh */ + LONG ExceptionCode; /* 1A4h */ + struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; /* 1A8h */ + UCHAR SpareBytes1[0x28]; /* 1ACh */ + GDI_TEB_BATCH GdiTebBatch; /* 1D4h */ + CLIENT_ID RealClientId; /* 6B4h */ + PVOID GdiCachedProcessHandle; /* 6BCh */ + ULONG GdiClientPID; /* 6C0h */ + ULONG GdiClientTID; /* 6C4h */ + PVOID GdiThreadLocalInfo; /* 6C8h */ + ULONG Win32ClientInfo[62]; /* 6CCh */ + PVOID glDispatchTable[0xE9]; /* 7C4h */ + ULONG glReserved1[0x1D]; /* B68h */ + PVOID glReserved2; /* BDCh */ + PVOID glSectionInfo; /* BE0h */ + PVOID glSection; /* BE4h */ + PVOID glTable; /* BE8h */ + PVOID glCurrentRC; /* BECh */ + PVOID glContext; /* BF0h */ + NTSTATUS LastStatusValue; /* BF4h */ + UNICODE_STRING StaticUnicodeString; /* BF8h */ + WCHAR StaticUnicodeBuffer[0x105]; /* C00h */ + PVOID DeallocationStack; /* E0Ch */ + PVOID TlsSlots[0x40]; /* E10h */ + LIST_ENTRY TlsLinks; /* F10h */ + PVOID Vdm; /* F18h */ + PVOID ReservedForNtRpc; /* F1Ch */ + PVOID DbgSsReserved[0x2]; /* F20h */ + ULONG HardErrorDisabled; /* F28h */ + PVOID Instrumentation[14]; /* F2Ch */ + PVOID SubProcessTag; /* F64h */ + PVOID EtwTraceData; /* F68h */ + PVOID WinSockData; /* F6Ch */ + ULONG GdiBatchCount; /* F70h */ + BOOLEAN InDbgPrint; /* F74h */ + BOOLEAN FreeStackOnTermination; /* F75h */ + BOOLEAN HasFiberData; /* F76h */ + UCHAR IdealProcessor; /* F77h */ + ULONG GuaranteedStackBytes; /* F78h */ + PVOID ReservedForPerf; /* F7Ch */ + PVOID ReservedForOle; /* F80h */ + ULONG WaitingOnLoaderLock; /* F84h */ + ULONG SparePointer1; /* F88h */ + ULONG SoftPatchPtr1; /* F8Ch */ + ULONG SoftPatchPtr2; /* F90h */ + PVOID *TlsExpansionSlots; /* F94h */ + ULONG ImpersionationLocale; /* F98h */ + ULONG IsImpersonating; /* F9Ch */ + PVOID NlsCache; /* FA0h */ + PVOID pShimData; /* FA4h */ + ULONG HeapVirualAffinity; /* FA8h */ + PVOID CurrentTransactionHandle; /* FACh */ + PTEB_ACTIVE_FRAME ActiveFrame; /* FB0h */ + PVOID FlsData; /* FB4h */ + UCHAR SafeThunkCall; /* FB8h */ + UCHAR BooleanSpare[3]; /* FB9h */ + /* FIXME: Needed for WINE DLL's */ + PVOID WineDebugInfo; /* FBCh */ } TEB, *PTEB; /* KERNEL MODE ONLY **********************************************************/ _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -1049,7 +1049,7 @@ IN BOOLEAN CurrentDirectory, IN HANDLE DebugPort OPTIONAL, IN HANDLE ExceptionPort OPTIONAL, - OUT PRTL_PROCESS_INFO ProcessInfo + OUT PRTL_USER_PROCESS_INFORMATION ProcessInfo ); NTSTATUS @@ -1059,8 +1059,8 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN BOOLEAN CreateSuspended, IN LONG StackZeroBits, - IN OUT PULONG StackReserve, - IN OUT PULONG StackCommit, + IN ULONG StackReserve, + IN ULONG StackCommit, IN PTHREAD_START_ROUTINE StartAddress, IN PVOID Parameter, IN OUT PHANDLE ThreadHandle, @@ -1075,11 +1075,11 @@ STDCALL RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); -NTSTATUS +VOID STDCALL RtlExitUserThread(NTSTATUS Status); -NTSTATUS +VOID STDCALL RtlInitializeContext( IN HANDLE ProcessHandle, _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/rtltypes.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -17,10 +17,18 @@ /* CONSTANTS *****************************************************************/ #define MAXIMUM_LEADBYTES 12 -#define PPF_NORMALIZED (1) +#define PPF_NORMALIZED 0x01 +#define PPF_PROFILE_USER 0x02 +#define PPF_PROFILE_SERVER 0x04 +#define PPF_PROFILE_KERNEL 0x08 -#define PEB_BASE (0x7FFDF000) +#define PPF_RESERVE_1MB 0x20 +#define PPF_DISABLE_HEAP_CHECKS 0x100 +#define PPF_PROCESS_OR_1 0x200 +#define PPF_PROCESS_OR_2 0x400 +#define PEB_BASE (0x7FFDF000) + #define EXCEPTION_CONTINUE_SEARCH 0 #define EXCEPTION_EXECUTE_HANDLER 1 @@ -218,6 +226,12 @@ ULONG ModuleCount; DEBUG_MODULE_INFORMATION ModuleEntry[1]; } MODULE_INFORMATION, *PMODULE_INFORMATION; + +typedef struct _RTL_HEAP_DEFINITION +{ + ULONG Length; + ULONG Unknown[11]; +} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; /* END REVIEW AREA */ typedef struct _EXCEPTION_REGISTRATION @@ -229,6 +243,12 @@ typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD; typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD; +typedef struct _CURDIR +{ + UNICODE_STRING DosPath; + HANDLE Handle; +} CURDIR, *PCURDIR; + typedef struct RTL_DRIVE_LETTER_CURDIR { USHORT Flags; @@ -237,12 +257,6 @@ UNICODE_STRING DosPath; } RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; -typedef struct _RTL_HEAP_DEFINITION -{ - ULONG Length; - ULONG Unknown[11]; -} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; - typedef struct _RTL_RANGE_LIST { LIST_ENTRY ListHead; @@ -323,44 +337,44 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { - ULONG AllocationSize; - ULONG Size; - ULONG Flags; - ULONG DebugFlags; - HANDLE hConsole; - ULONG ProcessGroup; - HANDLE hStdInput; - HANDLE hStdOutput; - HANDLE hStdError; - UNICODE_STRING CurrentDirectoryName; - HANDLE CurrentDirectoryHandle; - UNICODE_STRING DllPath; - UNICODE_STRING ImagePathName; - UNICODE_STRING CommandLine; - PWSTR Environment; - ULONG dwX; - ULONG dwY; - ULONG dwXSize; - ULONG dwYSize; - ULONG dwXCountChars; - ULONG dwYCountChars; - ULONG dwFillAttribute; - ULONG dwFlags; - ULONG wShowWindow; - UNICODE_STRING WindowTitle; - UNICODE_STRING DesktopInfo; - UNICODE_STRING ShellInfo; - UNICODE_STRING RuntimeInfo; + ULONG MaximumLength; + ULONG Length; + ULONG Flags; + ULONG DebugFlags; + HANDLE ConsoleHandle; + ULONG ConsoleFlags; + HANDLE StandardInput; + HANDLE StandardOutput; + HANDLE StandardError; + CURDIR CurrentDirectory; + UNICODE_STRING DllPath; + UNICODE_STRING ImagePathName; + UNICODE_STRING CommandLine; + PWSTR Environment; + ULONG StartingX; + ULONG StartingY; + ULONG CountX; + ULONG CountY; + ULONG CountCharsX; + ULONG CountCharsY; + ULONG FillAttribute;; + ULONG WindowFlags; + ULONG ShowWindowFlags; + UNICODE_STRING WindowTitle; + UNICODE_STRING DesktopInfo; + UNICODE_STRING ShellInfo; + UNICODE_STRING RuntimeData; + RTL_DRIVE_LETTER_CURDIR CurrentDirectories[32]; } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; -typedef struct _RTL_PROCESS_INFO +typedef struct _RTL_USER_PROCESS_INFORMATION { - ULONG Size; - HANDLE ProcessHandle; - HANDLE ThreadHandle; - CLIENT_ID ClientId; - SECTION_IMAGE_INFORMATION ImageInfo; -} RTL_PROCESS_INFO, *PRTL_PROCESS_INFO; + ULONG Size; + HANDLE ProcessHandle; + HANDLE ThreadHandle; + CLIENT_ID ClientId; + SECTION_IMAGE_INFORMATION ImageInformation; +} RTL_USER_PROCESS_INFORMATION, *PRTL_USER_PROCESS_INFORMATION; typedef struct _RTL_ATOM_TABLE_ENTRY { _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/umfuncs.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -122,7 +122,7 @@ ULONG Unknown2 ); -NTSTATUS +VOID STDCALL DbgUiRemoteBreakin(VOID); _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -3693,6 +3693,7 @@ IN HANDLE ThreadHandle, IN NTSTATUS ExitStatus ); + NTSTATUS STDCALL ZwTerminateThread( _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/zwtypes.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -427,19 +427,22 @@ /* Class 1 */ typedef struct _SECTION_IMAGE_INFORMATION { - ULONG EntryPoint; - ULONG Unknown1; - ULONG_PTR StackReserve; - ULONG_PTR StackCommit; - ULONG Subsystem; - USHORT MinorSubsystemVersion; - USHORT MajorSubsystemVersion; - ULONG Unknown2; - ULONG Characteristics; - USHORT ImageNumber; - BOOLEAN Executable; - UCHAR Unknown3; - ULONG Unknown4[3]; + PVOID TransferAddress; + ULONG ZeroBits; + ULONG MaximumStackSize; + ULONG CommittedStackSize; + ULONG SubsystemType; + USHORT SubSystemMinorVersion; + USHORT SubSystemMajorVersion; + ULONG GpValue; + USHORT ImageCharacteristics; + USHORT DllChracteristics; + USHORT Machine; + UCHAR ImageContainsCode; + UCHAR Spare1; + ULONG LoaderFlags; + ULONG ImageFileSIze; + ULONG Reserved[1]; } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; /* _____ Modified: trunk/reactos/lib/gdi32/main/dllmain.c --- trunk/reactos/lib/gdi32/main/dllmain.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/gdi32/main/dllmain.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -32,7 +32,7 @@ hProcessHeap = GetProcessHeap(); /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->Peb->GdiSharedHandleTable; + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; } _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/file/file.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -534,15 +534,15 @@ switch ((ULONG)hFile) { case STD_INPUT_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->hStdInput; + hFile = NtCurrentPeb()->ProcessParameters->StandardInput; break; case STD_OUTPUT_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->hStdOutput; + hFile = NtCurrentPeb()->ProcessParameters->StandardOutput; break; case STD_ERROR_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->hStdError; + hFile = NtCurrentPeb()->ProcessParameters->StandardError; break; } _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -23,6 +23,9 @@ #define FIELD_OFFSET(type,fld) ((LONG)&(((type *)0)->fld)) #endif +#define IsConsoleHandle(h) \ + ((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE + #define SetLastErrorByStatus(__S__) \ ((void)SetLastError(RtlNtStatusToDosError(__S__))) @@ -47,8 +50,6 @@ /* FUNCTION PROTOTYPES *******************************************************/ -BOOL STDCALL IsConsoleHandle(HANDLE Handle); - BOOL STDCALL VerifyConsoleIoHandle(HANDLE Handle); BOOL STDCALL CloseConsoleHandle(HANDLE Handle); _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -91,7 +91,7 @@ RtlEnterCriticalSection(&ConsoleLock); if(!(nCode == CTRL_C_EVENT && - NtCurrentPeb()->ProcessParameters->ProcessGroup & 1)) + NtCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) { for(i = NrCtrlHandlers; i > 0; -- i) if(CtrlHandlers[i - 1](nCode)) break; @@ -110,7 +110,7 @@ RtlEnterCriticalSection(&ConsoleLock); if(!(nCode == CTRL_C_EVENT && - NtCurrentPeb()->ProcessParameters->ProcessGroup & 1)) + NtCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) { i = NrCtrlHandlers; while(i > 0) @@ -1012,22 +1012,7 @@ return TRUE; } - /* - * internal function - */ -BOOL STDCALL -IsConsoleHandle(HANDLE Handle) -{ - if ((((ULONG)Handle) & 0x10000003) == 0x3) - { - return(TRUE); - } - return(FALSE); -} - - -/* * @implemented */ HANDLE STDCALL @@ -1047,13 +1032,13 @@ switch (nStdHandle) { case STD_INPUT_HANDLE: - return Ppb->hStdInput; + return Ppb->StandardInput; case STD_OUTPUT_HANDLE: - return Ppb->hStdOutput; + return Ppb->StandardOutput; case STD_ERROR_HANDLE: - return Ppb->hStdError; + return Ppb->StandardError; } SetLastError (ERROR_INVALID_PARAMETER); @@ -1085,15 +1070,15 @@ switch (nStdHandle) { case STD_INPUT_HANDLE: - Ppb->hStdInput = hHandle; + Ppb->StandardInput = hHandle; return TRUE; case STD_OUTPUT_HANDLE: - Ppb->hStdOutput = hHandle; + Ppb->StandardOutput = hHandle; return TRUE; case STD_ERROR_HANDLE: - Ppb->hStdError = hHandle; + Ppb->StandardError = hHandle; return TRUE; } @@ -1347,7 +1332,7 @@ NTSTATUS Status; HANDLE hStdError; - if(NtCurrentPeb()->ProcessParameters->hConsole) + if(NtCurrentPeb()->ProcessParameters->ConsoleHandle) { DPRINT("AllocConsole: Allocate duplicate console to the same Process\n"); SetLastErrorByStatus (STATUS_OBJECT_NAME_EXISTS); @@ -1363,7 +1348,7 @@ SetLastErrorByStatus ( Status ); return FALSE; } - NtCurrentPeb()->ProcessParameters->hConsole = Request.Data.AllocConsoleRequest.Console; + NtCurrentPeb()->ProcessParameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console; SetStdHandle( STD_INPUT_HANDLE, Request.Data.AllocConsoleRequest.InputHandle ); SetStdHandle( STD_OUTPUT_HANDLE, Request.Data.AllocConsoleRequest.OutputHandle ); hStdError = DuplicateConsoleHandle(Request.Data.AllocConsoleRequest.OutputHandle, _____ Modified: trunk/reactos/lib/kernel32/misc/handle.c --- trunk/reactos/lib/kernel32/misc/handle.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/handle.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -43,13 +43,13 @@ switch ((ULONG)hObject) { case STD_INPUT_HANDLE: - hObject = Ppb->hStdInput; + hObject = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hObject = Ppb->hStdOutput; + hObject = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hObject = Ppb->hStdError; + hObject = Ppb->StandardError; break; } @@ -95,13 +95,13 @@ switch ((ULONG)hObject) { case STD_INPUT_HANDLE: - hObject = Ppb->hStdInput; + hObject = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hObject = Ppb->hStdOutput; + hObject = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hObject = Ppb->hStdError; + hObject = Ppb->StandardError; break; } @@ -153,13 +153,13 @@ switch ((ULONG)hObject) { case STD_INPUT_HANDLE: - hObject = Ppb->hStdInput; + hObject = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hObject = Ppb->hStdOutput; + hObject = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hObject = Ppb->hStdError; + hObject = Ppb->StandardError; break; } @@ -198,13 +198,13 @@ switch ((ULONG)hSourceHandle) { case STD_INPUT_HANDLE: - hSourceHandle = Ppb->hStdInput; + hSourceHandle = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hSourceHandle = Ppb->hStdOutput; + hSourceHandle = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hSourceHandle = Ppb->hStdError; + hSourceHandle = Ppb->StandardError; break; } _____ Modified: trunk/reactos/lib/kernel32/misc/ldr.c --- trunk/reactos/lib/kernel32/misc/ldr.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/ldr.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -43,7 +43,7 @@ } else { - ModuleName = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName; + ModuleName = NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->ImagePathNam e; lpModule = ModuleName.Buffer; lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); } _____ Modified: trunk/reactos/lib/kernel32/misc/nls.c --- trunk/reactos/lib/kernel32/misc/nls.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/nls.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -101,7 +101,7 @@ /* Setup ANSI code page. */ AnsiCodePage.CodePage = CP_ACP; AnsiCodePage.SectionHandle = NULL; - AnsiCodePage.SectionMapping = NtCurrentTeb()->Peb->AnsiCodePageData; + AnsiCodePage.SectionMapping = NtCurrentTeb()->ProcessEnvironmentBlock->AnsiCodePageData; RtlInitCodePageTable((PUSHORT)AnsiCodePage.SectionMapping, &AnsiCodePage.CodePageTable); InsertTailList(&CodePageListHead, &AnsiCodePage.Entry); @@ -109,7 +109,7 @@ /* Setup OEM code page. */ OemCodePage.CodePage = CP_OEMCP; OemCodePage.SectionHandle = NULL; - OemCodePage.SectionMapping = NtCurrentTeb()->Peb->OemCodePageData; + OemCodePage.SectionMapping = NtCurrentTeb()->ProcessEnvironmentBlock->OemCodePageData; RtlInitCodePageTable((PUSHORT)OemCodePage.SectionMapping, &OemCodePage.CodePageTable); InsertTailList(&CodePageListHead, &OemCodePage.Entry); _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -16,7 +16,7 @@ /* FIXME */ #include <rosrtl/thread.h> -#define NDEBUG +//#define NDEBUG #include "../include/debug.h" /* FUNCTIONS ****************************************************************/ @@ -339,7 +339,7 @@ RtlRosR32AttribsToNativeAttribs(&oaThreadAttribs, lpThreadAttributes); /* native image */ - if(Sii->Subsystem != IMAGE_SUBSYSTEM_NATIVE) + if(Sii->SubsystemType != IMAGE_SUBSYSTEM_NATIVE) { pTrueStartAddress = (PVOID)BaseProcessStart; } @@ -368,8 +368,8 @@ &oaThreadAttribs, dwCreationFlags & CREATE_SUSPENDED, 0, - Sii->StackReserve, - Sii->StackCommit, + Sii->MaximumStackSize, + Sii->CommittedStackSize, pTrueStartAddress, &hThread, &cidClientId, @@ -382,8 +382,8 @@ &oaThreadAttribs, dwCreationFlags & CREATE_SUSPENDED, 0, - &(Sii->StackReserve), - &(Sii->StackCommit), + &(Sii->MaximumStackSize), + &(Sii->CommittedStackSize), pTrueStartAddress, &hThread, &cidClientId, @@ -401,8 +401,8 @@ "StackCommit %p\n" "ThreadHandle %p\n" "ClientId.UniqueThread %p\n", - Sii->StackReserve, - Sii->StackCommit, + Sii->MaximumStackSize, + Sii->CommittedStackSize, hThread, cidClientId.UniqueThread); @@ -550,7 +550,7 @@ /* create the PPB */ PpbBase = NULL; - PpbSize = Ppb->AllocationSize; + PpbSize = Ppb->MaximumLength; Status = NtAllocateVirtualMemory(ProcessHandle, &PpbBase, 0, @@ -566,7 +566,7 @@ NtWriteVirtualMemory(ProcessHandle, PpbBase, Ppb, - Ppb->AllocationSize, + Ppb->MaximumLength, &BytesWritten); /* write pointer to environment */ @@ -996,7 +996,7 @@ return FALSE; } - if (0 != (Sii.Characteristics & IMAGE_FILE_DLL)) + if (0 != (Sii.ImageCharacteristics & IMAGE_FILE_DLL)) { NtClose(hSection); DPRINT("Can't execute a DLL\n"); @@ -1004,11 +1004,11 @@ return FALSE; } - if (IMAGE_SUBSYSTEM_WINDOWS_GUI != Sii.Subsystem - && IMAGE_SUBSYSTEM_WINDOWS_CUI != Sii.Subsystem) + if (IMAGE_SUBSYSTEM_WINDOWS_GUI != Sii.SubsystemType + && IMAGE_SUBSYSTEM_WINDOWS_CUI != Sii.SubsystemType) { NtClose(hSection); - DPRINT("Invalid subsystem %d\n", Sii.Subsystem); + DPRINT("Invalid subsystem %d\n", Sii.SubsystemType); SetLastError(ERROR_CHILD_NOT_COMPLETE); return FALSE; } @@ -1124,12 +1124,12 @@ /* * Translate some handles for the new process */ - if (Ppb->CurrentDirectoryHandle) + if (Ppb->CurrentDirectory.Handle) { Status = NtDuplicateObject (NtCurrentProcess(), - Ppb->CurrentDirectoryHandle, + Ppb->CurrentDirectory.Handle, hProcess, - &Ppb->CurrentDirectoryHandle, + &Ppb->CurrentDirectory.Handle, 0, TRUE, DUPLICATE_SAME_ACCESS); @@ -1159,15 +1159,15 @@ Request = CREATE_PROCESS; CsrRequest.Data.CreateProcessRequest.NewProcessId = (HANDLE)ProcessBasicInfo.UniqueProcessId; - if (Sii.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + if (Sii.SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_GUI) { /* Do not create a console for GUI applications */ dwCreationFlags &= ~CREATE_NEW_CONSOLE; dwCreationFlags |= DETACHED_PROCESS; } - else if (Sii.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) + else if (Sii.SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_CUI) { - if (NULL == Ppb->hConsole) + if (NULL == Ppb->ConsoleHandle) { dwCreationFlags |= CREATE_NEW_CONSOLE; } @@ -1183,7 +1183,7 @@ DbgPrint("Failed to tell csrss about new process. Expect trouble.\n"); } - Ppb->hConsole = CsrRequest.Data.CreateProcessRequest.Console; + Ppb->ConsoleHandle = CsrRequest.Data.CreateProcessRequest.Console; InputSet = FALSE; OutputSet = FALSE; @@ -1196,19 +1196,19 @@ { if (lpStartupInfo->hStdInput) { - Ppb->hStdInput = lpStartupInfo->hStdInput; + Ppb->StandardInput = lpStartupInfo->hStdInput; InputSet = TRUE; InputDup = TRUE; } if (lpStartupInfo->hStdOutput) { - Ppb->hStdOutput = lpStartupInfo->hStdOutput; + Ppb->StandardOutput = lpStartupInfo->hStdOutput; OutputSet = TRUE; OutputDup = TRUE; } if (lpStartupInfo->hStdError) { - Ppb->hStdError = lpStartupInfo->hStdError; + Ppb->StandardError = lpStartupInfo->hStdError; ErrorSet = TRUE; ErrorDup = TRUE; } @@ -1221,19 +1221,19 @@ { if (! InputSet) { - Ppb->hStdInput = CsrRequest.Data.CreateProcessRequest.InputHandle; + Ppb->StandardInput = CsrRequest.Data.CreateProcessRequest.InputHandle; InputSet = TRUE; InputDup = FALSE; } if (! OutputSet) { - Ppb->hStdOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; + Ppb->StandardOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; OutputSet = TRUE; OutputDup = FALSE; } if (! ErrorSet) { - Ppb->hStdError = CsrRequest.Data.CreateProcessRequest.OutputHandle; + Ppb->StandardError = CsrRequest.Data.CreateProcessRequest.OutputHandle; ErrorSet = TRUE; ErrorDup = FALSE; } @@ -1242,34 +1242,34 @@ /* Use existing handles otherwise */ if (! InputSet) { - Ppb->hStdInput = NtCurrentPeb()->ProcessParameters->hStdInput; + Ppb->StandardInput = NtCurrentPeb()->ProcessParameters->StandardInput; InputDup = TRUE; } if (! OutputSet) { - Ppb->hStdOutput = NtCurrentPeb()->ProcessParameters->hStdOutput; + Ppb->StandardOutput = NtCurrentPeb()->ProcessParameters->StandardOutput; OutputDup = TRUE; } if (! ErrorSet) { - Ppb->hStdError = NtCurrentPeb()->ProcessParameters->hStdError; + Ppb->StandardError = NtCurrentPeb()->ProcessParameters->StandardError; ErrorDup = TRUE; } /* Now duplicate handles if required */ - if (InputDup && Ppb->hStdInput != NULL) + if (InputDup && Ppb->StandardInput != NULL) { - if (IsConsoleHandle(Ppb->hStdInput)) + if (IsConsoleHandle(Ppb->StandardInput)) { - Ppb->hStdInput = CsrRequest.Data.CreateProcessRequest.InputHandle; + Ppb->StandardInput = CsrRequest.Data.CreateProcessRequest.InputHandle; } else { DPRINT("Duplicate input handle\n"); Status = NtDuplicateObject (NtCurrentProcess(), - Ppb->hStdInput, + Ppb->StandardInput, hProcess, - &Ppb->hStdInput, + &Ppb->StandardInput, 0, TRUE, DUPLICATE_SAME_ACCESS); @@ -1280,19 +1280,19 @@ } } - if (OutputDup && Ppb->hStdOutput != NULL) + if (OutputDup && Ppb->StandardOutput != NULL) { - if (IsConsoleHandle(Ppb->hStdOutput)) + if (IsConsoleHandle(Ppb->StandardOutput)) { - Ppb->hStdOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; + Ppb->StandardOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; } else { DPRINT("Duplicate output handle\n"); Status = NtDuplicateObject (NtCurrentProcess(), - Ppb->hStdOutput, + Ppb->StandardOutput, hProcess, - &Ppb->hStdOutput, + &Ppb->StandardOutput, 0, TRUE, DUPLICATE_SAME_ACCESS); @@ -1303,9 +1303,9 @@ } } - if (ErrorDup && Ppb->hStdError != NULL) + if (ErrorDup && Ppb->StandardError != NULL) { - if (IsConsoleHandle(Ppb->hStdError)) + if (IsConsoleHandle(Ppb->StandardError)) { Request = DUPLICATE_HANDLE; CsrRequest.Data.DuplicateHandleRequest.ProcessId = (HANDLE)ProcessBasicInfo.UniqueProcessId; @@ -1316,20 +1316,20 @@ sizeof(CSR_API_MESSAGE)); if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) { - Ppb->hStdError = INVALID_HANDLE_VALUE; + Ppb->StandardError = INVALID_HANDLE_VALUE; } else { - Ppb->hStdError = CsrRequest.Data.DuplicateHandleRequest.Handle; + Ppb->StandardError = CsrRequest.Data.DuplicateHandleRequest.Handle; } } else { DPRINT("Duplicate error handle\n"); [truncated at 1000 lines; 1357 more skipped]

19 years, 3 months

[navaraf] 16539: Move Interlocked* routines from ROSRTL to separate INTRLCK library since ROSRTL is going to be removed.

by navaraf＠svn.reactos.com

Move Interlocked* routines from ROSRTL to separate INTRLCK library since ROSRTL is going to be removed. Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/intrlck/ Added: trunk/reactos/lib/intrlck/intrlck.c Added: trunk/reactos/lib/intrlck/intrlck.xml Modified: trunk/reactos/lib/kernel32/kernel32.xml Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/rosrtl/misc/intrlck.c Modified: trunk/reactos/lib/rosrtl/rosrtl.xml Modified: trunk/reactos/subsys/csrss/csrss.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/directory.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -91,6 +91,9 @@ <directory name="imm32"> <xi:include href="imm32/imm32.xml" /> </directory> +<directory name="intrlck"> + <xi:include href="intrlck/intrlck.xml" /> +</directory> <directory name="iphlpapi"> <xi:include href="iphlpapi/iphlpapi.xml" /> </directory> _____ Added: trunk/reactos/lib/intrlck/intrlck.c --- trunk/reactos/lib/intrlck/intrlck.c 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/intrlck/intrlck.c 2005-07-11 23:32:55 UTC (rev 16539) @@ -0,0 +1,209 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/ntdll/rtl/intrlck.c + * PURPOSE: Inter lock increments + * UPDATE HISTORY: + * Created 30/09/99 + */ + +/* + * Win32 kernel functions + * + * Copyright 1995 Martin von Loewis + * Copyright 1997 Onno Hovers + * Copied from kernel32 + */ + +/* PowerPC Functions from gatomic.c in glib + * + * GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * g_atomic_*: atomic operations. + * Copyright (C) 2003 Sebastian Wilhelmi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/********************************************************************** ** +* InterlockedIncrement * +* * +* InterlockedIncrement adds 1 to a long variable and returns * +* the resulting incremented value. * +* * +*********************************************************************** */ + +#include <windows.h> + +LONG +STDCALL +InterlockedIncrement(PLONG Addend) +{ + long ret; +#ifdef _M_IX86 + __asm__ + ( + "\tlock\n" /* for SMP systems */ + "\txaddl %0, (%1)\n" + "\tincl %0\n" + :"=r" (ret) + :"r" (Addend), "0" (1) + : "memory" + ); +#elif defined(_M_PPC) + ret = *Addend; + ret = InterlockedExchangeAdd( Addend, ret + 1 ); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} + +/********************************************************************** ** +* InterlockedDecrement * +* * +* InterlockedDecrement adds -1 to a long variable and returns * +* the resulting decremented value. * +* * +*********************************************************************** */ + +LONG +STDCALL +InterlockedDecrement(LPLONG lpAddend) +{ + long ret; +#ifdef _M_IX86 + __asm__ + ( + "\tlock\n" /* for SMP systems */ + "\txaddl %0, (%1)\n" + "\tdecl %0\n" + :"=r" (ret) + :"r" (lpAddend), "0" (-1) + : "memory" + ); +#elif defined(_M_PPC) + ret = *lpAddend; + ret = InterlockedExchangeAdd( lpAddend, ret - 1 ); +#else +#error Unknown compiler for inline assembler +#endif + return ret; + + +} + +/********************************************************************** ** + * InterlockedExchange + * + * Atomically exchanges a pair of values. + * + * RETURNS + * Prior value of value pointed to by Target + */ + +LONG +STDCALL +InterlockedExchange(LPLONG target, LONG value ) +{ + long ret; +#ifdef _M_IX86 + __asm__ ( /* lock for SMP systems */ + "lock\n\txchgl %0,(%1)" + :"=r" (ret):"r" (target), "0" (value):"memory" ); +#elif defined(_M_PPC) + do { + ret = *(volatile LONG *)target; + } while( InterlockedCompareExchange( target, value, ret ) != ret ); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} + +/********************************************************************** ** + * InterlockedCompareExchange + * + * Atomically compares Destination and Comperand, and if found equal exchanges + * the value of Destination with Exchange + * + * RETURNS + * Prior value of value pointed to by Destination + */ +LONG +STDCALL +InterlockedCompareExchange( + LPLONG Destination, + LONG Exchange, + LONG Comperand ) +{ + LONG ret; +#ifdef _M_IX86 + __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" + : "=a" (ret) : "r" (Destination), "r" (Exchange), "0" (Comperand) : "memory" ); +#elif defined(_M_PPC) + __asm__ __volatile__ ("sync\n" + "1: lwarx %0,0,%1\n" + " subf. %0,%2,%0\n" + " bne 2f\n" + " stwcx. %3,0,%1\n" + " bne- 1b\n" + "2: isync" + : "=&r" (ret) + : "b" (Destination), "r" (Comperand), "r" (Exchange) + : "cr0", "memory"); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} + +/********************************************************************** ** + * InterlockedExchangeAdd + * + * Atomically adds Increment to Addend and returns the previous value of + * Addend + * + * RETURNS + * Prior value of value pointed to by Addend + */ +LONG +STDCALL +InterlockedExchangeAdd( + PLONG Addend, + LONG Increment +) +{ + LONG ret; +#ifdef _M_IX86 + __asm__ ( /* lock for SMP systems */ + "lock\n\t" + "xaddl %0,(%1)" + :"=r" (ret) + :"r" (Addend), "0" (Increment) + :"memory" ); +#elif defined(_M_PPC) + LONG newval; + do { + ret = *(volatile LONG *)Addend; + newval = ret + Increment; + } while (InterlockedCompareExchange(Addend, ret, newval) != ret); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} _____ Added: trunk/reactos/lib/intrlck/intrlck.xml --- trunk/reactos/lib/intrlck/intrlck.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/intrlck/intrlck.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -0,0 +1,4 @@ +<module name="intrlck" type="staticlibrary"> + <define name="__USE_W32API" /> + <file>intrlck.c</file> +</module> _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -117,6 +117,7 @@ <library>kernel32_base</library> <library>pseh</library> <library>rosrtl</library> + <library>intrlck</library> <library>ntdll</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-nostartfiles</linkerflag> _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -9,6 +9,7 @@ <define name="_NTOSKRNL_" /> <library>rtl</library> <library>rosrtl</library> + <library>intrlck</library> <library>string</library> <linkerflag>-lgcc</linkerflag> <directory name="csr"> _____ Deleted: trunk/reactos/lib/rosrtl/misc/intrlck.c --- trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-07-11 23:32:55 UTC (rev 16539) @@ -1,209 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/ntdll/rtl/intrlck.c - * PURPOSE: Inter lock increments - * UPDATE HISTORY: - * Created 30/09/99 - */ - -/* - * Win32 kernel functions - * - * Copyright 1995 Martin von Loewis - * Copyright 1997 Onno Hovers - * Copied from kernel32 - */ - -/* PowerPC Functions from gatomic.c in glib - * - * GLIB - Library of useful routines for C programming - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * g_atomic_*: atomic operations. - * Copyright (C) 2003 Sebastian Wilhelmi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/********************************************************************** ** -* InterlockedIncrement * -* * -* InterlockedIncrement adds 1 to a long variable and returns * -* the resulting incremented value. * -* * -*********************************************************************** */ - -#include <windows.h> - -LONG -STDCALL -InterlockedIncrement(PLONG Addend) -{ - long ret; -#ifdef _M_IX86 - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\txaddl %0, (%1)\n" - "\tincl %0\n" - :"=r" (ret) - :"r" (Addend), "0" (1) - : "memory" - ); -#elif defined(_M_PPC) - ret = *Addend; - ret = InterlockedExchangeAdd( Addend, ret + 1 ); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} - -/********************************************************************** ** -* InterlockedDecrement * -* * -* InterlockedDecrement adds -1 to a long variable and returns * -* the resulting decremented value. * -* * -*********************************************************************** */ - -LONG -STDCALL -InterlockedDecrement(LPLONG lpAddend) -{ - long ret; -#ifdef _M_IX86 - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\txaddl %0, (%1)\n" - "\tdecl %0\n" - :"=r" (ret) - :"r" (lpAddend), "0" (-1) - : "memory" - ); -#elif defined(_M_PPC) - ret = *lpAddend; - ret = InterlockedExchangeAdd( lpAddend, ret - 1 ); -#else -#error Unknown compiler for inline assembler -#endif - return ret; - - -} - -/********************************************************************** ** - * InterlockedExchange - * - * Atomically exchanges a pair of values. - * - * RETURNS - * Prior value of value pointed to by Target - */ - -LONG -STDCALL -InterlockedExchange(LPLONG target, LONG value ) -{ - long ret; -#ifdef _M_IX86 - __asm__ ( /* lock for SMP systems */ - "lock\n\txchgl %0,(%1)" - :"=r" (ret):"r" (target), "0" (value):"memory" ); -#elif defined(_M_PPC) - do { - ret = *(volatile LONG *)target; - } while( InterlockedCompareExchange( target, value, ret ) != ret ); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} - -/********************************************************************** ** - * InterlockedCompareExchange - * - * Atomically compares Destination and Comperand, and if found equal exchanges - * the value of Destination with Exchange - * - * RETURNS - * Prior value of value pointed to by Destination - */ -LONG -STDCALL -InterlockedCompareExchange( - LPLONG Destination, - LONG Exchange, - LONG Comperand ) -{ - LONG ret; -#ifdef _M_IX86 - __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" - : "=a" (ret) : "r" (Destination), "r" (Exchange), "0" (Comperand) : "memory" ); -#elif defined(_M_PPC) - __asm__ __volatile__ ("sync\n" - "1: lwarx %0,0,%1\n" - " subf. %0,%2,%0\n" - " bne 2f\n" - " stwcx. %3,0,%1\n" - " bne- 1b\n" - "2: isync" - : "=&r" (ret) - : "b" (Destination), "r" (Comperand), "r" (Exchange) - : "cr0", "memory"); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} - -/********************************************************************** ** - * InterlockedExchangeAdd - * - * Atomically adds Increment to Addend and returns the previous value of - * Addend - * - * RETURNS - * Prior value of value pointed to by Addend - */ -LONG -STDCALL -InterlockedExchangeAdd( - PLONG Addend, - LONG Increment -) -{ - LONG ret; -#ifdef _M_IX86 - __asm__ ( /* lock for SMP systems */ - "lock\n\t" - "xaddl %0,(%1)" - :"=r" (ret) - :"r" (Addend), "0" (Increment) - :"memory" ); -#elif defined(_M_PPC) - LONG newval; - do { - ret = *(volatile LONG *)Addend; - newval = ret + Increment; - } while (InterlockedCompareExchange(Addend, ret, newval) != ret); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} _____ Modified: trunk/reactos/lib/rosrtl/rosrtl.xml --- trunk/reactos/lib/rosrtl/rosrtl.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/rosrtl/rosrtl.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -5,7 +5,6 @@ </directory> <directory name="misc"> <file>devmode.c</file> - <file>intrlck.c</file> <file>logfont.c</file> <file>qsort.c</file> </directory> _____ Modified: trunk/reactos/subsys/csrss/csrss.xml --- trunk/reactos/subsys/csrss/csrss.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/subsys/csrss/csrss.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -4,7 +4,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> - <library>rosrtl</library> + <library>intrlck</library> <library>ntdll</library> <library>smdll</library> <directory name="api">

19 years, 3 months

[robertk] 16538: made a copy

by robertk＠svn.reactos.com

made a copy Added: branches/ros-branch-0_2_7/ _____ Copied: branches/ros-branch-0_2_7 (from rev 16537, trunk)

19 years, 3 months

[ion] 16537: svn maintenance

by ion＠svn.reactos.com

svn maintenance Property changes on: trunk/reactos/lib/aclui ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp makefile + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.gch makefile Property changes on: trunk/reactos/subsys/system/dhcp/include ___________________________________________________________________ Name: svn:ignore + *.gch

19 years, 3 months

[weiden] 16536: return the length of the string excluding the null-termination character on success in GetEnvironmentVariable(). Thanks to Hartmut.

by weiden＠svn.reactos.com

return the length of the string excluding the null-termination character on success in GetEnvironmentVariable(). Thanks to Hartmut. Modified: trunk/reactos/lib/kernel32/misc/env.c _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-07-11 18:22:53 UTC (rev 16535) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-11 20:30:33 UTC (rev 16536) @@ -91,7 +91,7 @@ /* free unicode variable name string */ RtlFreeUnicodeString (&VarNameU); - return (VarValueU.Length / sizeof(WCHAR) + 1); + return (VarValueU.Length / sizeof(WCHAR)); } @@ -133,7 +133,7 @@ } } - return (VarValue.Length / sizeof(WCHAR) + 1); + return (VarValue.Length / sizeof(WCHAR)); }

19 years, 3 months

[hbirr] 16535: Check for a valid console handle in SetConsoleMode.

by hbirr＠svn.reactos.com

Check for a valid console handle in SetConsoleMode. Modified: trunk/reactos/lib/kernel32/misc/console.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-07-11 17:55:15 UTC (rev 16534) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-07-11 18:22:53 UTC (rev 16535) @@ -2605,6 +2605,14 @@ NTSTATUS Status; + if (!IsConsoleHandle (hConsoleHandle)) + { + DPRINT("SetConsoleMode was called with a non console handle\n"); + SetLastError (ERROR_INVALID_PARAMETER); + return FALSE; + } + + CsrRequest = MAKE_CSR_API(SET_CONSOLE_MODE, CSR_CONSOLE); Request.Data.SetConsoleModeRequest.ConsoleHandle = hConsoleHandle; Request.Data.SetConsoleModeRequest.Mode = dwMode;

19 years, 3 months

[ion] 16534: IPConfig Rewrite (Tim Jobling <tjob800@yahoo.co.uk>)

by ion＠svn.reactos.com

IPConfig Rewrite (Tim Jobling <tjob800(a)yahoo.co.uk>) * Relicense to GPL. * Display NodeType with meaningfull Human readable names. * Exclusively use TCHAR strings. * Display Physical Address, DHCP enabled state, IP Addresses/Netmasks, * Default Gateway, DHCP server and DHCP Lease times. * Parse command line options. * Default to only showing the IP/SM/DG is no options specified * Handel option: /All and /? * Display message about all unimplemented options. * Changed C++ style commenting to C style Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-07-11 07:51:09 UTC (rev 16533) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-07-11 17:55:15 UTC (rev 16534) @@ -1,10 +1,30 @@ +/* $Id: ipconfig.c + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Ipconfig utility + * FILE: apps/utils/net/ipconfig/ipconfig.c + * PURPOSE: Show and set network interface IP parameters + */ /* - * ipconfig - display IP stack parameters. + * History: * - * This source code is in the PUBLIC DOMAIN and has NO WARRANTY. + * 15/8/2002 (Robert Dickenson <robd(a)reactos.org>) + * Original version (PUBLIC DOMAIN and NO WARRANTY) * - * Robert Dickenson <robd(a)reactos.org>, August 15, 2002. - */ + * 26/6/2005 (Tim Jobling <tjob800(a)yahoo.co.uk>) + * Relicense to GPL. + * Display NodeType with meaningfull Human readable names. + * Exclusively use TCHAR strings. + * Display Physical Address, DHCP enabled state, IP Addresses/Netmasks, + * Default Gateway, DHCP server and DHCP Lease times. + * Parse command line options. + * Default to only showing the IP/SM/DG is no options specified + * Handel option: /All and /? + * Display message about all unimplemented options. + * Changed C++ style commenting to C style + * +*/ + #include <stdio.h> #include <windows.h> #include <tchar.h> @@ -18,8 +38,6 @@ #include "trace.h" #endif -/////////////////////////////////////////////////////////////////////// ///////// - /* imported from iphlpapi.dll GetAdapterOrderMap @@ -30,18 +48,43 @@ */ -static TCHAR* GetNodeTypeName(int nNodeType) +static TCHAR* GetNodeTypeName(UINT nNodeType) { switch (nNodeType) { - case 0: return _T("zero"); - case 1: return _T("one"); - case 2: return _T("two"); - case 3: return _T("three"); - case 4: return _T("mixed"); + case 1: return _T("Broadcast"); + case 2: return _T("Peer To Peer"); + case 4: return _T("Mixed"); + case 8: return _T("Hybrid"); default: return _T("unknown"); } } +static TCHAR* GetInterfaceTypeName(UINT nInterfaceType) +{ + switch (nInterfaceType) { + case MIB_IF_TYPE_OTHER: return _T("Other"); + case MIB_IF_TYPE_ETHERNET: return _T("Ethernet"); + case MIB_IF_TYPE_TOKENRING: return _T("Token Ring"); + case MIB_IF_TYPE_FDDI: return _T("FDDI"); + case MIB_IF_TYPE_PPP: return _T("PPP"); + case MIB_IF_TYPE_LOOPBACK: return _T("Loopback"); + case MIB_IF_TYPE_SLIP: return _T("SLIP"); + default: return _T("unknown"); + } +} + +void PrintPhysicalAddr(PBYTE Addr, UINT len) +{ + UINT i=0; + for (i=0; i<len; i++) + { + _tprintf(_T("%02X"), Addr[i]); + if ((i+1)<len) + _tprintf(_T("-")); + } + _tprintf(_T("\n")); +} + static void ShowNetworkFixedInfo() { FIXED_INFO* pFixedInfo = NULL; @@ -64,27 +107,28 @@ if (result == ERROR_SUCCESS) { IP_ADDR_STRING* pIPAddr; - printf("\tHostName. . . . . . . . . . . : %s\n", pFixedInfo->HostName); - printf("\tDomainName. . . . . . . . . . : %s\n", pFixedInfo->DomainName); -// - printf("\tDNS Servers . . . . . . . . . : %s\n", pFixedInfo->DnsServerList.IpAddress.String); + _tprintf(_T("\tHostName. . . . . . . . . . . : %s\n"), pFixedInfo->HostName); + _tprintf(_T("\tDomainName. . . . . . . . . . : %s\n"), pFixedInfo->DomainName); + + _tprintf(_T("\tDNS Servers . . . . . . . . . : %s\n"), pFixedInfo->DnsServerList.IpAddress.String); pIPAddr = pFixedInfo->DnsServerList.Next; while (pIPAddr) { - printf("\t\t\t\t : %s\n", pIPAddr->IpAddress.String); + _tprintf(_T("\t\t\t\t : %s\n"), pIPAddr->IpAddress.String); pIPAddr = pIPAddr->Next; } -// + _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), pFixedInfo->NodeType, GetNodeTypeName(pFixedInfo->NodeType)); - printf("\tScopeId . . . . . . . . . . . : %s\n", pFixedInfo->ScopeId); + _tprintf(_T("\tScopeId . . . . . . . . . . . : %s\n"), pFixedInfo->ScopeId); _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), pFixedInfo->EnableRouting ? _T("yes") : _T("no")); _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), pFixedInfo->EnableProxy ? _T("yes") : _T("no")); _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no")); _tprintf(_T("\n")); - //_tprintf(_T("\n"),); - //_tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters); +/* + _tprintf(_T("\n"),); + _tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters); -// _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no")); - + _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no")); +*/ } else { switch (result) { case ERROR_BUFFER_OVERFLOW: @@ -121,10 +165,11 @@ } result = GetInterfaceInfo(pIfTable, &dwOutBufLen); -// dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP); -// _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen); -// _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP)); - +/* + dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP); + _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen); + _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP)); +*/ pIfTable = (IP_INTERFACE_INFO*)malloc(dwOutBufLen); if (!pIfTable) { _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), dwOutBufLen); @@ -143,17 +188,13 @@ */ result = GetInterfaceInfo(pIfTable, &dwOutBufLen); if (result == NO_ERROR) { - int i; + UINT i; _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters); for (i = 0; i < pIfTable->NumAdapters; i++) { wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name); - //wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name); + /*wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name);*/ -// \DEVICE\TCPIP_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357} -// \DEVICE\TCPIP_{BD445697-0945-4591-AE7F-2AB0F383CA87} -// \DEVICE\TCPIP_{6D87DC08-6BC5-4E78-AB5F-18CAB785CFFE} - -//HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters \Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357} +/*HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters \Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}*/ } } else { switch (result) { @@ -213,13 +254,20 @@ a Lease Obtained. . . . . . . . . . : Monday, 30 December 2002 5:56:53 PM b Lease Expires . . . . . . . . . . : Monday, 30 December 2002 6:26:53 PM */ -static void ShowAdapterInfo() +static void ShowAdapterInfo(BOOL ShowAll) { IP_ADAPTER_INFO* pAdaptorInfo; ULONG ulOutBufLen; DWORD dwRetVal; + PIP_ADDR_STRING pIpAddrString; + struct tm *LeaseTime; - _tprintf(_T("\nAdaptor Information\t\n")); + + if (ShowAll) + { + _tprintf(_T("\nAdaptor Information\t\n")); + } + pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, sizeof(IP_ADAPTER_INFO)); ulOutBufLen = sizeof(IP_ADAPTER_INFO); @@ -231,14 +279,57 @@ _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal); } else { while (pAdaptorInfo) { - printf(" AdapterName: %s\n", pAdaptorInfo->AdapterName); - printf(" Description: %s\n", pAdaptorInfo->Description); + + /* print the type of interface before the Name of it */ + _tprintf(_T("\n%s Adapter %s:\n\n"), GetInterfaceTypeName(pAdaptorInfo->Type), pAdaptorInfo->AdapterName); + + if (ShowAll) + { + _tprintf(_T("\tDescription. . . . . . : %s\n"), pAdaptorInfo->Description); + + /* print the Physical address to the screen*/ + _tprintf(_T("\tPhysical Address . . . : ")); + PrintPhysicalAddr(pAdaptorInfo->Address, pAdaptorInfo->AddressLength); + + /* Now the DHCP state */ + _tprintf(_T("\tDHCP Enabled . . . . . : %s\n"), pAdaptorInfo->DhcpEnabled ? _T("Yes") : _T("No")); + } + + /* IP Addresses/Netmasks, there may be more than one */ + pIpAddrString = &pAdaptorInfo->IpAddressList; + + do{ + _tprintf(_T("\tIP Address . . . . . . : %s\n"), pIpAddrString->IpAddress.String); + _tprintf(_T("\tSubnet Mask. . . . . . : %s\n"), pIpAddrString->IpMask.String); + pIpAddrString = pIpAddrString->Next; + }while (pIpAddrString!=NULL); + + /* Default Gateway */ + pIpAddrString = &pAdaptorInfo->GatewayList; + _tprintf(_T("\tDefault Gateway. . . . : %s\n"), pIpAddrString->IpAddress.String); + + /* Print some stuff that is only relevant it dhcp is enabled */ + if((pAdaptorInfo->DhcpEnabled)&&(ShowAll)) + { + /* Display the DHCP server address */ + pIpAddrString = &pAdaptorInfo->DhcpServer; + _tprintf(_T("\tDHCP Server. . . . . . : %s\n"), pIpAddrString->IpAddress.String); + + /* Display the Lease times*/ + LeaseTime = localtime(&pAdaptorInfo->LeaseObtained); + _tprintf(_T("\tLease Obtained . . . . : %s"), asctime(LeaseTime)); + + LeaseTime = localtime(&pAdaptorInfo->LeaseExpires); + _tprintf(_T("\tLease Expieres . . . . : %s"), asctime(LeaseTime)); + + } + pAdaptorInfo = pAdaptorInfo->Next; } } } -const char szUsage[] = { "USAGE:\n" \ +const TCHAR szUsage[] = { _T("USAGE:\n" \ " ipconfig [/? | /all | /release [adapter] | /renew [adapter]\n" \ " | /flushdns | /registerdns\n" \ " | /showclassid adapter\n" \ @@ -259,7 +350,7 @@ " /setclassid Modifies the dhcp class id.\n" \ "\n" \ "The default is to display only the IP address, subnet mask and\n" \ - "default gateway for each adapter bound to TCP/IP.\n" + "default gateway for each adapter bound to TCP/IP.\n") }; /* "\n" \ @@ -279,21 +370,114 @@ static void usage(void) { - fputs(szUsage, stderr); + _fputts(szUsage, stderr); } -int main(int argc, char *argv[]) +int _tmain(int argc, TCHAR *argv[]) { - // 10.0.0.100 // As of build 0.0.20 this is hardcoded in the ip stack + BOOL DoUsage=FALSE; + BOOL DoAll=FALSE; + BOOL DoRelease=FALSE; + BOOL DoRenew=FALSE; + BOOL DoFlushdns=FALSE; + BOOL DoRegisterdns=FALSE; + BOOL DoDisplaydns=FALSE; + BOOL DoShowclassid=FALSE; + BOOL DoSetclassid=FALSE; - if (argc > 1) { - usage(); - return 1; + _tprintf(_T("\nReactOS IP Configuration\n\n")); + + /* + Parse command line for options we have been given. + */ + if ( ((argc > 1))&&((argv[1][0]=='/')||(argv[1][0]=='-')) ) + { + if( !_tcsicmp( &argv[1][1], _T("?") )) + { + DoUsage = TRUE; + } + else if( !_tcsnicmp( &argv[1][1], _T("ALL"), _tcslen(&argv[1][1]) )) + { + DoAll = TRUE; + } + else if( !_tcsnicmp( &argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]) )) + { + DoRelease = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]) )) + { + DoRenew = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHDNS"), _tcslen(&argv[1][1]) )) + { + DoFlushdns = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("REGISTERDNS"), _tcslen(&argv[1][1]) )) + { + DoRegisterdns = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("DISPLAYDNS"), _tcslen(&argv[1][1]) )) + { + DoDisplaydns = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("SHOWCLASSID"), _tcslen(&argv[1][1]) )) + { + DoShowclassid = TRUE; + } + else if( ! _tcsnicmp( &argv[1][1], _T("SETCLASSID"), _tcslen(&argv[1][1]) )) + { + DoSetclassid = TRUE; + } } - _tprintf(_T("ReactOS IP Configuration\n")); - ShowNetworkFixedInfo(); - ShowNetworkInterfaces(); - ShowAdapterInfo(); - return 0; + + + switch (argc) + { + case 1: /* Default behaviour if options are given specified*/ + ShowAdapterInfo(FALSE); + break; + case 2: /* Process all the options that take no paramiters */ + if ( DoUsage) + usage(); + else if ( DoAll) + { + ShowNetworkFixedInfo(); + ShowNetworkInterfaces(); + ShowAdapterInfo(TRUE); + } + else if ( DoRelease) + printf("\nSorry /Release is not implemented yet\n"); + else if ( DoRenew) + printf("\nSorry /Renew is not implemented yet\n"); + else if ( DoFlushdns) + printf("\nSorry /Flushdns is not implemented yet\n"); + else if ( DoRegisterdns) + printf("\nSorry /Registerdns is not implemented yet\n"); + else if ( DoDisplaydns) + printf("\nSorry /Displaydns is not implemented yet\n"); + else + usage(); + break; + case 3: /* Process all the options that can have 1 paramiters */ + if ( DoRelease) + printf("\nSorry /Release is not implemented yet\n"); + else if ( DoRenew) + printf("\nSorry /Renew is not implemented yet\n"); + else if ( DoShowclassid) + printf("\nSorry /Showclassid is not implemented yet\n"); + else + usage(); + break; + case 4: /* Process all the options that can have 2 paramiters */ + if ( DoSetclassid) + printf("\nSorry /Setclassid is not implemented yet\n"); + else + usage(); + break; + default: + usage(); + } + + return 0; }

19 years, 3 months

[gvg] 16533: Sebastian Gasiorek <zebasoftis@gmail.com>

by gvg＠svn.reactos.com

Sebastian Gasiorek <zebasoftis(a)gmail.com> Polish resource files Added: trunk/reactos/lib/shdocvw/Pl.rc Modified: trunk/reactos/lib/shdocvw/shdocvw.rc Added: trunk/reactos/lib/shellext/slayer/Pl.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Modified: trunk/reactos/lib/shlwapi/shlwapi.xml Added: trunk/reactos/lib/shlwapi/shlwapi_Pl.rc Modified: trunk/reactos/lib/wininet/rsrc.rc Added: trunk/reactos/lib/wininet/wininet_Pl.rc Added: trunk/reactos/lib/winmm/winmm_Pl.rc Modified: trunk/reactos/lib/winmm/winmm_res.rc _____ Added: trunk/reactos/lib/shdocvw/Pl.rc --- trunk/reactos/lib/shdocvw/Pl.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shdocvw/Pl.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -0,0 +1,36 @@ +/* + * Copyright 2005 Sebastian Gasiorek + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Pobierz kontrolkÛ ActiveX Mozilli" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Anuluj", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "Ta aplikacja wywo?uje obiekt ActiveX przegl?darki,\n" \ + "ale kontrolka Mozilla Active X nie jest zainstalowana." \ + "Czy chcesz j? pobraµ i zainstalowaµ?" +END Property changes on: trunk/reactos/lib/shdocvw/Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.rc --- trunk/reactos/lib/shdocvw/shdocvw.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shdocvw/shdocvw.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -28,6 +28,7 @@ #include "Es.rc" #include "Fr.rc" #include "Nl.rc" +#include "Pl.rc" #include "Pt.rc" #include "Ru.rc" #include "Sv.rc" _____ Added: trunk/reactos/lib/shellext/slayer/Pl.rc --- trunk/reactos/lib/shellext/slayer/Pl.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shellext/slayer/Pl.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -0,0 +1,40 @@ +// Polish resources by Sebastian Gasiorek (2005-07-10) + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Zgodno£µ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Je?eli masz problemy z uruchamianiem tego programu w ReactOS, wybierz system operacyjny kt¾ry ReactOS powinien zg?aszaµ aplikacji.", -1, 7,7,210,31 + GROUPBOX "Tryb zgodno£ci", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Uruchom ten program w trybie zgodno£ci z:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Ustawienia ekranu", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Uruchom w 256 kolorach", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Uruchom w rozdzielczo£ci ekranu 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Wy??cz kompozycje wizualne", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&dytuj tryby zgodno£ci...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Dowiedz siÛ wiÛcej o <A>zgodno£ci program¾w</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edycja tryb¾w zgodno£ci" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Dodaj...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Edytuj...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Usu±", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Anuluj", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END + Property changes on: trunk/reactos/lib/shellext/slayer/Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -17,6 +17,7 @@ #include "En.rc" #include "De.rc" +#include "Pl.rc" #include "Sv.rc" _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -29,5 +29,6 @@ #include "shlwapi_Nl.rc" #include "shlwapi_It.rc" #include "shlwapi_Ja.rc" +#include "shlwapi_Pl.rc" #include "shlwapi_Pt.rc" -#include "shlwapi_Sv.rc" \ No newline at end of file +#include "shlwapi_Sv.rc" _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.xml --- trunk/reactos/lib/shlwapi/shlwapi.xml 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shlwapi/shlwapi.xml 2005-07-11 07:51:09 UTC (rev 16533) @@ -37,5 +37,6 @@ <file>thread.c</file> <file>url.c</file> <file>wsprintf.c</file> + <file>shlwapi.rc</file> <file>shlwapi.spec</file> </module> _____ Added: trunk/reactos/lib/shlwapi/shlwapi_Pl.rc --- trunk/reactos/lib/shlwapi/shlwapi_Pl.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/shlwapi/shlwapi_Pl.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -0,0 +1,35 @@ +/* + * Polish resources for shlwapi + * + * Copyright 2005 Sebastian Gasiorek + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "B??d!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Ni&e pokazuj tego okna dialogowego w przysz?o£ci", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Anuluj" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Tak" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nie" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/wininet/rsrc.rc --- trunk/reactos/lib/wininet/rsrc.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/wininet/rsrc.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -48,6 +48,7 @@ #include "wininet_It.rc" #include "wininet_Ja.rc" #include "wininet_Nl.rc" +#include "wininet_Pl.rc" #include "wininet_Pt.rc" #include "wininet_Ru.rc" #include "wininet_Si.rc" _____ Added: trunk/reactos/lib/wininet/wininet_Pl.rc --- trunk/reactos/lib/wininet/wininet_Pl.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/wininet/wininet_Pl.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -0,0 +1,44 @@ +/* + * Copyright 2005 Sebastian Gasiorek + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wprowadzanie has?a sieciowego" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wpisz swoj? nazwÛ u?ytkownika i has?o:", -1, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Domena", -1, 40, 46, 50, 10 + LTEXT "Nazwa u?ytkownika", -1, 40, 66, 50, 10 + LTEXT "Has?o", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Zapisz has?o (niebezpieczne)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "Po??czenie LAN" +} Property changes on: trunk/reactos/lib/wininet/wininet_Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/winmm/winmm_Pl.rc --- trunk/reactos/lib/winmm/winmm_Pl.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/winmm/winmm_Pl.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -0,0 +1,126 @@ +/* + * Copyright 2005 Sebastian Gasiorek + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +BEGIN + +/* MMSYS errors */ +MMSYSERR_NOERROR, "Wydane polecenie zosta?o wykonane." +MMSYSERR_ERROR, "Nie zdefiniowany b??d zewnÛtrzny." +MMSYSERR_BADDEVICEID, "U?yto identyfikatora urz?dzenia, kt¾y jest poza zakresem tego systemu." +MMSYSERR_NOTENABLED, "Sterownik nie zosta? w??czony." +MMSYSERR_ALLOCATED, "Okre£lone urz?dzenie jest ju? u?ywane. Poczekaj, a? bÛdzie wolne i spr¾buj ponownie." +MMSYSERR_INVALHANDLE, "Podane doj£cie urz?dzenia jest nieprawid?owe." +MMSYSERR_NODRIVER, "Nie ma ?adnego zainstalowanego sterownika w tym systemie !\n" +MMSYSERR_NOMEM, "Brak dostÛpnej pamiÛci do wykonania tego zadania. Zako±cz jedn? lub wiÛcej aplikacji, aby zwiÛkszyµ dostÛpn? pamiÛµ. NastÛpnie spr¾buj ponownie." +MMSYSERR_NOTSUPPORTED, "Ta funkcja nie jest obs?ugiwana. U?yj funkcji Mo?liwo£ci, aby ustaliµ jakie funkcje i komunikaty obs?uguje sterownik." +MMSYSERR_BADERRNUM, "Podano numer b?Ûdu, kt¾ry nie jest zdefiniowany w systemie." +MMSYSERR_INVALFLAG, "Nieprawid?owa flaga zosta?a przekazana do funkcji systemowej." +MMSYSERR_INVALPARAM, "Nieprawid?owy parametr zosta? przekazany do funkcji systemowej." + +/* WAVE errors */ +WAVERR_BADFORMAT, "Okre£lony format nie jest obs?ugiwany i nie mo?na go przet?umaczyµ. U?yj funkcji Mo?liwo£ci, aby ustaliµ obs?ugiwane formaty." +WAVERR_STILLPLAYING, "Nie mo?na wykonaµ tej operacji w czasie, gdy dane multimedialne s? nadal odtwarzane. Zresetuj urz?dzenie lub poczekaj, a? zako±czy siÛ odtwarzanie danych." +WAVERR_UNPREPARED, "Nag?¾wek WAVE nie zosta? przygotowany. Przygotuj nag?¾wek u?ywaj?c funkcji Przygotuj i spr¾buj ponownie." +WAVERR_SYNC, "Nie mo?na otworzyµ urz?dzenia bez u?ycia flagi WAVE_ALLOWSYNC. U?yj tej flagi i spr¾buj ponownie." + +/* MIDI errors */ +MIDIERR_UNPREPARED, "Nag?¾wek MIDI nie zosta? przygotowany. Przygotuj nag?¾wek u?ywaj?c funkcji Przygotuj i spr¾buj ponownie." +MIDIERR_STILLPLAYING, "Nie mo?na wykonaµ tej operacji w czasie, gdy dane multimedialne s? nadal odtwarzane. Zresetuj urz?dzenie lub poczekaj, a? zako±czy siÛ odtwarzanie danych." +MIDIERR_NOMAP, "Nie mo?na odnalefµ mapowanie urz?dzenia MIDI. Mo?e to byµ spowodowane problemem ze sterownikiem albo brakiem lub uszkodzeniem pliku MIDIMAP.CFG." +MIDIERR_NOTREADY, "Port przesy?a dane do urz?dzenia. Poczekaj, a? dane zostan? przes?ane i spr¾buj ponownie." +MIDIERR_NODEVICE, "Bie??ce ustawienia mapowania MIDI odwo?uj? siÛ do urz?dzenia MIDI, kt¾re nie jest zainstalowane w systemie. U?yj Mapowania MIDI do edycji ustawie±." +MIDIERR_INVALIDSETUP, "Bie??ce ustawienia MIDI s? uszkodzone. Skopiuj oryginalny plik MIDIMAP.CFG do katalogu Windows SYSTEM, a nastÛpnie spr¾buj ponownie." + +/* MCI errors */ +MCIERR_INVALID_DEVICE_ID, "Nieprawid?owy identyfikator urz?dzenia MCI. U?yj identyfikatora zwr¾conego podczas otwierania urz?dzenia MCI." +MCIERR_UNRECOGNIZED_KEYWORD, "Sterownik nie mo?e rozpoznaµ podanego parametru polecenia." +MCIERR_UNRECOGNIZED_COMMAND, "Sterownik nie mo?e rozpoznaµ podanego polecenia." +MCIERR_HARDWARE, "Wyst?pi? problem z urz?dzeniem multimedialnym. Sprawdf czy dzia?a ono poprawnie lub skontaktuj siÛ z producentem urz?dzenia." +MCIERR_INVALID_DEVICE_NAME, "Podane urz?dzenie nie jest otwarte lub nie jest rozpoznawane przez MCI." +MCIERR_OUT_OF_MEMORY, "Za ma?o pamiÛci dla tego zadania. \nZamknij jedn? lub wiÛcej aplikacji w celu zwiÛkszenia dostÛpnej pamiÛci, a nastÛpnie spr¾buj ponownie." +MCIERR_DEVICE_OPEN, "Nazwa urz?dzenia jest ju? u?ywana jako alias przez t? aplikacjÛ. U?yj unikatowego aliasu." +MCIERR_CANNOT_LOAD_DRIVER, "Nieznany problem przy ?adowaniu okre£lonego sterownika urz?dzenia." +MCIERR_MISSING_COMMAND_STRING, "Nie okre£lono polecenia." +MCIERR_PARAM_OVERFLOW, "Wyj£ciowy ci?g znak¾w by? za du?y, aby zmie£ciµ siÛ w buforze. ZwiÛksz rozmiar buforu." +MCIERR_MISSING_STRING_ARGUMENT, "Okre£lone polecenie wymaga parametru. Podaj ten parametr." +MCIERR_BAD_INTEGER, "Okre£lona liczba ca?kowita jest nieprawid?owa dla tego polecenia." +MCIERR_PARSER_INTERNAL, "Sterownik urz?dzenia zwr¾ci? nieprawid?owy typ zwrotny. Skontaktuj siÛ z producentem urz?dzenia w celu otrzymania nowego sterownika." +MCIERR_DRIVER_INTERNAL, "Wyst?pi? problem ze sterownikiem tego urz?dzenia. Skontaktuj siÛ z producentem urz?dzenia w celu otrzymania nowego sterownika." +MCIERR_MISSING_PARAMETER, "Okre£lone polecenie wymaga parametru. Podaj ten parametr." +MCIERR_UNSUPPORTED_FUNCTION, "U?ywane urz?dzenie MCI nie obs?uguje okre£lonego polecenia." +MCIERR_FILE_NOT_FOUND, "Nie mo?na znalefµ okre£lonego pliku. Sprawdf, czy £cie?ka i nazwa pliku s? poprawne." +MCIERR_DEVICE_NOT_READY, "Sterownik urz?dzenia nie jest gotowy." +MCIERR_INTERNAL, "Wyst?pi? problem podczas inicjowania MCI. Spr¾buj uruchomiµ ponownie Windows." +MCIERR_DRIVER, "Wyst?pi? problem ze steronikiem tego urz?dzenia. Sterownik zosta? zamkniÛty. Nie ma dostÛpu do informacji o b?Ûdach." +MCIERR_CANNOT_USE_ALL, "W okre£lonym poleceniu nie mo?na u?yµ parametru 'all' jako nazwy urz?dzenia." +MCIERR_MULTIPLE, "Wyst?pi? b??d w wiÛcej ni? jednym urz?dzeniu. Okre£l ka?de polecenie i urz?dzenie oddzielnie, aby ustaliµ, kt¾re urz?dzenie spowodowa?o b?Ûdy." +MCIERR_EXTENSION_NOT_FOUND, "Nie mo?na ustaliµ typu urz?dzenia na podstawie podanego rozszerzenia pliku." +MCIERR_OUTOFRANGE, "Okre£lony parametr przekracza zakres przewidziany dla tego polecenia." +MCIERR_FLAGS_NOT_COMPATIBLE, "Okre£lonych parametr¾w nie mo?na u?ywaµ razem." +MCIERR_FILE_NOT_SAVED, "Nie mo?na zapisaµ okre£lonego pliku, Sprawdf, czy jest do£µ miejsca na dysku lub czy po??czenie sieciowe jest wci?? aktywne." +MCIERR_DEVICE_TYPE_REQUIRED, "Nie mo?na odnalefµ okre£lonego urz?dzenia. Sprawdf, czy jest ono zainstalowane i czy jest nazwa jest napisana poprawnie." +MCIERR_DEVICE_LOCKED, "Okre£lone urz?dzenie jest w?a£nie zamykane. Poczekaj kilka sekund i spr¾buj ponownie." +MCIERR_DUPLICATE_ALIAS, "Podany alias jest ju? u?ywany w tej aplikacji. U?yj unikatowego aliasu." +MCIERR_BAD_CONSTANT, "Okre£lony parametr jest nieprawid?owy dla tego polecenia." +MCIERR_MUST_USE_SHAREABLE, "Sterownik urz?dzenia jest ju? u?ywany. Aby go udostÛpniµ, zastosuj parametr 'shareable' dla ka?dego polecenia 'open'." +MCIERR_MISSING_DEVICE_NAME, "Okre£lone polecenie wymaga podania nazwy aliasu, pliku, sterownika lub urz?dzenia. Podaj tÛ nazwÛ." +MCIERR_BAD_TIME_FORMAT, "Okre£lona warto£µ formatu czasu jest nieprawid?owa. Sprawdf prawid?owe formaty w dokumentacji MCI." +MCIERR_NO_CLOSING_QUOTE, "W warto£ci parametru brak cudzys?owu zamykaj?cego. Dodaj go." +MCIERR_DUPLICATE_FLAGS, "Parametr lub warto£µ okre£lono dwukrotnie. Okre£l je tylko raz." +MCIERR_INVALID_FILE, "Podanego pliku nie mo?na odtworzyµ za pomoc? tego urz?dzenia MIDI. Plik mo?e byµ uszkodzony, mieµ z?y format lub mo?e nie byµ dostÛpna obs?uga tego formatu." +MCIERR_NULL_PARAMETER_BLOCK, "Do MCI przekazano blok parametr¾w zerowych." +MCIERR_UNNAMED_RESOURCE, "Nie mo?na zapisaµ pliku bez nazwy. Podaj nazwÛ." +MCIERR_NEW_REQUIRES_ALIAS, "Podczas u?ywania parametru 'new' nale?y podaµ jaki£ alias." +MCIERR_NOTIFY_ON_AUTO_OPEN, "Dla automatycznie otwieranych urz?dze± nie mo?na u?yµ flagi 'notify'." +MCIERR_NO_ELEMENT_ALLOWED, "Z okre£lonym urz?dzeniem nie mo?na u?ywaµ nazwy pliku." +MCIERR_NONAPPLICABLE_FUNCTION, "Nie mo?na wykonaµ polece± w podanej kolejno£ci. Popraw kolejno£µ polece± i spr¾buj ponownie." +MCIERR_ILLEGAL_FOR_AUTO_OPEN, "Nie mo?na wykonaµ tego polecenia na urz?dzeniu otwieranym automatycznie. Odczekaj, a? urz?dzenie zostanie zamkniÛte i spr¾buj ponownie." +MCIERR_FILENAME_REQUIRED, "Nazwa pliku jest nieprawid?owa. Upewnij siÛ, ?e nazwa pliku nie jest d?u?sza 8 znak¾w i zako±czona jest kropk? oraz rozszerzeniem." +MCIERR_EXTRA_CHARACTERS, "Nie mo?na okre£liµ dodatkowych znak¾w po ci?gu ujÛtym w cudzys?owy." +MCIERR_DEVICE_NOT_INSTALLED, "Podane urz?dzenie nie jest zainstalowane w systemie. Aby zainstalowaµ urz?dzenie, przejdf do Panelu sterowania i u?yj opcji Sterowniki." +MCIERR_GET_CD, "Nie mo?na uzyskaµ dostÛpu do okre£lonego pliku lub urz?dzenia MCI. Spr¾buj zmieniµ katalogi lub ponownie uruchomiµ komputer." +MCIERR_SET_CD, "Nie mo?na uzyskaµ dostÛpu do podanego pliku lub urz?dzenia MCI, gdy? aplikacja ta nie mo?e zmieniaµ katalog¾w." +MCIERR_SET_DRIVE, "Nie mo?na uzyskaµ dostÛpu do okre£lonego pliku lub urz?dzenia MCI, gdy? aplikacja ta nie mo?e zmieniaµ dysk¾w." +MCIERR_DEVICE_LENGTH, "Podaj nazwÛ urz?dzenia lub sterownika kr¾tsz? ni? 79 znak¾w." +MCIERR_DEVICE_ORD_LENGTH, "Podaj nazwÛ urz?dzenia lub sterownika kt¾tsz? ni? 69 znak¾w." +MCIERR_NO_INTEGER, "Okre£lone polecenie wymaga parametru w postaci liczby ca?kowitej. Podaj taki parametr." +MCIERR_WAVE_OUTPUTSINUSE, "Wszystkie urz?dzenia dfwiÛkowe Wave, kt¾re mog? odtwarzaµ pliki w bie??cym formacie, s? ju? u?ywane. Zaczekaj na zwolnienie jednego z nich i spr¾buj ponownie." +MCIERR_WAVE_SETOUTPUTINUSE, "Nie mo?na ustawiµ bie??cego urz?dzenia dfwiÛkowego Wave na odtwarzanie, poniewa? urz?dzenie jest u?ywane. Zaczekaj, a? urz?dzenie zostanie zwolnione i spr¾buj ponownie." +MCIERR_WAVE_INPUTSINUSE, "Wszystkie urz?dzenia dfwiÛkowe Wave, kt¾re mog? nagrywaµ pliki w bie??cym formacie, s? ju? u?ywane. Zaczekaj na zwolnienie jednego z nich i spr¾buj ponownie." +MCIERR_WAVE_SETINPUTINUSE, "Nie mo?na ustawiµ bie??cego urz?dzenia dfwiÛkowego Wave na nagrywanie, poniewa? urz?dzenie jest u?ywane. Zaczekaj, a? urz?dzenie zostanie zwolnione i spr¾buj ponownie." +MCIERR_WAVE_OUTPUTUNSPECIFIED, "Mo?na u?yµ dowolnego zgodnego urz?dzenia odtwarzaj?cego Wave." +MCIERR_WAVE_INPUTUNSPECIFIED, "Mo?na u?yµ dowolnego zgodnego urz?dzenia nagrywaj?cego Wave." +MCIERR_WAVE_OUTPUTSUNSUITABLE, "Nie zainstalowano ?adnego urz?dzenia dfwiÛkowego WAVE, kt¾re mog?oby odtwarzaµ pliki w bie??cym formacie. Aby zainstalowaµ urz?dzenie wave, u?yj opcji Sterowniki." +MCIERR_WAVE_SETOUTPUTUNSUITABLE,"Urz?dzenie, kt¾rego pr¾bujesz u?yµ do odtwarzania, nie mo?e rozpoznaµ bie??cego formatu pliku." +MCIERR_WAVE_INPUTSUNSUITABLE, "Nie zainstalowano ?adnego urz?dzenia dfwiÛkowego WAVE, kt¾re mog?oby nagrywaµ pliki w bie?acym formacie. Aby zainstalowaµ urz?dzenie wave, u?yj opcji Sterowniki." +MCIERR_WAVE_SETINPUTUNSUITABLE, "Urz?dzenie, kt¾rego pr¾bujesz u?yµ do nagrywania, nie mo?e rozpoznaµ bie??cego formatu pliku." +MCIERR_NO_WINDOW, "Brak okna wy£wietlania." +MCIERR_CREATEWINDOW, "Nie mo?na utworzyµ lub u?yµ okna." +MCIERR_FILE_READ, "Nie mo?na odczytaµ okre£lonego pliku. Upewnij siÛ, ?e plik nadal istnieje i sprawdf dysk lub po??czenie sieciowe." +MCIERR_FILE_WRITE, "Nie mo?na zapisaµ okre£lonego pliku. Sprawdf, czy jest miejsce na dysku lub czy po??czenie sieciowe jest aktywne." +MCIERR_SEQ_DIV_INCOMPATIBLE, "Nie mo?na u?yµ razem formatu czasu wskafnika piosenki i formatu czasu SMPTE." +MCIERR_SEQ_NOMIDIPRESENT, "W systemie nie ma zainstalowanych urz?dze± MIDI. Aby zainstalowaµ urz?dzenie MIDI, przejdf do Panelu sterowania i u?yj opcji Sterowniki." +MCIERR_SEQ_PORT_INUSE, "Okre£lony port MIDI jest ju? u?ywany. Poczekaj, a? bÛdzie wolny i spr¾buj ponownie." +MCIERR_SEQ_PORT_MAPNODEVICE, "Bie??ce ustawienia mapowania MIDI odwo?uje siÛ do urz?dzenia MIDI, kt¾re nie jest zainstalowane w systemie. U?yj Mapowania MIDI do edycji ustawie±." +MCIERR_SEQ_PORT_MISCERROR, "Wyst?pi? b??d podczas korzystania z okre£lonego portu." +MCIERR_SEQ_PORT_NONEXISTENT, "Okre£lone urz?dzenie MIDI nie jest zainstalowane w systemie. Aby zainstalowaµ urz?dzenie MIDI, przejdf do Panelu sterowania i u?yj opcji Sterowniki." +MCIERR_SEQ_PORTUNSPECIFIED, "Brak bie??cego portu MIDI." +MCIERR_SEQ_TIMER, "Wszystkie czasomierze multimedi¾w s? u?ywane przez inne aplikacje. Zamknij jedn? z nich i spr¾buj ponownie." + +END Property changes on: trunk/reactos/lib/winmm/winmm_Pl.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/winmm/winmm_res.rc --- trunk/reactos/lib/winmm/winmm_res.rc 2005-07-11 04:56:04 UTC (rev 16532) +++ trunk/reactos/lib/winmm/winmm_res.rc 2005-07-11 07:51:09 UTC (rev 16533) @@ -36,6 +36,7 @@ #include "winmm_It.rc" /* #include "winmm_Ja.rc" */ /* Gives error during ReactOS build */ #include "winmm_Nl.rc" +#include "winmm_Pl.rc" #include "winmm_Pt.rc" #include "winmm_Ru.rc" #include "winmm_Si.rc"

19 years, 3 months

[jimtabor] 16532: Connect UnrealizeObject and test debug prints. I assume arg count is one not two. If wrong please correct me.

by jimtabor＠svn.reactos.com

Connect UnrealizeObject and test debug prints. I assume arg count is one not two. If wrong please correct me. Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/subsys/win32k/objects/color.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-11 02:43:24 UTC (rev 16531) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-11 04:56:04 UTC (rev 16532) @@ -1116,8 +1116,7 @@ ) { UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return NtGdiUnrealizeObject(a0); } _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-07-11 02:43:24 UTC (rev 16531) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-07-11 04:56:04 UTC (rev 16532) @@ -609,8 +609,14 @@ case GDI_OBJECT_TYPE_PALETTE: { /* Make sure this is a Palette object!*/ + DPRINT1("GDI_OBJECT_TYPE_PALETTE\n"); break; } + case GDI_OBJECT_TYPE_BRUSH: + { + DPRINT1("GDI_OBJECT_TYPE_BRUSH\n"); + break; + } default: DPRINT1("Magic 0x%08x not implemented\n", objectType); break; _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2005-07-11 02:43:24 UTC (rev 16531) +++ trunk/reactos/tools/nci/w32ksvc.db 2005-07-11 04:56:04 UTC (rev 16532) @@ -274,7 +274,7 @@ NtGdiTextOut 5 NtGdiTransparentBlt 11 NtGdiTranslateCharsetInfo 3 -NtGdiUnrealizeObject 2 +NtGdiUnrealizeObject 1 NtGdiUpdateColors 1 NtGdiUpdateICMRegKey 4 NtGdiWidenPath 1

19 years, 3 months

← Newer
1
...
36
37
38
39
40
41
42
...
57
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 July 2005