Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[navaraf] 14145: Initialize the pGdiInfo->flRaster field to zero.

by navaraf＠svn.reactos.com

Initialize the pGdiInfo->flRaster field to zero. Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-03-16 21:18:33 UTC (rev 14144) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-03-16 21:28:21 UTC (rev 14145) @@ -210,6 +210,7 @@ pGdiInfo->ulLogPixelsX = pDevMode->dmLogPixels; pGdiInfo->ulLogPixelsY = pDevMode->dmLogPixels; pGdiInfo->flTextCaps = TC_RA_ABLE; + pGdiInfo->flRaster = 0; pGdiInfo->ulDACRed = SelectedMode->NumberRedBits; pGdiInfo->ulDACGreen = SelectedMode->NumberGreenBits; pGdiInfo->ulDACBlue = SelectedMode->NumberBlueBits;

19 years, 9 months

[frik85] 14144: Mindflyer, a.k.a. mf <mf@mufunyo.net>

by frik85＠svn.reactos.com

Mindflyer, a.k.a. mf <mf(a)mufunyo.net> alternative icon files * mycomputer icon * terminal icon Added: trunk/reactos/media/themes/ Added: trunk/reactos/media/themes/mycomputer.ico Added: trunk/reactos/media/themes/terminal.ico _____ Added: trunk/reactos/media/themes/mycomputer.ico (Binary files differ) Property changes on: trunk/reactos/media/themes/mycomputer.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/themes/terminal.ico (Binary files differ) Property changes on: trunk/reactos/media/themes/terminal.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

19 years, 9 months

[navaraf] 14143: Fix some logic in port management code.

by navaraf＠svn.reactos.com

Fix some logic in port management code. Modified: trunk/reactos/drivers/lib/ip/network/ports.c _____ Modified: trunk/reactos/drivers/lib/ip/network/ports.c --- trunk/reactos/drivers/lib/ip/network/ports.c 2005-03-16 20:36:02 UTC (rev 14142) +++ trunk/reactos/drivers/lib/ip/network/ports.c 2005-03-16 21:03:51 UTC (rev 14143) @@ -20,8 +20,7 @@ RtlInitializeBitMap( &PortSet->ProtoBitmap, PortSet->ProtoBitBuffer, PortSet->PortsToOversee ); - RtlClearBits( &PortSet->ProtoBitmap, - PortSet->StartingPort, PortsToManage ); + RtlClearAllBits( &PortSet->ProtoBitmap ); ExInitializeFastMutex( &PortSet->Mutex ); } @@ -31,14 +30,16 @@ VOID DeallocatePort( PPORT_SET PortSet, ULONG Port ) { Port = htons(Port); - RtlClearBits( &PortSet->ProtoBitmap, - PortSet->StartingPort + Port, 1 ); + ASSERT(Port >= PortSet->StartingPort); + ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); + RtlClearBits( &PortSet->ProtoBitmap, Port - PortSet->StartingPort, 1 ); } BOOLEAN AllocatePort( PPORT_SET PortSet, ULONG Port ) { BOOLEAN Clear; Port = htons(Port); + ASSERT(Port >= PortSet->StartingPort); Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex );

19 years, 9 months

[weiden] 14142: Rouven Wessling <rouven@rouvenwessling.de>:

by weiden＠svn.reactos.com

Rouven Wessling <rouven(a)rouvenwessling.de>: calc: - fixed spelling mistakes ncpa, aclui: - German translation Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_De.rc Added: trunk/reactos/lib/cpl/ncpa/de.rc Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc Modified: trunk/reactos/subsys/system/calc/De.rc Modified: trunk/reactos/subsys/system/calc/calc.rc Modified: trunk/reactos/subsys/system/calc/rsrc.rc _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/lib/aclui/aclui.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -10,4 +10,4 @@ IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp" #include "aclui_En.rc" - +#include "aclui_De.rc" _____ Added: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -0,0 +1,23 @@ +#include <reactos/resource.h> +#include <defines.h> +#include "resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Sicherheit" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Gruppen oder Benutzernamen:", -1, 7, 7, 105, 8 + CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "&Hinzuf³gen...", IDC_ACELIST_ADD, 116, 87, 50, 14 + PUSHBUTTON "&Entfernen", IDC_ACELIST_REMOVE, 170, 87, 50, 14 + LTEXT "Erlauben", -1, 135, 107, 32, 8, SS_CENTER + LTEXT "Verbieten", -1, 176, 107, 32, 8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "Berechtigungen f³r %1" +} Property changes on: trunk/reactos/lib/aclui/aclui_De.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/cpl/ncpa/de.rc --- trunk/reactos/lib/cpl/ncpa/de.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/lib/cpl/ncpa/de.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -0,0 +1,87 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Netzwerk Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Netzwerkkarten",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Hinzuf³gen",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Entfernen",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Eigenschaften",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verbindung herstellen ³ber:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Allgemein", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Dauer:", -1, 19, 34, 60, 8 + LTEXT "?bertragungsrate:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivitõt", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Gesendet", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Empfangen", -1, 149, 90, 37, 8 + LTEXT "Paketes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "E&igenschaften", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "IP-Einstellungen k÷nnen automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterst³tzt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 228, 27 + CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "&IP-Addresse:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "&Standardgateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Netzwerk Einstellungen" + IDS_CPLSYSTEMDESCRIPTION "Bearbeite Netzwerkeinstellungen." +END Property changes on: trunk/reactos/lib/cpl/ncpa/de.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc --- trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -23,4 +23,5 @@ IDI_NETSTAT ICON "resources/NETCONN.ICO" #include "en.rc" +#include "de.rc" #include "dk.rc" _____ Modified: trunk/reactos/subsys/system/calc/De.rc --- trunk/reactos/subsys/system/calc/De.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/subsys/system/calc/De.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -1,155 +1,155 @@ -/* - * WineCalc (DE.rc) - * - * Copyright 2005 Rouven Wessling - * - * 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 - */ - -#include "windows.h" -#include "resource.h" -#include "winecalc.h" - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_APPNAME, "Rechner" - - IDS_COPYRIGHT1, "Calculator 5.0. Lizensiert unter der LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" - IDS_COPYRIGHT3 "San Jose, California, USA" - IDS_COPYRIGHT4 "james(a)ActionMessage.com" - IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - - IDS_BTN_BACKSPACE, "R³cktaste" - IDS_BTN_CLEAR_ENTRY, "CE" - IDS_BTN_CLEAR_ALL, "C" - IDS_BTN_MEM_CLEAR, "MC" - IDS_BTN_MEM_RECALL, "MR" - IDS_BTN_MEM_STORE, "MS" - IDS_BTN_MEM_PLUS, "M+" - IDS_BTN_MEM_STATUS_M, "M" - IDS_BTN_SQRT, "sqrt" - IDS_ERR_INVALID_INPUT, "Ung³ltige Eingabe f³r funktion." - IDS_ERR_DIVIDE_BY_ZERO, "Teilen durch 0 unm÷glich." - IDS_ERR_UNDEFINED, "Das Ergebnis der funktion is undefiniert." -} - -MAIN_MENU MENU DISCARDABLE -{ - POPUP "&Bearbeiten" { - MENUITEM "&Kopieren Ctrl+C", IDM_COPY - MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE - } - POPUP "&Ansicht" { - MENUITEM "&Standard", IDM_MODE_STANDARD - MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING - } - POPUP "&?" { - MENUITEM "&Hilfethemen", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Info", IDM_ABOUT - } -} - -SCIMS_MENU MENU DISCARDABLE -{ - POPUP "&Bearbeiten" { - MENUITEM "&Kopiren Ctrl+C", IDM_COPY - MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE - } - POPUP "&Anzeige" { - MENUITEM "&Standard", IDM_MODE_STANDARD - MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "&Hex\tF5", ID_CALC_NS_HEX - MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC - MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT - MENUITEM "&Binõr\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "&Deg\tF2", ID_CALC_MS_DEGREES - MENUITEM "&Rad\tF3", ID_CALC_MS_RADIANS - MENUITEM "&Grad\tF4", ID_CALC_MS_GRADS - MENUITEM SEPARATOR - MENUITEM "Zifferngr&uppierung", IDM_DIGIT_GROUPING - } - POPUP "&?" { - MENUITEM "&Hilfethemen", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Info", IDM_ABOUT - } -} - -SCIWS_MENU MENU DISCARDABLE -{ - POPUP "&Bearbeiten" { - MENUITEM "&Kopieren Ctrl+C", IDM_COPY - MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE - } - POPUP "&Anzeige" { - MENUITEM "&Standard", IDM_MODE_STANDARD - MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "&Hex\tF5", ID_CALC_NS_HEX - MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC - MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT - MENUITEM "&Binõr\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dw&ord\tF2", ID_CALC_WS_DWORD - MENUITEM "Wo&rd\tF3", ID_CALC_WS_WORD - MENUITEM "&Byte\tF4", ID_CALC_WS_BYTE - MENUITEM SEPARATOR - MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING - } - POPUP "&?" { - MENUITEM "&Hilfethemen", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Info", IDM_ABOUT - } -} - -MAIN_MENU ACCELERATORS -BEGIN - VK_F1, IDV_HELP, VIRTKEY -END - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "Info ³ber GNU winecalc" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "Was ist das?", IDM_WHATS_THIS - } -} - -DLG_STATS DIALOG 12,0,125,78 -CAPTION "Statistics Box" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -BEGIN - DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP -END +/* + * WineCalc (DE.rc) + * + * Copyright 2005 Rouven Wessling + * + * 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 + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Rechner" + + IDS_COPYRIGHT1, "Rechner 5.0. Lizenziert unter der LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "R³cktaste" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Ung³ltige Eingabe f³r Funktion." + IDS_ERR_DIVIDE_BY_ZERO, "Teilen durch 0 unm÷glich." + IDS_ERR_UNDEFINED, "Das Ergebnis der Funktion is undefiniert." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Bearbeiten" { + MENUITEM "&Kopieren Ctrl+C", IDM_COPY + MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE + } + POPUP "&Ansicht" { + MENUITEM "&Standard", IDM_MODE_STANDARD + MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING + } + POPUP "&?" { + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Bearbeiten" { + MENUITEM "&Kopieren Ctrl+C", IDM_COPY + MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE + } + POPUP "&Anzeige" { + MENUITEM "&Standard", IDM_MODE_STANDARD + MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC + MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT + MENUITEM "&Binõr\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "&Deg\tF2", ID_CALC_MS_DEGREES + MENUITEM "&Rad\tF3", ID_CALC_MS_RADIANS + MENUITEM "&Grad\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Zifferngr&uppierung", IDM_DIGIT_GROUPING + } + POPUP "&?" { + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Bearbeiten" { + MENUITEM "&Kopieren Ctrl+C", IDM_COPY + MENUITEM "&Einf³gen Ctrl+V", IDM_PASTE + } + POPUP "&Anzeige" { + MENUITEM "&Standard", IDM_MODE_STANDARD + MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC + MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT + MENUITEM "&Binõr\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dw&ord\tF2", ID_CALC_WS_DWORD + MENUITEM "Wo&rd\tF3", ID_CALC_WS_WORD + MENUITEM "&Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING + } + POPUP "&?" { + MENUITEM "&Hilfethemen", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Info ³ber GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Was ist das?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Property changes on: trunk/reactos/subsys/system/calc/De.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/calc/calc.rc --- trunk/reactos/subsys/system/calc/calc.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/subsys/system/calc/calc.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -4,5 +4,3 @@ #include <reactos/resource.h> #include "rsrc.rc" -#include "De.rc" - _____ Modified: trunk/reactos/subsys/system/calc/rsrc.rc --- trunk/reactos/subsys/system/calc/rsrc.rc 2005-03-16 20:13:55 UTC (rev 14141) +++ trunk/reactos/subsys/system/calc/rsrc.rc 2005-03-16 20:36:02 UTC (rev 14142) @@ -22,6 +22,7 @@ #include "resource.h" #include "En.rc" +#include "De.rc" #include "Es.rc" #include "Fr.rc" #include "It.rc"

19 years, 9 months

[navaraf] 14141: Ulrich Czekalla <ulrich@codeweavers.com>

by navaraf＠svn.reactos.com

Ulrich Czekalla <ulrich(a)codeweavers.com> Set WS_EX_CONTROLPARENT when dialog has DS_CONTROL. Mike McCormack <mike(a)codeweavers.com> Strip WS_CAPTION and WS_SYSMENU for child dialogs. Modified: trunk/reactos/lib/user32/windows/dialog.c _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-03-16 19:27:45 UTC (rev 14140) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-03-16 20:13:55 UTC (rev 14141) @@ -708,8 +708,12 @@ rect.left = rect.top = 0; rect.right = MulDiv(template.cx, dlgInfo->xBaseUnit, 4); rect.bottom = MulDiv(template.cy, dlgInfo->yBaseUnit, 8); + if (template.style & WS_CHILD) + template.style &= ~(WS_CAPTION|WS_SYSMENU); if (template.style & DS_MODALFRAME) template.exStyle |= WS_EX_DLGMODALFRAME; + if (template.style & DS_CONTROL) + template.exStyle |= WS_EX_CONTROLPARENT; AdjustWindowRectEx( &rect, template.style, (dlgInfo->hMenu != 0), template.exStyle ); rect.right -= rect.left; rect.bottom -= rect.top;

19 years, 9 months

[fireball] 14140: Ivan Semenoff <ivans77@mail.ru>

by fireball＠svn.reactos.com

Ivan Semenoff <ivans77(a)mail.ru> Fixed a bug in RtlClearBits (asserting if startingindex+count is more than size, instead of silently continuing processing). Modified: trunk/reactos/lib/rtl/bitmap.c _____ Modified: trunk/reactos/lib/rtl/bitmap.c --- trunk/reactos/lib/rtl/bitmap.c 2005-03-16 19:24:41 UTC (rev 14139) +++ trunk/reactos/lib/rtl/bitmap.c 2005-03-16 19:27:45 UTC (rev 14140) @@ -187,8 +187,7 @@ if (StartingIndex >= Size || NumberToClear == 0) return; - if (StartingIndex + NumberToClear > Size) - NumberToClear = Size - StartingIndex; + ASSERT(StartingIndex + NumberToClear <= Size); Ptr = (PULONG)BitMapHeader->Buffer + (StartingIndex / 32); while (NumberToClear)

19 years, 9 months

[hpoussin] 14139: Saveliy Tretiakov <saveliyt@mail.ru>

by hpoussin＠svn.reactos.com

Saveliy Tretiakov <saveliyt(a)mail.ru> - Only one file may be open on a port at any given time - Implemented IOCTL_SERIAL_GET_STATS and IOCTL_SERIAL_CLEAR_STATS Modified: trunk/reactos/drivers/dd/serial/close.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/close.c --- trunk/reactos/drivers/dd/serial/close.c 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/close.c 2005-03-16 19:24:41 UTC (rev 14139) @@ -16,7 +16,14 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PSERIAL_DEVICE_EXTENSION pDeviceExtension; + DPRINT("Serial: IRP_MJ_CLOSE\n"); - IoCompleteRequest(Irp, IO_NO_INCREMENT); + pDeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + pDeviceExtension->IsOpened = FALSE; + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/create.c 2005-03-16 19:24:41 UTC (rev 14139) @@ -41,7 +41,15 @@ goto ByeBye; } + if(DeviceExtension->IsOpened) + { + DPRINT("Serial: COM%lu is already opened", DeviceExtension->ComPort); + Status = STATUS_ACCESS_DENIED; + goto ByeBye; + } + DPRINT("Serial: open COM%lu: successfull\n", DeviceExtension->ComPort); + DeviceExtension->IsOpened = TRUE; Status = STATUS_SUCCESS; ByeBye: _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-16 19:24:41 UTC (rev 14139) @@ -145,6 +145,32 @@ return Status; } +BOOL +SerialClearPerfStats( + IN PSERIALPERF_STATS pSerialPerfStats) +{ + RtlZeroMemory(pSerialPerfStats, sizeof(SERIALPERF_STATS)); + return TRUE; +} + +BOOL +SerialGetPerfStats(IN PIRP pIrp) +{ + PSERIAL_DEVICE_EXTENSION pDeviceExtension; + pDeviceExtension = (PSERIAL_DEVICE_EXTENSION) + IoGetCurrentIrpStackLocation(pIrp)->DeviceObject->DeviceExtension; + /* + * we assume buffer is big enough to hold SerialPerfStats structure + * caller must verify this + */ + RtlCopyMemory( + pIrp->AssociatedIrp.SystemBuffer, + &pDeviceExtension->SerialPerfStats, + sizeof(SERIALPERF_STATS) + ); + return TRUE; +} + NTSTATUS STDCALL SerialDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -175,9 +201,12 @@ { case IOCTL_SERIAL_CLEAR_STATS: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_CLEAR_STATS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT("Serial: IOCTL_SERIAL_CLEAR_STATS\n"); + KeSynchronizeExecution( + DeviceExtension->Interrupt, + (PKSYNCHRONIZE_ROUTINE)SerialClearPerfStats, + &DeviceExtension->SerialPerfStats); + Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_CLR_DTR: @@ -320,9 +349,24 @@ } case IOCTL_SERIAL_GET_STATS: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_STATS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT1("Serial: IOCTL_SERIAL_GET_STATS\n"); + if (LengthOut < sizeof(SERIALPERF_STATS)) + { + DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); + Status = STATUS_BUFFER_TOO_SMALL; + } + else if (Buffer == NULL) + { + DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + KeSynchronizeExecution(DeviceExtension->Interrupt, + (PKSYNCHRONIZE_ROUTINE)SerialGetPerfStats, Irp); + Status = STATUS_SUCCESS; + Information = sizeof(SERIALPERF_STATS); + } break; } case IOCTL_SERIAL_GET_TIMEOUTS: _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-03-16 19:24:41 UTC (rev 14139) @@ -105,6 +105,7 @@ if (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) { DPRINT1("Serial: Byte received: 0x%x\n", READ_PORT_UCHAR(SER_RBR(ComPortBase))); + DeviceExtension->SerialPerfStats.ReceivedCount++; return TRUE; } break; _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-03-16 19:24:41 UTC (rev 14139) @@ -219,6 +219,7 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; + ULONG Information = 0; PDEVICE_OBJECT LowerDevice; NTSTATUS Status; @@ -236,8 +237,6 @@ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) Status = SerialPnpStartDevice(DeviceObject, Irp); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); break; } /* IRP_MN_QUERY_STOP_DEVICE (FIXME: required) */ @@ -270,6 +269,9 @@ break; } } - + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-03-16 19:24:41 UTC (rev 14139) @@ -80,6 +80,7 @@ while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) ; WRITE_PORT_UCHAR(SER_THR(ComPortBase), Buffer[i]); + DeviceExtension->SerialPerfStats.TransmittedCount++; } IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-03-16 17:30:11 UTC (rev 14138) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-03-16 19:24:41 UTC (rev 14139) @@ -67,6 +67,9 @@ SERIAL_LINE_CONTROL SerialLineControl; ULONG WaitMask; + SERIALPERF_STATS SerialPerfStats; + BOOL IsOpened; + /* Current values */ UCHAR IER; /* Base+1, Interrupt Enable Register */ UCHAR MCR; /* Base+4, Modem Control Register */

19 years, 9 months

[gvg] 14138: Reapply Wine-20050310 changes, this time with the changes

by gvg＠svn.reactos.com

Reapply Wine-20050310 changes, this time with the changes to the include files. Where's CIS when you need it :P Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/classes.c Modified: trunk/reactos/lib/shell32/clipboard.c Modified: trunk/reactos/lib/shell32/dialogs.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/enumidlist.h Modified: trunk/reactos/lib/shell32/folders.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/pidl.h Modified: trunk/reactos/lib/shell32/shell32.spec Modified: trunk/reactos/lib/shell32/shell32_Es.rc Modified: trunk/reactos/lib/shell32/shell32_Pt.rc Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr.h Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shfldr_fs.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c Added: trunk/reactos/lib/shell32/shfldr_unixfs.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlfileop.c Modified: trunk/reactos/lib/shell32/shlfolder.c Modified: trunk/reactos/lib/shell32/shlfsbind.c Modified: trunk/reactos/lib/shell32/shlview.c Modified: trunk/reactos/w32api/include/shellapi.h Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/Makefile.in 2005-03-16 17:30:11 UTC (rev 14138) @@ -37,6 +37,7 @@ shfldr_desktop.c \ shfldr_fs.c \ shfldr_mycomp.c \ + shfldr_unixfs.c \ shlexec.c \ shlfileop.c \ shlfolder.c \ @@ -77,7 +78,7 @@ $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc shell.spec.c: shell.spec version16.res - $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res version16.res --dll $(SRCDIR)/shell.spec + $(WINEBUILD) $(DEFS) $(DLLFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -55,68 +55,95 @@ return SHCONTF_FOLDERS | (ulFlags & BIF_BROWSEINCLUDEFILES ? SHCONTF_NONFOLDERS : 0); } +/********************************************************************** ******** + * InitializeTreeView [Internal] + * + * Called from WM_INITDIALOG handler. + * + * PARAMS + * hwndParent [I] The BrowseForFolder dialog + * root [I] ITEMIDLIST of the root shell folder + */ static void InitializeTreeView(HWND hwndParent, LPCITEMIDLIST root) { - HIMAGELIST hImageList; - IShellFolder * lpsf; - HRESULT hr; - IEnumIDList * pEnumIL = NULL; - LPITEMIDLIST parentofroot; - parentofroot = ILClone(root); - ILRemoveLastID(parentofroot); + LPITEMIDLIST pidlParent, pidlChild; + HIMAGELIST hImageList; + HRESULT hr; + IShellFolder *lpsfParent, *lpsfRoot; + IEnumIDList * pEnumChildren = NULL; - hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW); - Shell_GetImageList(NULL, &hImageList); + TRACE("dlg=%p tree=%p\n", hwndParent, hwndTreeView ); + + hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW); + if (!hwndTreeView) { + FIXME("Could not get handle to treeview control! Error: %08lx\n", GetLastError()); + return; + } + Shell_GetImageList(NULL, &hImageList); - TRACE("dlg=%p tree=%p\n", hwndParent, hwndTreeView ); + if (hImageList) + TreeView_SetImageList(hwndTreeView, hImageList, 0); - if (hImageList && hwndTreeView) - TreeView_SetImageList(hwndTreeView, hImageList, 0); + /* We want to call InsertTreeViewItem down the code, in order to insert + * the root item of the treeview. Due to InsertTreeViewItem's signature, + * we need the following to do this: + * + * + An ITEMIDLIST corresponding to _the parent_ of root. + * + An ITEMIDLIST, which is a relative path from root's parent to root + * (containing a single SHITEMID). + * + An IShellFolder interface pointer of root's parent folder. + * + * If root is 'Desktop', then root's parent is also 'Desktop'. + */ - if (_ILIsDesktop (root)) { - hr = SHGetDesktopFolder(&lpsf); - } else { - IShellFolder * lpsfdesktop; + pidlParent = ILClone(root); + ILRemoveLastID(pidlParent); + pidlChild = ILClone(ILFindLastID(root)); + + if (_ILIsDesktop(pidlParent)) { + hr = SHGetDesktopFolder(&lpsfParent); + } else { + IShellFolder *lpsfDesktop; + hr = SHGetDesktopFolder(&lpsfDesktop); + if (!SUCCEEDED(hr)) { + WARN("SHGetDesktopFolder failed! hr = %08lx\n", hr); + return; + } + hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); + IShellFolder_Release(lpsfDesktop); + } + + if (!SUCCEEDED(hr)) { + WARN("Could not bind to parent shell folder! hr = %08lx\n", hr); + return; + } - hr = SHGetDesktopFolder(&lpsfdesktop); - if (SUCCEEDED(hr)) { - hr = IShellFolder_BindToObject(lpsfdesktop, parentofroot, 0,(REFIID)&IID_IShellFolder,(LPVOID *)&lpsf); - IShellFolder_Release(lpsfdesktop); - } - } - if (SUCCEEDED(hr)) - { - IShellFolder * pSFRoot; - if (_ILIsPidlSimple(root)) - { - pSFRoot = lpsf; - IShellFolder_AddRef(pSFRoot); - } - else - hr = IShellFolder_BindToObject(lpsf,ILFindLastID(root),0,&IID_IShellFolder,(L PVOID *)&pSFRoot); - if (SUCCEEDED(hr)) - { - hr = IShellFolder_EnumObjects( - pSFRoot, - hwndParent, - BrowseFlagsToSHCONTF(lpBrowseInfo->ulFlags), - &pEnumIL); - IShellFolder_Release(pSFRoot); - } - } + if (pidlChild && pidlChild->mkid.cb) { + hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); + } else { + lpsfRoot = lpsfParent; + hr = IShellFolder_AddRef(lpsfParent); + } + + if (!SUCCEEDED(hr)) { + WARN("Could not bind to root shell folder! hr = %08lx\n", hr); + IShellFolder_Release(lpsfParent); + return; + } - if (SUCCEEDED(hr) && hwndTreeView) - { - TreeView_DeleteAllItems(hwndTreeView); - TreeView_Expand(hwndTreeView, - InsertTreeViewItem(lpsf, _ILIsPidlSimple(root) ? root : ILFindLastID(root), parentofroot, pEnumIL, TVI_ROOT), - TVE_EXPAND); - } + hr = IShellFolder_EnumObjects(lpsfRoot, hwndParent, BrowseFlagsToSHCONTF(lpBrowseInfo->ulFlags), &pEnumChildren); + if (!SUCCEEDED(hr)) { + WARN("Could not get child iterator! hr = %08lx\n", hr); + IShellFolder_Release(lpsfParent); + IShellFolder_Release(lpsfRoot); + return; + } - if (SUCCEEDED(hr)) - IShellFolder_Release(lpsf); + TreeView_DeleteAllItems(hwndTreeView); + TreeView_Expand(hwndTreeView, InsertTreeViewItem(lpsfParent, pidlChild, pidlParent, pEnumChildren, TVI_ROOT), TVE_EXPAND); - TRACE("done\n"); + IShellFolder_Release(lpsfRoot); + IShellFolder_Release(lpsfParent); } static int GetIcon(LPITEMIDLIST lpi, UINT uFlags) @@ -149,12 +176,27 @@ typedef struct tagID { - LPSHELLFOLDER lpsfParent; - LPITEMIDLIST lpi; - LPITEMIDLIST lpifq; - IEnumIDList* pEnumIL; + LPSHELLFOLDER lpsfParent; /* IShellFolder of the parent */ + LPITEMIDLIST lpi; /* PIDL relativ to parent */ + LPITEMIDLIST lpifq; /* Fully qualified PIDL */ + IEnumIDList* pEnumIL; /* Children iterator */ } TV_ITEMDATA, *LPTV_ITEMDATA; +/********************************************************************** ******** + * GetName [Internal] + * + * Query a shell folder for the display name of one of it's children + * + * PARAMS + * lpsf [I] IShellFolder interface of the folder to be queried. + * lpi [I] ITEMIDLIST of the child, relative to parent + * dwFlags [I] as in IShellFolder::GetDisplayNameOf + * lpFriendlyName [O] The desired display name in unicode + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR lpFriendlyName) { BOOL bSuccess=TRUE; @@ -175,7 +217,22 @@ return bSuccess; } -static HTREEITEM InsertTreeViewItem(IShellFolder * lpsf, LPCITEMIDLIST pidl, LPCITEMIDLIST pidlParent, IEnumIDList* pEnumIL, HTREEITEM hParent) +/********************************************************************** ******** + * InsertTreeViewItem [Internal] + * + * PARAMS + * lpsf [I] IShellFolder interface of the item's parent shell folder + * pidl [I] ITEMIDLIST of the child to insert, relativ to parent + * pidlParent [I] ITEMIDLIST of the parent shell folder + * pEnumIL [I] Iterator for the children of the item to be inserted + * hParent [I] The treeview-item that represents the parent shell folder + * + * RETURNS + * Success: Handle to the created and inserted treeview-item + * Failure: NULL + */ +static HTREEITEM InsertTreeViewItem(IShellFolder * lpsf, LPCITEMIDLIST pidl, + LPCITEMIDLIST pidlParent, IEnumIDList* pEnumIL, HTREEITEM hParent) { TVITEMW tvi; TVINSERTSTRUCTW tvins; @@ -211,6 +268,18 @@ return (HTREEITEM)TreeView_InsertItemW(hwndTreeView, &tvins); } +/********************************************************************** ******** + * FillTreeView [Internal] + * + * For each child (given by lpe) of the parent shell folder, which is given by + * lpsf and whose PIDL is pidl, insert a treeview-item right under hParent + * + * PARAMS + * lpsf [I] IShellFolder interface of the parent shell folder + * pidl [I] ITEMIDLIST of the parent shell folder + * hParent [I] The treeview item that represents the parent shell folder + * lpe [I] An iterator for the children of the parent shell folder + */ static void FillTreeView(IShellFolder * lpsf, LPITEMIDLIST pidl, HTREEITEM hParent, IEnumIDList* lpe) { HTREEITEM hPrev = 0; @@ -219,7 +288,11 @@ HRESULT hr; HWND hwnd=GetParent(hwndTreeView); - TRACE("%p %p %x\n",lpsf, pidl, (INT)hParent); + TRACE("%p %p %x %p\n",lpsf, pidl, (INT)hParent, lpe); + + /* No IEnumIDList -> No children */ + if (!lpe) return; + SetCapture(GetParent(hwndTreeView)); SetCursor(LoadCursorA(0, (LPSTR)IDC_WAIT)); _____ Modified: trunk/reactos/lib/shell32/classes.c --- trunk/reactos/lib/shell32/classes.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/classes.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -116,7 +116,7 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) { - static const WCHAR swShell[] = {'\\','s','h','e','l','l','\\',0}; + static const WCHAR swShell[] = {'s','h','e','l','l','\\',0}; static const WCHAR swCommand[] = {'\\','c','o','m','m','a','n','d',0}; BOOL ret = FALSE; _____ Modified: trunk/reactos/lib/shell32/clipboard.c --- trunk/reactos/lib/shell32/clipboard.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/clipboard.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -26,7 +26,7 @@ * - a right mousebutton-copy sets the following formats: * classic: * Shell IDList Array - * Prefered Drop Effect + * Preferred Drop Effect * Shell Object Offsets * HDROP * FileName _____ Modified: trunk/reactos/lib/shell32/dialogs.c --- trunk/reactos/lib/shell32/dialogs.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/dialogs.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -127,9 +127,9 @@ case WM_INITDIALOG : prfdp = (RUNFILEDLGPARAMS *)lParam ; SetWindowTextA (hwnd, prfdp->lpstrTitle) ; - SetClassLongA (hwnd, GCL_HICON, (LPARAM)prfdp->hIcon) ; - SendMessageA (GetDlgItem (hwnd, 12297), STM_SETICON, - (WPARAM)LoadIconA (NULL, (LPSTR)IDI_WINLOGO), 0); + SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; + SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, + (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); FillList (GetDlgItem (hwnd, 12298), NULL) ; SetFocus (GetDlgItem (hwnd, 12298)) ; return TRUE ; @@ -283,7 +283,7 @@ if (NULL != pszLatest) { - if (!strcasecmp (pszCmd, pszLatest)) + if (!lstrcmpiA(pszCmd, pszLatest)) { /* sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ; _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -25,6 +25,7 @@ #define COBJMACROS #include "wine/debug.h" +#include "wine/unicode.h" #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -103,24 +104,27 @@ */ BOOL CreateFolderEnumList( IEnumIDList *list, - LPCSTR lpszPath, + LPCWSTR lpszPath, DWORD dwFlags) { LPITEMIDLIST pidl=NULL; - WIN32_FIND_DATAA stffile; + WIN32_FIND_DATAW stffile; HANDLE hFile; - CHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH]; BOOL succeeded = TRUE; + const static WCHAR stars[] = { '*','.','*',0 }; + const static WCHAR dot[] = { '.',0 }; + const static WCHAR dotdot[] = { '.','.',0 }; - TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_a(lpszPath),dwFlags); + TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_w(lpszPath),dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; - strcpy(szPath, lpszPath); - PathAddBackslashA(szPath); - strcat(szPath,"*.*"); + strcpyW(szPath, lpszPath); + PathAddBackslashW(szPath); + strcatW(szPath,stars); - hFile = FindFirstFileA(szPath,&stffile); + hFile = FindFirstFileW(szPath,&stffile); if ( hFile != INVALID_HANDLE_VALUE ) { BOOL findFinished = FALSE; @@ -132,21 +136,21 @@ { if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && dwFlags & SHCONTF_FOLDERS && - strcmp (stffile.cFileName, ".") && strcmp (stffile.cFileName, "..")) + strcmpW(stffile.cFileName, dot) && strcmpW(stffile.cFileName, dotdot)) { - pidl = _ILCreateFromFindDataA(&stffile); + pidl = _ILCreateFromFindDataW(&stffile); succeeded = succeeded && AddToEnumList(list, pidl); } else if (!(stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && dwFlags & SHCONTF_NONFOLDERS) { - pidl = _ILCreateFromFindDataA(&stffile); + pidl = _ILCreateFromFindDataW(&stffile); succeeded = succeeded && AddToEnumList(list, pidl); } } if (succeeded) { - if (!FindNextFileA(hFile, &stffile)) + if (!FindNextFileW(hFile, &stffile)) { if (GetLastError() == ERROR_NO_MORE_FILES) findFinished = TRUE; _____ Modified: trunk/reactos/lib/shell32/enumidlist.h --- trunk/reactos/lib/shell32/enumidlist.h 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/enumidlist.h 2005-03-16 17:30:11 UTC (rev 14138) @@ -25,6 +25,6 @@ /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and * adds them to the already-created list. */ -BOOL CreateFolderEnumList(IEnumIDList *list, LPCSTR lpszPath, DWORD dwFlags); +BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags); #endif /* ndef __ENUMIDLIST_H__ */ _____ Modified: trunk/reactos/lib/shell32/folders.c --- trunk/reactos/lib/shell32/folders.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/folders.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -328,7 +328,7 @@ found = TRUE; } - else if (!strcasecmp(sTemp, "lnkfile")) + else if (!lstrcmpiA(sTemp, "lnkfile")) { /* extract icon from shell shortcut */ IShellFolder* dsf; _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-03-16 16:25:54 UTC (rev 14137) +++ trunk/reactos/lib/shell32/pidl.c 2005-03-16 17:30:11 UTC (rev 14138) @@ -1,7 +1,7 @@ /* - * pidl Handling + * pidl Handling * - * Copyright 1998 Juergen Schmied + * Copyright 1998 Juergen Schmied * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,7 +57,7 @@ extern BOOL WINAPI Free(LPVOID); /*********************************************************************** ** - * ILGetDisplayNameEx [SHELL32.186] + * ILGetDisplayNameEx [SHELL32.186] * * Retrieves the display name of an ItemIDList * @@ -75,106 +75,108 @@ */ BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) { - BOOL ret = FALSE; - WCHAR wPath[MAX_PATH]; + BOOL ret = FALSE; + WCHAR wPath[MAX_PATH]; - TRACE("%p %p %p %ld\n", psf, pidl, path, type); + TRACE("%p %p %p %ld\n", psf, pidl, path, type); - if (!pidl || !path) - return FALSE; + if (!pidl || !path) + return FALSE; - ret = ILGetDisplayNameExW(psf, pidl, wPath, type); - WideCharToMultiByte(CP_ACP, 0, wPath, -1, path, MAX_PATH, NULL, NULL); - TRACE("%p %p %s\n", psf, pidl, debugstr_a(path)); + ret = ILGetDisplayNameExW(psf, pidl, wPath, type); + WideCharToMultiByte(CP_ACP, 0, wPath, -1, path, MAX_PATH, NULL, NULL); + TRACE("%p %p %s\n", psf, pidl, debugstr_a(path)); - return ret; + return ret; } BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) { - LPSHELLFOLDER psfParent, lsf = psf; - HRESULT ret = NO_ERROR; - LPCITEMIDLIST pidllast; - STRRET strret; - DWORD flag; + LPSHELLFOLDER psfParent, lsf = psf; + HRESULT ret = NO_ERROR; + LPCITEMIDLIST pidllast; + STRRET strret; + DWORD flag; - TRACE("%p %p %p %ld\n", psf, pidl, path, type); + TRACE("%p %p %p %ld\n", psf, pidl, path, type); - if (!pidl || !path) - return FALSE; + if (!pidl || !path) + return FALSE; - if (!lsf) - { - ret = SHGetDesktopFolder(&lsf); - if (FAILED(ret)) - return FALSE; - } + if (!lsf) + { + ret = SHGetDesktopFolder(&lsf); + if (FAILED(ret)) + return FALSE; + } - if (type >= 0 && type <= 2) - { - switch (type) - { - case ILGDN_FORPARSING: - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; - case ILGDN_NORMAL: - flag = SHGDN_NORMAL; - break; - case ILGDN_INFOLDER: - flag = SHGDN_INFOLDER; - break; - default: - FIXME("Unknown type parameter = %lx\n", type); - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; - } - if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) - { - ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); - if (SUCCEEDED(ret)) - { - ret = StrRetToStrNW(path, MAX_PATH, &strret, pidl); - } - } - else - { - ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); - if (SUCCEEDED(ret)) - { - ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); - if (SUCCEEDED(ret)) - { - ret = StrRetToStrNW(path, MAX_PATH, &strret, pidllast); - } - IShellFolder_Release(psfParent); - } - } - } + if (type >= 0 && type <= 2) + { + switch (type) + { + case ILGDN_FORPARSING: + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + case ILGDN_NORMAL: + flag = SHGDN_NORMAL; + break; + case ILGDN_INFOLDER: + flag = SHGDN_INFOLDER; + break; + default: + FIXME("Unknown type parameter = %lx\n", type); + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + } + if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) + { + ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); + if (SUCCEEDED(ret)) + { + ret = StrRetToStrNW(path, MAX_PATH, &strret, pidl); + } + } + else + { + ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); + if (SUCCEEDED(ret)) + { + ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); + if (SUCCEEDED(ret)) + { + ret = StrRetToStrNW(path, MAX_PATH, &strret, pidllast); + } + IShellFolder_Release(psfParent); + } + } + } - TRACE("%p %p %s\n", psf, pidl, debugstr_w(path)); + TRACE("%p %p %s\n", psf, pidl, debugstr_w(path)); - if (!psf) - IShellFolder_Release(lsf); - return SUCCEEDED(ret); + if (!psf) + IShellFolder_Release(lsf); + return SUCCEEDED(ret); } BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { - TRACE_(shell)("%p %p %p %ld\n", psf, pidl, path, type); - if (SHELL_OsIsUnicode()) - return ILGetDisplayNameExW(psf, pidl, path, type); - return ILGetDisplayNameExA(psf, pidl, path, type); + TRACE_(shell)("%p %p %p %ld\n", psf, pidl, path, type); + + if (SHELL_OsIsUnicode()) + return ILGetDisplayNameExW(psf, pidl, path, type); + return ILGetDisplayNameExA(psf, pidl, path, type); } /*********************************************************************** ** - * ILGetDisplayName [SHELL32.15] + * ILGetDisplayName [SHELL32.15] */ BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl, LPVOID path) { - TRACE_(shell)("%p %p\n", pidl, path); - if (SHELL_OsIsUnicode()) - return ILGetDisplayNameExW(NULL, pidl, path, ILGDN_FORPARSING); - return ILGetDisplayNameExA(NULL, pidl, path, ILGDN_FORPARSING); + TRACE_(shell)("%p %p\n", pidl, path); + + if (SHELL_OsIsUnicode()) + return ILGetDisplayNameExW(NULL, pidl, path, ILGDN_FORPARSING); + return ILGetDisplayNameExA(NULL, pidl, path, ILGDN_FORPARSING); } /*********************************************************************** ** @@ -185,20 +187,21 @@ */ LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl) { - LPCITEMIDLIST pidlLast = pidl; + LPCITEMIDLIST pidlLast = pidl; - TRACE("(pidl=%p)\n",pidl); + TRACE("(pidl=%p)\n",pidl); - if (!pidl) - return NULL; + if (!pidl) + return NULL; - while (pidl->mkid.cb) - { - pidlLast = pidl; - pidl = ILGetNext(pidl); - } - return (LPITEMIDLIST)pidlLast; + while (pidl->mkid.cb) + { + pidlLast = pidl; + pidl = ILGetNext(pidl); + } + return (LPITEMIDLIST)pidlLast; } + /*********************************************************************** ** * ILRemoveLastID [SHELL32.17] * @@ -207,12 +210,12 @@ */ BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl) { - TRACE_(shell)("pidl=%p\n",pidl); + TRACE_(shell)("pidl=%p\n",pidl); - if (!pidl || !pidl->mkid.cb) - return 0; - ILFindLastID(pidl)->mkid.cb = 0; - return 1; + if (!pidl || !pidl->mkid.cb) + return 0; + ILFindLastID(pidl)->mkid.cb = 0; + return 1; } /*********************************************************************** ** @@ -222,22 +225,24 @@ * duplicate an idlist */ LPITEMIDLIST WINAPI ILClone (LPCITEMIDLIST pidl) -{ DWORD len; - LPITEMIDLIST newpidl; +{ + DWORD len; + LPITEMIDLIST newpidl; - if (!pidl) - return NULL; + if (!pidl) + return NULL; - len = ILGetSize(pidl); - newpidl = (LPITEMIDLIST)SHAlloc(len); - if (newpidl) - memcpy(newpidl,pidl,len); + len = ILGetSize(pidl); + newpidl = (LPITEMIDLIST)SHAlloc(len); + if (newpidl) + memcpy(newpidl,pidl,len); - TRACE("pidl=%p newpidl=%p\n",pidl, newpidl); - pdump(pidl); + TRACE("pidl=%p newpidl=%p\n",pidl, newpidl); + pdump(pidl); - return newpidl; + return newpidl; } + /*********************************************************************** ** * ILCloneFirst [SHELL32.19] * @@ -245,27 +250,28 @@ * duplicates the first idlist of a complex pidl */ LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST pidl) -{ DWORD len; - LPITEMIDLIST pidlNew = NULL; +{ + DWORD len; + LPITEMIDLIST pidlNew = NULL; - TRACE("pidl=%p \n",pidl); - pdump(pidl); + TRACE("pidl=%p \n",pidl); + pdump(pidl); - if (pidl) - { - len = pidl->mkid.cb; - pidlNew = (LPITEMIDLIST) SHAlloc (len+2); - if (pidlNew) - { - memcpy(pidlNew,pidl,len+2); /* 2 -> mind a desktop pidl */ + if (pidl) + { + len = pidl->mkid.cb; + pidlNew = (LPITEMIDLIST) SHAlloc (len+2); + if (pidlNew) + { + memcpy(pidlNew,pidl,len+2); /* 2 -> mind a desktop pidl */ - if (len) - ILGetNext(pidlNew)->mkid.cb = 0x00; - } - } - TRACE("-- newpidl=%p\n",pidlNew); + if (len) + ILGetNext(pidlNew)->mkid.cb = 0x00; + } + } + TRACE("-- newpidl=%p\n",pidlNew); - return pidlNew; + return pidlNew; } /*********************************************************************** ** @@ -275,51 +281,58 @@ * the first two bytes are the len, the pidl is following then */ HRESULT WINAPI ILLoadFromStream (IStream * pStream, LPITEMIDLIST * ppPidl) -{ WORD wLen = 0; - DWORD dwBytesRead; - HRESULT ret = E_FAIL; +{ + WORD wLen = 0; + DWORD dwBytesRead; + HRESULT ret = E_FAIL; - TRACE_(shell)("%p %p\n", pStream , ppPidl); + TRACE_(shell)("%p %p\n", pStream , ppPidl); - if (*ppPidl) - { SHFree(*ppPidl); - *ppPidl = NULL; - } + if (*ppPidl) + { + SHFree(*ppPidl); + *ppPidl = NULL; + } - IStream_AddRef (pStream); + IStream_AddRef (pStream); - if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) - { - TRACE("PIDL length is %d\n", wLen); - if (wLen != 0) { - *ppPidl = SHAlloc (wLen); - if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead))) { - TRACE("Stream read OK\n"); - ret = S_OK; - } else { - WARN("reading pidl failed\n"); - SHFree(*ppPidl); - *ppPidl = NULL; - } - } else { - *ppPidl = NULL; - ret = S_OK; - } - } + if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) + { + TRACE("PIDL length is %d\n", wLen); + if (wLen != 0) + { + *ppPidl = SHAlloc (wLen); + if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead))) + { + TRACE("Stream read OK\n"); + ret = S_OK; + } + else + { + WARN("reading pidl failed\n"); + SHFree(*ppPidl); + *ppPidl = NULL; + } + } + else + { + *ppPidl = NULL; + ret = S_OK; + } + } - /* we are not yet fully compatible */ - if (*ppPidl && !pcheck(*ppPidl)) - { - WARN("Check failed\n"); - SHFree(*ppPidl); - *ppPidl = NULL; - } + /* we are not yet fully compatible */ + if (*ppPidl && !pcheck(*ppPidl)) + { + WARN("Check failed\n"); + SHFree(*ppPidl); + *ppPidl = NULL; + } - - IStream_Release (pStream); - TRACE("done\n"); - return ret; + IStream_Release (pStream); + TRACE("done\n"); + return ret; } /*********************************************************************** ** @@ -330,30 +343,29 @@ */ HRESULT WINAPI ILSaveToStream (IStream * pStream, LPCITEMIDLIST pPidl) { - LPCITEMIDLIST pidl; - WORD wLen = 0; - HRESULT ret = E_FAIL; + LPCITEMIDLIST pidl; + WORD wLen = 0; + HRESULT ret = E_FAIL; - TRACE_(shell)("%p %p\n", pStream, pPidl); + TRACE_(shell)("%p %p\n", pStream, pPidl); - IStream_AddRef (pStream); + IStream_AddRef (pStream); - pidl = pPidl; - while (pidl->mkid.cb) - { - wLen += sizeof(WORD) + pidl->mkid.cb; - pidl = ILGetNext(pidl); - } + pidl = pPidl; + while (pidl->mkid.cb) + { + wLen += sizeof(WORD) + pidl->mkid.cb; + pidl = ILGetNext(pidl); + } - if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL))) - { - if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL))) - { ret = S_OK; - } - } - IStream_Release (pStream); + if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL))) + { + if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL))) + ret = S_OK; + } + IStream_Release (pStream); - return ret; + return ret; } /*********************************************************************** ** @@ -375,45 +387,37 @@ */ HRESULT WINAPI SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { - LPSHELLFOLDER sf; - WCHAR lpszDisplayName[MAX_PATH]; - DWORD pchEaten; - HRESULT ret = E_FAIL; + WCHAR lpszDisplayName[MAX_PATH]; - TRACE_(shell)("%s %p 0x%08lx\n", path, ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08lx\n", path, ppidl, attributes ? *attributes : 0); - if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH)) - lpszDisplayName[MAX_PATH-1] = 0; + if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH)) + lpszDisplayName[MAX_PATH-1] = 0; - if (SUCCEEDED (SHGetDesktopFolder(&sf))) - { - ret = IShellFolder_ParseDisplayName(sf, 0, NULL, lpszDisplayName, &pchEaten, ppidl, attributes); - IShellFolder_Release(sf); - } - return ret; + return SHILCreateFromPathW(lpszDisplayName, ppidl, attributes); } HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { - LPSHELLFOLDER sf; - DWORD pchEaten; - HRESULT ret = E_FAIL; + LPSHELLFOLDER sf; + DWORD pchEaten; + HRESULT ret = E_FAIL; - TRACE_(shell)("%s %p 0x%08lx\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08lx\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); - if (SUCCEEDED (SHGetDesktopFolder(&sf))) - { - ret = IShellFolder_ParseDisplayName(sf, 0, NULL, (LPWSTR)path, &pchEaten, ppidl, attributes); - IShellFolder_Release(sf); - } - return ret; + if (SUCCEEDED (SHGetDesktopFolder(&sf))) + { + ret = IShellFolder_ParseDisplayName(sf, 0, NULL, (LPWSTR)path, &pchEaten, ppidl, attributes); + IShellFolder_Release(sf); + } + return ret; } HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD * attributes) { - if ( SHELL_OsIsUnicode()) - return SHILCreateFromPathW (path, ppidl, attributes); - return SHILCreateFromPathA (path, ppidl, attributes); + if ( SHELL_OsIsUnicode()) + return SHILCreateFromPathW (path, ppidl, attributes); + return SHILCreateFromPathA (path, ppidl, attributes); } /*********************************************************************** ** @@ -422,9 +426,9 @@ * Create an ItemIDList to one of the special folders. * PARAMS - * hwndOwner [in] - * nFolder [in] CSIDL_xxxxx - * fCreate [in] Create folder if it does not exist + * hwndOwner [in] + * nFolder [in] CSIDL_xxxxx + * fCreate [in] Create folder if it does not exist * * RETURNS * Success: The newly created pidl @@ -436,14 +440,15 @@ * shells IMalloc interface, aka ILFree. */ LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate) -{ LPITEMIDLIST ppidl; - TRACE_(shell)("(hwnd=%p,csidl=0x%lx,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); +{ + LPITEMIDLIST ppidl; + TRACE_(shell)("(hwnd=%p,csidl=0x%lx,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); - if (fCreate) - nFolder |= CSIDL_FLAG_CREATE; + if (fCreate) + nFolder |= CSIDL_FLAG_CREATE; - SHGetSpecialFolderLocation(hwndOwner, nFolder, &ppidl); - return ppidl; + SHGetSpecialFolderLocation(hwndOwner, nFolder, &ppidl); + return ppidl; } /*********************************************************************** ** @@ -461,21 +466,22 @@ * exported by ordinal. */ [truncated at 1000 lines; 10092 more skipped]

19 years, 9 months

[blight] 14137: Rename patch to binpatch in apps/utils

by blight＠svn.reactos.com

Rename patch to binpatch in apps/utils Modified: trunk/reactos/apps/utils/binpatch/Makefile _____ Modified: trunk/reactos/apps/utils/binpatch/Makefile --- trunk/reactos/apps/utils/binpatch/Makefile 2005-03-16 16:24:20 UTC (rev 14136) +++ trunk/reactos/apps/utils/binpatch/Makefile 2005-03-16 16:25:54 UTC (rev 14137) @@ -6,7 +6,7 @@ TARGET_APPTYPE = console -TARGET_NAME = patch +TARGET_NAME = binpatch TARGET_SDKLIBS =

19 years, 9 months

[blight] 14136: Rename patch to binpatch.

by blight＠svn.reactos.com

Rename patch to binpatch. Added: trunk/reactos/apps/utils/binpatch/ Deleted: trunk/reactos/apps/utils/patch/ _____ Copied: trunk/reactos/apps/utils/binpatch (from rev 14135, trunk/reactos/apps/utils/patch)

19 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005