Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[gedmurphy] 31240: remove NtUserGetCursorIconSize

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Dec 15 15:17:34 2007 New Revision: 31240 URL: http://svn.reactos.org/svn/reactos?rev=31240&view=rev Log: remove NtUserGetCursorIconSize Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Dec 15 15:17:34 2007 @@ -1210,13 +1210,6 @@ BOOL NTAPI -NtUserGetCursorIconSize( - HANDLE Handle, - BOOL *fIcon, - SIZE *Size); - -BOOL -NTAPI NtUserGetIconInfo( HANDLE Handle, PICONINFO IconInfo,

16 years, 9 months

[gedmurphy] 31239: remove the ros only NtUserGetCursorIconSize and implement NtUserGetIconSize in it's place

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Dec 15 15:16:45 2007 New Revision: 31239 URL: http://svn.reactos.org/svn/reactos?rev=31239&view=rev Log: remove the ros only NtUserGetCursorIconSize and implement NtUserGetIconSize in it's place Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Sat Dec 15 15:16:45 2007 @@ -676,69 +676,54 @@ } +/* for hints how the prototype might be, see + http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 + http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ /* * @implemented */ BOOL -STDCALL -NtUserGetCursorIconSize( - HANDLE hCurIcon, - BOOL *fIcon, - SIZE *Size) +NTAPI +NtUserGetIconSize( + HANDLE hCurIcon, + DWORD dwUnknown2, // Most of the time Zero. + PLONG plcx, // &size.cx + PLONG plcy) // &size.cy { PCURICON_OBJECT CurIcon; - PBITMAPOBJ bmp; - PWINSTATION_OBJECT WinSta; - NTSTATUS Status; - BOOL Ret = FALSE; - SIZE SafeSize; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetCursorIconSize\n"); + NTSTATUS Status = STATUS_SUCCESS; + BOOL bRet = FALSE; + + DPRINT("Enter NtUserGetIconSize\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - /* Copy fields */ - Status = MmCopyToCaller(fIcon, &CurIcon->IconInfo.fIcon, sizeof(BOOL)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - - bmp = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmColor); - if(!bmp) - goto done; - - SafeSize.cx = bmp->SurfObj.sizlBitmap.cx; - SafeSize.cy = bmp->SurfObj.sizlBitmap.cy; - Status = MmCopyToCaller(Size, &SafeSize, sizeof(SIZE)); + goto cleanup; + } + + _SEH_TRY + { + ProbeForWrite(plcx, sizeof(LONG), 1); + RtlCopyMemory(plcx, &CurIcon->Size.cx, sizeof(LONG)); + ProbeForWrite(plcy, sizeof(LONG), 1); + RtlCopyMemory(plcy, &CurIcon->Size.cy, sizeof(LONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if(NT_SUCCESS(Status)) - Ret = TRUE; + bRet = TRUE; else - SetLastNtError(Status); - - BITMAPOBJ_UnlockBitmap(bmp); - -done: - ObDereferenceObject(WinSta); - RETURN( Ret); - -CLEANUP: - DPRINT("Leave NtUserGetCursorIconSize, ret=%i\n",_ret_); + SetLastNtError(Status); // maybe not, test this + +cleanup: + DPRINT("Leave NtUserGetIconSize, ret=%i\n", bRet); UserLeave(); - END_CLEANUP; + return bRet; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sat Dec 15 15:16:45 2007 @@ -758,21 +758,6 @@ return 0; } -/* for hints how the prototype might be, see - http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 - http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -BOOL -NTAPI -NtUserGetIconSize( - HANDLE Handle, - DWORD dwUnknown2, // Most of the time Zero. - PLONG plcx, // &size.cx - PLONG plcy) // &size.cy -{ - UNIMPLEMENTED; - return FALSE; -} - DWORD NTAPI NtUserGetImeInfoEx( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Dec 15 15:16:45 2007 @@ -697,7 +697,6 @@ NtUserGetClientOrigin 2 NtUserGetClientRect 2 NtUserGetMenuDefaultItem 3 -NtUserGetCursorIconSize 3 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2

16 years, 9 months

[janderwald] 31238: - register Folder Options panel - add code to register printer folder

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 15 15:03:47 2007 New Revision: 31238 URL: http://svn.reactos.org/svn/reactos?rev=31238&view=rev Log: - register Folder Options panel - add code to register printer folder Modified: trunk/reactos/dll/win32/shell32/regsvr.c Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c Sat Dec 15 15:03:47 2007 @@ -728,7 +728,10 @@ static const WCHAR wszMyDocuments[] = { 'M','y',' ','D','o','c','u','m','e','n','t','s', 0 }; static const WCHAR wszRecycleBin[] = { 'T','r','a','s','h', 0 }; static const WCHAR wszMyComputer[] = { 'M','y','C','o','m','p','u','t','e','r',0 }; -static const WCHAR wszControlPanel[] = { 'C','o','n','t','r','o','l',0 }; +static const WCHAR wszControlPanel[] = { 'C','o','n','t','r','o','l','P','a','n','e','l',0 }; +static const WCHAR wszFolderOptions[] = { 'F','o','l','d','e','r',' ','O','p','t','i','o','n','s',0 }; + +const GUID CLSID_FolderOptions = { 0x6DFD7C5C, 0x2451, 0x11d3, {0xa2,0x99,0x00,0xC0,0x4F,0x8e,0xf6,0xaf} }; static struct regsvr_namespace const namespace_extensions_list[] = { #if 0 @@ -753,6 +756,18 @@ wszMyComputer, wszControlPanel }, + { + &CLSID_FolderOptions, + wszControlPanel, + wszFolderOptions + }, +#if 0 + { + &CLSID_Printers, + wszControlPanel, + wszPrinters + }, +#endif { NULL } };

16 years, 9 months

[janderwald] 31237: - register Folder Options control panel

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 15 14:48:24 2007 New Revision: 31237 URL: http://svn.reactos.org/svn/reactos?rev=31237&view=rev Log: - register Folder Options control panel Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Sat Dec 15 14:48:24 2007 @@ -237,6 +237,16 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}","",0x00000000,"Shell Drag and Drop helper" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; Folder Options CPL +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}","",0x00000000,"Folder Options" +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-150" +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\InProcServer32","",0x00000000,"shell32.dll" +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\InProcServer32","ThreadingModel",0x00000000,"Apartment" +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-210" +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\Open\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0" +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\RunAs\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0" +HKCR,"CLSID\{{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000 ; Open With shell extension HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}","",0x00000000,"Open With Context Menu Handler"

16 years, 9 months

[spetreolle] 31236: include SDK first

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Dec 15 14:30:07 2007 New Revision: 31236 URL: http://svn.reactos.org/svn/reactos?rev=31236&view=rev Log: include SDK first Modified: trunk/rostests/drivers/memtest/memtest.c Modified: trunk/rostests/drivers/memtest/memtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/memtest/memtest.c… ============================================================================== --- trunk/rostests/drivers/memtest/memtest.c (original) +++ trunk/rostests/drivers/memtest/memtest.c Sat Dec 15 14:30:07 2007 @@ -21,11 +21,11 @@ /* INCLUDES *******************************************************************/ +#include <ddk/ntddk.h> +#include "memtest.h" + //#define NDEBUG #include <debug.h> - -#include <ddk/ntddk.h> -#include "memtest.h" HANDLE MonitorThreadHandle;

16 years, 9 months

[janderwald] 31235: - ukrainian translation of usetup by Artem Reznikov (temarez) - sort languages See issue #2889 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 15 14:25:03 2007 New Revision: 31235 URL: http://svn.reactos.org/svn/reactos?rev=31235&view=rev Log: - ukrainian translation of usetup by Artem Reznikov (temarez) - sort languages See issue #2889 for more details. Added: trunk/reactos/base/setup/usetup/lang/uk-UA.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c Added: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (added) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Sat Dec 15 14:25:03 2007 @@ -1,0 +1,728 @@ +#ifndef LANG_UK_UA_H__ +#define LANG_UK_UA_H__ + +static MUI_ENTRY ukUAWelcomePageEntries[] = +{ + { + 6, + 8, + "Ëàñêàâî ïðîñèìî äî ïðîãðàìè óñòàíîâêè ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Öÿ ÷àñòèíà óñòàíîâêè êîï³þº îïåðàö³éíó ñèñòåìó ReactOS ó Âàø", + TEXT_NORMAL + }, + { + 6, + 12, + "êîìï'þòåð ³ ãîòóº äðóãó ÷àñòèíó óñòàíîâêè.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Íàòèñí³òü <ENTER> ùîá óñòàíèòè ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Íàòèñí³òü <R> ùîá â³äíîâèòè ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Íàòèñí³òü <L> ùîá ïåðåãëÿíóòè ë³öåíç³éí³ óìîâè ReactOS", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Íàòèñí³òü <F3> ùîá âèéòè, íå âñòàíîâëþþ÷è ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Äëÿ á³ëüø êîíêðåòíî¿ ³íôîðìàö³¿ ïðî ReactOS, áóäü ëàñêà â³äâ³äàéòå:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org/uk/", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER=Ïðîäîâæèòè R=Â³äíîâèòè F3=Âèõ³ä", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUALicensePageEntries[] = +{ + { + 6, + 6, + "Licensing:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Return", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUADevicePageEntries[] = +{ + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_NORMAL + }, + { + 8, + 11, + " Computer:", + TEXT_NORMAL + }, + { + 8, + 12, + " Display:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Keyboard:", + TEXT_NORMAL + }, + { + 8, + 14, + "Keyboard layout:", + TEXT_NORMAL + }, + { + 8, + 16, + " Accept:", + TEXT_NORMAL + }, + { + 25, + 16, "Accept these device settings", + TEXT_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_NORMAL + }, + { + 6, + 21, + "settings.", + TEXT_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_NORMAL + }, + { + 6, + 24, + "and press ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUARepairPageEntries[] = +{ + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Main page ENTER = Reboot", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY ukUAComputerPageEntries[] = +{ + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAFlushPageEntries[] = +{ + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_NORMAL + }, + { + 0, + 0, + " Flushing cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUAQuitPageEntries[] = +{ + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUADisplayPageEntries[] = +{ + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUASuccessPageEntries[] = +{ + { + 10, + 6, + "The basic components of ReactOS have been installed successfully.", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Reboot computer", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ukUABootPageEntries[] = +{ + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +MUI_PAGE ukUAPages[] = +{ + { + START_PAGE, + ukUAWelcomePageEntries + }, + { + INTRO_PAGE, + ukUAIntroPageEntries + }, + { + LICENSE_PAGE, + ukUALicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + ukUADevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + ukUARepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + ukUAComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + ukUADisplayPageEntries + }, + { + FLUSH_PAGE, + ukUAFlushPageEntries + }, + { + QUIT_PAGE, + ukUAQuitPageEntries + }, + { + SUCCESS_PAGE, + ukUASuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + ukUABootPageEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/uk-UA.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sat Dec 15 14:25:03 2007 @@ -2,8 +2,9 @@ #include "mui.h" #include "lang/en-US.h" +#include "lang/es-ES.h" #include "lang/de-DE.h" -#include "lang/es-ES.h" +#include "lang/uk-UA.h" static MUI_LANGUAGE LanguageList[] = { @@ -18,6 +19,10 @@ { "Spanish", esESPages + }, + { + "Ukrainian", + ukUAPages }, { NULL,

16 years, 9 months

[janderwald] 31234: - add IDS_FOLDER_OPTIONS constant - start implementing folder options cpl - export a few functions by name, patch by Kamil Hornicek(Pigglesworth) - move Options_RunDll[A|W] to new file folder_options.c

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 15 14:13:01 2007 New Revision: 31234 URL: http://svn.reactos.org/svn/reactos?rev=31234&view=rev Log: - add IDS_FOLDER_OPTIONS constant - start implementing folder options cpl - export a few functions by name, patch by Kamil Hornicek(Pigglesworth) - move Options_RunDll[A|W] to new file folder_options.c Added: trunk/reactos/dll/win32/shell32/folder_options.c (with props) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/shresdef.h Added: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.c (added) +++ trunk/reactos/dll/win32/shell32/folder_options.c Sat Dec 15 14:13:01 2007 @@ -1,0 +1,176 @@ +/* + * Open With Context Menu extension + * + * Copyright 2007 Johannes Anderwald <janderwald(a)reactos.org> + * + * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "winerror.h" +#include "wine/debug.h" + +#include "windef.h" +#include "wingdi.h" +#include "pidl.h" +#include "undocshell.h" +#include "shlobj.h" +#include "objbase.h" +#include "commdlg.h" + +#include "shell32_main.h" +#include "shellfolder.h" +#include "shresdef.h" +#include "stdio.h" +#include "shlwapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL (fprop); + +/// Folder Options: +/// CLASSKEY = HKEY_CLASSES_ROOT\CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF} +/// DefaultIcon = %SystemRoot%\system32\SHELL32.dll,-210 +/// Verbs: Open / RunAs +/// Cmd: rundll32.exe shell32.dll,Options_RunDLL 0 + +/// ShellFolder Attributes: 0x0 + +INT_PTR +CALLBACK +FolderOptionsGeneralDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + + + + return FALSE; +} + +INT_PTR +CALLBACK +FolderOptionsViewDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + + + + return FALSE; +} + +INT_PTR +CALLBACK +FolderOptionsFileTypesDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + + + + return FALSE; +} + + +VOID +ShowFolderOptionsDialog(HWND hWnd, HINSTANCE hInst) +{ + PROPSHEETHEADERW pinfo; + HPROPSHEETPAGE hppages[3]; + HPROPSHEETPAGE hpage; + UINT num_pages = 0; + WCHAR szOptions[100]; + + hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_GENERAL_DLG", FolderOptionsGeneralDlg, 0, NULL); + if (hpage) + hppages[num_pages++] = hpage; + + hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_VIEW_DLG", FolderOptionsViewDlg, 0, NULL); + if (hpage) + hppages[num_pages++] = hpage; + + hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_FILETYPES_DLG", FolderOptionsFileTypesDlg, 0, NULL); + if (hpage) + hppages[num_pages++] = hpage; + + szOptions[0] = L'\0'; + LoadStringW(hInst, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); + szOptions[99] = L'\0'; + + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); + pinfo.dwSize = sizeof(PROPSHEETHEADERW); + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.nPages = num_pages; + pinfo.u3.phpage = hppages; + pinfo.pszCaption = szOptions; + + PropertySheetW(&pinfo); +} + +VOID +Options_RunDLLCommon(HWND hWnd, HINSTANCE hInst, int fOptions, DWORD nCmdShow) +{ + switch(fOptions) + { + case 0: + ShowFolderOptionsDialog(hWnd, hInst); + break; + case 1: + // show taskbar options dialog + FIXME("notify explorer to show taskbar options dialog"); + //PostMessage(GetShellWindow(), WM_USER+22, fOptions, 0); + break; + default: + FIXME("unrecognized options id %d\n", fOptions); + } +} + +/************************************************************************* + * Options_RunDLL (SHELL32.@) + */ +VOID WINAPI Options_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) +{ + Options_RunDLLCommon(hWnd, hInst, StrToIntA(cmd), nCmdShow); +} +/************************************************************************* + * Options_RunDLLA (SHELL32.@) + */ +VOID WINAPI Options_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) +{ + Options_RunDLLCommon(hWnd, hInst, StrToIntA(cmd), nCmdShow); +} + +/************************************************************************* + * Options_RunDLLW (SHELL32.@) + */ +VOID WINAPI Options_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) +{ + Options_RunDLLCommon(hWnd, hInst, StrToIntW(cmd), nCmdShow); +} + + + Propchange: trunk/reactos/dll/win32/shell32/folder_options.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Sat Dec 15 14:13:01 2007 @@ -640,4 +640,5 @@ FCIDM_SHVIEW_NEW "Íîâè" FCIDM_SHVIEW_NEWFOLDER "Íîâà &ïàïêà" FCIDM_SHVIEW_NEWLINK "Íîâà &âðúçêà" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Sat Dec 15 14:13:01 2007 @@ -642,4 +642,5 @@ FCIDM_SHVIEW_NEW "&Nový" FCIDM_SHVIEW_NEWFOLDER "Nová &sloka" FCIDM_SHVIEW_NEWLINK "Nový &zástupce" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sat Dec 15 14:13:01 2007 @@ -642,4 +642,5 @@ FCIDM_SHVIEW_NEW "Neu" FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" -END + IDS_FOLDER_OPTIONS "Ordneroptionen" +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "Äçìéïõñãßá" FCIDM_SHVIEW_NEWFOLDER "ÍÝïò &ÖÜêåëïò" FCIDM_SHVIEW_NEWLINK "ÍÝá &Óõíôüìåõóç" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sat Dec 15 14:13:01 2007 @@ -642,4 +642,5 @@ FCIDM_SHVIEW_NEW "Nuevo" FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" FCIDM_SHVIEW_NEWLINK "Nuevo &acceso directo" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "Uusi" FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" FCIDM_SHVIEW_NEWLINK "Uusi &Linkki" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sat Dec 15 14:13:01 2007 @@ -645,4 +645,5 @@ FCIDM_SHVIEW_NEW "Nouveau" FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Sat Dec 15 14:13:01 2007 @@ -644,4 +644,5 @@ FCIDM_SHVIEW_NEW "Ú&j" FCIDM_SHVIEW_NEWFOLDER "&Mappa" FCIDM_SHVIEW_NEWLINK "&Parancsikon" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Sat Dec 15 14:13:01 2007 @@ -642,4 +642,5 @@ FCIDM_SHVIEW_NEW "Nuovo" FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" FCIDM_SHVIEW_NEWLINK "Nuovo &Collegamento" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "VKì¬" FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "Ny" FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" FCIDM_SHVIEW_NEWLINK "Ny &snarvei" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Sat Dec 15 14:13:01 2007 @@ -642,4 +642,5 @@ FCIDM_SHVIEW_NEW "&Nowy" FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&Skrót" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Sat Dec 15 14:13:01 2007 @@ -643,5 +643,5 @@ FCIDM_SHVIEW_NEW "Novo" FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" - -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Sat Dec 15 14:13:01 2007 @@ -643,4 +643,5 @@ FCIDM_SHVIEW_NEW "Novo" FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sat Dec 15 14:13:01 2007 @@ -640,4 +640,5 @@ FCIDM_SHVIEW_NEW "Ñîçäàòü" FCIDM_SHVIEW_NEWFOLDER "&Ïàïêà" FCIDM_SHVIEW_NEWLINK "&ßðëûê" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "Yeni" FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" FCIDM_SHVIEW_NEWLINK "Yeni &Kýsayol" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sat Dec 15 14:13:01 2007 @@ -642,4 +642,5 @@ FCIDM_SHVIEW_NEW "Ñòâîðèòè" FCIDM_SHVIEW_NEWFOLDER "&Ïàïêó" FCIDM_SHVIEW_NEWLINK "&ßðëèê" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Sat Dec 15 14:13:01 2007 @@ -641,4 +641,5 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" -END + IDS_FOLDER_OPTIONS "Folder Options" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Sat Dec 15 14:13:01 2007 @@ -642,6 +642,7 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" + IDS_FOLDER_OPTIONS "Folder Options" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Sat Dec 15 14:13:01 2007 @@ -642,6 +642,7 @@ FCIDM_SHVIEW_NEW "New" FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" + IDS_FOLDER_OPTIONS "Folder Options" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Sat Dec 15 14:13:01 2007 @@ -72,4 +72,5 @@ <file>recyclebin.c</file> <file>she_ocmenu.c</file> <file>shv_item_new.c</file> + <file>folder_options.c</file> </module> Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Sat Dec 15 14:13:01 2007 @@ -3,28 +3,28 @@ # win95 and winNT dlls import shell32.dll by ordinal) # This list was updated to dll version 4.72 - 2 stdcall -noname SHChangeNotifyRegister(long long long long long ptr) + 2 stdcall SHChangeNotifyRegister(long long long long long ptr) 3 stdcall SHDefExtractIconA(str long long ptr ptr long) - 4 stdcall -noname SHChangeNotifyDeregister(long) + 4 stdcall SHChangeNotifyDeregister(long) 5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) 6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) - 9 stub -noname PifMgr_OpenProperties - 10 stub -noname PifMgr_GetProperties - 11 stub -noname PifMgr_SetProperties - 13 stub -noname PifMgr_CloseProperties + 9 stub PifMgr_OpenProperties + 10 stub PifMgr_GetProperties + 11 stub PifMgr_SetProperties + 13 stub PifMgr_CloseProperties 15 stdcall -noname ILGetDisplayName(ptr ptr) - 16 stdcall -noname ILFindLastID(ptr) - 17 stdcall -noname ILRemoveLastID(ptr) - 18 stdcall -noname ILClone(ptr) - 19 stdcall -noname ILCloneFirst(ptr) + 16 stdcall ILFindLastID(ptr) + 17 stdcall ILRemoveLastID(ptr) + 18 stdcall ILClone(ptr) + 19 stdcall ILCloneFirst(ptr) 20 stdcall -noname ILGlobalClone(ptr) - 21 stdcall -noname ILIsEqual(ptr ptr) - 23 stdcall -noname ILIsParent(ptr ptr long) - 24 stdcall -noname ILFindChild(ptr ptr) - 25 stdcall -noname ILCombine(ptr ptr) - 26 stdcall -noname ILLoadFromStream(ptr ptr) - 27 stdcall -noname ILSaveToStream(ptr ptr) - 28 stdcall -noname SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW + 21 stdcall ILIsEqual(ptr ptr) + 23 stdcall ILIsParent(ptr ptr long) + 24 stdcall ILFindChild(ptr ptr) + 25 stdcall ILCombine(ptr ptr) + 26 stdcall ILLoadFromStream(ptr ptr) + 27 stdcall ILSaveToStream(ptr ptr) + 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW 31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW @@ -37,65 +37,65 @@ 38 stdcall -noname PathStripPath(ptr)PathStripPathAW 39 stdcall -noname PathIsUNC(ptr) PathIsUNCAW 40 stdcall -noname PathIsRelative(ptr) PathIsRelativeAW - 41 stdcall -noname IsLFNDriveA(str) - 42 stdcall -noname IsLFNDriveW(wstr) - 43 stdcall -noname PathIsExe(ptr) PathIsExeAW + 41 stdcall IsLFNDriveA(str) + 42 stdcall IsLFNDriveW(wstr) + 43 stdcall PathIsExe(ptr) PathIsExeAW 45 stdcall -noname PathFileExists(ptr) PathFileExistsAW 46 stdcall -noname PathMatchSpec(ptr ptr) PathMatchSpecAW - 47 stdcall -noname PathMakeUniqueName(ptr long ptr ptr ptr)PathMakeUniqueNameAW + 47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr)PathMakeUniqueNameAW 48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW - 49 stdcall -noname PathQualify(ptr) PathQualifyAW + 49 stdcall PathQualify(ptr) PathQualifyAW 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW - 53 stdcall DoEnvironmentSubst(long long) DoEnvironmentSubstAW + 53 stdcall -noname DoEnvironmentSubst(long long) DoEnvironmentSubstAW 54 stdcall -noname LogoffWindowsDialog(ptr) 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW 57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW - 59 stdcall -noname RestartDialog(long wstr long) + 59 stdcall RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) 61 stdcall -noname RunFileDlg(long long long str str long) - 62 stdcall -noname PickIconDlg(long long long long) - 63 stdcall -noname GetFileNameFromBrowse(long long long long str str str) - 64 stdcall -noname DriveType(long) + 62 stdcall PickIconDlg(long long long long) + 63 stdcall GetFileNameFromBrowse(long long long long str str str) + 64 stdcall DriveType(long) 65 stdcall -noname InvalidateDriveType(long) - 66 stdcall -noname IsNetDrive(long) - 67 stdcall -noname Shell_MergeMenus(long long long long long long) - 68 stdcall -noname SHGetSetSettings(ptr long long) + 66 stdcall IsNetDrive(long) + 67 stdcall Shell_MergeMenus(long long long long long long) + 68 stdcall SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource 70 stdcall -noname SHCreateDefClassObject(long long long long long) - 71 stdcall -noname Shell_GetImageList(ptr ptr) - 72 stdcall -noname Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW - 73 stdcall -noname SHShellFolderView_Message(long long long) - 74 stdcall -noname SHCreateStdEnumFmtEtc(long ptr ptr) - 75 stdcall -noname PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) - 76 stub DragQueryInfo - 77 stdcall -noname SHMapPIDLToSystemImageListIndex(ptr ptr ptr) + 71 stdcall Shell_GetImageList(ptr ptr) + 72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW + 73 stdcall SHShellFolderView_Message(long long long) + 74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) + 75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) + 76 stub -noname DragQueryInfo + 77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) 78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW 79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW 83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) - 84 stub SHIsBadInterfacePtr - 85 stdcall -noname OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA + 84 stub -noname SHIsBadInterfacePtr + 85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA 86 stdcall -noname SHRegisterDragDrop(long ptr) 87 stdcall -noname SHRevokeDragDrop(long) - 88 stdcall -noname SHDoDragDrop(long ptr ptr long ptr) - 89 stdcall -noname SHCloneSpecialIDList(long long long) - 90 stdcall -noname SHFindFiles(ptr ptr) - 91 stub SHFindComputer - 92 stdcall -noname PathGetShortPath(ptr) PathGetShortPathAW + 88 stdcall SHDoDragDrop(long ptr ptr long ptr) + 89 stdcall SHCloneSpecialIDList(long long long) + 90 stdcall SHFindFiles(ptr ptr) + 91 stub -noname SHFindComputer + 92 stdcall PathGetShortPath(ptr) PathGetShortPathAW 93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryAW 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryAW 95 stdcall -noname SHLogILFromFSIL(ptr) 96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW 97 stdcall -noname SHWaitForFileToOpen (long long long) - 98 stdcall -noname SHGetRealIDL(ptr ptr ptr) + 98 stdcall SHGetRealIDL(ptr ptr ptr) 99 stdcall -noname SetAppStartingCursor(long long) 100 stdcall -noname SHRestricted(long) - 102 stdcall -noname SHCoCreateInstance(wstr ptr long ptr ptr) - 103 stdcall -noname SignalFileOpen(long) + 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) + 103 stdcall SignalFileOpen(long) 104 stdcall -noname FileMenu_DeleteAllItems(long) 105 stdcall -noname FileMenu_DrawItem(long ptr) 106 stdcall -noname FileMenu_FindSubMenuByPidl(long ptr) @@ -111,9 +111,9 @@ 116 stdcall -noname FileMenu_TrackPopupMenuEx(long long long long long long) 117 stdcall -noname FileMenu_DeleteItemByCmd(long long) 118 stdcall -noname FileMenu_Destroy(long) - 119 stdcall -noname IsLFNDrive(ptr) IsLFNDriveAW + 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() - 121 stdcall -noname SHFlushClipboard() + 121 stdcall SHFlushClipboard() 122 stdcall -noname RunDLL_CallEntry16(long long long str long) #name wrong? 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) @@ -121,13 +121,13 @@ 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject - 129 stdcall -noname DAD_AutoScroll(long ptr ptr) + 129 stdcall DAD_AutoScroll(long ptr ptr) 130 stdcall -noname DAD_DragEnter(long) - 131 stdcall -noname DAD_DragEnterEx(long double) - 132 stdcall -noname DAD_DragLeave() - 134 stdcall -noname DAD_DragMove(double) - 136 stdcall -noname DAD_SetDragImage(long long) - 137 stdcall -noname DAD_ShowDragImage(long) + 131 stdcall DAD_DragEnterEx(long double) + 132 stdcall DAD_DragLeave() + 134 stdcall DAD_DragMove(double) + 136 stdcall DAD_SetDragImage(long long) + 137 stdcall DAD_ShowDragImage(long) 139 stub Desktop_UpdateBriefcaseOnEvent 140 stdcall -noname FileMenu_DeleteItemByIndex(long long) 141 stdcall -noname FileMenu_DeleteItemByFirstID(long long) @@ -136,57 +136,57 @@ 144 stdcall -noname FileMenu_GetItemExtent(long long) 145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW 146 stdcall -noname RLBuildListOfPaths() - 147 stdcall -noname SHCLSIDFromString(long long) SHCLSIDFromStringAW - 148 stdcall -noname SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) - 149 stdcall -noname SHFind_InitMenuPopup(long long long long) - - 151 stdcall -noname SHLoadOLE(long) - 152 stdcall -noname ILGetSize(ptr) - 153 stdcall -noname ILGetNext(ptr) - 154 stdcall -noname ILAppend(long long long) - 155 stdcall -noname ILFree(ptr) + 147 stdcall SHCLSIDFromString(long long) SHCLSIDFromStringAW + 148 stdcall SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) + 149 stdcall SHFind_InitMenuPopup(long long long long) + + 151 stdcall SHLoadOLE(long) + 152 stdcall ILGetSize(ptr) + 153 stdcall ILGetNext(ptr) + 154 stdcall ILAppend(long long long) + 155 stdcall ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) - 157 stdcall -noname ILCreateFromPath(ptr) ILCreateFromPathAW + 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW 158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW 159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW - 160 stub SHNetConnectionDialog - 161 stdcall -noname SHRunControlPanel(long long) - 162 stdcall -noname SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW + 160 stub -noname SHNetConnectionDialog + 161 stdcall SHRunControlPanel(long long) + 162 stdcall SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW - 164 stdcall -noname Win32DeleteFile(str) Win32DeleteFileAW - 165 stdcall -noname SHCreateDirectory(long ptr) - 166 stdcall -noname CallCPLEntry16(long long long long long long) - 167 stdcall -noname SHAddFromPropSheetExtArray(long long long) - 168 stdcall -noname SHCreatePropSheetExtArray(long wstr long) - 169 stdcall -noname SHDestroyPropSheetExtArray(long) - 170 stdcall -noname SHReplaceFromPropSheetExtArray(long long long long) - 171 stdcall -noname PathCleanupSpec(ptr ptr) + 164 stdcall Win32DeleteFile(str) Win32DeleteFileAW + 165 stdcall SHCreateDirectory(long ptr) + 166 stdcall CallCPLEntry16(long long long long long long) + 167 stdcall SHAddFromPropSheetExtArray(long long long) + 168 stdcall SHCreatePropSheetExtArray(long wstr long) + 169 stdcall SHDestroyPropSheetExtArray(long) + 170 stdcall SHReplaceFromPropSheetExtArray(long long long long) + 171 stdcall PathCleanupSpec(ptr ptr) 172 stdcall -noname SHCreateLinks(long str ptr long ptr) - 173 stdcall -noname SHValidateUNC(long long long) - 174 stdcall -noname SHCreateShellFolderViewEx(ptr ptr) + 173 stdcall SHValidateUNC(long long long) + 174 stdcall SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW - 176 stdcall -noname SHSetInstanceExplorer(long) - 177 stub DAD_SetDragImageFromListView - 178 stdcall -noname SHObjectProperties(long long wstr wstr) - 179 stdcall -noname SHGetNewLinkInfoA(str str ptr long long) - 180 stdcall -noname SHGetNewLinkInfoW(wstr wstr ptr long long) + 176 stdcall SHSetInstanceExplorer(long) + 177 stub -noname DAD_SetDragImageFromListView + 178 stdcall SHObjectProperties(long long wstr wstr) + 179 stdcall SHGetNewLinkInfoA(str str ptr long long) + 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) - 182 varargs -noname ShellMessageBoxW(long long wstr wstr long) - 183 varargs -noname ShellMessageBoxA(long long str str long) + 182 varargs ShellMessageBoxW(long long wstr wstr long) + 183 varargs ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) - 185 stub SHHandleDiskFull + 185 stub -noname SHHandleDiskFull 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) - 187 stub ILGetPseudoNameW + 187 stub -noname ILGetPseudoNameW 188 stdcall -noname ShellDDEInit(long) - 189 stdcall -noname ILCreateFromPathA(str) - 190 stdcall -noname ILCreateFromPathW(wstr) - 191 stdcall -noname SHUpdateImageA(str long long long) - 192 stdcall -noname SHUpdateImageW(wstr long long long) - 193 stdcall -noname SHHandleUpdateImage(ptr) + 189 stdcall ILCreateFromPathA(str) + 190 stdcall ILCreateFromPathW(wstr) + 191 stdcall SHUpdateImageA(str long long long) + 192 stdcall SHUpdateImageW(wstr long long long) + 193 stdcall SHHandleUpdateImage(ptr) 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) - 195 stdcall -noname SHFree(ptr) - 196 stdcall -noname SHAlloc(long) - 197 stub SHGlobalDefect + 195 stdcall SHFree(ptr) + 196 stdcall SHAlloc(long) + 197 stub -noname SHGlobalDefect 198 stdcall -noname SHAbortInvokeCommand() 199 stub SHGetFileIcon 200 stub SHLocalAlloc @@ -228,19 +228,19 @@ 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) 512 stdcall SHRegDeleteKeyW (long wstr) - 520 stdcall -noname SHAllocShared(ptr long long) - 521 stdcall -noname SHLockShared(long long) - 522 stdcall -noname SHUnlockShared(ptr) - 523 stdcall -noname SHFreeShared(long long) - 524 stdcall -noname RealDriveType(long long) + 520 stdcall SHAllocShared(ptr long long) + 521 stdcall SHLockShared(long long) + 522 stdcall SHUnlockShared(ptr) + 523 stdcall SHFreeShared(long long) + 524 stdcall RealDriveType(long long) 525 stub RealDriveTypeFlags 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) 641 stdcall -noname NTSHChangeNotifyDeregister(long) 643 stub SHChangeNotifyReceive - 644 stdcall -noname SHChangeNotification_Lock(long long ptr ptr) - 645 stdcall -noname SHChangeNotification_Unlock(long) + 644 stdcall SHChangeNotification_Lock(long long ptr ptr) + 645 stdcall SHChangeNotification_Unlock(long) 646 stub SHChangeRegistrationReceive 647 stub ReceiveAddToRecentDocs 648 stub SHWaitOp_Operate @@ -248,15 +248,15 @@ 650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW 651 stdcall -noname ReadCabinetState(long long) # OldReadCabinetState - 652 stdcall -noname WriteCabinetState(long) - 653 stdcall -noname PathProcessCommand(long long long long) PathProcessCommandAW + 652 stdcall WriteCabinetState(long) + 653 stdcall PathProcessCommand(long long long long) PathProcessCommandAW 654 stdcall @(long long) shell32_654 # ReadCabinetState@8 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW - 730 stdcall -noname RestartDialogEx(long wstr long long) + 730 stdcall RestartDialogEx(long wstr long long) 1217 stub FOOBAR1217 # no joke! This is the real name!! Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Sat Dec 15 14:13:01 2007 @@ -2088,26 +2088,3 @@ return TRUE; } -/************************************************************************* - * Options_RunDLL (SHELL32.@) - */ -VOID WINAPI Options_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) -{ - - PostMessage(GetShellWindow(), WM_USER+22, StrToIntA(cmd), 0); -} -/************************************************************************* - * Options_RunDLLA (SHELL32.@) - */ -VOID WINAPI Options_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow) -{ - PostMessage(GetShellWindow(), WM_USER+22, StrToIntA(cmd), 0); -} - -/************************************************************************* - * Options_RunDLLW (SHELL32.@) - */ -VOID WINAPI Options_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) -{ - PostMessage(GetShellWindow(), WM_USER+22, StrToIntW(cmd), 0); -} Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Sat Dec 15 14:13:01 2007 @@ -109,6 +109,7 @@ #define FCIDM_SHVIEW_VIEW 147 #define IDS_CONTROLPANEL 148 #define IDS_NEWFOLDER 149 +#define IDS_FOLDER_OPTIONS 150 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

16 years, 9 months

[hpoussin] 31233: Fix deletion of generated proxy makefile

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Dec 15 13:04:29 2007 New Revision: 31233 URL: http://svn.reactos.org/svn/reactos?rev=31233&view=rev Log: Fix deletion of generated proxy makefile Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Dec 15 13:04:29 2007 @@ -2208,9 +2208,14 @@ if ( module.name != "zlib" ) /* Avoid make warning */ { - FileLocation proxyMakefile ( OutputDirectory, + DirectoryLocation root; + if ( backend->configuration.GenerateProxyMakefilesInSourceTree ) + root = SourceDirectory; + else + root = OutputDirectory; + FileLocation proxyMakefile ( root, module.output->relative_path, - "makefile" ); + "GNUmakefile" ); CLEAN_FILE ( proxyMakefile ); }

16 years, 9 months

[fireball] 31232: - Colin Finck: Replace broken memcmp comparison of wide strings by an own version of wcsncmp (due to the fact it may be different on different hosts). - Add RtlAssert to mkhive, it was missing in some compiling cases, and fix DbgPrint function implementation. - Mark a memory overwrite in mkhive with a FIXME, to be fixed later.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Dec 15 13:02:00 2007 New Revision: 31232 URL: http://svn.reactos.org/svn/reactos?rev=31232&view=rev Log: - Colin Finck: Replace broken memcmp comparison of wide strings by an own version of wcsncmp (due to the fact it may be different on different hosts). - Add RtlAssert to mkhive, it was missing in some compiling cases, and fix DbgPrint function implementation. - Mark a memory overwrite in mkhive with a FIXME, to be fixed later. Modified: trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/rtl.c Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c (original) +++ trunk/reactos/tools/mkhive/registry.c Sat Dec 15 13:02:00 2007 @@ -68,6 +68,8 @@ Key->ValueCount = 0; Key->NameSize = KeyName->Length; + /* FIXME: It's not enough to allocate this way, because later + this memory gets overwritten with bigger names */ Key->Name = malloc (Key->NameSize); if (!Key->Name) return NULL; @@ -136,7 +138,7 @@ RtlInitUnicodeString(&KeyString, LocalKeyName); /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ - if (!memcmp(LocalKeyName, L"CurrentControlSet", 34) && + if (!xwcsncmp(LocalKeyName, L"CurrentControlSet", 17) && ParentKey->NameSize == 12 && !memcmp(ParentKey->Name, L"SYSTEM", 12)) RtlInitUnicodeString(&KeyString, L"ControlSet001"); Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=312… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c (original) +++ trunk/reactos/tools/mkhive/rtl.c Sat Dec 15 13:02:00 2007 @@ -26,6 +26,23 @@ if( String[i] ) return &String[i]; else return NULL; +} + +int xwcsncmp(PCWSTR s1, PCWSTR s2, size_t n) +{ + while(n--) + { + if(*s1 != *s2) + return 1; + + if(*s1 == 0) + return 0; + + s1++; + s2++; + } + + return 0; } /* @@ -168,4 +185,32 @@ va_start(ap, Format); vprintf(Format, ap); va_end(ap); -} + + return 0; +} + +VOID +NTAPI +RtlAssert(PVOID FailedAssertion, + PVOID FileName, + ULONG LineNumber, + PCHAR Message) +{ + if (NULL != Message) + { + DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber, + Message); + } + else + { + DbgPrint("Assertion \'%s\' failed at %s line %d\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber); + } + + //DbgBreakPoint(); +}

16 years, 9 months

[jimtabor] 31231: Use new share handle table info.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 15 12:11:59 2007 New Revision: 31231 URL: http://svn.reactos.org/svn/reactos?rev=31231&view=rev Log: Use new share handle table info. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sat Dec 15 12:11:59 2007 @@ -96,10 +96,10 @@ ULONG DxEngDispUniq() { - /* FIXME DisplayUniqVisrgn from gdishare memory */ - UNIMPLEMENTED; - return FALSE; -} + return GdiHandleTable->flDeviceUniq; +} + +ULONG gulVisRgnUniqueness; // Inc count everytime client region is updated. /************************************************************************/ /* DxEngVisRgnUniq */ @@ -108,9 +108,7 @@ ULONG DxEngVisRgnUniq() { - /* FIXME DisplayUniqVisrgn from gdishare memory */ - UNIMPLEMENTED; - return FALSE; + return gulVisRgnUniqueness; } /************************************************************************/

16 years, 9 months

← Newer
1
...
27
28
29
30
31
32
33
...
61
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 December 2007