Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 64363: [Win32k] - Process hardware keyboard and mouse buttons before mouse move messages. Should fix CORE-7797.
by jimtabor＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: jimtabor Date: Sun Sep 28 11:42:24 2014 New Revision: 64363 URL: http://svn.reactos.org/svn/reactos?rev=64363&view=rev Log: [Win32k] - Process hardware keyboard and mouse buttons before mouse move messages. Should fix CORE-7797. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sun Sep 28 11:42:24 2014 @@ -852,17 +852,6 @@ } /* Check for hardware events. */ - if ((ProcessMask & QS_MOUSE) && - co_MsqPeekMouseMove( pti, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) - { - return TRUE; - } - if ((ProcessMask & QS_INPUT) && co_MsqPeekHardwareMessage( pti, RemoveMessages, @@ -871,6 +860,17 @@ MsgFilterMax, ProcessMask, Msg)) + { + return TRUE; + } + + if ((ProcessMask & QS_MOUSE) && + co_MsqPeekMouseMove( pti, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg )) { return TRUE; } @@ -1198,7 +1198,7 @@ Window = UserGetWindowObject(Wnd); if ( !Window ) { - ERR("UserPostMessage: Invalid handle 0x%p!\n",Wnd); + ERR("UserPostMessage: Invalid handle 0x%p Msg %d!\n",Wnd,Msg); return FALSE; }

1 0

[akhaldi] 64362: [MSTSC] * Partial sync with rdesktop-ce to fix Windows 2008 R2 server login. CORE-8561 #resolve #comment Should be fixed in r64362. Please retest.
by akhaldi＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: akhaldi Date: Sun Sep 28 11:18:16 2014 New Revision: 64362 URL: http://svn.reactos.org/svn/reactos?rev=64362&view=rev Log: [MSTSC] * Partial sync with rdesktop-ce to fix Windows 2008 R2 server login. CORE-8561 #resolve #comment Should be fixed in r64362. Please retest. Modified: trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/secure.c Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/constants.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/constants.h [iso-8859-1] Sun Sep 28 11:18:16 2014 @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Miscellaneous protocol constants Copyright (C) Matthew Chapman 1999-2005 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* TCP port for Remote Desktop Protocol */ @@ -60,10 +60,11 @@ #define MCS_USERCHANNEL_BASE 1001 /* RDP secure transport constants */ -#define SEC_RANDOM_SIZE 32 -#define SEC_MODULUS_SIZE 64 -#define SEC_PADDING_SIZE 8 -#define SEC_EXPONENT_SIZE 4 +#define SEC_RANDOM_SIZE 32 +#define SEC_MODULUS_SIZE 64 +#define SEC_MAX_MODULUS_SIZE 256 +#define SEC_PADDING_SIZE 8 +#define SEC_EXPONENT_SIZE 4 #define SEC_CLIENT_RANDOM 0x0001 #define SEC_ENCRYPT 0x0008 Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] Sun Sep 28 11:18:16 2014 @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "precomp.h" @@ -56,7 +56,7 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len, char* mod, int mod_len, char* exp, int exp_len); -extern char g_hostname[]; +extern char g_hostname[16]; extern int g_width; extern int g_height; extern unsigned int g_keylayout; @@ -77,13 +77,14 @@ static void * rc4_encrypt_key = 0; //static RSA *server_public_key; static void * server_public_key; +static uint32 server_public_key_len; static uint8 sec_sign_key[16]; static uint8 sec_decrypt_key[16]; static uint8 sec_encrypt_key[16]; static uint8 sec_decrypt_update_key[16]; static uint8 sec_encrypt_update_key[16]; -static uint8 sec_crypted_random[SEC_MODULUS_SIZE]; +static uint8 sec_crypted_random[SEC_MAX_MODULUS_SIZE]; uint16 g_server_rdp_version = 0; @@ -263,7 +264,7 @@ ssl_md5_transform(md5, (char *)pad_92, 48); ssl_md5_transform(md5, (char *)shasig, 20); ssl_md5_complete(md5, (char *)md5sig); - ssl_md5_info_delete(md5); + ssl_md5_info_delete(md5); memcpy(signature, md5sig, siglen); } @@ -347,16 +348,32 @@ /* Perform an RSA public key encryption operation */ static void -sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent) +//sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent) +sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, uint8 * exponent) { ssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4); +/* +ssl_mod_exp(out, 64, in, 32, modulus, 64, exponent, 4); + +ssl_mod_exp(char* out, int out_len, char* in, int in_len, + char* mod, int mod_len, char* exp, int exp_len) + +e = (DIGIT_T*)l_exp; +x = (DIGIT_T*)l_in; +y = (DIGIT_T*)l_out; +m = (DIGIT_T*)l_mod; + +*/ + + //BN_CTX *ctx; + /* BN_CTX *ctx; BIGNUM mod, exp, x, y; - uint8 inr[SEC_MODULUS_SIZE]; + uint8 inr[SEC_MAX_MODULUS_SIZE]; int outlen; - reverse(modulus, SEC_MODULUS_SIZE); + reverse(modulus, modulus_size); reverse(exponent, SEC_EXPONENT_SIZE); memcpy(inr, in, len); reverse(inr, len); @@ -367,14 +384,14 @@ BN_init(&x); BN_init(&y); - BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod); + BN_bin2bn(modulus, modulus_size, &mod); BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); BN_bin2bn(inr, len, &x); BN_mod_exp(&y, &x, &exp, &mod, ctx); outlen = BN_bn2bin(&y, out); reverse(out, outlen); - if (outlen < SEC_MODULUS_SIZE) - memset(out + outlen, 0, SEC_MODULUS_SIZE - outlen); + if (outlen < modulus_size) + memset(out + outlen, 0, modulus_size - outlen); BN_free(&y); BN_clear_free(&x); @@ -440,14 +457,14 @@ static void sec_establish_key(void) { - uint32 length = SEC_MODULUS_SIZE + SEC_PADDING_SIZE; + uint32 length = server_public_key_len + SEC_PADDING_SIZE; uint32 flags = SEC_CLIENT_RANDOM; STREAM s; - s = sec_init(flags, 76); + s = sec_init(flags, length+4); out_uint32_le(s, length); - out_uint8p(s, sec_crypted_random, SEC_MODULUS_SIZE); + out_uint8p(s, sec_crypted_random, server_public_key_len); out_uint8s(s, SEC_PADDING_SIZE); s_mark_end(s); @@ -559,16 +576,18 @@ } in_uint32_le(s, modulus_len); - if (modulus_len != SEC_MODULUS_SIZE + SEC_PADDING_SIZE) - { - error("modulus len 0x%x\n", modulus_len); + modulus_len -= SEC_PADDING_SIZE; + if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE)) + { + error("Bad server public key size (%u bits)\n", modulus_len*8); return False; } in_uint8s(s, 8); /* modulus_bits, unknown */ in_uint8p(s, *exponent, SEC_EXPONENT_SIZE); - in_uint8p(s, *modulus, SEC_MODULUS_SIZE); + in_uint8p(s, *modulus, modulus_len); in_uint8s(s, SEC_PADDING_SIZE); + server_public_key_len = modulus_len; return s_check(s); } @@ -740,10 +759,10 @@ static void sec_process_crypt_info(STREAM s) { - uint8 *server_random, *modulus = NULL, *exponent = NULL; + uint8 *server_random, *modulus, *exponent; uint8 client_random[SEC_RANDOM_SIZE]; uint32 rc4_key_size; - uint8 inr[SEC_MODULUS_SIZE]; + //uint8 inr[SEC_MODULUS_SIZE]; if (!sec_parse_crypt_info(s, &rc4_key_size, &server_random, &modulus, &exponent)) { @@ -754,15 +773,14 @@ DEBUG(("Generating client random\n")); /* Generate a client random, and hence determine encryption keys */ /* This is what the MS client do: */ - memset(inr, 0, SEC_RANDOM_SIZE); + //memset(inr, 0, SEC_RANDOM_SIZE); /* *ARIGL!* Plaintext attack, anyone? - I tried doing: - generate_random(inr); - ..but that generates connection errors now and then (yes, - "now and then". Something like 0 to 3 attempts needed before a - successful connection. Nice. Not! - */ - + I tried doing: + generate_random(inr); + ..but that generates connection errors now and then (yes, + "now and then". Something like 0 to 3 attempts needed before a + successful connection. Nice. Not! + */ generate_random(client_random); if (NULL != server_public_key) { /* Which means we should use @@ -783,7 +801,7 @@ else { /* RDP4-style encryption */ sec_rsa_encrypt(sec_crypted_random, - client_random, SEC_RANDOM_SIZE, modulus, exponent); + client_random, SEC_RANDOM_SIZE, server_public_key_len, modulus, exponent); } sec_generate_keys(client_random, server_random, rc4_key_size); }

1 0

[ekohl] 64361: [MC] - Fix service manager message ids. Message 7004 does not exist. - Add missing service manager messages.
by ekohl＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: ekohl Date: Sun Sep 28 09:19:20 2014 New Revision: 64361 URL: http://svn.reactos.org/svn/reactos?rev=64361&view=rev Log: [MC] - Fix service manager message ids. Message 7004 does not exist. - Add missing service manager messages. Modified: trunk/reactos/include/reactos/mc/neteventmsg.mc Modified: trunk/reactos/include/reactos/mc/neteventmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… ============================================================================== --- trunk/reactos/include/reactos/mc/neteventmsg.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/neteventmsg.mc [iso-8859-1] Sun Sep 28 09:19:20 2014 @@ -180,7 +180,7 @@ The %1 service depends on the following nonexistent service: %2 . -MessageId=7004 +MessageId=7005 Severity=Error Facility=System SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED @@ -188,7 +188,7 @@ The %1 call failed with the following error: %n%2 . -MessageId=7005 +MessageId=7006 Severity=Error Facility=System SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED_II @@ -196,7 +196,7 @@ The %1 call failed for %2 with the following error: %n%3 . -MessageId=7006 +MessageId=7007 Severity=Error Facility=System SymbolicName=EVENT_REVERTED_TO_LASTKNOWNGOOD @@ -204,7 +204,7 @@ The system reverted to its last known good configuration. The system is restarting.... . -MessageId=7007 +MessageId=7008 Severity=Error Facility=System SymbolicName=EVENT_BAD_ACCOUNT_NAME @@ -212,7 +212,7 @@ No backslash is in the account name. . -MessageId=7008 +MessageId=7009 Severity=Error Facility=System SymbolicName=EVENT_CONNECTION_TIMEOUT @@ -220,7 +220,7 @@ Timeout (%1 milliseconds) waiting for the %2 service to connect. . -MessageId=7009 +MessageId=7010 Severity=Error Facility=System SymbolicName=EVENT_READFILE_TIMEOUT @@ -228,7 +228,7 @@ Timeout (%1 milliseconds) waiting for ReadFile. . -MessageId=7010 +MessageId=7011 Severity=Error Facility=System SymbolicName=EVENT_TRANSACT_TIMEOUT @@ -236,7 +236,7 @@ Timeout (%1 milliseconds) waiting for a transaction response from the %2 service. . -MessageId=7011 +MessageId=7012 Severity=Error Facility=System SymbolicName=EVENT_TRANSACT_INVALID @@ -244,7 +244,7 @@ Message returned in transaction has incorrect size. . -MessageId=7012 +MessageId=7013 Severity=Error Facility=System SymbolicName=EVENT_FIRST_LOGON_FAILED @@ -252,7 +252,7 @@ Logon attempt with current password failed with the following error: %n%1 . -MessageId=7013 +MessageId=7014 Severity=Error Facility=System SymbolicName=EVENT_SECOND_LOGON_FAILED @@ -260,7 +260,7 @@ Second logon attempt with old password also failed with the following error: %n%1 . -MessageId=7014 +MessageId=7015 Severity=Error Facility=System SymbolicName=EVENT_INVALID_DRIVER_DEPENDENCY @@ -268,7 +268,7 @@ Boot-start or system-start driver (%1) must not depend on a service. . -MessageId=7015 +MessageId=7016 Severity=Error Facility=System SymbolicName=EVENT_BAD_SERVICE_STATE @@ -276,7 +276,7 @@ The %1 service has reported an invalid current state %2. . -MessageId=7016 +MessageId=7017 Severity=Error Facility=System SymbolicName=EVENT_CIRCULAR_DEPENDENCY_DEMAND @@ -284,7 +284,7 @@ Detected circular dependencies demand starting %1. . -MessageId=7017 +MessageId=7018 Severity=Error Facility=System SymbolicName=EVENT_CIRCULAR_DEPENDENCY_AUTO @@ -292,7 +292,7 @@ Detected circular dependencies auto-starting services. . -MessageId=7018 +MessageId=7019 Severity=Error Facility=System SymbolicName=EVENT_DEPEND_ON_LATER_SERVICE @@ -300,7 +300,7 @@ Circular dependency: The %1 service depends on a service in a group which starts later. . -MessageId=7019 +MessageId=7020 Severity=Error Facility=System SymbolicName=EVENT_DEPEND_ON_LATER_GROUP @@ -308,7 +308,7 @@ Circular dependency: The %1 service depends on a group which starts later. . -MessageId=7020 +MessageId=7021 Severity=Error Facility=System SymbolicName=EVENT_SEVERE_SERVICE_FAILED @@ -316,7 +316,7 @@ About to revert to the last known good configuration because the %1 service failed to start. . -MessageId=7021 +MessageId=7022 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_START_HUNG @@ -324,7 +324,7 @@ The %1 service hung on starting. . -MessageId=7022 +MessageId=7023 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_EXIT_FAILED @@ -332,7 +332,7 @@ The %1 service terminated with the following error: %n%2 . -MessageId=7023 +MessageId=7024 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_EXIT_FAILED_SPECIFIC @@ -340,7 +340,7 @@ The %1 service terminated with service-specific error %2. . -MessageId=7024 +MessageId=7025 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_START_AT_BOOT_FAILED @@ -348,7 +348,7 @@ At least one service or driver failed during system startup. Use Event Viewer to examine the event log for details. . -MessageId=7025 +MessageId=7026 Severity=Error Facility=System SymbolicName=EVENT_BOOT_SYSTEM_DRIVERS_FAILED @@ -356,7 +356,7 @@ The following boot-start or system-start driver(s) failed to load: %1 . -MessageId=7026 +MessageId=7027 Severity=Error Facility=System SymbolicName=EVENT_RUNNING_LASTKNOWNGOOD @@ -364,7 +364,7 @@ ReactOS could not be started as configured. A previous working configuration was used instead. . -MessageId=7027 +MessageId=7028 Severity=Error Facility=System SymbolicName=EVENT_TAKE_OWNERSHIP @@ -372,7 +372,7 @@ The %1 Registry key denied access to SYSTEM account programs so the Service Control Manager took ownership of the Registry key. . -MessageId=7028 +MessageId=7029 Severity=Error Facility=System SymbolicName=TITLE_SC_MESSAGE_BOX @@ -380,7 +380,7 @@ Service Control Manager %0 . -MessageId=7029 +MessageId=7030 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_NOT_INTERACTIVE @@ -388,7 +388,7 @@ The %1 service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly. . -MessageId=7030 +MessageId=7031 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_CRASH @@ -396,7 +396,7 @@ The %1 service terminated unexpectedly. It has done this %2 time(s). The following corrective action will be taken in %3 milliseconds: %5. . -MessageId=7031 +MessageId=7032 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_RECOVERY_FAILED @@ -404,7 +404,7 @@ The Service Control Manager tried to take a corrective action (%2) after the unexpected termination of the %3 service, but this action failed with the following error: %n%4 . -MessageId=7032 +MessageId=7033 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_SCESRV_FAILED @@ -414,31 +414,31 @@ system is restarting... . -MessageId=7033 +MessageId=7034 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_CRASH_NO_ACTION Language=English The %1 service terminated unexpectedly. It has done this %2 time(s). -. - -MessageId=7034 -Severity=Informational -Facility=System -SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS -Language=English -The %1 service was successfully sent a %2 control. . MessageId=7035 Severity=Informational Facility=System +SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS +Language=English +The %1 service was successfully sent a %2 control. +. + +MessageId=7036 +Severity=Informational +Facility=System SymbolicName=EVENT_SERVICE_STATUS_SUCCESS Language=English -Service Control Manager %0 -. - -MessageId=7036 +The %1 service entered the %2 state. +. + +MessageId=7037 Severity=Error Facility=System SymbolicName=EVENT_SERVICE_CONFIG_BACKOUT_FAILED @@ -451,7 +451,7 @@ properly, use the Services snap-in in Microsoft Management Console (MMC). . -MessageId=7037 +MessageId=7038 Severity=Error Facility=System SymbolicName=EVENT_FIRST_LOGON_FAILED_II @@ -462,6 +462,65 @@ Console (MMC). . +MessageId=7039 +Severity=Warning +Facility=System +SymbolicName=EVENT_SERVICE_DIFFERENT_PID_CONNECTED +Language=English +A service process other than the one launched by the Service Control Manager +connected when starting the %1 service. The Service Control Manager launched +process %2 and process %3 connected instead.%n%n + +Note that if this service is configured to start under a debugger, this behavior is expected. +. + +MessageId=7040 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_START_TYPE_CHANGED +Language=English +The start type of the %1 service was changed from %2 to %3. +. + +MessageId=7041 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_LOGON_TYPE_NOT_GRANTED +Language=English +The %1 service was unable to log on as %2 with the currently configured password due to the following error:%n +Logon failure: the user has not been granted the requested logon type at this computer.%n%n +Service: %1%n +Domain and account: %2%n%n +This service account does not have the necessary user right "Log on as a service."%n%n +User Action%n%n +Assign "Log on as a service" to the service account on this computer. You can +use Local Security Settings (Secpol.msc) to do this. If this computer is a +node in a cluster, check that this user right is assigned to the Cluster +service account on all nodes in the cluster.%n%n +If you have already assigned this user right to the service account, and the +user right appears to be removed, a Group Policy object associated with this +node might be removing the right. Check with your domain administrator to find +out if this is happening. +. + +MessageId=7042 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_STOP_SUCCESS_WITH_REASON +Language=English +The %1 service was successfully sent a %2 control.%n%n +The reason specified was: %3 [%4]%n%n +Comment: %5 +. + +MessageId=7043 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_SHUTDOWN_FAILED +Language=English +The %1 service did not shut down properly after receiving a preshutdown control. +. + ; ; transport events 9000-9499

1 0

[hbelusca] 64360: [NTVDM]: Fix a bug introduced in revision 64324, where I didn't restore the original values of CF and AX. Fix some keyboard issues in Mystery Mansion.
by hbelusca＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: hbelusca Date: Sat Sep 27 23:45:24 2014 New Revision: 64360 URL: http://svn.reactos.org/svn/reactos?rev=64360&view=rev Log: [NTVDM]: Fix a bug introduced in revision 64324, where I didn't restore the original values of CF and AX. Fix some keyboard issues in Mystery Mansion. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat Sep 27 23:45:24 2014 @@ -194,6 +194,7 @@ // Keyboard IRQ 1 static VOID WINAPI BiosKeyboardIrq(LPWORD Stack) { + BOOLEAN SkipScanCode; BYTE ScanCode, VirtualKey; WORD Character; @@ -204,17 +205,24 @@ * In return, if CF is set we continue processing the scan code * stored in AL, and if not, we skip it. */ + BYTE CF, AX; + CF = getCF(); + AX = getAX(); + setCF(1); setAL(IOReadB(PS2_DATA_PORT)); setAH(0x4F); Int32Call(&BiosContext, BIOS_MISC_INTERRUPT); - /* Check whether CL is clear. If so, skip the scan code. */ - if (getCF() == 0) goto Quit; - /**/setCF(0);/**/ // FIXME: HACK: Reset CF otherwise we enter in an infinite loop. - /* Retrieve the modified scan code in AL */ + SkipScanCode = (getCF() == 0); ScanCode = getAL(); + + setAX(AX); + setCF(CF); + + /* Check whether CF is clear. If so, skip the scan code. */ + if (SkipScanCode) goto Quit; /* Get the corresponding virtual key code */ VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK);

1 0

[tkreuzer] 64359: [WIN32K] Fix NtGdiExcludeClipRect. Should fix regressions from r64260.
by tkreuzer＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: tkreuzer Date: Sat Sep 27 22:59:13 2014 New Revision: 64359 URL: http://svn.reactos.org/svn/reactos?rev=64359&view=rev Log: [WIN32K] Fix NtGdiExcludeClipRect. Should fix regressions from r64260. Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Sat Sep 27 22:59:13 2014 @@ -226,34 +226,27 @@ iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, pdc->dclevel.prgnClip, &rect); - - /* Emulate Windows behavior */ - if (iComplexity == SIMPLEREGION) - iComplexity = COMPLEXREGION; - } - else - { - /* Check if the rect intersects with the window rect */ - if (RECTL_bIntersectRect(&rect, &rect, &pdc->erclWindow)) - { - /* It does. In this case create an empty region */ - pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); - iComplexity = NULLREGION; + } + else + { + /* We don't have a clip region yet, create an empty region */ + pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + if (pdc->dclevel.prgnClip == NULL) + { + iComplexity = ERROR; } else { - /* Otherwise, emulate strange Windows behavior... */ - pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 1, 1); - iComplexity = COMPLEXREGION; - } - - /* Check if creating the region failed */ - if (pdc->dclevel.prgnClip == NULL) - { - /* Return error code */ - iComplexity = ERROR; - } - } + /* Subtract the rect from the VIS region */ + iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, + pdc->prgnVis, + &rect); + } + } + + /* Emulate Windows behavior */ + if (iComplexity == SIMPLEREGION) + iComplexity = COMPLEXREGION; /* If we succeeded, mark the RAO region as dirty */ if (iComplexity != ERROR)

1 0

[hpoussin] 64358: [NTOSKRNL] Partly implement FsRtlRegisterUncProvider/FsRtlDeregisterUncProvider Currently only support one UNC provider at the time. Also disable mup.sys, which is not used for now.
by hpoussin＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: hpoussin Date: Sat Sep 27 21:07:48 2014 New Revision: 64358 URL: http://svn.reactos.org/svn/reactos?rev=64358&view=rev Log: [NTOSKRNL] Partly implement FsRtlRegisterUncProvider/FsRtlDeregisterUncProvider Currently only support one UNC provider at the time. Also disable mup.sys, which is not used for now. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/ntoskrnl/fsrtl/unc.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Sep 27 21:07:48 2014 @@ -1266,7 +1266,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x00000000,"\DosDevices\LPT1" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000000,"\Device\Mup" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000000,"\Device\Mup" ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" @@ -1509,13 +1509,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002 ; Multiple UNC provider driver -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 ; NDIS driver - the only boot-start network driver HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/ntoskrnl/fsrtl/unc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/unc.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] Sat Sep 27 21:07:48 2014 @@ -32,8 +32,18 @@ NTAPI FsRtlDeregisterUncProvider(IN HANDLE Handle) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNICODE_STRING DosDevicesUNC = RTL_CONSTANT_STRING(L"\\DosDevices\\UNC"); + + DPRINT("FsRtlDeregisterUncProvider: Handle=%p\n", Handle); + // + // Normal implementation should look like: + // - notify mup.sys? + // - at last deregistration, destroy \DosDevices\UNC symbolic link + // + + ZwClose(Handle); + + IoDeleteSymbolicLink(&DosDevicesUNC); } /*++ @@ -61,7 +71,64 @@ IN PUNICODE_STRING RedirectorDeviceName, IN BOOLEAN MailslotsSupported) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING DevNull = RTL_CONSTANT_STRING(L"\\Device\\Null"); + UNICODE_STRING DosDevicesUNC = RTL_CONSTANT_STRING(L"\\DosDevices\\UNC"); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + HANDLE FileHandle; + NTSTATUS Status; + + DPRINT("FsRtlRegisterUncProvider: Redirector=%wZ MailslotsSupported=%d\n", + RedirectorDeviceName, MailslotsSupported); + + // + // Current implementation is a hack, as it only supports one UNC provider. + // However, it doesn't require to have a functional mup.sys driver. + // + + // + // Normal implementation should look like: + // - at registration 1, creates symlink \DosDevices\UNC to new provider; + // returns handle to \Device\Null + // - at registration 2, load mup.sys, register both providers to mup.sys + // and change \DosDevices\UNC to DD_MUP_DEVICE_NAME; + // returns handle to new provider + // - at next registrations, register provider to mup.sys; + // returns handle to new provider + // + + *Handle = (HANDLE)-1; + InitializeObjectAttributes(&ObjectAttributes, + &DevNull, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateFile(&FileHandle, + GENERIC_WRITE, + &ObjectAttributes, + &Iosb, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to open %wZ\n", &DevNull); + return Status; + } + + Status = IoCreateSymbolicLink(&DosDevicesUNC, RedirectorDeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to create symbolic link %wZ -> %wZ\n", &DosDevicesUNC, RedirectorDeviceName); + DPRINT1("FIXME: multiple unc provider registered?\n"); + ZwClose(FileHandle); + return Status; + } + + *Handle = FileHandle; + return STATUS_SUCCESS; }

1 0

[tfaber] 64357: [MSVCRT] - Move __CxxFrameHandler3 to msvcrtex. Windows 2003's dll does not export this, and their msvcrt.lib doesn't have it, but we need this to support modern compilers.
by tfaber＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: tfaber Date: Sat Sep 27 20:32:22 2014 New Revision: 64357 URL: http://svn.reactos.org/svn/reactos?rev=64357&view=rev Log: [MSVCRT] - Move __CxxFrameHandler3 to msvcrtex. Windows 2003's dll does not export this, and their msvcrt.lib doesn't have it, but we need this to support modern compilers. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/cpprt/i386/cpprt.s Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Sep 27 20:32:22 2014 @@ -891,6 +891,3 @@ @ cdecl wctomb(ptr long) @ varargs wprintf(wstr) @ varargs wscanf(wstr) - -# Functions not exported in native dll: -@ cdecl -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Sat Sep 27 20:32:22 2014 @@ -13,4 +13,7 @@ ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z +; These are the same +DEFINE_ALIAS ___CxxFrameHandler3, ___CxxFrameHandler + END

1 0

[akhaldi] 64356: [PSDK] * Fix PIMAGEHLP_STATUS_ROUTINE params.
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 20:00:19 2014 New Revision: 64356 URL: http://svn.reactos.org/svn/reactos?rev=64356&view=rev Log: [PSDK] * Fix PIMAGEHLP_STATUS_ROUTINE params. Modified: trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sat Sep 27 20:00:19 2014 @@ -106,7 +106,7 @@ BindMismatchedSymbols, BindSymbolsNotUpdated } IMAGEHLP_STATUS_REASON; -typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG); +typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,PCSTR,PCSTR,ULONG_PTR,ULONG_PTR); typedef struct _LOADED_IMAGE { PSTR ModuleName; HANDLE hFile;

1 0

[akhaldi] 64355: [IMAGEHLP_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 19:47:51 2014 New Revision: 64355 URL: http://svn.reactos.org/svn/reactos?rev=64355&view=rev Log: [IMAGEHLP_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/imagehlp/image.c trunk/rostests/winetests/imagehlp/integrity.c Modified: trunk/rostests/winetests/imagehlp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.… ============================================================================== --- trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] Sat Sep 27 19:47:51 2014 @@ -31,6 +31,8 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); +static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, + const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); /* minimal PE file image */ #define VA_START 0x400000 @@ -149,6 +151,9 @@ BOOL todo; }; +static int status_routine_called[BindSymbolsNotUpdated+1]; + + static BOOL WINAPI accumulating_stream_output(DIGEST_HANDLE handle, BYTE *pb, DWORD cb) { @@ -273,6 +278,40 @@ bin.nt_headers.OptionalHeader.CheckSum = sum; } +static BOOL CALLBACK testing_status_routine(IMAGEHLP_STATUS_REASON reason, const char *ImageName, + const char *DllName, ULONG_PTR Va, ULONG_PTR Parameter) +{ + char kernel32_path[MAX_PATH]; + + if (0 <= (int)reason && reason <= BindSymbolsNotUpdated) + status_routine_called[reason]++; + else + ok(0, "expected reason between 0 and %d, got %d\n", BindSymbolsNotUpdated+1, reason); + + switch(reason) + { + case BindImportModule: + ok(!strcmp(DllName, "KERNEL32.DLL"), "expected DllName to be KERNEL32.DLL, got %s\n", + DllName); + break; + + case BindImportProcedure: + case BindForwarderNOT: + GetSystemDirectoryA(kernel32_path, MAX_PATH); + strcat(kernel32_path, "\\KERNEL32.DLL"); + ok(!lstrcmpiA(DllName, kernel32_path), "expected DllName to be %s, got %s\n", + kernel32_path, DllName); + ok(!strcmp((char *)Parameter, "ExitProcess"), + "expected Parameter to be ExitProcess, got %s\n", (char *)Parameter); + break; + + default: + ok(0, "got unexpected reason %d\n", reason); + break; + } + return TRUE; +} + static void test_get_digest_stream(void) { BOOL ret; @@ -281,6 +320,11 @@ DWORD count; struct update_accum accum = { 0, NULL }; + if (!pImageGetDigestStream) + { + win_skip("ImageGetDigestStream function is not available\n"); + return; + } SetLastError(0xdeadbeef); ret = pImageGetDigestStream(NULL, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, @@ -329,6 +373,60 @@ DeleteFileA(temp_file); } +static void test_bind_image_ex(void) +{ + BOOL ret; + HANDLE file; + char temp_file[MAX_PATH]; + DWORD count; + + if (!pBindImageEx) + { + win_skip("BindImageEx function is not available\n"); + return; + } + + /* call with a non-existent file */ + SetLastError(0xdeadbeef); + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, "nonexistent.dll", 0, 0, + testing_status_routine); + todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + + WriteFile(file, &bin, sizeof(bin), &count, NULL); + CloseHandle(file); + + /* call with a proper PE file, but with StatusRoutine set to NULL */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + NULL); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + /* call with a proper PE file and StatusRoutine */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + testing_status_routine); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + todo_wine ok(status_routine_called[BindImportModule] == 1, + "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); + + todo_wine ok((status_routine_called[BindImportProcedure] == 1) +#if defined(_WIN64) + || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ +#endif + , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -340,14 +438,10 @@ } pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); - - if (!pImageGetDigestStream) - { - win_skip("ImageGetDigestStream function is not available\n"); - } else - { - test_get_digest_stream(); - } + pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); + + test_get_digest_stream(); + test_bind_image_ex(); FreeLibrary(hImageHlp); } Modified: trunk/rostests/winetests/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/integr… ============================================================================== --- trunk/rostests/winetests/imagehlp/integrity.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/integrity.c [iso-8859-1] Sat Sep 27 19:47:51 2014 @@ -135,7 +135,7 @@ return filesize; } -static void test_add_certificate(const char *cert_data, int len) +static DWORD test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -148,7 +148,7 @@ if (hFile == INVALID_HANDLE_VALUE) { skip("Unable to open %s, skipping test\n", test_dll_path); - return; + return ~0; } cert_len = sizeof(WIN_CERTIFICATE) + len; @@ -158,7 +158,7 @@ { skip("Unable to allocate memory, skipping test\n"); CloseHandle(hFile); - return; + return ~0; } cert->dwLength = cert_len; @@ -168,9 +168,11 @@ ret = pImageAddCertificate(hFile, cert, &index); ok(ret, "Unable to add certificate to image, error %x\n", GetLastError()); + trace("added cert index %d\n", index); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); + return index; } static void test_get_certificate(const char *cert_data, int index) @@ -239,7 +241,7 @@ START_TEST(integrity) { - DWORD file_size, file_size_orig; + DWORD file_size, file_size_orig, first, second; hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -272,25 +274,27 @@ pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_get_certificate(test_cert_data, 0); - test_remove_certificate(0); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_get_certificate(test_cert_data, first); + test_remove_certificate(first); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); /* Try adding multiple certificates */ - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); - - test_get_certificate(test_cert_data, 0); - test_get_certificate(test_cert_data_2, 1); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + second = test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + ok(second == first + 1, "got %d %d\n", first, second); + + test_get_certificate(test_cert_data, first); + test_get_certificate(test_cert_data_2, second); /* Remove the first one and verify the second certificate is intact */ - test_remove_certificate(0); - test_get_certificate(test_cert_data_2, 0); - - test_remove_certificate(0); + test_remove_certificate(first); + second--; + test_get_certificate(test_cert_data_2, second); + + test_remove_certificate(second); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size);

1 0

[akhaldi] 64354: [TRANSLATIONS] * Second part of the russian translation update by Kudratov Olimjon. CORE-8495 #resolve #comment Second part committed in r64354. Thanks!
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 19:44:10 2014 New Revision: 64354 URL: http://svn.reactos.org/svn/reactos?rev=64354&view=rev Log: [TRANSLATIONS] * Second part of the russian translation update by Kudratov Olimjon. CORE-8495 #resolve #comment Second part committed in r64354. Thanks! Added: trunk/reactos/base/applications/network/net/lang/ru-RU.rc (with props) trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc (with props) trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/network/net/net.rc trunk/reactos/base/applications/network/wlanconf/wlanconf.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/subsystems/ntvdm/ntvdm.rc Added: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -0,0 +1,64 @@ +/* Russian translation by Kudratov Olimjon, 2014.09.25 */ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ACCOUNTS_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET ACCOUNTS [/FORCELOGOFF:{ÐÐ¸Ð½ÑÑÑ | NO}] [/MINPWLEN: ÐÐ»Ð¸Ð½Ð°]\n\ + [/MAXPWAGE:{ÐÐ½Ð¸ | UNLIMITED}] [/MINPWAGE:ÐÐ½Ð¸]\n\ + [/UNIQUEPW:Ð§Ð¸ÑÐ»Ð¾] [/DOMAIN]\n" + IDS_ACCOUNTS_HELP "ACCOUNTS\n..." + IDS_COMPUTER_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET COMPUTER ..." + IDS_COMPUTER_HELP "COMPUTER\n..." + IDS_CONFIG_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET CONFIG ..." + IDS_CONFIG_HELP "CONFIG\n..." + IDS_CONTINUE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET CONTINUE <ÐÐ¼Ñ ÑÐ»ÑÐ¶Ð±Ñ>" + IDS_CONTINUE_HELP "CONTINUE\n..." + IDS_FILE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET FILE ..." + IDS_FILE_HELP "FILE\n..." + IDS_GROUP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET GROUP ..." + IDS_GROUP_HELP "GROUP\n..." + IDS_HELPMSG_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET HELPMSG <ÐÐ¾Ð´ Ð¾ÑÐ¸Ð±ÐºÐ¸>" + IDS_HELPMSG_HELP "HELPMSG\n..." + IDS_LOCALGROUP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET LOCALGROUP ..." + IDS_LOCALGROUP_HELP "LOCALGROUP\n..." + IDS_NAME_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET NAME ..." + IDS_NAME_HELP "NAME\n..." + IDS_PRINT_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET PRINT ..." + IDS_PRINT_HELP "PRINT\n..." + IDS_PAUSE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET PAUSE <ÐÐ¼Ñ ÑÐ»ÑÐ¶Ð±Ñ>" + IDS_PAUSE_HELP "PAUSE\n..." + IDS_SEND_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET SEND ..." + IDS_SEND_HELP "SEND\n..." + IDS_SESSION_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET SESSION ..." + IDS_SESSION_HELP "SESSION\n..." + IDS_SHARE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET SHARE ..." + IDS_SHARE_HELP "SHARE\n..." + IDS_START_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET START ..." + IDS_START_HELP "START\n..." + IDS_STATISTICS_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET STATISTICS ..." + IDS_STATISTICS_HELP "STATISTICS\n..." + IDS_STOP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET STOP <ÐÐ¼Ñ ÑÐ»ÑÐ¶Ð±Ñ>" + IDS_STOP_HELP "STOP\n..." + IDS_TIME_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET TIME ..." + IDS_TIME_HELP "TIME\n..." + IDS_USE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET USE ..." + IDS_USE_HELP "USE\n..." + IDS_USER_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET USER ..." + IDS_USER_HELP "USER\n..." + IDS_VIEW_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET VIEW ..." + IDS_VIEW_HELP "VIEW\n..." + IDS_HELP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET HELP <ÐÐ¾Ð¼Ð°Ð½Ð´Ð°>\n - Ð¸Ð»Ð¸ -\nNET <ÐÐ¾Ð¼Ð°Ð½Ð´Ð°> /HELP\n\n\ + ÐÐ¾ÑÑÑÐ¿Ð½Ñ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ:\n\n\ + NET ACCOUNTS NET HELP NET SHARE\n\ + NET COMPUTER NET HELPMSG NET START\n\ + NET CONFIG NET LOCALGROUP NET STATISTICS\n\ + NET CONFIG SERVER NET NAME NET STOP\n\ + NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ + NET CONTINUE NET PRINT NET USE\n\ + NET FILE NET SEND NET USER\n\ + NET GROUP NET SESSION NET VIEW\n\n\ + ..." + IDS_NET_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ + SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" +END Propchange: trunk/reactos/base/applications/network/net/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -18,3 +18,6 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -0,0 +1,38 @@ +/* Russian translation by Kudratov Olimjon, 2014.09.25 */ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nÐÐ°ÑÑÑÐ¾Ð¹ÑÐµ WLAN Ð°Ð´Ð°Ð¿ÑÐµÑ.\n\n\ +WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ +\t-c SSID\t\tÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÑÑ Ðº ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ SSID,\n\ +\t-w WEP\t\tÐÐ°Ð´Ð°ÐµÑ WEP ÐºÐ»ÑÑ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n\ +\t-a\t\tÐ£ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÐ»ÐµÐ²ÑÑ ÑÐµÑÑ is ad-hoc\n\ +\t-d\t\tÐÑÐºÐ»ÑÑÐ°ÐµÑÑÑ Ð¾Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÐ¾ÑÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð°.\n\ +\t-s\t\tÐ¡ÐºÐ°Ð½Ð¸ÑÑÐµÑ Ð¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ¾ÑÐµÐº Ð´Ð¾ÑÑÑÐ¿Ð°\n\ +\t\t\tÐ² Ð¾Ð±Ð»Ð°ÑÑÐ¸.\n\n\ +ÐÑÐ¸ Ð¾ÑÑÑÑÑÑÐ²Ð¸Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐµÐºÑÑÐµÐ¼ WLAN ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸\n" + IDS_NO_NETWORK "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐµÑÐµÐ¹ Ð² Ð¾Ð±Ð»Ð°ÑÑÐ¸\n" + IDS_NO_WLAN_ADAPTER "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ WLAN Ð°Ð´Ð°Ð¿ÑÐµÑ Ð² ÑÐ¸ÑÑÐµÐ¼Ðµ\n" + IDS_SUCCESS "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° ÑÑÐ¿ÐµÑÐ½Ð¾.\n" + IDS_WLAN_DISCONNECT "\nWLAN Ð¾ÑÐºÐ»ÑÑÐµÐ½\n" + IDS_MSG_WEP_ENABLED "WEP Ð²ÐºÐ»ÑÑÐµÐ½: %s\n" + IDS_MSG_NETWORK_MODE "Ð ÐµÐ¶Ð¸Ð¼ ÑÐµÑÐ¸: %s\n" + IDS_MSG_CURRENT_WIRELESS "\nÐ¢ÐµÐºÑÑÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Ð±ÐµÑÐ¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑÐ¸:\n\n" + IDS_MSG_ENCRYPTED "ÐÐ°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¾: %s\n" + IDS_MSG_NETWORK_TYPE "Ð¢Ð¸Ð¿ ÑÐµÑÐ¸: %s\n" + IDS_MSG_RSSI "RSSI: %i dBm\n" + IDS_MSG_SUPPORT_RATE "ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ ÑÐºÐ¾ÑÐ¾ÑÑÐ¸ (Mbps): " + IDS_MSG_TRANSMISSION_POWER "ÐÐ¾ÑÐ½Ð¾ÑÑÑ Ð¿ÐµÑÐµÐ´Ð°ÑÑÐ¸ÐºÐ°: %d mW\n" + IDS_MSG_ANTENNA_COUNT "Ð§Ð¸ÑÐ»Ð¾ Ð°Ð½ÑÐµÐ½Ð½: %d\n" + IDS_MSG_TRANSMIT_ANTENNA "ÐÐµÑÐµÐ´Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: %d\n" + IDS_MSG_TRANSMIT_ANTENNA_ANY "ÐÐµÑÐµÐ´Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: ÐÑÐ±Ð°Ñ\n" + IDS_MSG_RECEIVE_ANTENNA "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: %d\n" + IDS_MSG_RECEIVE_ANTENNA_ANY "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: ÐÑÐ±Ð°Ñ\n" + IDS_MSG_FRAGMENT_THRESHOLD "ÐÐ¾ÑÐ¾Ð³ ÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸: %d Ð±Ð°Ð¹Ñ\n" + IDS_MSG_RTS_THRESHOLD "ÐÐ¾ÑÐ¾Ð³ RTS: %d Ð±Ð°Ð¹Ñ\n" + IDS_YES "ÐÐ°" + IDS_NO "ÐÐµÑ" + IDS_ADHOC "Adhoc" + IDS_INFRASTRUCTURE "ÐÐ½ÑÑÐ°ÑÑÑÑÐºÑÑÑÐ°" +END Propchange: trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -31,6 +31,9 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -31,8 +31,8 @@ IDS_SEARCH "&ÐÐ¾Ð¸ÑÐº" IDS_FAVORITES "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" - IDS_HIDETABS "Hide &Tabs" - IDS_SHOWTABS "Show &Tabs" + IDS_HIDETABS "&Ð¡ÐºÑÑÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸" + IDS_SHOWTABS "&ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸" END STRINGTABLE @@ -54,12 +54,12 @@ POPUP "" /* Options */ { MENUITEM "", IDTB_EXPAND - MENUITEM "S&ync", IDTB_SYNC - MENUITEM "&Back", IDTB_BACK - MENUITEM "&Forward", IDTB_FORWARD - MENUITEM "&Home", IDTB_HOME - MENUITEM "&Stop", IDTB_STOP - MENUITEM "&Refresh", IDTB_REFRESH - MENUITEM "&Print...", IDTB_PRINT + MENUITEM "Ð¡&Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ", IDTB_SYNC + MENUITEM "&ÐÐ°Ð·Ð°Ð´", IDTB_BACK + MENUITEM "&ÐÐ¿ÐµÑÐµÐ´", IDTB_FORWARD + MENUITEM "&ÐÐ¾Ð¼Ð¾Ð¹", IDTB_HOME + MENUITEM "&ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", IDTB_STOP + MENUITEM "Ð&Ð±Ð½Ð¾Ð²Ð¸ÑÑ", IDTB_REFRESH + MENUITEM "&ÐÐµÑÐ°ÑÑ...", IDTB_PRINT } } Added: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -0,0 +1,14 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HIDE_MOUSE, "&Ð¡Ð¿ÑÑÑÐ°ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" + IDS_SHOW_MOUSE, "&ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" + IDS_VDM_MENU , "ReactOS &VDM" +END + +STRINGTABLE +BEGIN + IDS_VDM_DUMPMEM, "ÐÐ°Ð¼Ð¿ &Ð¿Ð°Ð¼ÑÑÐ¸" + IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" +END Propchange: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -40,3 +40,6 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif

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