Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66601: [INTRIN] Fix x64 build.
by tkreuzer＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: tkreuzer Date: Sat Mar 7 22:35:52 2015 New Revision: 66601 URL: http://svn.reactos.org/svn/reactos?rev=66601&view=rev Log: [INTRIN] Fix x64 build. Modified: trunk/reactos/include/crt/intrin.h Modified: trunk/reactos/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/intrin.h [iso-8859-1] Sat Mar 7 22:35:52 2015 @@ -794,6 +794,7 @@ unsigned char _interlockedbittestandreset64(__int64 volatile *, __int64); unsigned char _interlockedbittestandset64(__int64 volatile *, __int64); unsigned __int64 _mm_crc32_u64(unsigned __int64, unsigned __int64); +#if 0 __int64 _mm_cvtsd_si64(__m128d); __int64 _mm_cvtsd_si64x(__m128d); __int64 _mm_cvtsi128_si64(__m128i); @@ -818,7 +819,7 @@ void _mm_stream_si64x(__int64 *, __int64); __int64 _mul128(__int64 _Multiplier, __int64 _Multiplicand, __int64 * _HighProduct); unsigned __int64 _umul128(unsigned __int64 _Multiplier, unsigned __int64 _Multiplicand, unsigned __int64 * _HighProduct); - +#endif #endif /* _M_X64 */ #if defined(_M_ARM) || defined(_M_X64)

1 0

[janderwald] 66600: [KS] - fix multiple bugs in software bus pnp enumerator [INF] - add wdmaud.sys as a client of the software bus pnp enumerator
by janderwald＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: janderwald Date: Sat Mar 7 18:01:03 2015 New Revision: 66600 URL: http://svn.reactos.org/svn/reactos?rev=66600&view=rev Log: [KS] - fix multiple bugs in software bus pnp enumerator [INF] - add wdmaud.sys as a client of the software bus pnp enumerator Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/media/inf/wdmaudio.inf Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Mar 7 18:01:03 2015 @@ -98,7 +98,7 @@ RtlInitUnicodeString(&ReferenceString, DeviceEntry->DeviceName); /* register device interface */ - Status = IoRegisterDeviceInterface(BusDeviceExtension->PhysicalDeviceObject, &BusInstanceEntry->InterfaceGuid, &ReferenceString, &BusInstanceEntry->SymbolicLink); + Status = IoRegisterDeviceInterface(BusDeviceExtension->PhysicalDeviceObject, &DeviceEntry->DeviceGuid, NULL, &BusInstanceEntry->SymbolicLink); /* check for success */ if (!NT_SUCCESS(Status)) @@ -231,7 +231,7 @@ if (NT_SUCCESS(Status)) { /* perform callback */ - Status = Callback(hNewKey, BusDeviceExtension, DeviceEntry, ReferenceString, KeyInfo->Name); + Status = Callback(hNewKey, BusDeviceExtension, DeviceEntry, KeyInfo->Name, ReferenceString); /* should enumeration stop */ if (!NT_SUCCESS(Status)) @@ -272,6 +272,8 @@ /* check if the device is already present */ Entry = DeviceEntry->DeviceInterfaceList.Flink; + DPRINT1("KspCreateDeviceAssociation ReferenceString %S\n", ReferenceString); + DPRINT1("KspCreateDeviceAssociation InterfaceString %S\n", InterfaceString); while(Entry != &DeviceEntry->DeviceInterfaceList) { @@ -325,8 +327,8 @@ IN PHANDLE hKey, IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, IN PBUS_DEVICE_ENTRY DummyEntry, - IN LPWSTR DeviceCategory, - IN LPWSTR ReferenceString) + IN LPWSTR InterfaceId, + IN LPWSTR DeviceId) { LPWSTR DeviceName; SIZE_T Length; @@ -338,7 +340,7 @@ KIRQL OldLevel; /* first construct device name & reference guid */ - Length = wcslen(DeviceCategory) + wcslen(ReferenceString); + Length = wcslen(DeviceId) + wcslen(InterfaceId); /* append '&' and null byte */ Length += 2; @@ -353,7 +355,9 @@ } /* construct device name */ - swprintf(DeviceName, L"%s&%s", DeviceCategory, ReferenceString); + wcscpy(DeviceName, DeviceId); + wcscat(DeviceName, L"&"); + wcscat(DeviceName, InterfaceId); /* scan list and check if it is already present */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -391,15 +395,15 @@ InitializeListHead(&DeviceEntry->IrpPendingList); /* copy device guid */ - RtlInitUnicodeString(&String, DeviceCategory); + RtlInitUnicodeString(&String, DeviceId); RtlGUIDFromString(&String, &DeviceEntry->DeviceGuid); /* copy device names */ DeviceEntry->DeviceName = DeviceName; - DeviceEntry->Instance = (DeviceName + wcslen(DeviceCategory) + 1); + DeviceEntry->Instance = (DeviceName + wcslen(DeviceId) + 1); /* copy name */ - DeviceEntry->BusId = AllocateItem(NonPagedPool, (wcslen(DeviceCategory) + 1) * sizeof(WCHAR)); + DeviceEntry->BusId = AllocateItem(NonPagedPool, (wcslen(DeviceId) + 1) * sizeof(WCHAR)); if (!DeviceEntry->BusId) { /* no memory */ @@ -407,11 +411,11 @@ FreeItem(DeviceEntry); return STATUS_INSUFFICIENT_RESOURCES; } - wcscpy(DeviceEntry->BusId, DeviceCategory); - } - - /* now enumerate the devices */ - Status = KspEnumerateBusRegistryKeys(hKey, ReferenceString, KspCreateDeviceAssociation, BusDeviceExtension, DeviceEntry); + wcscpy(DeviceEntry->BusId, DeviceId); + } + + /* now enumerate the interfaces */ + Status = KspEnumerateBusRegistryKeys(hKey, InterfaceId, KspCreateDeviceAssociation, BusDeviceExtension, DeviceEntry); /* check if list is empty */ if (IsListEmpty(&DeviceEntry->DeviceInterfaceList)) @@ -466,7 +470,7 @@ IN LPWSTR DeviceCategory, IN LPWSTR ReferenceString) { - return KspEnumerateBusRegistryKeys(hKey, ReferenceString, KspCreateDeviceReference, BusDeviceExtension, DummyEntry); + return KspEnumerateBusRegistryKeys(hKey, DeviceCategory, KspCreateDeviceReference, BusDeviceExtension, DummyEntry); } @@ -1015,35 +1019,36 @@ Status = ZwCreateKey(&hDeviceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); if (NT_SUCCESS(Status)) { - /* initialize reference string */ - RtlInitUnicodeString(&ReferenceString, InstallInterface->ReferenceString); - - /* initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, &ReferenceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hDeviceKey, NULL); - - /* construct device key */ - Status = ZwCreateKey(&hReferenceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); + /* convert interface guid to string */ + Status = RtlStringFromGUID(&InstallInterface->InterfaceId, &InterfaceString); if (NT_SUCCESS(Status)) { - /* convert interface guid to string */ - Status = RtlStringFromGUID(&InstallInterface->InterfaceId, &InterfaceString); + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &InterfaceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hDeviceKey, NULL); + + /* construct device key */ + Status = ZwCreateKey(&hInterfaceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); if (NT_SUCCESS(Status)) { + /* initialize reference string */ + RtlInitUnicodeString(&ReferenceString, InstallInterface->ReferenceString); + /* initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, &InterfaceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hReferenceKey, NULL); + InitializeObjectAttributes(&ObjectAttributes, &ReferenceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hInterfaceKey, NULL); /* construct device key */ - Status = ZwCreateKey(&hInterfaceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); + Status = ZwCreateKey(&hReferenceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); if (NT_SUCCESS(Status)) { /* close key */ - ZwClose(hInterfaceKey); + ZwClose(hReferenceKey); } - /* free interface string */ - RtlFreeUnicodeString(&InterfaceString); } + /* free interface string */ + RtlFreeUnicodeString(&InterfaceString); + /* close reference key */ - ZwClose(hReferenceKey); + ZwClose(hInterfaceKey); } /* close device key */ ZwClose(hDeviceKey); @@ -1123,14 +1128,18 @@ { /* get device entry */ DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); - - if (IsEqualGUIDAligned(&DeviceEntry->DeviceGuid, &InstallInterface->DeviceId) && - !wcsicmp(DeviceEntry->Instance, InstallInterface->ReferenceString)) + if (IsEqualGUIDAligned(&DeviceEntry->DeviceGuid, &InstallInterface->DeviceId)) { if (!DeviceEntry->PDO) { + /* release device entry lock */ + KeReleaseSpinLock(&Context->BusDeviceExtension->Lock, OldLevel); + /* create pdo */ Status = KspCreatePDO(Context->BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); + + /* acquire device entry lock */ + KeAcquireSpinLock(&Context->BusDeviceExtension->Lock, &OldLevel); /* done */ break; Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Sat Mar 7 18:01:03 2015 @@ -25,6 +25,7 @@ ExcludeFromSelect = WDMAUDIO_CopyFilesOnlyId [GenericMfg] +%WDM_WDMAUD.DeviceDesc% = WDM_WDMAUD, SW\{CD171DE3-69E5-11D2-B56D-0000F8754380} %WDM_DRMKAUD.DeviceDesc% = WDM_DRMKAUD, SW\{EEC12DB6-AD9C-4168-8658-B03DAEF417FE} %WDMAUDIO_CopyFilesOnlyId.DeviceDesc% = WDMAUDIO.CopyFilesOnly, WDMAUDIO_CopyFilesOnlyId @@ -42,10 +43,38 @@ CopyFiles = WDM.CopyFiles [DeviceRegistration] -;; DRMKAUD swenum install +; WDMAud install +HKLM,%RunOnce%,"WDM_WDMAUD",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_WDMAUD.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_WDMAUD%,%17%\WDMAUDIO.inf,WDM_WDMAUD.Interface.Install" +; DRMKAUD install HKLM,%RunOnce%,"WDM_DRMKAUD",,"rundll32.exe streamci,StreamingDeviceSetup %WDM_DRMKAUD.DeviceId%,%KSNAME_DRMKAUD%,%KSCATEGORY_DRM_DESCRAMBLE%,%17%\WDMAUDIO.inf,WDM_DRMKAUD.Interface.Install" -;; DRMKAUD Install +;-------------------------------------------------------------------------------- +; WDMAUD Install +[WDM_WDMAUD.Interface.Install] +AddReg=WDM_WDMAUD.Interface.AddReg + +[WDM_WDMAUD.Interface.AddReg] +HKR,,CLSID,,%Proxy.CLSID% +HKR,,FriendlyName,,%WDM_WDMAUD.FriendlyName% + +[WDM_WDMAUD] +CopyFiles = WDM_WDMAUD.CopyFiles + +[WDM_WDMAUD.CopyFiles] +wdmaud.sys + +[WDM_WDMAUD.Services] +AddService = wdmaud,0x00000002, wdmaud_Service_Inst + +[wdmaud_Service_Inst] +DisplayName = %wdmaud.SvcDesc% +ServiceType = 1 ; SERVICE_KERNEL_DRIVER +StartType = 3 ; SERVICE_DEMAND_START +ErrorControl = 1 ; SERVICE_ERROR_NORMAL +ServiceBinary = %10%\system32\drivers\wdmaud.sys + +;-------------------------------------------------------------------------------- +; DRMKAUD Install [WDM_DRMKAUD.Interface.Install] AddReg=WDM_DRMKAUD.Interface.AddReg @@ -80,6 +109,7 @@ WDM.CopyFiles = 10,system32\drivers ; %SystemRoot%\system32\drivers WDM_DRMKAUD.CopyFiles = 10,system32\drivers +;--------------------------------------------------------------------------------- [Strings] ;Non-localizable ReactOS="ReactOS" @@ -87,18 +117,26 @@ RunOnce = "SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" Proxy.CLSID = "{17CCA71B-ECD7-11D0-B908-00A0C9223196}" +KSNAME_Filter = "{9B365890-165F-11D0-A195-0020AFD156E4}" KSNAME_DRMKAUD = "{ABD61E00-9350-47e2-A632-4438B90C6641}" WDM_DRMKAUD.DeviceId = "{EEC12DB6-AD9C-4168-8658-B03DAEF417FE}" KSCATEGORY_DRM_DESCRAMBLE = "{FFBB6E3F-CCFE-4D84-90D9-421418B03A8E}" KSCATEGORY_DATATRANSFORM = "{2EB07EA0-7E70-11D0-A5D6-28DB04C10000}" KSCATEGORY_AUDIO = "{6994AD04-93EF-11D0-A3CC-00A0C9223196}" PKEY_AudioEngine_OEMFormat = "{E4870E26-3CC5-4CD2-BA46-CA0A9A70ED04},3" +WDM_WDMAUD.DeviceId = "{CD171DE3-69E5-11D2-B56D-0000F8754380}" +KSCATEGORY_WDMAUD = "{3E227E76-690D-11D2-8161-0000F8775BF1}" + ;Localizable WDM_DRMKAUD.DeviceDesc = "ReactOS Trusted Audio Drivers" WDM_DRMKAUD.FriendlyName = "ReactOS Trusted Audio Drivers" drmkaud.SvcDesc = "ReactOS Trusted Audio Drivers" WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "ReactOS WDM Audio Drivers" +WDM_WDMAUD.DeviceDesc = "Driver for ReactOS WINMM-WDM-Audio" +WDM_WDMAUD.FriendlyName = "Driver for ReactOS WINMM-WDM-Audio" +wdmaud.SvcDesc = "Driver for ReactOS WINMM-WDM-Audio" + [Strings.0418] WDM_DRMKAUD.DeviceDesc = "Module-pilot audio de încredere ale ReactOS"

1 0

[janderwald] 66599: [MMSYS] - install software bus pnp enumerator when an audio device is installed
by janderwald＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: janderwald Date: Sat Mar 7 17:33:13 2015 New Revision: 66599 URL: http://svn.reactos.org/svn/reactos?rev=66599&view=rev Log: [MMSYS] - install software bus pnp enumerator when an audio device is installed Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sat Mar 7 17:33:13 2015 @@ -15,6 +15,7 @@ #include <shlwapi.h> #include <debug.h> +#include <newdev.h> #include <initguid.h> #include <devguid.h> @@ -87,6 +88,14 @@ UINT uNumberOfGuids, HWPAGE_DISPLAYMODE DisplayMode); +typedef BOOL (WINAPI *UpdateDriverForPlugAndPlayDevicesProto)(IN OPTIONAL HWND hwndParent, + IN LPCTSTR HardwareId, + IN LPCTSTR FullInfPath, + IN DWORD InstallFlags, + OUT OPTIONAL PBOOL bRebootRequired + ); + +#define UPDATEDRIVERFORPLUGANDPLAYDEVICES "UpdateDriverForPlugAndPlayDevicesW" #define NUM_APPLETS (1) @@ -328,6 +337,80 @@ RegCloseKey(hKey); } +DWORD +InstallSoftwareBusPnpEnumerator(LPWSTR InfPath, LPCWSTR HardwareIdList) +{ + HDEVINFO DeviceInfoSet = INVALID_HANDLE_VALUE; + SP_DEVINFO_DATA DeviceInfoData; + GUID ClassGUID; + TCHAR ClassName[50]; + int Result = 0; + HMODULE hModule = NULL; + UpdateDriverForPlugAndPlayDevicesProto UpdateProc; + BOOL reboot = FALSE; + DWORD flags = 0; + + if (!SetupDiGetINFClass(InfPath,&ClassGUID,ClassName,sizeof(ClassName)/sizeof(ClassName[0]),0)) + { + return -1; + } + + DeviceInfoSet = SetupDiCreateDeviceInfoList(&ClassGUID,0); + if(DeviceInfoSet == INVALID_HANDLE_VALUE) + { + return -1; + } + + DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (!SetupDiCreateDeviceInfo(DeviceInfoSet, ClassName, &ClassGUID, NULL, 0, DICD_GENERATE_ID, &DeviceInfoData)) + { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + return -1; + } + + if(!SetupDiSetDeviceRegistryProperty(DeviceInfoSet, &DeviceInfoData, SPDRP_HARDWAREID, (LPBYTE)HardwareIdList, (lstrlen(HardwareIdList)+1+1)*sizeof(TCHAR))) + { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + return -1; + } + + if (!SetupDiCallClassInstaller(DIF_REGISTERDEVICE, DeviceInfoSet, &DeviceInfoData)) + { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + return -1; + } + + if(GetFileAttributes(InfPath)==(DWORD)(-1)) { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + return -1; + } + + flags |= INSTALLFLAG_FORCE; + hModule = LoadLibraryW(L"newdev.dll"); + if(!hModule) { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + return -1; + } + + UpdateProc = (UpdateDriverForPlugAndPlayDevicesProto)GetProcAddress(hModule,UPDATEDRIVERFORPLUGANDPLAYDEVICES); + if(!UpdateProc) + { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + FreeLibrary(hModule); + return -1; + } + + if(!UpdateProc(NULL, HardwareIdList, InfPath, flags, &reboot)) + { + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + FreeLibrary(hModule); + return -1; + } + + FreeLibrary(hModule); + SetupDiDestroyDeviceInfoList(DeviceInfoSet); + return Result; +} DWORD MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) @@ -401,7 +484,20 @@ SetupTermDefaultQueueCallback(Context); SetupCloseInfFile(hInf); - + Length = GetWindowsDirectoryW(szBuffer, MAX_PATH); + if (!Length || Length >= MAX_PATH - 14) + { + return ERROR_GEN_FAILURE; + } + + pBuffer = PathAddBackslashW(szBuffer); + if (!pBuffer) + { + return ERROR_GEN_FAILURE; + } + + wcscpy(pBuffer, L"inf\\machine.inf"); + InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM"); hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (!hSCManager)

1 0

[tkreuzer] 66598: [INTRIN] Add some missing intrinsics for GCC (_InterlockedExchangeAdd8, __incgsqword, _BitScanForward64, _BitScanReverse64, _bittest64, _bittestandset64, _bittestandreset64, _bitt...
by tkreuzer＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: tkreuzer Date: Sat Mar 7 13:22:42 2015 New Revision: 66598 URL: http://svn.reactos.org/svn/reactos?rev=66598&view=rev Log: [INTRIN] Add some missing intrinsics for GCC (_InterlockedExchangeAdd8, __incgsqword, _BitScanForward64, _BitScanReverse64, _bittest64, _bittestandset64, _bittestandreset64, _bittestandcomplement64, _rotr64, _lrotl, _lrotr, __lzcnt, __lzcnt16, __popcnt, __popcnt16, __lzcnt64, __popcnt64, __cpuidex, __ud2, __writecr8/__readcr8 (x86)) Remove useless top level const modifiers from parameters (they do only tell the compiler that the variable cannot be modified, they do not tell the compiler whether the parameter is a compiler constant!) Modified: trunk/reactos/include/crt/intrin.h trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/intrin.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/intrin.h [iso-8859-1] Sat Mar 7 13:22:42 2015 @@ -581,6 +581,7 @@ unsigned long __readcr2(void); unsigned long __readcr3(void); unsigned long __readcr4(void); +unsigned long __readcr8(void); unsigned int __readdr(unsigned int); unsigned int __readeflags(void); unsigned char __readfsbyte(unsigned long); @@ -589,6 +590,7 @@ void __writecr0(unsigned int); void __writecr3(unsigned int); void __writecr4(unsigned int); +void __writecr8(unsigned int); void __writedr(unsigned int, unsigned int); void __writeeflags(unsigned int); void __writefsbyte(unsigned long, unsigned char); Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sat Mar 7 13:22:42 2015 @@ -70,6 +70,7 @@ #endif /*** memcopy must be memmove ***/ +void* memmove(void* dest, const void* source, size_t num); __INTRIN_INLINE void* memcpy(void* dest, const void* source, size_t num) { return memmove(dest, source, num); @@ -129,38 +130,38 @@ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 -__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) +__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * Destination, char Exchange, char Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) +__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * Destination, short Exchange, short Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } #ifndef __clang__ -__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) +__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -__INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) +__INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * Destination, void * Exchange, void * Comperand) { return (void *)__sync_val_compare_and_swap(Destination, Comperand, Exchange); } #endif -__INTRIN_INLINE char _InterlockedExchange8(volatile char * const Target, const char Value) +__INTRIN_INLINE char _InterlockedExchange8(volatile char * Target, char Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return __sync_lock_test_and_set(Target, Value); } -__INTRIN_INLINE short _InterlockedExchange16(volatile short * const Target, const short Value) +__INTRIN_INLINE short _InterlockedExchange16(volatile short * Target, short Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); @@ -169,14 +170,14 @@ #ifndef __clang__ -__INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value) +__INTRIN_INLINE long _InterlockedExchange(volatile long * Target, long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return __sync_lock_test_and_set(Target, Value); } -__INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) +__INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * Target, void * Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); @@ -185,8 +186,8 @@ #endif -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedExchange64(volatile long long * const Target, const long long Value) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedExchange64(volatile long long * Target, long long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); @@ -194,120 +195,125 @@ } #endif -__INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +__INTRIN_INLINE char _InterlockedExchangeAdd8(char volatile * Addend, char Value) { return __sync_fetch_and_add(Addend, Value); } +__INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * Addend, short Value) +{ + return __sync_fetch_and_add(Addend, Value); +} + #ifndef __clang__ -__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) +__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * Addend, long Value) { return __sync_fetch_and_add(Addend, Value); } #endif -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedExchangeAdd64(volatile long long * Addend, long long Value) { return __sync_fetch_and_add(Addend, Value); } #endif -__INTRIN_INLINE char _InterlockedAnd8(volatile char * const value, const char mask) +__INTRIN_INLINE char _InterlockedAnd8(volatile char * value, char mask) { return __sync_fetch_and_and(value, mask); } -__INTRIN_INLINE short _InterlockedAnd16(volatile short * const value, const short mask) +__INTRIN_INLINE short _InterlockedAnd16(volatile short * value, short mask) { return __sync_fetch_and_and(value, mask); } -__INTRIN_INLINE long _InterlockedAnd(volatile long * const value, const long mask) +__INTRIN_INLINE long _InterlockedAnd(volatile long * value, long mask) { return __sync_fetch_and_and(value, mask); } -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedAnd64(volatile long long * const value, const long long mask) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedAnd64(volatile long long * value, long long mask) { return __sync_fetch_and_and(value, mask); } #endif -__INTRIN_INLINE char _InterlockedOr8(volatile char * const value, const char mask) +__INTRIN_INLINE char _InterlockedOr8(volatile char * value, char mask) { return __sync_fetch_and_or(value, mask); } -__INTRIN_INLINE short _InterlockedOr16(volatile short * const value, const short mask) +__INTRIN_INLINE short _InterlockedOr16(volatile short * value, short mask) { return __sync_fetch_and_or(value, mask); } -__INTRIN_INLINE long _InterlockedOr(volatile long * const value, const long mask) +__INTRIN_INLINE long _InterlockedOr(volatile long * value, long mask) { return __sync_fetch_and_or(value, mask); } -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedOr64(volatile long long * const value, const long long mask) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedOr64(volatile long long * value, long long mask) { return __sync_fetch_and_or(value, mask); } #endif -__INTRIN_INLINE char _InterlockedXor8(volatile char * const value, const char mask) +__INTRIN_INLINE char _InterlockedXor8(volatile char * value, char mask) { return __sync_fetch_and_xor(value, mask); } -__INTRIN_INLINE short _InterlockedXor16(volatile short * const value, const short mask) +__INTRIN_INLINE short _InterlockedXor16(volatile short * value, short mask) { return __sync_fetch_and_xor(value, mask); } -__INTRIN_INLINE long _InterlockedXor(volatile long * const value, const long mask) +__INTRIN_INLINE long _InterlockedXor(volatile long * value, long mask) { return __sync_fetch_and_xor(value, mask); } -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedXor64(volatile long long * const value, const long long mask) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedXor64(volatile long long * value, long long mask) { return __sync_fetch_and_xor(value, mask); } #endif #ifndef __clang__ -__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend) +__INTRIN_INLINE long _InterlockedDecrement(volatile long * lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); } -__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend) +__INTRIN_INLINE long _InterlockedIncrement(volatile long * lpAddend) { return __sync_add_and_fetch(lpAddend, 1); } #endif -__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); } -__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * lpAddend) { return __sync_add_and_fetch(lpAddend, 1); } -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); } -__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend) +__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * lpAddend) { return __sync_add_and_fetch(lpAddend, 1); } @@ -315,77 +321,84 @@ #else /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */ -__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) +__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * Destination, char Exchange, char Comperand) { char retval = Comperand; __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } -__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) +__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * Destination, short Exchange, short Comperand) { short retval = Comperand; __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } -__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) +__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand) { long retval = Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } -__INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) +__INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * Destination, void * Exchange, void * Comperand) { void * retval = (void *)Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } -__INTRIN_INLINE char _InterlockedExchange8(volatile char * const Target, const char Value) +__INTRIN_INLINE char _InterlockedExchange8(volatile char * Target, char Value) { char retval = Value; __asm__("xchgb %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } -__INTRIN_INLINE short _InterlockedExchange16(volatile short * const Target, const short Value) +__INTRIN_INLINE short _InterlockedExchange16(volatile short * Target, short Value) { short retval = Value; __asm__("xchgw %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } -__INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value) +__INTRIN_INLINE long _InterlockedExchange(volatile long * Target, long Value) { long retval = Value; __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } -__INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) +__INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * Target, void * Value) { void * retval = Value; __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } -__INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - long retval = Value; +__INTRIN_INLINE char _InterlockedExchangeAdd8(char volatile * Addend, char Value) +{ + char retval = Value; + __asm__("lock; xaddb %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); + return retval; +} + +__INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * Addend, short Value) +{ + short retval = Value; __asm__("lock; xaddw %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } -__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) +__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * Addend, long Value) { long retval = Value; __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } -__INTRIN_INLINE char _InterlockedAnd8(volatile char * const value, const char mask) +__INTRIN_INLINE char _InterlockedAnd8(volatile char * value, char mask) { char x; char y; @@ -402,7 +415,7 @@ return y; } -__INTRIN_INLINE short _InterlockedAnd16(volatile short * const value, const short mask) +__INTRIN_INLINE short _InterlockedAnd16(volatile short * value, short mask) { short x; short y; @@ -419,7 +432,7 @@ return y; } -__INTRIN_INLINE long _InterlockedAnd(volatile long * const value, const long mask) +__INTRIN_INLINE long _InterlockedAnd(volatile long * value, long mask) { long x; long y; @@ -436,7 +449,7 @@ return y; } -__INTRIN_INLINE char _InterlockedOr8(volatile char * const value, const char mask) +__INTRIN_INLINE char _InterlockedOr8(volatile char * value, char mask) { char x; char y; @@ -453,7 +466,7 @@ return y; } -__INTRIN_INLINE short _InterlockedOr16(volatile short * const value, const short mask) +__INTRIN_INLINE short _InterlockedOr16(volatile short * value, short mask) { short x; short y; @@ -470,7 +483,7 @@ return y; } -__INTRIN_INLINE long _InterlockedOr(volatile long * const value, const long mask) +__INTRIN_INLINE long _InterlockedOr(volatile long * value, long mask) { long x; long y; @@ -487,7 +500,7 @@ return y; } -__INTRIN_INLINE char _InterlockedXor8(volatile char * const value, const char mask) +__INTRIN_INLINE char _InterlockedXor8(volatile char * value, char mask) { char x; char y; @@ -504,7 +517,7 @@ return y; } -__INTRIN_INLINE short _InterlockedXor16(volatile short * const value, const short mask) +__INTRIN_INLINE short _InterlockedXor16(volatile short * value, short mask) { short x; short y; @@ -521,7 +534,7 @@ return y; } -__INTRIN_INLINE long _InterlockedXor(volatile long * const value, const long mask) +__INTRIN_INLINE long _InterlockedXor(volatile long * value, long mask) { long x; long y; @@ -538,33 +551,33 @@ return y; } -__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend) +__INTRIN_INLINE long _InterlockedDecrement(volatile long * lpAddend) { return _InterlockedExchangeAdd(lpAddend, -1) - 1; } -__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend) +__INTRIN_INLINE long _InterlockedIncrement(volatile long * lpAddend) { return _InterlockedExchangeAdd(lpAddend, 1) + 1; } -__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * lpAddend) { return _InterlockedExchangeAdd16(lpAddend, -1) - 1; } -__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * lpAddend) { return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } -#if defined(_M_AMD64) -__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend) +#if defined(__x86_64__) +__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * lpAddend) { return _InterlockedExchangeAdd64(lpAddend, -1) - 1; } -__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend) +__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * lpAddend) { return _InterlockedExchangeAdd64(lpAddend, 1) + 1; } @@ -574,14 +587,14 @@ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) -__INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +__INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Destination, long long Exchange, long long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } #else -__INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +__INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Destination, long long Exchange, long long Comperand) { long long retval = Comperand; @@ -600,7 +613,8 @@ #endif -__INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * const Addend, const long Value) +#ifdef __i386__ +__INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * Addend, long Value) { __asm__ ( @@ -615,16 +629,17 @@ return Value; } - -__INTRIN_INLINE unsigned char _interlockedbittestandreset(volatile long * a, const long b) +#endif /* __i386__ */ + +__INTRIN_INLINE unsigned char _interlockedbittestandreset(volatile long * a, long b) { unsigned char retval; __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } -#if defined(_M_AMD64) -__INTRIN_INLINE unsigned char _interlockedbittestandreset64(volatile long long * a, const long long b) +#if defined(__x86_64__) +__INTRIN_INLINE unsigned char _interlockedbittestandreset64(volatile long long * a, long long b) { unsigned char retval; __asm__("lock; btrq %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); @@ -632,15 +647,15 @@ } #endif -__INTRIN_INLINE unsigned char _interlockedbittestandset(volatile long * a, const long b) +__INTRIN_INLINE unsigned char _interlockedbittestandset(volatile long * a, long b) { unsigned char retval; __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=q" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } -#if defined(_M_AMD64) -__INTRIN_INLINE unsigned char _interlockedbittestandset64(volatile long long * a, const long long b) +#if defined(__x86_64__) +__INTRIN_INLINE unsigned char _interlockedbittestandset64(volatile long long * a, long long b) { unsigned char retval; __asm__("lock; btsq %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); @@ -651,7 +666,7 @@ /*** String operations ***/ /* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ -__INTRIN_INLINE void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count) +__INTRIN_INLINE void __stosb(unsigned char * Dest, unsigned char Data, size_t Count) { __asm__ __volatile__ ( @@ -661,7 +676,7 @@ ); } -__INTRIN_INLINE void __stosw(unsigned short * Dest, const unsigned short Data, size_t Count) +__INTRIN_INLINE void __stosw(unsigned short * Dest, unsigned short Data, size_t Count) { __asm__ __volatile__ ( @@ -671,7 +686,7 @@ ); } -__INTRIN_INLINE void __stosd(unsigned long * Dest, const unsigned long Data, size_t Count) +__INTRIN_INLINE void __stosd(unsigned long * Dest, unsigned long Data, size_t Count) { __asm__ __volatile__ ( @@ -681,8 +696,8 @@ ); } -#ifdef _M_AMD64 -__INTRIN_INLINE void __stosq(unsigned __int64 * Dest, const unsigned __int64 Data, size_t Count) +#ifdef __x86_64__ +__INTRIN_INLINE void __stosq(unsigned long long * Dest, unsigned long long Data, size_t Count) { __asm__ __volatile__ ( @@ -723,7 +738,7 @@ ); } -#ifdef _M_AMD64 +#ifdef __x86_64__ __INTRIN_INLINE void __movsq(unsigned long * Destination, const unsigned long * Source, size_t Count) { __asm__ __volatile__ @@ -735,7 +750,7 @@ } #endif -#if defined(_M_AMD64) +#if defined(__x86_64__) /*** GS segment addressing ***/ @@ -754,7 +769,7 @@ __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } -__INTRIN_INLINE void __writegsqword(unsigned long Offset, unsigned __int64 Data) +__INTRIN_INLINE void __writegsqword(unsigned long Offset, unsigned long long Data) { __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } @@ -780,9 +795,9 @@ return value; } -__INTRIN_INLINE unsigned __int64 __readgsqword(unsigned long Offset) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long long __readgsqword(unsigned long Offset) +{ + unsigned long long value; __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } @@ -802,6 +817,11 @@ __asm__ __volatile__("incl %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } +__INTRIN_INLINE void __incgsqword(unsigned long Offset) +{ + __asm__ __volatile__("incq %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); +} + __INTRIN_INLINE void __addgsbyte(unsigned long Offset, unsigned char Data) { __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); @@ -817,12 +837,12 @@ __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } -__INTRIN_INLINE void __addgsqword(unsigned long Offset, unsigned __int64 Data) +__INTRIN_INLINE void __addgsqword(unsigned long Offset, unsigned long long Data) { __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } -#else /* defined(_M_AMD64) */ +#else /* defined(__x86_64__) */ /*** FS segment addressing ***/ @@ -902,25 +922,25 @@ __asm__ __volatile__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } -#endif /* defined(_M_AMD64) */ +#endif /* defined(__x86_64__) */ /*** Bit manipulation ***/ -__INTRIN_INLINE unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask) +__INTRIN_INLINE unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask) { __asm__("bsfl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); return Mask ? 1 : 0; } -__INTRIN_INLINE unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask) +__INTRIN_INLINE unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask) { __asm__("bsrl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); return Mask ? 1 : 0; } /* NOTE: again, the bizarre implementation follows Visual C++ */ -__INTRIN_INLINE unsigned char _bittest(const long * const a, const long b) +__INTRIN_INLINE unsigned char _bittest(const long * a, long b) { unsigned char retval; @@ -932,8 +952,20 @@ return retval; } -#ifdef _M_AMD64 -__INTRIN_INLINE unsigned char _bittest64(const __int64 * const a, const __int64 b) +#ifdef __x86_64__ +__INTRIN_INLINE unsigned char _BitScanForward64(unsigned long * Index, unsigned long long Mask); +{ + __asm__("bsfq %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); + return Mask ? 1 : 0; +} + +__INTRIN_INLINE unsigned char _BitScanReverse64(unsigned long * Index, unsigned long long Mask); +{ + __asm__("bsrq %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); + return Mask ? 1 : 0; +} + +__INTRIN_INLINE unsigned char _bittest64(const long long * a, long long b) { unsigned char retval; @@ -946,7 +978,7 @@ } #endif -__INTRIN_INLINE unsigned char _bittestandcomplement(long * const a, const long b) +__INTRIN_INLINE unsigned char _bittestandcomplement(long * a, long b) { unsigned char retval; @@ -958,7 +990,7 @@ return retval; } -__INTRIN_INLINE unsigned char _bittestandreset(long * const a, const long b) +__INTRIN_INLINE unsigned char _bittestandreset(long * a, long b) { unsigned char retval; @@ -970,7 +1002,7 @@ return retval; } -__INTRIN_INLINE unsigned char _bittestandset(long * const a, const long b) +__INTRIN_INLINE unsigned char _bittestandset(long * a, long b) { unsigned char retval; @@ -982,6 +1014,46 @@ return retval; } +#ifdef __x86_64__ + +__INTRIN_INLINE unsigned char _bittestandset64(long long * a, long long b); +{ + unsigned char retval; + + if(__builtin_constant_p(b)) + __asm__("btsq %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 64))), [retval] "=q" (retval) : [b] "Ir" (b % 64)); + else + __asm__("btsq %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b)); + + return retval; +} + +__INTRIN_INLINE unsigned char _bittestandreset64(long long * a, long long b); +{ + unsigned char retval; + + if(__builtin_constant_p(b)) + __asm__("btrq %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 64))), [retval] "=q" (retval) : [b] "Ir" (b % 64)); + else + __asm__("btrq %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b)); + + return retval; +} + +__INTRIN_INLINE unsigned char _bittestandcomplement64(long long * a, long long b); +{ + unsigned char retval; + + if(__builtin_constant_p(b)) + __asm__("btcq %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 64))), [retval] "=q" (retval) : [b] "Ir" (b % 64)); + else + __asm__("btcq %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b)); + + return retval; +} + +#endif + __INTRIN_INLINE unsigned char _rotl8(unsigned char value, unsigned char shift) { unsigned char retval; @@ -998,44 +1070,73 @@ __INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift) { + unsigned int retval; + __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} + +#ifdef __x86_64__ +__INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) +{ + unsigned long long retval; + __asm__("rolq %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} +#else +__INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) +{ + /* FIXME: this is probably not optimal */ + return (value << shift) | (value >> (64 - shift)); +} +#endif + +__INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift) +{ + unsigned int retval; + __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} + +__INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift) +{ + unsigned char retval; + __asm__("rorb %b[shift], %b[retval]" : [retval] "=qm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} + +__INTRIN_INLINE unsigned short _rotr16(unsigned short value, unsigned char shift) +{ + unsigned short retval; + __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} + +#ifdef __x86_64__ +__INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) +{ + unsigned long long retval; + __asm__("rorq %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} +#else +__INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) +{ + /* FIXME: this is probably not optimal */ + return (value >> shift) | (value << (64 - shift)); +} +#endif + +__INTRIN_INLINE unsigned long __cdecl _lrotl(unsigned long value, int shift) +{ unsigned long retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -#ifdef _M_AMD64 -__INTRIN_INLINE unsigned __int64 _rotl64(unsigned __int64 value, int shift) -{ - unsigned __int64 retval; - __asm__("rolq %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} -#else -__INTRIN_INLINE unsigned __int64 _rotl64(unsigned __int64 value, int shift) -{ - /* FIXME: this is probably not optimal */ - return (value << shift) | (value >> (64 - shift)); -} -#endif - -__INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift) +__INTRIN_INLINE unsigned long __cdecl _lrotr(unsigned long value, int shift) { unsigned long retval; __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -__INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift) -{ - unsigned char retval; - __asm__("rorb %b[shift], %b[retval]" : [retval] "=qm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -__INTRIN_INLINE unsigned short _rotr16(unsigned short value, unsigned char shift) -{ - unsigned short retval; - __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } @@ -1046,7 +1147,7 @@ just confuses it. Also we declare Bit as an int and then truncate it to match Visual C++ behavior */ -__INTRIN_INLINE unsigned long long __ll_lshift(const unsigned long long Mask, const int Bit) +__INTRIN_INLINE unsigned long long __ll_lshift(unsigned long long Mask, int Bit) { unsigned long long retval = Mask; @@ -1060,7 +1161,7 @@ return retval; } -__INTRIN_INLINE long long __ll_rshift(const long long Mask, const int Bit) +__INTRIN_INLINE long long __ll_rshift(long long Mask, int Bit) { long long retval = Mask; @@ -1074,7 +1175,7 @@ return retval; } -__INTRIN_INLINE unsigned long long __ull_rshift(const unsigned long long Mask, int Bit) +__INTRIN_INLINE unsigned long long __ull_rshift(unsigned long long Mask, int Bit) { unsigned long long retval = Mask; @@ -1102,18 +1203,18 @@ return retval; } -#ifdef _M_AMD64 -__INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value) -{ - unsigned __int64 retval; +#ifdef __x86_64__ +__INTRIN_INLINE unsigned long long _byteswap_uint64(unsigned long long value) +{ + unsigned long long retval; __asm__("bswapq %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); return retval; } #else -__INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value) +__INTRIN_INLINE unsigned long long _byteswap_uint64(unsigned long long value) { union { - unsigned __int64 int64part; + unsigned long long int64part; struct { unsigned long lowpart; unsigned long hipart; @@ -1127,34 +1228,71 @@ } #endif +__INTRIN_INLINE unsigned int __lzcnt(unsigned int value) +{ + return __builtin_clz(value); +} + +__INTRIN_INLINE unsigned short __lzcnt16(unsigned short value) +{ + return __builtin_clz(value); +} + +__INTRIN_INLINE unsigned int __popcnt(unsigned int value) +{ + return __builtin_popcount(value); +} + +__INTRIN_INLINE unsigned short __popcnt16(unsigned short value) +{ + return __builtin_popcount(value); +} + +#ifdef __x86_64__ +unsigned long long __lzcnt64(unsigned long long value) +{ + return __builtin_clzll(value); +} + +unsigned long long __popcnt64(unsigned long long value) +{ + return __builtin_popcountll(value); +} +#endif + /*** 64-bit math ***/ -__INTRIN_INLINE long long __emul(const int a, const int b) +__INTRIN_INLINE long long __emul(int a, int b) { long long retval; __asm__("imull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } -__INTRIN_INLINE unsigned long long __emulu(const unsigned int a, const unsigned int b) +__INTRIN_INLINE unsigned long long __emulu(unsigned int a, unsigned int b) { unsigned long long retval; __asm__("mull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } -#ifdef _M_AMD64 - -__INTRIN_INLINE __int64 __mulh(__int64 a, __int64 b) -{ - __int64 retval; +__INTRIN_INLINE long long __cdecl _abs64(long long value) +{ + return (value >= 0) ? value : -value; +} + +#ifdef __x86_64__ + +__INTRIN_INLINE long long __mulh(long long a, long long b) +{ + long long retval; __asm__("imulq %[b]" : "=d" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } -__INTRIN_INLINE unsigned __int64 __umulh(unsigned __int64 a, unsigned __int64 b) -{ - unsigned __int64 retval; +__INTRIN_INLINE unsigned long long __umulh(unsigned long long a, unsigned long long b) +{ + unsigned long long retval; __asm__("mulq %[b]" : "=d" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } @@ -1163,21 +1301,21 @@ /*** Port I/O ***/ -__INTRIN_INLINE unsigned char __inbyte(const unsigned short Port) +__INTRIN_INLINE unsigned char __inbyte(unsigned short Port) { unsigned char byte; __asm__ __volatile__("inb %w[Port], %b[byte]" : [byte] "=a" (byte) : [Port] "Nd" (Port)); return byte; } -__INTRIN_INLINE unsigned short __inword(const unsigned short Port) +__INTRIN_INLINE unsigned short __inword(unsigned short Port) { unsigned short word; __asm__ __volatile__("inw %w[Port], %w[word]" : [word] "=a" (word) : [Port] "Nd" (Port)); return word; } -__INTRIN_INLINE unsigned long __indword(const unsigned short Port) +__INTRIN_INLINE unsigned long __indword(unsigned short Port) { unsigned long dword; __asm__ __volatile__("inl %w[Port], %k[dword]" : [dword] "=a" (dword) : [Port] "Nd" (Port)); @@ -1217,32 +1355,32 @@ ); } -__INTRIN_INLINE void __outbyte(unsigned short const Port, const unsigned char Data) +__INTRIN_INLINE void __outbyte(unsigned short Port, unsigned char Data) { __asm__ __volatile__("outb %b[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); } -__INTRIN_INLINE void __outword(unsigned short const Port, const unsigned short Data) +__INTRIN_INLINE void __outword(unsigned short Port, unsigned short Data) { __asm__ __volatile__("outw %w[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); } -__INTRIN_INLINE void __outdword(unsigned short const Port, const unsigned long Data) +__INTRIN_INLINE void __outdword(unsigned short Port, unsigned long Data) { __asm__ __volatile__("outl %k[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); } -__INTRIN_INLINE void __outbytestring(unsigned short Port, unsigned char * const Buffer, const unsigned long Count) +__INTRIN_INLINE void __outbytestring(unsigned short Port, unsigned char * Buffer, unsigned long Count) { __asm__ __volatile__("rep; outsb" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } -__INTRIN_INLINE void __outwordstring(unsigned short Port, unsigned short * const Buffer, const unsigned long Count) +__INTRIN_INLINE void __outwordstring(unsigned short Port, unsigned short * Buffer, unsigned long Count) { __asm__ __volatile__("rep; outsw" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } -__INTRIN_INLINE void __outdwordstring(unsigned short Port, unsigned long * const Buffer, const unsigned long Count) +__INTRIN_INLINE void __outdwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count) { __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } @@ -1283,14 +1421,19 @@ /*** System information ***/ -__INTRIN_INLINE void __cpuid(int CPUInfo[], const int InfoType) +__INTRIN_INLINE void __cpuid(int CPUInfo[4], int InfoType) { __asm__ __volatile__("cpuid" : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (InfoType)); } +__INTRIN_INLINE void __cpuidex(int CPUInfo[4], int InfoType, int ECXValue) +{ + __asm__ __volatile__("cpuid" : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (InfoType), "c" (ECXValue)); +} + __INTRIN_INLINE unsigned long long __rdtsc(void) { -#ifdef _M_AMD64 +#ifdef __x86_64__ unsigned long long low, high; __asm__ __volatile__("rdtsc" : "=a"(low), "=d"(high)); return low | (high << 32); @@ -1324,6 +1467,11 @@ } #endif +__INTRIN_INLINE void __ud2(void) +{ + __asm__("ud2"); +} + __INTRIN_INLINE void __int2c(void) { __asm__("int $0x2c"); @@ -1353,78 +1501,83 @@ /*** Protected memory management ***/ -#ifdef _M_AMD64 - -__INTRIN_INLINE void __writecr0(const unsigned __int64 Data) +#ifdef __x86_64__ + +__INTRIN_INLINE void __writecr0(unsigned long long Data) { __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); } -__INTRIN_INLINE void __writecr3(const unsigned __int64 Data) +__INTRIN_INLINE void __writecr3(unsigned long long Data) { __asm__("mov %[Data], %%cr3" : : [Data] "r" (Data) : "memory"); } -__INTRIN_INLINE void __writecr4(const unsigned __int64 Data) +__INTRIN_INLINE void __writecr4(unsigned long long Data) { __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); } -__INTRIN_INLINE void __writecr8(const unsigned __int64 Data) +__INTRIN_INLINE void __writecr8(unsigned long long Data) { __asm__("mov %[Data], %%cr8" : : [Data] "r" (Data) : "memory"); } -__INTRIN_INLINE unsigned __int64 __readcr0(void) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long long __readcr0(void) +{ + unsigned long long value; __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=r" (value)); return value; } -__INTRIN_INLINE unsigned __int64 __readcr2(void) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long long __readcr2(void) +{ + unsigned long long value; __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=r" (value)); return value; } -__INTRIN_INLINE unsigned __int64 __readcr3(void) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long long __readcr3(void) +{ + unsigned long long value; __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=r" (value)); return value; } -__INTRIN_INLINE unsigned __int64 __readcr4(void) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long long __readcr4(void) +{ + unsigned long long value; __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=r" (value)); return value; } -__INTRIN_INLINE unsigned __int64 __readcr8(void) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long long __readcr8(void) +{ + unsigned long long value; __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=r" (value)); return value; } -#else /* _M_AMD64 */ - -__INTRIN_INLINE void __writecr0(const unsigned int Data) +#else /* __x86_64__ */ + +__INTRIN_INLINE void __writecr0(unsigned int Data) { __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); } -__INTRIN_INLINE void __writecr3(const unsigned int Data) +__INTRIN_INLINE void __writecr3(unsigned int Data) { __asm__("mov %[Data], %%cr3" : : [Data] "r" (Data) : "memory"); } -__INTRIN_INLINE void __writecr4(const unsigned int Data) +__INTRIN_INLINE void __writecr4(unsigned int Data) { __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); +} + +__INTRIN_INLINE void __writecr8(unsigned int Data) +{ + __asm__("mov %[Data], %%cr8" : : [Data] "r" (Data) : "memory"); } __INTRIN_INLINE unsigned long __readcr0(void) @@ -1455,13 +1608,20 @@ return value; } -#endif /* _M_AMD64 */ - -#ifdef _M_AMD64 - -__INTRIN_INLINE unsigned __int64 __readdr(unsigned int reg) -{ - unsigned __int64 value; +__INTRIN_INLINE unsigned long __readcr8(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr8, %[value]" : [value] "=r" (value)); + return value; +} + +#endif /* __x86_64__ */ + +#ifdef __x86_64__ + +__INTRIN_INLINE unsigned long long __readdr(unsigned int reg) +{ + unsigned long long value; switch (reg) { case 0: @@ -1492,7 +1652,7 @@ return value; } -__INTRIN_INLINE void __writedr(unsigned reg, unsigned __int64 value) +__INTRIN_INLINE void __writedr(unsigned reg, unsigned long long value) { switch (reg) { @@ -1523,7 +1683,7 @@ } } -#else /* _M_AMD64 */ +#else /* __x86_64__ */ __INTRIN_INLINE unsigned int __readdr(unsigned int reg) { @@ -1589,9 +1749,9 @@ } } -#endif /* _M_AMD64 */ - -__INTRIN_INLINE void __invlpg(void * const Address) +#endif /* __x86_64__ */ + +__INTRIN_INLINE void __invlpg(void *Address) { __asm__("invlpg %[Address]" : : [Address] "m" (*((unsigned char *)(Address))) : "memory"); } @@ -1601,7 +1761,7 @@ __INTRIN_INLINE unsigned long long __readmsr(unsigned long reg) { -#ifdef _M_AMD64 +#ifdef __x86_64__ unsigned long low, high; __asm__ __volatile__("rdmsr" : "=a" (low), "=d" (high) : "c" (reg)); return ((unsigned long long)high << 32) | low; @@ -1612,9 +1772,9 @@ #endif } -__INTRIN_INLINE void __writemsr(const unsigned long Register, const unsigned long long Value) -{ -#ifdef _M_AMD64 +__INTRIN_INLINE void __writemsr(unsigned long Register, unsigned long long Value) +{ +#ifdef __x86_64__ __asm__ __volatile__("wrmsr" : : "a" (Value), "d" (Value >> 32), "c" (Register)); #else __asm__ __volatile__("wrmsr" : : "A" (Value), "c" (Register)); @@ -1629,7 +1789,7 @@ } /* NOTE: an immediate value for 'a' will raise an ICE in Visual C++ */ -__INTRIN_INLINE unsigned long __segmentlimit(const unsigned long a) +__INTRIN_INLINE unsigned long __segmentlimit(unsigned long a) { unsigned long retval; __asm__ __volatile__("lsl %[a], %[retval]" : [retval] "=r" (retval) : [a] "rm" (a));

1 0

[hbelusca] 66597: [NTVDM]: Add configuration files (will be needed in the future). By Lee Schroeder. CORE-7736 CORE-7832
by hbelusca＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: hbelusca Date: Sat Mar 7 01:42:16 2015 New Revision: 66597 URL: http://svn.reactos.org/svn/reactos?rev=66597&view=rev Log: [NTVDM]: Add configuration files (will be needed in the future). By Lee Schroeder. CORE-7736 CORE-7832 Added: trunk/reactos/subsystems/mvdm/config/ (with props) trunk/reactos/subsystems/mvdm/config/AUTOEXEC.NT (with props) trunk/reactos/subsystems/mvdm/config/CMakeLists.txt (with props) trunk/reactos/subsystems/mvdm/config/CONFIG.NT (with props) trunk/reactos/subsystems/mvdm/config/system.ini (contents, props changed) - copied, changed from r66588, trunk/reactos/boot/bootdata/system.ini trunk/reactos/subsystems/mvdm/config/win.ini (with props) Removed: trunk/reactos/boot/bootdata/system.ini Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/subsystems/mvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/README.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -72,9 +72,6 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION reactos FOR all) -#system.ini -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/system.ini DESTINATION reactos FOR all) - #freeldr.ini add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD freeldr.ini FOR bootcd regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NOT_IN_HYBRIDCD NAME_ON_CD freeldr.ini FOR livecd) Removed: trunk/reactos/boot/bootdata/system.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/system.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/system.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/system.ini (removed) @@ -1,20 +0,0 @@ -[driver32] -msacm.imaadpcm=imaadp32.acm -msacm.msadpcm=msadp32.acm -msacm.msg711=msg711.acm -msacm.msgsm610=msgsm32.acm -msacm.winemp3=winemp3.acm -vidc.mrle=msrle32.dll -vidc.msvc=msvidc32.dll -vidc.cvid=iccvid.dll - -[mci] -MPEGVideo=mciqtz32.dll -MPEGVideo2=mciqtz32.dll -AVIVideo=mciavi32.dll -CDAudio=mcicda.dll -Sequencer=mciseq.dll -vcr=mcivisca.drv -WaveAudio=mciwave.dll - -[386enh] Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… ============================================================================== --- trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -1,4 +1,5 @@ +add_subdirectory(config) #add_subdirectory(dos) add_subdirectory(ntvdm) add_subdirectory(vdmdbg) Modified: trunk/reactos/subsystems/mvdm/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/README.txt… ============================================================================== --- trunk/reactos/subsystems/mvdm/README.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/README.txt [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -1,7 +1,8 @@ Multiple Virtual DOS Machines - Directory description ===================================================== -- dos : All 16-bit DOS files (kernel, drivers, apps...) are placed here -- ntvdm : NT Virtual DOS Machine -- vdmdbg : Virtual DOS Machine debug helper DLL (from Wine) -- wow16 : All Win16 thunk files are placed here +- config : Miscellaneous configuration files. +- dos : All 16-bit DOS files (kernel, drivers, apps...) are placed here. +- ntvdm : NT Virtual DOS Machine. +- vdmdbg : Virtual DOS Machine debug helper DLL (from Wine). +- wow16 : All Win16 thunk files are placed here. Propchange: trunk/reactos/subsystems/mvdm/config/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Mar 7 01:42:16 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/subsystems/mvdm/config/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/subsystems/mvdm/config/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/subsystems/mvdm/config/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/subsystems/mvdm/config/AUTOEXEC.NT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/config/AUT… ============================================================================== --- trunk/reactos/subsystems/mvdm/config/AUTOEXEC.NT (added) +++ trunk/reactos/subsystems/mvdm/config/AUTOEXEC.NT [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -0,0 +1,30 @@ +@ECHO OFF +REM Virtual DOS Machine (VDM) Default Environment Configuration + +REM NOTE: NTVDM does not use AUTOEXEC.BAT as the default +REM environment settings file when running a DOS application. If you +REM wish to change the default settings for DOS programs, make changes +REM to this file instead. + +REM Sound Blaster Settings +REM ====================== +REM A = The I/O address of the Sound Blaster. +REM * Possible values: 220, 240, 260, 280, 2a0, 2c0, 2e0, 300. +REM I = The IRQ number of the Sound Blaster. +REM * Possible values: 7, 5, 3, 9, 10, 11, 12. +REM D = The DMA number of the Sound Blaster. +REM * Possible values: 1, 5, 0, 3, 6, 7. +REM H = The High DMA number of the Sound Blaster. +REM * Possible values: 1, 5, 0, 3, 6, 7. +REM T = Type of Sound Blaster Card +REM * 1 - SB 1.5 +REM * 2 - SB Pro I +REM * 3 - SB 2.0 +REM * 4 - SB Pro II +REM * 6 - SB 16/AWE 32/32/64 +REM +REM NOTE: To disable Sound Blaster support, simply place an invalid +REM I/O Port Address (e.g. SET BLASTER=A0). However, if SET BLASTER is +REM not specified in this file, then the default values (A220 I7 D1 H5 T6) +REM will be used instead. +SET BLASTER=A220 I7 D1 H5 T6 Propchange: trunk/reactos/subsystems/mvdm/config/AUTOEXEC.NT ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/reactos/subsystems/mvdm/config/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/config/CMa… ============================================================================== --- trunk/reactos/subsystems/mvdm/config/CMakeLists.txt (added) +++ trunk/reactos/subsystems/mvdm/config/CMakeLists.txt [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -0,0 +1,17 @@ + +# NTVDM Default Configuration Files + +list(APPEND NTVDM_CONFIG_FILES + AUTOEXEC.NT + CONFIG.NT) + +foreach(item ${NTVDM_CONFIG_FILES}) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/system32 FOR all) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/repair FOR all) +endforeach(item) + +# system.ini +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/system.ini DESTINATION reactos FOR all) + +# win.ini +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/win.ini DESTINATION reactos FOR all) Propchange: trunk/reactos/subsystems/mvdm/config/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/config/CONFIG.NT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/config/CON… ============================================================================== --- trunk/reactos/subsystems/mvdm/config/CONFIG.NT (added) +++ trunk/reactos/subsystems/mvdm/config/CONFIG.NT [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -0,0 +1,65 @@ +REM Virtual DOS Machine (VDM) Default Startup File + +REM NOTE: NTVDM does not use CONFIG.BAT as the default +REM environment settings file when running a DOS application. To +REM change the default settings for the VDM, change this file +REM instead. However, if a DOS Shortcut (PIF) is used, then +REM the settings found in the PIF file will be used instead. + +REM Echo Output Option +REM ================== +REM When starting up a DOS application, by default, no output +REM text is shown to the user as the application starts +REM up. To display information from both CONFIG.NT and +REM AUTOEXEC.NT, use the option, 'echoconfig'. +REM echoconfig + +REM Command Prompt Option +REM ===================== +REM If the user returns to the Command Prompt either from a TSR, +REM or while running a DOS application, by default, VDM runs +REM COMMAND.COM. To run cmd.exe instead, use the option, 'ntcmdprompt'. +REM However, if COMMAND.COM cannot be found, VDM will use this option +REM regardless if it's disabled or not. +ntcmdprompt + +REM DOS-Only Mode +REM ============= +REM By default, any DOS application can run another application, +REM regardless if it's DOS-based or not. To prevent DOS applications +REM from running non-DOS applications, and therefore possibly preventing +REM disruption of the TSR, use the option 'dosonly'. +REM dosonly + +REM Expanded Memory Manager (EMM) +REM ============================= +REM Syntax = EMM [A=AltRegSets] [B=BaseSegment] [RAM] +REM +REM A = Alternative Mapping Register (AltRegSets) +REM * Determines the Alternative Mapping Register Sets supported by the system. +REM The supported values goes from 1 to 255. +REM * The default value is 8. +REM B = Base Segment +REM * The default value is 0x4000. +REM Random Access Memory (RAM) +REM * If used, then only allocate 64kb address space from the Upper Memory +REM Block (UMB) for EMM page frames, while allowing the rest (if any) to be +REM used by NTVDM for loadhigh and devicehigh commands. +REM * By default, all available and possible UMB will be used for page frames. +REM +REM The size of a program's EMM is determined by it's given PIF file. But +REM if no PIF file is provided, the default settings will be used (_default.pif). +REM But if the size of the given PIF file is zero, then the EMM will be disabled +REM and the options below will be ignored. +REM EMM A=8 B=0x4000 64 + +REM Disable PC Speaker Audio +REM ======================== +REM Disables the playback of PC Speaker Audio. +REM disablepcspeaker + +REM Misc. Configuration Options +REM =========================== +REM dos=high, umb +REM device=%SystemRoot%\System32\himem.sys +REM files=40 Propchange: trunk/reactos/subsystems/mvdm/config/CONFIG.NT ------------------------------------------------------------------------------ svn:eol-style = CRLF Copied: trunk/reactos/subsystems/mvdm/config/system.ini (from r66588, trunk/reactos/boot/bootdata/system.ini) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/config/sys… ============================================================================== --- trunk/reactos/boot/bootdata/system.ini [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/config/system.ini [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -1,20 +1,21 @@ -[driver32] -msacm.imaadpcm=imaadp32.acm -msacm.msadpcm=msadp32.acm -msacm.msg711=msg711.acm -msacm.msgsm610=msgsm32.acm -msacm.winemp3=winemp3.acm -vidc.mrle=msrle32.dll -vidc.msvc=msvidc32.dll -vidc.cvid=iccvid.dll - -[mci] -MPEGVideo=mciqtz32.dll -MPEGVideo2=mciqtz32.dll -AVIVideo=mciavi32.dll -CDAudio=mcicda.dll -Sequencer=mciseq.dll -vcr=mcivisca.drv -WaveAudio=mciwave.dll - -[386enh] +; For 16-bit compatibility +[driver32] +msacm.imaadpcm=imaadp32.acm +msacm.msadpcm=msadp32.acm +msacm.msg711=msg711.acm +msacm.msgsm610=msgsm32.acm +msacm.winemp3=winemp3.acm +vidc.mrle=msrle32.dll +vidc.msvc=msvidc32.dll +vidc.cvid=iccvid.dll + +[mci] +MPEGVideo=mciqtz32.dll +MPEGVideo2=mciqtz32.dll +AVIVideo=mciavi32.dll +CDAudio=mcicda.dll +Sequencer=mciseq.dll +vcr=mcivisca.drv +WaveAudio=mciwave.dll + +[386enh] Propchange: trunk/reactos/subsystems/mvdm/config/system.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/reactos/subsystems/mvdm/config/win.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/config/win… ============================================================================== --- trunk/reactos/subsystems/mvdm/config/win.ini (added) +++ trunk/reactos/subsystems/mvdm/config/win.ini [iso-8859-1] Sat Mar 7 01:42:16 2015 @@ -0,0 +1,8 @@ +; For 16-bit compatibility +[fonts] +[extensions] +[mci extensions] +[files] +[Mail] +MAPI=1 +[MCI Extensions.BAK] Propchange: trunk/reactos/subsystems/mvdm/config/win.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF

1 0

[aandrejevic] 66596: [NTVDM] Begin implementing Expanded Memory Space (EMS) support.
by aandrejevic＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: aandrejevic Date: Sat Mar 7 00:43:17 2015 New Revision: 66596 URL: http://svn.reactos.org/svn/reactos?rev=66596&view=rev Log: [NTVDM] Begin implementing Expanded Memory Space (EMS) support. Added: trunk/reactos/subsystems/mvdm/ntvdm/ems.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/ems.h (with props) Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/emulator.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Sat Mar 7 00:43:17 2015 @@ -33,6 +33,7 @@ dos/mouse32.c dos/dem.c clock.c + ems.c emulator.c int32.c io.c Added: trunk/reactos/subsystems/mvdm/ntvdm/ems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ems.… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/ems.c [iso-8859-1] Sat Mar 7 00:43:17 2015 @@ -0,0 +1,231 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: ems.c + * PURPOSE: Expanded Memory Support + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "bios/bios32/bios32p.h" +#include <ndk/rtltypes.h> +#include <ndk/rtlfuncs.h> +#include "ems.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static RTL_BITMAP AllocBitmap; +static ULONG BitmapBuffer[(EMS_TOTAL_PAGES + sizeof(ULONG) - 1) / sizeof(ULONG)]; +static EMS_PAGE PageTable[EMS_TOTAL_PAGES]; +static EMS_HANDLE HandleTable[EMS_MAX_HANDLES]; +static PVOID Mapping[EMS_PHYSICAL_PAGES] = { NULL }; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static USHORT EmsFree(USHORT Handle) +{ + PLIST_ENTRY Entry; + PEMS_HANDLE HandleEntry = &HandleTable[Handle]; + + if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) + { + return EMS_STATUS_INVALID_HANDLE; + } + + for (Entry = HandleEntry->PageList.Flink; + Entry != &HandleEntry->PageList; + Entry = Entry->Flink) + { + PEMS_PAGE PageEntry = (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); + ULONG PageNumber = (ULONG)(((ULONG_PTR)PageEntry - (ULONG_PTR)PageTable) / sizeof(EMS_PAGE)); + + /* Free the page */ + RtlClearBits(&AllocBitmap, PageNumber, 1); + } + + HandleEntry->Allocated = FALSE; + HandleEntry->PageCount = 0; + InitializeListHead(&HandleEntry->PageList); + + return EMS_STATUS_OK; +} + +static UCHAR EmsAlloc(USHORT NumPages, PUSHORT Handle) +{ + ULONG i, CurrentIndex = 0; + PEMS_HANDLE HandleEntry; + + if (NumPages == 0) return EMS_STATUS_ZERO_PAGES; + + for (i = 0; i < EMS_MAX_HANDLES; i++) + { + HandleEntry = &HandleTable[i]; + if (!HandleEntry->Allocated) + { + *Handle = i; + break; + } + } + + if (i == EMS_MAX_HANDLES) return EMS_STATUS_NO_MORE_HANDLES; + HandleEntry->Allocated = TRUE; + + while (HandleEntry->PageCount < NumPages) + { + ULONG RunStart; + ULONG RunSize = RtlFindNextForwardRunClear(&AllocBitmap, CurrentIndex, &RunStart); + + if (RunSize == 0) + { + /* Free what's been allocated already and report failure */ + EmsFree(*Handle); + return EMS_STATUS_INSUFFICIENT_PAGES; + } + else if ((HandleEntry->PageCount + RunSize) > NumPages) + { + /* We don't need the entire run */ + RunSize = NumPages - HandleEntry->PageCount; + } + + CurrentIndex = RunStart + RunSize; + HandleEntry->PageCount += RunSize; + RtlSetBits(&AllocBitmap, RunStart, RunSize); + + for (i = 0; i < RunSize; i++) + { + PageTable[RunStart + i].Handle = *Handle; + InsertTailList(&HandleEntry->PageList, &PageTable[RunStart + i].Entry); + } + } + + return EMS_STATUS_OK; +} + +static USHORT EmsMap(USHORT Handle, UCHAR PhysicalPage, USHORT LogicalPage) +{ + PLIST_ENTRY Entry; + PEMS_PAGE PageEntry; + PEMS_HANDLE HandleEntry = &HandleTable[Handle]; + ULONG PageNumber; + + if (PhysicalPage >= EMS_PHYSICAL_PAGES) return EMS_STATUS_INV_PHYSICAL_PAGE; + if (LogicalPage == 0xFFFF) + { + /* Unmap */ + Mapping[PhysicalPage] = NULL; + return EMS_STATUS_OK; + } + + if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) return EMS_STATUS_INVALID_HANDLE; + + Entry = HandleEntry->PageList.Flink; + while (LogicalPage) + { + if (Entry == &HandleEntry->PageList) break; + + LogicalPage--; + Entry = Entry->Flink; + } + + if (Entry == &HandleEntry->PageList) return EMS_STATUS_INV_LOGICAL_PAGE; + + PageEntry = (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); + PageNumber = (ULONG)(((ULONG_PTR)PageEntry - (ULONG_PTR)PageTable) / sizeof(EMS_PAGE)); + Mapping[PhysicalPage] = (PVOID)(EMS_ADDRESS + PageNumber * EMS_PAGE_SIZE); + + return EMS_STATUS_OK; +} + +static VOID WINAPI EmsIntHandler(LPWORD Stack) +{ + switch (getAH()) + { + /* Get Manager Status */ + case 0x40: + { + setAH(EMS_STATUS_OK); + break; + } + + /* Get Page Frame Segment */ + case 0x41: + { + setAH(EMS_STATUS_OK); + setBX(EMS_SEGMENT); + break; + } + + /* Get Number Of Pages */ + case 0x42: + { + setAH(EMS_STATUS_OK); + setBX(RtlNumberOfClearBits(&AllocBitmap)); + setDX(EMS_TOTAL_PAGES); + break; + } + + /* Get Handle And Allocate Memory */ + case 0x43: + { + USHORT Handle; + UCHAR Status = EmsAlloc(getBX(), &Handle); + + setAH(Status); + if (Status == EMS_STATUS_OK) setDX(Handle); + break; + } + + /* Map Memory */ + case 0x44: + { + setAH(EmsMap(getDX(), getAL(), getBX())); + break; + } + + /* Release Handle And Memory */ + case 0x45: + { + setAH(EmsFree(getDX())); + break; + } + + default: + { + DPRINT1("EMS function AH = %02X NOT IMPLEMENTED\n", getAH()); + setAH(EMS_STATUS_UNKNOWN_FUNCTION); + break; + } + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID EmsReadMemory(ULONG Address, PVOID Buffer, ULONG Size) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; +} + +VOID EmsWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; +} + +VOID EmsInitialize(VOID) +{ + ULONG i; + RtlInitializeBitMap(&AllocBitmap, BitmapBuffer, EMS_TOTAL_PAGES); + + for (i = 0; i < EMS_MAX_HANDLES; i++) + { + HandleTable[i].Allocated = FALSE; + HandleTable[i].PageCount = 0; + InitializeListHead(&HandleTable[i].PageList); + } + + RegisterBiosInt32(EMS_INTERRUPT_NUM, EmsIntHandler); +} Propchange: trunk/reactos/subsystems/mvdm/ntvdm/ems.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/ems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ems.… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.h (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/ems.h [iso-8859-1] Sat Mar 7 00:43:17 2015 @@ -0,0 +1,56 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: ems.h + * PURPOSE: Expanded Memory Support + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _EMS_H_ +#define _EMS_H_ + +/* DEFINITIONS ****************************************************************/ + +#define EMS_INTERRUPT_NUM 0x67 +#define EMS_SEGMENT 0xE000 +#define EMS_MAX_HANDLES 16 +#define EMS_TOTAL_PAGES 256 +#define EMS_PAGE_BITS 14 +#define EMS_PAGE_SIZE (1 << EMS_PAGE_BITS) +#define EMS_ADDRESS 0xA00000 +#define EMS_PHYSICAL_PAGES 4 +#define EMS_START_ADDRESS (EMS_SEGMENT << 4) +#define EMS_END_ADDRESS (EMS_START_ADDRESS + EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE) + +#define EMS_STATUS_OK 0x00 +#define EMS_STATUS_INTERNAL_ERROR 0x80 +#define EMS_STATUS_INVALID_HANDLE 0x83 +#define EMS_STATUS_NO_MORE_HANDLES 0x85 +#define EMS_STATUS_INSUFFICIENT_PAGES 0x88 +#define EMS_STATUS_ZERO_PAGES 0x89 +#define EMS_STATUS_INV_LOGICAL_PAGE 0x8A +#define EMS_STATUS_INV_PHYSICAL_PAGE 0x8B +#define EMS_STATUS_UNKNOWN_FUNCTION 0x8F + +typedef struct _EMS_HANDLE +{ + BOOLEAN Allocated; + USHORT PageCount; + LIST_ENTRY PageList; +} EMS_HANDLE, *PEMS_HANDLE; + +typedef struct _EMS_PAGE +{ + LIST_ENTRY Entry; + USHORT Handle; +} EMS_PAGE, *PEMS_PAGE; + +/* FUNCTIONS ******************************************************************/ + +VOID EmsReadMemory(ULONG Address, PVOID Buffer, ULONG Size); +VOID EmsWriteMemory(ULONG Address, PVOID Buffer, ULONG Size); +VOID EmsInitialize(VOID); + +#endif // _EMS_H_ + +/* EOF */ Propchange: trunk/reactos/subsystems/mvdm/ntvdm/ems.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Mar 7 00:43:17 2015 @@ -30,6 +30,7 @@ #include "hardware/sound/speaker.h" #include "hardware/pit.h" #include "hardware/video/vga.h" +#include "ems.h" #include "vddsup.h" #include "io.h" @@ -619,6 +620,9 @@ /* Initialize I/O ports */ /* Initialize RAM */ + /* Initialize EMS */ + EmsInitialize(); + /* Initialize the CPU */ /* Initialize the internal clock */

1 0

[hbelusca] 66595: [SHORTCUTS]: Add RApps shortcut to the desktop. CORE-9190
by hbelusca＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: hbelusca Date: Sat Mar 7 00:21:24 2015 New Revision: 66595 URL: http://svn.reactos.org/svn/reactos?rev=66595&view=rev Log: [SHORTCUTS]: Add RApps shortcut to the desktop. CORE-9190 Modified: trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sat Mar 7 00:21:24 2015 @@ -15,6 +15,7 @@ [DesktopShortcuts] %SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0 +%SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0 [ProgramShortcuts] %SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 0

1 0

[dreimer] 66594: [MSTSC] German update. No user cares about the number of colors at all. It always was called High/True Color and thus we do so too.
by dreimer＠svn.reactos.org 07 Mar '15

07 Mar '15

Author: dreimer Date: Sat Mar 7 00:06:06 2015 New Revision: 66594 URL: http://svn.reactos.org/svn/reactos?rev=66594&view=rev Log: [MSTSC] German update. No user cares about the number of colors at all. It always was called High/True Color and thus we do so too. Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] Sat Mar 7 00:06:06 2015 @@ -52,10 +52,10 @@ IDS_TAB_GENERAL "Allgemein" IDS_TAB_DISPLAY "Display" IDS_256COLORS "256 Farben" - IDS_HIGHCOLOR15 "32,768 Farben (15 bit)" - IDS_HIGHCOLOR16 "65,536 Farben (16 bit)" - IDS_HIGHCOLOR24 "16,777,216 Farben (24 bit)" - IDS_HIGHCOLOR32 "Highest Quality (32 bit)" + IDS_HIGHCOLOR15 "High Color (15 bit)" + IDS_HIGHCOLOR16 "High Color (16 bit)" + IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_HIGHCOLOR32 "HÃ¶chste QualitÃ¤t (32 bit)" IDS_PIXEL "%lux%lu Pixel" IDS_FULLSCREEN "Vollbild" IDS_BROWSESERVER "<Nach mehr suchen...>"

1 0

[hbelusca] 66593: [MPLAY32] - Additional improvements by Ricardo Hanke, see CORE-8477 for all the details! - Add support for play/pause button: now we change its icon and tooltip. - Do not block wh...
by hbelusca＠svn.reactos.org 06 Mar '15

06 Mar '15

Author: hbelusca Date: Fri Mar 6 23:49:49 2015 New Revision: 66593 URL: http://svn.reactos.org/svn/reactos?rev=66593&view=rev Log: [MPLAY32] - Additional improvements by Ricardo Hanke, see CORE-8477 for all the details! - Add support for play/pause button: now we change its icon and tooltip. - Do not block when repeatedly change play/pause state. Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/mplay32.h trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -55,8 +55,8 @@ IDS_TOOLTIP_SEEKBACK "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð·Ð°Ð´" IDS_TOOLTIP_SEEKFORW "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð¿ÑÐµÐ´" IDS_TOOLTIP_FORWARD "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð¿ÑÐµÐ´" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ÐÑÐ»ÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸ÑÑ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ» Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" IDS_PLAY "ÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -56,8 +56,8 @@ IDS_TOOLTIP_SEEKBACK "Posunout zpÄt" IDS_TOOLTIP_SEEKFORW "Posunout vpÅed" IDS_TOOLTIP_FORWARD "PÅeskoÄit vpÅed" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS PÅehrÃ¡vaÄ multimÃ©diÃ" IDS_PLAY "PÅehrÃ¡t" IDS_DEFAULTMCIERRMSG "Pro tuto chybu nenÃ dostupnÃ½ Å¾Ã¡dnÃ½ popis." - IDS_UNKNOWNFILEEXT "Nelze urÄit typ zaÅÃzenÃ z danÃ© pÅÃpony souboru." END Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Schneller RÃ¼cklauf" IDS_TOOLTIP_SEEKFORW "Schneller Vorlauf" IDS_TOOLTIP_FORWARD "Weiter" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Abspielen" IDS_DEFAULTMCIERRMSG "FÃ¼r diesen Fehler steht keine Beschreibung zur VerfÃ¼gung." - IDS_UNKNOWNFILEEXT "Kann keinen GerÃ¤tetyp aus der angegebenen Dateinamenerweiterung ermitteln." END Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Seek Backward" IDS_TOOLTIP_SEEKFORW "Seek Forward" IDS_TOOLTIP_FORWARD "Skip Forward" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Rebobinar" IDS_TOOLTIP_SEEKFORW "Avance rÃ¡pido" IDS_TOOLTIP_FORWARD "Siguiente marca" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Reproductor multimedia de ReactOS" IDS_PLAY "Reproducir" IDS_DEFAULTMCIERRMSG "No hay una descripciÃ³n disponible para este error." - IDS_UNKNOWNFILEEXT "No se puede determinar el tipo de dispositivo a partir de la extensiÃ³n del archivo." END Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Retour rapide" IDS_TOOLTIP_SEEKFORW "Avance rapide" IDS_TOOLTIP_FORWARD "Suivant" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Lire" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "××¤×© ××××¨× ××ª" IDS_TOOLTIP_SEEKFORW "××¤×© ×§××××" IDS_TOOLTIP_FORWARD "××× ×§××××" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "× ×× ×××××××××× ×©× ReactOS" IDS_PLAY "× ××" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Riavvolgimento rapido" IDS_TOOLTIP_SEEKFORW "Avanzamento rapido" IDS_TOOLTIP_FORWARD "Successivo" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Riproduttore multimediale ReactOS" IDS_PLAY "Riproduci" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "å¾ãã¸ã·ã¼ã¯" IDS_TOOLTIP_SEEKFORW "åã¸ã·ã¼ã¯" IDS_TOOLTIP_FORWARD "åã¸ã¹ããã" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤ã¼" IDS_PLAY "åç" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Terugspoelen" IDS_TOOLTIP_SEEKFORW "Vooruitspoelen" IDS_TOOLTIP_FORWARD "Volgende" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "SÃ¸ke tilbake" IDS_TOOLTIP_SEEKFORW "SÃ¸ke fremover" IDS_TOOLTIP_FORWARD "Spole fremover" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia avspiller" IDS_PLAY "Spill" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -59,8 +59,8 @@ IDS_TOOLTIP_SEEKBACK "PrzewiÅ do tyÅu" IDS_TOOLTIP_SEEKFORW "PrzewiÅ do przodu" IDS_TOOLTIP_FORWARD "Przeskocz do przodu" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Odtwarzacz multimedialny ReactOS" IDS_PLAY "OdtwÃ³rz" IDS_DEFAULTMCIERRMSG "Brak dostÄpnego opisu dla tego bÅÄdu." - IDS_UNKNOWNFILEEXT "Nie moÅ¼na okreÅliÄ typu urzÄdzenia z podanego rozszerzenia pliku." END Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -53,8 +53,8 @@ IDS_TOOLTIP_SEEKBACK "Procurar Anterior" IDS_TOOLTIP_SEEKFORW "Procurar PrÃ³ximo" IDS_TOOLTIP_FORWARD "Pular PrÃ³xima" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Executar" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -57,8 +57,8 @@ IDS_TOOLTIP_SEEKBACK "DeruleazÄ Ã®napoi" IDS_TOOLTIP_SEEKFORW "DeruleazÄ Ã®nainte" IDS_TOOLTIP_FORWARD "Salt la urmÄtor" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Lector multimedia" IDS_PLAY "Lecturare" IDS_DEFAULTMCIERRMSG "Nu existÄ descriere pentru aceastÄ eroare." - IDS_UNKNOWNFILEEXT "Nu se poate determina tipul dispozitivului din extensia fiÈierului." END Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "ÐÐµÑÐµÐ¼Ð¾ÑÐºÐ° Ð½Ð°Ð·Ð°Ð´" IDS_TOOLTIP_SEEKFORW "ÐÐµÑÐµÐ¼Ð¾ÑÐºÐ° Ð²Ð¿ÐµÑÐµÐ´" IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ÐÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ ReactOS" IDS_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸" IDS_DEFAULTMCIERRMSG "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°." - IDS_UNKNOWNFILEEXT "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ¸Ð¿ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð° Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°." END Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -56,8 +56,8 @@ IDS_TOOLTIP_SEEKBACK "VyhÄ¾adaÅ¥ dozadu" IDS_TOOLTIP_SEEKFORW "VyhÄ¾adaÅ¥ dopredu" IDS_TOOLTIP_FORWARD "PreskoÄiÅ¥ dopredu" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "MultimediÃ¡lny prehrÃ¡vaÄ systÃ©mu ReactOS" IDS_PLAY "PrehraÅ¥" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -55,8 +55,8 @@ IDS_TOOLTIP_SEEKBACK "KÃ«rko mbrapa" IDS_TOOLTIP_SEEKFORW "KÃ«rko pÃ«rpara" IDS_TOOLTIP_FORWARD "Kalo para" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Programi muzikor i ReactOS" IDS_PLAY "Fillo" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -58,8 +58,8 @@ IDS_TOOLTIP_SEEKBACK "SÃ¶k bakÃ¥t" IDS_TOOLTIP_SEEKFORW "SÃ¶k framÃ¥t" IDS_TOOLTIP_FORWARD "Spola fremÃ¥t" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimediaspelare" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -53,8 +53,8 @@ IDS_TOOLTIP_SEEKBACK "Geri Sar" IDS_TOOLTIP_SEEKFORW "Ä°leri Sar" IDS_TOOLTIP_FORWARD "Bir Sonrakine GeÃ§" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Ãoklu Ortam OynatÄ±cÄ±sÄ±" IDS_PLAY "Ãal" IDS_DEFAULTMCIERRMSG "Bu yanlÄ±ÅlÄ±ÄÄ±n tanÄ±mÄ± yoktur." - IDS_UNKNOWNFILEEXT "Verilen kÃ¼tÃ¼k tÃ¼rÃ¼nden aygÄ±t tÃ¼rÃ¼ belirlenemiyor." END Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -59,8 +59,8 @@ IDS_TOOLTIP_SEEKBACK "ÐÐµÑÐµÐ¼Ð¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð·Ð°Ð´" IDS_TOOLTIP_SEEKFORW "ÐÐµÑÐµÐ¼Ð¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¿ÐµÑÐµÐ´" IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ÐÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ ReactOS" IDS_PLAY "ÐÑÐ´ÑÐ²Ð¾ÑÐ¸ÑÐ¸" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -53,8 +53,8 @@ IDS_TOOLTIP_SEEKBACK "å¿«é" IDS_TOOLTIP_SEEKFORW "å¿«è¿" IDS_TOOLTIP_FORWARD "ååè·³è¿" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS å¤åªä½ææ¾å¨" IDS_PLAY "ææ¾" IDS_DEFAULTMCIERRMSG "è¯¥éè¯¯æ²¡æå¯ç¨çæè¿°." - IDS_UNKNOWNFILEEXT "è¯¥è®¾å¤ç±»åä»ç»å®çæä»¶æ©å±åæ æ³æå®." END Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -59,8 +59,8 @@ IDS_TOOLTIP_SEEKBACK "å¾é" IDS_TOOLTIP_SEEKFORW "åé²" IDS_TOOLTIP_FORWARD "å¿«è½" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS å¤åªé«ææ¾å¨" IDS_PLAY "ææ¾" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -6,6 +6,8 @@ #include "mplay32.h" +#define IDT_PLAYTIMER 1000 + #define MAIN_WINDOW_HEIGHT 125 #define MAIN_WINDOW_MIN_WIDTH 250 #define MAX_MCISTR 256 @@ -20,9 +22,7 @@ TCHAR szDefaultFilter[MAX_PATH] = _T(""); TCHAR *szFilter = NULL; -WORD wDeviceId; -BOOL bIsOpened = FALSE; -BOOL bIsPaused = FALSE; +WORD wDeviceId = 0; BOOL bRepeat = FALSE; BOOL bIsSingleWindow = FALSE; UINT MaxFilePos = 0; @@ -39,7 +39,8 @@ {TBICON_BACKWARD, IDC_BACKWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, {TBICON_SEEKBACK, IDC_SEEKBACK, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, {TBICON_SEEKFORW, IDC_SEEKFORW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0} + {TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, +// {TBICON_PAUSE, IDC_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0} }; void EnableMenuItems(HWND hwnd) @@ -47,7 +48,7 @@ MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; MCI_DGV_RECT_PARMS mciVideoRect; - MCI_DGV_WINDOW_PARMSW mciVideoWindow; + MCI_DGV_WINDOW_PARMSW mciVideoWindow; EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED); @@ -59,7 +60,7 @@ mciVideoWindow.hWnd = hwnd; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); if (!mciError) { mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); @@ -148,6 +149,10 @@ LoadImage(hInstance, MAKEINTRESOURCE(IDB_FORWARDICON), IMAGE_BITMAP, 16, 16, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + ImageList_AddMasked(hImageList, + LoadImage(hInstance, MAKEINTRESOURCE(IDB_PAUSEICON), IMAGE_BITMAP, 16, 16, LR_DEFAULTCOLOR), + RGB(255, 255, 255)); + ImageList_Destroy((HIMAGELIST)SendMessage(hToolBar, TB_SETIMAGELIST, 0, @@ -160,9 +165,9 @@ TCHAR szErrorMessage[MAX_MCISTR]; TCHAR szTempMessage[MAX_MCISTR + 44]; - if (mciGetErrorString(mciError, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])) == FALSE) - { - LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); + if (mciGetErrorString(mciError, szErrorMessage, ARRAYSIZE(szErrorMessage)) == FALSE) + { + LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, ARRAYSIZE(szErrorMessage)); } StringCbPrintf(szTempMessage, sizeof(szTempMessage), _T("MMSYS%lu: %s"), mciError, szErrorMessage); @@ -172,7 +177,7 @@ static VOID InitControls(HWND hwnd) { - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + INT NumButtons = ARRAYSIZE(Buttons); InitCommonControls(); @@ -219,63 +224,24 @@ SendMessage(hToolBar, TB_ADDBUTTONS, NumButtons, (LPARAM)Buttons); } -static BOOL -IsSupportedFileExtension(LPTSTR lpFileName, LPTSTR lpDeviceName, LPDWORD dwSize) -{ - HKEY hKey; - DWORD dwType; - TCHAR *pathend; - - pathend = _tcsrchr(lpFileName, '.'); - - if (pathend == NULL) - { - return FALSE; - } - - pathend++; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - if (RegQueryValueEx(hKey, pathend, NULL, &dwType, (LPBYTE)lpDeviceName, dwSize) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - if (dwType != REG_SZ) - { - return FALSE; - } - - return TRUE; - } - - RegCloseKey(hKey); - } - - return FALSE; -} - static VOID SwitchViewMode(HWND hwnd) { MCIERROR mciError; MCI_DGV_RECT_PARMS mciVideoRect; - MCI_DGV_WINDOW_PARMSW mciVideoWindow; + MCI_DGV_WINDOW_PARMSW mciVideoWindow; RECT rcToolbarRect; RECT rcTempRect; mciVideoWindow.hWnd = hwnd; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); - if (mciError) - { + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); + if (mciError != 0) return; - } mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); - if (mciError) - { + if (mciError != 0) return; - } if (!bIsSingleWindow) { @@ -284,17 +250,17 @@ SetParent(hTrackBar, hToolBar); mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD_PTR)&mciVideoRect); - if (mciError) + if (mciError != 0) { ShowMCIError(hwnd, mciError); return; } - GetWindowRect(hToolBar, &rcToolbarRect); + GetWindowRect(hToolBar, &rcToolbarRect); ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top)); - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); - if (mciError) + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); + if (mciError != 0) { ShowMCIError(hwnd, mciError); return; @@ -313,7 +279,7 @@ mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT; mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); - if (mciError) + if (mciError != 0) { ShowMCIError(hwnd, mciError); return; @@ -371,10 +337,8 @@ mciOpen.lpstrAlias = NULL; mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_WAIT, (DWORD_PTR)&mciOpen); - if (mciError) - { + if (mciError != 0) return mciError; - } mciInfo.dwCallback = 0; mciInfo.lpstrReturn = lpFriendlyName; @@ -388,17 +352,17 @@ return mciError; } -static DWORD +static MCIERROR CloseMciDevice(VOID) { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - if (bIsOpened) + if (wDeviceId) { mciError = mciSendCommand(wDeviceId, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (mciError) return mciError; - bIsOpened = FALSE; + if (mciError != 0) return mciError; + wDeviceId = 0; } DisableMenuItems(); @@ -406,18 +370,17 @@ return 0; } -static DWORD +static MCIERROR OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName) { MCIERROR mciError; MCI_STATUS_PARMS mciStatus; MCI_OPEN_PARMS mciOpen; - TCHAR szNewTitle[MAX_PATH + 128]; - - if (bIsOpened) - { + DWORD dwFlags = MCI_OPEN_ELEMENT | MCI_WAIT; + TCHAR szNewTitle[MAX_PATH + 3 + 256]; + + if (wDeviceId) CloseMciDevice(); - } mciOpen.lpstrDeviceType = lpType; mciOpen.lpstrElementName = lpFileName; @@ -425,41 +388,40 @@ mciOpen.wDeviceID = 0; mciOpen.lpstrAlias = NULL; - mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); + if (lpType) + dwFlags |= MCI_OPEN_TYPE; + + mciError = mciSendCommand(0, MCI_OPEN, dwFlags, (DWORD_PTR)&mciOpen); if (mciError != 0) - { return mciError; - } mciStatus.dwItem = MCI_STATUS_LENGTH; mciError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); if (mciError != 0) - { return mciError; - } - - SendMessage(hTrackBar, TBM_SETRANGEMIN, (WPARAM) TRUE, (LPARAM) 1); - SendMessage(hTrackBar, TBM_SETRANGEMAX, (WPARAM) TRUE, (LPARAM) mciStatus.dwReturn); + + SendMessage(hTrackBar, TBM_SETRANGEMIN, (WPARAM)TRUE, (LPARAM)1); + SendMessage(hTrackBar, TBM_SETRANGEMAX, (WPARAM)TRUE, (LPARAM)mciStatus.dwReturn); SendMessage(hTrackBar, TBM_SETPAGESIZE, 0, 10); SendMessage(hTrackBar, TBM_SETLINESIZE, 0, 1); - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1); + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)1); if (mciStatus.dwReturn < 10000) { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)100, (LPARAM)0); } else if (mciStatus.dwReturn < 100000) { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 1000, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)1000, (LPARAM)0); } else if (mciStatus.dwReturn < 1000000) { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 10000, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)10000, (LPARAM)0); } else { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100000, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)100000, (LPARAM)0); } StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s"), szAppTitle, lpFileName); @@ -467,7 +429,6 @@ MaxFilePos = mciStatus.dwReturn; wDeviceId = mciOpen.wDeviceID; - bIsOpened = TRUE; StringCbCopy(szPrevFile, sizeof(szPrevFile), lpFileName); EnableMenuItems(hwnd); @@ -475,21 +436,52 @@ return 0; } +static DWORD +GetDeviceMode(HWND hwnd) +{ + MCIERROR mciError; + MCI_STATUS_PARMS mciStatus; + + mciStatus.dwItem = MCI_STATUS_MODE; + mciError = mciSendCommand(wDeviceId, MCI_STATUS, MCI_WAIT | MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return MCI_MODE_NOT_READY; + } + + return mciStatus.dwReturn; +} + static VOID StopPlayback(HWND hwnd) { - if (bIsOpened) - { - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1); - KillTimer(hwnd, IDT_PLAYTIMER); - - if (bIsSingleWindow) - { - SwitchViewMode(hwnd); - } - - CloseMciDevice(); - } + MCIERROR mciError; + MCI_GENERIC_PARMS mciGeneric; + + if (wDeviceId == 0) return; + + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)1); + KillTimer(hwnd, IDT_PLAYTIMER); + + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_STOP, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + IDC_PLAY); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + IDC_PLAY, + IDB_PLAYICON - IDB_PLAYICON); } static VOID @@ -499,21 +491,20 @@ MCI_SEEK_PARMS mciSeek; MCI_PLAY_PARMS mciPlay; - if (bIsOpened) - { - mciSeek.dwTo = (DWORD_PTR)dwNewPos; - mciError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } - - mciPlay.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } + if (wDeviceId == 0) return; + + mciSeek.dwTo = (DWORD_PTR)dwNewPos; + mciError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + } + + mciPlay.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } } @@ -523,14 +514,14 @@ MCI_STATUS_PARMS mciStatus; DWORD dwNewPos; - if (!bIsOpened) return; + if (wDeviceId == 0) return; mciStatus.dwItem = MCI_STATUS_POSITION; mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwNewPos = mciStatus.dwReturn - 1; - if((UINT)dwNewPos <= 1) + if ((UINT)dwNewPos <= 1) { StopPlayback(hwnd); } @@ -546,14 +537,14 @@ MCI_STATUS_PARMS mciStatus; DWORD dwNewPos; - if (!bIsOpened) return; + if (wDeviceId == 0) return; mciStatus.dwItem = MCI_STATUS_POSITION; mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwNewPos = mciStatus.dwReturn + 1; - if((UINT)dwNewPos >= MaxFilePos) + if ((UINT)dwNewPos >= MaxFilePos) { StopPlayback(hwnd); } @@ -564,37 +555,46 @@ } static VOID -PausePlayback(HWND hwnd) +TogglePlaybackState(HWND hwnd) { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - - if (bIsOpened) - { - mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } - bIsPaused = TRUE; - } -} - -static VOID -ResumePlayback(HWND hwnd) -{ - MCIERROR mciError; - MCI_GENERIC_PARMS mciGeneric; - - if (bIsPaused) - { - mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } - bIsPaused = FALSE; - } + DWORD dwMode; + ULONG idBmp = IDB_PLAYICON; + ULONG idCmd = IDC_PLAY; + + if (wDeviceId == 0) return; + + dwMode = GetDeviceMode(hwnd); + if (dwMode == MCI_MODE_PLAY) + { + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + idBmp = IDB_PLAYICON; + idCmd = IDC_PLAY; + } + else if (dwMode == MCI_MODE_PAUSE) + { + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + idBmp = IDB_PAUSEICON; + idCmd = IDC_PAUSE; + } + + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + idCmd); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + idCmd, + idBmp - IDB_PLAYICON); } static VOID @@ -617,13 +617,13 @@ MCI_PLAY_PARMS mciPlay; DWORD dwPos; - if (!bIsOpened) KillTimer(hwnd, IDT_PLAYTIMER); + if (wDeviceId == 0) KillTimer(hwnd, IDT_PLAYTIMER); mciStatus.dwItem = MCI_STATUS_POSITION; mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwPos = mciStatus.dwReturn; - if((UINT)dwPos >= MaxFilePos) + if ((UINT)dwPos >= MaxFilePos) { if (!bRepeat) { @@ -638,61 +638,17 @@ } else { - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) dwPos); - } -} - -static VOID -PlayFile(HWND hwnd, LPTSTR lpFileName) -{ + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)dwPos); + } +} + +static VOID +StartPlayback(HWND hwnd) +{ + MCIERROR mciError; MCI_PLAY_PARMS mciPlay; - TCHAR szLocalFileName[MAX_PATH]; - TCHAR szDeviceName[MAX_PATH]; - DWORD dwSize; - MCIERROR mciError; - - if (lpFileName == NULL) - { - if (szPrevFile[0] == _T('\0')) - return; - - StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile); - } - else - { - StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName); - } - - if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) - { - return; - } - - dwSize = sizeof(szDeviceName) - 2; - _tcsnset(szDeviceName, _T('\0'), dwSize / sizeof(TCHAR)); - - if (!IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize)) - { - TCHAR szErrorMessage[256]; - - LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); - MessageBox(hwnd, szErrorMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); - return; - } - - if (bIsOpened) - { - StopPlayback(hwnd); - } - - mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - return; - } - - SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc); + + SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC)PlayTimerProc); mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); @@ -704,7 +660,63 @@ if (mciError != 0) { ShowMCIError(hwnd, mciError); - } + return; + } + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + IDC_PAUSE); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + IDC_PAUSE, + IDB_PAUSEICON - IDB_PLAYICON); +} + +static VOID +CloseMediaFile(HWND hwnd) +{ + StopPlayback(hwnd); + + if (bIsSingleWindow) + SwitchViewMode(hwnd); + + CloseMciDevice(); + SetWindowText(hwnd, szAppTitle); +} + +static VOID +OpenMediaFile(HWND hwnd, LPTSTR lpFileName) +{ + MCIERROR mciError; + TCHAR szLocalFileName[MAX_PATH]; + + if (lpFileName == NULL) + { + if (szPrevFile[0] == _T('\0')) + return; + + StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile); + } + else + { + StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName); + } + + if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) + return; + + if (wDeviceId) + CloseMediaFile(hwnd); + + mciError = OpenMciDevice(hwnd, NULL, szLocalFileName); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + StartPlayback(hwnd); } static VOID @@ -733,7 +745,7 @@ HKEY hKey = NULL; /* Always load the default (all files) filter */ - LoadString(hInstance, IDS_ALL_TYPES_FILTER, szDefaultFilter, sizeof(szDefaultFilter) / sizeof(szDefaultFilter[0])); + LoadString(hInstance, IDS_ALL_TYPES_FILTER, szDefaultFilter, ARRAYSIZE(szDefaultFilter)); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) { @@ -749,9 +761,7 @@ szExtensionList = malloc(dwMaskLen * sizeof(TCHAR)); if (!szExtensionList) - { goto Failure; - } dwNumDevices = GetNumDevices(); @@ -763,21 +773,15 @@ szFilter = malloc(dwFilterSize); if (!szFilter) - { goto Failure; - } szExtension = malloc((dwValueNameLen + 1) * sizeof(TCHAR)); if (!szExtension) - { goto Failure; - } szDevice = malloc(dwValueDataSize + sizeof(TCHAR)); if (!szDevice) - { goto Failure; - } ZeroMemory(szFilter, dwFilterSize); @@ -813,7 +817,7 @@ if (RegEnumValue(hKey, i, szExtension, &dwExtensionLen, NULL, NULL, (LPBYTE)szDevice, &dwDeviceSize) == ERROR_SUCCESS) { CharLowerBuff(szDevice, dwDeviceSize / sizeof(TCHAR)); - CharLowerBuff(szDeviceName, sizeof(szDeviceName) / sizeof(szDeviceName[0])); + CharLowerBuff(szDeviceName, ARRAYSIZE(szDeviceName)); if (_tcscmp(szDeviceName, szDevice) == 0) { CharLowerBuff(szExtension, dwExtensionLen); @@ -835,7 +839,7 @@ uSizeRemain -= sizeof(*c); /* Append the filter mask */ - StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); + StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); /* Skip another char to seperate the elements of the filter mask */ c++; @@ -870,7 +874,7 @@ uSizeRemain -= sizeof(*c); /* Append the filter mask */ - StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); + StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); Cleanup: if (szExtensionList) free(szExtensionList); @@ -896,7 +900,7 @@ uSizeRemain -= sizeof(*c); /* Append the filter mask */ - StringCbCopyEx(c, uSizeRemain, szDefaultExtension, &c, &uSizeRemain, 0); + StringCbCopyEx(c, uSizeRemain, szDefaultExtension, &c, &uSizeRemain, 0); goto Cleanup; } @@ -916,7 +920,7 @@ ZeroMemory(&OpenFileName, sizeof(OpenFileName)); - if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(szCurrentDir[0]), szCurrentDir)) + if (!GetCurrentDirectory(ARRAYSIZE(szCurrentDir), szCurrentDir)) { StringCbCopy(szCurrentDir, sizeof(szCurrentDir), _T("c:\\")); } @@ -926,15 +930,15 @@ OpenFileName.hInstance = hInstance; OpenFileName.lpstrFilter = szFilter; OpenFileName.lpstrFile = szFile; - OpenFileName.nMaxFile = sizeof(szFile) / sizeof(szFile[0]); + OpenFileName.nMaxFile = ARRAYSIZE(szFile); OpenFileName.lpstrInitialDir = szCurrentDir; OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.lpstrDefExt = _T("\0"); - if (GetOpenFileName(&OpenFileName)) - { - PlayFile(hwnd, OpenFileName.lpstrFile); - } + if (!GetOpenFileName(&OpenFileName)) + return; + + OpenMediaFile(hwnd, OpenFileName.lpstrFile); } LRESULT CALLBACK @@ -955,9 +959,9 @@ TCHAR droppedfile[MAX_PATH]; drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(droppedfile[0])); + DragQueryFile(drophandle, 0, droppedfile, ARRAYSIZE(droppedfile)); DragFinish(drophandle); - PlayFile(hwnd, droppedfile); + OpenMediaFile(hwnd, droppedfile); break; } @@ -995,6 +999,9 @@ case IDC_FORWARD: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_FORWARD); break; + case IDC_PAUSE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PAUSE); + break; } break; } @@ -1054,11 +1061,11 @@ case WM_HSCROLL: { - if (hTrackBar == (HWND) lParam) + if (hTrackBar == (HWND)lParam) { - if (bIsOpened) + if (wDeviceId) { - DWORD dwNewPos = (DWORD) SendMessage(hTrackBar, TBM_GETPOS, 0, 0); + DWORD dwNewPos = (DWORD)SendMessage(hTrackBar, TBM_GETPOS, 0, 0); SeekPlayback(hwnd, dwNewPos); } else @@ -1083,20 +1090,23 @@ switch (LOWORD(wParam)) { case IDC_PLAY: + case IDC_PAUSE: { - if (bIsOpened) + if (wDeviceId) { - if (bIsPaused) - ResumePlayback(hwnd); - else - PausePlayback(hwnd); + DWORD dwMode = GetDeviceMode(hwnd); + + if ((dwMode == MCI_MODE_STOP) || (dwMode == MCI_MODE_OPEN)) + StartPlayback(hwnd); + else if ((dwMode == MCI_MODE_PAUSE) || (dwMode = MCI_MODE_PLAY)) + TogglePlaybackState(hwnd); } else { if (szPrevFile[0] == _T('\0')) OpenFileDialog(hwnd); else - PlayFile(hwnd, NULL); + OpenMediaFile(hwnd, NULL); } break; } @@ -1127,8 +1137,8 @@ return 0; case IDM_CLOSE_FILE: - StopPlayback(hwnd); szPrevFile[0] = _T('\0'); + CloseMediaFile(hwnd); break; case IDM_REPEAT: @@ -1174,7 +1184,7 @@ } case WM_DESTROY: - StopPlayback(hwnd); + CloseMediaFile(hwnd); PostQuitMessage(0); return 0; } @@ -1194,9 +1204,9 @@ hInstance = hInst; - LoadString(hInstance, IDS_APPTITLE, szAppTitle, sizeof(szAppTitle) / sizeof(szAppTitle[0])); - - WndClass.cbSize = sizeof(WNDCLASSEX); + LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)); + + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szClassName; WndClass.lpfnWndProc = MainWndProc; WndClass.hInstance = hInstance; @@ -1247,7 +1257,7 @@ ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); - PlayFile(hwnd, lpCmdLine); + OpenMediaFile(hwnd, lpCmdLine); /* Message Loop */ while (GetMessage(&msg, NULL, 0, 0)) Modified: trunk/reactos/base/applications/mplay32/mplay32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -14,17 +14,3 @@ #include <strsafe.h> #include "resource.h" - -#define IDT_PLAYTIMER 1000 - -#define UNSUPPORTED_FILE 0 -#define WAVE_FILE 1 -#define MIDI_FILE 2 -#define AUDIOCD_FILE 3 -#define AVI_FILE 4 - -typedef struct -{ - TCHAR szExt[MAX_PATH]; - UINT uType; -} TYPEBYEXT; Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -22,10 +22,10 @@ #define IDS_TOOLTIP_SEEKBACK 105 #define IDS_TOOLTIP_SEEKFORW 106 #define IDS_TOOLTIP_FORWARD 107 -#define IDS_ALL_TYPES_FILTER 108 -#define IDS_PLAY 109 -#define IDS_DEFAULTMCIERRMSG 110 -#define IDS_UNKNOWNFILEEXT 111 +#define IDS_TOOLTIP_PAUSE 108 +#define IDS_ALL_TYPES_FILTER 109 +#define IDS_PLAY 110 +#define IDS_DEFAULTMCIERRMSG 111 /* Menu */ #define IDR_MAINMENU 500 @@ -60,3 +60,4 @@ #define IDC_SEEKBACK 1504 #define IDC_SEEKFORW 1505 #define IDC_FORWARD 1506 +#define IDC_PAUSE 1507

1 0

[hbelusca] 66592: [SHIMGVW] - Few whitespace fixes. - Fix a regression where an exception was thrown when opening a file from cdrom. Patch by Ricardo Hanke. CORE-9250 #resolve #comment Patch v2 com...
by hbelusca＠svn.reactos.org 06 Mar '15

06 Mar '15

Author: hbelusca Date: Fri Mar 6 20:32:38 2015 New Revision: 66592 URL: http://svn.reactos.org/svn/reactos?rev=66592&view=rev Log: [SHIMGVW] - Few whitespace fixes. - Fix a regression where an exception was thrown when opening a file from cdrom. Patch by Ricardo Hanke. CORE-9250 #resolve #comment Patch v2 committed! Thanks! Modified: trunk/reactos/dll/win32/shimgvw/comsup.c trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/comsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/comsup.c… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/comsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/comsup.c [iso-8859-1] Fri Mar 6 20:32:38 2015 @@ -34,12 +34,12 @@ STDAPI DllCanUnloadNow(VOID) { - if ((ObjectCount != 0) || (LockCount != 0)) + if ((ObjectCount != 0) || (LockCount != 0)) { return S_FALSE; } else - { + { return S_OK; } } @@ -53,6 +53,6 @@ /* There are no classes to export, so always return CLASS_E_CLASSNOTAVAILABLE*/ *ppv = NULL; hr = CLASS_E_CLASSNOTAVAILABLE; - + return hr; } Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Fri Mar 6 20:32:38 2015 @@ -1,5 +1,4 @@ /* - * * PROJECT: ReactOS Picture and Fax Viewer * FILE: dll/win32/shimgvw/shimgvw.c * PURPOSE: shimgvw.dll @@ -175,9 +174,9 @@ { c++; } - - LoadStringW(hInstance, IDS_APPTITLE, szResStr, 512); - StringCbPrintfExW(szTitleBuf, 800, NULL, NULL, 0, L"%ls%ls%ls", szResStr, L" - ", c); + + LoadStringW(hInstance, IDS_APPTITLE, szResStr, ARRAYSIZE(szResStr)); + StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), L"%ls%ls%ls", szResStr, L" - ", c); SetWindowTextW(hwnd, szTitleBuf); if (image) @@ -200,16 +199,15 @@ WCHAR szSearchMask[MAX_PATH]; WCHAR szFileTypes[MAX_PATH]; WIN32_FIND_DATAW findData; - SHIMGVW_FILENODE *currentNode; - SHIMGVW_FILENODE *root; - SHIMGVW_FILENODE *conductor; + SHIMGVW_FILENODE *currentNode = NULL; + SHIMGVW_FILENODE *root = NULL; + SHIMGVW_FILENODE *conductor = NULL; ImageCodecInfo *codecInfo; UINT num; UINT size; UINT j; - - wcscpy(szSearchPath, szFirstFile); + StringCbCopyW(szSearchPath, sizeof(szSearchPath), szFirstFile); PathRemoveFileSpecW(szSearchPath); GdipGetImageDecodersSize(&num, &size); @@ -234,19 +232,19 @@ for (j = 0; j < num; ++j) { - StringCbPrintfExW(szFileTypes, MAX_PATH, NULL, NULL, 0, L"%ls", codecInfo[j].FilenameExtension); - + StringCbCopyW(szFileTypes, sizeof(szFileTypes), codecInfo[j].FilenameExtension); + extension = wcstok(szFileTypes, L";"); while (extension != NULL) { - StringCbPrintfExW(szSearchMask, MAX_PATH, NULL, NULL, 0, L"%ls%ls%ls", szSearchPath, L"\\", extension); + PathCombineW(szSearchMask, szSearchPath, extension); hFindHandle = FindFirstFileW(szSearchMask, &findData); if (hFindHandle != INVALID_HANDLE_VALUE) { do { - StringCbPrintfExW(conductor->FileName, MAX_PATH, NULL, NULL, 0, L"%ls%ls%ls", szSearchPath, L"\\", findData.cFileName); + PathCombineW(conductor->FileName, szSearchPath, findData.cFileName); // compare the name of the requested file with the one currently found. // if the name matches, the current node is returned by the function. @@ -261,7 +259,7 @@ if (!conductor->Next) { DPRINT1("malloc() failed in pLoadFileList()\n"); - + conductor->Next = root; root->Prev = conductor; @@ -286,7 +284,7 @@ // we use this node to store the name of it, otherwise we free it. if (currentNode == NULL) { - StringCbPrintfExW(conductor->FileName, MAX_PATH, NULL, NULL, 0, L"%ls", szFirstFile); + StringCchCopyW(conductor->FileName, MAX_PATH, szFirstFile); currentNode = conductor; } else @@ -503,7 +501,7 @@ ImageView_DrawImage(hwnd); return 0L; } - } + } return CallWindowProc(PrevProc, hwnd, Message, wParam, lParam); } @@ -793,4 +791,3 @@ return TRUE; } -

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs