Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 15288: rename czech resource file to sync wih Wine's filename
by mf＠svn.reactos.com 14 May '05

14 May '05

rename czech resource file to sync wih Wine's filename Added: trunk/reactos/subsys/system/winefile/cs.rc Deleted: trunk/reactos/subsys/system/winefile/cz.rc Modified: trunk/reactos/subsys/system/winefile/winefile.dsp Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Copied: trunk/reactos/subsys/system/winefile/cs.rc (from rev 15286, trunk/reactos/subsys/system/winefile/cz.rc) _____ Deleted: trunk/reactos/subsys/system/winefile/cz.rc --- trunk/reactos/subsys/system/winefile/cz.rc 2005-05-14 19:45:27 UTC (rev 15287) +++ trunk/reactos/subsys/system/winefile/cz.rc 2005-05-14 19:58:30 UTC (rev 15288) @@ -1,211 +0,0 @@ -/* - * WineFile - * Czech Language Support - * - * Copyright 2005 Denzil <d3nzil(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -#pragma code_page(1250) - - -/* Menu */ - -IDM_WINEFILE MENU FIXED IMPURE -{ - POPUP "&Soubor" { - MENUITEM "&Otev°Ýt\tEnter" , ID_ACTIVATE - MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE - MENUITEM "&KopÝrovat...\tF8" , 107 - MENUITEM "&Ve schrßnce...\tF9" , 118 - MENUITEM "&Smazat\tDel" , 108 - MENUITEM "P°&ejmenovat..." , 109 - MENUITEM "V&lastnosti...\tAlt+Enter" , ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "&Komprese..." , 119 - MENUITEM "&Dekomprese..." , 120 - MENUITEM SEPARATOR - MENUITEM "&Spustit..." , ID_EXECUTE - MENUITEM "&Tisknout..." , 102 - MENUITEM "Asociovat..." , 103 - MENUITEM SEPARATOR - MENUITEM "V&ytvo°it adresß°..." , 111 - MENUITEM "&Hledat..." , 104 - MENUITEM "&Zvolit voubory..." , 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "K&onec\tAlt+X" , ID_FILE_EXIT -#else - MENUITEM "K&onec", ID_FILE_EXIT -#endif - } - - POPUP "&Disk" { - MENUITEM "&KopÝrovat disk..." , 201 - MENUITEM "&Jmenovka disk..." , 202 - MENUITEM SEPARATOR - MENUITEM "&Formßtovat disk..." , ID_FORMAT_DISK -#ifdef _WIN95 - MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ" , ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ" , ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "SdÝlet jako..." , 254 - MENUITEM "&Odstranit sdÝlenÝ..." , 255 - MENUITEM SEPARATOR - MENUITEM "&Zvolit za°ÝzenÝ..." , 251 - } - - POPUP "&Adresß°e" { - MENUITEM "&DalÜÝ ·rove?\t+" , 301 - MENUITEM "Rozbalit &strom\t*" , 302 - MENUITEM "Rozbalit &vÜe\tStrg+*" , 303 - MENUITEM "Sbalit &strom\t-" , 304 - MENUITEM SEPARATOR - MENUITEM "&OznaÞit potomky" , 505 - } - - POPUP "&ZobrazenÝ" { - MENUITEM "&Strom a adresß°e" , 413 - MENUITEM "&Jen strom" , 411 - MENUITEM "Jen &adresß°e" , 412 - MENUITEM SEPARATOR - MENUITEM "&Rozdýlit" , 414 - MENUITEM SEPARATOR - MENUITEM "&JmÚno" , ID_VIEW_NAME - MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "?ß&steÞnÚ detaily..." , ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&T°Ýdit podle jmÚna" , ID_VIEW_SORT_NAME - MENUITEM "T°Ýdit &podle typu" , ID_VIEW_SORT_TYPE - MENUITEM "T°Ýdit podle &velikosti" , ID_VIEW_SORT_SIZE - MENUITEM "T°Ýdit podle &data" , ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "T°Ýdit podle &..." , 409 - } - - POPUP "&NastavenÝ" { - MENUITEM "&PotvrzovßnÝ..." , -1 - MENUITEM "&PÝsmo..." , ID_SELECT_FONT - MENUITEM "Upravit panel &nßstroj¨..." , -1 - MENUITEM SEPARATOR - MENUITEM "&Panel nßstroj¨" , ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Panel za°ÝenÝ" , ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Stavov² °ßdek" , ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "&Celaß obrazovka\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimalizovat p°i spuÜtýnÝ" , -1 - MENUITEM "&Ulo×it nastavenÝ p°i vypnutÝ" , 511 - } - - - POPUP "&ZabezpeÞenÝ" { - MENUITEM "&P°Ýstup..." , 605 - MENUITEM "&LogovßnÝ..." , 606 - MENUITEM "&VlastnÝk..." , 607 - } - - POPUP "&Okno" { - MENUITEM "NovÚ &okno" , ID_WINDOW_NEW - MENUITEM "KaskßdovßnÝ\tCtrl+F5" , ID_WINDOW_CASCADE - MENUITEM "Uspo°ßdat &horizontßlný" , ID_WINDOW_TILE_HORZ - MENUITEM "Uspo°ßdat &vertikßlný\tCtrl+F4" , ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "Zarovnat automaticky" , ID_WINDOW_AUTOSORT -#endif - MENUITEM "Zarovnat &symboly" , ID_WINDOW_ARRANGE - MENUITEM "&Aktualizovat\tF5" , ID_REFRESH - } - - POPUP "&?" { - MENUITEM "&TÚmata nßpovýdy\tF1" , ID_HELP - MENUITEM "HledßnÝ v &nßpovýdý...\tF1" , ID_HELP - MENUITEM "&Jak pou×Ývat nßpovýdu\tF1" , ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Informace o &Winefile..." , ID_ABOUT -/* POPUP "Info..." { - MENUITEM "Informace o &Wine..." , ID_ABOUT_WINE -// MENUITEM "&Licence..." ID_LICENSE -// MENUITEM "&BEZ Z?RUKY" ID_NO_WARRANTY - } */ - } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Spustit" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&P°Ýkaz:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Jako &Symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Pomoc" , 254, 158, 43, 47, 14 -} - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zvolte cÝl" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Cesta:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Prochßzet" , 254, 158, 43, 47, 14 -} - -STRINGTABLE -{ - IDS_FONT_SEL_DLG_NAME "AplikovßnÝ nastavenÝ pÝsma" - IDS_FONT_SEL_ERROR "Chyba p°i volbý novÚho pÝsma." -} - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Chyba" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Plocha" - IDS_SHELL "P°Ýkazov² °ßdek" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "ZatÝm neimplementovßno" - IDS_WINE "WINE" - IDS_WINE_FILE "Wine File" -} - -STRINGTABLE -{ - IDS_COL_NAME "JmÚno" - IDS_COL_SIZE "Velikost" - IDS_COL_CDATE "CDatum" - IDS_COL_ADATE "ADatum" - IDS_COL_MDATE "MDatum" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Links" - IDS_COL_ATTR "Atributy" - IDS_COL_SEC "ZabezpeÞenÝ" -} _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-14 19:45:27 UTC (rev 15287) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-14 19:58:30 UTC (rev 15288) @@ -150,7 +150,7 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=.\cz.rc +SOURCE=.\cs.rc # PROP Exclude_From_Build 1 # End Source File # Begin Source File @@ -198,6 +198,11 @@ # End Source File # Begin Source File +SOURCE=.\pl.rc +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\pt.rc # PROP Exclude_From_Build 1 # End Source File _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-05-14 19:45:27 UTC (rev 15287) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-05-14 19:58:30 UTC (rev 15288) @@ -28,7 +28,7 @@ /* include localised resources */ #include "en.rc" -#include "cz.rc" +#include "cs.rc" #include "de.rc" #include "es.rc" #include "fr.rc"

1 0

[gvg] 15287: Merge 14725:15285 from trunk
by gvg＠svn.reactos.com 14 May '05

14 May '05

Merge 14725:15285 from trunk Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c Modified: branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c Modified: branches/xen/reactos/boot/freeldr/freeldr/cmdline.c Modified: branches/xen/reactos/boot/freeldr/freeldr/custom.c Modified: branches/xen/reactos/boot/freeldr/freeldr/disk/disk.c Modified: branches/xen/reactos/boot/freeldr/freeldr/disk/partition.c Modified: branches/xen/reactos/boot/freeldr/freeldr/drivemap.c Modified: branches/xen/reactos/boot/freeldr/freeldr/freeldr.c Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/fat.h Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/fs.c Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/iso.c Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/iso.h Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/disk.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/fs.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/inifile.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/linux.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/miscboot.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/oslist.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/reactos.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/rtl.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/ui.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/version.h Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: branches/xen/reactos/boot/freeldr/freeldr/linuxboot.c Modified: branches/xen/reactos/boot/freeldr/freeldr/math/i386.h Modified: branches/xen/reactos/boot/freeldr/freeldr/math/powerpc.h Modified: branches/xen/reactos/boot/freeldr/freeldr/miscboot.c Modified: branches/xen/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: branches/xen/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/xen/reactos/boot/freeldr/freeldr/options.c Modified: branches/xen/reactos/boot/freeldr/freeldr/oslist.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: branches/xen/reactos/boot/freeldr/freeldr/rtl/memset.c Modified: branches/xen/reactos/boot/freeldr/freeldr/rtl/print.c Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/gui.c Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/tui.c Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/tui.h Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/ui.c Modified: branches/xen/reactos/boot/freeldr/freeldr/version.c Modified: branches/xen/reactos/boot/freeldr/freeldr/video/bank.c Modified: branches/xen/reactos/boot/freeldr/freeldr/video/fade.c Modified: branches/xen/reactos/boot/freeldr/freeldr/video/palette.c Modified: branches/xen/reactos/boot/freeldr/freeldr/video/pixel.c Modified: branches/xen/reactos/boot/freeldr/freeldr/video/video.c Property changes on: branches/xen/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: lastmerge - 14725 + 15285 _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-05-14 19:45:27 UTC (rev 15287) @@ -487,7 +487,6 @@ EXTERN(i386BootPartition) .long 0 -.bss mb_info: .fill MB_INFO_SIZE, 1, 0 _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -101,9 +101,9 @@ typedef struct _CM_PNP_BIOS_DEVICE_NODE { USHORT Size; - UCHAR Node; + CHAR Node; ULONG ProductId; - UCHAR DeviceType[3]; + CHAR DeviceType[3]; USHORT DeviceAttributes; } __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; @@ -197,44 +197,44 @@ WRITE_PORT_UCHAR((PUCHAR)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH & 0xff); /* LSB */ WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH >> 8); /* MSB */ - + /* Stage 1: Coarse calibration */ - + WaitFor8254Wraparound(); - + delay_count = 1; - + do { delay_count <<= 1; /* Next delay count to try */ WaitFor8254Wraparound(); - + __StallExecutionProcessor(delay_count); /* Do the delay */ - + CurCount = Read8254Timer(); } while (CurCount > LATCH / 2); - + delay_count >>= 1; /* Get bottom value for delay */ - + /* Stage 2: Fine calibration */ - + calib_bit = delay_count; /* Which bit are we going to test */ - + for(i=0;i<PRECISION;i++) { calib_bit >>= 1; /* Next bit to calibrate */ if(!calib_bit) break; /* If we have done all bits, stop */ - + delay_count |= calib_bit; /* Set the bit in delay_count */ - + WaitFor8254Wraparound(); - + __StallExecutionProcessor(delay_count); /* Do the delay */ - + CurCount = Read8254Timer(); if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ delay_count &= ~calib_bit; /* calibrated bit back off */ } - + /* We're finished: Do the finishing touches */ delay_count /= (MILLISEC / 2); /* Calculate delay_count for 1ms */ } @@ -258,7 +258,7 @@ Error = RegSetValue(ComponentKey, "Component Information", REG_BINARY, - (PUCHAR)&CompInfo, + (PCHAR)&CompInfo, sizeof(CM_COMPONENT_INFORMATION)); if (Error != ERROR_SUCCESS) { @@ -287,7 +287,7 @@ LONG Error; InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported(); - if (InstData == NULL || strncmp(InstData->Signature, "$PnP", 4)) + if (InstData == NULL || strncmp((CHAR*)InstData->Signature, "$PnP", 4)) { DbgPrint((DPRINT_HWDETECT, "PnP-BIOS not supported\n")); return; @@ -335,7 +335,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PUCHAR)"PNP BIOS", + "PNP BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -413,7 +413,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -495,7 +495,7 @@ Error = RegSetValue(DiskKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -516,7 +516,7 @@ ULONG i; ULONG Checksum; ULONG Signature; - char Identifier[20]; + CHAR Identifier[20]; LONG Error; /* Read the MBR */ @@ -568,7 +568,7 @@ Error = RegSetValue(DiskKey, "Identifier", REG_SZ, - (PUCHAR) Identifier, + Identifier, 20); if (Error != ERROR_SUCCESS) { @@ -673,7 +673,7 @@ Error = RegSetValue(SystemKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -829,7 +829,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -845,7 +845,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + (PCHAR)Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -939,7 +939,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1280,7 +1280,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -1294,7 +1294,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -1409,7 +1409,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1426,7 +1426,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1542,7 +1542,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1559,7 +1559,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1702,7 +1702,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)FullResourceDescriptor, + (PCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1718,7 +1718,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1804,7 +1804,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)FullResourceDescriptor, + (PCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1972,7 +1972,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) { @@ -2014,7 +2014,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -2029,7 +2029,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)"MICROSOFT PS2 MOUSE", + "MICROSOFT PS2 MOUSE", 20); if (Error != ERROR_SUCCESS) { @@ -2098,7 +2098,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -2146,7 +2146,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PUCHAR)"ISA", + "ISA", 4); if (Error != ERROR_SUCCESS) { @@ -2175,7 +2175,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -92,7 +92,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"ACPI BIOS", + "ACPI BIOS", 10); if (Error != ERROR_SUCCESS) { _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -95,7 +95,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"APM", + "APM", 4); if (Error != ERROR_SUCCESS) { _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -111,8 +111,8 @@ DetectCPU(FRLDRHKEY CpuKey, FRLDRHKEY FpuKey) { - char VendorIdentifier[13]; - char Identifier[64]; + CHAR VendorIdentifier[13]; + CHAR Identifier[64]; ULONG FeatureSet; FRLDRHKEY CpuInstKey; FRLDRHKEY FpuInstKey; @@ -195,7 +195,7 @@ Error = RegSetValue(CpuInstKey, "FeatureSet", REG_DWORD, - (PUCHAR)&FeatureSet, + (PCHAR)&FeatureSet, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -208,7 +208,7 @@ Error = RegSetValue(CpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -218,7 +218,7 @@ Error = RegSetValue(FpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -231,7 +231,7 @@ Error = RegSetValue(CpuInstKey, "VendorIdentifier", REG_SZ, - (PUCHAR)VendorIdentifier, + VendorIdentifier, strlen(VendorIdentifier) + 1); if (Error != ERROR_SUCCESS) { @@ -250,7 +250,7 @@ Error = RegSetValue(CpuInstKey, "~MHz", REG_DWORD, - (PUCHAR)&CpuSpeed, + (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -339,7 +339,7 @@ Error = RegSetValue(CpuInstKey, "FeatureSet", REG_DWORD, - (PUCHAR)&FeatureSet, + (PCHAR)&FeatureSet, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -352,7 +352,7 @@ Error = RegSetValue(CpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -362,7 +362,7 @@ Error = RegSetValue(FpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -375,7 +375,7 @@ Error = RegSetValue(CpuInstKey, "VendorIdentifier", REG_SZ, - (PUCHAR)VendorIdentifier, + VendorIdentifier, strlen(VendorIdentifier) + 1); if (Error != ERROR_SUCCESS) { @@ -394,7 +394,7 @@ Error = RegSetValue(CpuInstKey, "~MHz", REG_DWORD, - (PUCHAR)&CpuSpeed, + (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -464,7 +464,7 @@ if (ConfigTable->Signature != MP_CT_SIGNATURE) return NULL; - DbgPrint((DPRINT_HWDETECT, + DbgPrint((DPRINT_HWDETECT, "MP Configuration Table at: %x\n", (ULONG)ConfigTable)); @@ -538,7 +538,7 @@ CpuEntry = (PMP_PROCESSOR_ENTRY)Ptr; DbgPrint((DPRINT_HWDETECT, "Processor Entry\n")); - DbgPrint((DPRINT_HWDETECT, + DbgPrint((DPRINT_HWDETECT, "APIC Id %u APIC Version %u Flags %x Signature %x Feature %x\n", CpuEntry->LocalApicId, CpuEntry->LocalApicVersion, _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -178,7 +178,7 @@ Error = RegSetValue(TableKey, "Identifier", REG_SZ, - (PUCHAR)"PCI Real-mode IRQ Routing Table", + "PCI Real-mode IRQ Routing Table", 32); if (Error != ERROR_SUCCESS) { @@ -216,7 +216,7 @@ Error = RegSetValue(TableKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -272,7 +272,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"PCI BIOS", + "PCI BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -301,7 +301,7 @@ Error = RegSetValue(BiosKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -168,7 +168,7 @@ return TRUE; } -BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) { PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR VolumeType; _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -47,12 +47,12 @@ // interrupt from the AT real-time clock chip which is available on INT 70; // because newer BIOSes may have much more precise timers available, it is // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) + // the precise behavior of the BIOS is known (or found through testing) while (msec) { msec_this = msec; - + if (msec_this > 4000) { msec_this = 4000; _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -88,7 +88,7 @@ // A search must then be made to find them, FFFFh will also terminate this // second list. In some cases, only a "stub" VBE may be present, supporting // only AX=4F00h; this case may be assumed if the list of supported video modes -// is empty (consisting of a single word of FFFFh) +// is empty (consisting of a single word of FFFFh) VOID BiosSetVideoFont8x16(VOID) { _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -136,7 +136,7 @@ * CH = feature connector bits * CL = switch settings * AH destroyed (at least by Tseng ET4000 BIOS v8.00n) - * + * * Installation check;EGA */ Regs.b.ah = 0x12; @@ -161,7 +161,7 @@ * This function is commonly used to check for the presence of a VGA. * * Installation check;VGA - * + * * Values for display combination code: * 00h no display * 01h monochrome adapter w/ monochrome display @@ -309,15 +309,15 @@ * CL = bottom scan line containing cursor (bits 0-4) * Return: * Nothing - * + * * Specify the starting and ending scan lines to be occupied * by the hardware cursor in text modes. * * AMI 386 BIOS and AST Premier 386 BIOS will lock up the * system if AL is not equal to the current video mode. - * + * * Bitfields for cursor start and options: - * + * * Bit(s) Description * 7 should be zero * 6,5 cursor blink @@ -460,7 +460,7 @@ * * Note: While VBE 1.1 and higher will zero out all unused bytes * of the buffer, v1.0 did not, so applications that want to be - * backward compatible should clear the buffer before calling + * backward compatible should clear the buffer before calling */ Regs.w.ax = 0x4F01; Regs.w.cx = Mode; @@ -563,7 +563,7 @@ * 121h 1600x1200x32K * 122h 1600x1200x64K * 81FFh special full-memory access mode - * + * * Notes: The special mode 81FFh preserves the contents of the video memory and gives * access to all of the memory; VESA recommends that the special mode be a packed-pixel * mode. For VBE 2.0+, it is required that the VBE implement the mode, but not place it _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -58,8 +58,8 @@ PUCHAR Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; insb\n\t" - : "=D" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; insb\n\t" + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -71,7 +71,7 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; insw" - : "=D" (Buffer), "=c" (Count) + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -83,17 +83,17 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; insl" - : "=D" (Buffer), "=c" (Count) + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } #undef READ_PORT_UCHAR -UCHAR +UCHAR STDCALL READ_PORT_UCHAR (PUCHAR Port) { UCHAR Value; - + __asm__("inb %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -107,7 +107,7 @@ READ_PORT_USHORT (USHORT* Port) { USHORT Value; - + __asm__("inw %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -121,7 +121,7 @@ READ_PORT_ULONG (ULONG* Port) { ULONG Value; - + __asm__("inl %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -130,14 +130,14 @@ } #undef WRITE_PORT_BUFFER_UCHAR -VOID +VOID STDCALL WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; outsb" - : "=S" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; outsb" + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -149,7 +149,7 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; outsw" - : "=S" (Buffer), "=c" (Count) + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -160,8 +160,8 @@ ULONG* Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; outsl" - : "=S" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; outsl" + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -172,7 +172,7 @@ UCHAR Value) { __asm__("outb %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; @@ -185,7 +185,7 @@ USHORT Value) { __asm__("outw %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; @@ -198,7 +198,7 @@ ULONG Value) { __asm__("outl %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -149,7 +149,7 @@ #define IDEWriteDMAStatus(Address, Data) \ (WRITE_PORT_UCHAR((PUCHAR)((Address) + 2), (Data))) #define IDEWritePRDTable(Address, Data) \ - (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data))) + (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data))) /* * Data block read and write commands _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -31,11 +31,11 @@ BOOLEAN AcpiPresent = FALSE; char BootPath[0x100]; -void le_swap( const void *start_addr_v, - const void *end_addr_v, +void le_swap( const void *start_addr_v, + const void *end_addr_v, const void *target_addr_v ) { - long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), - *end_addr = (long *)ROUND_UP((long)end_addr_v,8), + long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), + *end_addr = (long *)ROUND_UP((long)end_addr_v,8), *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8); long tmp; while( start_addr <= end_addr ) { @@ -107,7 +107,7 @@ void PpcPutChar( int ch ) { char buf[3]; - if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } + if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } buf[2] = 0; ofw_print_string( buf ); @@ -167,12 +167,12 @@ return FALSE; } -VOID PpcVideoSetPaletteColor( UCHAR Color, +VOID PpcVideoSetPaletteColor( UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue ) { printf( "SetPaletteColor(%x,%x,%x,%x)\n", Color, Red, Green, Blue ); } -VOID PpcVideoGetPaletteColor( UCHAR Color, +VOID PpcVideoGetPaletteColor( UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue ) { printf( "GetPaletteColor(%x)\n", Color); } @@ -198,7 +198,7 @@ BiosMemoryMap[0].BaseAddress = 0; BiosMemoryMap[0].Length = 32 * 1024 * 1024; /* Assume 32 meg for now */ - printf( "Returning memory map (%dk total)\n", + printf( "Returning memory map (%dk total)\n", (int)BiosMemoryMap[0].Length / 1024 ); return 1; @@ -226,7 +226,7 @@ return 0; } -VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, +VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second ) { printf("RTCGeturrentDateTime\n"); } @@ -256,7 +256,7 @@ MachVtbl.VideoSetTextCursorPosition = PpcVideoSetTextCursorPosition; MachVtbl.VideoHideShowTextCursor = PpcVideoHideShowTextCursor; MachVtbl.VideoPutChar = PpcVideoPutChar; - MachVtbl.VideoCopyOffScreenBufferToVRAM = + MachVtbl.VideoCopyOffScreenBufferToVRAM = PpcVideoCopyOffScreenBufferToVRAM; MachVtbl.VideoIsPaletteFixed = PpcVideoIsPaletteFixed; MachVtbl.VideoSetPaletteColor = PpcVideoSetPaletteColor; @@ -276,13 +276,13 @@ MachVtbl.HwDetect = PpcHwDetect; printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); - BootMain("freeldr-ppc"); + BootMain("freeldr-ppc"); } void MachInit(char *CmdLine) { int len; printf( "Determining boot device:\n" ); - len = ofw_getprop(chosen_package, "bootpath", + len = ofw_getprop(chosen_package, "bootpath", BootPath, sizeof(BootPath)); printf( "Got %d bytes of path\n", len ); BootPath[len] = 0; _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c --- branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -39,12 +39,12 @@ VOID RunLoader(VOID) { - UCHAR SettingName[80]; - UCHAR SettingValue[80]; + CHAR SettingName[80]; + CHAR SettingValue[80]; ULONG SectionId; ULONG OperatingSystemCount; - PUCHAR *OperatingSystemSectionNames; - PUCHAR *OperatingSystemDisplayNames; + PCHAR *OperatingSystemSectionNames; + PCHAR *OperatingSystemDisplayNames; ULONG DefaultOperatingSystem; LONG TimeOut; ULONG SelectedOperatingSystem; @@ -166,10 +166,10 @@ return; } -ULONG GetDefaultOperatingSystem(PUCHAR OperatingSystemList[], ULONG OperatingSystemCount) +ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount) { - UCHAR DefaultOSText[80]; - char* DefaultOSName; + CHAR DefaultOSText[80]; + PCHAR DefaultOSName; ULONG SectionId; ULONG DefaultOS = 0; ULONG Idx; @@ -205,7 +205,7 @@ LONG GetTimeOut(VOID) { - UCHAR TimeOutText[20]; + CHAR TimeOutText[20]; LONG TimeOut; ULONG SectionId; _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c --- branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -89,7 +89,7 @@ CacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock); } } - + return NULL; } _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/cmdline.c --- branches/xen/reactos/boot/freeldr/freeldr/cmdline.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/cmdline.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <freeldr.h> +#include <freeldr.h> #include <cmdline.h> #include <rtl.h> _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/custom.c --- branches/xen/reactos/boot/freeldr/freeldr/custom.c 2005-05-14 19:16:44 UTC (rev 15286) +++ branches/xen/reactos/boot/freeldr/freeldr/custom.c 2005-05-14 19:45:27 UTC (rev 15287) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <rtl.h> #include <ui.h> @@ -32,20 +32,20 @@ #include <machine.h> -UCHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; -UCHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; -UCHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; -UCHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; -UCHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; -UCHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; -UCHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -UCHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; +CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; +CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; +CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; +CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; +CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; +CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; +CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; -UCHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; +CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; VOID OptionMenuCustomBoot(VOID) { - PUCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -77,8 +77,8 @@ VOID OptionMenuCustomBootDisk(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; @@ -119,9 +119,9 @@ VOID OptionMenuCustomBootPartition(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; @@ -174,10 +174,10 @@ VOID OptionMenuCustomBootBootSectorFile(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; - UCHAR BootSectorFileString[200]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR BootSectorFileString[200]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; [truncated at 1000 lines; 4009 more skipped]

1 0

[mf] 15286: add polish resource file
by mf＠svn.reactos.com 14 May '05

14 May '05

add polish resource file Added: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Added: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-14 19:16:24 UTC (rev 15285) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-14 19:16:44 UTC (rev 15286) @@ -0,0 +1,186 @@ +/* + * WineFile + * Polish Language Support + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * Copyright 2004 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Plik" { + MENUITEM "&Otw¾rz\tEnter" , ID_ACTIVATE + MENUITEM "&Przenie£...\tF7" , ID_FILE_MOVE + MENUITEM "&Kopiuj...\tF8" , 107 + MENUITEM "W s&chowku...\tF9" , 118 + MENUITEM "&Usu±\tDel" , 108 + MENUITEM "&Zmie± nazwÛ..." , 109 + MENUITEM "Ustawie&nia...\tAlt+Enter" , ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Kompresja..." , 119 + MENUITEM "&Dekompresja..." , 120 + MENUITEM SEPARATOR + MENUITEM "&Uruchom..." , ID_EXECUTE + MENUITEM "&Drukuj..." , 102 + MENUITEM "Skojarz..." , 103 + MENUITEM SEPARATOR + MENUITEM "U&tw¾rz folder..." , 111 + MENUITEM "&Szukaj..." , 104 + MENUITEM "&Zaznacz pliki..." , 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "&Wyj£cie\tAlt+X" , ID_FILE_EXIT +#else + MENUITEM "&Wyj£cie", ID_FILE_EXIT +#endif + } + + POPUP "&Dysk" { + MENUITEM "&Kopiuj dusk..." , 201 + MENUITEM "&Etykieta dysku..." , 202 + MENUITEM SEPARATOR + MENUITEM "&Formatuj dysk..." , ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Stw¾rz dysk systemowy...", -1 /*@@ */ +#endif + MENUITEM SEPARATOR + MENUITEM "&Pod??cz Dysk Sieciowy" , ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Od??cz Dysk Sieciowy" , ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "UdostÛpnij jako..." , 254 + MENUITEM "&Nie udostÛpniaj..." , 255 + MENUITEM SEPARATOR + MENUITEM "Wyb¾r &dysku..." , 251 + } + + POPUP "&Katalogi" { + MENUITEM "&NastÛpny poziom\t+" , 301 + MENUITEM "&Rozwi± drzewo\t*" , 302 + MENUITEM "Rozwi± &wszystko\tStrg+*" , 303 + MENUITEM "&Zwi± drzewo\t-" , 304 + MENUITEM SEPARATOR + MENUITEM "Zaznacz &podkatalogi" , 505 + } + + POPUP "&Widok" { + MENUITEM "&Drzewo i katalogi" , 413 + MENUITEM "D&rzewo" , 411 + MENUITEM "&Katalogi" , 412 + MENUITEM SEPARATOR + MENUITEM "&Po??cz" , 414 + MENUITEM SEPARATOR + MENUITEM "&Nazwa" , ID_VIEW_NAME + MENUITEM "&Wszystkie atrybuty pliku" , ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "Wybrane &atrybuty pliku..." , ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "P&osortuj alfabetycznie" , 404 + MENUITEM "Posortuj po &typie" , 405 + MENUITEM "Rozmie£µ &po wielko£ci" , 406 + MENUITEM "&Sortuj po dacie" , 407 + MENUITEM SEPARATOR + MENUITEM "Sortuj po &..." , 409 + } + + POPUP "&Opcje" { + MENUITEM "&Potwierdzenie..." , -1 + MENUITEM "&Czcionka..." , ID_SELECT_FONT + MENUITEM "&Ustawienia paska narzÛdzi..." , -1 + MENUITEM SEPARATOR + MENUITEM "Pasek &narzÛdzi" , ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Pasek &dysk¾w" , ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Pasek &statusu" , ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Pe?ny &ekran\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Zminimalizuj przy starcie" , -1 + MENUITEM "Z&apisz ustawienia przed zako±czeniem" , 511 + } + + + POPUP "&Bezpiecze±stwo" { + MENUITEM "&DostÛp..." , 605 + MENUITEM "&Logowanie..." , 606 + MENUITEM "&W?a£ciciel..." , 607 + } + + POPUP "&Okno" { + MENUITEM "&Nowe okno" , ID_WINDOW_NEW + MENUITEM "&Kaskaduj?co\tCtrl+F5" , ID_WINDOW_CASCADE + MENUITEM "&Tytu? pionowo" , ID_WINDOW_TILE_HORZ + MENUITEM "Tytu? &poziomo\tCtrl+F4" , ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Rozmie£µ automatycznie" , ID_WINDOW_AUTOSORT +#endif + MENUITEM "Rozmie£µ &symbole" , ID_WINDOW_ARRANGE + MENUITEM "&Od£wierz\tF5" , ID_REFRESH + } + + POPUP "&?" { + MENUITEM "&Tematu pomocy\tF1" , ID_HELP + MENUITEM "&Szukaj..." , ID_HELP + MENUITEM "&U?ywanie pomocy" , ID_HELP_USING + MENUITEM SEPARATOR + POPUP "O programie..." { + MENUITEM "&Wine..." , ID_ABOUT_WINE +/* + * MENUITEM "&Licencja..." ID_LICENSE + * MENUITEM "&NO WARRANTY" ID_NO_WARRANTY + */ + } + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Uruchom" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Polecenie:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Jako &symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Anuluj" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Pomoc" , 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wyb¾r celu" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&îcie?ka:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Anuluj" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Przegl?daj" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Wprowadzanie ustawie± czcionki" + IDS_FONT_SEL_ERROR "B??d przy wybieraniu czcionki" +} _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-05-14 19:16:24 UTC (rev 15285) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-05-14 19:16:44 UTC (rev 15286) @@ -35,6 +35,7 @@ #include "hu.rc" #include "it.rc" #include "nl.rc" +#include "pl.rc" #include "pt.rc" #include "ru.rc" #include "si.rc"

1 0

[mf] 15285: fix Wine version of sort order switching
by mf＠svn.reactos.com 14 May '05

14 May '05

fix Wine version of sort order switching Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-14 19:09:02 UTC (rev 15284) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-14 19:16:24 UTC (rev 15285) @@ -1323,6 +1323,9 @@ static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, SORT_ORDER sortOrder, HWND hwnd) { const static TCHAR sBackslash[] = {'\\', '\0'}; +#if !defined(_NO_EXTENSIONS) && defined(__WINE__) + const static TCHAR sSlash[] = {'/', '\0'}; +#endif #ifdef _SHELL_FOLDERS if (pidl) @@ -1370,10 +1373,6 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) { -#if !defined(_NO_EXTENSIONS) && defined(__WINE__) - const static TCHAR sSlash[] = {'/', '\0'}; -#endif - TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; TCHAR b1[BUFFER_LEN];

1 0

[gvg] 15284: Implement WH_MOUSE_LL hook
by gvg＠svn.reactos.com 14 May '05

14 May '05

Implement WH_MOUSE_LL hook Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-05-14 18:57:07 UTC (rev 15283) +++ trunk/reactos/lib/user32/windows/hook.c 2005-05-14 19:09:02 UTC (rev 15284) @@ -281,7 +281,8 @@ PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra; WPARAM wParam; LPARAM lParam; - KBDLLHOOKSTRUCT *KeyboardLlData; + PKBDLLHOOKSTRUCT KeyboardLlData; + PMSLLHOOKSTRUCT MouseLlData; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -355,9 +356,13 @@ } break; case WH_KEYBOARD_LL: - KeyboardLlData = (KBDLLHOOKSTRUCT *)((PCHAR) Common + Common->lParam); + KeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) KeyboardLlData); break; + case WH_MOUSE_LL: + MouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) MouseLlData); + break; default: return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2005-05-14 18:57:07 UTC (rev 15283) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2005-05-14 19:09:02 UTC (rev 15284) @@ -296,6 +296,9 @@ case WH_KEYBOARD_LL: ArgumentLength += sizeof(KBDLLHOOKSTRUCT); break; + case WH_MOUSE_LL: + ArgumentLength += sizeof(MSLLHOOKSTRUCT); + break; default: DPRINT1("Trying to call unsupported window hook %d\n", HookId); return 0; @@ -350,6 +353,10 @@ RtlCopyMemory(Extra, (PVOID) lParam, sizeof(KBDLLHOOKSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; + case WH_MOUSE_LL: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSLLHOOKSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; } ResultPointer = &Result; _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-05-14 18:57:07 UTC (rev 15283) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-05-14 19:09:02 UTC (rev 15284) @@ -266,7 +266,7 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ Status = MsqSendMessage(Hook->Thread->Tcb.Win32Thread->MessageQueue, (HWND) Code, HookId, - wParam, lParam, /*500*/0, TRUE, TRUE, &uResult); + wParam, lParam, 5000, TRUE, TRUE, &uResult); return NT_SUCCESS(Status) ? uResult : 0; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-05-14 18:57:07 UTC (rev 15283) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-05-14 19:09:02 UTC (rev 15284) @@ -515,6 +515,7 @@ { PUSER_MESSAGE UserMsg; MSG Msg; + BOOL ProcessMessage; ASSERT(SystemMessageQueueHead < SYSTEM_MESSAGE_QUEUE_SIZE); Msg = SystemMessageQueue[SystemMessageQueueHead]; @@ -522,12 +523,48 @@ (SystemMessageQueueHead + 1) % SYSTEM_MESSAGE_QUEUE_SIZE; SystemMessageQueueCount--; IntUnLockSystemMessageQueue(OldIrql); - UserMsg = ExAllocateFromPagedLookasideList(&MessageLookasideList); - /* What to do if out of memory? For now we just panic a bit in debug */ - ASSERT(UserMsg); - UserMsg->FreeLParam = FALSE; - UserMsg->Msg = Msg; - InsertTailList(&HardwareMessageQueueHead, &UserMsg->ListEntry); + if (WM_MOUSEFIRST <= Msg.message && Msg.message <= WM_MOUSELAST) + { + MSLLHOOKSTRUCT MouseHookData; + + MouseHookData.pt.x = GET_X_LPARAM(Msg.lParam); + MouseHookData.pt.y = GET_Y_LPARAM(Msg.lParam); + switch(Msg.message) + { + case WM_MOUSEWHEEL: + MouseHookData.mouseData = MAKELONG(0, GET_WHEEL_DELTA_WPARAM(Msg.wParam)); + break; + case WM_XBUTTONDOWN: + case WM_XBUTTONUP: + case WM_XBUTTONDBLCLK: + case WM_NCXBUTTONDOWN: + case WM_NCXBUTTONUP: + case WM_NCXBUTTONDBLCLK: + MouseHookData.mouseData = MAKELONG(0, HIWORD(Msg.wParam)); + break; + default: + MouseHookData.mouseData = 0; + break; + } + MouseHookData.flags = 0; + MouseHookData.time = Msg.time; + MouseHookData.dwExtraInfo = 0; + ProcessMessage = (0 == HOOK_CallHooks(WH_MOUSE_LL, HC_ACTION, + Msg.message, (LPARAM) &MouseHookData)); + } + else + { + ProcessMessage = TRUE; + } + if (ProcessMessage) + { + UserMsg = ExAllocateFromPagedLookasideList(&MessageLookasideList); + /* What to do if out of memory? For now we just panic a bit in debug */ + ASSERT(UserMsg); + UserMsg->FreeLParam = FALSE; + UserMsg->Msg = Msg; + InsertTailList(&HardwareMessageQueueHead, &UserMsg->ListEntry); + } IntLockSystemMessageQueue(OldIrql); } /* _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-05-14 18:57:07 UTC (rev 15283) +++ trunk/reactos/subsys/win32k/w32k.h 2005-05-14 19:09:02 UTC (rev 15284) @@ -27,6 +27,7 @@ #include <math.h> #include <float.h> #include <windows.h> +#include <windowsx.h> #include <rosrtl/string.h> #include <user32/callback.h> _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-05-14 18:57:07 UTC (rev 15283) +++ trunk/reactos/w32api/include/winuser.h 2005-05-14 19:09:02 UTC (rev 15284) @@ -2151,6 +2151,7 @@ #define LLKHF_INJECTED 0x00000010 #define LLKHF_ALTDOWN 0x00000020 #define LLKHF_UP 0x00000080 +#define LLMHF_INJECTED 0x00000001 #if (WINVER >= 0x0500) #define FLASHW_STOP 0 #define FLASHW_CAPTION 1 @@ -3065,6 +3066,14 @@ DWORD time; DWORD dwExtraInfo; } KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT; +typedef struct tagMSLLHOOKSTRUCT +{ + POINT pt; + DWORD mouseData; + DWORD flags; + DWORD time; + ULONG_PTR dwExtraInfo; +} MSLLHOOKSTRUCT, *LPMSLLHOOKSTRUCT, *PMSLLHOOKSTRUCT; #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) typedef struct { UINT cbSize;

1 0

[mf] 15283: implement switching of file sort order
by mf＠svn.reactos.com 14 May '05

14 May '05

implement switching of file sort order Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cz.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -93,10 +93,10 @@ MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Vissa detaljer..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Sortera efter namn", 404 - MENUITEM "Sortera efter t&yp", 405 - MENUITEM "Sortera efter st&orlek", 406 - MENUITEM "Sortera efter &datum", 407 + MENUITEM "&Sortera efter namn", ID_VIEW_SORT_NAME + MENUITEM "Sortera efter t&yp", ID_VIEW_SORT_TYPE + MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE + MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Sortera efter &...", 409 } _____ Modified: trunk/reactos/subsys/system/winefile/cz.rc --- trunk/reactos/subsys/system/winefile/cz.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/cz.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -92,10 +92,10 @@ MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "?ß&steÞnÚ detaily..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&T°Ýdit podle jmÚna" , 404 - MENUITEM "T°Ýdit &podle typu" , 405 - MENUITEM "T°Ýdit podle &velikosti" , 406 - MENUITEM "T°Ýdit podle &data" , 407 + MENUITEM "&T°Ýdit podle jmÚna" , ID_VIEW_SORT_NAME + MENUITEM "T°Ýdit &podle typu" , ID_VIEW_SORT_TYPE + MENUITEM "T°Ýdit podle &velikosti" , ID_VIEW_SORT_SIZE + MENUITEM "T°Ýdit podle &data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "T°Ýdit podle &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -91,10 +91,10 @@ MENUITEM "A&lle Dateiangaben" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Bestimmte Dateiangaben..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Nach N&ame" , 404 - MENUITEM "Nach T&yp" , 405 - MENUITEM "Nach &Gr÷?e" , 406 - MENUITEM "Nach &Datum" , 407 + MENUITEM "Nach N&ame" , ID_VIEW_SORT_NAME + MENUITEM "Nach T&yp" , ID_VIEW_SORT_TYPE + MENUITEM "Nach &Gr÷?e" , ID_VIEW_SORT_SIZE + MENUITEM "Nach &Datum" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Angaben ausw&õhlen..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -94,12 +94,12 @@ MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Partial Details..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Sort by Name" , 404 - MENUITEM "Sort &by Type" , 405 - MENUITEM "Sort by Si&ze" , 406 - MENUITEM "Sort by &Date" , 407 + MENUITEM "&Sort by Name" , ID_VIEW_SORT_NAME + MENUITEM "Sort &by Type" , ID_VIEW_SORT_TYPE + MENUITEM "Sort by Si&ze" , ID_VIEW_SORT_SIZE + MENUITEM "Sort by &Date" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Sort by &..." , 409 + MENUITEM "Filter by &..." , 409 } POPUP "&Options" { _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -90,10 +90,10 @@ MENUITEM "T&odos los detalles" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "Detalles &parciales..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Ordenar por &nombre" , 404 - MENUITEM "Ordenar por &tipo" , 405 - MENUITEM "Ordenar por t&ama±o" , 406 - MENUITEM "Ordenar por &fecha" , 407 + MENUITEM "Ordenar por &nombre" , ID_VIEW_SORT_NAME + MENUITEM "Ordenar por &tipo" , ID_VIEW_SORT_TYPE + MENUITEM "Ordenar por t&ama±o" , ID_VIEW_SORT_SIZE + MENUITEM "Ordenar por &fecha" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Ordenar por &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -93,10 +93,10 @@ MENUITEM "Tous &les DÚtails" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&DÚtails..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Trier par N&om" , 404 - MENUITEM "Trier par &Type" , 405 - MENUITEM "Trier par Ta&ille" , 406 - MENUITEM "Trier par Dat&e" , 407 + MENUITEM "Trier par N&om" , ID_VIEW_SORT_NAME + MENUITEM "Trier par &Type" , ID_VIEW_SORT_TYPE + MENUITEM "Trier par Ta&ille" , ID_VIEW_SORT_SIZE + MENUITEM "Trier par Dat&e" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Trier par &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -93,10 +93,10 @@ MENUITEM "&Minden rÚszlet" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Egyedi..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&RendezÚs nÚv szerint" , 404 - MENUITEM "RendezÚs k&iterjesztÚs szerint" , 405 - MENUITEM "RendezÚs &mÚret szerint" , 406 - MENUITEM "RendezÚs &dßtum szerint" , 407 + MENUITEM "&RendezÚs nÚv szerint" , ID_VIEW_SORT_NAME + MENUITEM "RendezÚs k&iterjesztÚs szerint" , ID_VIEW_SORT_TYPE + MENUITEM "RendezÚs &mÚret szerint" , ID_VIEW_SORT_SIZE + MENUITEM "RendezÚs &dßtum szerint" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Egyedi rendezÚs &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -93,10 +93,10 @@ MENUITEM "&Mostra tutti i dettagli sui file" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Mostra dettagli parziali..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Ordina per Nome" , 404 - MENUITEM "&Ordina per Tipo" , 405 - MENUITEM "&Ordina per Dimensione" , 406 - MENUITEM "&Ordina per Data" , 407 + MENUITEM "&Ordina per Nome" , ID_VIEW_SORT_NAME + MENUITEM "&Ordina per Tipo" , ID_VIEW_SORT_TYPE + MENUITEM "&Ordina per Dimensione" , ID_VIEW_SORT_SIZE + MENUITEM "&Ordina per Data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Ordina per &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -89,10 +89,10 @@ MENUITEM "&Alle details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Gedeeltelijke details..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Sorteer op &naam" , 404 - MENUITEM "Sorteer op &type" , 405 - MENUITEM "Sorteer op &grootte" , 406 - MENUITEM "Sorteer op &datum" , 407 + MENUITEM "Sorteer op &naam" , ID_VIEW_SORT_NAME + MENUITEM "Sorteer op &type" , ID_VIEW_SORT_TYPE + MENUITEM "Sorteer op &grootte" , ID_VIEW_SORT_SIZE + MENUITEM "Sorteer op &datum" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Sorteer op &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -92,10 +92,10 @@ MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "D&etalhes parciais..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Classificar por nome" , 404 - MENUITEM "C&lassificar por tipo" , 405 - MENUITEM "Cl&assificar por tamanho" , 406 - MENUITEM "Cla&ssificar por &data" , 407 + MENUITEM "&Classificar por nome" , ID_VIEW_SORT_NAME + MENUITEM "C&lassificar por tipo" , ID_VIEW_SORT_TYPE + MENUITEM "Cl&assificar por tamanho" , ID_VIEW_SORT_SIZE + MENUITEM "Cla&ssificar por &data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Classificar &por..." , 409 } @@ -220,10 +220,10 @@ MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "D&etalhes parciais..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Classificar por nome" , 404 - MENUITEM "C&lassificar por tipo" , 405 - MENUITEM "Cl&assificar por tamanho" , 406 - MENUITEM "Cla&ssificar por &data" , 407 + MENUITEM "&Classificar por nome" , ID_VIEW_SORT_NAME + MENUITEM "C&lassificar por tipo" , ID_VIEW_SORT_TYPE + MENUITEM "Cl&assificar por tamanho" , ID_VIEW_SORT_SIZE + MENUITEM "Cla&ssificar por &data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Classificar &por..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-14 18:57:07 UTC (rev 15283) @@ -49,6 +49,10 @@ #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 +#define ID_VIEW_SORT_NAME 404 +#define ID_VIEW_SORT_TYPE 405 +#define ID_VIEW_SORT_SIZE 406 +#define ID_VIEW_SORT_DATE 407 #define ID_SELECT_FONT 510 #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -89,10 +89,10 @@ MENUITEM "?&±Õ ´¯õ¯ßÝ¯±?Þ ¯ ¶ÓÚÙÕ" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&?¹ß¯¯¸Ý¯ ¯ ¶ÓÚÙÕ..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Ð¯?Þ¯ÔÓ?³ ´¯ ÞýÕÝÞ" , 404 - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &?Þ´¾" , 405 - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &ÓþýÕ¾" , 406 - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ õ&Ó?Õ" , 407 + MENUITEM "&Ð¯?Þ¯ÔÓ?³ ´¯ ÞýÕÝÞ" , ID_VIEW_SORT_NAME + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &?Þ´¾" , ID_VIEW_SORT_TYPE + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &ÓþýÕ¾" , ID_VIEW_SORT_SIZE + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ õ&Ó?Õ" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &..." , 409 } _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -90,12 +90,12 @@ MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Partial Details..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "&Sort by Name" , 404 - MENUITEM "Sort &by Type" , 405 - MENUITEM "Sort by Si&ze" , 406 - MENUITEM "Sort by &Date" , 407 + MENUITEM "&Sort by Name" , ID_VIEW_SORT_NAME + MENUITEM "Sort &by Type" , ID_VIEW_SORT_TYPE + MENUITEM "Sort by Si&ze" , ID_VIEW_SORT_SIZE + MENUITEM "Sort by &Date" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Sort by &..." , 409 + MENUITEM "Filter by &..." , 409 } POPUP "&Options" { _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-14 18:57:07 UTC (rev 15283) @@ -200,7 +200,8 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND hwnd); -static void set_curdir(ChildWnd* child, Entry* entry, HWND hwnd); +static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd); +static void refresh_child(ChildWnd* child); static void get_path(Entry* dir, PTSTR path); LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); @@ -1319,10 +1320,57 @@ } -static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) +static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, SORT_ORDER sortOrder, HWND hwnd) { const static TCHAR sBackslash[] = {'\\', '\0'}; + +#ifdef _SHELL_FOLDERS + if (pidl) + { + /* read shell namespace tree */ + root->drive_type = DRIVE_UNKNOWN; + drv[0] = '\\'; + drv[1] = '\0'; + load_string(root->volname, IDS_DESKTOP); + root->fs_flags = 0; + load_string(root->fs, IDS_SHELL); + + return read_tree_shell(root, pidl, sortOrder, hwnd); + } + else +#endif #if !defined(_NO_EXTENSIONS) && defined(__WINE__) + if (*path == '/') + { + /* read unix file system tree */ + root->drive_type = GetDriveType(path); + + lstrcat(drv, sSlash); + load_string(root->volname, IDS_ROOT_FS); + root->fs_flags = 0; + load_string(root->fs, IDS_UNIXFS); + + lstrcpy(root->path, sSlash); + + return read_tree_unix(root, path, sortOrder, hwnd); + } +#endif + + /* read WIN32 file system tree */ + root->drive_type = GetDriveType(path); + + lstrcat(drv, sBackslash); + GetVolumeInformation(drv, root->volname, _MAX_FNAME, 0, 0, &root->fs_flags, root->fs, _MAX_DIR); + + lstrcpy(root->path, drv); + + return read_tree_win(root, path, sortOrder, hwnd); +} + + +static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) +{ +#if !defined(_NO_EXTENSIONS) && defined(__WINE__) const static TCHAR sSlash[] = {'/', '\0'}; #endif @@ -1367,45 +1415,8 @@ root->entry.level = 0; -#ifdef _SHELL_FOLDERS - if (pidl) - { - root->drive_type = DRIVE_UNKNOWN; - drv[0] = '\\'; - drv[1] = '\0'; - load_string(root->volname, IDS_DESKTOP); - root->fs_flags = 0; - load_string(root->fs, IDS_SHELL); + entry = read_tree(root, path, pidl, drv, child->sortOrder, hwnd); - entry = read_tree_shell(root, pidl, child->sortOrder, hwnd); - } - else -#endif -#if !defined(_NO_EXTENSIONS) && defined(__WINE__) - if (*path == '/') - { - root->drive_type = GetDriveType(path); - - lstrcat(drv, sSlash); - load_string(root->volname, IDS_ROOT_FS); - root->fs_flags = 0; - load_string(root->fs, IDS_UNIXFS); - - lstrcpy(root->path, sSlash); - entry = read_tree_unix(root, path, child->sortOrder, hwnd); - } - else -#endif - { - root->drive_type = GetDriveType(path); - - lstrcat(drv, sBackslash); - GetVolumeInformation(drv, root->volname, _MAX_FNAME, 0, 0, &root->fs_flags, root->fs, _MAX_DIR); - - lstrcpy(root->path, drv); - entry = read_tree_win(root, path, child->sortOrder, hwnd); - } - #ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) load_string(root->entry.data.cFileName, IDS_DESKTOP); @@ -1418,7 +1429,7 @@ child->left.root = &root->entry; child->right.root = NULL; - set_curdir(child, entry, hwnd); + set_curdir(child, entry, 0, hwnd); return child; } @@ -1610,7 +1621,8 @@ ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - idx = ListBox_FindItemData(child->left.hwnd, ListBox_GetCurSel(child->left.hwnd), child->left.cur); + + idx = ListBox_FindItemData(child->left.hwnd, 0, child->left.cur); ListBox_SetCurSel(child->left.hwnd, idx); return child->hwnd; @@ -1873,6 +1885,13 @@ PostQuitMessage(0); break; + case WM_INITMENUPOPUP: { + HWND hwndClient = (HWND) SendMessage(Globals.hmdiclient, WM_MDIGETACTIVE, 0, 0); + + if (!SendMessage(hwndClient, WM_INITMENUPOPUP, wparam, lparam)) + return 0; + break;} + case WM_COMMAND: { UINT cmd = LOWORD(wparam); HWND hwndClient = (HWND) SendMessage(Globals.hmdiclient, WM_MDIGETACTIVE, 0, 0); @@ -3188,10 +3207,9 @@ #endif /* _NO_EXTENSIONS */ -static void scan_entry(ChildWnd* child, Entry* entry, HWND hwnd) +static void scan_entry(ChildWnd* child, Entry* entry, int idx, HWND hwnd) { TCHAR path[MAX_PATH]; - int idx = ListBox_GetCurSel(child->left.hwnd); HCURSOR old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); /* delete sub entries in left pane */ @@ -3305,7 +3323,7 @@ } -static void set_curdir(ChildWnd* child, Entry* entry, HWND hwnd) +static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd) { TCHAR path[MAX_PATH]; @@ -3316,7 +3334,7 @@ child->right.cur = entry; if (!entry->scanned) - scan_entry(child, entry, hwnd); + scan_entry(child, entry, idx, hwnd); else { ListBox_ResetContent(child->right.hwnd); insert_entries(&child->right, entry->down, -1); @@ -3338,6 +3356,30 @@ } +static void refresh_child(ChildWnd* child) +{ + TCHAR path[MAX_PATH], drv[_MAX_DRIVE+1]; + Entry* entry; + int idx; + + get_path(child->left.cur, path); + _tsplitpath(path, drv, NULL, NULL, NULL); + + child->right.root = NULL; + + scan_entry(child, &child->root.entry, 0, child->hwnd); + + entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd); + + insert_entries(&child->left, child->root.entry.down, 0); + + set_curdir(child, entry, 0, child->hwnd); + + idx = ListBox_FindItemData(child->left.hwnd, 0, child->left.cur); + ListBox_SetCurSel(child->left.hwnd, idx); +} + + BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow) { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow); @@ -3415,7 +3457,7 @@ int scanned_old = entry->scanned; if (!scanned_old) - scan_entry(child, entry, hwnd); + scan_entry(child, entry, ListBox_GetCurSel(child->left.hwnd), hwnd); #ifndef _NO_EXTENSIONS if (entry->data.cFileName[0]=='.' && entry->data.cFileName[1]=='\0') @@ -3434,7 +3476,7 @@ if (!pane->treePane) focus_entry: { int idx = ListBox_FindItemData(child->left.hwnd, ListBox_GetCurSel(child->left.hwnd), entry); ListBox_SetCurSel(child->left.hwnd, idx); - set_curdir(child, entry, hwnd); + set_curdir(child, entry, idx, hwnd); } } @@ -3500,6 +3542,23 @@ } +static void set_sort_order(ChildWnd* child, SORT_ORDER sortOrder) +{ + if (child->sortOrder != sortOrder) { + child->sortOrder = sortOrder; + refresh_child(child); + } +} + +static void update_view_menu(ChildWnd* child) +{ + CheckMenuItem(Globals.hMenuView, ID_VIEW_SORT_NAME, child->sortOrder==SORT_NAME? MF_CHECKED: MF_UNCHECKED); + CheckMenuItem(Globals.hMenuView, ID_VIEW_SORT_TYPE, child->sortOrder==SORT_EXT? MF_CHECKED: MF_UNCHECKED); + CheckMenuItem(Globals.hMenuView, ID_VIEW_SORT_SIZE, child->sortOrder==SORT_SIZE? MF_CHECKED: MF_UNCHECKED); + CheckMenuItem(Globals.hMenuView, ID_VIEW_SORT_DATE, child->sortOrder==SORT_DATE? MF_CHECKED: MF_UNCHECKED); +} + + static IContextMenu2* s_pctxmenu2 = NULL; #ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ @@ -3781,7 +3840,7 @@ break;} case ID_REFRESH: - scan_entry(child, pane->cur, hwnd); + refresh_child(child); break; case ID_ACTIVATE: @@ -3818,12 +3877,28 @@ activate_entry(child, pane, hwnd); } else - scan_entry(child, pane->root, hwnd); + refresh_child(child); } else display_error(hwnd, GetLastError()); break;} + case ID_VIEW_SORT_NAME: + set_sort_order(child, SORT_NAME); + break; + + case ID_VIEW_SORT_TYPE: + set_sort_order(child, SORT_EXT); + break; + + case ID_VIEW_SORT_SIZE: + set_sort_order(child, SORT_SIZE); + break; + + case ID_VIEW_SORT_DATE: + set_sort_order(child, SORT_DATE); + break; + default: return pane_command(pane, LOWORD(wparam)); } @@ -3839,7 +3914,7 @@ Entry* entry = (Entry*) ListBox_GetItemData(pane->hwnd, idx); if (pane == &child->left) - set_curdir(child, entry, hwnd); + set_curdir(child, entry, idx, hwnd); else pane->cur = entry; break;} @@ -3909,6 +3984,7 @@ if (CtxMenu_HandleMenuMsg(nmsg, wparam, lparam)) return 0; + update_view_menu(child); break; #ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-14 18:04:53 UTC (rev 15282) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-14 18:57:07 UTC (rev 15283) @@ -90,10 +90,10 @@ MENUITEM "????¤Û¤ñ?ð?Ýú¿&Aú®" , ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "??ÀÍ?¶ðÈú¿&Pú®..." , ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "???????¹??ð?ú¿&Sú®" , 404 - MENUITEM "???Óð???ð?ú¿&Bú®" , 405 - MENUITEM "???¾ðí??ð?ú¿&Zú®" , 406 - MENUITEM "???iã???ð?ú¿&Dú®" , 407 + MENUITEM "???????¹??ð?ú¿&Sú®" , ID_VIEW_SORT_NAME + MENUITEM "???Óð???ð?ú¿&Bú®" , ID_VIEW_SORT_TYPE + MENUITEM "???¾ðí??ð?ú¿&Zú®" , ID_VIEW_SORT_SIZE + MENUITEM "???iã???ð?ú¿&Dú®" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Â¿Íã??ð?..." , 409 }

1 0

[greatlrd] 15282: Activate serial mouse for livecd
by greatlrd＠svn.reactos.com 14 May '05

14 May '05

Activate serial mouse for livecd now it support both ps2 and serial mouse Modified: trunk/reactos/bootdata/livecd.inf _____ Modified: trunk/reactos/bootdata/livecd.inf --- trunk/reactos/bootdata/livecd.inf 2005-05-14 18:03:31 UTC (rev 15281) +++ trunk/reactos/bootdata/livecd.inf 2005-05-14 18:04:53 UTC (rev 15282) @@ -19,6 +19,9 @@ ; Shell HKLM,"SYSTEM\Setup","CmdLine",0x00020000,"%SystemRoot%\explorer.exe" +; Serial mouse driver +HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x 00000001 + ; User Profile List HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList","ProfilesDirectory",0x00020000,"%SystemDr ive%\Profiles"

1 0

[gvg] 15281: Present for GreatLord:
by gvg＠svn.reactos.com 14 May '05

14 May '05

Present for GreatLord: Implement WH_KEYBOARD_LL hook Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/lib/user32/windows/hook.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -281,6 +281,7 @@ PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra; WPARAM wParam; LPARAM lParam; + KBDLLHOOKSTRUCT *KeyboardLlData; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -353,6 +354,10 @@ break; } break; + case WH_KEYBOARD_LL: + KeyboardLlData = (KBDLLHOOKSTRUCT *)((PCHAR) Common + Common->lParam); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) KeyboardLlData); + break; default: return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } _____ Modified: trunk/reactos/subsys/win32k/include/msgqueue.h --- trunk/reactos/subsys/win32k/include/msgqueue.h 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/include/msgqueue.h 2005-05-14 18:03:31 UTC (rev 15281) @@ -28,6 +28,7 @@ ULONG_PTR CompletionCallbackContext; /* entry in the dispatching list of the sender's message queue */ LIST_ENTRY DispatchingListEntry; + BOOL HookMessage; } USER_SENT_MESSAGE, *PUSER_SENT_MESSAGE; typedef struct _USER_SENT_MESSAGE_NOTIFY @@ -127,7 +128,8 @@ NTSTATUS FASTCALL MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, - UINT uTimeout, BOOL Block, ULONG_PTR *uResult); + UINT uTimeout, BOOL Block, BOOL HookMessage, + ULONG_PTR *uResult); PUSER_MESSAGE FASTCALL MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam); VOID FASTCALL _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -240,7 +240,44 @@ return STATUS_SUCCESS; } +/* Only used in ntuser/input.c KeyboardThreadMain(). If it's + not called there anymore, please delete */ +NTSTATUS +Win32kInitWin32Thread(PETHREAD Thread) +{ + PEPROCESS Process; + Process = Thread->ThreadsProcess; + + if (Process->Win32Process == NULL) + { + /* FIXME - lock the process */ + Process->Win32Process = ExAllocatePool(NonPagedPool, sizeof(W32PROCESS)); + + if (Process->Win32Process == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Process->Win32Process, sizeof(W32PROCESS)); + /* FIXME - unlock the process */ + + Win32kProcessCallback(Process, TRUE); + } + + if (Thread->Tcb.Win32Thread == NULL) + { + Thread->Tcb.Win32Thread = ExAllocatePool (NonPagedPool, sizeof(W32THREAD)); + if (Thread->Tcb.Win32Thread == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Thread->Tcb.Win32Thread, sizeof(W32THREAD)); + + Win32kThreadCallback(Thread, TRUE); + } + + return(STATUS_SUCCESS); +} + + /* * This definition doesn't work */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -293,6 +293,9 @@ return 0; } break; + case WH_KEYBOARD_LL: + ArgumentLength += sizeof(KBDLLHOOKSTRUCT); + break; default: DPRINT1("Trying to call unsupported window hook %d\n", HookId); return 0; @@ -343,6 +346,10 @@ break; } break; + case WH_KEYBOARD_LL: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(KBDLLHOOKSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; } ResultPointer = &Result; _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -182,8 +182,10 @@ RtlFreeUnicodeString(&Hook->ModuleName); /* Dereference thread if required */ - if(Hook->Flags & HOOK_THREAD_REFERENCED) - ObDereferenceObject(Hook->Thread); + if (Hook->Flags & HOOK_THREAD_REFERENCED) + { + ObDereferenceObject(Hook->Thread); + } /* Close handle */ ObmCloseHandle(WinStaObj->HandleTable, Hook->Self); @@ -191,7 +193,7 @@ /* remove a hook, freeing it if the chain is not in use */ STATIC FASTCALL VOID -IntRemoveHook(PHOOK Hook, PWINSTATION_OBJECT WinStaObj) +IntRemoveHook(PHOOK Hook, PWINSTATION_OBJECT WinStaObj, BOOL TableAlreadyLocked) { PHOOKTABLE Table = IntGetTable(Hook); @@ -201,7 +203,10 @@ return; } - IntLockHookTable(Table); + if (! TableAlreadyLocked) + { + IntLockHookTable(Table); + } if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Hook->Proc = NULL; /* chain is in use, just mark it and return */ @@ -210,7 +215,10 @@ { IntFreeHook(Table, Hook, WinStaObj); } - IntUnLockHookTable(Table); + if (! TableAlreadyLocked) + { + IntUnLockHookTable(Table); + } } /* release a hook chain, removing deleted hooks if the use count drops to 0 */ @@ -249,17 +257,42 @@ IntUnLockHookTable(Table); } +static LRESULT FASTCALL +IntCallLowLevelHook(INT HookId, INT Code, WPARAM wParam, LPARAM lParam, PHOOK Hook) +{ + NTSTATUS Status; + ULONG_PTR uResult; + + /* FIXME should get timeout from + * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ + Status = MsqSendMessage(Hook->Thread->Tcb.Win32Thread->MessageQueue, (HWND) Code, HookId, + wParam, lParam, /*500*/0, TRUE, TRUE, &uResult); + + return NT_SUCCESS(Status) ? uResult : 0; +} + LRESULT FASTCALL HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam) { PHOOK Hook; - PHOOKTABLE Table = MsqGetHooks(PsGetWin32Thread()->MessageQueue); + PW32THREAD Win32Thread; + PHOOKTABLE Table; LRESULT Result; PWINSTATION_OBJECT WinStaObj; NTSTATUS Status; ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); + Win32Thread = PsGetWin32Thread(); + if (NULL == Win32Thread) + { + Table = NULL; + } + else + { + Table = MsqGetHooks(Win32Thread->MessageQueue); + } + if (NULL == Table || ! (Hook = IntGetFirstValidHook(Table, HookId))) { /* try global table */ @@ -270,6 +303,13 @@ } } + if (Hook->Thread != PsGetCurrentThread() + && (WH_KEYBOARD_LL == HookId || WH_MOUSE_LL == HookId)) + { + DPRINT("Calling hook in owning thread\n"); + return IntCallLowLevelHook(HookId, Code, wParam, lParam, Hook); + } + if (Hook->Thread != PsGetCurrentThread()) { DPRINT1("Calling hooks in other threads not implemented yet"); @@ -294,7 +334,7 @@ 0, &WinStaObj); - if(! NT_SUCCESS(Status)) + if (! NT_SUCCESS(Status)) { DPRINT1("Invalid window station????\n"); } @@ -324,7 +364,7 @@ 0, &WinStaObj); - if(! NT_SUCCESS(Status)) + if (! NT_SUCCESS(Status)) { DPRINT1("Invalid window station????\n"); return; @@ -344,7 +384,7 @@ Elem = Elem->Flink; if (HookObj->Thread == Thread) { - IntRemoveHook(HookObj, WinStaObj); + IntRemoveHook(HookObj, WinStaObj, TRUE); } } break; @@ -372,7 +412,7 @@ 0, &WinStaObj); - if(! NT_SUCCESS(Status)) + if (! NT_SUCCESS(Status)) { SetLastNtError(Status); return FALSE; @@ -433,7 +473,7 @@ BOOL Ansi) { PWINSTATION_OBJECT WinStaObj; - BOOLEAN Global, ReleaseThread; + BOOLEAN Global; PETHREAD Thread; PHOOK Hook; UNICODE_STRING ModuleName; @@ -473,15 +513,23 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return NULL; } - ReleaseThread = TRUE; } else /* system-global hook */ { - ReleaseThread = FALSE; if (HookId == WH_KEYBOARD_LL || HookId == WH_MOUSE_LL) { Mod = NULL; Thread = PsGetCurrentThread(); + Status = ObReferenceObjectByPointer(Thread, + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode); + + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return (HANDLE) NULL; + } } else if (NULL == Mod) { @@ -495,16 +543,20 @@ Global = TRUE; } - /* We only (partially) support local WH_CBT hooks for now */ - if (WH_CBT != HookId || Global) + /* We only (partially) support local WH_CBT hooks and + * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ + if ((WH_CBT != HookId || Global) + && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED #else DPRINT1("Not implemented: HookId %d Global %s\n", HookId, Global ? "TRUE" : "FALSE"); #endif - if(ReleaseThread) - ObDereferenceObject(Thread); + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } SetLastWin32Error(ERROR_NOT_SUPPORTED); return NULL; } @@ -514,10 +566,12 @@ 0, &WinStaObj); - if(! NT_SUCCESS(Status)) + if (! NT_SUCCESS(Status)) { - if(ReleaseThread && Thread) - ObDereferenceObject(Thread); + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } SetLastNtError(Status); return (HANDLE) NULL; } @@ -525,14 +579,18 @@ Hook = IntAddHook(Thread, HookId, Global, WinStaObj); if (NULL == Hook) { - if(ReleaseThread) - ObDereferenceObject(Thread); + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } ObDereferenceObject(WinStaObj); return NULL; } - if(ReleaseThread) + if (NULL != Thread) + { Hook->Flags |= HOOK_THREAD_REFERENCED; + } if (NULL != Mod) { @@ -540,9 +598,11 @@ if (! NT_SUCCESS(Status)) { ObmDereferenceObject(Hook); - IntRemoveHook(Hook, WinStaObj); - if(ReleaseThread) - ObDereferenceObject(Thread); + IntRemoveHook(Hook, WinStaObj, FALSE); + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } ObDereferenceObject(WinStaObj); SetLastNtError(Status); return NULL; @@ -553,9 +613,11 @@ if (NULL == Hook->ModuleName.Buffer) { ObmDereferenceObject(Hook); - IntRemoveHook(Hook, WinStaObj); - if(ReleaseThread) - ObDereferenceObject(Thread); + IntRemoveHook(Hook, WinStaObj, FALSE); + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } ObDereferenceObject(WinStaObj); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; @@ -567,9 +629,11 @@ if (! NT_SUCCESS(Status)) { ObmDereferenceObject(Hook); - IntRemoveHook(Hook, WinStaObj); - if(ReleaseThread) - ObDereferenceObject(Thread); + IntRemoveHook(Hook, WinStaObj, FALSE); + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } ObDereferenceObject(WinStaObj); SetLastNtError(Status); return NULL; @@ -618,7 +682,7 @@ 0, &WinStaObj); - if(! NT_SUCCESS(Status)) + if (! NT_SUCCESS(Status)) { SetLastNtError(Status); return FALSE; @@ -635,7 +699,7 @@ } ASSERT(Hook == HookObj->Self); - IntRemoveHook(HookObj, WinStaObj); + IntRemoveHook(HookObj, WinStaObj, FALSE); ObmDereferenceObject(HookObj); ObDereferenceObject(WinStaObj); _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -184,7 +184,7 @@ DPRINT("Mouse Input Thread Starting...\n"); /* - * Receive and process keyboard input. + * Receive and process mouse input. */ while(InputThreadsRunning) { @@ -409,7 +409,9 @@ MSG msg; PUSER_MESSAGE_QUEUE FocusQueue; struct _ETHREAD *FocusThread; + extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread); + PKEYBOARD_INDICATOR_TRANSLATION IndicatorTrans = NULL; UINT ModifierState = 0; USHORT LastMakeCode = 0; @@ -434,6 +436,22 @@ return; //(Status); } + /* Not sure if converting this thread to a win32 thread is such + a great idea. Since we're posting keyboard messages to the focus + window message queue, we'll be (indirectly) doing sendmessage + stuff from this thread (for WH_KEYBOARD_LL processing), which + means we need our own message queue. If keyboard messages were + instead queued to the system message queue, the thread removing + the message from the system message queue would be responsible + for WH_KEYBOARD_LL processing and we wouldn't need this thread + to be a win32 thread. */ + Status = Win32kInitWin32Thread(PsGetCurrentThread()); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Win32K: Failed making keyboard thread a win32 thread.\n"); + return; //(Status); + } + IntKeyboardGetIndicatorTrans(KeyboardDeviceHandle, &IndicatorTrans); _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -1332,7 +1332,7 @@ } Status = MsqSendMessage(Window->MessageQueue, hWnd, Msg, wParam, lParam, - uTimeout, (uFlags & SMTO_BLOCK), uResult); + uTimeout, (uFlags & SMTO_BLOCK), FALSE, uResult); IntReleaseWindowObject(Window); if (STATUS_TIMEOUT == Status) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-05-14 18:03:31 UTC (rev 15281) @@ -618,6 +618,7 @@ PUSER_MESSAGE_QUEUE FocusMessageQueue; MSG Msg; LARGE_INTEGER LargeTickCount; + KBDLLHOOKSTRUCT KbdHookData; DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", uMsg, wParam, lParam); @@ -632,6 +633,20 @@ /* We can't get the Msg.pt point here since we don't know thread (and thus the window station) the message will end up in yet. */ + KbdHookData.vkCode = Msg.wParam; + KbdHookData.scanCode = (Msg.lParam >> 16) & 0xff; + KbdHookData.flags = (0 == (Msg.lParam & 0x01000000) ? 0 : LLKHF_EXTENDED) | + (0 == (Msg.lParam & 0x20000000) ? 0 : LLKHF_ALTDOWN) | + (0 == (Msg.lParam & 0x80000000) ? 0 : LLKHF_UP); + KbdHookData.time = Msg.time; + KbdHookData.dwExtraInfo = 0; + if (HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) + { + DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + Msg.message, Msg.wParam, Msg.lParam); + return; + } + FocusMessageQueue = IntGetFocusMessageQueue(); if( !IntGetScreenDC() ) { /* FIXME: What to do about Msg.pt here? */ @@ -793,11 +808,21 @@ IntUnLockMessageQueue(MessageQueue); - /* Call the window procedure. */ - Result = IntSendMessage(Message->Msg.hwnd, - Message->Msg.message, - Message->Msg.wParam, - Message->Msg.lParam); + if (Message->HookMessage) + { + Result = HOOK_CallHooks(Message->Msg.message, + (INT) Message->Msg.hwnd, + Message->Msg.wParam, + Message->Msg.lParam); + } + else + { + /* Call the window procedure. */ + Result = IntSendMessage(Message->Msg.hwnd, + Message->Msg.message, + Message->Msg.wParam, + Message->Msg.lParam); + } /* remove the message from the local dispatching list, because it doesn't need to be cleaned up on thread termination anymore */ @@ -957,7 +982,8 @@ NTSTATUS FASTCALL MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, - UINT uTimeout, BOOL Block, ULONG_PTR *uResult) + UINT uTimeout, BOOL Block, BOOL HookMessage, + ULONG_PTR *uResult) { PUSER_SENT_MESSAGE Message; KEVENT CompletionEvent; @@ -992,6 +1018,7 @@ Message->SenderQueue = ThreadQueue; IntReferenceMessageQueue(ThreadQueue); Message->CompletionCallback = NULL; + Message->HookMessage = HookMessage; IntReferenceMessageQueue(MessageQueue); _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-05-14 17:57:31 UTC (rev 15280) +++ trunk/reactos/w32api/include/winuser.h 2005-05-14 18:03:31 UTC (rev 15281) @@ -2147,7 +2147,10 @@ #define MOD_ON_KEYUP 2048 #define MOD_RIGHT 16384 #define MOD_LEFT 32768 +#define LLKHF_EXTENDED 0x00000001 +#define LLKHF_INJECTED 0x00000010 #define LLKHF_ALTDOWN 0x00000020 +#define LLKHF_UP 0x00000080 #if (WINVER >= 0x0500) #define FLASHW_STOP 0 #define FLASHW_CAPTION 1

1 0

[chorns] 15280: Extract WINE resources at compile-time
by chorns＠svn.reactos.com 14 May '05

14 May '05

Extract WINE resources at compile-time Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_large.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_small.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_large.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_small.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_large.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_small.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_copy.cur Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divider.cur Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divideropen.cur Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_movebutton.cur Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_dragarrow.ico Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_error_sm.ico Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_info_sm.ico Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_warn_sm.ico Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idt_check.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/800.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/cdrom.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/floppy.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/folder.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/folder2.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/fontpics.bmp Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/hdisk.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/network.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_collate.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_landscape.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_nocollate.ico Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_portrait.ico Deleted: branches/xmlbuildsystem/reactos/lib/ole32/drag_copy.cur Deleted: branches/xmlbuildsystem/reactos/lib/ole32/drag_link.cur Deleted: branches/xmlbuildsystem/reactos/lib/ole32/drag_move.cur Deleted: branches/xmlbuildsystem/reactos/lib/ole32/nodrop.cur Deleted: branches/xmlbuildsystem/reactos/lib/shell32/desktop.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/document.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/drive.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/floppy.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/folder.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/folder_open.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/mycomputer.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/netdrive.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/netdrive2.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/printer.ico Deleted: branches/xmlbuildsystem/reactos/lib/shell32/ramdisk.ico Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.c Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Added: branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/Makefile 2005-05-14 17:57:31 UTC (rev 15280) @@ -229,6 +229,7 @@ -include makefile.auto PREAUTO := \ + $(BIN2RES_TARGET) \ $(BUILDNO_H) \ $(BUGCODES_H) \ $(BUGCODES_RC) \ _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-05-14 17:57:31 UTC (rev 15280) @@ -14,6 +14,13 @@ <define name="DBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> + <if property="DBG" value="0"> + <compilerflag>-O2</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_large.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_hist_small.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_large.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_std_small.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_large.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idb_view_small.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_copy.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divider.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_divideropen.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idc_movebutton.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_dragarrow.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_error_sm.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_info_sm.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idi_tt_warn_sm.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/idt_check.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/800.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/cdrom.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/floppy.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/folder.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/folder2.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/fontpics.bmp (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/hdisk.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/network.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_collate.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_landscape.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_nocollate.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_portrait.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/ole32/drag_copy.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/ole32/drag_link.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/ole32/drag_move.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/ole32/nodrop.cur (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/desktop.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/document.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/drive.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/floppy.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/folder.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/folder_open.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/mycomputer.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/netdrive.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/netdrive2.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/printer.ico (Binary files differ) _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/ramdisk.ico (Binary files differ) _____ Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.c --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.c 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.c 2005-05-14 17:57:31 UTC (rev 15280) @@ -35,14 +35,25 @@ # include <unistd.h> #endif +#if defined(WIN32) +#define DIR_SEPARATOR "\\" +#else +#define DIR_SEPARATOR "/" +#endif + extern int mkstemps(char *template, int suffix_len); +int process_resources(const char* input_file_name, const char* specific_file_name, + const char* relative_path, + int inserting, int force_processing, int verbose); + static const char* help = "Usage: bin2res [OPTIONS] <rsrc.rc>\n" " -a archive binaries into the <rsrc.rc> file\n" " -x extract binaries from the <rsrc.rc> file\n" " -i <filename> archive the named file into the <rsrc.rc> file\n" " -o <filename> extract the named file from the <rsrc.rc> file\n" + " -b <path> assume resources are relative to this base path\n" " -f force processing of older resources\n" " -v causes the command to be verbous during processing\n" " -h print this help screen and exit\n" @@ -127,9 +138,62 @@ return res_file_name; } +const char* parse_include(const char *line) +{ + static char include_filename[PATH_MAX], *rpos, *wpos; + + if (!(rpos = strstr(line, "#"))) return 0; + for (rpos += 1; *rpos && isspace(*rpos); rpos++) /**/; + if (!(rpos = strstr(line, "include"))) return 0; + for (rpos += 7; *rpos && isspace(*rpos); rpos++) /**/; + for (; *rpos && (*rpos == '"' || *rpos == '<'); rpos++) /**/; + for (wpos = include_filename; *rpos && !(*rpos == '"' || *rpos == '<'); ) *wpos++ = *rpos++; + if (!(rpos = strstr(include_filename, ".rc"))) return 0; + *wpos = 0; + + return include_filename; +} + +char* get_filename_with_full_path(char* output, const char* filename, const char* relative_path) +{ + if (relative_path != NULL && relative_path[0] != 0) + { + strcpy(output, relative_path); + strcat(output, DIR_SEPARATOR); + strcat(output, filename); + } + else + strcpy(output, filename); + return output; +} + +void process_includes(const char* input_file_name, const char* specific_file_name, + const char* relative_path, + int inserting, int force_processing, int verbose) +{ + char filename[PATH_MAX]; + char buffer[2048]; + const char *include_file_name; + FILE *fin; + int c; + + if (!(fin = fopen(input_file_name, "r"))) return; + for (c = EOF; fgets(buffer, sizeof(buffer), fin); c = EOF) + { + if (!(include_file_name = parse_include(buffer))) continue; + if ( verbose ) printf ( "Processing included file %s\n", include_file_name); + process_resources(get_filename_with_full_path(filename, include_file_name, relative_path), + specific_file_name, relative_path, + inserting, force_processing, verbose); + } + fclose(fin); +} + int process_resources(const char* input_file_name, const char* specific_file_name, + const char* relative_path, int inserting, int force_processing, int verbose) { + char filename[PATH_MAX]; char buffer[2048], tmp_file_name[PATH_MAX]; const char *res_file_name; time_t rc_last_update, res_last_update; @@ -169,7 +233,8 @@ if (inserting) fputc(c, ftmp); if (c == EOF) break; - if (!(fres = fopen(res_file_name, inserting ? "rb" : "wb"))) break; + if (!(fres = fopen(get_filename_with_full_path(filename, res_file_name, relative_path), + inserting ? "rb" : "wb"))) break; if (inserting) { if (!insert_hexdump(ftmp, fres)) break; @@ -201,6 +266,11 @@ } else unlink(tmp_file_name); } + else + { + process_includes(input_file_name, specific_file_name, relative_path, + inserting, force_processing, verbose); + } return c == EOF; } @@ -211,8 +281,9 @@ int force_overwrite = 0, verbose = 0; const char* input_file_name = 0; const char* specific_file_name = 0; + const char* relative_path = 0; - while((optc = getopt(argc, argv, "axi:o:fhv")) != EOF) + while((optc = getopt(argc, argv, "axi:o:b:fhv")) != EOF) { switch(optc) { @@ -229,6 +300,10 @@ if (convert_dir && convert_dir != optc) usage(); convert_dir = optc; break; + case 'b': + if (relative_path) usage(); + relative_path = optarg; + break; case 'f': force_overwrite = 1; break; @@ -249,7 +324,7 @@ if (!convert_dir) usage(); - if (!process_resources(input_file_name, specific_file_name, + if (!process_resources(input_file_name, specific_file_name, relative_path, convert_dir == 'a', force_overwrite, verbose)) { perror("Processing failed"); _____ Modified: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-05-14 17:57:31 UTC (rev 15280) @@ -42,6 +42,9 @@ $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ +.PHONY: bin2res +bin2res: $(BIN2RES_TARGET) + .PHONY: bin2res_clean bin2res_clean: $(BIN2RES_TARGET) -@$(rm) $(BIN2RES_TARGET) $(BIN2RES_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-14 17:57:31 UTC (rev 15280) @@ -121,8 +121,8 @@ string Directory::ReplaceVariable ( string name, - string value, - string path ) + string value, + string path ) { size_t i = path.find ( name ); if ( i != string::npos ) @@ -131,9 +131,9 @@ return path; } -string +/* static */ string Directory::GetEnvironmentVariablePathOrDefault ( const string& name, - const string& defaultValue ) + const string& defaultValue ) { const string& environmentVariableValue = Environment::GetVariable ( name ); if ( environmentVariableValue.length () > 0 ) @@ -142,21 +142,21 @@ return defaultValue; } -string +/* static */ string Directory::GetIntermediatePath () { return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", "obj-i386" ); } -string +/* static */ string Directory::GetOutputPath () { return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", "output-i386" ); } -string +/* static */ string Directory::GetInstallPath () { return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", @@ -165,7 +165,7 @@ void Directory::ResolveVariablesInPath ( char* buf, - string path ) + string path ) { string s = ReplaceVariable ( "$(INTERMEDIATE)", GetIntermediatePath (), path ); s = ReplaceVariable ( "$(OUTPUT)", GetOutputPath (), s ); @@ -175,7 +175,7 @@ void Directory::GenerateTree ( const string& parent, - bool verbose ) + bool verbose ) { string path; @@ -355,6 +355,7 @@ GenerateInstallTarget (); GenerateDirectoryTargets (); GenerateDirectories (); + UnpackWineResources (); CheckAutomaticDependencies (); CloseMakefile (); } @@ -637,7 +638,23 @@ fprintf ( fMakefile, "\n" ); } +string +MingwBackend::GetBin2ResExecutable () +{ + return NormalizeFilename ( Directory::GetOutputPath () + SSEP + "tools/bin2res/bin2res" + EXEPOSTFIX ); +} + void +MingwBackend::UnpackWineResources () +{ + printf ( "Unpacking WINE resources..." ); + WineResource wineResource ( ProjectNode, + GetBin2ResExecutable () ); + wineResource.UnpackResources ( verbose ); + printf ( "done\n" ); +} + +void MingwBackend::CheckAutomaticDependencies () { printf ( "Checking automatic dependencies..." ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-14 17:57:31 UTC (rev 15280) @@ -37,17 +37,17 @@ std::string EscapeSpaces ( std::string path ); void CreateRule ( FILE* f, const std::string& parent ); + static std::string GetIntermediatePath (); + static std::string GetOutputPath (); + static std::string GetInstallPath (); private: bool mkdir_p ( const char* path ); std::string ReplaceVariable ( std::string name, std::string value, std::string path ); std::string GetEnvironmentVariable ( const std::string& name ); - std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, - const std::string& defaultValue ); - std::string GetIntermediatePath (); - std::string GetOutputPath (); - std::string GetInstallPath (); + static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, + const std::string& defaultValue ); void ResolveVariablesInPath ( char* buf, std::string path ); bool CreateDirectory ( std::string path ); @@ -90,6 +90,8 @@ std::string GetBuildToolDependencies () const; void GenerateInitTarget () const; void GenerateXmlBuildFilesMacro() const; + std::string GetBin2ResExecutable (); + void UnpackWineResources (); void CheckAutomaticDependencies (); bool IncludeDirectoryTarget ( const std::string& directory ) const; bool TryToDetectThisCompiler ( const std::string& compiler ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-14 17:57:31 UTC (rev 15280) @@ -1848,7 +1848,7 @@ deps[i].c_str () ); fprintf ( fMakefile, " | %s\n", - GetDirectory ( GetTargetFilename ( module, NULL ) ).c_str () ); + GetDirectory ( GetImportLibraryFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -2236,34 +2236,10 @@ void MingwWin32DLLModuleHandler::Process () { - GenerateExtractWineDLLResourcesTarget (); GenerateWin32DLLModuleTarget (); } void -MingwWin32DLLModuleHandler::GenerateExtractWineDLLResourcesTarget () -{ - fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n", - module.name.c_str () ); - fprintf ( fMakefile, "%s_extractresources: $(BIN2RES_TARGET)\n", - module.name.c_str () ); - const vector<File*>& files = module.non_if_data.files; - for ( size_t i = 0; i < files.size (); i++ ) - { - File& file = *files[i]; - string extension = GetExtension ( file.name ); - if ( extension == ".rc" || extension == ".RC" ) - { - string resource = NormalizeFilename ( file.name ); - fprintf ( fMakefile, "\t$(ECHO_BIN2RES)\n" ); - fprintf ( fMakefile, "\t@:echo ${bin2res} -f -x %s\n", - resource.c_str () ); - } - } - fprintf ( fMakefile, "\n"); -} - -void MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget () { string targetMacro ( GetTargetMacro (module) ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-14 17:57:31 UTC (rev 15280) @@ -291,7 +291,6 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: - void GenerateExtractWineDLLResourcesTarget (); void GenerateWin32DLLModuleTarget (); }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-14 17:57:31 UTC (rev 15280) @@ -55,6 +55,7 @@ class CompilerFlag; class LinkerFlag; class Property; +class WineResource; class AutomaticDependency; class Bootstrap; class CDFile; @@ -421,6 +422,26 @@ }; +class WineResource +{ +public: + const Project& project; + std::string bin2res; + + WineResource ( const Project& project, + std::string bin2res ); + ~WineResource (); + void UnpackResources ( bool verbose ); +private: + bool IsSpecFile ( const File& file ); + bool IsWineModule ( const Module& module ); + bool IsResourceFile ( const File& file ); + std::string GetResourceFilename ( const Module& module ); + void UnpackResourcesInModule ( Module& module, + bool verbose ); +}; + + class SourceFile { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-14 17:57:31 UTC (rev 15280) @@ -123,6 +123,7 @@ project.cpp \ ssprintf.cpp \ stubbedcomponent.cpp \ + wineresource.cpp \ XML.cpp \ ) @@ -261,6 +262,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)wineresource.o: $(RBUILD_BASE_)wineresource.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -335,7 +340,6 @@ .PHONY: rbuild_test - rbuild_test: $(RBUILD_TEST_TARGET) $(ECHO_TEST) $(Q)$(RBUILD_TEST_TARGET) _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp 2005-05-14 15:07:11 UTC (rev 15279) +++ branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp 2005-05-14 17:57:31 UTC (rev 15280) @@ -0,0 +1,100 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; +using std::vector; + +WineResource::WineResource ( const Project& project, + string bin2res ) + : project ( project ), + bin2res ( bin2res ) +{ +} + +WineResource::~WineResource () +{ +} + +bool +WineResource::IsSpecFile ( const File& file ) +{ + string extension = GetExtension ( file.name ); + if ( extension == ".spec" || extension == ".SPEC" ) + return true; + return false; +} + +bool +WineResource::IsWineModule ( const Module& module ) +{ + const vector<File*>& files = module.non_if_data.files; + for ( size_t i = 0; i < files.size (); i++ ) + { + if ( IsSpecFile ( *files[i] ) ) + return true; + } + return false; +} + +bool +WineResource::IsResourceFile ( const File& file ) +{ + string extension = GetExtension ( file.name ); + if ( extension == ".rc" || extension == ".RC" ) + return true; + return false; +} + +string +WineResource::GetResourceFilename ( const Module& module ) +{ + const vector<File*>& files = module.non_if_data.files; + for ( size_t i = 0; i < files.size (); i++ ) + { + if ( IsResourceFile ( *files[i] ) ) + return files[i]->name; + } + return ""; +} + +void +WineResource::UnpackResources ( bool verbose ) +{ + for ( size_t i = 0; i < project.modules.size (); i++ ) + { + if ( IsWineModule ( *project.modules[i] ) ) + { + UnpackResourcesInModule ( *project.modules[i], + verbose ); + } + } +} + +void +WineResource::UnpackResourcesInModule ( Module& module, + bool verbose ) +{ + string resourceFilename = GetResourceFilename ( module ); + if ( resourceFilename.length () == 0 ) + return; + + if ( verbose ) + { + printf ( "Unpacking resources for %s", + module.name.c_str () ); + } + + string outputDirectory = GetDirectory ( module.GetPath () ); + string parameters = ssprintf ( "-b %s -f -x %s", + NormalizeFilename ( outputDirectory ).c_str (), + NormalizeFilename ( resourceFilename ).c_str () ); + string command = bin2res + " " + parameters; + int exitcode = system ( command.c_str () ); + if ( exitcode != 0 ) + { + throw InvocationFailedException ( command, + exitcode ); + } +} Property changes on: branches/xmlbuildsystem/reactos/tools/rbuild/wineresource.cpp ___________________________________________________________________ Name: svn:eol-style + native

1 0

[chorns] 15279: Only pass GCC specific options to GCC
by chorns＠svn.reactos.com 14 May '05

14 May '05

Only pass GCC specific options to GCC Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-14 15:07:11 UTC (rev 15279) @@ -383,46 +383,27 @@ fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.xml' INSTEAD\n\n" ); } +string +MingwBackend::GenerateIncludesAndDefines ( IfableData& data ) const +{ + string includeParameters = MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ); + string defineParameters = MingwModuleHandler::GenerateGccDefineParametersFromVector ( data.defines ); + return includeParameters + " " + defineParameters; +} + void MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation, IfableData& data ) const { - size_t i; - fprintf ( fMakefile, "PROJECT_CFLAGS %s", assignmentOperation ); - for ( i = 0; i < data.compilerFlags.size(); i++ ) - { - fprintf ( - fMakefile, - " %s", - data.compilerFlags[i]->flag.c_str() ); - } + fprintf ( fMakefile, + " %s", + GenerateIncludesAndDefines ( data ).c_str() ); - for ( i = 0; i < data.includes.size(); i++ ) - { - fprintf ( - fMakefile, - " -I%s", - data.includes[i]->directory.c_str() ); - } - - for ( i = 0; i < data.defines.size(); i++ ) - { - Define& d = *data.defines[i]; - fprintf ( - fMakefile, - " -D%s", - d.name.c_str() ); - if ( d.value.size() ) - fprintf ( - fMakefile, - "=%s", - d.value.c_str() ); - } fprintf ( fMakefile, "\n" ); } @@ -441,7 +422,7 @@ prop.value.c_str() ); } - if ( data.includes.size() || data.defines.size() || data.compilerFlags.size() ) + if ( data.includes.size() || data.defines.size() ) { GenerateProjectCFlagsMacro ( assignmentOperation, data ); @@ -452,7 +433,6 @@ If& rIf = *data.ifs[i]; if ( rIf.data.defines.size() || rIf.data.includes.size() - || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { fprintf ( @@ -470,6 +450,62 @@ } } +void +MingwBackend::GenerateProjectGccOptionsMacro ( const char* assignmentOperation, + IfableData& data ) const +{ + size_t i; + + fprintf ( + fMakefile, + "PROJECT_GCCOPTIONS %s", + assignmentOperation ); + + for ( i = 0; i < data.compilerFlags.size(); i++ ) + { + fprintf ( + fMakefile, + " %s", + data.compilerFlags[i]->flag.c_str() ); + } + + fprintf ( fMakefile, "\n" ); +} + +void +MingwBackend::GenerateProjectGccOptions ( + const char* assignmentOperation, + IfableData& data ) const +{ + size_t i; + + if ( data.compilerFlags.size() ) + { + GenerateProjectGccOptionsMacro ( assignmentOperation, + data ); + } + + for ( i = 0; i < data.ifs.size(); i++ ) + { + If& rIf = *data.ifs[i]; + if ( rIf.data.compilerFlags.size() + || rIf.data.ifs.size() ) + { + fprintf ( + fMakefile, + "ifeq (\"$(%s)\",\"%s\")\n", + rIf.property.c_str(), + rIf.value.c_str() ); + GenerateProjectGccOptions ( + "+=", + rIf.data ); + fprintf ( + fMakefile, + "endif\n\n" ); + } + } +} + string MingwBackend::GenerateProjectLFLAGS () const { @@ -487,14 +523,14 @@ void MingwBackend::GenerateGlobalVariables () const { - GenerateGlobalCFlagsAndProperties ( - "=", - ProjectNode.non_if_data ); + GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); + GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", GenerateProjectLFLAGS ().c_str () ); + fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-14 15:07:11 UTC (rev 15279) @@ -73,10 +73,15 @@ void CreateMakefile (); void CloseMakefile () const; void GenerateHeader () const; + std::string GenerateIncludesAndDefines ( IfableData& data ) const; void GenerateProjectCFlagsMacro ( const char* assignmentOperation, IfableData& data ) const; void GenerateGlobalCFlagsAndProperties ( const char* op, IfableData& data ) const; + void GenerateProjectGccOptionsMacro ( const char* assignmentOperation, + IfableData& data ) const; + void GenerateProjectGccOptions ( const char* assignmentOperation, + IfableData& data ) const; std::string GenerateProjectLFLAGS () const; void GenerateDirectories (); void GenerateGlobalVariables () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-14 15:07:11 UTC (rev 15279) @@ -488,9 +488,9 @@ return objectFilenames; } -string +/* static */ string MingwModuleHandler::GenerateGccDefineParametersFromVector ( - const vector<Define*>& defines ) const + const vector<Define*>& defines ) { string parameters; for ( size_t i = 0; i < defines.size (); i++ ) @@ -535,8 +535,8 @@ return path1 + CSEP + path2; } -string -MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const +/* static */ string +MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) { string parameters; for ( size_t i = 0; i < includes.size (); i++ ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-14 15:07:11 UTC (rev 15279) @@ -40,6 +40,9 @@ const Module& module, string_list* pclean_files ); + static std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ); + static std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ); + std::string GetModuleTargets ( const Module& module ); void GetObjectsVector ( const IfableData& data, std::vector<std::string>& objectFiles ) const; @@ -100,9 +103,7 @@ private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; - std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ) const; std::string GenerateGccDefineParameters () const; - std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const; std::string GenerateCompilerParametersFromVector ( const std::vector<CompilerFlag*>& compilerFlags ) const; std::string GenerateLinkerParametersFromVector ( const std::vector<LinkerFlag*>& linkerFlags ) const; std::string GenerateImportLibraryDependenciesFromVector ( const std::vector<Library*>& libraries );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs