Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[janderwald] 22997: * set svn:eol-style native
by janderwald＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: janderwald Date: Mon Jul 10 18:11:12 2006 New Revision: 22997 URL: http://svn.reactos.org/svn/reactos?rev=22997&view=rev Log: * set svn:eol-style native Modified: trunk/reactos/dll/cpl/sysdm/hu.rc (contents, props changed) trunk/reactos/dll/cpl/sysdm/virtmem.c (contents, props changed) Modified: trunk/reactos/dll/cpl/sysdm/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hu.rc?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hu.rc (original) +++ trunk/reactos/dll/cpl/sysdm/hu.rc Mon Jul 10 18:11:12 2006 @@ -1,140 +1,140 @@ -// Hungarian resource file by Peter Lukacs -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -RC_LICENSE RTDATA "resources/gpl.txt" - -IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Általános" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Operációs rendszer",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - LTEXT "Verzió " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - - LTEXT "Számítógép",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 - - EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHEETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY -END - -IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hálózati azonosítás" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "A ReactOS a következõ információkat fogja használni gépe azonosításához a hálózaton.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - LTEXT "Teljes számítógép név:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABELLINE(4)-4 - LTEXT "(Alapértelmezett)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABELLINE(4)-5 - LTEXT "Munkacsoport:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSHEETPADDING,LABELLINE(6)-6 - LTEXT "(üres)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60,LABELLINE(6)-6 - LTEXT "Ha a Hálózati azonosítás varázsló használatával akar csatlakozni egy tartományhoz és kíván létrehozni egy helyi felhasználói fiókot, akkor kattintson a Hálózati azonosítás gombra.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&Hálózati azonosítás...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 - LTEXT "A számítógépe átnevezéséhez, vagy annak tartományba léptetéséhez kattintson a Tulajdonságok gombra.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 - PUSHBUTTON "&Tulajdonságok...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 -END - -IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardver" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Hardver varázsló",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "A Hardver varázsló segíti Önt hardvereszközei telepítésénél, eltávolításánál, kijavításánál, leválasztásánál, kiadásánál, beállításánál.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - PUSHBUTTON "&Hardver varázsló...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14 - - GROUPBOX "Eszközkezelõ",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2 - ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Az Eszközkezelõ felsorolja az összes hardverelemet, amelyek telepítve vannak az Ön számítógépén. Az Eszközkezelõben bármelyik eszköz beállításait megváltoztathatja.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - - PUSHBUTTON "&Eszközkezelõ...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 - - GROUPBOX "Hardver profilok",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "A hardver profilok használatával eltérõ hardver környezetet hozhat létre, és menthet el.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "Hard&ver profilok...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 -END - -IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Felhasználói profilok" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "A felhasználói profilok tárolják személyes adatait, és az asztala beállításait. Minden számítógépen létrehozhat különbözõ profilokat, vagy kiválaszthat egy vándor profilt, amely mindegyik gépen egyforma beállításokat fog eredményezni, ahol csak használja.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) - LTEXT "A számítógépen tárolt profilok:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) - CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTEDGE - - PUSHBUTTON "Törlés",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Típus megváltoztatása...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Másolás...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE(20),60,LABELLINE(1)+2 -END - -IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speciális" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Teljesítmény",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "A teljesítmény-beállításokkal lehet megadni azt, hogy a programok hogyan használják a memóriát. Ez hatással van számítógépe sebességre.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Teljesítmény-beállítások...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 - GROUPBOX "Környezeti változók",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "A környezeti változókkal tudja a számítógépén futó alkalmazásoknak megadni, hogy hol keressenek bizonyos információkat.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Környezeti változók...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(12)+2,(18*PROPSHEETPADDING),14 - GROUPBOX "&Indítás és helyreállítás",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Az indítási és helyreállítási beállításokkal adhatja meg operációs rendszerének, hogy hogyan induljon el, és hogy mit tegyen, ha egy hiba miatt leáll számítógépe.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Indítás és helyreállítás...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(19)+2,(18*PROPSHEETPADDING),14 -END - -IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Környezeti változók" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Felhasználói változók",-1,7,12,238,100 - LTEXT "&Változók:",-1,14,24,224,8 - CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "&Új...",IDC_USER_VARIABLE_NEW,80,90,50,14 - PUSHBUTTON "&Szerkesztés...",IDC_USER_VARIABLE_EDIT,134,90,50,14 - PUSHBUTTON "&Törlés",IDC_USER_VARIABLE_DELETE,188,90,50,14 - - GROUPBOX "Rendszerváltozók",-1,7,116,238,100 - LTEXT "Vá&ltozók:",-1,14,128,224,8 - CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "Ú&j...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 - PUSHBUTTON "S&zerkesztés...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 - PUSHBUTTON "Tö&rlés",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 - - DEFPUSHBUTTON "Rendben",IDOK,141,224,50,14,WS_GROUP - PUSHBUTTON "Mégsem",IDCANCEL,195,224,50,14 -END - - -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Változó szerkesztése" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Változó &neve:",-1,7,14,50,8 - EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL - LTEXT "Vál&tozó értéke:",-1,7,32,50,8 - EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL - - DEFPUSHBUTTON "Rendben",IDOK,116,50,50,14,WS_GROUP - PUSHBUTTON "Mégsem",IDCANCEL,170,50,50,14 -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Rendszer" - IDS_CPLSYSTEMDESCRIPTION "A számítógéppel kapcsolatos információk megjelenítése, különbözõ rendszer és hardver beállítások módosítása." -END +// Hungarian resource file by Peter Lukacs +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Általános" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Operációs rendszer",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Verzió " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Számítógép",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHEETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hálózati azonosítás" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "A ReactOS a következõ információkat fogja használni gépe azonosításához a hálózaton.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Teljes számítógép név:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABELLINE(4)-4 + LTEXT "(Alapértelmezett)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABELLINE(4)-5 + LTEXT "Munkacsoport:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSHEETPADDING,LABELLINE(6)-6 + LTEXT "(üres)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60,LABELLINE(6)-6 + LTEXT "Ha a Hálózati azonosítás varázsló használatával akar csatlakozni egy tartományhoz és kíván létrehozni egy helyi felhasználói fiókot, akkor kattintson a Hálózati azonosítás gombra.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Hálózati azonosítás...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 + LTEXT "A számítógépe átnevezéséhez, vagy annak tartományba léptetéséhez kattintson a Tulajdonságok gombra.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Tulajdonságok...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardver" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Hardver varázsló",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "A Hardver varázsló segíti Önt hardvereszközei telepítésénél, eltávolításánál, kijavításánál, leválasztásánál, kiadásánál, beállításánál.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Hardver varázsló...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Eszközkezelõ",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Az Eszközkezelõ felsorolja az összes hardverelemet, amelyek telepítve vannak az Ön számítógépén. Az Eszközkezelõben bármelyik eszköz beállításait megváltoztathatja.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Eszközkezelõ...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Hardver profilok",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "A hardver profilok használatával eltérõ hardver környezetet hozhat létre, és menthet el.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Hard&ver profilok...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Felhasználói profilok" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "A felhasználói profilok tárolják személyes adatait, és az asztala beállításait. Minden számítógépen létrehozhat különbözõ profilokat, vagy kiválaszthat egy vándor profilt, amely mindegyik gépen egyforma beállításokat fog eredményezni, ahol csak használja.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "A számítógépen tárolt profilok:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTEDGE + + PUSHBUTTON "Törlés",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Típus megváltoztatása...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Másolás...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE(20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Speciális" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Teljesítmény",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "A teljesítmény-beállításokkal lehet megadni azt, hogy a programok hogyan használják a memóriát. Ez hatással van számítógépe sebességre.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Teljesítmény-beállítások...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Környezeti változók",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "A környezeti változókkal tudja a számítógépén futó alkalmazásoknak megadni, hogy hol keressenek bizonyos információkat.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Környezeti változók...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(12)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&Indítás és helyreállítás",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Az indítási és helyreállítási beállításokkal adhatja meg operációs rendszerének, hogy hogyan induljon el, és hogy mit tegyen, ha egy hiba miatt leáll számítógépe.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Indítás és helyreállítás...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Környezeti változók" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Felhasználói változók",-1,7,12,238,100 + LTEXT "&Változók:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Új...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Szerkesztés...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Törlés",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Rendszerváltozók",-1,7,116,238,100 + LTEXT "Vá&ltozók:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "Ú&j...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "S&zerkesztés...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "Tö&rlés",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "Rendben",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Mégsem",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Változó szerkesztése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Változó &neve:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "Vál&tozó értéke:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "Rendben",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Mégsem",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Rendszer" + IDS_CPLSYSTEMDESCRIPTION "A számítógéppel kapcsolatos információk megjelenítése, különbözõ rendszer és hardver beállítások módosítása." +END Propchange: trunk/reactos/dll/cpl/sysdm/hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Mon Jul 10 18:11:12 2006 @@ -1,39 +1,39 @@ -#include <windows.h> -#include <commctrl.h> -#include <stdlib.h> -#include <tchar.h> - -#include "resource.h" -#include "sysdm.h" - - -/* Environment dialog procedure */ -INT_PTR CALLBACK -VirtMemDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) - { - case WM_INITDIALOG: - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDCANCEL: - EndDialog(hwndDlg, 0); - return TRUE; - } - break; - - case WM_NOTIFY: - break; - } - - return FALSE; -} - -/* EOF */ +#include <windows.h> +#include <commctrl.h> +#include <stdlib.h> +#include <tchar.h> + +#include "resource.h" +#include "sysdm.h" + + +/* Environment dialog procedure */ +INT_PTR CALLBACK +VirtMemDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDCANCEL: + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + + case WM_NOTIFY: + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/sysdm/virtmem.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 22996: * fix a few msvc compilation errors (MS powercfg.h does not use include guards)
by janderwald＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: janderwald Date: Mon Jul 10 17:47:11 2006 New Revision: 22996 URL: http://svn.reactos.org/svn/reactos?rev=22996&view=rev Log: * fix a few msvc compilation errors (MS powercfg.h does not use include guards) Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/hibernate.c trunk/reactos/dll/cpl/powercfg/powercfg.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c Mon Jul 10 17:47:11 2006 @@ -9,6 +9,10 @@ * Martin Rottensteiner */ +//#ifndef NSTATUS +//typedef long NTSTATUS; +//#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include <windows.h> @@ -16,7 +20,6 @@ #include <cpl.h> #include "resource.h" #include "powercfg.h" -#include "powrprof.h" HWND hAdv=0; @@ -109,7 +112,7 @@ { SYSTEM_BATTERY_STATE sbs; - if (CallNtPowerInformation(SystemBatteryState,NULL, (ULONG)NULL, &sbs, sizeof(SYSTEM_BATTERY_STATE)) == STATUS_SUCCESS) + if (CallNtPowerInformation(SystemBatteryState,NULL, (ULONG)0, &sbs, sizeof(SYSTEM_BATTERY_STATE)) == STATUS_SUCCESS) { if (sbs.BatteryPresent) { @@ -119,7 +122,6 @@ } return TRUE; } - return FALSE; } return FALSE; Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Mon Jul 10 17:47:11 2006 @@ -18,7 +18,6 @@ #include "resource.h" #include "powercfg.h" -#include "powrprof.h" BOOLEAN Ala_InitData(HWND); Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c Mon Jul 10 17:47:11 2006 @@ -9,6 +9,10 @@ * Martin Rottensteiner */ +//#ifndef NSTATUS +//typedef long NTSTATUS; +//#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include <windows.h> @@ -19,7 +23,7 @@ #include "resource.h" #include "powercfg.h" -#include "powrprof.h" + void Hib_InitDialog(HWND); INT_PTR Hib_SaveData(HWND); Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Mon Jul 10 17:47:11 2006 @@ -15,7 +15,6 @@ #include "resource.h" #include "powercfg.h" -#include "powrprof.h" #define NUM_APPLETS (1)

1 0

[janderwald] 22995: * make resource files msvc compilable * fix size of text in various languages
by janderwald＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: janderwald Date: Mon Jul 10 17:30:17 2006 New Revision: 22995 URL: http://svn.reactos.org/svn/reactos?rev=22995&view=rev Log: * make resource files msvc compilable * fix size of text in various languages Modified: trunk/reactos/dll/cpl/access/De.rc trunk/reactos/dll/cpl/access/En.rc trunk/reactos/dll/cpl/access/Es.rc trunk/reactos/dll/cpl/access/Fr.rc trunk/reactos/dll/cpl/access/Hu.rc trunk/reactos/dll/cpl/access/Ja.rc trunk/reactos/dll/cpl/access/Nl.rc trunk/reactos/dll/cpl/access/Pl.rc trunk/reactos/dll/cpl/access/Ru.rc trunk/reactos/dll/cpl/access/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/access/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/De.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/En.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Es.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Fr.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Hu.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Ja.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Nl.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Pl.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Ru.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?…

1 0

[fireball] 22994: Add DPRINT1s for failures, and added UNIMPLEMENTED macro in the unimplemented export function
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Mon Jul 10 17:10:22 2006 New Revision: 22994 URL: http://svn.reactos.org/svn/reactos?rev=22994&view=rev Log: Add DPRINT1s for failures, and added UNIMPLEMENTED macro in the unimplemented export function Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Jul 10 17:10:22 2006 @@ -454,6 +454,7 @@ STDCALL IoInvalidateDeviceState(IN PDEVICE_OBJECT PhysicalDeviceObject) { + UNIMPLEMENTED; } /** @@ -496,7 +497,10 @@ DPRINT("IoOpenDeviceRegistryKey() called\n"); if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0) - return STATUS_INVALID_PARAMETER; + { + DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting... \n"); + return STATUS_INVALID_PARAMETER; + } /* * Calculate the length of the base key name. This is the full @@ -554,6 +558,7 @@ &DriverKeyLength); if (!NT_SUCCESS(Status)) { + DPRINT1("Call to IoGetDeviceProperty() failed with Status 0x%08lx\n", Status); ExFreePool(KeyNameBuffer); return Status; } @@ -614,7 +619,7 @@ STDCALL IoRequestDeviceEject(IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED; + UNIMPLEMENTED; }

1 0

[fireball] 22993: Thomas Weidenmueller: Fix GCC4 warnings
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Mon Jul 10 15:42:28 2006 New Revision: 22993 URL: http://svn.reactos.org/svn/reactos?rev=22993&view=rev Log: Thomas Weidenmueller: Fix GCC4 warnings Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h Mon Jul 10 15:42:28 2006 @@ -11,7 +11,7 @@ IopLockFileObject(IN PFILE_OBJECT FileObject) { /* Lock the FO and check for contention */ - if (InterlockedExchange(&FileObject->Busy, TRUE)) + if (InterlockedExchange((PLONG)&FileObject->Busy, TRUE)) { /* FIXME: Implement contention case */ KEBUGCHECK(0); @@ -23,7 +23,7 @@ IopUnlockFileObject(IN PFILE_OBJECT FileObject) { /* Unlock the FO and wake any waiters up */ - InterlockedExchange(&FileObject->Busy, FALSE); + InterlockedExchange((PLONG)&FileObject->Busy, FALSE); if (FileObject->Waiters) KeSetEvent(&FileObject->Lock, 0, FALSE); } Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c Mon Jul 10 15:42:28 2006 @@ -243,6 +243,8 @@ DriverNameString.Buffer = DriverObject->DriverName.Buffer; DriverNameLength = DriverObject->DriverName.Length; } + else + DriverNameString.Buffer = NULL; /* Check if there isn't a valid name*/ if (!DriverNameLength) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Mon Jul 10 15:42:28 2006 @@ -117,7 +117,7 @@ Vpb = OpenPacket->RelatedFileObject->Vpb; /* Reference it */ - InterlockedIncrement(&Vpb->ReferenceCount); + InterlockedIncrement((PLONG)&Vpb->ReferenceCount); } } else @@ -467,7 +467,7 @@ /* And re-associate with the actual one */ Vpb = FileObject->Vpb; - if (Vpb) InterlockedIncrement(&Vpb->ReferenceCount); + if (Vpb) InterlockedIncrement((PLONG)&Vpb->ReferenceCount); } /* Make sure we are not using a dummy */ Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Mon Jul 10 15:42:28 2006 @@ -1474,12 +1474,11 @@ IoIsOperationSynchronous(IN PIRP Irp) { /* Check the flags */ - if (((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) && - (!(Irp->Flags & IRP_PAGING_IO) && - !(Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO))) || - (Irp->Flags & IRP_SYNCHRONOUS_API) || - (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & - FO_SYNCHRONOUS_IO)) + if (!(Irp->Flags & (IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO)) && + ((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) || + (Irp->Flags & IRP_SYNCHRONOUS_API) || + (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & + FO_SYNCHRONOUS_IO))) { /* Synch API or Paging I/O is OK, as is Sync File I/O */ return TRUE; Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=229… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Mon Jul 10 15:42:28 2006 @@ -50,7 +50,7 @@ } /* Set the delete flag */ - InterlockedOr(&Process->Flags, 8); + InterlockedOr((PLONG)&Process->Flags, 8); /* Get the first thread */ while ((Thread = PsGetNextProcessThread(Process, Thread))) @@ -401,7 +401,7 @@ if (!(--CurrentProcess->ActiveThreads)) { /* Set the delete flag */ - InterlockedOr(&CurrentProcess->Flags, 8); + InterlockedOr((PLONG)&CurrentProcess->Flags, 8); /* Remember we are last */ Last = TRUE; @@ -586,7 +586,7 @@ CmNotifyRunDown(Thread); */ /* Clear NPX Thread */ - InterlockedCompareExchangePointer(&KeGetCurrentPrcb()->NpxThread, NULL, Thread); + (void)InterlockedCompareExchangePointer(&KeGetCurrentPrcb()->NpxThread, NULL, Thread); /* Rundown Mutexes */ KeRundownThread(); @@ -829,7 +829,7 @@ ASSERT_IRQL(PASSIVE_LEVEL); /* Mark it as terminated */ - InterlockedOr(&Thread->CrossThreadFlags, 1); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, 1); /* Directly terminate the thread */ PspExitThread(ExitStatus); @@ -849,7 +849,7 @@ Flags = Thread->CrossThreadFlags | 1; /* Set it, and check if it was already set while we were running */ - if (!(InterlockedExchange(&Thread->CrossThreadFlags, Flags) & 1)) + if (!(InterlockedExchange((PLONG)&Thread->CrossThreadFlags, Flags) & 1)) { /* Initialize a Kernel Mode APC to Kill the Thread */ KeInitializeApc(Apc, @@ -894,7 +894,7 @@ DPRINT1("PspExitProcess %p\n", Process); /* Set Process Delete flag */ - InterlockedOr(&Process->Flags, 4); + InterlockedOr((PLONG)&Process->Flags, 4); /* Check if we are the last thread */ if (LastThread) @@ -991,7 +991,7 @@ PsLockProcess(Process, FALSE); /* Set the exit flag */ - if (!KillByHandle) InterlockedOr(&Process->Flags, 8); + if (!KillByHandle) InterlockedOr((PLONG)&Process->Flags, 8); /* Get the first thread */ Status = STATUS_NOTHING_TO_TERMINATE; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Mon Jul 10 15:42:28 2006 @@ -428,7 +428,7 @@ Process->DebugPort = DebugObject; /* Check if the caller doesn't want the debug stuff inherited */ - if (Flags & PS_NO_DEBUG_INHERIT) InterlockedOr(&Process->Flags, 2); + if (Flags & PS_NO_DEBUG_INHERIT) InterlockedOr((PLONG)&Process->Flags, 2); } else { @@ -477,7 +477,7 @@ &DirectoryTableBase); /* We now have an address space */ - InterlockedOr(&Process->Flags, 0x40000); + InterlockedOr((PLONG)&Process->Flags, 0x40000); /* Set the maximum WS */ Process->Vm.MaximumWorkingSetSize = MaxWs; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Mon Jul 10 15:42:28 2006 @@ -283,7 +283,7 @@ { /* System Thread */ Thread->StartAddress = StartRoutine; - InterlockedOr(&Thread->CrossThreadFlags, 0x10); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, 0x10); /* Let the kernel intialize the Thread */ KeInitializeThread(&Process->Pcb,

1 0

[fireball] 22992: - Remove IopGetLowestDevice() call from IoRegisterDeviceInterface() (hpoussin approved this change) - Add a few DPRINTs to easier see failures of exported APIs
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Mon Jul 10 13:54:50 2006 New Revision: 22992 URL: http://svn.reactos.org/svn/reactos?rev=22992&view=rev Log: - Remove IopGetLowestDevice() call from IoRegisterDeviceInterface() (hpoussin approved this change) - Add a few DPRINTs to easier see failures of exported APIs Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Mon Jul 10 13:54:50 2006 @@ -542,13 +542,7 @@ VOID ); -PDEVICE_OBJECT -NTAPI -IopGetLowestDevice( - IN PDEVICE_OBJECT DeviceObject -); - -NTSTATUS +NTSTATUS INIT_FUNCTION IopInitPlugPlayEvents(VOID); Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Mon Jul 10 13:54:50 2006 @@ -634,8 +634,10 @@ ASSERT_IRQL(PASSIVE_LEVEL); + DPRINT("IoRegisterDeviceInterface(): PDO %p, RefString: %p, SLName: %p\n", + PhysicalDeviceObject, ReferenceString, SymbolicLinkName); + /* Parameters must pass three border of checks */ - PhysicalDeviceObject = IopGetLowestDevice(PhysicalDeviceObject); DeviceObjectExtension = (PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension; /* 1st level: Presence of a Device Node */ @@ -977,7 +979,10 @@ StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); if (!StartPosition ||!EndPosition || StartPosition > EndPosition) + { + DPRINT("IoSetDeviceInterfaceState() returning STATUS_INVALID_PARAMETER_1\n"); return STATUS_INVALID_PARAMETER_1; + } GuidString.Buffer = StartPosition; GuidString.MaximumLength = GuidString.Length = (ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition; @@ -997,6 +1002,7 @@ &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { + DPRINT("IoGetDeviceObjectPointer() failed with status 0x%08lx\n", Status); ExFreePool(ObjectName.Buffer); return Status; }

1 0

[fireball] 22991: Sync with Wine: Update EDIT_EM_SetMargins in EDIT control.
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Mon Jul 10 12:56:02 2006 New Revision: 22991 URL: http://svn.reactos.org/svn/reactos?rev=22991&view=rev Log: Sync with Wine: Update EDIT_EM_SetMargins in EDIT control. Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Mon Jul 10 12:56:02 2006 @@ -18,7 +18,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTES * @@ -239,7 +239,7 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc); #endif static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); -static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, INT left, INT right, BOOL repaint); +static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs); @@ -802,7 +802,7 @@ /* The following EM_xxx are new to win95 and don't exist for 16 bit */ case EM_SETMARGINS: - EDIT_EM_SetMargins(es, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam), TRUE); + EDIT_EM_SetMargins(es, (INT)wParam, LOWORD(lParam), HIWORD(lParam), TRUE); break; case EM_GETMARGINS: @@ -3715,9 +3715,24 @@ * of the char's width as the margin, but this is not how Windows handles this. * For all other fonts Windows sets the margins to zero. * - */ + * FIXME - When EC_USEFONTINFO is used the margins only change if the + * edit control is equal to or larger than a certain size. + * Interestingly if one subtracts both the left and right margins from + * this size one always seems to get an even number. The extents of + * the (four character) string "'**'" match this quite closely, so + * we'll use this until we come up with a better idea. + */ +static int calc_min_set_margin_size(HDC dc, INT left, INT right) +{ + WCHAR magic_string[] = {'\'','*','*','\'', 0}; + SIZE sz; + + GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz); + return sz.cx + left + right; +} + static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, - INT left, INT right, BOOL repaint) + WORD left, WORD right, BOOL repaint) { TEXTMETRICW tm; INT default_left_margin = 0; /* in pixels */ @@ -3730,9 +3745,17 @@ GetTextMetricsW(dc, &tm); /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { + int min_size; + RECT rc; /* This must be calculated more exactly! But how? */ - default_left_margin = tm.tmAveCharWidth / 3; - default_right_margin = tm.tmAveCharWidth / 3; + default_left_margin = tm.tmAveCharWidth / 2; + default_right_margin = tm.tmAveCharWidth / 2; + min_size = calc_min_set_margin_size(dc, default_left_margin, default_right_margin); + GetClientRect(es->hwndSelf, &rc); + if(rc.right - rc.left < min_size) { + default_left_margin = es->left_margin; + default_right_margin = es->right_margin; + } } SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Mon Jul 10 12:56:02 2006 @@ -117,7 +117,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced at 20060621 reactos/dll/win32/user32/controls/combo.c # Synced at 20060617 - reactos/dll/win32/user32/controls/edit.c # Synced at 20060623 + reactos/dll/win32/user32/controls/edit.c # Synced at 20060710 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 reactos/dll/win32/user32/controls/scrollbar.c # Forked

1 0

[fireball] 22990: Dmitry Philippov: Fix a bug with firstly overwriting the value, and then trying to use variable for comparation (should be vice-versa: firstly compared what was passed, then overwrite with a new value)
by fireball＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: fireball Date: Mon Jul 10 12:33:02 2006 New Revision: 22990 URL: http://svn.reactos.org/svn/reactos?rev=22990&view=rev Log: Dmitry Philippov: Fix a bug with firstly overwriting the value, and then trying to use variable for comparation (should be vice-versa: firstly compared what was passed, then overwrite with a new value) Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/comm.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/comm.c Mon Jul 10 12:33:02 2006 @@ -971,7 +971,6 @@ lpCC->wReserved = 0; lpCC->dwProviderSubType = lpComPort->dwProvSubType; lpCC->dwProviderSize = lpComPort->dwProvSpec2; - *lpdwSize = lpCC->dwSize+lpCC->dwProviderSize; if( 0 == lpComPort->dwProvSpec2 ) { lpCC->dwProviderOffset = 0; } else { @@ -985,6 +984,7 @@ RtlCopyMemory(lpCC->wcProviderData, lpComPort->wcProvChar, lpCC->dwProviderSize); ReturnValue = GetCommState(hCommDev, &lpCC->dcb); } + *lpdwSize = lpCC->dwSize+lpCC->dwProviderSize; } }

1 0

[jimtabor] 22989: - User32 menu - Fixed and modified MenuDrawBitmapItem, MenuGetBitmapItemSize and MenuCalcItemSize. Based on Wine ports. - Fixed menu bar drawing and maintained most callback changes (for Miranda). Implemented flat menu support. Some other misc changes. Owner drawing is still broken (Free pascal project Lazarus). Run user32_crosstest from Wine, still more rewriting is needed.
by jimtabor＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: jimtabor Date: Mon Jul 10 09:52:41 2006 New Revision: 22989 URL: http://svn.reactos.org/svn/reactos?rev=22989&view=rev Log: - User32 menu - Fixed and modified MenuDrawBitmapItem, MenuGetBitmapItemSize and MenuCalcItemSize. Based on Wine ports. - Fixed menu bar drawing and maintained most callback changes (for Miranda). Implemented flat menu support. Some other misc changes. Owner drawing is still broken (Free pascal project Lazarus). Run user32_crosstest from Wine, still more rewriting is needed. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Mon Jul 10 09:52:41 2006 @@ -331,22 +331,38 @@ * Get the size of a bitmap item. */ static void FASTCALL -MenuGetBitmapItemSize(UINT Id, DWORD Data, SIZE *Size) +MenuGetBitmapItemSize(PROSMENUITEMINFO lpitem, SIZE *Size, HWND WndOwner) { BITMAP Bm; - HBITMAP Bmp = (HBITMAP) Id; + HBITMAP Bmp = lpitem->hbmpItem; Size->cx = Size->cy = 0; /* check if there is a magic menu item associated with this item */ - if (0 != Id && IS_MAGIC_ITEM(Id)) - { - switch((INT_PTR) LOWORD(Id)) - { + if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) + { + switch((INT_PTR) Bmp) + { + case (INT_PTR)HBMMENU_CALLBACK: + { + MEASUREITEMSTRUCT measItem; + measItem.CtlType = ODT_MENU; + measItem.CtlID = 0; + measItem.itemID = lpitem->wID; + measItem.itemWidth = lpitem->Rect.right - lpitem->Rect.left; + measItem.itemHeight = lpitem->Rect.bottom - lpitem->Rect.top; + measItem.itemData = lpitem->dwItemData; + SendMessageW( WndOwner, WM_MEASUREITEM, lpitem->wID, (LPARAM)&measItem); + Size->cx = measItem.itemWidth; + Size->cy = measItem.itemHeight; + return; + } + break; + case (INT_PTR) HBMMENU_SYSTEM: - if (0 != Data) + if (0 != lpitem->dwItemData) { - Bmp = (HBITMAP) Data; + Bmp = (HBITMAP) lpitem->dwItemData; break; } /* fall through */ @@ -359,7 +375,6 @@ Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; return; - case (INT_PTR) HBMMENU_CALLBACK: case (INT_PTR) HBMMENU_POPUP_CLOSE: case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: @@ -383,25 +398,28 @@ * Draw a bitmap item. */ static void FASTCALL -MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect, BOOL MenuBar) +MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect, + HMENU hmenu, HWND WndOwner, UINT odaction, BOOL MenuBar) { BITMAP Bm; DWORD Rop; HDC DcMem; - HBITMAP Bmp = (HBITMAP) Item->hbmpItem; + HBITMAP Bmp; int w = Rect->right - Rect->left; int h = Rect->bottom - Rect->top; int BmpXoffset = 0; int Left, Top; + HBITMAP hbmpToDraw = (HBITMAP) Item->hbmpItem; + Bmp = hbmpToDraw; /* Check if there is a magic menu item associated with this item */ - if (IS_MAGIC_ITEM(Item->hbmpItem)) + if (IS_MAGIC_ITEM(hbmpToDraw)) { UINT Flags = 0; RECT r; r = *Rect; - switch ((int) Item->hbmpItem) + switch ((INT_PTR)hbmpToDraw) { case (INT_PTR) HBMMENU_SYSTEM: if (NULL != Item->hbmpItem) @@ -442,6 +460,31 @@ Flags = DFCS_CAPTIONCLOSE | DFCS_INACTIVE; break; case (INT_PTR) HBMMENU_CALLBACK: + { + DRAWITEMSTRUCT drawItem; + POINT origorg; + drawItem.CtlType = ODT_MENU; + drawItem.CtlID = 0; + drawItem.itemID = Item->wID; + drawItem.itemAction = odaction; + drawItem.itemState = (Item->fState & MF_CHECKED)?ODS_CHECKED:0; + drawItem.itemState |= (Item->fState & MF_DEFAULT)?ODS_DEFAULT:0; + drawItem.itemState |= (Item->fState & MF_DISABLED)?ODS_DISABLED:0; + drawItem.itemState |= (Item->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0; + drawItem.itemState |= (Item->fState & MF_HILITE)?ODS_SELECTED:0; + drawItem.hwndItem = (HWND)hmenu; + drawItem.hDC = Dc; + drawItem.rcItem = *Rect; + drawItem.itemData = Item->dwItemData; + /* some applications make this assumption on the DC's origin */ + SetViewportOrgEx( Dc, Item->Rect.left, Item->Rect.top, &origorg); + OffsetRect( &drawItem.rcItem, - Item->Rect.left, - Item->Rect.top); + SendMessageW( WndOwner, WM_DRAWITEM, 0, (LPARAM)&drawItem); + SetViewportOrgEx( Dc, origorg.x, origorg.y, NULL); + return; + } + break; + case (INT_PTR) HBMMENU_POPUP_CLOSE: case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: @@ -491,7 +534,9 @@ { RECT Rect; PWCHAR Text; - + BOOL flat_menu = FALSE; + int bkgnd; + if (0 != (Item->fType & MF_SYSMENU)) { if (! IsIconic(Wnd)) @@ -504,11 +549,14 @@ return; } + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + bkgnd = (MenuBar && flat_menu) ? COLOR_MENUBAR : COLOR_MENU; + /* Setup colors */ if (0 != (Item->fState & MF_HILITE)) { - if (MenuBar) + if (MenuBar && !flat_menu) { SetTextColor(Dc, GetSysColor(COLOR_MENUTEXT)); SetBkColor(Dc, GetSysColor(COLOR_MENU)); @@ -536,7 +584,7 @@ { SetTextColor(Dc, GetSysColor(COLOR_MENUTEXT)); } - SetBkColor(Dc, GetSysColor(COLOR_MENU)); + SetBkColor(Dc, GetSysColor(bkgnd)); } if (0 != (Item->fType & MF_OWNERDRAW)) @@ -579,7 +627,21 @@ dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right, dis.rcItem.bottom); SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis); - /* Fall through to draw popup-menu arrow */ + /* Draw the popup-menu arrow */ + if (0 != (Item->fType & MF_POPUP)) + { + HDC DcMem = CreateCompatibleDC(Dc); + HBITMAP OrigBitmap; + + OrigBitmap = SelectObject(DcMem, StdMnArrow); + BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, + ((Rect.top + Rect.bottom) - ArrowBitmapHeight) / 2, + ArrowBitmapWidth, ArrowBitmapHeight, + DcMem, 0, 0, SRCCOPY); + SelectObject(DcMem, OrigBitmap); + DeleteDC(DcMem); + } + return; } DPRINT("rect={%ld,%ld,%ld,%ld}\n", Item->Rect.left, Item->Rect.top, @@ -596,18 +658,28 @@ { if (Item->fState & MF_HILITE) { - if (MenuBar) - { - DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); + if (flat_menu) + { + InflateRect (&Rect, -1, -1); + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT)); + InflateRect (&Rect, 1, 1); + FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); } else { - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + if (MenuBar) + { + DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); + } + else + { + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + } } } else { - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENU)); + FillRect(Dc, &Rect, GetSysColorBrush(bkgnd)); } } @@ -618,21 +690,38 @@ /* vertical separator */ if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK)) { + HPEN oldPen; RECT rc = Rect; rc.top = 3; rc.bottom = Height - 3; - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.left, rc.bottom ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); } /* horizontal separator */ if (0 != (Item->fType & MF_SEPARATOR)) { + HPEN oldPen; RECT rc = Rect; rc.left++; rc.right--; rc.top += SEPARATOR_HEIGHT / 2; - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); - + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.right, rc.top ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); return; } } @@ -646,7 +735,7 @@ #endif if (! MenuBar) - { + { INT y = Rect.top + Rect.bottom; UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); @@ -685,34 +774,7 @@ } if (Item->hbmpItem) { - if (Item->hbmpItem == HBMMENU_CALLBACK) - { - DRAWITEMSTRUCT drawItem; - POINT origorg; - drawItem.CtlType = ODT_MENU; - drawItem.CtlID = 0; - drawItem.itemID = Item->wID; - drawItem.itemAction = Action; - drawItem.itemState = (Item->fState & MF_CHECKED)?ODS_CHECKED:0; - drawItem.itemState |= (Item->fState & MF_DEFAULT)?ODS_DEFAULT:0; - drawItem.itemState |= (Item->fState & MF_DISABLED)?ODS_DISABLED:0; - drawItem.itemState |= (Item->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0; - drawItem.itemState |= (Item->fState & MF_HILITE)?ODS_SELECTED:0; - drawItem.hwndItem = (HWND) MenuInfo->Self; - drawItem.hDC = Dc; - drawItem.rcItem = Item->Rect; - drawItem.itemData = Item->dwItemData; - /* some applications make this assumption on the DC's origin */ - SetViewportOrgEx( Dc, Item->Rect.left, Item->Rect.top, &origorg); - OffsetRect( &drawItem.rcItem, - Item->Rect.left, - Item->Rect.top); - SendMessageW( WndOwner, WM_DRAWITEM, 0, (LPARAM)&drawItem); - SetViewportOrgEx( Dc, origorg.x, origorg.y, NULL); - } - else - { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuBar); - return; - } + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); } } @@ -731,22 +793,24 @@ DeleteDC(DcMem); } - Rect.left += CheckBitmapWidth; - Rect.right -= ArrowBitmapWidth; - } - else if( Item->hbmpItem && !(Item->fType & MF_OWNERDRAW)) - { /* Draw the bitmap */ - MenuDrawBitmapItem(Dc, Item, &Rect, MenuBar); - } + Rect.left += CheckBitmapWidth; + Rect.right -= ArrowBitmapWidth; + } + else + /* Draw the item text or bitmap */ + if (Item->hbmpItem && !(Item->fType & MF_OWNERDRAW)) //IS_BITMAP_ITEM(Item->fType)) + { + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + } /* Done for owner-drawn */ if (0 != (Item->fType & MF_OWNERDRAW)) { return; } - - /* process text if present */ - if (!(Item->fType & MF_SYSMENU) && Item->dwTypeData) + + /* No bitmap - process text if present */ + else if ( !(Item->fType & MF_SYSMENU) && IS_STRING_ITEM(Item->fType)) { register int i; HFONT FontOld = NULL; @@ -769,7 +833,6 @@ Rect.left += MenuInfo->maxBmpSize.cx; Rect.right -= MenuInfo->maxBmpSize.cx; } - Text = (PWCHAR) Item->dwTypeData; for (i = 0; L'\0' != Text[i]; i++) { @@ -790,6 +853,7 @@ } SetTextColor(Dc, RGB(0x80, 0x80, 0x80)); } + DrawTextW(Dc, Text, i, &Rect, uFormat); /* paint the shortcut text */ @@ -853,7 +917,13 @@ PrevPen = SelectObject(Dc, GetStockObject(NULL_PEN)); if (NULL != PrevPen) { - DrawEdge(Dc, &Rect, EDGE_RAISED, BF_RECT); + BOOL flat_menu = FALSE; + + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + if (flat_menu) + FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_BTNSHADOW)); + else + DrawEdge(Dc, &Rect, EDGE_RAISED, BF_RECT); /* draw menu items */ @@ -890,7 +960,7 @@ case WM_CREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam; - SetWindowLongW(Wnd, 0, (LONG) cs->lpCreateParams); + SetWindowLongPtrW(Wnd, 0, (LONG) cs->lpCreateParams); return 0; } @@ -901,7 +971,7 @@ { PAINTSTRUCT ps; BeginPaint(Wnd, &ps); - MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongW(Wnd, 0)); + MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongPtrW(Wnd, 0)); EndPaint(Wnd, &ps); return 0; } @@ -920,23 +990,23 @@ case WM_SHOWWINDOW: if (0 != wParam) { - if (0 == GetWindowLongW(Wnd, 0)) + if (0 == GetWindowLongPtrW(Wnd, 0)) { OutputDebugStringA("no menu to display\n"); } } else { - SetWindowLongW(Wnd, 0, 0); + SetWindowLongPtrW(Wnd, 0, 0); } break; case MM_SETMENUHANDLE: - SetWindowLongW(Wnd, 0, wParam); + SetWindowLongPtrW(Wnd, 0, wParam); break; case MM_GETMENUHANDLE: - return GetWindowLongW(Wnd, 0); + return GetWindowLongPtrW(Wnd, 0); default: return DefWindowProcW(Wnd, Message, wParam, lParam); @@ -1159,11 +1229,14 @@ mis.CtlID = 0; mis.itemID = ItemInfo->wID; mis.itemData = (DWORD)ItemInfo->dwItemData; - mis.itemHeight = 0; + mis.itemHeight = HIWORD( GetDialogBaseUnits()); mis.itemWidth = 0; SendMessageW(WndOwner, WM_MEASUREITEM, 0, (LPARAM) &mis); - ItemInfo->Rect.right += mis.itemWidth; - + /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average + * width of a menufont character to the width of an owner-drawn menu. + */ + ItemInfo->Rect.right += mis.itemWidth + 2 * + GdiGetCharDimensions( Dc, NULL, NULL ); if (MenuBar) { ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE; @@ -1193,57 +1266,47 @@ return; } - if (! MenuBar) - { - if (ItemInfo->hbmpItem) + if (ItemInfo->hbmpItem) //IS_BITMAP_ITEM(ItemInfo->fType)) + { + SIZE Size; + + if (!MenuBar) { - if (ItemInfo->hbmpItem == HBMMENU_CALLBACK) - { - MEASUREITEMSTRUCT measItem; - measItem.CtlType = ODT_MENU; - measItem.CtlID = 0; - measItem.itemID = ItemInfo->wID; - measItem.itemWidth = ItemInfo->Rect.right - ItemInfo->Rect.left; - measItem.itemHeight = ItemInfo->Rect.bottom - ItemInfo->Rect.top; - measItem.itemData = ItemInfo->dwItemData; - SendMessageW( WndOwner, WM_MEASUREITEM, ItemInfo->wID, (LPARAM)&measItem); - ItemInfo->Rect.right = ItemInfo->Rect.left + measItem.itemWidth; - if (MenuInfo->maxBmpSize.cx < abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE || - MenuInfo->maxBmpSize.cy < abs(measItem.itemHeight)) - { - MenuInfo->maxBmpSize.cx = abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE; - MenuInfo->maxBmpSize.cy = abs(measItem.itemHeight); - MenuSetRosMenuInfo(MenuInfo); - } - } - else - { - SIZE Size; - - MenuGetBitmapItemSize((int) ItemInfo->hbmpItem, (DWORD) ItemInfo->hbmpItem, &Size); - ItemInfo->Rect.right += Size.cx; - ItemInfo->Rect.bottom += Size.cy; - - /* Leave space for the sunken border */ - ItemInfo->Rect.right += 2; - ItemInfo->Rect.bottom += 2; - - /* Special case: Minimize button doesn't have a space behind it. */ - if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE || - ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D) - ItemInfo->Rect.right -= 1; - } - ItemInfo->Rect.right += 2 * CheckBitmapWidth; + MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner ); + /* Keep the size of the bitmap in callback mode to be able + * to draw it correctly */ + ItemInfo->Rect.right = ItemInfo->Rect.left + Size.cx; + if (MenuInfo->maxBmpSize.cx < abs(Size.cx) + MENU_ITEM_HBMP_SPACE || + MenuInfo->maxBmpSize.cy < abs(Size.cy)) + { + MenuInfo->maxBmpSize.cx = abs(Size.cx) + MENU_ITEM_HBMP_SPACE; + MenuInfo->maxBmpSize.cy = abs(Size.cy); + } + MenuSetRosMenuInfo(MenuInfo); + + ItemInfo->Rect.right += 2 * CheckBitmapWidth; + if (0 != (ItemInfo->fType & MF_POPUP)) + { + ItemInfo->Rect.right += ArrowBitmapWidth; + } + } else { - ItemInfo->Rect.right += 2 * CheckBitmapWidth; - if (0 != (ItemInfo->fType & MF_POPUP)) - { - ItemInfo->Rect.right += ArrowBitmapWidth; - } + MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner ); + ItemInfo->Rect.right += Size.cx; + ItemInfo->Rect.bottom += Size.cy; + + /* Leave space for the sunken border */ + ItemInfo->Rect.right += 2; + ItemInfo->Rect.bottom += 2; + + /* Special case: Minimize button doesn't have a space behind it. */ + if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE || + ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D) + ItemInfo->Rect.right -= 1; } - } + } /* it must be a text item - unless it's the system menu */ if (0 == (ItemInfo->fType & MF_SYSMENU) && IS_STRING_ITEM(ItemInfo->fType)) @@ -1548,7 +1611,10 @@ ROSMENUITEMINFO ItemInfo; UINT i; HFONT FontOld = NULL; - + BOOL flat_menu = FALSE; + + SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); + if (NULL == Menu) { Menu = GetMenu(Wnd); @@ -1575,7 +1641,7 @@ Rect->bottom = Rect->top + MenuInfo.Height; - FillRect(DC, Rect, GetSysColorBrush(COLOR_MENU)); + FillRect(DC, Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); SelectObject(DC, GetSysColorPen(COLOR_3DFACE)); MoveToEx(DC, Rect->left, Rect->bottom, NULL); @@ -1759,7 +1825,7 @@ /* NOTE: In Windows, top menu popup is not owned. */ MenuInfo.Wnd = CreateWindowExW(0, POPUPMENU_CLASS_ATOMW, NULL, WS_POPUP, X, Y, Width, Height, - WndOwner, 0, (HINSTANCE) GetWindowLongW(WndOwner, GWL_HINSTANCE), + WndOwner, 0, (HINSTANCE) GetWindowLongPtrW(WndOwner, GWLP_HINSTANCE), (LPVOID) MenuInfo.Self); if (NULL == MenuInfo.Wnd || ! MenuSetRosMenuInfo(&MenuInfo)) { @@ -3458,7 +3524,7 @@ /* The return value is only used by TrackPopupMenu */ if (!(Flags & TPM_RETURNCMD)) return TRUE; if (ExecutedMenuId < 0) ExecutedMenuId = 0; - return ExecutedMenuId; + return ExecutedMenuId; } /*********************************************************************** @@ -4939,3 +5005,5 @@ return InsertMenuA(hMenu, cmd, flags, cmdInsert, lpszNewItem); }; } + +

1 0

[greatlrd] 22988: Implement SPI_GETFLATMENU and SPI_SETFLATMENU after jimtabor request not tested if it work
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 05:48:46 2006 New Revision: 22988 URL: http://svn.reactos.org/svn/reactos?rev=22988&view=rev Log: Implement SPI_GETFLATMENU and SPI_SETFLATMENU after jimtabor request not tested if it work Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Mon Jul 10 05:48:46 2006 @@ -32,7 +32,8 @@ UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; - + + BOOL FlatMenu; /* ScreenSaver */ BOOL ScreenSaverRunning; UINT ScreenSaverTimeOut; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jul 10 05:48:46 2006 @@ -998,6 +998,8 @@ case SPI_GETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETFLATMENU: + case SPI_SETFLATMENU: { PSYSTEM_CURSORINFO CurInfo; @@ -1013,6 +1015,12 @@ switch(uiAction) { + case SPI_GETFLATMENU: + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; + return TRUE; + case SPI_SETFLATMENU: + WinStaObject->FlatMenu = uiParam; + break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; @@ -1035,7 +1043,7 @@ CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? - break; + return TRUE; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */ @@ -1400,6 +1408,8 @@ case SPI_SETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETFLATMENU: + case SPI_SETFLATMENU: { BOOL Ret; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Jul 10 05:48:46 2006 @@ -490,6 +490,7 @@ */ WindowStationObject->ScreenSaverRunning = FALSE; WindowStationObject->ScreenSaverTimeOut = 30; + WindowStationObject->FlatMenu = FALSE; if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) { @@ -509,6 +510,8 @@ CurInfo->WheelScroLines = 3; CurInfo->WheelScroChars = 3; + + /* FIXME: Obtain the following information from the registry */ CurInfo->SwapButtons = FALSE;

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006