Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[fireball] 14968: NtOpenKey modified to correctly behave when wrong input params are given (according to WINE tests).

by fireball＠svn.reactos.com

NtOpenKey modified to correctly behave when wrong input params are given (according to WINE tests). Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-04 13:28:34 UTC (rev 14967) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-04 15:27:05 UTC (rev 14968) @@ -1115,6 +1115,10 @@ ObjectAttributes, ObjectAttributes ? ObjectAttributes->ObjectName : NULL); + /* Check place for result handle, if it's null - return immediately */ + if (KeyHandle == NULL) + return(STATUS_INVALID_PARAMETER); + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode) @@ -1137,6 +1141,10 @@ } } + /* WINE checks for the length also */ + /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) + return(STATUS_BUFFER_OVERFLOW);*/ + RemainingPath.Buffer = NULL; Status = ObFindObject(ObjectAttributes, &Object, @@ -1144,7 +1152,10 @@ CmiKeyType); if (!NT_SUCCESS(Status)) { - return(Status); + DPRINT("ObFindObject() returned 0x%08lx\n", Status); + Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ + hKey = *KeyHandle; /* Preserve hkResult value */ + goto openkey_cleanup; } VERIFY_KEY_OBJECT((PKEY_OBJECT) Object); @@ -1155,7 +1166,9 @@ { ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_NOT_FOUND; + Status = STATUS_OBJECT_NAME_NOT_FOUND; + hKey = NULL; + goto openkey_cleanup; } RtlFreeUnicodeString(&RemainingPath); @@ -1164,7 +1177,9 @@ if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) { ObDereferenceObject(Object); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + hKey = NULL; + goto openkey_cleanup; } Status = ObCreateHandle(PsGetCurrentProcess(), @@ -1175,10 +1190,9 @@ ObDereferenceObject(Object); if (!NT_SUCCESS(Status)) - { - return(Status); - } + hKey = NULL; +openkey_cleanup: _SEH_TRY { *KeyHandle = hKey;

19 years, 7 months

[hpoussin] 14967: Fix flags checking in I8042ReadData (patch by Tinus_)

by hpoussin＠svn.reactos.com

Fix flags checking in I8042ReadData (patch by Tinus_) Check error codes returned by IoCreateDevice Replace ExFreePool by ExFreePoolWithTag Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/registry.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-05-03 23:24:26 UTC (rev 14966) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-05-04 13:28:34 UTC (rev 14967) @@ -80,9 +80,10 @@ // If data is available if ((Status & KBD_OBF)) { Data[0]=READ_PORT_UCHAR((PUCHAR)I8042_DATA_PORT); + DPRINT("Read: %x (status: %x)\n", Data[0], Status); // If the data is valid (not timeout, not parity error) - if ((~Status) & (KBD_GTO | KBD_PERR)) + if (0 == (Status & (KBD_GTO | KBD_PERR))) return STATUS_SUCCESS; } return STATUS_UNSUCCESSFUL; @@ -613,7 +614,7 @@ DPRINT("I8042AddDevice\n"); - IoCreateDevice(DriverObject, + Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), NULL, FILE_DEVICE_8042_PORT, @@ -621,6 +622,9 @@ TRUE, &Fdo); + if (!NT_SUCCESS(Status)) + return Status; + IoAttachDeviceToDeviceStack(Fdo, Pdo); DevExt = Fdo->DeviceExtension; @@ -647,7 +651,7 @@ KeInitializeTimer(&DevExt->TimerMouseTimeout); Status = I8042Initialize(DevExt); - if (STATUS_SUCCESS != Status) { + if (!NT_SUCCESS(STATUS_SUCCESS)) { DPRINT1("Initialization failure: %x\n", Status); return Status; } @@ -668,31 +672,36 @@ TRUE, &Fdo); - FdoDevExt = Fdo->DeviceExtension; + if (NT_SUCCESS(Status)) + { + FdoDevExt = Fdo->DeviceExtension; - RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); + RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); - FdoDevExt->PortDevExt = DevExt; - FdoDevExt->Type = Keyboard; - FdoDevExt->DeviceObject = Fdo; + FdoDevExt->PortDevExt = DevExt; + FdoDevExt->Type = Keyboard; + FdoDevExt->DeviceObject = Fdo; - Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags |= DO_BUFFERED_IO; - DevExt->DebugWorkItem = IoAllocateWorkItem(Fdo); - DevExt->KeyboardObject = Fdo; + DevExt->DebugWorkItem = IoAllocateWorkItem(Fdo); + DevExt->KeyboardObject = Fdo; - DevExt->KeyboardBuffer = ExAllocatePoolWithTag( - NonPagedPool, - DevExt->KeyboardAttributes.InputDataQueueLength * - sizeof(KEYBOARD_INPUT_DATA), - TAG_I8042); + DevExt->KeyboardBuffer = ExAllocatePoolWithTag( + NonPagedPool, + DevExt->KeyboardAttributes.InputDataQueueLength * + sizeof(KEYBOARD_INPUT_DATA), + TAG_I8042); - if (!DevExt->KeyboardBuffer) { - DPRINT1("No memory for keyboardbuffer\n"); - return STATUS_INSUFFICIENT_RESOURCES; + if (!DevExt->KeyboardBuffer) { + DPRINT1("No memory for keyboardbuffer\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); } - - InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + else + DevExt->KeyboardExists = FALSE; } if (DevExt->MouseExists) { @@ -711,30 +720,35 @@ TRUE, &Fdo); - FdoDevExt = Fdo->DeviceExtension; + if (NT_SUCCESS(Status)) + { + FdoDevExt = Fdo->DeviceExtension; - RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); + RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); - FdoDevExt->PortDevExt = DevExt; - FdoDevExt->Type = Mouse; - FdoDevExt->DeviceObject = Fdo; + FdoDevExt->PortDevExt = DevExt; + FdoDevExt->Type = Mouse; + FdoDevExt->DeviceObject = Fdo; - Fdo->Flags |= DO_BUFFERED_IO; - DevExt->MouseObject = Fdo; + Fdo->Flags |= DO_BUFFERED_IO; + DevExt->MouseObject = Fdo; + + DevExt->MouseBuffer = ExAllocatePoolWithTag( + NonPagedPool, + DevExt->MouseAttributes.InputDataQueueLength * + sizeof(MOUSE_INPUT_DATA), + TAG_I8042); - DevExt->MouseBuffer = ExAllocatePoolWithTag( - NonPagedPool, - DevExt->MouseAttributes.InputDataQueueLength * - sizeof(MOUSE_INPUT_DATA), - TAG_I8042); + if (!DevExt->MouseBuffer) { + ExFreePoolWithTag(DevExt->KeyboardBuffer, TAG_I8042); + DPRINT1("No memory for mouse buffer\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } - if (!DevExt->MouseBuffer) { - ExFreePool(DevExt->KeyboardBuffer); - DPRINT1("No memory for mouse buffer\n"); - return STATUS_INSUFFICIENT_RESOURCES; + InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); } - - InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + else + DevExt->MouseExists = FALSE; } if (DirqlKeyboard > DirqlMouse) _____ Modified: trunk/reactos/drivers/input/i8042prt/registry.c --- trunk/reactos/drivers/input/i8042prt/registry.c 2005-05-03 23:24:26 UTC (rev 14966) +++ trunk/reactos/drivers/input/i8042prt/registry.c 2005-05-04 13:28:34 UTC (rev 14967) @@ -231,7 +231,7 @@ DPRINT1 ("Manually set defaults\n"); } - ExFreePool(ParametersPath.Buffer); + ExFreePoolWithTag(ParametersPath.Buffer, TAG_I8042); DPRINT("Done reading registry\n"); }

19 years, 7 months

[ion] 14966: Fix horrible bug where Queued Threads were treated like Threads on the Ready list. I was aware of this bug for months and it's fixed in my new scheduler but now that tinus has seen it happen, I'm comitting the fix temporarly in trunk.

by ion＠svn.reactos.com

Fix horrible bug where Queued Threads were treated like Threads on the Ready list. I was aware of this bug for months and it's fixed in my new scheduler but now that tinus has seen it happen, I'm comitting the fix temporarly in trunk. Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-05-03 23:18:21 UTC (rev 14965) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-05-03 23:24:26 UTC (rev 14966) @@ -54,7 +54,7 @@ KEBUGCHECK(0); } - InsertTailList(&PriorityListHead[Priority], &Thread->QueueListEntry); + InsertTailList(&PriorityListHead[Priority], &Thread->WaitListEntry); PriorityListMask |= (1 << Priority); } @@ -63,7 +63,7 @@ KiRemoveFromThreadList(PKTHREAD Thread) { ASSERT(Ready == Thread->State); - RemoveEntryList(&Thread->QueueListEntry); + RemoveEntryList(&Thread->WaitListEntry); if (IsListEmpty(&PriorityListHead[(ULONG)Thread->Priority])) { PriorityListMask &= ~(1 << Thread->Priority); @@ -87,7 +87,7 @@ while (current_entry != &PriorityListHead[Priority]) { - current = CONTAINING_RECORD(current_entry, KTHREAD, QueueListEntry); + current = CONTAINING_RECORD(current_entry, KTHREAD, WaitListEntry); if (current->State != Ready) {

19 years, 7 months

[greatlrd] 14965: bugfix from, tinus mailto:o112w8r02@sneakemail.com

by greatlrd＠svn.reactos.com

bugfix from, tinus mailto:o112w8r02@sneakemail.com fixining http://reactos.com/bugzilla/show_bug.cgi?id=616#c1 bug in mozila There's a small bug in usetup/bootsup.c which makes it fail formatting the disk. It tries to read the bootsector image on the cdrom for write access (which succeeds), then tries to read from the handle (which fails). Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-03 21:42:35 UTC (rev 14964) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-03 23:18:21 UTC (rev 14965) @@ -1244,7 +1244,7 @@ NULL); Status = NtOpenFile(&FileHandle, - GENERIC_WRITE, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0,

19 years, 7 months

[hbirr] 14964: Do always set the UserIosb of an irp in IoSecondStageCompletion.

by hbirr＠svn.reactos.com

Do always set the UserIosb of an irp in IoSecondStageCompletion. Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-03 21:25:41 UTC (rev 14963) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-03 21:42:35 UTC (rev 14964) @@ -1265,14 +1265,18 @@ } Irp->MdlAddress = NULL; + if (Irp->UserIosb) + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + /* Check for Success but allow failure for Async IRPs */ if (NT_SUCCESS(Irp->IoStatus.Status) || (Irp->PendingReturned && !(Irp->Flags & IRP_SYNCHRONOUS_API) && (FileObject == NULL || FileObject->Flags & FO_SYNCHRONOUS_IO))) { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; /* Check if there's an event */ if (Irp->UserEvent) @@ -1361,9 +1365,7 @@ /* Check for SYNC IRP */ if (Irp->Flags & IRP_SYNCHRONOUS_API) { - /* Set the status in this case only */ - *Irp->UserIosb = Irp->IoStatus; - + /* Signal our event if we have one */ if (Irp->UserEvent) {

19 years, 7 months

[hpoussin] 14963: Add French translation for sndvol32 (Patch by Usurp)

by hpoussin＠svn.reactos.com

Add French translation for sndvol32 (Patch by Usurp) Set properties for Cz.rc and Sv.rc Modified: trunk/reactos/subsys/system/sndvol32/Cz.rc Added: trunk/reactos/subsys/system/sndvol32/Fr.rc Modified: trunk/reactos/subsys/system/sndvol32/Sv.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc _____ Modified: trunk/reactos/subsys/system/sndvol32/Cz.rc --- trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-05-03 18:37:51 UTC (rev 14962) +++ trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-05-03 21:25:41 UTC (rev 14963) @@ -1,41 +1,41 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&NastavenÝ" - BEGIN - MENUITEM "&Mo×nosti", IDC_PROPERTIES - MENUITEM "&RozÜÝ°enÚ nastevenÝ", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Konec", IDC_EXIT - END - POPUP "&Pomoc" - BEGIN - MENUITEM "&TÚmata nßpovýdy", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&O ovlßdßnÝ hlasitosti ...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "OvlßdßnÝ hlasitosti" - IDS_NOMIXERDEVICES "Nejsou dostupnÚ ×ßdnÚ smýÜovacÝ za°ÝzenÝ! Aplikace se nynÝ ukonÞÝ." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Mo×nosti" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&SmýÜovacÝ za°ÝzenÝ:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Upravit hlasitost pro:", -1, 7,25,211,77 - PUSHBUTTON "&P°ehrßvßnÝ", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Zßznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&JinÚ:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "ZruÜit", IDCANCEL, 168,226,50,14 -END +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&NastavenÝ" + BEGIN + MENUITEM "&Mo×nosti", IDC_PROPERTIES + MENUITEM "&RozÜÝ°enÚ nastevenÝ", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Konec", IDC_EXIT + END + POPUP "&Pomoc" + BEGIN + MENUITEM "&TÚmata nßpovýdy", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&O ovlßdßnÝ hlasitosti ...", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "OvlßdßnÝ hlasitosti" + IDS_NOMIXERDEVICES "Nejsou dostupnÚ ×ßdnÚ smýÜovacÝ za°ÝzenÝ! Aplikace se nynÝ ukonÞÝ." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Mo×nosti" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&SmýÜovacÝ za°ÝzenÝ:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Upravit hlasitost pro:", -1, 7,25,211,77 + PUSHBUTTON "&P°ehrßvßnÝ", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Zßznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&JinÚ:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "ZruÜit", IDCANCEL, 168,226,50,14 +END Property changes on: trunk/reactos/subsys/system/sndvol32/Cz.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/sndvol32/Fr.rc --- trunk/reactos/subsys/system/sndvol32/Fr.rc 2005-05-03 18:37:51 UTC (rev 14962) +++ trunk/reactos/subsys/system/sndvol32/Fr.rc 2005-05-03 21:25:41 UTC (rev 14963) @@ -0,0 +1,42 @@ +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "O&ptions" + BEGIN + MENUITEM "P&ropriÚtÚs", IDC_PROPERTIES + MENUITEM "&Contr¶les avancÚs", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "Q&uitter", IDC_EXIT + END + POPUP "&?" + BEGIN + MENUITEM "&Aide", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "A &propos ...", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Contr¶le du volume" + IDS_NOMIXERDEVICES "Il n'y a pas de pÚriphÚrique de mixage disponible ! L'application va se terminer." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "PropriÚtÚs" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&PÚriphÚrique de mixage :", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Ajuster le volume pour :", -1, 7,25,211,77 + PUSHBUTTON "&Lecture", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Enregistrement", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Autre :", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14 +END + Property changes on: trunk/reactos/subsys/system/sndvol32/Fr.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/sndvol32/Sv.rc --- trunk/reactos/subsys/system/sndvol32/Sv.rc 2005-05-03 18:37:51 UTC (rev 14962) +++ trunk/reactos/subsys/system/sndvol32/Sv.rc 2005-05-03 21:25:41 UTC (rev 14963) @@ -1,61 +1,61 @@ -/////////////////////////////////////////////////////////////////////// ////// -// Swedish (SE) resources -/* - * Copyright 2005 David Nordenberg - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Alternativ" - BEGIN - MENUITEM "&Instõllningar", IDC_PROPERTIES - MENUITEM "A&vancerade kontroller", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Avsluta", IDC_EXIT - END - POPUP "&Hjõlp" - BEGIN - MENUITEM "&Hjõlpavsnitt", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Om ...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Volymkontroll" - IDS_NOMIXERDEVICES "Det finns inga ljudmixningsenheter tillgõngliga! Programmet kommer nu att avslutas." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instõllningar" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Mixerenhet:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Justera volymen f÷r:", -1, 7,25,211,77 - PUSHBUTTON "&Uppspelning", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Inspelning", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Andra:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 -END +/////////////////////////////////////////////////////////////////////// ////// +// Swedish (SE) resources +/* + * Copyright 2005 David Nordenberg + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Alternativ" + BEGIN + MENUITEM "&Instõllningar", IDC_PROPERTIES + MENUITEM "A&vancerade kontroller", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Avsluta", IDC_EXIT + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "&Hjõlpavsnitt", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Om ...", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Volymkontroll" + IDS_NOMIXERDEVICES "Det finns inga ljudmixningsenheter tillgõngliga! Programmet kommer nu att avslutas." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instõllningar" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Mixerenhet:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Justera volymen f÷r:", -1, 7,25,211,77 + PUSHBUTTON "&Uppspelning", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Inspelning", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Andra:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 +END Property changes on: trunk/reactos/subsys/system/sndvol32/Sv.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-05-03 18:37:51 UTC (rev 14962) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-05-03 21:25:41 UTC (rev 14963) @@ -15,6 +15,7 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico #include "En.rc" +#include "Fr.rc" #include "Cz.rc" #include "De.rc" #include "Sv.rc"

19 years, 7 months

[greatlrd] 14962: Implement WSAStringToAddressA

by greatlrd＠svn.reactos.com

Implement WSAStringToAddressA Modified: trunk/reactos/lib/ws2_32/misc/ns.c _____ Modified: trunk/reactos/lib/ws2_32/misc/ns.c --- trunk/reactos/lib/ws2_32/misc/ns.c 2005-05-03 17:22:52 UTC (rev 14961) +++ trunk/reactos/lib/ws2_32/misc/ns.c 2005-05-03 18:37:51 UTC (rev 14962) @@ -320,12 +320,37 @@ OUT LPSOCKADDR lpAddress, IN OUT LPINT lpAddressLength) { - UNIMPLEMENTED + INT ret, len; + LPWSTR szTemp; + LPWSAPROTOCOL_INFOW lpProtoInfoW = NULL; - return 0; + len = MultiByteToWideChar( CP_ACP, 0, AddressString, -1, NULL, 0 ); + szTemp = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, AddressString, -1, szTemp, len ); + + if (lpProtocolInfo) + { + len = WSAPROTOCOL_LEN+1; + lpProtoInfoW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + + memcpy( lpProtoInfoW, lpProtocolInfo, sizeof(LPWSAPROTOCOL_INFOA)); + + MultiByteToWideChar( CP_ACP, 0, lpProtocolInfo->szProtocol, -1, lpProtoInfoW->szProtocol, len ); + } + + ret = WSAStringToAddressW(szTemp, AddressFamily, lpProtoInfoW, lpAddress, lpAddressLength); + + HeapFree( GetProcessHeap(), 0, szTemp ); + + if (lpProtocolInfo) + HeapFree( GetProcessHeap(), 0, lpProtoInfoW ); + + WSASetLastError(ret); + return ret; } + /* * @implement */

19 years, 7 months

[greatlrd] 14961: Implement WSAStringToAddressW

by greatlrd＠svn.reactos.com

Implement WSAStringToAddressW Modified: trunk/reactos/lib/ws2_32/misc/ns.c _____ Modified: trunk/reactos/lib/ws2_32/misc/ns.c --- trunk/reactos/lib/ws2_32/misc/ns.c 2005-05-03 13:14:59 UTC (rev 14960) +++ trunk/reactos/lib/ws2_32/misc/ns.c 2005-05-03 17:22:52 UTC (rev 14961) @@ -327,7 +327,7 @@ /* - * @unimplemented + * @implement */ INT EXPORT @@ -338,9 +338,76 @@ OUT LPSOCKADDR lpAddress, IN OUT LPINT lpAddressLength) { - UNIMPLEMENTED + int pos=0; + int res=0; + LONG inetaddr = 0; + LPWSTR *bp=NULL; - return 0; + SOCKADDR_IN *sockaddr = (SOCKADDR_IN *) lpAddress; + + if (!lpAddressLength || !lpAddress) + return SOCKET_ERROR; + + if (AddressString==NULL) + return WSAEINVAL; + + /* Set right adress family */ + if (lpProtocolInfo!=NULL) + sockaddr->sin_family = lpProtocolInfo->iAddressFamily; + + else sockaddr->sin_family = AddressFamily; + + /* Report size */ + if (AddressFamily == AF_INET) + { + if (*lpAddressLength < sizeof(SOCKADDR_IN)) + { + *lpAddressLength = sizeof(SOCKADDR_IN); + res = WSAEFAULT; + } + else + { + if (!lpAddress) + res = WSAEINVAL; + else + { + // translate now ip string to ip + + /* rest sockaddr.sin_addr.s_addr + for we need to be sure it is zero when we come to while */ + memset(lpAddress,0,sizeof(SOCKADDR_IN)); + + /* Set right adress family */ + sockaddr->sin_family = AF_INET; + + /* Get port number */ + pos = wcscspn(AddressString,L":") + 1; + if (pos < wcslen(AddressString)) + sockaddr->sin_port = wcstol(&AddressString[pos],bp,10); + + else + sockaddr->sin_port = 0; + + /* Get ip number */ + pos=0; + inetaddr=0; + + while (pos < wcslen(AddressString)) + { + inetaddr = (inetaddr<<8) + ((UCHAR)wcstol(&AddressString[pos],bp,10)); + pos += wcscspn( &AddressString[pos],L".") +1 ; + } + + res = 0; + sockaddr->sin_addr.s_addr = inetaddr; + } + + } + } + + WSASetLastError(res); + if (!res) return 0; + return SOCKET_ERROR; } void check_hostent(struct hostent **he) { @@ -1215,3 +1282,4 @@ } /* EOF */ +

19 years, 7 months

[hpoussin] 14960: Remove Disk driver for Bochs.

by hpoussin＠svn.reactos.com

Remove Disk driver for Bochs. It doesn't compile and shouldn't be usefull as we have a normal disk driver in drivers/storage/disk Deleted: trunk/reactos/drivers/dd/sdisk/

19 years, 7 months

[mf] 14959: rosshell: printer and network folder in start menu

by mf＠svn.reactos.com

rosshell: printer and network folder in start menu Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-03 11:56:46 UTC (rev 14958) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-03 12:15:27 UTC (rev 14959) @@ -447,7 +447,7 @@ BEGIN LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 - LTEXT "(c) 2003/2004 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 LTEXT "",IDC_WIN_VERSION,91,58,98,22 LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, 8 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-03 11:56:46 UTC (rev 14958) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-03 12:15:27 UTC (rev 14959) @@ -2083,7 +2083,7 @@ { super::AddEntries(); -#ifdef _ROS_ // to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(_ROS_) // _ROS_ to be removed when printer/network will be implemented AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU); AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else @@ -2114,7 +2114,7 @@ #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ? #endif -#ifdef _ROS_ // to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(_ROS_) // _ROS_ to be removed when printer/network will be implemented AddButton(ResString(IDS_NETWORK), ICID_NETWORK, false, IDC_NETWORK); #else AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK);

19 years, 7 months

← Newer
1
...
72
73
74
75
76
77
78
...
82
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 May 2005