Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32162: We now return memory map. We added a new member to the ARM board configuration block that specifies the number of memory map entries. Board boot loaders are responsible for sending the base and size of all DRAM and FLASH banks. FLASH banks should be marked as Reserved so we don't try using them as RAM.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Feb 6 18:47:02 2008 New Revision: 32162 URL: http://svn.reactos.org/svn/reactos?rev=32162&view=rev Log: We now return memory map. We added a new member to the ARM board configuration block that specifies the number of memory map entries. Board boot loaders are responsible for sending the base and size of all DRAM and FLASH banks. FLASH banks should be marked as Reserved so we don't try using them as RAM. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 18:47:02 2008 @@ -127,8 +127,13 @@ ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, IN ULONG MaxMemoryMapSize) { - while (TRUE); - return FALSE; + // + // Return whatever the board returned to us (CS0 Base + Size and FLASH0) + // + RtlCopyMemory(BiosMemoryMap, + ArmBoardBlock->MemoryMap, + ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); + return ArmBoardBlock->MemoryMapEntryCount; } VOID Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h Wed Feb 6 18:47:02 2008 @@ -38,6 +38,7 @@ ULONG ClockRate; ULONG TimerRegisterBase; ULONG UartRegisterBase; + ULONG MemoryMapEntryCount; PBIOS_MEMORY_MAP MemoryMap; CHAR CommandLine[256]; } ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Wed Feb 6 18:47:02 2008 @@ -106,6 +106,10 @@ MmMarkPagesInLookupTable(PageLookupTableAddress, 0x90, 0x10, LoaderOsloaderHeap); // Disk read buffer for int 13h. DISKREADBUFFER MmMarkPagesInLookupTable(PageLookupTableAddress, 0xA0, 0x60, LoaderFirmwarePermanent); // ROM / Video MmMarkPagesInLookupTable(PageLookupTableAddress, 0xFFF, 1, LoaderSpecialMemory); // unusable memory +#elif __arm__ + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // arm exception handlers + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // arm board block + freeldr stack + cmdline + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x08, 0x70, LoaderLoadedProgram); // freeldr image (roughly max. 0x64 pages) #endif FreePagesInLookupTable = MmCountFreePagesInLookupTable(PageLookupTableAddress, TotalPagesInLookupTable);

16 years, 10 months

[dchapyshev] 32161: - Add vga font for cp437

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 6 18:36:29 2008 New Revision: 32161 URL: http://svn.reactos.org/svn/reactos?rev=32161&view=rev Log: - Add vga font for cp437 Added: trunk/reactos/media/vgafonts/437-8x8.bin (with props) Modified: trunk/reactos/media/vgafonts/readme.txt Added: trunk/reactos/media/vgafonts/437-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/437-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/437-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/vgafonts/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/readme.txt?… ============================================================================== --- trunk/reactos/media/vgafonts/readme.txt (original) +++ trunk/reactos/media/vgafonts/readme.txt Wed Feb 6 18:36:29 2008 @@ -4,6 +4,7 @@ sources: +http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp437-8x8.fnt http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp850-8x8.fnt http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp865-8x8.fnt http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp866-8x8.fnt

16 years, 10 months

[dchapyshev] 32160: - Fix formatting for ras.h, rasdlg.h and rasapi.h - Add raseapif.h header file

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 6 18:29:45 2008 New Revision: 32160 URL: http://svn.reactos.org/svn/reactos?rev=32160&view=rev Log: - Fix formatting for ras.h, rasdlg.h and rasapi.h - Add raseapif.h header file Added: trunk/reactos/include/psdk/raseapif.h (with props) Modified: trunk/reactos/include/psdk/ras.h trunk/reactos/include/psdk/rasdlg.h trunk/reactos/include/psdk/rassapi.h Modified: trunk/reactos/include/psdk/ras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ras.h?rev=321… ============================================================================== --- trunk/reactos/include/psdk/ras.h (original) +++ trunk/reactos/include/psdk/ras.h Wed Feb 6 18:29:45 2008 @@ -37,8 +37,8 @@ #define RAS_MaxReplyMessage 1024 #define RAS_MaxDnsSuffix 256 #if (WINVER >= 0x501) -#define RASCF_AllUsers 0x00000001 -#define RASCF_GlobalCreds 0x00000002 +#define RASCF_AllUsers 0x00000001 +#define RASCF_GlobalCreds 0x00000002 #endif /*(WINVER >= 0x501)*/ #define RDEOPT_UsePrefixSuffix 0x00000001 #define RDEOPT_PausedStates 0x00000002 @@ -54,11 +54,11 @@ #define RDEOPT_Router 0x00000800 #define REN_User 0x00000000 #define REN_AllUsers 0x00000001 -#define VS_Default 0 -#define VS_PptpOnly 1 -#define VS_PptpFirst 2 -#define VS_L2tpOnly 3 -#define VS_L2tpFirst 4 +#define VS_Default 0 +#define VS_PptpOnly 1 +#define VS_PptpFirst 2 +#define VS_L2tpOnly 3 +#define VS_L2tpFirst 4 #define RASDIALEVENT "RasDialEvent" #define WM_RASDIALEVENT 0xCCCD #define RASEO_UseCountryAndAreaCodes 0x00000001 @@ -90,7 +90,7 @@ #define RASDT_Vpn TEXT("vpn") #define RASDT_Pad TEXT("pad") #define RASDT_Generic TEXT("GENERIC") -#define RASDT_Serial TEXT("SERIAL") +#define RASDT_Serial TEXT("SERIAL") #define RASDT_FrameRelay TEXT("FRAMERELAY") #define RASDT_Atm TEXT("ATM") #define RASDT_Sonet TEXT("SONET") @@ -578,14 +578,14 @@ DWORD dwVpnStrategy; #endif #if (WINVER >= 0x501) - DWORD dwfOptions2; - DWORD dwfOptions3; - WCHAR szDnsSuffix[RAS_MaxDnsSuffix]; - DWORD dwTcpWindowSize; - WCHAR szPrerequisitePbk[MAX_PATH]; - WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; - DWORD dwRedialCount; - DWORD dwRedialPause; + DWORD dwfOptions2; + DWORD dwfOptions3; + WCHAR szDnsSuffix[RAS_MaxDnsSuffix]; + DWORD dwTcpWindowSize; + WCHAR szPrerequisitePbk[MAX_PATH]; + WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; + DWORD dwRedialCount; + DWORD dwRedialPause; #endif /*(WINVER >= 0x501)*/ } RASENTRYW, *LPRASENTRYW; @@ -635,14 +635,14 @@ DWORD dwVpnStrategy; #endif #if (WINVER >= 0x501) - DWORD dwfOptions2; - DWORD dwfOptions3; - CHAR szDnsSuffix[RAS_MaxDnsSuffix]; - DWORD dwTcpWindowSize; - CHAR szPrerequisitePbk[MAX_PATH]; - CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; - DWORD dwRedialCount; - DWORD dwRedialPause; + DWORD dwfOptions2; + DWORD dwfOptions3; + CHAR szDnsSuffix[RAS_MaxDnsSuffix]; + DWORD dwTcpWindowSize; + CHAR szPrerequisitePbk[MAX_PATH]; + CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; + DWORD dwRedialCount; + DWORD dwRedialPause; #endif /*(WINVER >= 0x501)*/ } RASENTRYA, *LPRASENTRYA; @@ -822,32 +822,24 @@ /* Callback prototypes */ typedef BOOL (WINAPI * ORASADFUNC) (HWND, LPSTR, DWORD, LPDWORD); /* deprecated */ typedef VOID (WINAPI * RASDIALFUNC) (UINT, RASCONNSTATE, DWORD); -typedef VOID (WINAPI * RASDIALFUNC1) (HRASCONN, UINT, RASCONNSTATE, DWORD, - DWORD); -typedef DWORD (WINAPI * RASDIALFUNC2) (ULONG_PTR, DWORD, HRASCONN, UINT, - RASCONNSTATE, DWORD, DWORD); +typedef VOID (WINAPI * RASDIALFUNC1) (HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); +typedef DWORD (WINAPI * RASDIALFUNC2) (ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); /* External functions */ -DWORD APIENTRY RasDialA (LPRASDIALEXTENSIONS, LPCSTR, LPRASDIALPARAMSA, - DWORD, LPVOID, LPHRASCONN); -DWORD APIENTRY RasDialW (LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, - DWORD, LPVOID, LPHRASCONN); +DWORD APIENTRY RasDialA (LPRASDIALEXTENSIONS, LPCSTR, LPRASDIALPARAMSA, DWORD, LPVOID, LPHRASCONN); +DWORD APIENTRY RasDialW (LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD, LPVOID, LPHRASCONN); DWORD APIENTRY RasEnumConnectionsA (LPRASCONNA, LPDWORD, LPDWORD); DWORD APIENTRY RasEnumConnectionsW (LPRASCONNW, LPDWORD, LPDWORD); -DWORD APIENTRY RasEnumEntriesA (LPCSTR, LPCSTR, LPRASENTRYNAMEA, LPDWORD, - LPDWORD); -DWORD APIENTRY RasEnumEntriesW (LPCWSTR, LPCWSTR, LPRASENTRYNAMEW, LPDWORD, - LPDWORD); +DWORD APIENTRY RasEnumEntriesA (LPCSTR, LPCSTR, LPRASENTRYNAMEA, LPDWORD, LPDWORD); +DWORD APIENTRY RasEnumEntriesW (LPCWSTR, LPCWSTR, LPRASENTRYNAMEW, LPDWORD, LPDWORD); DWORD APIENTRY RasGetConnectStatusA (HRASCONN, LPRASCONNSTATUSA); DWORD APIENTRY RasGetConnectStatusW (HRASCONN, LPRASCONNSTATUSW); DWORD APIENTRY RasGetErrorStringA (UINT, LPSTR, DWORD); DWORD APIENTRY RasGetErrorStringW (UINT, LPWSTR, DWORD); DWORD APIENTRY RasHangUpA (HRASCONN); DWORD APIENTRY RasHangUpW (HRASCONN); -DWORD APIENTRY RasGetProjectionInfoA (HRASCONN, RASPROJECTION, LPVOID, - LPDWORD); -DWORD APIENTRY RasGetProjectionInfoW (HRASCONN, RASPROJECTION, LPVOID, - LPDWORD); +DWORD APIENTRY RasGetProjectionInfoA (HRASCONN, RASPROJECTION, LPVOID, LPDWORD); +DWORD APIENTRY RasGetProjectionInfoW (HRASCONN, RASPROJECTION, LPVOID, LPDWORD); DWORD APIENTRY RasCreatePhonebookEntryA (HWND, LPCSTR); DWORD APIENTRY RasCreatePhonebookEntryW (HWND, LPCWSTR); DWORD APIENTRY RasEditPhonebookEntryA (HWND, LPCSTR, LPCSTR); @@ -860,14 +852,10 @@ DWORD APIENTRY RasEnumDevicesW (LPRASDEVINFOW, LPDWORD, LPDWORD); DWORD APIENTRY RasGetCountryInfoA (LPRASCTRYINFOA, LPDWORD); DWORD APIENTRY RasGetCountryInfoW (LPRASCTRYINFOW, LPDWORD); -DWORD APIENTRY RasGetEntryPropertiesA (LPCSTR, LPCSTR, LPRASENTRYA, LPDWORD, - LPBYTE, LPDWORD); -DWORD APIENTRY RasGetEntryPropertiesW (LPCWSTR, LPCWSTR, LPRASENTRYW, - LPDWORD, LPBYTE, LPDWORD); -DWORD APIENTRY RasSetEntryPropertiesA (LPCSTR, LPCSTR, LPRASENTRYA, DWORD, - LPBYTE, DWORD); -DWORD APIENTRY RasSetEntryPropertiesW (LPCWSTR, LPCWSTR, LPRASENTRYW, DWORD, - LPBYTE, DWORD); +DWORD APIENTRY RasGetEntryPropertiesA (LPCSTR, LPCSTR, LPRASENTRYA, LPDWORD, LPBYTE, LPDWORD); +DWORD APIENTRY RasGetEntryPropertiesW (LPCWSTR, LPCWSTR, LPRASENTRYW, LPDWORD, LPBYTE, LPDWORD); +DWORD APIENTRY RasSetEntryPropertiesA (LPCSTR, LPCSTR, LPRASENTRYA, DWORD, LPBYTE, DWORD); +DWORD APIENTRY RasSetEntryPropertiesW (LPCWSTR, LPCWSTR, LPRASENTRYW, DWORD, LPBYTE, DWORD); DWORD APIENTRY RasRenameEntryA (LPCSTR, LPCSTR, LPCSTR); DWORD APIENTRY RasRenameEntryW (LPCWSTR, LPCWSTR, LPCWSTR); DWORD APIENTRY RasDeleteEntryA (LPCSTR, LPCSTR); @@ -888,21 +876,21 @@ DWORD APIENTRY RasConnectionNotificationA (HRASCONN, HANDLE, DWORD); DWORD APIENTRY RasConnectionNotificationW (HRASCONN, HANDLE, DWORD); DWORD APIENTRY RasGetSubEntryPropertiesA (LPCSTR, LPCSTR, DWORD, - LPRASSUBENTRYA, LPDWORD, LPBYTE, LPDWORD); + LPRASSUBENTRYA, LPDWORD, LPBYTE, LPDWORD); DWORD APIENTRY RasGetSubEntryPropertiesW (LPCWSTR, LPCWSTR, DWORD, - LPRASSUBENTRYW, LPDWORD, LPBYTE, LPDWORD); + LPRASSUBENTRYW, LPDWORD, LPBYTE, LPDWORD); DWORD APIENTRY RasSetSubEntryPropertiesA (LPCSTR, LPCSTR, DWORD, - LPRASSUBENTRYA, DWORD, LPBYTE, DWORD); + LPRASSUBENTRYA, DWORD, LPBYTE, DWORD); DWORD APIENTRY RasSetSubEntryPropertiesW (LPCWSTR, LPCWSTR, DWORD, - LPRASSUBENTRYW, DWORD, LPBYTE, DWORD); + LPRASSUBENTRYW, DWORD, LPBYTE, DWORD); DWORD APIENTRY RasGetAutodialAddressA (LPCSTR, LPDWORD, LPRASAUTODIALENTRYA, - LPDWORD, LPDWORD); + LPDWORD, LPDWORD); DWORD APIENTRY RasGetAutodialAddressW (LPCWSTR, LPDWORD, - LPRASAUTODIALENTRYW, LPDWORD, LPDWORD); + LPRASAUTODIALENTRYW, LPDWORD, LPDWORD); DWORD APIENTRY RasSetAutodialAddressA (LPCSTR, DWORD, LPRASAUTODIALENTRYA, - DWORD, DWORD); + DWORD, DWORD); DWORD APIENTRY RasSetAutodialAddressW (LPCWSTR, DWORD, LPRASAUTODIALENTRYW, - DWORD, DWORD); + DWORD, DWORD); DWORD APIENTRY RasEnumAutodialAddressesA (LPSTR *, LPDWORD, LPDWORD); DWORD APIENTRY RasEnumAutodialAddressesW (LPWSTR *, LPDWORD, LPDWORD); DWORD APIENTRY RasGetAutodialEnableA (DWORD, LPBOOL); @@ -917,9 +905,9 @@ #if (WINVER >= 0x500) typedef DWORD (WINAPI * RasCustomHangUpFn) (HRASCONN); -typedef DWORD (WINAPI * RasCustomDeleteEntryNotifyFn) (LPCTSTR, LPCTSTR, DWORD); +typedef DWORD (WINAPI * RasCustomDeleteEntryNotifyFn) (LPCTSTR, LPCTSTR, DWORD); typedef DWORD (WINAPI * RasCustomDialFn) (HINSTANCE, LPRASDIALEXTENSIONS, - LPCTSTR, LPRASDIALPARAMS, DWORD, LPVOID, LPHRASCONN, DWORD); + LPCTSTR, LPRASDIALPARAMS, DWORD, LPVOID, LPHRASCONN, DWORD); DWORD APIENTRY RasInvokeEapUI (HRASCONN, DWORD, LPRASDIALEXTENSIONS, HWND); DWORD APIENTRY RasGetLinkStatistics (HRASCONN, DWORD, RAS_STATS*); @@ -930,9 +918,9 @@ DWORD APIENTRY RasGetEapUserDataW (HANDLE, LPCWSTR, LPCWSTR, BYTE*, DWORD*); DWORD APIENTRY RasSetEapUserDataA (HANDLE, LPCSTR, LPCSTR, BYTE*, DWORD); DWORD APIENTRY RasSetEapUserDataW (HANDLE, LPCWSTR, LPCWSTR, BYTE*, DWORD); -DWORD APIENTRY RasGetCustomAuthDataA (LPCSTR, LPCSTR, BYTE*, DWORD*); +DWORD APIENTRY RasGetCustomAuthDataA (LPCSTR, LPCSTR, BYTE*, DWORD*); DWORD APIENTRY RasGetCustomAuthDataW (LPCWSTR, LPCWSTR, BYTE*, DWORD*); -DWORD APIENTRY RasSetCustomAuthDataA (LPCSTR, LPCSTR, BYTE*, DWORD); +DWORD APIENTRY RasSetCustomAuthDataA (LPCSTR, LPCSTR, BYTE*, DWORD); DWORD APIENTRY RasSetCustomAuthDataW (LPCWSTR, LPCWSTR, BYTE*, DWORD); DWORD APIENTRY RasGetEapUserIdentityW (LPCWSTR, LPCWSTR, DWORD, HWND, LPRASEAPUSERIDENTITYW*); DWORD APIENTRY RasGetEapUserIdentityA (LPCSTR, LPCSTR, DWORD, HWND, LPRASEAPUSERIDENTITYA*); Modified: trunk/reactos/include/psdk/rasdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rasdlg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rasdlg.h (original) +++ trunk/reactos/include/psdk/rasdlg.h Wed Feb 6 18:29:45 2008 @@ -6,64 +6,64 @@ #include <ras.h> -#define RASPBDEVENT_AddEntry 1 -#define RASPBDEVENT_EditEntry 2 -#define RASPBDEVENT_RemoveEntry 3 -#define RASPBDEVENT_DialEntry 4 -#define RASPBDEVENT_EditGlobals 5 -#define RASPBDEVENT_NoUser 6 -#define RASPBDEVENT_NoUserEdit 7 +#define RASPBDEVENT_AddEntry 1 +#define RASPBDEVENT_EditEntry 2 +#define RASPBDEVENT_RemoveEntry 3 +#define RASPBDEVENT_DialEntry 4 +#define RASPBDEVENT_EditGlobals 5 +#define RASPBDEVENT_NoUser 6 +#define RASPBDEVENT_NoUserEdit 7 #define RASPBDFLAG_PositionDlg 0x00000001 -#define RASPBDFLAG_ForceCloseOnDial 0x00000002 +#define RASPBDFLAG_ForceCloseOnDial 0x00000002 #define RASPBDFLAG_NoUser 0x00000010 #define RASPBDFLAG_UpdateDefaults 0x80000000 -#define RASEDFLAG_PositionDlg 1 -#define RASEDFLAG_NewEntry 2 -#define RASEDFLAG_CloneEntry 4 +#define RASEDFLAG_PositionDlg 1 +#define RASEDFLAG_NewEntry 2 +#define RASEDFLAG_CloneEntry 4 -#define RASDDFLAG_PositionDlg 1 +#define RASDDFLAG_PositionDlg 1 #ifndef RC_INVOKED #include <pshpack4.h> typedef struct tagRASENTRYDLGA { - DWORD dwSize; - HWND hwndOwner; - DWORD dwFlags; - LONG xDlg; - LONG yDlg; - CHAR szEntry[RAS_MaxEntryName + 1]; - DWORD dwError; - ULONG_PTR reserved; - ULONG_PTR reserved2; + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; + CHAR szEntry[RAS_MaxEntryName + 1]; + DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; } RASENTRYDLGA, *LPRASENTRYDLGA; typedef struct tagRASENTRYDLGW { - DWORD dwSize; - HWND hwndOwner; - DWORD dwFlags; - LONG xDlg; - LONG yDlg; - WCHAR szEntry[RAS_MaxEntryName + 1]; - DWORD dwError; - ULONG_PTR reserved; - ULONG_PTR reserved2; + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; + WCHAR szEntry[RAS_MaxEntryName + 1]; + DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; } RASENTRYDLGW, *LPRASENTRYDLGW; typedef struct tagRASDIALDLG { - DWORD dwSize; - HWND hwndOwner; - DWORD dwFlags; - LONG xDlg; - LONG yDlg; - DWORD dwSubEntry; - DWORD dwError; - ULONG_PTR reserved; - ULONG_PTR reserved2; + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; + DWORD dwSubEntry; + DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; } RASDIALDLG, *LPRASDIALDLG; /* Application-defined callback functions */ @@ -72,61 +72,61 @@ typedef struct tagRASPBDLGA { - DWORD dwSize; - HWND hwndOwner; - DWORD dwFlags; - LONG xDlg; - LONG yDlg; - ULONG_PTR dwCallbackId; - RASPBDLGFUNCA pCallback; - DWORD dwError; - ULONG_PTR reserved; - ULONG_PTR reserved2; + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; + ULONG_PTR dwCallbackId; + RASPBDLGFUNCA pCallback; + DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; } RASPBDLGA, *LPRASPBDLGA; typedef struct tagRASPBDLGW { - DWORD dwSize; - HWND hwndOwner; - DWORD dwFlags; - LONG xDlg; - LONG yDlg; - ULONG_PTR dwCallbackId; - RASPBDLGFUNCW pCallback; - DWORD dwError; - ULONG_PTR reserved; - ULONG_PTR reserved2; + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; + ULONG_PTR dwCallbackId; + RASPBDLGFUNCW pCallback; + DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; } RASPBDLGW, *LPRASPBDLGW; typedef struct tagRASMONITORDLG { - DWORD dwSize; - HWND hwndOwner; - DWORD dwFlags; - DWORD dwStartPage; - LONG xDlg; - LONG yDlg; - OUT DWORD dwError; - ULONG_PTR reserved; - ULONG_PTR reserved2; + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + DWORD dwStartPage; + LONG xDlg; + LONG yDlg; + OUT DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; } RASMONITORDLG, *LPRASMONITORDLG; typedef struct tagRASNOUSERA { - DWORD dwSize; - DWORD dwFlags; - DWORD dwTimeoutMs; - CHAR szUserName[UNLEN + 1]; - CHAR szPassword[PWLEN + 1]; - CHAR szDomain[DNLEN + 1]; + DWORD dwSize; + DWORD dwFlags; + DWORD dwTimeoutMs; + CHAR szUserName[UNLEN + 1]; + CHAR szPassword[PWLEN + 1]; + CHAR szDomain[DNLEN + 1]; } RASNOUSERA, *LPRASNOUSERA; typedef struct tagRASNOUSERW { - DWORD dwSize; - DWORD dwFlags; - DWORD dwTimeoutMs; - WCHAR szUserName[UNLEN + 1]; - WCHAR szPassword[PWLEN + 1]; - WCHAR szDomain[DNLEN + 1]; + DWORD dwSize; + DWORD dwFlags; + DWORD dwTimeoutMs; + WCHAR szUserName[UNLEN + 1]; + WCHAR szPassword[PWLEN + 1]; + WCHAR szDomain[DNLEN + 1]; } RASNOUSERW, *LPRASNOUSERW ; #include <poppack.h> @@ -143,25 +143,25 @@ #endif /*(WINVER <= 0x500)*/ #ifdef UNICODE -typedef RASENTRYDLGW RASENTRYDLG, *LPRASENTRYDLG; -typedef RASPBDLGW RASPBDLG, *LPRASPBDLG; -typedef RASNOUSERW RASNOUSER, *LPRASNOUSER; -#define RasDialDlg RasDialDlgW -#define RasEntryDlg RasEntryDlgW +typedef RASENTRYDLGW RASENTRYDLG, *LPRASENTRYDLG; +typedef RASPBDLGW RASPBDLG, *LPRASPBDLG; +typedef RASNOUSERW RASNOUSER, *LPRASNOUSER; +#define RasDialDlg RasDialDlgW +#define RasEntryDlg RasEntryDlgW #if (WINVER <= 0x500) #define RasMonitorDlg RasMonitorDlgW #endif /*(WINVER <= 0x500)*/ -#define RasPhonebookDlg RasPhonebookDlgW +#define RasPhonebookDlg RasPhonebookDlgW #else -typedef RASENTRYDLGA RASENTRYDLG, *LPRASENTRYDLG; -typedef RASPBDLGA RASPBDLG, *LPRASPBDLG; -typedef RASNOUSERA RASNOUSER, *LPRASNOUSER; -#define RasDialDlg RasDialDlgA -#define RasEntryDlg RasEntryDlgA +typedef RASENTRYDLGA RASENTRYDLG, *LPRASENTRYDLG; +typedef RASPBDLGA RASPBDLG, *LPRASPBDLG; +typedef RASNOUSERA RASNOUSER, *LPRASNOUSER; +#define RasDialDlg RasDialDlgA +#define RasEntryDlg RasEntryDlgA #if (WINVER <= 0x500) #define RasMonitorDlg RasMonitorDlgA #endif /*(WINVER <= 0x500)*/ -#define RasPhonebookDlg RasPhonebookDlgA +#define RasPhonebookDlg RasPhonebookDlgA #endif /* UNICODE */ #endif /* RC_INVOKED */ Added: trunk/reactos/include/psdk/raseapif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/raseapif.h?re… ============================================================================== --- trunk/reactos/include/psdk/raseapif.h (added) +++ trunk/reactos/include/psdk/raseapif.h Wed Feb 6 18:29:45 2008 @@ -1,0 +1,272 @@ +#ifndef _RASEAPIF_ +#define _RASEAPIF_ + +#ifdef __cplusplus +extern "C" { +#endif + +#if(WINVER >= 0x0500) + +#define RAS_EAP_REGISTRY_LOCATION TEXT("SYSTEM\\CurrentControlSet\\Services\\Rasman\\PPP\\EAP") + +#define RAS_EAP_VALUENAME_PATH TEXT("Path") +#define RAS_EAP_VALUENAME_CONFIGUI TEXT("ConfigUIPath") +#define RAS_EAP_VALUENAME_INTERACTIVEUI TEXT("InteractiveUIPath") +#define RAS_EAP_VALUENAME_IDENTITY TEXT("IdentityPath") +#define RAS_EAP_VALUENAME_FRIENDLY_NAME TEXT("FriendlyName") +#define RAS_EAP_VALUENAME_DEFAULT_DATA TEXT("ConfigData") +#define RAS_EAP_VALUENAME_REQUIRE_CONFIGUI TEXT("RequireConfigUI") +#define RAS_EAP_VALUENAME_ENCRYPTION TEXT("MPPEEncryptionSupported") +#define RAS_EAP_VALUENAME_INVOKE_NAMEDLG TEXT("InvokeUsernameDialog") +#define RAS_EAP_VALUENAME_INVOKE_PWDDLG TEXT("InvokePasswordDialog") +#define RAS_EAP_VALUENAME_CONFIG_CLSID TEXT("ConfigCLSID") +#define RAS_EAP_VALUENAME_STANDALONE_SUPPORTED TEXT("StandaloneSupported") +#define RAS_EAP_VALUENAME_ROLES_SUPPORTED TEXT("RolesSupported") +#define RAS_EAP_VALUENAME_PER_POLICY_CONFIG TEXT("PerPolicyConfig") + +#define RAS_EAP_ROLE_AUTHENTICATOR 0x00000001 +#define RAS_EAP_ROLE_AUTHENTICATEE 0x00000002 + +#define RAS_EAP_ROLE_EXCLUDE_IN_EAP 0x00000004 +#define RAS_EAP_ROLE_EXCLUDE_IN_PEAP 0x00000008 +#define RAS_EAP_ROLE_EXCLUDE_IN_VPN 0x00000010 + +#define raatARAPChallenge 33 +#define raatARAPOldPassword 19 +#define raatARAPNewPassword 20 +#define raatARAPPasswordChangeReason 21 + +#define EAPCODE_Request 1 +#define EAPCODE_Response 2 +#define EAPCODE_Success 3 +#define EAPCODE_Failure 4 + +#define MAXEAPCODE 4 + +#define RAS_EAP_FLAG_ROUTER 0x00000001 +#define RAS_EAP_FLAG_NON_INTERACTIVE 0x00000002 +#define RAS_EAP_FLAG_LOGON 0x00000004 +#define RAS_EAP_FLAG_PREVIEW 0x00000008 +#define RAS_EAP_FLAG_FIRST_LINK 0x00000010 +#define RAS_EAP_FLAG_MACHINE_AUTH 0x00000020 +#define RAS_EAP_FLAG_GUEST_ACCESS 0x00000040 +#define RAS_EAP_FLAG_8021X_AUTH 0x00000080 +#define RAS_EAP_FLAG_HOSTED_IN_PEAP 0x00000100 +#define RAS_EAP_FLAG_RESUME_FROM_HIBERNATE 0x00000200 +#define RAS_EAP_FLAG_PEAP_UPFRONT 0x00000400 +#define RAS_EAP_FLAG_ALTERNATIVE_USER_DB 0x00000800 + +typedef enum _RAS_AUTH_ATTRIBUTE_TYPE_ +{ + raatMinimum = 0, + raatUserName, + raatUserPassword, + raatMD5CHAPPassword, + raatNASIPAddress, + raatNASPort, + raatServiceType, + raatFramedProtocol, + raatFramedIPAddress, + raatFramedIPNetmask, + raatFramedRouting = 10, + raatFilterId, + raatFramedMTU, + raatFramedCompression, + raatLoginIPHost, + raatLoginService, + raatLoginTCPPort, + raatUnassigned17, + raatReplyMessage, + raatCallbackNumber, + raatCallbackId =20, + raatUnassigned21, + raatFramedRoute, + raatFramedIPXNetwork, + raatState, + raatClass, + raatVendorSpecific, + raatSessionTimeout, + raatIdleTimeout, + raatTerminationAction, + raatCalledStationId = 30, + raatCallingStationId, + raatNASIdentifier, + raatProxyState, + raatLoginLATService, + raatLoginLATNode, + raatLoginLATGroup, + raatFramedAppleTalkLink, + raatFramedAppleTalkNetwork, + raatFramedAppleTalkZone, + raatAcctStatusType = 40, + raatAcctDelayTime, + raatAcctInputOctets, + raatAcctOutputOctets, + raatAcctSessionId, + raatAcctAuthentic, + raatAcctSessionTime, + raatAcctInputPackets, + raatAcctOutputPackets, + raatAcctTerminateCause, + raatAcctMultiSessionId = 50, + raatAcctLinkCount, + raatAcctEventTimeStamp = 55, + raatMD5CHAPChallenge = 60, + raatNASPortType, + raatPortLimit, + raatLoginLATPort, + raatTunnelType, + raatTunnelMediumType, + raatTunnelClientEndpoint, + raatTunnelServerEndpoint, + raatARAPPassword = 70, + raatARAPFeatures, + raatARAPZoneAccess, + raatARAPSecurity, + raatARAPSecurityData, + raatPasswordRetry, + raatPrompt, + raatConnectInfo, + raatConfigurationToken, + raatEAPMessage, + raatSignature = 80, + raatARAPChallengeResponse = 84, + raatAcctInterimInterval = 85, + raatARAPGuestLogon = 8096, + raatCertificateOID, + raatEAPConfiguration, + raatPEAPEmbeddedEAPTypeId, + raatPEAPFastRoamedSession, + raatEAPTLV = 8102, + raatReserved = 0xFFFFFFFF + +}RAS_AUTH_ATTRIBUTE_TYPE; + +typedef struct _RAS_AUTH_ATTRIBUTE +{ + RAS_AUTH_ATTRIBUTE_TYPE raaType; + DWORD dwLength; + PVOID Value; + +}RAS_AUTH_ATTRIBUTE, *PRAS_AUTH_ATTRIBUTE; + +typedef struct _PPP_EAP_PACKET +{ + BYTE Code; + BYTE Id; + BYTE Length[2]; + BYTE Data[1]; +}PPP_EAP_PACKET, *PPPP_EAP_PACKET; + +#define PPP_EAP_PACKET_HDR_LEN (sizeof(PPP_EAP_PACKET) - 1) + +typedef struct _PPP_EAP_INPUT +{ + DWORD dwSizeInBytes; + DWORD fFlags; + BOOL fAuthenticator; + WCHAR* pwszIdentity; + WCHAR* pwszPassword; + BYTE bInitialId; + RAS_AUTH_ATTRIBUTE* pUserAttributes; + BOOL fAuthenticationComplete; + DWORD dwAuthResultCode; + OPTIONAL HANDLE hTokenImpersonateUser; + BOOL fSuccessPacketReceived; + BOOL fDataReceivedFromInteractiveUI; + OPTIONAL PBYTE pDataFromInteractiveUI; + DWORD dwSizeOfDataFromInteractiveUI; + OPTIONAL PBYTE pConnectionData; + DWORD dwSizeOfConnectionData; + OPTIONAL PBYTE pUserData; + DWORD dwSizeOfUserData; + HANDLE hReserved; +}PPP_EAP_INPUT, *PPPP_EAP_INPUT; + +typedef enum _PPP_EAP_ACTION +{ + EAPACTION_NoAction, + EAPACTION_Authenticate, + EAPACTION_Done, + EAPACTION_SendAndDone, + EAPACTION_Send, + EAPACTION_SendWithTimeout, + EAPACTION_SendWithTimeoutInteractive, + EAPACTION_IndicateTLV, + EAPACTION_IndicateIdentity +}PPP_EAP_ACTION; + +typedef struct _PPP_EAP_OUTPUT +{ + DWORD dwSizeInBytes; + PPP_EAP_ACTION Action; + DWORD dwAuthResultCode; + OPTIONAL RAS_AUTH_ATTRIBUTE* pUserAttributes; + BOOL fInvokeInteractiveUI; + OPTIONAL PBYTE pUIContextData; + DWORD dwSizeOfUIContextData; + BOOL fSaveConnectionData; + OPTIONAL PBYTE pConnectionData; + DWORD dwSizeOfConnectionData; + BOOL fSaveUserData; + OPTIONAL PBYTE pUserData; + DWORD dwSizeOfUserData; +}PPP_EAP_OUTPUT, *PPPP_EAP_OUTPUT; + +typedef struct _PPP_EAP_INFO +{ + DWORD dwSizeInBytes; + DWORD dwEapTypeId; + DWORD (APIENTRY *RasEapInitialize)(IN BOOL fInitialize ); + DWORD (APIENTRY *RasEapBegin)(OUT VOID** ppWorkBuffer, IN PPP_EAP_INPUT* pPppEapInput); + DWORD (APIENTRY *RasEapEnd)(IN VOID* pWorkBuffer); + DWORD (APIENTRY *RasEapMakeMessage)(IN VOID* pWorkBuf, IN PPP_EAP_PACKET* pReceivePacket, OUT PPP_EAP_PACKET* pSendPacket, IN DWORD cbSendPacket, OUT PPP_EAP_OUTPUT* pEapOutput, IN PPP_EAP_INPUT* pEapInput); +}PPP_EAP_INFO, *PPPP_EAP_INFO; + +DWORD APIENTRY +RasEapGetInfo(IN DWORD dwEapTypeId, + OUT PPP_EAP_INFO* pEapInfo); + +DWORD APIENTRY +RasEapFreeMemory(IN BYTE* pMemory); + +DWORD APIENTRY +RasEapInvokeInteractiveUI(IN DWORD dwEapTypeId, + IN HWND hwndParent, + IN BYTE* pUIContextData, + IN DWORD dwSizeOfUIContextData, + OUT BYTE** ppDataFromInteractiveUI, + OUT DWORD* pdwSizeOfDataFromInteractiveUI); + +DWORD APIENTRY +RasEapInvokeConfigUI(IN DWORD dwEapTypeId, + IN HWND hwndParent, + IN DWORD dwFlags, + IN BYTE* pConnectionDataIn, + IN DWORD dwSizeOfConnectionDataIn, + OUT BYTE** ppConnectionDataOut, + OUT DWORD* pdwSizeOfConnectionDataOut); + +DWORD APIENTRY +RasEapGetIdentity(IN DWORD dwEapTypeId, + IN HWND hwndParent, + IN DWORD dwFlags, + IN const WCHAR* pwszPhonebook, + IN const WCHAR* pwszEntry, + IN BYTE* pConnectionDataIn, + IN DWORD dwSizeOfConnectionDataIn, + IN BYTE* pUserDataIn, + IN DWORD dwSizeOfUserDataIn, + OUT BYTE** ppUserDataOut, + OUT DWORD* pdwSizeOfUserDataOut, + OUT WCHAR** ppwszIdentity +); + +#endif /* WINVER >= 0x0500 */ + +#ifdef __cplusplus +} +#endif + +#endif /* _RASEAPIF_ */ + Propchange: trunk/reactos/include/psdk/raseapif.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/rassapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rassapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/rassapi.h (original) +++ trunk/reactos/include/psdk/rassapi.h Wed Feb 6 18:29:45 2008 @@ -11,8 +11,8 @@ #include <lmcons.h> #endif #define RASSAPI_MAX_PHONENUMBER_SIZE 128 -#define RASSAPI_MAX_MEDIA_NAME 16 -#define RASSAPI_MAX_PORT_NAME 16 +#define RASSAPI_MAX_MEDIA_NAME 16 +#define RASSAPI_MAX_PORT_NAME 16 #define RASSAPI_MAX_DEVICE_NAME 128 #define RASSAPI_MAX_DEVICETYPE_NAME 16 #define RASSAPI_MAX_PARAM_KEY_SIZE 32 @@ -23,18 +23,18 @@ #define RASPRIV_CallbackType (RASPRIV_AdminSetCallback \ | RASPRIV_CallerSetCallback \ | RASPRIV_NoCallback) -#define RAS_MODEM_OPERATIONAL 1 +#define RAS_MODEM_OPERATIONAL 1 #define RAS_MODEM_NOT_RESPONDING 2 #define RAS_MODEM_HARDWARE_FAILURE 3 #define RAS_MODEM_INCORRECT_RESPONSE 4 -#define RAS_MODEM_UNKNOWN 5 +#define RAS_MODEM_UNKNOWN 5 #define RAS_PORT_NON_OPERATIONAL 1 -#define RAS_PORT_DISCONNECTED 2 -#define RAS_PORT_CALLING_BACK 3 -#define RAS_PORT_LISTENING 4 +#define RAS_PORT_DISCONNECTED 2 +#define RAS_PORT_CALLING_BACK 3 +#define RAS_PORT_LISTENING 4 #define RAS_PORT_AUTHENTICATING 5 -#define RAS_PORT_AUTHENTICATED 6 -#define RAS_PORT_INITIALIZING 7 +#define RAS_PORT_AUTHENTICATED 6 +#define RAS_PORT_INITIALIZING 7 #define MEDIA_UNKNOWN 0 #define MEDIA_SERIAL 1 #define MEDIA_RAS10_SERIAL 2 @@ -59,17 +59,17 @@ ParamString = 1 } RAS_PARAMS_FORMAT; typedef union RAS_PARAMS_VALUE { - DWORD Number; - struct { - DWORD Length; - PCHAR Data; - } String; + DWORD Number; + struct { + DWORD Length; + PCHAR Data; + } String; } RAS_PARAMS_VALUE; typedef struct RAS_PARAMETERS { - CHAR P_Key [RASSAPI_MAX_PARAM_KEY_SIZE]; - RAS_PARAMS_FORMAT P_Type; - BYTE P_Attributes; - RAS_PARAMS_VALUE P_Value; + CHAR P_Key [RASSAPI_MAX_PARAM_KEY_SIZE]; + RAS_PARAMS_FORMAT P_Type; + BYTE P_Attributes; + RAS_PARAMS_VALUE P_Value; } RAS_PARAMETERS; typedef struct _RAS_USER_0 { BYTE bfPrivilege;

16 years, 10 months

[dchapyshev] 32159: - Import tapi32.dll from Wine - Add more defines and structures to tapi.h - Add tapi32 to bootcd

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 6 18:23:40 2008 New Revision: 32159 URL: http://svn.reactos.org/svn/reactos?rev=32159&view=rev Log: - Import tapi32.dll from Wine - Add more defines and structures to tapi.h - Add tapi32 to bootcd Added: trunk/reactos/dll/win32/tapi32/ trunk/reactos/dll/win32/tapi32/assisted.c (with props) trunk/reactos/dll/win32/tapi32/line.c (with props) trunk/reactos/dll/win32/tapi32/phone.c (with props) trunk/reactos/dll/win32/tapi32/tapi32.rbuild (with props) trunk/reactos/dll/win32/tapi32/tapi32.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/include/psdk/tapi.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=321… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/tapi32/assisted.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/assisted.… Added: trunk/reactos/dll/win32/tapi32/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/line.c?re… Added: trunk/reactos/dll/win32/tapi32/phone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/phone.c?r… Added: trunk/reactos/dll/win32/tapi32/tapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.rb… Added: trunk/reactos/dll/win32/tapi32/tapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.sp… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Modified: trunk/reactos/include/psdk/tapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tapi.h?rev=32…

16 years, 10 months

[dreimer] 32158: Update German RC File

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 6 15:20:34 2008 New Revision: 32158 URL: http://svn.reactos.org/svn/reactos?rev=32158&view=rev Log: Update German RC File Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Wed Feb 6 15:20:34 2008 @@ -98,67 +98,67 @@ IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Save Scheme As" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 +CAPTION "Schema speichern unter" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Dieses Soundschema speichern unter:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 157, 36, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 157, 36, 60, 14 END IDD_SPEAKERS DIALOG 0, 0, 257, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speakers" +CAPTION "Lautsprecher" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + LTEXT "Wählen Sie die Lautsprecherkonfiguration, die der an Ihrem Computer am ehesten entspricht.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "S&peaker setup:", 8502, 53, 169, 55, 10 + LTEXT "Lauts&precherkonfiguration:", 8502, 53, 169, 90, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 - GROUPBOX "Audio playback", 8494, 7, 32, 243, 152 +CAPTION "Leistung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Diese Einstellungen bestimmen, wie ReactOS Audiodaten wiedergibt. Sie können auch bei Problemen in der Audiowiedergabe helfen.", 8492, 34, 7, 218, 23 + GROUPBOX "Audiowiedergabe", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 56, 111, 14 + LTEXT "&Hardwarebeschleunigung:", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 123, 103, 14 + LTEXT "&Konvertierungsqualtität:", 8496, 13, 123, 103, 14 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 7, 191, 110, 14 - LTEXT "None", 8497, 128, 56, 21, 10 - LTEXT "Full", 8498, 214, 56, 21, 9 - LTEXT "Good", 8499, 128, 123, 21, 10 - LTEXT "Best", 8500, 214, 123, 23, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 + PUSHBUTTON "Standard &wiederherstellen", 5400, 7, 191, 110, 14 + LTEXT "Keine", 8497, 128, 56, 21, 10 + LTEXT "Voll", 8498, 214, 56, 21, 9 + LTEXT "Gut", 8499, 128, 123, 21, 10 + LTEXT "Beste", 8500, 214, 123, 23, 9 + LTEXT "Diese Zeichenfolge beschreibt die Hardwareeinstellung für das Capture Gerät", 5399, 13, 145, 227, 21 + LTEXT "Diese Zeichenfolge beschreibt die Hardwareeinstellung für das Render Gerät", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 - GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 +CAPTION "Leistung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Diese Einstellungen bestimmen, wie ReactOS Audiodaten aufnimmt. Sie können auch bei Problemen in der Audiowiedergabe helfen.", 8492, 34, 7, 217, 20 + GROUPBOX "Aufnahme", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "&Hardwarebeschleunigung:", 8495, 13, 46, 103, 17 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "&Konvertierungsqualtität:", 8496, 13, 103, 103, 17 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 - LTEXT "None", 8497, 125, 46, 24, 10 - LTEXT "Full", 8498, 217, 46, 19, 9 - LTEXT "Good", 8499, 125, 103, 24, 10 - LTEXT "Best", 8500, 217, 103, 19, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 + PUSHBUTTON "Standard &wiederherstellen", 5400, 9, 158, 110, 14 + LTEXT "Keine", 8497, 125, 46, 24, 10 + LTEXT "Voll", 8498, 217, 46, 19, 9 + LTEXT "Gut", 8499, 125, 103, 24, 10 + LTEXT "Beste", 8500, 217, 103, 19, 9 + LTEXT "Diese Zeichenfolge beschreibt die Hardwareeinstellung für das Capture Gerät", 5399, 13, 125, 222, 21 + LTEXT "Diese Zeichenfolge beschreibt die Hardwareeinstellung für das Render Gerät", 5398, 13, 68, 218, 24 END IDD_SETUP1 DIALOG 0, 0, 227, 206 @@ -168,11 +168,11 @@ BEGIN GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 - AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 - LTEXT "Notes", 10246, 58, 87, 150, 11 - LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 - LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 + LTEXT "Dieser Computer kann keine Audiodaten abspielen, da der ReactOS Audio-Dienst nicht aktiviert ist.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "&ReactOS Audio aktivieren", 10253, 60, 68, 150, 9 + LTEXT "Informationen", 10246, 58, 87, 150, 11 + LTEXT "1. Sie müssen Administrator sein, um diesen Dienst aktivieren zu können. Wenn Sie nicht als Administrator angemeldet sind, werden Sie nach dem Administaratornamen und Passwort gefragt.", 10247, 60, 100, 150, 40 + LTEXT "2. Nach Aktivierung des ReactOS Audio Dienstes müssen Sie den Computer neustarten.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 @@ -180,41 +180,41 @@ CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Description goes here.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 + LTEXT "Bezeichung kommt hier rein.", 9506, 8, 4, 212, 24 + LTEXT "Niedrig", 9473, 65, 31, 22, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Hoch", 9474, 202, 31, 17, 8 + LTEXT "Niedrig", 9477, 65, 50, 22, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Hoch", 9478, 202, 50, 17, 8 + LTEXT "Niedrig", 9481, 65, 69, 22, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Hoch", 9482, 202, 69, 17, 8 + LTEXT "Niedrig", 9485, 65, 88, 22, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Hoch", 9486, 202, 88, 17, 8 + LTEXT "Niedrig", 9489, 65, 107, 22, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Hoch", 9490, 202, 107, 17, 8 + LTEXT "Niedrig", 9493, 65, 126, 22, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Hoch", 9494, 202, 126, 17, 8 + LTEXT "Niedrig", 9497, 65, 145, 22, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Hoch", 9498, 202, 145, 17, 8 + LTEXT "Niedrig", 9501, 65, 164, 22, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 - PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 + LTEXT "Hoch", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "&Alle Regler auf einmal betätigen", 9504, 5, 185, 216, 9 + PUSHBUTTON "Standard &wiederherstellen", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 @@ -224,44 +224,44 @@ BEGIN GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 - LTEXT "To restart ReactOS, click OK.", 10262, 60, 75, 150, 20 - LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 + LTEXT "Der ReactOS Audio Dienst ist nun aktiviert. Dennoch kann es sein, dass die Audiowiedergabe nicht richtig funktioniert, bis Sie ReactOS neugestartet haben. Wenn Sie jetzt neustarten wollen, speichern Sie Ihre Arbeit und beenden Sie alle Programme.", 10261, 60, 25, 150, 50 + LTEXT "Um ReactOS neuzustarten, klicken Sie OK.", 10262, 60, 75, 150, 20 + LTEXT "Wenn Sie abbrechen, müssen Sie später neustarten, um sichergehen zu können, dass die Audiowiedergabe richtig funktioniert.", 10263, 60, 100, 150, 40 END STRINGTABLE BEGIN - IDS_CPLNAME "Sound und Audio Geräte" + IDS_CPLNAME "Sounds und Audio Geräte" IDS_CPLDESCRIPTION "Ändert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen für Ihre Lautsprecher und Aufnahmegeräte." IDS_NO_SOUND "(Kein)" - 5825 "Program error" - 5826 "Close program" - 5827 "Critical Battery Alarm" - 5828 "Device Connect" - 5829 "Device Disconnect" - 5830 "Device Failed to Connect" - 5831 "Empty Recycle Bin" - 5832 "Low Battery Alarm" - 5833 "Maximize" - 5834 "Menu command" - 5835 "Menu popup" - 5836 "Minimize" - 5837 "New Mail Notification" - 5838 "Start Navigation" - 5839 "Open program" - 5840 "Print Complete" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" - 5844 "Default sound" - 5845 "Exclamation" - 5846 "Exit ReactOS" - 5847 "Critical Stop" - 5848 "System Notification" - 5849 "Question" - 5850 "Start ReactOS" - 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" -END + 5825 "Programmfehler" + 5826 "Programm schließen" + 5827 "Alarm bei kritischem Batteriestand" + 5828 "Geräteanschluss" + 5829 "Gerätetrennung" + 5830 "Fehler bei Geräteverbindung" + 5831 "Papierkorb leeren" + 5832 "Alarm bei niedrigem Batteriestand" + 5833 "Maximieren" + 5834 "Menübefehl" + 5835 "Menü-Popup" + 5836 "Minimieren" + 5837 "Posteingangsbenachrichtigung" + 5838 "Navigation starten" + 5839 "Programm öffnen" + 5840 "Druckvorgang abgeschlossen" + 5841 "Verkleinern" + 5842 "Vergrößern" + 5843 "Sternchen" + 5844 "Standardsound" + 5845 "Hinweis" + 5846 "ReactOS beenden" + 5847 "Kritischer Abbruch" + 5848 "Systembenachrichtigung" + 5849 "Frage" + 5850 "ReactOS starten" + 5851 "Startmenü" + 5852 "ReactOS-Abmeldung" + 5853 "ReactOS-Anmeldung" +END

16 years, 10 months

[dchapyshev] 32157: - Add more dialogs - Add disable all controls functions - Add icons

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 6 14:36:37 2008 New Revision: 32157 URL: http://svn.reactos.org/svn/reactos?rev=32157&view=rev Log: - Add more dialogs - Add disable all controls functions - Add icons Added: trunk/reactos/dll/cpl/mmsys/audio.c (with props) trunk/reactos/dll/cpl/mmsys/resources/3004.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4353.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4354.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4355.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4356.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4357.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4358.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4359.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4360.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4361.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4362.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4363.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4364.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4365.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4366.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4367.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4368.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4369.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4370.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4371.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4372.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4373.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4374.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4375.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4376.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4377.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4378.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4379.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4380.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4381.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4382.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4383.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4384.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4385.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4386.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4387.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4388.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4390.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4393.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/4394.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/play.ico (with props) trunk/reactos/dll/cpl/mmsys/resources/stop.ico (with props) trunk/reactos/dll/cpl/mmsys/voice.c (with props) Removed: trunk/reactos/dll/cpl/mmsys/resources/microphone.ico trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico trunk/reactos/dll/cpl/mmsys/resources/muted.ico Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c trunk/reactos/dll/cpl/mmsys/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… Added: trunk/reactos/dll/cpl/mmsys/resources/3004.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/30… Added: trunk/reactos/dll/cpl/mmsys/resources/4353.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4354.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4355.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4356.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4357.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4358.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4359.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4360.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4361.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4362.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4363.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4364.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4365.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4366.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4367.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4368.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4369.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4370.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4371.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4372.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4373.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4374.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4375.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4376.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4377.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4378.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4379.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4380.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4381.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4382.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4383.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4384.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4385.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4386.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4387.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4388.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4390.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4393.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Added: trunk/reactos/dll/cpl/mmsys/resources/4394.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… Removed: trunk/reactos/dll/cpl/mmsys/resources/microphone.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/mi… Removed: trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/mm… Removed: trunk/reactos/dll/cpl/mmsys/resources/muted.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/mu… Added: trunk/reactos/dll/cpl/mmsys/resources/play.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/pl… Added: trunk/reactos/dll/cpl/mmsys/resources/stop.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/st… Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… Added: trunk/reactos/dll/cpl/mmsys/voice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/voice.c?rev=… Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev…

16 years, 10 months

[dreimer] 32156: Why easy if you can get it difficult. Removed two Variables I used in charch. Add a security check for title setting. Check if RosBE Version got declared.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 6 14:00:24 2008 New Revision: 32156 URL: http://svn.reactos.org/svn/reactos?rev=32156&view=rev Log: Why easy if you can get it difficult. Removed two Variables I used in charch. Add a security check for title setting. Check if RosBE Version got declared. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Wed Feb 6 14:00:24 2008 @@ -163,7 +163,9 @@ :: "%_ROSBE_BASEDIR%\Tools\flash.exe" -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Wed Feb 6 14:00:24 2008 @@ -73,5 +73,6 @@ ) goto :EOF -:EOC -title ReactOS Build Environment %_ROSBE_VERSION% +:EOCif defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Wed Feb 6 14:00:24 2008 @@ -248,7 +248,9 @@ goto :NOK :NOK -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Wed Feb 6 14:00:24 2008 @@ -107,7 +107,6 @@ echo Change the ReactOS source directory for the current RosBE session. echo Possible Architectures are: x86, ppc, arm. echo. - echo previous - Switch to the previous ReactOS source directory. goto :EOC ) ) @@ -203,4 +202,6 @@ ) :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd Wed Feb 6 14:00:24 2008 @@ -15,28 +15,28 @@ :: :: Parse the command line arguments. +:: ROS_ARCH: Set to x86, ppc or arm. +:: ROS_PREFIX: Default is mingw32. ppc could be mingw32-ppc, arm mingw32-arm. :: + if "%1" == "" ( call :INTERACTIVE ) else ( set _1=%1 ) -if /i "%_1%" == "previous" ( - popd -) if /i "%_1%" == "x86" ( - set _ROSBE_ARCH%=x86 - set _ROSBE_PREFIX=mingw32 + set ROS_ARCH= + set ROS_PREFIX= goto :EOC ) if /i "%_1%" == "arm" ( - set _ROSBE_ARCH%=arm - set _ROSBE_PREFIX=mingwarm + set ROS_ARCH=arm + set ROS_PREFIX=mingw32-arm goto :EOC ) if /i "%_1%" == "ppc" ( - set _ROSBE_ARCH%=ppc - set _ROSBE_PREFIX=mingwppc + set ROS_ARCH==ppc + set ROS_PREFIX=mingw32-ppc goto :EOC ) if not "%_1%" == "" ( @@ -57,27 +57,8 @@ goto :EOF :EOC -pushd %_1% - -:: -:: Set to x86, ppc or arm. -:: -set ROS_ARCH=%_ROSBE_ARCH% - -:: -:: Default is mingw32. ppc could be mingwppc, arm mingwarm. -:: -set ROS_PREFIX=%_ROSBE_PREFIX% - REM chdefgcc %PATH% -REM Maybe another way to set the compiler... if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) - -:: -:: Unload all used Vars. -:: -set _ROSBE_ARCH= -set _ROSBE_PREFIX= Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Wed Feb 6 14:00:24 2008 @@ -48,7 +48,9 @@ goto :EOF :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Wed Feb 6 14:00:24 2008 @@ -28,4 +28,6 @@ echo ERROR: options.exe was not found. ) -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Wed Feb 6 14:00:24 2008 @@ -84,7 +84,9 @@ goto :EOF :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Wed Feb 6 14:00:24 2008 @@ -90,7 +90,9 @@ if /i "%UP%"=="no" goto :EOC :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Wed Feb 6 14:00:24 2008 @@ -38,4 +38,6 @@ call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3 :EOC -title ReactOS Build Environment %_ROSBE_VERSION% +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +)

16 years, 10 months

[hpoussin] 32155: Fix typo

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Feb 6 13:37:21 2008 New Revision: 32155 URL: http://svn.reactos.org/svn/reactos?rev=32155&view=rev Log: Fix typo Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Wed Feb 6 13:37:21 2008 @@ -717,7 +717,7 @@ */ if (!FsOpenSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) { - UiMessageBox("Failed to open boot drive."); + UiMessageBox("Failed to open system drive."); return; }

16 years, 10 months

[gedmurphy] 32154: fix indentation

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Feb 6 13:34:03 2008 New Revision: 32154 URL: http://svn.reactos.org/svn/reactos?rev=32154&view=rev Log: fix indentation Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Wed Feb 6 13:34:03 2008 @@ -59,8 +59,8 @@ <file>ofw.c</file> <file>ofw_util.s</file> <file>ofw_calls.s</file> - <file>ofwdisk.c</file> - <file>ofw_method.c</file> + <file>ofwdisk.c</file> + <file>ofw_method.c</file> <file>prep.c</file> <file>prep_ide.c</file> <file>prep_pci.c</file> @@ -103,7 +103,7 @@ <file>boot.s</file> <file>ferouart.c</file> <file>macharm.c</file> - <file>stubs.c</file> + <file>stubs.c</file> </module> </if> </directory>

16 years, 10 months

[fireball] 32153: - Make i8042Flush flush both output and input buffers. - Make i8042Flush apply only KBD_OBF flag (applying MOU_OBF leads to an infinite loop trying to flush the buffer). - Fix a bug in i8042Write, where instead of waiting by polling a PollingIterations times (~10000), it was using ResendIterations (=3), thus giving 8042 very small chance of processing the data. - Make i8042BasicDetect resend CTRL_SELF_TEST sequence, if controller asks so. Maximum resend iterations are limited b

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 6 12:46:38 2008 New Revision: 32153 URL: http://svn.reactos.org/svn/reactos?rev=32153&view=rev Log: - Make i8042Flush flush both output and input buffers. - Make i8042Flush apply only KBD_OBF flag (applying MOU_OBF leads to an infinite loop trying to flush the buffer). - Fix a bug in i8042Write, where instead of waiting by polling a PollingIterations times (~10000), it was using ResendIterations (=3), thus giving 8042 very small chance of processing the data. - Make i8042BasicDetect resend CTRL_SELF_TEST sequence, if controller asks so. Maximum resend iterations are limited by ResendIterations variable. - Reinsert debug-messages hack, since this is an early-loading driver, and it's not possible to break in to KDBG to change debug filter values. - As a result, keyboard and mouse work on real hardware again. See issue #3036 for more details. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/input/i8042prt/readwrite.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Wed Feb 6 12:46:38 2008 @@ -475,6 +475,17 @@ ULONG i; NTSTATUS Status; + /* ROS Hack: ideally, we shouldn't have to initialize debug level this way, + but since the only way is to change it via KDBG, it's better to leave + it here too. */ +#if 0 + DbgSetDebugFilterState( + DPFLTR_I8042PRT_ID, + (1 << DPFLTR_ERROR_LEVEL) | (1 << DPFLTR_WARNING_LEVEL) | + (1 << DPFLTR_TRACE_LEVEL) /*| (1 << DPFLTR_INFO_LEVEL)*/ | DPFLTR_MASK, + TRUE); +#endif + Status = IoAllocateDriverObjectExtension( DriverObject, DriverObject, Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Wed Feb 6 12:46:38 2008 @@ -75,6 +75,7 @@ IN PPORT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; + ULONG ResendIterations; UCHAR Value = 0; /* Don't enable keyboard and mouse interrupts, disable keyboard/mouse */ @@ -83,23 +84,33 @@ i8042Flush(DeviceExtension); - if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST)) - { - WARN_(I8042PRT, "Writing CTRL_SELF_TEST command failed\n"); - return STATUS_IO_TIMEOUT; - } - - Status = i8042ReadDataWait(DeviceExtension, &Value); - if (!NT_SUCCESS(Status)) - { - WARN_(I8042PRT, "Failed to read CTRL_SELF_TEST response, status 0x%08lx\n", Status); - return Status; - } - - if (Value != 0x55) - { - WARN_(I8042PRT, "Got 0x%02x instead of 0x55\n", Value); - return STATUS_IO_DEVICE_ERROR; + ResendIterations = DeviceExtension->Settings.ResendIterations + 1; + while (ResendIterations--) + { + if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST)) + { + WARN_(I8042PRT, "Writing CTRL_SELF_TEST command failed\n"); + return STATUS_IO_TIMEOUT; + } + + Status = i8042ReadDataWait(DeviceExtension, &Value); + if (!NT_SUCCESS(Status)) + { + WARN_(I8042PRT, "Failed to read CTRL_SELF_TEST response, status 0x%08lx\n", Status); + return Status; + } + + if (Value == KBD_RESEND) + { + TRACE_(I8042PRT, "Resending...\n", Value); + KeStallExecutionProcessor(50); + continue; + } + else if (Value != 0x55) + { + WARN_(I8042PRT, "Got 0x%02x instead of 0x55\n", Value); + return STATUS_IO_DEVICE_ERROR; + } } /* Modified: trunk/reactos/drivers/input/i8042prt/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/rea… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/readwrite.c (original) +++ trunk/reactos/drivers/input/i8042prt/readwrite.c Wed Feb 6 12:46:38 2008 @@ -21,8 +21,16 @@ { UCHAR Ignore; - while (NT_SUCCESS(i8042ReadData(DeviceExtension, KBD_OBF | MOU_OBF, &Ignore))) { - INFO_(I8042PRT, "Data flushed\n"); /* drop */ + /* Flush output buffer */ + while (NT_SUCCESS(i8042ReadData(DeviceExtension, KBD_OBF /* | MOU_OBF*/, &Ignore))) { + KeStallExecutionProcessor(50); + TRACE_(I8042PRT, "Output data flushed\n"); + } + + /* Flush input buffer */ + while (NT_SUCCESS(i8042ReadData(DeviceExtension, KBD_IBF, &Ignore))) { + KeStallExecutionProcessor(50); + TRACE_(I8042PRT, "Input data flushed\n"); } } @@ -189,20 +197,20 @@ IN PUCHAR addr, IN UCHAR data) { - ULONG ResendIterations; + ULONG Counter; ASSERT(addr); ASSERT(DeviceExtension->ControlPort != NULL); - ResendIterations = DeviceExtension->Settings.ResendIterations; + Counter = DeviceExtension->Settings.PollingIterations; while ((KBD_IBF & READ_PORT_UCHAR(DeviceExtension->ControlPort)) && - (ResendIterations--)) - { - KeStallExecutionProcessor(50); - } - - if (ResendIterations) + (Counter--)) + { + KeStallExecutionProcessor(50); + } + + if (Counter) { WRITE_PORT_UCHAR(addr, data); INFO_(I8042PRT, "Sent 0x%x to port %p\n", data, addr);

16 years, 10 months

← Newer
1
...
35
36
37
38
39
40
41
...
46
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 February 2008