Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 59689: [NETAPI32] Reimplement NetUserModalsGet and add NetUserModalsSet stub.
by ekohl＠svn.reactos.org 10 Aug '13

10 Aug '13

Author: ekohl Date: Sat Aug 10 19:24:03 2013 New Revision: 59689 URL: http://svn.reactos.org/svn/reactos?rev=59689&view=rev Log: [NETAPI32] Reimplement NetUserModalsGet and add NetUserModalsSet stub. Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Sat Aug 10 19:24:03 2013 @@ -262,130 +262,6 @@ return NERR_DCNotFound; /* say we can't find a domain controller */ } -/****************************************************************************** - * NetUserModalsGet (NETAPI32.@) - * - * Retrieves global information for all users and global groups in the security - * database. - * - * PARAMS - * szServer [I] Specifies the DNS or the NetBIOS name of the remote server - * on which the function is to execute. - * level [I] Information level of the data. - * 0 Return global passwords parameters. bufptr points to a - * USER_MODALS_INFO_0 struct. - * 1 Return logon server and domain controller information. bufptr - * points to a USER_MODALS_INFO_1 struct. - * 2 Return domain name and identifier. bufptr points to a - * USER_MODALS_INFO_2 struct. - * 3 Return lockout information. bufptr points to a USER_MODALS_INFO_3 - * struct. - * pbuffer [I] Buffer that receives the data. - * - * RETURNS - * Success: NERR_Success. - * Failure: - * ERROR_ACCESS_DENIED - the user does not have access to the info. - * NERR_InvalidComputer - computer name is invalid. - */ -NET_API_STATUS WINAPI NetUserModalsGet( - LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) -{ - TRACE("(%s %d %p)\n", debugstr_w(szServer), level, pbuffer); - - switch (level) - { - case 0: - /* return global passwords parameters */ - FIXME("level 0 not implemented!\n"); - *pbuffer = NULL; - return NERR_InternalError; - case 1: - /* return logon server and domain controller info */ - FIXME("level 1 not implemented!\n"); - *pbuffer = NULL; - return NERR_InternalError; - case 2: - { - /* return domain name and identifier */ - PUSER_MODALS_INFO_2 umi; - LSA_HANDLE policyHandle; - LSA_OBJECT_ATTRIBUTES objectAttributes; - PPOLICY_ACCOUNT_DOMAIN_INFO domainInfo; - NTSTATUS ntStatus; - PSID domainIdentifier = NULL; - int domainNameLen, domainIdLen; - - ZeroMemory(&objectAttributes, sizeof(objectAttributes)); - objectAttributes.Length = sizeof(objectAttributes); - - ntStatus = LsaOpenPolicy(NULL, &objectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, - &policyHandle); - if (ntStatus != STATUS_SUCCESS) - { - WARN("LsaOpenPolicy failed with NT status %x\n", - LsaNtStatusToWinError(ntStatus)); - return ntStatus; - } - - ntStatus = LsaQueryInformationPolicy(policyHandle, - PolicyAccountDomainInformation, - (PVOID *)&domainInfo); - if (ntStatus != STATUS_SUCCESS) - { - WARN("LsaQueryInformationPolicy failed with NT status %x\n", - LsaNtStatusToWinError(ntStatus)); - LsaClose(policyHandle); - return ntStatus; - } - - domainIdentifier = domainInfo->DomainSid; - domainIdLen = (domainIdentifier) ? GetLengthSid(domainIdentifier) : 0; - domainNameLen = lstrlenW(domainInfo->DomainName.Buffer) + 1; - LsaClose(policyHandle); - - ntStatus = NetApiBufferAllocate(sizeof(USER_MODALS_INFO_2) + - domainIdLen + - domainNameLen * sizeof(WCHAR), - (LPVOID *)pbuffer); - - if (ntStatus != NERR_Success) - { - WARN("NetApiBufferAllocate() failed\n"); - LsaFreeMemory(domainInfo); - return ntStatus; - } - - umi = (USER_MODALS_INFO_2 *) *pbuffer; - umi->usrmod2_domain_id = (domainIdLen > 0) ? (*pbuffer + sizeof(USER_MODALS_INFO_2)) : NULL; - umi->usrmod2_domain_name = (LPWSTR)(*pbuffer + - sizeof(USER_MODALS_INFO_2) + domainIdLen); - - lstrcpynW(umi->usrmod2_domain_name, - domainInfo->DomainName.Buffer, - domainNameLen); - if (domainIdLen > 0) - CopySid(GetLengthSid(domainIdentifier), umi->usrmod2_domain_id, - domainIdentifier); - - LsaFreeMemory(domainInfo); - - break; - } - case 3: - /* return lockout information */ - FIXME("level 3 not implemented!\n"); - *pbuffer = NULL; - return NERR_InternalError; - default: - TRACE("Invalid level %d is specified\n", level); - *pbuffer = NULL; - return ERROR_INVALID_LEVEL; - } - - return NERR_Success; -} NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) { Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sat Aug 10 19:24:03 2013 @@ -209,7 +209,7 @@ @ stdcall NetUserGetInfo(wstr wstr long ptr) @ stdcall NetUserGetLocalGroups(wstr wstr long long ptr long ptr ptr) @ stdcall NetUserModalsGet(wstr long ptr) -@ stub NetUserModalsSet +@ stdcall NetUserModalsSet(wstr long ptr ptr) @ stdcall NetUserSetGroups(wstr wstr long ptr long) @ stdcall NetUserSetInfo(wstr wstr long ptr ptr) @ stdcall NetWkstaGetInfo(wstr long ptr) Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Aug 10 19:24:03 2013 @@ -45,6 +45,24 @@ BOOLEAN BuiltinDone; } ENUM_CONTEXT, *PENUM_CONTEXT; + + +static +ULONG +DeltaTimeToSeconds(LARGE_INTEGER DeltaTime) +{ + LARGE_INTEGER Seconds; + + if (DeltaTime.QuadPart == 0) + return 0; + + Seconds.QuadPart = -DeltaTime.QuadPart / 10000000; + + if (Seconds.HighPart != 0) + return TIMEQ_FOREVER; + + return Seconds.LowPart; +} static @@ -3059,6 +3077,332 @@ /****************************************************************************** + * NetUserModalsGet (NETAPI32.@) + * + * Retrieves global information for all users and global groups in the security + * database. + * + * PARAMS + * servername [I] Specifies the DNS or the NetBIOS name of the remote server + * on which the function is to execute. + * level [I] Information level of the data. + * 0 Return global passwords parameters. bufptr points to a + * USER_MODALS_INFO_0 struct. + * 1 Return logon server and domain controller information. bufptr + * points to a USER_MODALS_INFO_1 struct. + * 2 Return domain name and identifier. bufptr points to a + * USER_MODALS_INFO_2 struct. + * 3 Return lockout information. bufptr points to a USER_MODALS_INFO_3 + * struct. + * bufptr [O] Buffer that receives the data. + * + * RETURNS + * Success: NERR_Success. + * Failure: + * ERROR_ACCESS_DENIED - the user does not have access to the info. + * NERR_InvalidComputer - computer name is invalid. + */ +NET_API_STATUS +WINAPI +NetUserModalsGet(LPCWSTR servername, + DWORD level, + LPBYTE *bufptr) +{ + UNICODE_STRING ServerName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + PSID DomainSid = NULL; + PDOMAIN_PASSWORD_INFORMATION PasswordInfo = NULL; + PDOMAIN_LOGOFF_INFORMATION LogoffInfo = NULL; + PDOMAIN_SERVER_ROLE_INFORMATION ServerRoleInfo = NULL; + PDOMAIN_REPLICATION_INFORMATION ReplicationInfo = NULL; + PDOMAIN_NAME_INFORMATION NameInfo = NULL; + PDOMAIN_LOCKOUT_INFORMATION LockoutInfo = NULL; + ULONG DesiredAccess; + ULONG BufferSize; + PUSER_MODALS_INFO_0 umi0; + PUSER_MODALS_INFO_1 umi1; + PUSER_MODALS_INFO_2 umi2; + PUSER_MODALS_INFO_3 umi3; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %d %p)\n", debugstr_w(servername), level, bufptr); + + *bufptr = NULL; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the Account Domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + switch (level) + { + case 0: + DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS | DOMAIN_READ_PASSWORD_PARAMETERS; + break; + + case 1: + DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; + break; + + case 2: + DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; + break; + + case 3: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS; + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + /* Open the Account Domain */ + Status = SamOpenDomain(ServerHandle, + DesiredAccess, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + switch (level) + { + case 0: + /* return global passwords parameters */ + Status = SamQueryInformationDomain(DomainHandle, + DomainPasswordInformation, + (PVOID*)&PasswordInfo); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamQueryInformationDomain(DomainHandle, + DomainLogoffInformation, + (PVOID*)&LogoffInfo); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + BufferSize = sizeof(USER_MODALS_INFO_0); + break; + + case 1: + /* return logon server and domain controller info */ + Status = SamQueryInformationDomain(DomainHandle, + DomainServerRoleInformation, + (PVOID*)&ServerRoleInfo); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamQueryInformationDomain(DomainHandle, + DomainReplicationInformation, + (PVOID*)&ReplicationInfo); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + BufferSize = sizeof(USER_MODALS_INFO_1) + + ReplicationInfo->ReplicaSourceNodeName.Length + sizeof(WCHAR); + break; + + case 2: + /* return domain name and identifier */ + Status = SamQueryInformationDomain(DomainHandle, + DomainNameInformation, + (PVOID*)&NameInfo); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + BufferSize = sizeof( USER_MODALS_INFO_2 ) + + NameInfo->DomainName.Length + sizeof(WCHAR) + + RtlLengthSid(DomainSid); + break; + + case 3: + /* return lockout information */ + Status = SamQueryInformationDomain(DomainHandle, + DomainLockoutInformation, + (PVOID*)&LockoutInfo); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + BufferSize = sizeof(USER_MODALS_INFO_3); + break; + + default: + TRACE("Invalid level %d is specified\n", level); + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + + ApiStatus = NetApiBufferAllocate(BufferSize, + (LPVOID *)bufptr); + if (ApiStatus != NERR_Success) + { + WARN("NetApiBufferAllocate() failed\n"); + goto done; + } + + switch (level) + { + case 0: + umi0 = (PUSER_MODALS_INFO_0)*bufptr; + + umi0->usrmod0_min_passwd_len = PasswordInfo->MinPasswordLength; + umi0->usrmod0_max_passwd_age = (ULONG)(PasswordInfo->MaxPasswordAge.QuadPart / 10000000); + umi0->usrmod0_min_passwd_age = + DeltaTimeToSeconds(PasswordInfo->MinPasswordAge); + umi0->usrmod0_force_logoff = + DeltaTimeToSeconds(LogoffInfo->ForceLogoff); + umi0->usrmod0_password_hist_len = PasswordInfo->PasswordHistoryLength; + break; + + case 1: + umi1 = (PUSER_MODALS_INFO_1)*bufptr; + + switch (ServerRoleInfo->DomainServerRole) + { + + umi1->usrmod1_role = UAS_ROLE_STANDALONE; + umi1->usrmod1_role = UAS_ROLE_MEMBER; + + case DomainServerRolePrimary: + umi1->usrmod1_role = UAS_ROLE_PRIMARY; + break; + + case DomainServerRoleBackup: + umi1->usrmod1_role = UAS_ROLE_BACKUP; + break; + + default: + ApiStatus = NERR_InternalError; + goto done; + } + + umi1->usrmod1_primary = (LPWSTR)(*bufptr + sizeof(USER_MODALS_INFO_1)); + RtlCopyMemory(umi1->usrmod1_primary, + ReplicationInfo->ReplicaSourceNodeName.Buffer, + ReplicationInfo->ReplicaSourceNodeName.Length); + umi1->usrmod1_primary[ReplicationInfo->ReplicaSourceNodeName.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + + case 2: + umi2 = (PUSER_MODALS_INFO_2)*bufptr; + + umi2->usrmod2_domain_name = (LPWSTR)(*bufptr + sizeof(USER_MODALS_INFO_2)); + RtlCopyMemory(umi2->usrmod2_domain_name, + NameInfo->DomainName.Buffer, + NameInfo->DomainName.Length); + umi2->usrmod2_domain_name[NameInfo->DomainName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + umi2->usrmod2_domain_id = *bufptr + + sizeof(USER_MODALS_INFO_2) + + NameInfo->DomainName.Length + sizeof(WCHAR); + RtlCopyMemory(umi2->usrmod2_domain_id, + DomainSid, + RtlLengthSid(DomainSid)); + break; + + case 3: + umi3 = (PUSER_MODALS_INFO_3)*bufptr; + umi3->usrmod3_lockout_duration = + DeltaTimeToSeconds(LockoutInfo->LockoutDuration); + umi3->usrmod3_lockout_observation_window = + DeltaTimeToSeconds(LockoutInfo->LockoutObservationWindow ); + umi3->usrmod3_lockout_threshold = LockoutInfo->LockoutThreshold; + break; + } + +done: + if (LockoutInfo != NULL) + SamFreeMemory(LockoutInfo); + + if (NameInfo != NULL) + SamFreeMemory(NameInfo); + + if (ReplicationInfo != NULL) + SamFreeMemory(ReplicationInfo); + + if (ServerRoleInfo != NULL) + SamFreeMemory(ServerRoleInfo); + + if (LogoffInfo != NULL) + SamFreeMemory(LogoffInfo); + + if (PasswordInfo != NULL) + SamFreeMemory(PasswordInfo); + + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + + +/****************************************************************************** + * NetUserModalsSet (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserModalsSet(IN LPCWSTR servername, + IN DWORD level, + IN LPBYTE buf, + OUT LPDWORD parm_err) +{ + FIXME("(%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); + return ERROR_ACCESS_DENIED; +} + + +/****************************************************************************** * NetUserSetGroups (NETAPI32.@) */ NET_API_STATUS

1 0

[aandrejevic] 59688: [NTVDM] Clear the screen when switching video modes.
by aandrejevic＠svn.reactos.org 10 Aug '13

10 Aug '13

Author: aandrejevic Date: Sat Aug 10 19:24:00 2013 New Revision: 59688 URL: http://svn.reactos.org/svn/reactos?rev=59688&view=rev Log: [NTVDM] Clear the screen when switching video modes. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Aug 10 19:24:00 2013 @@ -255,6 +255,31 @@ } } +static VOID BiosClearScreen(VOID) +{ + INT i; + BYTE PlaneMask; + + /* Save the plane write register */ + VgaWritePort(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + PlaneMask = VgaReadPort(VGA_SEQ_DATA); + + /* Write to all planes */ + VgaWritePort(VGA_SEQ_DATA, 0x0F); + + /* Clear the screen */ + for (i = VgaGetVideoBaseAddress(); + i < VgaGetVideoLimitAddress(); + i += sizeof(DWORD)) + { + DWORD Zero = 0; + VgaWriteMemory(i, (LPVOID)&Zero, sizeof(DWORD)); + } + + /* Restore the plane write register */ + VgaWritePort(VGA_SEQ_DATA, PlaneMask); +} + /* PUBLIC FUNCTIONS ***********************************************************/ BYTE BiosGetVideoMode(VOID) @@ -304,7 +329,7 @@ /* Update the values in the BDA */ Bda->VideoMode = ModeNumber; Bda->VideoPage = 0; - Bda->VideoPageSize = BIOS_PAGE_SIZE; + Bda->VideoPageSize = BIOS_PAGE_SIZE; Bda->VideoPageOffset = 0; /* Get the character height */ @@ -629,6 +654,8 @@ case 0x00: { BiosSetVideoMode(LOBYTE(Eax)); + BiosClearScreen(); + break; }

1 0

[aandrejevic] 59687: Synchronize with trunk to fix spec2def issue. [NTVDM] Implement write modes and latch register for VGA.
by aandrejevic＠svn.reactos.org 10 Aug '13

10 Aug '13

Author: aandrejevic Date: Sat Aug 10 17:06:04 2013 New Revision: 59687 URL: http://svn.reactos.org/svn/reactos?rev=59687&view=rev Log: Synchronize with trunk to fix spec2def issue. [NTVDM] Implement write modes and latch register for VGA. Modified: branches/ntvdm/ (props changed) branches/ntvdm/dll/win32/samsrv/samsrv.h branches/ntvdm/dll/win32/samsrv/setup.c branches/ntvdm/drivers/hid/hidparse/ (props changed) branches/ntvdm/drivers/hid/hidusb/ (props changed) branches/ntvdm/drivers/usb/usbehci/ (props changed) branches/ntvdm/drivers/usb/usbhub/ (props changed) branches/ntvdm/drivers/usb/usbohci/ (props changed) branches/ntvdm/lib/drivers/libusb/common_interfaces.h (props changed) branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/hub_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.h (props changed) branches/ntvdm/lib/drivers/libusb/memory_manager.cpp (props changed) branches/ntvdm/lib/drivers/libusb/misc.cpp (props changed) branches/ntvdm/lib/drivers/libusb/purecall.cpp (props changed) branches/ntvdm/lib/drivers/libusb/usb_device.cpp (props changed) branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/tools/spec2def/spec2def.c Propchange: branches/ntvdm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -15,4 +15,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:59241-59683 +/trunk/reactos:59241-59686 Modified: branches/ntvdm/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.h… ============================================================================== --- branches/ntvdm/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Aug 10 17:06:04 2013 @@ -9,6 +9,7 @@ #include <stdio.h> #include <stdlib.h> +#include <limits.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H Modified: branches/ntvdm/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/setup.c?… ============================================================================== --- branches/ntvdm/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/samsrv/setup.c [iso-8859-1] Sat Aug 10 17:06:04 2013 @@ -577,7 +577,7 @@ FixedData.DomainModifiedCount.QuadPart = 0; FixedData.MaxPasswordAge.QuadPart = -(6LL * 7LL * 24LL * 60LL * 60LL * TICKS_PER_SECOND); /* 6 weeks */ FixedData.MinPasswordAge.QuadPart = 0; /* right now */ -// FixedData.ForceLogoff.QuadPart = // very far in the future aka never + FixedData.ForceLogoff.QuadPart = LLONG_MAX; /* very far in the future aka never */ FixedData.LockoutDuration.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ FixedData.LockoutObservationWindow.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ FixedData.ModifiedCountAtLastPromotion.QuadPart = 0; Propchange: branches/ntvdm/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -18,5 +18,5 @@ /branches/usb-bringup/drivers/hid/hidparse:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/drivers/hid/hidparse:55020-55543,55548-55554 /branches/wlan-bringup/drivers/hid/hidparse:54809-54998 -/trunk/reactos/drivers/hid/hidparse:59241-59683 +/trunk/reactos/drivers/hid/hidparse:59241-59686 /trunk/reactos/drivers/usb/hidparse:48236-51323 Propchange: branches/ntvdm/drivers/hid/hidusb/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -18,5 +18,5 @@ /branches/usb-bringup/drivers/hid/hidusb:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/drivers/hid/hidusb:55020-55543,55548-55554 /branches/wlan-bringup/drivers/hid/hidusb:54809-54998 -/trunk/reactos/drivers/hid/hidusb:59241-59683 +/trunk/reactos/drivers/hid/hidusb:59241-59686 /trunk/reactos/drivers/usb/hidusb:48236-51323 Propchange: branches/ntvdm/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998 -/trunk/reactos/drivers/usb/usbehci:59241-59683 +/trunk/reactos/drivers/usb/usbehci:59241-59686 Propchange: branches/ntvdm/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbhub:55524-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998 -/trunk/reactos/drivers/usb/usbhub:59241-59683 +/trunk/reactos/drivers/usb/usbhub:59241-59686 Propchange: branches/ntvdm/drivers/usb/usbohci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -19,4 +19,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbohci:55019-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbohci:54809-54998 /trunk/reactos/drivers/usb/usbehci_new:48236-51323 -/trunk/reactos/drivers/usb/usbohci:59241-59683 +/trunk/reactos/drivers/usb/usbohci:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/common_interfaces.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/interfaces.h:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/interfaces.h:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/interfaces.h:54809-54998 -/trunk/reactos/lib/drivers/libusb/common_interfaces.h:59241-59683 +/trunk/reactos/lib/drivers/libusb/common_interfaces.h:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/hcd_controller.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/hcd_controller.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/hub_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/hub_controller.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/hub_controller.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/libusb.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usbehci.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usbehci.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/libusb.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/libusb.cpp:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/libusb.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.h:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usbehci.h:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usbehci.h:54809-54998 -/trunk/reactos/lib/drivers/libusb/libusb.h:59241-59683 +/trunk/reactos/lib/drivers/libusb/libusb.h:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/memory_manager.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/memory_manager.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/memory_manager.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/memory_manager.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/memory_manager.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/memory_manager.cpp:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/misc.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/misc.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/misc.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/misc.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/misc.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/misc.cpp:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/purecall.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/purecall.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/purecall.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/purecall.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/purecall.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/purecall.cpp:59241-59686 Propchange: branches/ntvdm/lib/drivers/libusb/usb_device.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 10 17:06:04 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usb_device.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usb_device.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/usb_device.cpp:59241-59683 +/trunk/reactos/lib/drivers/libusb/usb_device.cpp:59241-59686 Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Aug 10 17:06:04 2013 @@ -13,8 +13,8 @@ ps2.c vga.c ntvdm.c - ntvdm.rc) -# ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def + ntvdm.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) add_executable(ntvdm ${SOURCE}) set_module_type(ntvdm win32cui UNICODE) Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Sat Aug 10 17:06:04 2013 @@ -19,6 +19,7 @@ static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; +static BYTE VgaLatchRegisters[VGA_NUM_BANKS] = {0, 0, 0, 0}; static BYTE VgaMiscRegister; static BYTE VgaSeqIndex = VGA_SEQ_RESET_REG; static BYTE VgaSeqRegisters[VGA_SEQ_MAX_REG]; @@ -117,6 +118,66 @@ return Offset; } +static inline BYTE VgaTranslateByteForWriting(BYTE Data, BYTE Plane) +{ + BYTE WriteMode = VgaGcRegisters[VGA_GC_MODE_REG] & 3; + BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 3; + BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 7; + BYTE BitMask = VgaGcRegisters[VGA_GC_BITMASK_REG]; + + if (WriteMode == 1) + { + /* In write mode 1 just return the latch register */ + return VgaLatchRegisters[Plane]; + } + + if (WriteMode != 2) + { + /* Write modes 0 and 3 rotate the data to the right first */ + Data = LOBYTE(((DWORD)Data >> RotateCount) | ((DWORD)Data << (8 - RotateCount))); + } + else + { + /* Write mode 2 expands the appropriate bit to all 8 bits */ + Data = (Data & (1 << Plane)) ? 0xFF : 0x00; + } + + if (WriteMode == 0) + { + /* + * In write mode 0, the enable set/reset register decides if the + * set/reset bit should be expanded to all 8 bits. + */ + if (VgaGcRegisters[VGA_GC_ENABLE_RESET_REG] & (1 << Plane)) + { + /* Copy the bit from the set/reset register to all 8 bits */ + Data = (VgaGcRegisters[VGA_GC_RESET_REG] & (1 << Plane)) ? 0xFF : 0x00; + } + } + + if (WriteMode != 3) + { + /* Write modes 0 and 2 then perform a logical operation on the data and latch */ + if (LogicalOperation == 1) Data &= VgaLatchRegisters[Plane]; + else if (LogicalOperation == 2) Data |= VgaLatchRegisters[Plane]; + else if (LogicalOperation == 3) Data ^= VgaLatchRegisters[Plane]; + } + else + { + /* For write mode 3, we AND the bitmask with the data, which is used as the new bitmask */ + BitMask &= Data; + + /* Then we expand the bit in the set/reset field */ + Data = (VgaGcRegisters[VGA_GC_RESET_REG] & (1 << Plane)) ? 0xFF : 0x00; + } + + /* Bits cleared in the bitmask are replaced with latch register bits */ + Data = (Data & BitMask) | (VgaLatchRegisters[Plane] & (~BitMask)); + + /* Return the byte */ + return Data; +} + static inline VOID VgaMarkForUpdate(SHORT Row, SHORT Column) { DPRINT("VgaMarkForUpdate: Row %d, Column %d\n", Row, Column); @@ -694,6 +755,12 @@ { VideoAddress = VgaTranslateReadAddress(Address + i); + /* Load the latch registers */ + VgaLatchRegisters[0] = VgaMemory[LOWORD(VideoAddress)]; + VgaLatchRegisters[1] = VgaMemory[VGA_BANK_SIZE + LOWORD(VideoAddress)]; + VgaLatchRegisters[2] = VgaMemory[(2 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; + VgaLatchRegisters[3] = VgaMemory[(3 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; + /* Copy the value to the buffer */ Buffer[i] = VgaMemory[VideoAddress]; } @@ -745,7 +812,7 @@ } /* Copy the value to the VGA memory */ - VgaMemory[VideoAddress + j * VGA_BANK_SIZE] = Buffer[i]; + VgaMemory[VideoAddress + j * VGA_BANK_SIZE] = VgaTranslateByteForWriting(Buffer[i], j); } } } Modified: branches/ntvdm/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/spec2def/spec2def.c… ============================================================================== --- branches/ntvdm/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/ntvdm/tools/spec2def/spec2def.c [iso-8859-1] Sat Aug 10 17:06:04 2013 @@ -306,7 +306,7 @@ { fprintf(file, "; File generated automatically, do not edit!\n\n" - "LIBRARY %s\n\n" + "NAME %s\n\n" "EXPORTS\n", libname); }

1 0

[hbelusca] 59686: [SPEC2DEF] In GCC builds, LD sucks, and therefore, use NAME instead of LIBRARY to prevent that GNU crap from marking executables as dlls just because they export stuff, which is n...
by hbelusca＠svn.reactos.org 10 Aug '13

10 Aug '13

Author: hbelusca Date: Sat Aug 10 15:00:50 2013 New Revision: 59686 URL: http://svn.reactos.org/svn/reactos?rev=59686&view=rev Log: [SPEC2DEF] In GCC builds, LD sucks, and therefore, use NAME instead of LIBRARY to prevent that GNU crap from marking executables as dlls just because they export stuff, which is needed by both ntoskrnl and ntvdm. Tested and approved by Aleksandar Aandrejevic a.k.a. [TheFlash], gigaherz and Amine Khaldi. See: http://msdn.microsoft.com/en-us/library/28d6s79h.aspx - "Module-Definition (.Def) Files" http://msdn.microsoft.com/en-us/library/30fw19zw.aspx - For a description of the LIBRARY keyword http://msdn.microsoft.com/en-us/library/03b3wfkt.aspx - For a description of the NAME keyword http://sourceware.org/binutils/docs-2.16/binutils/def-file-format.html - "The format of the dlltool .def file" (GCC) for more information. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat Aug 10 15:00:50 2013 @@ -306,7 +306,7 @@ { fprintf(file, "; File generated automatically, do not edit!\n\n" - "LIBRARY %s\n\n" + "NAME %s\n\n" "EXPORTS\n", libname); }

1 0

[ekohl] 59685: [SAMSRV] Initialize default domain ForceLogoff time.
by ekohl＠svn.reactos.org 10 Aug '13

10 Aug '13

Author: ekohl Date: Sat Aug 10 12:53:29 2013 New Revision: 59685 URL: http://svn.reactos.org/svn/reactos?rev=59685&view=rev Log: [SAMSRV] Initialize default domain ForceLogoff time. Modified: trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Aug 10 12:53:29 2013 @@ -9,6 +9,7 @@ #include <stdio.h> #include <stdlib.h> +#include <limits.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Aug 10 12:53:29 2013 @@ -577,7 +577,7 @@ FixedData.DomainModifiedCount.QuadPart = 0; FixedData.MaxPasswordAge.QuadPart = -(6LL * 7LL * 24LL * 60LL * 60LL * TICKS_PER_SECOND); /* 6 weeks */ FixedData.MinPasswordAge.QuadPart = 0; /* right now */ -// FixedData.ForceLogoff.QuadPart = // very far in the future aka never + FixedData.ForceLogoff.QuadPart = LLONG_MAX; /* very far in the future aka never */ FixedData.LockoutDuration.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ FixedData.LockoutObservationWindow.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ FixedData.ModifiedCountAtLastPromotion.QuadPart = 0;

1 0

[aandrejevic] 59684: [NTVDM] Synchronize with trunk again to fix important bugs in the build system. Implement register control functions which should be exported (Adapted from a patch by Hermes Be...
by aandrejevic＠svn.reactos.org 09 Aug '13

09 Aug '13

Author: aandrejevic Date: Fri Aug 9 23:52:08 2013 New Revision: 59684 URL: http://svn.reactos.org/svn/reactos?rev=59684&view=rev Log: [NTVDM] Synchronize with trunk again to fix important bugs in the build system. Implement register control functions which should be exported (Adapted from a patch by Hermes Belusca-Maito). The actual export is temporarily disabled because a bug in the build system compiles ntvdm as a DLL instead of an EXE. Added: branches/ntvdm/subsystems/ntvdm/ntvdm.spec (with props) branches/ntvdm/subsystems/ntvdm/registers.c (with props) branches/ntvdm/subsystems/ntvdm/registers.h (with props) Modified: branches/ntvdm/ (props changed) branches/ntvdm/cmake/CMakeMacros.cmake branches/ntvdm/drivers/hid/hidparse/ (props changed) branches/ntvdm/drivers/hid/hidusb/ (props changed) branches/ntvdm/drivers/usb/usbehci/ (props changed) branches/ntvdm/drivers/usb/usbhub/ (props changed) branches/ntvdm/drivers/usb/usbohci/ (props changed) branches/ntvdm/lib/drivers/libusb/common_interfaces.h (props changed) branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/hub_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.h (props changed) branches/ntvdm/lib/drivers/libusb/memory_manager.cpp (props changed) branches/ntvdm/lib/drivers/libusb/misc.cpp (props changed) branches/ntvdm/lib/drivers/libusb/purecall.cpp (props changed) branches/ntvdm/lib/drivers/libusb/usb_device.cpp (props changed) branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Propchange: branches/ntvdm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -15,4 +15,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:59241-59678 +/trunk/reactos:59241-59683 Modified: branches/ntvdm/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/CMakeMacros.cmake?r… ============================================================================== --- branches/ntvdm/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/ntvdm/cmake/CMakeMacros.cmake [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -430,7 +430,13 @@ elseif(${TYPE} STREQUAL nativecui) set(__entrypoint NtProcessStartup) set(__entrystack 4) - elseif((${TYPE} STREQUAL win32gui) OR (${TYPE} STREQUAL win32cui)) + elseif(${TYPE} STREQUAL win32cui) + if(__module_UNICODE) + set(__entrypoint wmainCRTStartup) + else() + set(__entrypoint mainCRTStartup) + endif() + elseif(${TYPE} STREQUAL win32gui) if(__module_UNICODE) set(__entrypoint wWinMainCRTStartup) else() Propchange: branches/ntvdm/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -18,5 +18,5 @@ /branches/usb-bringup/drivers/hid/hidparse:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/drivers/hid/hidparse:55020-55543,55548-55554 /branches/wlan-bringup/drivers/hid/hidparse:54809-54998 -/trunk/reactos/drivers/hid/hidparse:59241-59678 +/trunk/reactos/drivers/hid/hidparse:59241-59683 /trunk/reactos/drivers/usb/hidparse:48236-51323 Propchange: branches/ntvdm/drivers/hid/hidusb/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -18,5 +18,5 @@ /branches/usb-bringup/drivers/hid/hidusb:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/drivers/hid/hidusb:55020-55543,55548-55554 /branches/wlan-bringup/drivers/hid/hidusb:54809-54998 -/trunk/reactos/drivers/hid/hidusb:59241-59678 +/trunk/reactos/drivers/hid/hidusb:59241-59683 /trunk/reactos/drivers/usb/hidusb:48236-51323 Propchange: branches/ntvdm/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998 -/trunk/reactos/drivers/usb/usbehci:59241-59678 +/trunk/reactos/drivers/usb/usbehci:59241-59683 Propchange: branches/ntvdm/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbhub:55524-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998 -/trunk/reactos/drivers/usb/usbhub:59241-59678 +/trunk/reactos/drivers/usb/usbhub:59241-59683 Propchange: branches/ntvdm/drivers/usb/usbohci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -19,4 +19,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbohci:55019-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbohci:54809-54998 /trunk/reactos/drivers/usb/usbehci_new:48236-51323 -/trunk/reactos/drivers/usb/usbohci:59241-59678 +/trunk/reactos/drivers/usb/usbohci:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/common_interfaces.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/interfaces.h:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/interfaces.h:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/interfaces.h:54809-54998 -/trunk/reactos/lib/drivers/libusb/common_interfaces.h:59241-59678 +/trunk/reactos/lib/drivers/libusb/common_interfaces.h:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/hcd_controller.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/hcd_controller.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/hub_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/hub_controller.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/hub_controller.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/libusb.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usbehci.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usbehci.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/libusb.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/libusb.cpp:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/libusb.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.h:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usbehci.h:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usbehci.h:54809-54998 -/trunk/reactos/lib/drivers/libusb/libusb.h:59241-59678 +/trunk/reactos/lib/drivers/libusb/libusb.h:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/memory_manager.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/memory_manager.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/memory_manager.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/memory_manager.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/memory_manager.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/memory_manager.cpp:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/misc.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/misc.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/misc.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/misc.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/misc.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/misc.cpp:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/purecall.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/purecall.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/purecall.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/purecall.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/purecall.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/purecall.cpp:59241-59683 Propchange: branches/ntvdm/lib/drivers/libusb/usb_device.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 9 23:52:08 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usb_device.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usb_device.cpp:54809-54998 -/trunk/reactos/lib/drivers/libusb/usb_device.cpp:59241-59678 +/trunk/reactos/lib/drivers/libusb/usb_device.cpp:59241-59683 Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -1,16 +1,20 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/softx86) + +spec2def(ntvdm.exe ntvdm.spec) list(APPEND SOURCE bios.c dos.c emulator.c pic.c + registers.c timer.c ps2.c vga.c ntvdm.c ntvdm.rc) +# ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def add_executable(ntvdm ${SOURCE}) set_module_type(ntvdm win32cui UNICODE) Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -416,7 +416,7 @@ return TRUE; } -VOID EmulatorSetStack(WORD Segment, WORD Offset) +VOID EmulatorSetStack(WORD Segment, DWORD Offset) { #ifndef NEW_EMULATOR /* Call the softx86 API */ @@ -479,6 +479,15 @@ #endif } +ULONG EmulatorGetProgramCounter(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->reg_ip; +#else + return EmulatorContext.InstructionPointer.Long; +#endif +} + VOID EmulatorSetRegister(ULONG Register, ULONG Value) { #ifndef NEW_EMULATOR @@ -524,9 +533,9 @@ VOID EmulatorStep(VOID) { +#ifndef NEW_EMULATOR LPWORD Instruction; -#ifndef NEW_EMULATOR /* Print the current position - useful for debugging */ DPRINT("Executing at CS:IP = %04X:%04X\n", EmulatorGetRegister(EMULATOR_REG_CS), Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -168,14 +168,22 @@ typedef VOID (*EMULATOR_OPCODE_HANDLER)(PEMULATOR_CONTEXT Context, BYTE Opcode); +#ifndef NEW_EMULATOR +extern softx86_ctx EmulatorContext; +extern softx87_ctx FpuEmulatorContext; +#else +extern EMULATOR_CONTEXT EmulatorContext; +#endif + /* FUNCTIONS ******************************************************************/ BOOLEAN EmulatorInitialize(); -VOID EmulatorSetStack(WORD Segment, WORD Offset); +VOID EmulatorSetStack(WORD Segment, DWORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number); VOID EmulatorExternalInterrupt(BYTE Number); ULONG EmulatorGetRegister(ULONG Register); +ULONG EmulatorGetProgramCounter(VOID); VOID EmulatorSetRegister(ULONG Register, ULONG Value); BOOLEAN EmulatorGetFlag(ULONG Flag); VOID EmulatorSetFlag(ULONG Flag); Added: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.spec (added) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -0,0 +1,88 @@ +@ cdecl getAF() +@ cdecl getAH() +@ cdecl getAL() +@ cdecl getAX() +@ cdecl getBH() +@ cdecl getBL() +@ cdecl getBP() +@ cdecl getBX() +@ cdecl getCF() +@ cdecl getCH() +@ cdecl getCL() +@ cdecl getCS() +@ cdecl getCX() +@ cdecl getDF() +@ cdecl getDH() +@ cdecl getDI() +@ cdecl getDL() +@ cdecl getDS() +@ cdecl getDX() +@ cdecl getEAX() +@ cdecl getEBP() +@ cdecl getEBX() +@ cdecl getECX() +@ cdecl getEDI() +@ cdecl getEDX() +; @ cdecl getEFLAGS() +@ cdecl getEIP() +@ cdecl getES() +@ cdecl getESI() +@ cdecl getESP() +@ cdecl getFS() +@ cdecl getGS() +@ cdecl getIF() +; @ cdecl getIntelRegistersPointer() +@ cdecl getIP() +@ cdecl getMSW() +@ cdecl getOF() +@ cdecl getPF() +@ cdecl getSF() +@ cdecl getSI() +@ cdecl getSP() +@ cdecl getSS() +@ cdecl getZF() + + + +@ cdecl setAF(long) +@ cdecl setAH(long) +@ cdecl setAL(long) +@ cdecl setAX(long) +@ cdecl setBH(long) +@ cdecl setBL(long) +@ cdecl setBP(long) +@ cdecl setBX(long) +@ cdecl setCF(long) +@ cdecl setCH(long) +@ cdecl setCL(long) +@ cdecl setCS(long) +@ cdecl setCX(long) +@ cdecl setDF(long) +@ cdecl setDH(long) +@ cdecl setDI(long) +@ cdecl setDL(long) +@ cdecl setDS(long) +@ cdecl setDX(long) +@ cdecl setEAX(long) +@ cdecl setEBP(long) +@ cdecl setEBX(long) +@ cdecl setECX(long) +@ cdecl setEDI(long) +@ cdecl setEDX(long) +; @ cdecl setEFLAGS(long) +@ cdecl setEIP(long) +@ cdecl setES(long) +@ cdecl setESI(long) +@ cdecl setESP(long) +@ cdecl setFS(long) +@ cdecl setGS(long) +@ cdecl setIF(long) +@ cdecl setIP(long) +@ cdecl setMSW(long) +@ cdecl setOF(long) +@ cdecl setPF(long) +@ cdecl setSF(long) +@ cdecl setSI(long) +@ cdecl setSP(long) +@ cdecl setSS(long) +@ cdecl setZF(long) Propchange: branches/ntvdm/subsystems/ntvdm/ntvdm.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c (added) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -0,0 +1,811 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: registers.c + * PURPOSE: Exported functions for manipulating registers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" + +/* PUBLIC FUNCTIONS ***********************************************************/ + +ULONG +CDECL +getEAX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_AX].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_AX].Long; +#endif +} + +VOID +CDECL +setEAX(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_AX].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_AX].Long = Value; +#endif +} + +USHORT +CDECL +getAX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_AX].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_AX].LowWord; +#endif +} + +VOID +CDECL +setAX(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_AX].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_AX].LowWord = Value; +#endif +} + +UCHAR +CDECL +getAH(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.hi; +#else + return EmulatorContext.Registers[EMULATOR_REG_AX].HighByte; +#endif +} + +VOID +CDECL +setAH(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.hi = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_AX].HighByte = Value; +#endif +} + +UCHAR +CDECL +getAL(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_AX].LowByte; +#endif +} + +VOID +CDECL +setAL(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_AX].LowByte = Value; +#endif +} + +ULONG +CDECL +getEBX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_BX].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_BX].Long; +#endif +} + +VOID +CDECL +setEBX(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_BX].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_BX].Long = Value; +#endif +} + +USHORT +CDECL +getBX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_BX].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_BX].LowWord; +#endif +} + +VOID +CDECL +setBX(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_BX].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_BX].LowWord = Value; +#endif +} + +UCHAR +CDECL +getBH(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.hi; +#else + return EmulatorContext.Registers[EMULATOR_REG_BX].HighByte; +#endif +} + +VOID +CDECL +setBH(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.hi = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_BX].HighByte = Value; +#endif +} + +UCHAR +CDECL +getBL(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_BX].LowByte; +#endif +} + +VOID +CDECL +setBL(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_BX].LowByte = Value; +#endif +} + + + +ULONG +CDECL +getECX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_CX].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_CX].Long; +#endif +} + +VOID +CDECL +setECX(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_CX].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_CX].Long = Value; +#endif +} + +USHORT +CDECL +getCX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_CX].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_CX].LowWord; +#endif +} + +VOID +CDECL +setCX(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_CX].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_CX].LowWord = Value; +#endif +} + +UCHAR +CDECL +getCH(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.hi; +#else + return EmulatorContext.Registers[EMULATOR_REG_CX].HighByte; +#endif +} + +VOID +CDECL +setCH(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.hi = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_CX].HighByte = Value; +#endif +} + +UCHAR +CDECL +getCL(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_CX].LowByte; +#endif +} + +VOID +CDECL +setCL(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_CX].LowByte = Value; +#endif +} + + + +ULONG +CDECL +getEDX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_DX].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_DX].Long; +#endif +} + +VOID +CDECL +setEDX(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_DX].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_DX].Long = Value; +#endif +} + +USHORT +CDECL +getDX(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_DX].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_DX].LowWord; +#endif +} + +VOID +CDECL +setDX(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_DX].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_DX].LowWord = Value; +#endif +} + +UCHAR +CDECL +getDH(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.hi; +#else + return EmulatorContext.Registers[EMULATOR_REG_DX].HighByte; +#endif +} + +VOID +CDECL +setDH(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.hi = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_DX].HighByte = Value; +#endif +} + +UCHAR +CDECL +getDL(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_DX].LowByte; +#endif +} + +VOID +CDECL +setDL(UCHAR Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_DX].LowByte = Value; +#endif +} + + + +ULONG +CDECL +getESP(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_SP); +} + +VOID +CDECL +setESP(ULONG Value) +{ + EmulatorSetStack(EmulatorGetRegister(EMULATOR_REG_SS), Value); +} + +USHORT +CDECL +getSP(VOID) +{ + return LOWORD(EmulatorGetRegister(EMULATOR_REG_SP)); +} + +VOID +CDECL +setSP(USHORT Value) +{ + EmulatorSetStack(EmulatorGetRegister(EMULATOR_REG_SS), Value); +} + + + +ULONG +CDECL +getEBP(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_BP].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_BP].Long; +#endif +} + +VOID +CDECL +setEBP(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_BP].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_BP].Long = Value; +#endif +} + +USHORT +CDECL +getBP(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_BP].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_BP].LowWord; +#endif +} + +VOID +CDECL +setBP(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_BP].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_BP].LowWord = Value; +#endif +} + + + +ULONG +CDECL +getESI(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_SI].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_SI].Long; +#endif +} + +VOID +CDECL +setESI(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_SI].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_SI].Long = Value; +#endif +} + +USHORT +CDECL +getSI(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_SI].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_SI].LowWord; +#endif +} + +VOID +CDECL +setSI(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_SI].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_SI].LowWord = Value; +#endif +} + + + +ULONG +CDECL +getEDI(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_DI].val; +#else + return EmulatorContext.Registers[EMULATOR_REG_DI].Long; +#endif +} + +VOID +CDECL +setEDI(ULONG Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_DI].val = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_DI].Long = Value; +#endif +} + +USHORT +CDECL +getDI(VOID) +{ +#ifndef NEW_EMULATOR + return EmulatorContext.state->general_reg[EMULATOR_REG_DI].w.lo; +#else + return EmulatorContext.Registers[EMULATOR_REG_DI].LowWord; +#endif +} + +VOID +CDECL +setDI(USHORT Value) +{ +#ifndef NEW_EMULATOR + EmulatorContext.state->general_reg[EMULATOR_REG_DI].w.lo = Value; +#else + EmulatorContext.Registers[EMULATOR_REG_DI].LowWord = Value; +#endif +} + + + +ULONG +CDECL +getEIP(VOID) +{ + return EmulatorGetProgramCounter(); +} + +VOID +CDECL +setEIP(ULONG Value) +{ + EmulatorExecute(EmulatorGetRegister(EMULATOR_REG_CS), Value); +} + +USHORT +CDECL +getIP(VOID) +{ + return LOWORD(EmulatorGetProgramCounter()); +} + +VOID +CDECL +setIP(USHORT Value) +{ + EmulatorExecute(EmulatorGetRegister(EMULATOR_REG_CS), Value); +} + + + +USHORT +CDECL +getCS(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_CS); +} + +VOID +CDECL +setCS(USHORT Value) +{ + EmulatorSetRegister(EMULATOR_REG_CS, Value); +} + +USHORT +CDECL +getSS(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_SS); +} + +VOID +CDECL +setSS(USHORT Value) +{ + EmulatorSetRegister(EMULATOR_REG_SS, Value); +} + +USHORT +CDECL +getDS(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_DS); +} + +VOID +CDECL +setDS(USHORT Value) +{ + EmulatorSetRegister(EMULATOR_REG_DS, Value); +} + +USHORT +CDECL +getES(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_ES); +} + +VOID +CDECL +setES(USHORT Value) +{ + EmulatorSetRegister(EMULATOR_REG_ES, Value); +} + +USHORT +CDECL +getFS(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_FS); +} + +VOID +CDECL +setFS(USHORT Value) +{ + EmulatorSetRegister(EMULATOR_REG_FS, Value); +} + +USHORT +CDECL +getGS(VOID) +{ + return EmulatorGetRegister(EMULATOR_REG_GS); +} + +VOID +CDECL +setGS(USHORT Value) +{ + EmulatorSetRegister(EMULATOR_REG_GS, Value); +} + + + +ULONG +CDECL +getCF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_CF); +} + +VOID +CDECL +setCF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_CF); + else + EmulatorClearFlag(EMULATOR_FLAG_CF); +} + +ULONG +CDECL +getPF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_PF); +} + +VOID +CDECL +setPF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_PF); + else + EmulatorClearFlag(EMULATOR_FLAG_PF); +} + +ULONG +CDECL +getAF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_AF); +} + +VOID +CDECL +setAF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_AF); + else + EmulatorClearFlag(EMULATOR_FLAG_AF); +} + +ULONG +CDECL +getZF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_ZF); +} + +VOID +CDECL +setZF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_ZF); + else + EmulatorClearFlag(EMULATOR_FLAG_ZF); +} + +ULONG +CDECL +getSF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_SF); +} + +VOID +CDECL +setSF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_SF); + else + EmulatorClearFlag(EMULATOR_FLAG_SF); +} + +ULONG +CDECL +getIF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_IF); +} + +VOID +CDECL +setIF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_IF); + else + EmulatorClearFlag(EMULATOR_FLAG_IF); +} + +ULONG +CDECL +getDF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_DF); +} + +VOID +CDECL +setDF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_DF); + else + EmulatorClearFlag(EMULATOR_FLAG_DF); +} + +ULONG +CDECL +getOF(VOID) +{ + return EmulatorGetFlag(EMULATOR_FLAG_OF); +} + +VOID +CDECL +setOF(ULONG Flag) +{ + if (Flag & 1) + EmulatorSetFlag(EMULATOR_FLAG_OF); + else + EmulatorClearFlag(EMULATOR_FLAG_OF); +} + + + +USHORT +CDECL +getMSW(VOID) +{ + return 0; // UNIMPLEMENTED +} + +VOID +CDECL +setMSW(USHORT Value) +{ + // UNIMPLEMENTED +} + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/registers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.h (added) +++ branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] Fri Aug 9 23:52:08 2013 @@ -0,0 +1,112 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: registers.c + * PURPOSE: Exported functions for manipulating registers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _REGISTERS_H_ +#define _REGISTERS_H_ + +/* INCLUDES *******************************************************************/ + +ULONG getEAX(VOID); +VOID setEAX(ULONG); +USHORT getAX(VOID); +VOID setAX(USHORT); +UCHAR getAH(VOID); +VOID setAH(UCHAR); +UCHAR getAL(VOID); +VOID setAL(UCHAR); + +ULONG getEBX(VOID); +VOID setEBX(ULONG); +USHORT getBX(VOID); +VOID setBX(USHORT); +UCHAR getBH(VOID); +VOID setBH(UCHAR); +UCHAR getBL(VOID); +VOID setBL(UCHAR); + +ULONG getECX(VOID); +VOID setECX(ULONG); +USHORT getCX(VOID); +VOID setCX(USHORT); +UCHAR getCH(VOID); +VOID setCH(UCHAR); +UCHAR getCL(VOID); +VOID setCL(UCHAR); + +ULONG getEDX(VOID); +VOID setEDX(ULONG); +USHORT getDX(VOID); +VOID setDX(USHORT); +UCHAR getDH(VOID); +VOID setDH(UCHAR); +UCHAR getDL(VOID); +VOID setDL(UCHAR); + + + +ULONG getESP(VOID); +VOID setESP(ULONG); +USHORT getSP(VOID); +VOID setSP(USHORT); + +ULONG getEBP(VOID); +VOID setEBP(ULONG); +USHORT getBP(VOID); +VOID setBP(USHORT); + +ULONG getESI(VOID); +VOID setESI(ULONG); +USHORT getSI(VOID); +VOID setSI(USHORT); + +ULONG getEDI(VOID); +VOID setEDI(ULONG); +USHORT getDI(VOID); +VOID setDI(USHORT); + +ULONG getEIP(VOID); +VOID setEIP(ULONG); +USHORT getIP(VOID); +VOID setIP(USHORT); + +USHORT getCS(VOID); +VOID setCS(USHORT); +USHORT getSS(VOID); +VOID setSS(USHORT); +USHORT getDS(VOID); +VOID setDS(USHORT); +USHORT getES(VOID); +VOID setES(USHORT); +USHORT getFS(VOID); +VOID setFS(USHORT); +USHORT getGS(VOID); +VOID setGS(USHORT); + +ULONG getCF(VOID); +VOID setCF(ULONG); +ULONG getPF(VOID); +VOID setPF(ULONG); +ULONG getAF(VOID); +VOID setAF(ULONG); +ULONG getZF(VOID); +VOID setZF(ULONG); +ULONG getSF(VOID); +VOID setSF(ULONG); +ULONG getIF(VOID); +VOID setIF(ULONG); +ULONG getDF(VOID); +VOID setDF(ULONG); +ULONG getOF(VOID); +VOID setOF(ULONG); + +USHORT getMSW(VOID); +VOID setMSW(USHORT); + +#endif // _REGISTERS_H_ + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/registers.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 59683: [CMAKE] Fix console apps entry-point (problem since revision r53553).
by hbelusca＠svn.reactos.org 09 Aug '13

09 Aug '13

Author: hbelusca Date: Fri Aug 9 22:23:27 2013 New Revision: 59683 URL: http://svn.reactos.org/svn/reactos?rev=59683&view=rev Log: [CMAKE] Fix console apps entry-point (problem since revision r53553). Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Aug 9 22:23:27 2013 @@ -430,7 +430,13 @@ elseif(${TYPE} STREQUAL nativecui) set(__entrypoint NtProcessStartup) set(__entrystack 4) - elseif((${TYPE} STREQUAL win32gui) OR (${TYPE} STREQUAL win32cui)) + elseif(${TYPE} STREQUAL win32cui) + if(__module_UNICODE) + set(__entrypoint wmainCRTStartup) + else() + set(__entrypoint mainCRTStartup) + endif() + elseif(${TYPE} STREQUAL win32gui) if(__module_UNICODE) set(__entrypoint wWinMainCRTStartup) else()

1 0

[hbelusca] 59682: Fix formatting, no code changes.
by hbelusca＠svn.reactos.org 09 Aug '13

09 Aug '13

Author: hbelusca Date: Fri Aug 9 18:55:35 2013 New Revision: 59682 URL: http://svn.reactos.org/svn/reactos?rev=59682&view=rev Log: Fix formatting, no code changes. Modified: branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/pic.h branches/ntvdm/subsystems/ntvdm/ps2.h branches/ntvdm/subsystems/ntvdm/timer.h branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -120,4 +120,6 @@ BYTE FillAttribute ); -#endif +#endif // _BIOS_H_ + +/* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -133,7 +133,6 @@ VOID DosBreakInterrupt(LPWORD Stack); BOOLEAN DosInitialize(VOID); -#endif +#endif // _DOS_H_ /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -184,7 +184,6 @@ VOID EmulatorCleanup(); VOID EmulatorSetA20(BOOLEAN Enabled); -#endif +#endif // _EMULATOR_H_ /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -35,6 +35,6 @@ VOID DisplayMessage(LPCWSTR Format, ...); -#endif +#endif // _NTVDM_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -52,6 +52,6 @@ VOID PicWriteData(BYTE Port, BYTE Value); VOID PicInterruptRequest(BYTE Number); -#endif +#endif // _PIC_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -30,4 +30,6 @@ VOID KeyboardWriteData(BYTE Data); VOID CheckForInputEvents(); -#endif +#endif // _PS2_H_ + +/* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -50,7 +50,6 @@ VOID PitWriteData(BYTE Channel, BYTE Value); VOID PitDecrementCount(); -#endif +#endif // _TIMER_H_ /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -195,6 +195,6 @@ VOID VgaWritePort(WORD Port, BYTE Data); VOID VgaInitialize(HANDLE TextHandle); -#endif +#endif // _VGA_H_ /* EOF */

1 0

[hbelusca] 59681: [NTVDM] Simplify code.
by hbelusca＠svn.reactos.org 09 Aug '13

09 Aug '13

Author: hbelusca Date: Fri Aug 9 14:01:43 2013 New Revision: 59681 URL: http://svn.reactos.org/svn/reactos?rev=59681&view=rev Log: [NTVDM] Simplify code. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Aug 9 14:01:43 2013 @@ -569,7 +569,7 @@ COORD VgaGetDisplayResolution(VOID) { COORD Resolution; - BYTE TextSize = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); /* The low 8 bits are in the display registers */ Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; @@ -597,15 +597,10 @@ /* The horizontal resolution is halved in 8-bit mode */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) Resolution.X /= 2; - - /* Divide the vertical resolution by the maximum scan line */ - Resolution.Y /= ((DWORD)VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F) + 1; - } - else - { - /* Divide the number of scanlines by the font size */ - Resolution.Y /= TextSize; - } + } + + /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ + Resolution.Y /= MaximumScanLine; /* Return the resolution */ return Resolution;

1 0

[aandrejevic] 59680: Fix one file that wasn't merged correctly.
by aandrejevic＠svn.reactos.org 09 Aug '13

09 Aug '13

Author: aandrejevic Date: Fri Aug 9 13:33:17 2013 New Revision: 59680 URL: http://svn.reactos.org/svn/reactos?rev=59680&view=rev Log: Fix one file that wasn't merged correctly. Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] Fri Aug 9 13:33:17 2013 @@ -49,7 +49,6 @@ RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle); #define CMD_STRING L"cmd /c " -#define NTVDM_STRING L"\\ntvdm.exe" /* FUNCTIONS ****************************************************************/ @@ -2327,7 +2326,6 @@ ANSI_STRING AnsiEnv; UNICODE_STRING UnicodeEnv, PathName; BOOLEAN SearchRetry, QuotesNeeded, CmdLineIsAppName, HasQuotes; - WCHAR VdmPath[MAX_PATH]; // // Variables used for Fusion/SxS (Side-by-Side Assemblies)

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