Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[jimtabor] 54170: [Win32k] - Fix timer resolution so it will run every 10 ms +/-1ms. This is the default setting when the user provides less than 10 ms for the period to wait for the timer event. P...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 17 01:33:55 2011 New Revision: 54170 URL: http://svn.reactos.org/svn/reactos?rev=54170&view=rev Log: [Win32k] - Fix timer resolution so it will run every 10 ms +/-1ms. This is the default setting when the user provides less than 10 ms for the period to wait for the timer event. Pass wine test_timers_no_wnd. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Mon Oct 17 01:33:55 2011 @@ -187,7 +187,7 @@ PTIMER pTmr; UINT Ret = IDEvent; LARGE_INTEGER DueTime; - DueTime.QuadPart = (LONGLONG)(-10000); // 1024hz .9765625 ms set to 1.1 ms + DueTime.QuadPart = (LONGLONG)(-97656); // 1024hz .9765625 ms set to 10.0 ms #if 0 /* Windows NT/2k/XP behaviour */ @@ -209,7 +209,7 @@ if (Elapse < 10) { TRACE("Adjusting uElapse\n"); - Elapse = 10; + Elapse = 10; // 1024hz .9765625 ms, set to 10.0 ms (+/-)1 ms } /* Passing an IDEvent of 0 and the SetTimer returns 1. @@ -448,7 +448,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-10000); // 1024hz .9765625 ms set to 1.1 ms + DueTime.QuadPart = (LONGLONG)(-97656); // 1024hz .9765625 ms set to 10.0 ms while(pLE != &TimersListHead) {

13 years, 2 months

[cgutman] 54169: [TCPIP] - Do not transmit fragments recursively since it can cause a kernel stack overflow with large packets - Big thanks to hto for his work on this bug which has eluded me since...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 17 00:38:46 2011 New Revision: 54169 URL: http://svn.reactos.org/svn/reactos?rev=54169&view=rev Log: [TCPIP] - Do not transmit fragments recursively since it can cause a kernel stack overflow with large packets - Big thanks to hto for his work on this bug which has eluded me since last year See issue #5796 for more details. Modified: trunk/reactos/drivers/network/tcpip/include/transmit.h trunk/reactos/lib/drivers/ip/network/transmit.c Modified: trunk/reactos/drivers/network/tcpip/include/transmit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/transmit.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/transmit.h [iso-8859-1] Mon Oct 17 00:38:46 2011 @@ -25,8 +25,8 @@ UINT BytesLeft; /* Number of bytes left to send */ UINT PathMTU; /* Path Maximum Transmission Unit */ PNEIGHBOR_CACHE_ENTRY NCE; /* Pointer to NCE to use */ - PIP_TRANSMIT_COMPLETE Complete; /* Completion Routine */ - PVOID Context; /* Completion Context */ + KEVENT Event; /* Signalled when the transmission is complete */ + NDIS_STATUS Status; /* Status of the transmission */ } IPFRAGMENT_CONTEXT, *PIPFRAGMENT_CONTEXT; Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Oct 17 00:38:46 2011 @@ -28,30 +28,14 @@ */ { PIPFRAGMENT_CONTEXT IFC = (PIPFRAGMENT_CONTEXT)Context; - NTSTATUS Status; TI_DbgPrint (MAX_TRACE, ("Called. Context (0x%X) NdisPacket (0x%X) NdisStatus (0x%X)\n", Context, NdisPacket, NdisStatus)); - - if (NT_SUCCESS(NdisStatus) && PrepareNextFragment(IFC)) { - /* A fragment was prepared for transmission, so send it */ - Status = IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); - if (!NT_SUCCESS(Status)) - { - FreeNdisPacket(IFC->NdisPacket); - IFC->Complete(IFC->Context, IFC->Datagram, Status); - ExFreePoolWithTag(IFC, IFC_TAG); - } - } else { - TI_DbgPrint(MAX_TRACE, ("Calling completion handler.\n")); - - /* There are no more fragments to transmit, so call completion handler */ - FreeNdisPacket(IFC->NdisPacket); - IFC->Complete(IFC->Context, IFC->Datagram, NdisStatus); - ExFreePoolWithTag(IFC, IFC_TAG); - } + + IFC->Status = NdisStatus; + KeSetEvent(&IFC->Event, 0, FALSE); } NTSTATUS IPSendFragment( @@ -202,8 +186,7 @@ IFC->Position = 0; IFC->BytesLeft = IPPacket->TotalSize - IPPacket->HeaderSize; IFC->Data = (PVOID)((ULONG_PTR)IFC->Header + IPPacket->HeaderSize); - IFC->Complete = Complete; - IFC->Context = Context; + KeInitializeEvent(&IFC->Event, NotificationEvent, FALSE); TI_DbgPrint(MID_TRACE,("Copying header from %x to %x (%d)\n", IPPacket->Header, IFC->Header, @@ -211,19 +194,27 @@ RtlCopyMemory( IFC->Header, IPPacket->Header, IPPacket->HeaderSize ); - /* Prepare next fragment for transmission and send it */ - - if (!PrepareNextFragment(IFC)) { - FreeNdisPacket(IFC->NdisPacket); - ExFreePoolWithTag(IFC, IFC_TAG); - return NDIS_STATUS_FAILURE; + while (PrepareNextFragment(IFC)) + { + NdisStatus = IPSendFragment(IFC->NdisPacket, NCE, IFC); + if (NT_SUCCESS(NdisStatus)) + { + KeWaitForSingleObject(&IFC->Event, + Executive, + KernelMode, + FALSE, + NULL); + NdisStatus = IFC->Status; + } + + if (!NT_SUCCESS(NdisStatus)) + break; } - if (!NT_SUCCESS((NdisStatus = IPSendFragment(IFC->NdisPacket, NCE, IFC)))) - { - FreeNdisPacket(IFC->NdisPacket); - ExFreePoolWithTag(IFC, IFC_TAG); - } + FreeNdisPacket(IFC->NdisPacket); + ExFreePoolWithTag(IFC, IFC_TAG); + + Complete(Context, IPPacket->NdisPacket, NdisStatus); return NdisStatus; }

13 years, 2 months

[osiejka] 54168: [TRANSLATION] - Romanian translation of userenv, winmm, ntvdm, and win32csr (bug no. 6580) and inf (bug no. 6577) by Stefan Fulea (minor corrections by me); - Polish translation up...

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Oct 16 23:39:00 2011 New Revision: 54168 URL: http://svn.reactos.org/svn/reactos?rev=54168&view=rev Log: [TRANSLATION] - Romanian translation of userenv, winmm, ntvdm, and win32csr (bug no. 6580) and inf (bug no. 6577) by Stefan Fulea (minor corrections by me); - Polish translation update/cleanup of inf by me; - Spanish inetcpl translation (bug no. 6472) and French subst translation (bug no. 6166) by Jason Genie; Added: trunk/reactos/base/system/subst/lang/fr-FR.rc (with props) trunk/reactos/dll/win32/userenv/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/winmm/winmm_Ro.rc (with props) trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc (with props) trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/system/subst/rsrc.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/dll/win32/winmm/winmm_res.rc trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/audio.inf trunk/reactos/media/inf/battery.inf trunk/reactos/media/inf/bda.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/disk.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hal.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/ks.inf trunk/reactos/media/inf/kscaptur.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtpnt.inf trunk/reactos/media/inf/nettcpip.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/unknown.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf trunk/reactos/media/inf/xboxdisp.inf trunk/reactos/subsystems/ntvdm/rsrc.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Added: trunk/reactos/base/system/subst/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/fr-… ============================================================================== --- trunk/reactos/base/system/subst/lang/fr-FR.rc (added) +++ trunk/reactos/base/system/subst/lang/fr-FR.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -1,0 +1,16 @@ +#include "resource.h" +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "Nombre incorrect de paramètres - %s\n" + IDS_INVALID_PARAMETER "Nombre incorrect de paramètres - %s\n" + IDS_INVALID_PARAMETER2 "Paramètre incorrect - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "Disque déjà substitué\n" + IDS_FAILED_WITH_ERROCODE "Échoue avec le code d'erreur 0x%x: %s\n" + IDS_USAGE "Associe un chemin avec une lettre de lecteur.\n\nSUBST [disque1: [disque2:]chemin]\nSUBST dique1: /D\n\n disque1: \ + Spécifie un lecteur virtuel auquel vous voulez affecter un chemin.\n \ + [disque2:]chemin Spécifie un disque physique et le chemin que vous souhaitez attribuer à\n \ + un disque virtuel.\n /D \ + Supprime un disque (virtuel) substitué.\n\nTapez SUBST sans paramètres pour afficher la liste des lecteurs virtuels en cours.\n" +END Propchange: trunk/reactos/base/system/subst/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/subst/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/system/subst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/rsrc.rc?… ============================================================================== --- trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -5,6 +5,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/ro-RO.rc" Added: trunk/reactos/dll/win32/userenv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/userenv/lang/ro-RO.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -1,0 +1,37 @@ +/* + * FILE: dll/win32/userenv/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-10-11 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Documente Èi preferinÈe" + IDS_APPDATA "Date aplicaÈii" + IDS_DESKTOP "Birou" + IDS_FAVORITES "Favorite" + IDS_STARTMENU "Meniul pornire" + IDS_PROGRAMS "Meniul pornire\\Programe" + IDS_ADMINTOOLS "Meniul pornire\\Programe\\Administrative" + IDS_STARTUP "Meniul pornire\\Programe\\Autolansate" + IDS_MYDOCUMENTS "Documente" + IDS_MYPICTURES "Documente\\Imagini" + IDS_MYMUSIC "Documente\\Audio" + IDS_MYVIDEOS "Documente\\Video" + IDS_TEMPLATES "Èabloane" + IDS_RECENT "Recente" + IDS_SENDTO "Trimitere" + IDS_PRINTHOOD "Imprimante" + IDS_NETHOOD "ReÈele" + IDS_LOCALSETTINGS "PreferinÈe locale" + IDS_LOCALAPPDATA "PreferinÈe locale\\Date aplicaÈii" + IDS_TEMP "PreferinÈe locale\\Temp" + IDS_CACHE "PreferinÈe locale\\FiÈiere de Internet temporare" + IDS_HISTORY "PreferinÈe locale\\Istoric" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\FiÈiere program" + IDS_COMMONFILES "FiÈiere comune" +END Propchange: trunk/reactos/dll/win32/userenv/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/userenv/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -60,5 +60,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/winmm/winmm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_Ro.r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_Ro.rc (added) +++ trunk/reactos/dll/win32/winmm/winmm_Ro.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -1,0 +1,129 @@ +/* + * Copyright 1999 Eric Pouech + * Transl. Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * CHANGE LOG: 2011-10-11 initial translation + */ + +STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +BEGIN + +/* MMSYS errors */ +MMSYSERR_NOERROR, "Comanda specificatÄ a fost Ã®ndeplinitÄ." +MMSYSERR_ERROR, "Eroare externÄ nedefinitÄ." +MMSYSERR_BADDEVICEID, "A fost utilizat un identificator de dispozitiv nevalid pentru acest sistem." +MMSYSERR_NOTENABLED, "Modulul pilot nu a fost activat." +MMSYSERR_ALLOCATED, "Dispozitivul specificat deja este Ã®n uz. AÈteptaÈi pÃ¢nÄ se elibereazÄ, apoi reÃ®ncercaÈi." +MMSYSERR_INVALHANDLE, "Rutina dispozitivului specificat este invalidÄ." +MMSYSERR_NODRIVER, "Modulul pilot nu este instalat Ã®n sistem!\n" +MMSYSERR_NOMEM, "Memorie disponibilÄ pentru aceastÄ activitate este insuficientÄ. ÃnchideÈi una sau mai multe aplicaÈii pentru a elibera memorie, apoi reÃ®ncercaÈi." +MMSYSERR_NOTSUPPORTED, "AceastÄ funcÈie nu este acceptatÄ. Petru a determina ce funcÈii Èi mesaje se acceptÄ Ã®n modulul pilot, utilizaÈi âCapabilitÄÈiâ." +MMSYSERR_BADERRNUM, "A fost specificat un numÄr de eroare nespecificat Ã®n acest sistem." +MMSYSERR_INVALFLAG, "A fost transmis un indicator nevalid Ã®ntr-o funcÈie de sistem." +MMSYSERR_INVALPARAM, "A fost transmis un parametru nevalid Ã®ntr-o funcÈie de sistem." + +/* WAVE errors */ +WAVERR_BADFORMAT, "Formatul specificat nu este acceptat sau nu poate fi tratat. Pentru a determina formatele suportate pentru funcÈie, utilizaÈi âCapabilitÄÈiâ" +WAVERR_STILLPLAYING, "AceastÄ operaÈie nu poate fi executatÄ cÃ¢t timp sunt accesate date media. ReiniÈializaÈi dispozitivul sau aÈteptaÈi contenirea accesÄrii datelor media." +WAVERR_UNPREPARED, "Antetul de format nu a fost pregÄtit. UtilizaÈi funcÈia âPrepareâ pentru a pregÄti antetul, apoi reÃ®ncercaÈi." +WAVERR_SYNC, "Dispozitivul nu poate fi deschis fÄrÄ indicativul WAVE_ALLOWSYNC. StabiliÈi acest indicativ, apoi reÃ®cercaÈi." + +/* MIDI errors */ +MIDIERR_UNPREPARED, "Antetuul MIDI nu este pregÄtit. UtilizaÈi funcÈia âPrepareâ pentru a pregÄti antetul, apoi reÃ®ncercaÈi." +MIDIERR_STILLPLAYING, "AceastÄ operaÈie nu poate fi executatÄ cÃ¢t timp sunt accesate date media. ReiniÈializaÈi dispozitivul sau aÈteptaÈi contenirea accesÄrii datelor media." +MIDIERR_NOMAP, "LipseÈte harta MIDI. Poate fi o problemÄ cu modulul pilot, sau cu fiÈierul MIDIMAP.CFG care fie lipseÈte, fie este corupt." +MIDIERR_NOTREADY, "Portul transmite date cÄtre dispozitiv. AÈteptaÈi pÃ¢nÄ datele sunt transmise Ã®n totalitate, apoi reÃ®ncercaÈi." +MIDIERR_NODEVICE, "Configuratorul MIDI se referÄ la un dispozitiv care nu este instalat Ã®n sistem." +MIDIERR_INVALIDSETUP, "Configuratorul MIDI este deteriorat. CopiaÈi fiÈierul original MIDIMAP.CFG Ã®n directorul SYSTEM din ReactOS, apoi reÃ®ncercaÈi." + +/* MCI errors */ +MCIERR_INVALID_DEVICE_ID, "Identificator de dispozitiv MCI nevalid. UtilizaÈi identificatorul obÈinut la deschiderea dispozitivului MCI." +MCIERR_UNRECOGNIZED_KEYWORD, "Modulul pilot nu recunoaÈte parametrul de comandÄ specificat." +MCIERR_UNRECOGNIZED_COMMAND, "Modulul pilot nu recunoaÈte comanda specificatÄ." +MCIERR_HARDWARE, "A survenit o problemÄ la dispozitivul media. AsiguraÈi-vÄ cÄ funcÈioneazÄ corect sau contactaÈi producÄtorul dispozitivului." +MCIERR_INVALID_DEVICE_NAME, "Dispozitivul specificat nu este deschis sau nu este recunoscut de cÄtre MCI." +MCIERR_OUT_OF_MEMORY, "Memorie disponibilÄ pentru aceastÄ activitate este insuficientÄ. \nÃnchideÈi una sau mai multe aplicaÈii pentru a elibera memorie, apoi reÃ®ncercaÈi." +MCIERR_DEVICE_OPEN, "Numele de dispozitiv deja este utilizat ca alias de cÄtre aplicaÈie. UtilizaÈi un alias unic." +MCIERR_CANNOT_LOAD_DRIVER, "A survenit o eroare neidentificabilÄ la Ã®ncÄrcarea modulului pilot al dispozitivului." +MCIERR_MISSING_COMMAND_STRING, "Nu a fost specificatÄ comanda." +MCIERR_PARAM_OVERFLOW, "Èirul de ieÈire este prea voluminos pentru a fi inclus Ã®n memoria rezervatÄ pentru rezultat. MÄriÈi aceastÄ memorie." +MCIERR_MISSING_STRING_ARGUMENT, "Comanda specificatÄ necesitÄ parametru Èir-de-caractere. FurnizaÈi un asemenea parametru." +MCIERR_BAD_INTEGER, "NumÄrul Ã®ntreg specificat nu este valid pentru aceastÄ comandÄ." +MCIERR_PARSER_INTERNAL, "Modulul pilot a rÄspuns cu un tip de date eronat. CÄutaÈi un nou modul pilot la producÄtorul dispozitivului." +MCIERR_DRIVER_INTERNAL, "A apÄrut o problemÄ Ã®n modulul pilot al dispozitivului. CÄutaÈi un nou modul pilot la producÄtorul dispozitivului." +MCIERR_MISSING_PARAMETER, "Comanda specificatÄ necesitÄ un parametru. FurnizaÈi un parametru." +MCIERR_UNSUPPORTED_FUNCTION, "Dispozitivul MCI pe care-l utilizaÈi nu acceptÄ comanda specificatÄ." +MCIERR_FILE_NOT_FOUND, "Nu se poate gÄsi fiÈierul specificat. AsiguraÈi-vÄ cÄ numele Èi calea fiÈierului sunt corecte." +MCIERR_DEVICE_NOT_READY, "Modulul pilot al dispozitivului nu este gata." +MCIERR_INTERNAL, "A apÄrut o problemÄ la iniÈializarea MCI. ÃncercaÈi repornirea ReactOS." +MCIERR_DRIVER, "A apÄrut o problemÄ la modulul pilot al dispozitibului. Modulul pilot este Ã®nchis. Nu se poate accesa eroarea." +MCIERR_CANNOT_USE_ALL, "Ãn aceastÄ comandÄ nu se poate utiliza 'all' ca nume de dispozitiv." +MCIERR_MULTIPLE, "Au survenit erori Ã®n mai mult de un dispozitiv. SpecificaÈi separat fiecare comandÄ Èi dispozitiv pentru a identifica dispozitivul care a cauzat eroarea." +MCIERR_EXTENSION_NOT_FOUND, "Nu se poate identifica tipul dispozitivului din extensia fiÈierului dat." +MCIERR_OUTOFRANGE, "Parametrul este Ã®n afara valorilor permise pentru comanda specificatÄ." +MCIERR_FLAGS_NOT_COMPATIBLE, "Parametrii specificaÈi nu pot fi utilizaÈi Ã®mpreunÄ." +MCIERR_FILE_NOT_SAVED, "FiÈierul specificat nu se poate stoca. AsiguraÈi suficient spaÈiu disponibil pe unitatea de stocare precum Èi conectivitatea reÈelei." +MCIERR_DEVICE_TYPE_REQUIRED, "Dispozitivul specificat nu se poate localiza. AsiguraÈi-vÄ cÄ este instalat sau cÄ numele dispozitivului este scris corect." +MCIERR_DEVICE_LOCKED, "Dispozitivul specificat este blocat. AÈteptaÈi cÃ¢teva secunde, apoi reÃ®ncercaÈi." +MCIERR_DUPLICATE_ALIAS, "Ãn aceastÄ aplicaÈie deja existÄ un asemenea alias. UtilizaÈi un alias unic." +MCIERR_BAD_CONSTANT, "Parametrul specificat nu este valid pentru aceastÄ comandÄ." +MCIERR_MUST_USE_SHAREABLE, "Acest modul pilot este deja Ã®n uz. Pentru a-l partaja, utilizaÈi parametrul âshareableâ pentru fiecare comandÄ âopenâ." +MCIERR_MISSING_DEVICE_NAME, "Comanda specificatÄ necesitÄ un alias, fiÈier, modul pilot, sau un nume de dispozitiv. FurnizaÈi o asemenea parametru." +MCIERR_BAD_TIME_FORMAT, "Valoarea specificatÄ pentru formatul orei nu este validÄ. ConsultaÈi documentaÈia MCI Ã®n vederea formatelor valide." +MCIERR_NO_CLOSING_QUOTE, "Ãn valoarea parametru, ghilimelele nu au fost Ã®nchise. ÃnchideÈi-le." +MCIERR_DUPLICATE_FLAGS, "Un parametru sau valoare a fost duplicat. SpecificaÈi singurÄ datÄ." +MCIERR_INVALID_FILE, "FiÈierul specificat nu poate fi lecturat la dispozitivul MCI specificat. FiÈierul poate fi fie corupt, fie Ã®ntr-un format diferit." +MCIERR_NULL_PARAMETER_BLOCK, "CÄtre MCI a fost transmis un bloc nul." +MCIERR_UNNAMED_RESOURCE, "Nu se poate stoca un fiÈier fÄrÄ nume. FurnizaÈi un nume." +MCIERR_NEW_REQUIRES_ALIAS, "Este necesarÄ specificarea unui alias la utilizarea parametrului ânewâ." +MCIERR_NOTIFY_ON_AUTO_OPEN, "Nu se poate utiliza indicatorul ânofifyâ pentru dispozitive cu auto-deschidere." +MCIERR_NO_ELEMENT_ALLOWED, "Nu se poate folosi un nume de fiÈier pentru dispozitivul specificat." +MCIERR_NONAPPLICABLE_FUNCTION, "Nu se pot executa comenzile Ã®n ordinea specificatÄ. CorectaÈi secvenÈa de comandÄ, apoi reÃ®ncercaÈi." +MCIERR_ILLEGAL_FOR_AUTO_OPEN, "Comanda specificatÄ nu poate fi executatÄ pe un dispozitiv cu auto-deschidere. AÈteptaÈi Ã®nchiderea despozitivului, apoi reÃ®ncercaÈi." +MCIERR_FILENAME_REQUIRED, "Numele de fiÈier este nevalid. AsiguraÈi-vÄ cÄ numele de fiÈier nu este mai lung de 8 caractere, urmate de un punct Èi o extensie." +MCIERR_EXTRA_CHARACTERS, "Nu se pot specifica alte caractere suplimentare Ã®n afara ghilimelelor." +MCIERR_DEVICE_NOT_INSTALLED, "Dispozitivul specificat nu este insalat Ã®n sistem. UtilizaÈi Ã®n Panoul de control opÈiunile de Module pilot pentru a instala dispozitivul." +MCIERR_GET_CD, "Nu se poate accesa fiÈierul specificat pentru dispozitivul MCI. ÃncercaÈi schimbarea directoarelor sau repornirea calculatorului." +MCIERR_SET_CD, "Nu se poate accesa fiÈierul specificat sau dispozitivul MCI din cauzÄ cÄ aplicaÈia nu poate schimba directoare." +MCIERR_SET_DRIVE, "Nu se poate accesa fiÈierul specificat sau dispozitivul MCI din cauzÄ cÄ aplicaÈia nu poate schimba unitÄÈile de stocare." +MCIERR_DEVICE_LENGTH, "SpecificaÈi un nume de dispozitiv sau modul pilot sub 79 de caractere." +MCIERR_DEVICE_ORD_LENGTH, "SpecificaÈi un nume de dispozitiv sau modul pilot sub 69 de caractere." +MCIERR_NO_INTEGER, "Comanda specificatÄ necesitÄ un parametru numÄr Ã®ntreg. VÄ rugÄm furnizaÈi unul." +MCIERR_WAVE_OUTPUTSINUSE, "Toate dispozitivele care pot lectura fiÈierele Ã®n formatul curent sunt ocupate. AÈteptaÈi pÃ¢nÄ se elibereazÄ unul dintre dispozitive, apoi reÃ®ncercaÈi." +MCIERR_WAVE_SETOUTPUTINUSE, "Dispozitivul curent nu poate fi desemnat ca lector deoarece este ocupat. AÈteptaÈi eliberarea dispozitivului, apoi reÃ®ncercaÈi." +MCIERR_WAVE_INPUTSINUSE, "Toate dispozitivele care pot Ã®nregistra fiÈiere Ã®n formatul curent, sunt ocupate. AÈteptaÈi pÃ¢nÄ se elibereazÄ unul dintre dispozitive, apoi reÃ®ncercaÈi." +MCIERR_WAVE_SETINPUTINUSE, "Dispozitivul curent nu poate fi desemnat ca Ã®nregistrator deoarece este ocupat. AÈteptaÈi eliberarea dispozitivului, apoi reÃ®ncercaÈi." +MCIERR_WAVE_OUTPUTUNSPECIFIED, "Poate fi utilizat orice dispozitiv capabil de a reda forme de undÄ." +MCIERR_WAVE_INPUTUNSPECIFIED, "Poate fi utilizat orice dispozitiv capabil de a Ã®nregistra forme de undÄ." +MCIERR_WAVE_OUTPUTSUNSUITABLE, "Nu existÄ nici un dispozitiv instalat care sÄ poatÄ lectura fiÈiere Ã®n formatul curent. UtilizaÈi opÈiunea âModule pilotâ pentru a instala un asemenea dispozitiv." +MCIERR_WAVE_SETOUTPUTUNSUITABLE,"Dispozitivul pe care-l folosiÈi nu recunoaÈte formatul de fiÈier curent." +MCIERR_WAVE_INPUTSUNSUITABLE, "Nu existÄ dispozitive instalate care sÄ poatÄ Ã®nregistra fiÈiere Ã®n formatul curent. UtilizaÈi opÈiunea âModule pilotâ pentru a instala un asemenea dispozitiv." +MCIERR_WAVE_SETINPUTUNSUITABLE, "Dispozitivul din care Ã®ncercaÈi sÄ Ã®nregistraÈi nu recunoaÈte formatul de fiÈier curent." +MCIERR_NO_WINDOW, "Nu existÄ fereastrÄ de afiÈare." +MCIERR_CREATEWINDOW, "Fereastra nu poate fi creatÄ sau utilizatÄ." +MCIERR_FILE_READ, "FiÈierul specificat nu poate fi citit. AsiguraÈi-vÄ cÄ fiÈierul Ã®ncÄ existÄ, verificaÈi conexiunea reÈelei Èi disponibilitatea discului." +MCIERR_FILE_WRITE, "Nu se poate scrie Ã®n fiÈierul specificat. AsiguraÈi disponibilitatea spaÈiului de disc Èi conectivitatea reÈelei." +MCIERR_SEQ_DIV_INCOMPATIBLE, "Formatul temporal al âreferinÈei cÃ¢ntecâ Èi SMPTE sunt reciproc exclusive. Nu le puteÈi utiliza Ã®mpreunÄ." +MCIERR_SEQ_NOMIDIPRESENT, "Sistemul nu are instalate dispozitive MIDI. UtilizaÈi âModule pilotâ din Panoul de control pentru a instala un modul pilot MIDI." +MCIERR_SEQ_PORT_INUSE, "Portul MIDI specificat este ocupat. AÈteptaÈi eliberarea portului, apoi reÃ®ncercaÈi." +MCIERR_SEQ_PORT_MAPNODEVICE, "Configuratorul MIDI curent se referÄ la un dispozitiv MIDI care nu este instalat Ã®n sistem. UtilizaÈi opÈiunile de configurare MIDI din Panoul de control pentru a modifica configuraÈia curentÄ." +MCIERR_SEQ_PORT_MISCERROR, "La portul specificat a survenit o eroare." +MCIERR_SEQ_PORT_NONEXISTENT, "Dispozitivul MIDI specificat nu este instalat Ã®n sistem. UtilizaÈi opÈiunile Modul pilot din Panoul de control pentur a instala un dispozitiv MIDI." +MCIERR_SEQ_PORTUNSPECIFIED, "Ãn sistem nu existÄ portul MIDI specificat." +MCIERR_SEQ_TIMER, "Toate cronometrele multimedia sunt utilizate de cÄtre alte aplicaÈii. ÃnchideÈi una dintre aceste aplicaÈii, apoi reÃ®ncercaÈi." + +END Propchange: trunk/reactos/dll/win32/winmm/winmm_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/winmm/winmm_Ro.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/winmm/winmm_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_res.… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -41,6 +41,7 @@ #include "winmm_No.rc" #include "winmm_Pl.rc" #include "winmm_Pt.rc" +#include "winmm_Ro.rc" #include "winmm_Ru.rc" #include "winmm_Si.rc" #include "winmm_Sk.rc" Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=541… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=54… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -76,11 +76,16 @@ [Strings.040a] AUDIOClassName = "Dispositivos de sonido, vídeo y juegos" -[Strings.0416] +[Strings.0415] +ReactOS = "Ekipa ReactOS" AUDIOClassName = "Kontrolery audio, wideo i gier" [Strings.0416] AUDIOClassName = "Controladores de som, vídeo e jogo" +[Strings.0418] +ReactOS = "Echipa ReactOS" +AUDIOClassName = "Dispozitive audio & video" + [Strings.0427] AUDIOClassName = "Garso, vaizdo ir aidimu irenginiai" Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bda.inf?rev=5416… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=54… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=5416… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/disk.inf?rev=541… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=5416… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=5416… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5416… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ks.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ks.inf?rev=54168… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=5… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=5… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=54… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=541… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/unknown.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=5416… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/xboxdisp.inf?rev… ============================================================================== Binary files - no diff available. Added: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ro-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -1,0 +1,14 @@ + /* + * FILE: subsystems/ntvdm/lang/ro-RO.rc + ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-10-16 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +STRING_WelcomeMsg, "AsistenÈÄ pentru maÈina virtualÄ DOS.\n" +STRING_PromptMsg, "TastaÈi r<cr> pentru a executa, s<cr> pentru a Ã®nchide sau q<cr> pentru a ieÈi imediat." +END Propchange: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc.rc?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -22,5 +22,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -1,0 +1,65 @@ + /* + * FILE: subsystems/win32/csrss/win32csr/lang/ro-RO.rc + ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-10-16 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Terminare execuÈie - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Terminare execuÈie... aÈteptaÈi",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "DacÄ alegeÈi Ã®nchiderea forÈatÄ, riscaÈi pierderi de date. Pentru a forÈa Ã®nchiderea, apÄsaÈi âTerminÄ forÈatâ.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "TerminÄ &forÈat",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Terminare execuÈie - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "A&nuleazÄ",IDCANCEL,142,98,43,17 + PUSHBUTTON "TerminÄ &forÈat",IDC_END_NOW,78,98,43,17 + LTEXT "Acest program nu rÄspunde",IDC_STATIC,7,7,178,8 + LTEXT "Pentru a vÄ Ã®ntoarce Ã®n ReactOS Èi a verifica starea programului, apÄsaÈi âAnuleazÄâ", + IDC_STATIC,7,26,178,16 + LTEXT "DacÄ alegeÈi Ã®nchiderea imediatÄ a programului, riscaÈi pierderi de date. Pentru a forÈa Ã®nchiderea, apÄsaÈi âTerminÄ forÈatâ.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + +STRINGTABLE +BEGIN + IDS_EDIT "Editare" + IDS_MARK "MarcheazÄ" + IDS_COPY "Copie\tEnter" + IDS_PASTE "LipeÈte" + IDS_SELECTALL "SelecteazÄ tot" + IDS_SCROLL "Derulare" + IDS_FIND "GÄsire..." + IDS_DEFAULTS "Implicite" + IDS_PROPERTIES "ProprietÄÈi" + IDS_SCROLLHERE "DeruleazÄ aici" + IDS_SCROLLTOP "DeruleazÄ la Ã®nceput" + IDS_SCROLLBOTTOM "DeruleazÄ la sfÃ¢rÈit" + IDS_SCROLLPAGE_UP "Pagina anterioarÄ" + IDS_SCROLLPAGE_DOWN "Pagina urmÄtoare" + IDS_SCROLLUP "DeruleazÄ Ã®n sus" + IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" + + IDS_COMMAND_PROMPT "Linie de comandÄ" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Sun Oct 16 23:39:00 2011 @@ -24,5 +24,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

13 years, 2 months

[cgutman] 54167: [TCPIP] - Prevent corruption of the search context list using a combination of references and broader spin lock usage - Fixes bug 6506

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 16 22:21:41 2011 New Revision: 54167 URL: http://svn.reactos.org/svn/reactos?rev=54167&view=rev Log: [TCPIP] - Prevent corruption of the search context list using a combination of references and broader spin lock usage - Fixes bug 6506 Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Oct 16 22:21:41 2011 @@ -35,10 +35,20 @@ USHORT Protocol, PAF_SEARCH SearchContext) { + KIRQL OldIrql; + SearchContext->Address = Address; SearchContext->Port = Port; - SearchContext->Next = AddressFileListHead.Flink; SearchContext->Protocol = Protocol; + + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + + SearchContext->Next = AddressFileListHead.Flink; + + if (!IsListEmpty(&AddressFileListHead)) + ReferenceObject(CONTAINING_RECORD(SearchContext->Next, ADDRESS_FILE, ListEntry)); + + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); return AddrSearchNext(SearchContext); } @@ -104,13 +114,19 @@ KIRQL OldIrql; PADDRESS_FILE Current = NULL; BOOLEAN Found = FALSE; - - if (IsListEmpty(SearchContext->Next)) + + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + + if (SearchContext->Next == &AddressFileListHead) + { + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); return NULL; + } + + /* Remove the extra reference we added to keep this address file in memory */ + DereferenceObject(CONTAINING_RECORD(SearchContext->Next, ADDRESS_FILE, ListEntry)); CurrentEntry = SearchContext->Next; - - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); while (CurrentEntry != &AddressFileListHead) { Current = CONTAINING_RECORD(CurrentEntry, ADDRESS_FILE, ListEntry); @@ -136,13 +152,22 @@ CurrentEntry = CurrentEntry->Flink; } + if (Found) + { + SearchContext->Next = CurrentEntry->Flink; + + if (SearchContext->Next != &AddressFileListHead) + { + /* Reference the next address file to prevent the link from disappearing behind our back */ + ReferenceObject(CONTAINING_RECORD(SearchContext->Next, ADDRESS_FILE, ListEntry)); + } + } + else + Current = NULL; + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); - if (Found) { - SearchContext->Next = CurrentEntry->Flink; - return Current; - } else - return NULL; + return Current; } VOID AddrFileFree(

13 years, 2 months

[ion] 54166: [KERNEL32]: Move some definitions to header file. [KERNEL32]: MoveBasepLocateExeLdrEntry to utils.c.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 16 17:05:16 2011 New Revision: 54166 URL: http://svn.reactos.org/svn/reactos?rev=54166&view=rev Log: [KERNEL32]: Move some definitions to header file. [KERNEL32]: MoveBasepLocateExeLdrEntry to utils.c. Modified: trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Sun Oct 16 17:05:16 2011 @@ -10,27 +10,6 @@ #define NDEBUG #include <debug.h> - -typedef struct tagLOADPARMS32 { - LPSTR lpEnvAddress; - LPSTR lpCmdLine; - WORD wMagicValue; - WORD wCmdShow; - DWORD dwReserved; -} LOADPARMS32; - -extern BOOLEAN InWindows; -extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; - -#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 -#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 -#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 - -VOID -NTAPI -BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, - IN PVOID Context, - OUT BOOLEAN *StopEnumeration); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Oct 16 17:05:16 2011 @@ -371,37 +371,6 @@ &DuplicatedHandle, sizeof(HANDLE), &Dummy); - } -} - -VOID -NTAPI -BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, - IN PVOID Context, - OUT BOOLEAN *StopEnumeration) -{ - /* Make sure we get Entry, Context and valid StopEnumeration pointer */ - ASSERT(Entry); - ASSERT(Context); - ASSERT(StopEnumeration); - - /* If entry is already found - signal to stop */ - if (BasepExeLdrEntry) - { - /* Signal to stop enumeration and return */ - *StopEnumeration = TRUE; - return; - } - - /* We don't have a exe ldr entry, so try to see if this one is ours - by matching base address */ - if (Entry->DllBase == Context) - { - /* It matches, so remember the ldr entry */ - BasepExeLdrEntry = Entry; - - /* And stop enumeration */ - *StopEnumeration = TRUE; } } Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Oct 16 17:05:16 2011 @@ -25,6 +25,34 @@ /* FUNCTIONS ****************************************************************/ +VOID +NTAPI +BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, + IN PVOID Context, + OUT BOOLEAN *StopEnumeration) +{ + /* Make sure we get Entry, Context and valid StopEnumeration pointer */ + ASSERT(Entry); + ASSERT(Context); + ASSERT(StopEnumeration); + + /* If entry is already found - signal to stop */ + if (BasepExeLdrEntry) + { + *StopEnumeration = TRUE; + return; + } + + /* Otherwise keep enumerating until we find a match */ + if (Entry->DllBase == Context) + { + /* It matches, so remember the ldr entry */ + BasepExeLdrEntry = Entry; + + /* And stop enumeration */ + *StopEnumeration = TRUE; + } +} /* * Converts an ANSI or OEM String to the TEB StaticUnicodeString Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Oct 16 17:05:16 2011 @@ -80,6 +80,20 @@ CPTABLEINFO CodePageTable; } CODEPAGE_ENTRY, *PCODEPAGE_ENTRY; +typedef struct tagLOADPARMS32 { + LPSTR lpEnvAddress; + LPSTR lpCmdLine; + WORD wMagicValue; + WORD wCmdShow; + DWORD dwReserved; +} LOADPARMS32; + + +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 + + extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; typedef @@ -87,6 +101,10 @@ (*WaitForInputIdleType)( HANDLE hProcess, DWORD dwMilliseconds); + + +extern BOOLEAN InWindows; +extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; /* GLOBAL VARIABLES **********************************************************/ @@ -260,3 +278,9 @@ BOOL bInheritHandle, DWORD dwOptions); +VOID +NTAPI +BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, + IN PVOID Context, + OUT BOOLEAN *StopEnumeration); +

13 years, 2 months

[akhaldi] 54165: [MSXML3] * Don't link to libxslt in rbuild build. Dedicated to Alex.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 16 16:28:47 2011 New Revision: 54165 URL: http://svn.reactos.org/svn/reactos?rev=54165&view=rev Log: [MSXML3] * Don't link to libxslt in rbuild build. Dedicated to Alex. Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Sun Oct 16 16:28:47 2011 @@ -14,7 +14,6 @@ <define name="LIBXML_STATIC" /> <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <library>libxml2</library> - <library>libxslt</library> <library>wine</library> <library>wineldr</library> <library>urlmon</library>

13 years, 2 months

[khornicek] 54164: [EXPLORER] Make the Network connections start menu item open the net connections folder. Trim a misleading message.

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Oct 16 16:12:55 2011 New Revision: 54164 URL: http://svn.reactos.org/svn/reactos?rev=54164&view=rev Log: [EXPLORER] Make the Network connections start menu item open the net connections folder. Trim a misleading message. Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sun Oct 16 16:12:55 2011 @@ -2039,26 +2039,29 @@ #endif break; - case IDC_CONNECTIONS: + case IDC_CONNECTIONS:{ + CloseStartMenu(id); #ifndef ROSSHELL -#ifdef __REACTOS__ // to be removed when RAS will be implemented - MessageBox(0, TEXT("RAS folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); -#else - CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS)); - //CloseStartMenu(id); - //MainFrame::Create(SpecialFolderPath(CSIDL_CONNECTIONS, _hwnd), OWM_PIDL); -#endif +#ifndef _NO_MDI + XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); + bool mdi = XMLBool(explorer_options, "mdi", true); + + if (mdi) + MDIMainFrame::Create(SHELLPATH_NET_CONNECTIONS, 0); + else +#endif + SDIMainFrame::Create(SHELLPATH_NET_CONNECTIONS, 0); #else launch_file(_hwnd, SHELLPATH_NET_CONNECTIONS); #endif - break; + break;} // browse menu case IDC_NETWORK: #ifdef __REACTOS__ ///@todo to be removed when network browsing will be implemented in shell namespace - MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK); + MessageBox(0, TEXT("not yet implemented"), ResString(IDS_TITLE), MB_OK); #else CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK)); #endif @@ -2192,13 +2195,14 @@ { super::AddEntries(); -#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printers will be implemented //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU); - AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS_MENU); +#endif + AddButton(ResString(IDS_CONNECTIONS), ICID_NETCONNS, false, IDC_CONNECTIONS); -#endif + AddButton(ResString(IDS_ADMIN), ICID_ADMIN, true, IDC_ADMIN); #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)

13 years, 2 months

[rharabien] 54163: [WIN32K] - Remove ReadRegistryValue in kbdlayout.c as we already implement RegQueryValue for reading from registry in W32k. This function additionally checks value type. - Rename...

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Oct 16 15:39:07 2011 New Revision: 54163 URL: http://svn.reactos.org/svn/reactos?rev=54163&view=rev Log: [WIN32K] - Remove ReadRegistryValue in kbdlayout.c as we already implement RegQueryValue for reading from registry in W32k. This function additionally checks value type. - Rename KBL to KL based on Techwiki - HKCU\Keyboard Layout\Preload value is REG_SZ (not REG_EXPAND_SZ) - NtUserLoadKeyboardLayoutEx should set last error if flags are invalid - Minor keyboard layout code cleanup Modified: trunk/reactos/boot/bootdata/livecd.inf trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/boot/bootdata/livecd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Sun Oct 16 15:39:07 2011 @@ -8,7 +8,7 @@ [AddReg] ; Default locale for the keyboard layout -HKU,".DEFAULT\Keyboard Layout\Preload","1",0x00020000,"00000409" +HKU,".DEFAULT\Keyboard Layout\Preload","1",0x00000000,"00000409" ; Cdfs (ISO96660) filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000000 Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Sun Oct 16 15:39:07 2011 @@ -2,17 +2,17 @@ #include <ndk/kbd.h> -typedef struct _KBL +typedef struct _KL { LIST_ENTRY List; DWORD Flags; WCHAR Name[KL_NAMELENGTH]; // used w GetKeyboardLayoutName same as wszKLID. - struct _KBDTABLES* KBTables; // KBDTABLES in ndk/kbd.h + struct _KBDTABLES *KBTables; // KBDTABLES in ndk/kbd.h HANDLE hModule; ULONG RefCount; HKL hkl; DWORD klid; // Low word - language id. High word - device id. -} KBL, *PKBL; +} KL, *PKL; typedef struct _ATTACHINFO { @@ -39,14 +39,14 @@ INIT_FUNCTION NTSTATUS NTAPI InitInputImpl(VOID); INIT_FUNCTION NTSTATUS NTAPI InitKeyboardImpl(VOID); VOID NTAPI UserInitKeyboard(HANDLE hKeyboardDevice); -PKBL W32kGetDefaultKeyLayout(VOID); +PKL W32kGetDefaultKeyLayout(VOID); VOID NTAPI UserProcessKeyboardInput(PKEYBOARD_INPUT_DATA pKeyInput); BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected); VOID NTAPI UserProcessMouseInput(PMOUSE_INPUT_DATA Data, ULONG InputCount); BOOL FASTCALL IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi, BOOL Injected); BOOL UserInitDefaultKeyboardLayout(VOID); -PKBL UserHklToKbl(HKL hKl); +PKL UserHklToKbl(HKL hKl); VOID NTAPI KeyboardThreadMain(PVOID StartContext); DWORD NTAPI CreateSystemThreads(UINT Type); BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Oct 16 15:39:07 2011 @@ -69,7 +69,7 @@ PTL ptl; PPROCESSINFO ppi; struct _USER_MESSAGE_QUEUE* MessageQueue; - struct _KBL* KeyboardLayout; + struct _KL* KeyboardLayout; PCLIENTTHREADINFO pcti; struct _DESKTOP* rpdesk; PDESKTOPINFO pDeskInfo; @@ -188,7 +188,7 @@ LIST_ENTRY PrivateFontListHead; FAST_MUTEX DriverObjListLock; LIST_ENTRY DriverObjListHead; - struct _KBL* KeyboardLayout; // THREADINFO only + struct _KL* KeyboardLayout; // THREADINFO only W32HEAP_USER_MAPPING HeapMappings; struct _GDI_POOL *pPoolDcAttr; struct _GDI_POOL *pPoolBrushAttr; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sun Oct 16 15:39:07 2011 @@ -5,251 +5,156 @@ * PURPOSE: Keyboard layout management * COPYRIGHT: Copyright 2007 Saveliy Tretiakov * Copyright 2008 Colin Finck + * Copyright 2011 Rafal Harabien */ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserKbdLayout); -PKBL KBLList = NULL; // Keyboard layout list. - -typedef PVOID (*KbdLayerDescriptor)(VOID); +PKL gpklFirst = NULL; // Keyboard layout list. + +typedef PVOID (*PFNKBDLAYERDESCRIPTOR)(VOID); /* PRIVATE FUNCTIONS ******************************************************/ - -/* - * Utility function to read a value from the registry more easily. - * - * IN PUNICODE_STRING KeyName -> Name of key to open - * IN PUNICODE_STRING ValueName -> Name of value to open - * OUT PUNICODE_STRING ReturnedValue -> String contained in registry - * - * Returns NTSTATUS - */ - -static NTSTATUS APIENTRY ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) +static BOOL +UserLoadKbdDll(CONST WCHAR *wszKLID, + HANDLE *phModule, + PKBDTABLES *pKbdTables) { NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - PWCHAR ReturnBuffer; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + HKEY hKey; + ULONG cbSize; + PFNKBDLAYERDESCRIPTOR pfnKbdLayerDescriptor; + WCHAR wszLayoutRegKey[256] = L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet\\" + L"Control\\Keyboard Layouts\\"; + WCHAR wszLayoutPath[MAX_PATH] = L"\\SystemRoot\\System32\\"; + + /* Open layout registry key */ + RtlStringCbCatW(wszLayoutRegKey, sizeof(wszLayoutRegKey), wszKLID); + Status = RegOpenKey(wszLayoutRegKey, &hKey); if (!NT_SUCCESS(Status)) { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if (Status != STATUS_BUFFER_TOO_SMALL) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof(*KeyValuePartialInfo); - KeyValuePartialInfo = - ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); - Length = ResLength; - - if (!KeyValuePartialInfo) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, - ValueName, - KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - + ERR("Failed to open keyboard layouts registry key %ws (%lx)\n", wszKLID, Status); + return FALSE; + } + + /* Read filename of layout DLL and close the key */ + cbSize = sizeof(wszLayoutPath) - (wcslen(wszLayoutPath) + 1)*sizeof(WCHAR); + Status = RegQueryValue(hKey, + L"Layout File", + REG_SZ, + wszLayoutPath + wcslen(wszLayoutPath), + &cbSize); + ZwClose(hKey); if (!NT_SUCCESS(Status)) { - NtClose(KeyHandle); - ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); - return Status; - } - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - ReturnBuffer = ExAllocatePoolWithTag(PagedPool, - KeyValuePartialInfo->DataLength, - TAG_STRING); - - if (!ReturnBuffer) - { - NtClose(KeyHandle); - ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); - return STATUS_NO_MEMORY; - } - - RtlCopyMemory(ReturnBuffer, - KeyValuePartialInfo->Data, - KeyValuePartialInfo->DataLength); - RtlInitUnicodeString(ReturnedValue, ReturnBuffer); - - ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); - NtClose(KeyHandle); - - return Status; -} - -static BOOL UserLoadKbdDll(WCHAR *wsKLID, - HANDLE *phModule, - PKBDTABLES *pKbdTables) -{ - NTSTATUS Status; - KbdLayerDescriptor layerDescGetFn; - ANSI_STRING kbdProcedureName; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - UNICODE_STRING klid; - WCHAR LayoutPathBuffer[MAX_PATH] = L"\\SystemRoot\\System32\\"; - WCHAR KeyNameBuffer[MAX_PATH] = L"\\REGISTRY\\Machine\\SYSTEM\\" - L"CurrentControlSet\\Control\\Keyboard Layouts\\"; - - RtlInitUnicodeString(&klid, wsKLID); - RtlInitUnicodeString(&LayoutValueName, L"Layout File"); - RtlInitUnicodeString(&LayoutKeyName, KeyNameBuffer); - LayoutKeyName.MaximumLength = sizeof(KeyNameBuffer); - - RtlAppendUnicodeStringToString(&LayoutKeyName, &klid); - Status = ReadRegistryValue(&LayoutKeyName, &LayoutValueName, &LayoutFile); - - if (!NT_SUCCESS(Status)) - { - TRACE("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); + TRACE("Can't get layout filename for %ws (%lx)\n", wszKLID, Status); return FALSE; } - TRACE("Read registry and got %wZ\n", &LayoutFile); - RtlInitUnicodeString(&FullLayoutPath, LayoutPathBuffer); - FullLayoutPath.MaximumLength = sizeof(LayoutPathBuffer); - RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); - TRACE("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - ExFreePoolWithTag(LayoutFile.Buffer, TAG_STRING); - - *phModule = EngLoadImage(FullLayoutPath.Buffer); - - if (*phModule) - { - TRACE("Loaded %wZ\n", &FullLayoutPath); - - RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - layerDescGetFn = EngFindImageProcAddress(*phModule, "KbdLayerDescriptor"); - - if (layerDescGetFn) - { - *pKbdTables = layerDescGetFn(); - } - else - { - ERR("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); - } - - if (!layerDescGetFn || !*pKbdTables) - { - ERR("Failed to load the keyboard layout.\n"); - EngUnloadImage(*phModule); - return FALSE; - } + /* Load keyboard layout DLL */ + TRACE("Loading Keyboard DLL %ws\n", wszLayoutPath); + *phModule = EngLoadImage(wszLayoutPath); + if (!(*phModule)) + { + ERR("Failed to load dll %ws\n", wszLayoutPath); + return FALSE; + } + + /* Find KbdLayerDescriptor function and get layout tables */ + TRACE("Loaded %ws\n", wszLayoutPath); + pfnKbdLayerDescriptor = EngFindImageProcAddress(*phModule, "KbdLayerDescriptor"); + + if (pfnKbdLayerDescriptor) + *pKbdTables = pfnKbdLayerDescriptor(); + else + ERR("Error: %ws has no KbdLayerDescriptor()\n", wszLayoutPath); + + if (!pfnKbdLayerDescriptor || !*pKbdTables) + { + ERR("Failed to load the keyboard layout.\n"); + EngUnloadImage(*phModule); + return FALSE; + } #if 0 // Dump keyboard layout - { - unsigned i; - PVK_TO_BIT pVkToBit = (*pKbdTables)->pCharModifiers->pVkToBit; - PVK_TO_WCHAR_TABLE pVkToWchTbl = (*pKbdTables)->pVkToWcharTable; - PVSC_VK pVscVk = (*pKbdTables)->pVSCtoVK_E0; - DbgPrint("Kbd layout: fLocaleFlags %x bMaxVSCtoVK %x\n", (*pKbdTables)->fLocaleFlags, (*pKbdTables)->bMaxVSCtoVK); - DbgPrint("wMaxModBits %x\n", (*pKbdTables)->pCharModifiers->wMaxModBits); - while (pVkToBit->Vk) + { + unsigned i; + PVK_TO_BIT pVkToBit = (*pKbdTables)->pCharModifiers->pVkToBit; + PVK_TO_WCHAR_TABLE pVkToWchTbl = (*pKbdTables)->pVkToWcharTable; + PVSC_VK pVscVk = (*pKbdTables)->pVSCtoVK_E0; + DbgPrint("Kbd layout: fLocaleFlags %x bMaxVSCtoVK %x\n", (*pKbdTables)->fLocaleFlags, (*pKbdTables)->bMaxVSCtoVK); + DbgPrint("wMaxModBits %x\n", (*pKbdTables)->pCharModifiers->wMaxModBits); + while (pVkToBit->Vk) + { + DbgPrint("VkToBit %x -> %x\n", pVkToBit->Vk, pVkToBit->ModBits); + ++pVkToBit; + } + for (i = 0; i <= (*pKbdTables)->pCharModifiers->wMaxModBits; ++i) + DbgPrint("ModNumber %x -> %x\n", i, (*pKbdTables)->pCharModifiers->ModNumber[i]); + while (pVkToWchTbl->pVkToWchars) + { + PVK_TO_WCHARS1 pVkToWch = pVkToWchTbl->pVkToWchars; + DbgPrint("pVkToWchTbl nModifications %x cbSize %x\n", pVkToWchTbl->nModifications, pVkToWchTbl->cbSize); + while (pVkToWch->VirtualKey) { - DbgPrint("VkToBit %x -> %x\n", pVkToBit->Vk, pVkToBit->ModBits); - ++pVkToBit; + DbgPrint("pVkToWch VirtualKey %x Attributes %x wc { ", pVkToWch->VirtualKey, pVkToWch->Attributes); + for (i = 0; i < pVkToWchTbl->nModifications; ++i) + DbgPrint("%x ", pVkToWch->wch[i]); + DbgPrint("}\n"); + pVkToWch = (PVK_TO_WCHARS1)(((PBYTE)pVkToWch) + pVkToWchTbl->cbSize); } - for (i = 0; i <= (*pKbdTables)->pCharModifiers->wMaxModBits; ++i) - DbgPrint("ModNumber %x -> %x\n", i, (*pKbdTables)->pCharModifiers->ModNumber[i]); - while (pVkToWchTbl->pVkToWchars) - { - PVK_TO_WCHARS1 pVkToWch = pVkToWchTbl->pVkToWchars; - DbgPrint("pVkToWchTbl nModifications %x cbSize %x\n", pVkToWchTbl->nModifications, pVkToWchTbl->cbSize); - while (pVkToWch->VirtualKey) - { - DbgPrint("pVkToWch VirtualKey %x Attributes %x wc { ", pVkToWch->VirtualKey, pVkToWch->Attributes); - for (i = 0; i < pVkToWchTbl->nModifications; ++i) - DbgPrint("%x ", pVkToWch->wch[i]); - DbgPrint("}\n"); - pVkToWch = (PVK_TO_WCHARS1)(((PBYTE)pVkToWch) + pVkToWchTbl->cbSize); - } - ++pVkToWchTbl; - } - DbgPrint("pusVSCtoVK: { "); - for (i = 0; i < (*pKbdTables)->bMaxVSCtoVK; ++i) - DbgPrint("%x -> %x, ", i, (*pKbdTables)->pusVSCtoVK[i]); - DbgPrint("}\n"); - DbgPrint("pVSCtoVK_E0: { "); - while (pVscVk->Vsc) - { - DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); - ++pVscVk; - } - DbgPrint("}\n"); - pVscVk = (*pKbdTables)->pVSCtoVK_E1; - DbgPrint("pVSCtoVK_E1: { "); - while (pVscVk->Vsc) - { - DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); - ++pVscVk; - } - DbgPrint("}\n"); - } + ++pVkToWchTbl; + } + DbgPrint("pusVSCtoVK: { "); + for (i = 0; i < (*pKbdTables)->bMaxVSCtoVK; ++i) + DbgPrint("%x -> %x, ", i, (*pKbdTables)->pusVSCtoVK[i]); + DbgPrint("}\n"); + DbgPrint("pVSCtoVK_E0: { "); + while (pVscVk->Vsc) + { + DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); + ++pVscVk; + } + DbgPrint("}\n"); + pVscVk = (*pKbdTables)->pVSCtoVK_E1; + DbgPrint("pVSCtoVK_E1: { "); + while (pVscVk->Vsc) + { + DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); + ++pVscVk; + } + DbgPrint("}\n"); DbgBreakPoint(); + } #endif - } - else - { - ERR("Failed to load dll %wZ\n", &FullLayoutPath); - return FALSE; - } return TRUE; } -static PKBL UserLoadDllAndCreateKbl(DWORD LocaleId) -{ - PKBL NewKbl; +static PKL +UserLoadDllAndCreateKbl(DWORD LocaleId) +{ + PKL pNewKbl; ULONG hKl; LANGID langid; - NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), USERTAG_KBDLAYOUT); - - if (!NewKbl) - { - ERR("%s: Can't allocate memory!\n", __FUNCTION__); + pNewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KL), USERTAG_KBDLAYOUT); + + if (!pNewKbl) + { + ERR("Can't allocate memory!\n"); return NULL; } - swprintf(NewKbl->Name, L"%08lx", LocaleId); - - if (!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) - { - TRACE("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); - ExFreePoolWithTag(NewKbl, USERTAG_KBDLAYOUT); + swprintf(pNewKbl->Name, L"%08lx", LocaleId); + + if (!UserLoadKbdDll(pNewKbl->Name, &pNewKbl->hModule, &pNewKbl->KBTables)) + { + ERR("Failed to load %x dll!\n", LocaleId); + ExFreePoolWithTag(pNewKbl, USERTAG_KBDLAYOUT); return NULL; } @@ -265,158 +170,155 @@ hKl |= 0xe001 << 16; /* FIXME */ else hKl |= hKl << 16; - NewKbl->hkl = (HKL)(ULONG_PTR) hKl; - NewKbl->klid = LocaleId; - NewKbl->Flags = 0; - NewKbl->RefCount = 0; - - return NewKbl; -} - -BOOL UserInitDefaultKeyboardLayout() + pNewKbl->hkl = (HKL)(ULONG_PTR) hKl; + pNewKbl->klid = LocaleId; + pNewKbl->Flags = 0; + pNewKbl->RefCount = 0; + + return pNewKbl; +} + +BOOL +UserInitDefaultKeyboardLayout() { LCID LocaleId; NTSTATUS Status; + /* Load keyboard layout for default locale */ Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { + if (NT_SUCCESS(Status)) + { + TRACE("DefaultLocale = %08lx\n", LocaleId); + gpklFirst = UserLoadDllAndCreateKbl(LocaleId); + } + else ERR("Could not get default locale (%08lx).\n", Status); - } - else - { - TRACE("DefaultLocale = %08lx\n", LocaleId); - } - - if (!NT_SUCCESS(Status) || !(KBLList = UserLoadDllAndCreateKbl(LocaleId))) - { + + if (!NT_SUCCESS(Status) || !gpklFirst) + { + /* If failed load US keyboard layout */ ERR("Trying to load US Keyboard Layout.\n"); LocaleId = 0x409; - if (!(KBLList = UserLoadDllAndCreateKbl(LocaleId))) + if (!(gpklFirst = UserLoadDllAndCreateKbl(LocaleId))) { ERR("Failed to load any Keyboard Layout\n"); return FALSE; } } - KBLList->Flags |= KBL_PRELOAD; - - InitializeListHead(&KBLList->List); + /* Add layout to the list */ + gpklFirst->Flags |= KBL_PRELOAD; + InitializeListHead(&gpklFirst->List); + return TRUE; } -PKBL W32kGetDefaultKeyLayout(VOID) -{ - const WCHAR szKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; - const WCHAR szDefaultUserPath[] = L"\\REGISTRY\\USER\\.DEFAULT"; - - HANDLE KeyHandle; +PKL +W32kGetDefaultKeyLayout(VOID) +{ + CONST WCHAR wszDefaultUserPath[] = L"\\REGISTRY\\USER\\.DEFAULT"; + CONST WCHAR wszKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; + WCHAR wszKbdLayoutKey[256], *pwsz; + size_t cbRemaining; + HKEY hKey; + ULONG cbValue; LCID LayoutLocaleId = 0; NTSTATUS Status; - OBJECT_ATTRIBUTES KeyAttributes; - PKBL pKbl; + PKL pKbl; UNICODE_STRING CurrentUserPath; - UNICODE_STRING FullKeyboardLayoutPath; - UNICODE_STRING LayoutValueName; - UNICODE_STRING LayoutLocaleIdString; WCHAR wszBuffer[MAX_PATH]; - // Get the path to HKEY_CURRENT_USER + /* Try to get default alayout from HKCU\Keyboard Layout\Preload first */ Status = RtlFormatCurrentUserKeyPath(&CurrentUserPath); - if (NT_SUCCESS(Status)) { - FullKeyboardLayoutPath.Buffer = wszBuffer; - FullKeyboardLayoutPath.MaximumLength = sizeof(wszBuffer); - - // FIXME: Is this 100% correct? - // We're called very early, so HKEY_CURRENT_USER might not be available yet. Check this first. - InitializeObjectAttributes(&KeyAttributes, &CurrentUserPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); - - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - // It is not available, so read it from HKEY_USERS\.DEFAULT - FullKeyboardLayoutPath.Length = sizeof(szDefaultUserPath) - sizeof(UNICODE_NULL); - RtlCopyMemory(wszBuffer, szDefaultUserPath, sizeof(szDefaultUserPath)); - } + /* FIXME: We're called very early, so HKEY_CURRENT_USER might not be + available yet. Check this first. */ + RtlStringCbCopyNExW(wszKbdLayoutKey, sizeof(wszKbdLayoutKey), + CurrentUserPath.Buffer, CurrentUserPath.Length, + &pwsz, &cbRemaining, 0); + RtlStringCbCopyW(pwsz, cbRemaining, wszKeyboardLayoutPath); + Status = RegOpenKey(wszKbdLayoutKey, &hKey); + + /* Free CurrentUserPath - we dont need it anymore */ + RtlFreeUnicodeString(&CurrentUserPath); + } + + /* If failed try HKU\.DEFAULT\Keyboard Layout\Preload */ + if (!NT_SUCCESS(Status)) + { + RtlStringCbCopyNExW(wszKbdLayoutKey, sizeof(wszKbdLayoutKey), + wszDefaultUserPath, sizeof(wszDefaultUserPath), + &pwsz, &cbRemaining, 0); + RtlStringCbCopyW(pwsz, cbRemaining, wszKeyboardLayoutPath); + Status = RegOpenKey(wszKbdLayoutKey, &hKey); + } + + if (NT_SUCCESS(Status)) + { + /* Return the first keyboard layout listed there */ + cbValue = sizeof(wszBuffer); + Status = RegQueryValue(hKey, L"1", REG_SZ, wszBuffer, &cbValue); + if (NT_SUCCESS(Status)) + LayoutLocaleId = (LCID)wcstol(wszBuffer, NULL, 16); else - { - // The path is available - ZwClose(KeyHandle); - RtlCopyUnicodeString(&FullKeyboardLayoutPath, &CurrentUserPath); - } - - // Free CurrentUserPath - we dont need it anymore - RtlFreeUnicodeString(&CurrentUserPath); - - Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); - - if (NT_SUCCESS(Status)) - { - // Return the first keyboard layout listed there - RtlInitUnicodeString(&LayoutValueName, L"1"); - - Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); - - if (NT_SUCCESS(Status)) - { - RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); - ExFreePoolWithTag(LayoutLocaleIdString.Buffer, TAG_STRING); - } - else - ERR("ReadRegistryValue failed! (%08lx).\n", Status); - } - else - ERR("RtlAppendUnicodeToString failed! (%08lx)\n", Status); + ERR("RegQueryValue failed (%08lx)\n", Status); + + /* Close the key */ + ZwClose(hKey); } else - ERR("RtlFormatCurrentUserKeyPath failed! (%08lx)\n", Status); - + ERR("Failed to open keyboard layout preload key (%08lx)\n", Status); + + /* If we failed loading settings from registry use US layout */ if (!LayoutLocaleId) { ERR("Assuming default locale for the keyboard layout (0x409 - US)\n"); LayoutLocaleId = 0x409; } - pKbl = KBLList; + /* Check if layout is already loaded */ + pKbl = gpklFirst; do { if (pKbl->klid == LayoutLocaleId) - { return pKbl; - } - - pKbl = (PKBL) pKbl->List.Flink; - } while (pKbl != KBLList); - + + pKbl = CONTAINING_RECORD(pKbl->List.Flink, KL, List); + } while (pKbl != gpklFirst); + + /* Load the keyboard layout */ TRACE("Loading new default keyboard layout.\n"); pKbl = UserLoadDllAndCreateKbl(LayoutLocaleId); - if (!pKbl) { - TRACE("Failed to load %x!!! Returning any availableKL.\n", LayoutLocaleId); - return KBLList; - } - - InsertTailList(&KBLList->List, &pKbl->List); + ERR("Failed to load %x!!! Returning any available KL.\n", LayoutLocaleId); + return gpklFirst; + } + + /* Add loaded layout to the list */ + InsertTailList(&gpklFirst->List, &pKbl->List); return pKbl; } -PKBL UserHklToKbl(HKL hKl) -{ - PKBL pKbl = KBLList; +PKL +UserHklToKbl(HKL hKl) +{ + PKL pKbl = gpklFirst; do { - if (pKbl->hkl == hKl) return pKbl; - pKbl = (PKBL) pKbl->List.Flink; - } while (pKbl != KBLList); + if (pKbl->hkl == hKl) + return pKbl; + + pKbl = CONTAINING_RECORD(pKbl->List.Flink, KL, List); + } while (pKbl != gpklFirst); return NULL; } -BOOL UserUnloadKbl(PKBL pKbl) +BOOL +UserUnloadKbl(PKL pKbl) { /* According to msdn, UnloadKeyboardLayout can fail if the keyboard layout identifier was preloaded. */ @@ -444,13 +346,14 @@ return TRUE; } -static PKBL co_UserActivateKbl(PTHREADINFO w32Thread, PKBL pKbl, UINT Flags) -{ - PKBL Prev; - - Prev = w32Thread->KeyboardLayout; - Prev->RefCount--; - w32Thread->KeyboardLayout = pKbl; +static PKL +co_UserActivateKbl(PTHREADINFO pti, PKL pKbl, UINT Flags) +{ + PKL pklPrev; + + pklPrev = pti->KeyboardLayout; + pklPrev->RefCount--; + pti->KeyboardLayout = pKbl; pKbl->RefCount++; if (Flags & KLF_SETFORPROCESS) @@ -459,18 +362,18 @@ } - if (Prev->Flags & KBL_UNLOAD && Prev->RefCount == 0) - { - UserUnloadKbl(Prev); + if (pklPrev->Flags & KBL_UNLOAD && pklPrev->RefCount == 0) + { + UserUnloadKbl(pklPrev); } // Send WM_INPUTLANGCHANGE to thread's focus window - co_IntSendMessage(w32Thread->MessageQueue->FocusWindow, + co_IntSendMessage(pti->MessageQueue->FocusWindow, WM_INPUTLANGCHANGE, 0, // FIXME: put charset here (what is this?) (LPARAM)pKbl->hkl); //klid - return Prev; + return pklPrev; } /* EXPORTS *******************************************************************/ @@ -481,13 +384,13 @@ { NTSTATUS Status; PETHREAD Thread; - PTHREADINFO W32Thread; + PTHREADINFO pti; HKL Ret; if (!dwThreadId) { - W32Thread = PsGetCurrentThreadWin32Thread(); - return W32Thread->KeyboardLayout->hkl; + pti = PsGetCurrentThreadWin32Thread(); + return pti->KeyboardLayout->hkl; } Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); @@ -497,8 +400,8 @@ return NULL; } - W32Thread = PsGetThreadWin32Thread(Thread); - Ret = W32Thread->KeyboardLayout->hkl; + pti = PsGetThreadWin32Thread(Thread); + Ret = pti->KeyboardLayout->hkl; ObDereferenceObject(Thread); return Ret; } @@ -506,37 +409,41 @@ UINT APIENTRY NtUserGetKeyboardLayoutList( - INT nItems, + INT nBuff, HKL* pHklBuff) { - UINT Ret = 0; - PKBL pKbl; + UINT uRet = 0; + PKL pKbl; UserEnterShared(); - pKbl = KBLList; - - if (nItems == 0) + pKbl = gpklFirst; + + if (!pHklBuff) + nBuff = 0; + + if (nBuff == 0) { do { - Ret++; - pKbl = (PKBL) pKbl->List.Flink; - } while (pKbl != KBLList); + uRet++; + pKbl = CONTAINING_RECORD(pKbl->List.Flink, KL, List); + } while (pKbl != gpklFirst); } else { _SEH2_TRY { - ProbeForWrite(pHklBuff, nItems*sizeof(HKL), 4); - - while (Ret < nItems) + ProbeForWrite(pHklBuff, nBuff*sizeof(HKL), 4); + + while (uRet < nBuff) { if (!(pKbl->Flags & KBL_UNLOAD)) { - pHklBuff[Ret] = pKbl->hkl; - Ret++; - pKbl = (PKBL) pKbl->List.Flink; - if (pKbl == KBLList) break; + pHklBuff[uRet] = pKbl->hkl; + uRet++; + pKbl = CONTAINING_RECORD(pKbl->List.Flink, KL, List); + if (pKbl == gpklFirst) + break; } } @@ -544,13 +451,13 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - Ret = 0; + uRet = 0; } _SEH2_END; } UserLeave(); - return Ret; + return uRet; } BOOL @@ -558,8 +465,8 @@ NtUserGetKeyboardLayoutName( LPWSTR lpszName) { - BOOL ret = FALSE; - PKBL pKbl; + BOOL bRet = FALSE; + PKL pKbl; PTHREADINFO pti; UserEnterShared(); @@ -569,20 +476,18 @@ ProbeForWrite(lpszName, KL_NAMELENGTH*sizeof(WCHAR), 1); pti = PsGetCurrentThreadWin32Thread(); pKbl = pti->KeyboardLayout; - RtlCopyMemory(lpszName, pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR)); - ret = TRUE; + RtlCopyMemory(lpszName, pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR)); + bRet = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; } _SEH2_END; UserLeave(); - return ret; -} - + return bRet; +} HKL APIENTRY @@ -595,24 +500,32 @@ IN DWORD dwKLID, IN UINT Flags) { - HKL Ret = NULL; - PKBL pKbl = NULL, Cur; + HKL hklRet = NULL; + PKL pKbl = NULL, pklCur; + + if (Flags & ~(KLF_ACTIVATE|KLF_NOTELLSHELL|KLF_REORDER|KLF_REPLACELANG| + KLF_SUBSTITUTE_OK|KLF_SETFORPROCESS|KLF_UNLOADPREVIOUS)) + { + ERR("Invalid flags: %x\n", Flags); + EngSetLastError(ERROR_INVALID_FLAGS); + return 0; + } UserEnterExclusive(); //Let's see if layout was already loaded. - Cur = KBLList; + pklCur = gpklFirst; do { - if (Cur->klid == dwKLID) - { - pKbl = Cur; + if (pklCur->klid == dwKLID) + { + pKbl = pklCur; pKbl->Flags &= ~KBL_UNLOAD; break; } - Cur = (PKBL) Cur->List.Flink; - } while (Cur != KBLList); + pklCur = CONTAINING_RECORD(pKbl->List.Flink, KL, List); + } while (pklCur != gpklFirst); //It wasn't, so load it. if (!pKbl) @@ -621,28 +534,28 @@ if (!pKbl) { - goto the_end; - } - - InsertTailList(&KBLList->List, &pKbl->List); - } - - if (Flags & KLF_REORDER) KBLList = pKbl; + goto cleanup; + } + + InsertTailList(&gpklFirst->List, &pKbl->List); + } + + if (Flags & KLF_REORDER) gpklFirst = pKbl; if (Flags & KLF_ACTIVATE) { co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl, Flags); } - Ret = pKbl->hkl; + hklRet = pKbl->hkl; //FIXME: KLF_NOTELLSHELL // KLF_REPLACELANG // KLF_SUBSTITUTE_OK -the_end: +cleanup: UserLeave(); - return Ret; + return hklRet; } HKL @@ -651,27 +564,27 @@ HKL hKl, ULONG Flags) { - PKBL pKbl; - HKL Ret = NULL; - PTHREADINFO pWThread; + PKL pKbl; + HKL hklRet = NULL; + PTHREADINFO pti; UserEnterExclusive(); - pWThread = PsGetCurrentThreadWin32Thread(); - - if (pWThread->KeyboardLayout->hkl == hKl) - { - Ret = hKl; - goto the_end; + pti = PsGetCurrentThreadWin32Thread(); + + if (pti->KeyboardLayout->hkl == hKl) + { + hklRet = hKl; + goto cleanup; } if (hKl == (HKL)HKL_NEXT) { - pKbl = (PKBL)pWThread->KeyboardLayout->List.Flink; + pKbl = CONTAINING_RECORD(pti->KeyboardLayout->List.Flink, KL, List); } else if (hKl == (HKL)HKL_PREV) { - pKbl = (PKBL)pWThread->KeyboardLayout->List.Blink; + pKbl = CONTAINING_RECORD(pti->KeyboardLayout->List.Blink, KL, List); } else pKbl = UserHklToKbl(hKl); @@ -680,16 +593,16 @@ if (pKbl) { if (Flags & KLF_REORDER) - KBLList = pKbl; - - if (pKbl == pWThread->KeyboardLayout) - { - Ret = pKbl->hkl; + gpklFirst = pKbl; + + if (pKbl == pti->KeyboardLayout) + { + hklRet = pKbl->hkl; } else { - pKbl = co_UserActivateKbl(pWThread, pKbl, Flags); - Ret = pKbl->hkl; + pKbl = co_UserActivateKbl(pti, pKbl, Flags); + hklRet = pKbl->hkl; } } else @@ -697,9 +610,9 @@ ERR("Invalid HKL %x!\n", hKl); } -the_end: +cleanup: UserLeave(); - return Ret; + return hklRet; } BOOL @@ -707,14 +620,15 @@ NtUserUnloadKeyboardLayout( HKL hKl) { - PKBL pKbl; - BOOL Ret = FALSE; + PKL pKbl; + BOOL bRet = FALSE; UserEnterExclusive(); - if ((pKbl = UserHklToKbl(hKl))) - { - Ret = UserUnloadKbl(pKbl); + pKbl = UserHklToKbl(hKl); + if (pKbl) + { + bRet = UserUnloadKbl(pKbl); } else { @@ -722,7 +636,7 @@ } UserLeave(); - return Ret; + return bRet; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Oct 16 15:39:07 2011 @@ -891,7 +891,7 @@ UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected) { WORD wScanCode, wVk; - PKBL pKbl = NULL; + PKL pKbl = NULL; PKBDTABLES pKbdTbl; PUSER_MESSAGE_QUEUE pFocusQueue; struct _ETHREAD *pFocusThread; @@ -973,7 +973,7 @@ PKEYBOARD_INPUT_DATA pKbdInputData) { WORD wScanCode, wVk; - PKBL pKbl = NULL; + PKL pKbl = NULL; PKBDTABLES pKbdTbl; PUSER_MESSAGE_QUEUE pFocusQueue; struct _ETHREAD *pFocusThread; @@ -1211,7 +1211,7 @@ } else { - PKBL pKbl; + PKL pKbl; pKbl = UserHklToKbl(dwhkl); if (pKbl) @@ -1246,7 +1246,7 @@ BYTE afKeyState[256 * 2 / 8] = {0}; PWCHAR pwszBuff = NULL; INT i, iRet = 0; - PKBL pKbl = NULL; + PKL pKbl = NULL; TRACE("Enter NtUserSetKeyboardState\n"); @@ -1451,7 +1451,7 @@ PKBDTABLES pKbdTbl; PVK_TO_WCHAR_TABLE pVkToWchTbl; PVK_TO_WCHARS10 pVkToWch; - PKBL pKbl = NULL; + PKL pKbl = NULL; DWORD i, dwModBits = 0, dwModNumber = 0, Ret = (DWORD)-1; TRACE("NtUserVkKeyScanEx() wch %d, KbdLayout 0x%p\n", wch, dwhkl);

13 years, 2 months

[tfaber] 54162: [KERNEL32] - Reapply the ConvertThreadToFiberEx changes from r52804, they were lost in r52805. Confirmed by Alex. See issue #6394 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 16 15:04:26 2011 New Revision: 54162 URL: http://svn.reactos.org/svn/reactos?rev=54162&view=rev Log: [KERNEL32] - Reapply the ConvertThreadToFiberEx changes from r52804, they were lost in r52805. Confirmed by Alex. See issue #6394 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sun Oct 16 15:04:26 2011 @@ -79,48 +79,58 @@ ConvertThreadToFiberEx(LPVOID lpParameter, DWORD dwFlags) { - PTEB pTeb = NtCurrentTeb(); - PFIBER pfCurFiber; + PTEB Teb; + PFIBER Fiber; DPRINT1("Converting Thread to Fiber\n"); - /* the current thread is already a fiber */ - if(pTeb->HasFiberData && pTeb->NtTib.FiberData) return pTeb->NtTib.FiberData; - - /* allocate the fiber */ - pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), - 0, - sizeof(FIBER)); - - /* failure */ - if (pfCurFiber == NULL) + /* Check for invalid flags */ + if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) + { + /* Fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Are we already a fiber? */ + Teb = NtCurrentTeb(); + if (Teb->HasFiberData) + { + /* Fail */ + SetLastError(ERROR_ALREADY_FIBER); + return NULL; + } + + /* Allocate the fiber */ + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); + if (!Fiber) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - /* copy some contextual data from the thread to the fiber */ - pfCurFiber->Parameter = lpParameter; - pfCurFiber->ExceptionList = pTeb->NtTib.ExceptionList; - pfCurFiber->StackBase = pTeb->NtTib.StackBase; - pfCurFiber->StackLimit = pTeb->NtTib.StackLimit; - pfCurFiber->DeallocationStack = pTeb->DeallocationStack; - pfCurFiber->FlsData = pTeb->FlsData; - pfCurFiber->GuaranteedStackBytes = pTeb->GuaranteedStackBytes; - pfCurFiber->ActivationContextStack = pTeb->ActivationContextStackPointer; - pfCurFiber->Context.ContextFlags = CONTEXT_FULL; - - /* Save FPU State if requsted */ + /* Copy some contextual data from the thread to the fiber */ + Fiber->Parameter = lpParameter; + Fiber->ExceptionList = Teb->NtTib.ExceptionList; + Fiber->StackBase = Teb->NtTib.StackBase; + Fiber->StackLimit = Teb->NtTib.StackLimit; + Fiber->DeallocationStack = Teb->DeallocationStack; + Fiber->FlsData = Teb->FlsData; + Fiber->GuaranteedStackBytes = Teb->GuaranteedStackBytes; + Fiber->ActivationContextStack = Teb->ActivationContextStackPointer; + Fiber->Context.ContextFlags = CONTEXT_FULL; + + /* Save FPU State if requested */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { - pfCurFiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; - } - - /* associate the fiber to the current thread */ - pTeb->NtTib.FiberData = pfCurFiber; - pTeb->HasFiberData = TRUE; - - /* success */ - return (LPVOID)pfCurFiber; + Fiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; + } + + /* Associate the fiber to the current thread */ + Teb->NtTib.FiberData = Fiber; + Teb->HasFiberData = TRUE; + + /* Return opaque fiber data */ + return (LPVOID)Fiber; } /*

13 years, 2 months

[rharabien] 54161: - Fix MSVC build based on ThFabba suggestion

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Oct 16 14:59:29 2011 New Revision: 54161 URL: http://svn.reactos.org/svn/reactos?rev=54161&view=rev Log: - Fix MSVC build based on ThFabba suggestion Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 16 14:59:29 2011 @@ -92,7 +92,7 @@ * Opens input device for asynchronous access */ static -NTAPI NTSTATUS +NTSTATUS NTAPI OpenInputDevice(PHANDLE pHandle, PFILE_OBJECT *ppObject, CONST WCHAR *pszDeviceName) { UNICODE_STRING DeviceName;

13 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011