Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[cwittich] 30650: SetDlgItemText doesn't like NULL
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Thu Nov 22 00:02:16 2007 New Revision: 30650 URL: http://svn.reactos.org/svn/reactos?rev=30650&view=rev Log: SetDlgItemText doesn't like NULL Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c Thu Nov 22 00:02:16 2007 @@ -554,7 +554,7 @@ switch(pnmh->code) { case PSN_SETACTIVE: - SetDlgItemText(hwndDlg, IDC_INSTALLINGSTATUS, NULL); + SetDlgItemText(hwndDlg, IDC_INSTALLINGSTATUS, L""); SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, TRUE, 50); PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); InstStartInstallationThread(hwndDlg);

1 0

[cwittich] 30649: fix some PREfast warnings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 23:35:52 2007 New Revision: 30649 URL: http://svn.reactos.org/svn/reactos?rev=30649&view=rev Log: fix some PREfast warnings Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.c (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c Wed Nov 21 23:35:52 2007 @@ -1224,7 +1224,7 @@ if (List->Priority == Priority) { - DPRINT("Logical device %d DestinationList 0x%X\n", + DPRINT("Logical device %d DestinationList %p\n", LogicalDevice->Number, DestinationList); @@ -1238,7 +1238,7 @@ Descriptor = CONTAINING_RECORD( Entry, ISAPNP_DESCRIPTOR, ListEntry); - DPRINT("Logical device %d Destination 0x%X(%d)\n", + DPRINT("Logical device %d Destination %p(%d)\n", LogicalDevice->Number, &DestinationList->Descriptors[i], i); @@ -1572,6 +1572,7 @@ } +static DRIVER_DISPATCH ISAPNPDispatchOpenClose; static NTSTATUS STDCALL ISAPNPDispatchOpenClose( @@ -1587,7 +1588,7 @@ return STATUS_SUCCESS; } - +static DRIVER_DISPATCH ISAPNPDispatchReadWrite; static NTSTATUS STDCALL ISAPNPDispatchReadWrite( @@ -1603,7 +1604,7 @@ return STATUS_UNSUCCESSFUL; } - +static DRIVER_DISPATCH ISAPNPDispatchDeviceControl; static NTSTATUS STDCALL ISAPNPDispatchDeviceControl( @@ -1635,7 +1636,7 @@ return Status; } - +static DRIVER_DISPATCH ISAPNPControl; static NTSTATUS STDCALL ISAPNPControl(

1 0

[dreimer] 30648: oops. I thought I commited this already. Fixes for Changelog. A bit too late for 1.0
by dreimer＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: dreimer Date: Wed Nov 21 23:29:21 2007 New Revision: 30648 URL: http://svn.reactos.org/svn/reactos?rev=30648&view=rev Log: oops. I thought I commited this already. Fixes for Changelog. A bit too late for 1.0 Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Wed Nov 21 23:29:21 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 1.0 Released -- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, Mike Nordell) +- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, TODO: name of tamlin) - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward) - Updated: NASM to 0.99.06 (Daniel Reimer) - Updated: You can now select the components you want to install. (Daniel Reimer) @@ -41,15 +41,15 @@ - Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. (Peter Ward) -- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' +- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' (Peter Ward) instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll*' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) - (yes you can still specify the full path if you like) (Peter Ward) -- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this + (yes you can still specify the full path if you like) +- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this (Peter Ward) file can also be used outside of the RosBE to initialize and GCC/MinGW - in the current directory. (Peter Ward) + in the current directory. - Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) - Added a minimal replacement for tee. (Peter Ward) - Added ccache 2.4 to RosBE. (Daniel Reimer)

1 0

[cwittich] 30646: fix some warnings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 23:14:25 2007 New Revision: 30646 URL: http://svn.reactos.org/svn/reactos?rev=30646&view=rev Log: fix some warnings Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/include/class2.h Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c Wed Nov 21 23:14:25 2007 @@ -231,7 +231,6 @@ #define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,'CscS') #endif - NTSTATUS STDCALL DriverEntry( @@ -278,6 +277,7 @@ IN PIRP Irp ); +IO_COMPLETION_ROUTINE CdRomDeviceControlCompletion; NTSTATUS STDCALL CdRomDeviceControlCompletion( @@ -286,6 +286,7 @@ IN PVOID Context ); +IO_COMPLETION_ROUTINE CdRomSetVolumeIntermediateCompletion; NTSTATUS STDCALL CdRomSetVolumeIntermediateCompletion( @@ -294,6 +295,7 @@ IN PVOID Context ); +IO_COMPLETION_ROUTINE CdRomSwitchModeCompletion; NTSTATUS STDCALL CdRomSwitchModeCompletion( @@ -302,6 +304,7 @@ IN PVOID Context ); +IO_COMPLETION_ROUTINE CdRomXACompletion; NTSTATUS STDCALL CdRomXACompletion( @@ -310,6 +313,7 @@ IN PVOID Context ); +IO_COMPLETION_ROUTINE CdRomClassIoctlCompletion; NTSTATUS STDCALL CdRomClassIoctlCompletion( @@ -383,6 +387,7 @@ BOOLEAN *Retry ); +IO_COMPLETION_ROUTINE ToshibaProcessErrorCompletion; VOID STDCALL ToshibaProcessError( @@ -451,7 +456,6 @@ ULONG NoLoad = 0; - NTSTATUS STDCALL DriverEntry( @@ -519,7 +523,6 @@ } // end DriverEntry() - BOOLEAN STDCALL ScsiCdRomFindDevices( @@ -665,7 +668,6 @@ } // end FindScsiCdRoms() - VOID STDCALL CdRomCreateNamedEvent( @@ -699,7 +701,7 @@ NTSTATUS status; - sprintf(eventNameBuffer,"\\Device\\MediaChangeEvent%d", + sprintf(eventNameBuffer,"\\Device\\MediaChangeEvent%ld", DeviceNumber); RtlInitString(&eventNameString, @@ -728,7 +730,6 @@ RtlFreeUnicodeString(&unicodeString); } - NTSTATUS STDCALL CreateCdRomDeviceObject( @@ -765,7 +766,6 @@ --*/ { UCHAR ntNameBuffer[64]; - STRING ntNameString; UNICODE_STRING ntUnicodeString; NTSTATUS status; BOOLEAN changerDevice; @@ -802,7 +802,7 @@ // sprintf(ntNameBuffer, - "\\Device\\CdRom%d", + "\\Device\\CdRom%lu", *DeviceCount); status = ScsiClassCreateDeviceObject(DriverObject, @@ -1365,7 +1365,6 @@ } // end CreateCdRomDeviceObject() - VOID STDCALL ScsiCdRomStartIo( @@ -1382,7 +1381,6 @@ ULONG transferPages; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; - LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; PCDROM_DATA cdData; PSCSI_REQUEST_BLOCK srb = NULL; PCDB cdb; @@ -1828,7 +1826,6 @@ if (cdData->RawAccess) { ULONG startingSector; - UCHAR min, sec, frame; // // Free the recently allocated irp, as we don't need it. @@ -2404,8 +2401,6 @@ case IOCTL_CDROM_READ_Q_CHANNEL: { - PSUB_Q_CHANNEL_DATA userChannelData = - Irp->AssociatedIrp.SystemBuffer; PCDROM_SUB_Q_DATA_FORMAT inputBuffer = Irp->AssociatedIrp.SystemBuffer; @@ -2585,10 +2580,6 @@ } case IOCTL_CDROM_GET_CONTROL: { - - PAUDIO_OUTPUT audioOutput; - PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer; - // // Allocate buffer for volume control information. // @@ -2789,7 +2780,6 @@ } - NTSTATUS STDCALL ScsiCdRomReadVerification( @@ -2820,11 +2810,6 @@ PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; - PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension+1); - KIRQL irql; - SCSI_REQUEST_BLOCK srb; - PCDB cdb = (PCDB)srb.Cdb; - NTSTATUS status; // // If the cd is playing music then reject this request. @@ -2875,7 +2860,6 @@ } // end ScsiCdRomReadVerification() - NTSTATUS STDCALL CdRomDeviceControlCompletion( @@ -3443,7 +3427,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS STDCALL CdRomSetVolumeIntermediateCompletion( @@ -3776,7 +3759,6 @@ } - NTSTATUS STDCALL CdRomSwitchModeCompletion( @@ -3788,7 +3770,6 @@ PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension + 1); - BOOLEAN use6Byte = cdData->XAFlags & XA_USE_6_BYTE; PIO_STACK_LOCATION realIrpStack; PIO_STACK_LOCATION realIrpNextStack; PSCSI_REQUEST_BLOCK srb = Context; @@ -3925,7 +3906,6 @@ ULONG maximumTransferLength; ULONG transferPages; - UCHAR min, sec, frame; // // Calculate starting offset. @@ -4145,7 +4125,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS STDCALL CdRomXACompletion( @@ -4183,7 +4162,6 @@ PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION irpNextStack = IoGetNextIrpStackLocation(Irp); PSCSI_REQUEST_BLOCK srb = Context; - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; NTSTATUS status; BOOLEAN retry; @@ -4304,7 +4282,6 @@ return status; } - NTSTATUS STDCALL CdRomDeviceControl( @@ -4336,13 +4313,8 @@ PKEVENT deviceControlEvent; PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension+1); - BOOLEAN use6Byte = cdData->XAFlags & XA_USE_6_BYTE; SCSI_REQUEST_BLOCK srb; - PCDB cdb = (PCDB)srb.Cdb; - PVOID outputBuffer; - ULONG bytesTransferred = 0; NTSTATUS status; - NTSTATUS status2; KIRQL irql; ULONG ioctlCode; @@ -4861,7 +4833,6 @@ } // end ScsiCdRomDeviceControl() - VOID STDCALL ScanForSpecial( @@ -5024,7 +4995,6 @@ return; } - VOID STDCALL HitachProcessError( @@ -5224,7 +5194,6 @@ } } - NTSTATUS STDCALL ToshibaProcessErrorCompletion( @@ -5288,7 +5257,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - VOID STDCALL ToshibaProcessError( @@ -5463,7 +5431,6 @@ } } - BOOLEAN STDCALL CdRomIsPlayActive( @@ -5555,8 +5522,7 @@ } - - +IO_COMPLETION_ROUTINE CdRomMediaChangeCompletion; NTSTATUS STDCALL CdRomMediaChangeCompletion( @@ -5727,7 +5693,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - + VOID STDCALL CdRomTickHandler( @@ -5981,7 +5947,7 @@ heldIrpList = nextIrp; } } - + BOOLEAN STDCALL CdRomCheckRegistryForMediaChangeValue( @@ -6070,7 +6036,7 @@ // the suffix for the path // - sprintf(buf, "\\Device%d", DeviceNumber); + sprintf(buf, "\\Device%lu", DeviceNumber); RtlInitAnsiString(&paramNum, buf); // @@ -6192,7 +6158,7 @@ return FALSE; } - + BOOLEAN STDCALL IsThisASanyo( @@ -6294,7 +6260,6 @@ return FALSE; } - BOOLEAN STDCALL IsThisAnAtapiChanger( @@ -6403,7 +6368,6 @@ return retVal; } - BOOLEAN STDCALL IsThisAMultiLunDevice( @@ -6496,7 +6460,7 @@ } - +IO_COMPLETION_ROUTINE CdRomUpdateGeometryCompletion; NTSTATUS STDCALL CdRomUpdateGeometryCompletion( @@ -6749,7 +6713,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS STDCALL CdRomUpdateCapacity( @@ -6922,7 +6885,6 @@ return STATUS_INSUFFICIENT_RESOURCES; } - NTSTATUS STDCALL CdRomClassIoctlCompletion( Modified: trunk/reactos/drivers/storage/class/include/class2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/incl… ============================================================================== --- trunk/reactos/drivers/storage/class/include/class2.h (original) +++ trunk/reactos/drivers/storage/class/include/class2.h Wed Nov 21 23:14:25 2007 @@ -146,6 +146,7 @@ /* FUNCTIONS ****************************************************************/ +IO_COMPLETION_ROUTINE ScsiClassAsynchronousCompletion; NTSTATUS STDCALL ScsiClassAsynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp,

1 0

[fireball] 30645: Dmitry Chapyshev <lentind@yandex.ru> - Add russian translation. - Fix control's size (in all languages).
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 22:54:06 2007 New Revision: 30645 URL: http://svn.reactos.org/svn/reactos?rev=30645&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add russian translation. - Fix control's size (in all languages). Added: trunk/rosapps/magnify/lang/ru-RU.rc (with props) Modified: trunk/rosapps/magnify/lang/en-US.rc trunk/rosapps/magnify/lang/es-ES.rc trunk/rosapps/magnify/lang/fr-FR.rc trunk/rosapps/magnify/lang/uk-UA.rc trunk/rosapps/magnify/rsrc.rc Modified: trunk/rosapps/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/en-US.rc (original) +++ trunk/rosapps/magnify/lang/en-US.rc Wed Nov 21 22:54:06 2007 @@ -35,7 +35,7 @@ BEGIN DEFPUSHBUTTON "Exit",IDOK,96,161,50,14 PUSHBUTTON "Help",IDOK,38,161,50,14 - LTEXT "Magnification level:",IDC_STATIC,6,12,68,8 + LTEXT "Magnification level:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Tracking",IDC_STATIC,7,25,139,59 GROUPBOX "Presentation",IDC_STATIC,7,87,139,57 Modified: trunk/rosapps/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/es-ES.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/es-ES.rc (original) +++ trunk/rosapps/magnify/lang/es-ES.rc Wed Nov 21 22:54:06 2007 @@ -38,7 +38,7 @@ BEGIN DEFPUSHBUTTON "Salir",IDOK,96,161,50,14 PUSHBUTTON "Ayuda",IDOK,38,161,50,14 - LTEXT "Nivel de aumento:",IDC_STATIC,6,12,68,8 + LTEXT "Nivel de aumento:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Rastreando",IDC_STATIC,7,25,139,59 GROUPBOX "Presentación",IDC_STATIC,7,87,139,57 Modified: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc (original) +++ trunk/rosapps/magnify/lang/fr-FR.rc Wed Nov 21 22:54:06 2007 @@ -35,7 +35,7 @@ BEGIN DEFPUSHBUTTON "Quitter",IDOK,96,161,50,14 PUSHBUTTON "Aider",IDOK,38,161,50,14 - LTEXT "Coefficient d'agrandissement:",IDC_STATIC,6,12,68,8 + LTEXT "Coefficient d'agrandissement:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Poursuite",IDC_STATIC,7,25,139,59 GROUPBOX "Présentation",IDC_STATIC,7,87,139,57 Added: trunk/rosapps/magnify/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/ru-RU.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/ru-RU.rc (added) +++ trunk/rosapps/magnify/lang/ru-RU.rc Wed Nov 21 22:54:06 2007 @@ -1,0 +1,64 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&????" + BEGIN + MENUITEM "&?????", IDM_EXIT + MENUITEM "&?????????", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&? ?????????...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "? ?????????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "???????? ????. ?????? 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "????????? ????? (C) 2007 ???? ??????? (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,130,25 + PUSHBUTTON "OK",IDOK,162,53,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 182, 182 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "????????? ???????? ????" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "?????",IDOK,96,161,50,14 + PUSHBUTTON "??????",IDOK,38,161,50,14 + LTEXT "??????????:",IDC_STATIC,6,8,80,8 + COMBOBOX IDC_ZOOM,92,6,81,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "????????",IDC_STATIC,7,25,165,59 + GROUPBOX "?????????????",IDC_STATIC,7,88,165,57 + CONTROL "????????? ?? ?????????? ????",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,146,10 + CONTROL "????????? ?? ??????? ?????",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,148,10 + CONTROL "????????? ?? ??????????????? ??????",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,152,10 + CONTROL "????????????? ?????",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,122,10 + CONTROL "????????? ? ????????? ????",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,128,10 + CONTROL "?????????? ???? ????",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,131,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "???????? ???? ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT """???????? ????"" ???????????? ???? ????????? ??????? ???????????? ??? ????? ? ?????? ???????. ????????????? ? ???????? ??????????? ?????? ????? ????????? ??????????? ????????? ? ????? ???????? ?????????????.",IDC_STATIC,36,7,207,33 + CONTROL "?? ?????????? ? ??????????",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "???????? ????" +END Propchange: trunk/rosapps/magnify/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/magnify/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/uk-UA.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/uk-UA.rc (original) +++ trunk/rosapps/magnify/lang/uk-UA.rc Wed Nov 21 22:54:06 2007 @@ -43,7 +43,7 @@ BEGIN DEFPUSHBUTTON "Âèõ³ä",IDOK,96,161,50,14 PUSHBUTTON "Äîâ³äêà",IDOK,38,161,50,14 - LTEXT "Çá³ëüøåííÿ:",IDC_STATIC,6,12,68,8 + LTEXT "Çá³ëüøåííÿ:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Â³äñòåæåííÿ",IDC_STATIC,7,25,139,59 GROUPBOX "Ïîäàííÿ",IDC_STATIC,7,87,139,57 Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=30645&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc (original) +++ trunk/rosapps/magnify/rsrc.rc Wed Nov 21 22:54:06 2007 @@ -6,3 +6,4 @@ #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc"

1 0

[weiden] 30644: Only update the UI state if the dialog is a top level window. If it is a client window (e.g. a property sheet or embedded dialog) we simply copy the UI state from the parent.
by weiden＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: weiden Date: Wed Nov 21 22:53:09 2007 New Revision: 30644 URL: http://svn.reactos.org/svn/reactos?rev=30644&view=rev Log: Only update the UI state if the dialog is a top level window. If it is a client window (e.g. a property sheet or embedded dialog) we simply copy the UI state from the parent. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Wed Nov 21 22:53:09 2007 @@ -816,7 +816,8 @@ SetFocus( dlgInfo->hwndFocus ); } - SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0); + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) + SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0); if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) {

1 0

[cwittich] 30643: set DRIVER_DISPATCH where needed
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 22:37:33 2007 New Revision: 30643 URL: http://svn.reactos.org/svn/reactos?rev=30643&view=rev Log: set DRIVER_DISPATCH where needed Modified: trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/ioctl.h trunk/reactos/drivers/storage/floppy/readwrite.h Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c Wed Nov 21 22:37:33 2007 @@ -181,7 +181,7 @@ KeClearEvent(&ControllerInfo->SynchEvent); } - +static DRIVER_DISPATCH CreateClose; static NTSTATUS NTAPI CreateClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) /* Modified: trunk/reactos/drivers/storage/floppy/ioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.h (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.h Wed Nov 21 22:37:33 2007 @@ -24,6 +24,7 @@ * 15-Feb-2004 vizzini - Created */ +DRIVER_DISPATCH DeviceIoctl; NTSTATUS NTAPI DeviceIoctl(PDEVICE_OBJECT DeviceObject, PIRP Irp); Modified: trunk/reactos/drivers/storage/floppy/readwrite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.h (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.h Wed Nov 21 22:37:33 2007 @@ -24,7 +24,7 @@ * 15-Feb-2004 vizzini - Created */ - +DRIVER_DISPATCH ReadWrite; NTSTATUS NTAPI ReadWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp);

1 0

[cwittich] 30642: fix condition
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 22:11:40 2007 New Revision: 30642 URL: http://svn.reactos.org/svn/reactos?rev=30642&view=rev Log: fix condition Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.c (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.c Wed Nov 21 22:11:40 2007 @@ -5388,7 +5388,7 @@ // if ((Srb->Lun != 0) || - (!deviceExtension->DeviceFlags[Srb->TargetId] & DFLAGS_DEVICE_PRESENT)) { + (!(deviceExtension->DeviceFlags[Srb->TargetId] & DFLAGS_DEVICE_PRESENT))) { // // Indicate no device found at this address.

1 0

[cwittich] 30641: fix a format string
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 20:28:15 2007 New Revision: 30641 URL: http://svn.reactos.org/svn/reactos?rev=30641&view=rev Log: fix a format string Modified: trunk/reactos/drivers/filesystems/msfs/finfo.c Modified: trunk/reactos/drivers/filesystems/msfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/msfs/finfo.c Wed Nov 21 20:28:15 2007 @@ -169,7 +169,7 @@ BufferLength = IoStack->Parameters.QueryFile.Length; DPRINT("FileInformationClass %d\n", FileInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); + DPRINT("SystemBuffer %p\n", SystemBuffer); switch (FileInformationClass) {

1 0

[cwittich] 30640: fix some format strings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 20:20:36 2007 New Revision: 30640 URL: http://svn.reactos.org/svn/reactos?rev=30640&view=rev Log: fix some format strings Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fcb.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fcb.c Wed Nov 21 20:20:36 2007 @@ -181,7 +181,7 @@ ULONG ShortIndex; PVFATFCB tmpFcb; - DPRINT ("releasing FCB at %x: %wZ, refCount:%d\n", + DPRINT ("releasing FCB at %p: %wZ, refCount:%d\n", pFCB, &pFCB->PathNameU, pFCB->RefCount); @@ -562,7 +562,7 @@ fileObject->SectionObjectPointer = &fcb->SectionObjectPointers; fileObject->FsContext = fcb; fileObject->FsContext2 = newCCB; - DPRINT ("file open: fcb:%x PathName:%wZ\n", fcb, &fcb->PathNameU); + DPRINT ("file open: fcb:%p PathName:%wZ\n", fcb, &fcb->PathNameU); return STATUS_SUCCESS; } @@ -590,7 +590,7 @@ ASSERT(pDirectoryFCB); ASSERT(FileToFindU); - DPRINT ("vfatDirFindFile(VCB:%08x, dirFCB:%08x, File:%wZ)\n", + DPRINT ("vfatDirFindFile(VCB:%p, dirFCB:%p, File:%wZ)\n", pDeviceExt, pDirectoryFCB, FileToFindU); @@ -666,7 +666,7 @@ PWCHAR curr, prev, last; ULONG Length; - DPRINT ("vfatGetFCBForFile (%x,%x,%x,%wZ)\n", + DPRINT ("vfatGetFCBForFile (%p,%p,%p,%wZ)\n", pVCB, pParentFCB, pFCB,

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007