Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 23000: * make resources compilable with msvc
by janderwald＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: janderwald Date: Mon Jul 10 20:22:03 2006 New Revision: 23000 URL: http://svn.reactos.org/svn/reactos?rev=23000&view=rev Log: * make resources compilable with msvc Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc trunk/reactos/dll/cpl/sysdm/cz.rc trunk/reactos/dll/cpl/sysdm/de.rc trunk/reactos/dll/cpl/sysdm/dk.rc trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/es.rc trunk/reactos/dll/cpl/sysdm/fr.rc trunk/reactos/dll/cpl/sysdm/hu.rc trunk/reactos/dll/cpl/sysdm/nl.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/ru.rc trunk/reactos/dll/cpl/sysdm/sv.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/Ja.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/cz.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/dk.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/es.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/fr.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hu.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/nl.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… Modified: trunk/reactos/dll/cpl/sysdm/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sv.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev…

1 0

[mbosma] 22999: Make patch a bit smaller.
by mbosma＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: mbosma Date: Mon Jul 10 19:11:48 2006 New Revision: 22999 URL: http://svn.reactos.org/svn/reactos?rev=22999&view=rev Log: Make patch a bit smaller. Modified: branches/cache_manager_rewrite/headers.patch Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch (original) +++ branches/cache_manager_rewrite/headers.patch Mon Jul 10 19:11:48 2006 @@ -1,6 +1,6 @@ Index: drivers/filesystems/cdfs/cdfs.h =================================================================== ---- drivers/filesystems/cdfs/cdfs.h (revision 22905) +--- drivers/filesystems/cdfs/cdfs.h (revision 22988) +++ drivers/filesystems/cdfs/cdfs.h (working copy) @@ -6,7 +6,7 @@ #include <ntddcdrm.h> @@ -13,7 +13,7 @@ #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Index: drivers/filesystems/ntfs/ntfs.h =================================================================== ---- drivers/filesystems/ntfs/ntfs.h (revision 22905) +--- drivers/filesystems/ntfs/ntfs.h (revision 22988) +++ drivers/filesystems/ntfs/ntfs.h (working copy) @@ -6,7 +6,7 @@ #include <ntdddisk.h> @@ -26,7 +26,7 @@ #define CACHEPAGESIZE(pDeviceExt) \ Index: include/reactos/exeformat.h =================================================================== ---- include/reactos/exeformat.h (revision 22905) +--- include/reactos/exeformat.h (revision 22988) +++ include/reactos/exeformat.h (working copy) @@ -34,7 +34,8 @@ @@ -49,7 +49,7 @@ IN PEXEFMT_CB_READ_FILE ReadFileCb, Index: ntoskrnl/include/internal/cc.h =================================================================== ---- ntoskrnl/include/internal/cc.h (revision 22905) +--- ntoskrnl/include/internal/cc.h (revision 22988) +++ ntoskrnl/include/internal/cc.h (working copy) @@ -1,17 +1,29 @@ #ifndef __INCLUDE_INTERNAL_CC_H @@ -102,25 +102,9 @@ Index: ntoskrnl/include/internal/mm.h =================================================================== ---- ntoskrnl/include/internal/mm.h (revision 22905) +--- ntoskrnl/include/internal/mm.h (revision 22988) +++ ntoskrnl/include/internal/mm.h (working copy) -@@ -165,17 +165,20 @@ - - typedef struct _MM_SECTION_SEGMENT - { -- LONGLONG FileOffset; -- ULONG_PTR VirtualAddress; -- ULONG RawLength; -- ULONG Length; -+ LONGLONG FileOffset; /* start offset into the file for image sections */ -+ ULONG_PTR VirtualAddress; /* dtart offset into the address range for image sections */ -+ ULONG RawLength; /* length of the segment which is part of the mapped file */ -+ ULONG Length; /* absolute length of the segment */ - ULONG Protection; -- FAST_MUTEX Lock; -+ FAST_MUTEX Lock; /* lock which protects the page directory */ - ULONG ReferenceCount; - SECTION_PAGE_DIRECTORY PageDirectory; +@@ -176,6 +176,9 @@ ULONG Flags; ULONG Characteristics; BOOLEAN WriteCopy; @@ -169,18 +153,17 @@ - ULONG ViewOffset; - PMM_SECTION_SEGMENT Segment; - BOOLEAN WriteCopyView; -- LIST_ENTRY RegionListHead; + LIST_ENTRY RegionListHead; - } SectionData; - struct - { - LIST_ENTRY RegionListHead; -+ LIST_ENTRY RegionListHead; } VirtualMemoryData; } Data; } MEMORY_AREA, *PMEMORY_AREA; Index: ntoskrnl/ntoskrnl.def =================================================================== ---- ntoskrnl/ntoskrnl.def (revision 22905) +--- ntoskrnl/ntoskrnl.def (revision 22988) +++ ntoskrnl/ntoskrnl.def (working copy) @@ -5,9 +5,6 @@ ; ReactOS Operating System

1 0

[greatlrd] 22998: Fixing a small bug, value where never devliver from SPI and that did make screensaver start direcky and start mulitetimes.
by greatlrd＠svn.reactos.org 10 Jul '06

10 Jul '06

Author: greatlrd Date: Mon Jul 10 19:02:43 2006 New Revision: 22998 URL: http://svn.reactos.org/svn/reactos?rev=22998&view=rev Log: Fixing a small bug, value where never devliver from SPI and that did make screensaver start direcky and start mulitetimes. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Mon Jul 10 19:02:43 2006 @@ -217,8 +217,9 @@ { BOOL nPreviousState = FALSE; DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT1("Keyboard Timeout counter was %I64d\n",DiffTimeKeyboard.QuadPart); - DPRINT1("Mouse Timeout counter was %I64d\n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); CSR_API_MESSAGE Request; CsrInit(); 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 19:02:43 2006 @@ -1016,34 +1016,42 @@ switch(uiAction) { case SPI_GETFLATMENU: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; - return TRUE; + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; + return TRUE; + break; case SPI_SETFLATMENU: WinStaObject->FlatMenu = uiParam; - break; + return TRUE; + break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; + break; case SPI_SETSCREENSAVETIMEOUT: - WinStaObject->ScreenSaverTimeOut = uiParam; - return TRUE; + WinStaObject->ScreenSaverTimeOut = uiParam; + return TRUE; + break; case SPI_GETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - return TRUE; + return TRUE; + break; case SPI_SETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; WinStaObject->ScreenSaverRunning = uiParam; - return TRUE; + return TRUE; + break; case SPI_GETWHEELSCROLLLINES: CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines; /* FIXME add this value to scroll list as scroll value ?? */ return TRUE; + break; case SPI_GETWHEELSCROLLCHARS: CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? return TRUE; + break; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs