- Ros-dev - ReactOS.org

Same old Boot Stalling
by James Tabor 29 Jul '06

29 Jul '06

Real hardware, I think csrss is crashing. I think that was the problem the whole time, anyone have any ideas how to TS this problem? ReactOS 0.4-SVN (Build 20060710-r23002) Used memory 1015744Kb (ntoskrnl/cm/import.c:146) Adding new hive (ntoskrnl/cm/import.c:146) Adding new hive (0,8DBE08C8,36) (0,8DBE0658,36) (ntoskrnl/io/iomgr/driver.c:900) Driver 'buslogic.sys' load failed, status (c0000001) (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(81215748, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(81215748, 0) (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 81215748, Process 81005018) (ntoskrnl/ldr/loader.c:267) Could not open module file: \SystemRoot\system32\drivers\sndblst.sys (Status 0xc0000034) (ntoskrnl/ldr/loader.c:267) Could not open module file: \SystemRoot\system32\drivers\mpu401.sys (Status 0xc0000034) (ntoskrnl/ps/kill.c:963) NtTerminateProcess(ProcessHandle ffffffff, ExitStatus 0) (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(81272C68, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(81272C68, 0) (ntoskrnl/ps/kill.c:894) PspExitProcess 813204B0 (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 81272C68, Process 813204B0) (ntoskrnl/ps/kill.c:1068) NtTerminateThread: fffffffe 0 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(81017018, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(81017018, 0) (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 81017018, Process 81013300) (ntoskrnl/ps/kill.c:1068) NtTerminateThread: fffffffe 0 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(813BD100, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(813BD100, 0) (base/system/winlogon/winlogon.c:173) WL: Failed to create lsass notification event (base/system/winlogon/winlogon.c:563) WL: Failed to start LSASS (0xA1) (base/system/winlogon/winlogon.c:764) WL-Status: ReactOS is starting up... (ntoskrnl/ps/kill.c:1068) NtTerminateThread: 0 0 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(8182E798, 0) (ntoskrnl/ps/kill.c:341) PspExitThread(8182E798, 0) (ntoskrnl/ps/kill.c:275) PspDeleteThread(Thread 8182E798, Process 81810C98) (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (dll/win32/iphlpapi/ifenum_reactos.c:99) openTcpFile for <\Device\Tcp> failed: 0xc0000034 (./subsystems/win32/win32k/ntuser/input.c:219) Keyboard and Mouse TimeOut Starting Screen Saver ... (./subsystems/win32/win32k/ntuser/input.c:220) 18000000 Keyboard Timeout Value (./subsystems/win32/win32k/ntuser/input.c:221) 18000000 Mouse Timeout Value (./subsystems/win32/win32k/ntuser/input.c:222) 18000000 TimeOut (subsystems/win32/csrss/win32csr/conio.c:3356) CsrStartScreenSaver : FAIL J. (ntoskrnl/ps/kill.c:1068) NtTerminateThread: fffffffe 102 (ntoskrnl/ps/kill.c:815) PspTerminateThreadByPointer(813BD688, 102) (ntoskrnl/ps/kill.c:341) PspExitThread(813BD688, 102) (./subsystems/win32/win32k/ntuser/input.c:219) Keyboard and Mouse TimeOut Starting Screen Saver ... (./subsystems/win32/win32k/ntuser/input.c:220) 308400000 Keyboard Timeout Value (./subsystems/win32/win32k/ntuser/input.c:221) 308400000 Mouse Timeout Value (./subsystems/win32/win32k/ntuser/input.c:222) 308400000 TimeOut (subsystems/win32/csrss/win32csr/conio.c:3356) CsrStartScreenSaver : FAIL J.

3 8

desk.cpl appearance tab
by Timo Kreuzer 29 Jul '06

29 Jul '06

Hi, Some time ago, I thought about implementing the appearance tab of the desk.cpl, to allow some basic theming. This is what I've done so far: http://static.flickr.com/76/200954523_5f103460fd_o.png On win XP you can change and apply the colors correctly. Fonts / size is not yet implemented, nor loading of themes from the registry. But it doesn't work on ROS. On 0.3.0 RC1 the ColorPicker dialog doesn't work at all. On trunk you can at least change the color by editing the values. But they are not applied and either not saved to the registry (regedit always crashes) or not loaded from registry at startup. The color button on the background page doesn't work either. 1.) Is loading of syscolors from the registry already implemented? Is someone going to do it in the near future? 2.) How should storage of themes be done on ROS? Exactly the same way XP does it (Control Panel\Appearance\New Schemes\xx\...) or in a ROS specific way? On XP Scheme names are stored in themeui.dll, I think this is pretty complicated and is only needed for systems with users having different languages. Greetings, Timo

3 2

Quake and fun!
by James Tabor 26 Jul '06

26 Jul '06

I manage to get it to boot and play on the net with mozilla and play quake in demo mode and this bug check. Graphics mode was set to 32 bit 1024x7xx. (./subsystems/win32/win32k/ntuser/message.c:1107) Copy message to kernel from t8 (dll/win32/winmm/mci.c:900) Couldn't load driver for type L"CDAUDIO". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini NPOOL: Low-side redzone overwritten, Block 8124d6c0, Size 4, Tag 656e6f4e(enoN)b KeBugCheck at ntoskrnl/mm/npool.c:1514 (ntoskrnl/mm/mm.c:221) Page fault at high IRQL was 2, address c5b62 (ntoskrnl/mm/mm.c:221) Page fault at high IRQL was 2, address 5c39 Entered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fa) (Look here, read on) Memory at 0x00005C39 could not be written: Page not present. kdb:> bt Eip: <ntoskrnl.exe:71d92 (ntoskrnl/ke/i386/v86m_sup.S:122 (KiV86Complete))> Frames: <ntoskrnl.exe:6cabe (ntoskrnl/ke/i386/bios.c:70 (Ke386CallBios))> <videoprt.sys:2722 (drivers/video/videoprt/int10.c:181 (IntInt10CallBios))> <vbemp.sys:1ae5 (drivers/video/miniport/vbe/vbemp.c:773 (VBEResetDevice))> <vbemp.sys:1b2f (drivers/video/miniport/vbe/vbemp.c:543 (VBEResetHw))> <videoprt.sys:1f26 (drivers/video/videoprt/dispatch.c:49 (IntVideoPortResetDisp> <8053881c> <ntoskrnl.exe:1bd6 (ntoskrnl/ke/bug.c:311 (KeBugCheckWithTf))> <ntoskrnl.exe:1d50 (ntoskrnl/ke/bug.c:493 (KeBugCheckEx))> <ntoskrnl.exe:1d67 (ntoskrnl/ke/bug.c:514 (KeBugCheck))> <ntoskrnl.exe:46b25 (ntoskrnl/mm/npool.c:1514 (check_redzone_header))> <ntoskrnl.exe:46c24 (ntoskrnl/mm/npool.c:1579 (ExFreeNonPagedPool))> <ntoskrnl.exe:5742b (ntoskrnl/ob/oblife.c:151 (ObpDeleteObject))> <ntoskrnl.exe:12a45 (ntoskrnl/cm/registry.c:296 (CmiWorkerThread))> <ntoskrnl.exe:63cd1 (ntoskrnl/ps/thread.c:126 (PspSystemThreadStartup))> <ntoskrnl.exe:6cb45 (ntoskrnl/ke/i386/ctxswitch.S:82 (KiThreadStartup))> kdb:>

1 0

BSOD during setup
by Christian Wallukat 24 Jul '06

24 Jul '06

Hi NG, first I want to say that it is a great project which I want to join… I develop since 5 years in C++, but I have only used M$ Dev Studio … - Is there anything that can I do for the team ? - Are there documents which describe the coding guidelines ? BTW: I have checked out the trunk and build the boot CD. During the setup I got a BSOD for information check the attached screenshot… The BSOD comes after the setup has copied the last file … Kr Christian -- No virus found in this outgoing message. Checked by AVG Free Edition. Version: 7.1.394 / Virus Database: 268.10.3/395 - Release Date: 21.07.2006

3 4

Re: [ros-dev] Broken RtlMultiByteToUnicodeSize
by Michele Cicciotti [Khamsa S.A.] 24 Jul '06

24 Jul '06

Myria wrote: > I personally think ReactOS should support UTF-8 as a default code page, but I doubt that others agree. This function is one of the many that would have to change... > I should warn you: setting UTF-8 as the default codepage instantly breaks all multibyte-aware code. How so you might wonder? UTF-8 is "multibyte", only not "Windows multibyte": it doesn't have lead bytes/trail bytes. Any code that parses multibyte strings needs a special case for UTF-8 (try it yourself. Set a console's codepage to UTF-8 and try to run a batch file). You can do it for code you write, but for code that has already been written...

1 0

Re: [ros-dev] [ros-diffs] [fireball] 23265: ReactOS Status Report July 2006 . If no major issues will be found, it's going to be published today
by Murphy, Ged (Bolton) 24 Jul '06

24 Jul '06

I've been looking forward to this :) Would you like a native speaker to provide suggestions for text and grammar improvements? -----Original Message----- From: fireball(a)svn.reactos.org [mailto:fireball@svn.reactos.org] Sent: 24 July 2006 14:10 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [fireball] 23265: ReactOS Status Report July 2006. If no major issues will be found, it's going to be published today Author: fireball Date: Mon Jul 24 17:10:18 2006 New Revision: 23265 URL: http://svn.reactos.org/svn/reactos?rev=23265&view=rev Log: ReactOS Status Report July 2006. If no major issues will be found, it's going to be published today Added: trunk/press-media/Status Reports/July 2006/ trunk/press-media/Status Reports/July 2006/ReactOS status report.doc (with props) Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.doc URL: http://svn.reactos.org/svn/reactos/trunk/press-media/Status%20Reports/July%2 02006/ReactOS%20status%20report.doc?rev=23265&view=auto ============================================================================ == Binary file - no diff available. Propchange: trunk/press-media/Status Reports/July 2006/ReactOS status report.doc ---------------------------------------------------------------------------- -- svn:mime-type = application/octet-stream

1 0

Re: [ros-dev] 0.3.0 RC1 is out! (Need a wordcount)
by Wierd_w 24 Jul '06

24 Jul '06

10 pages is quite an order, but I will do my best. Can I get an approximate wordcount that you would be looking for? __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 2

Re: [ros-dev] 0.3.0 RC1 is out!
by Murphy, Ged (Bolton) 21 Jul '06

21 Jul '06

Brandon Turner wrote: > http://sourceforge.net/project/showfiles.php?group_id=6553&pac > kage_id=6629 > > I just released 0.3.0 RC1 to sourceforge. Enjoy. I'm going to bring this up again. It's been well over a month now since RC1 was released. What are we waiting for to get the final release out? IMO, we should get 0.3.0 out of the door and immediately branch for 0.3.1. More than enough work has been done to justify it. Ged.

5 7

Re: [ros-dev] 0.3.0 RC1 is out!
by Wierd_w 21 Jul '06

21 Jul '06

How long would you like the article to be? I have nothing better to do, since I finished my Catia class for this class cycle, and will be idleing until mid August. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Re: [ros-dev] [ros-diffs] [winesync] 23203: Autosyncing with Wine HEAD
by Murphy, Ged (Bolton) 21 Jul '06

21 Jul '06

I would prefer it if I could keep comctl32 up to date manually. I don't really trust the synching tool, I can see things it's done wrong with this merge already.... I'll try fixing it later tonight. -----Original Message----- From: winesync(a)svn.reactos.org [mailto:winesync@svn.reactos.org] Sent: 21 July 2006 12:30 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [winesync] 23203: Autosyncing with Wine HEAD Author: winesync Date: Fri Jul 21 15:30:20 2006 New Revision: 23203 URL: http://svn.reactos.org/svn/reactos?rev=23203&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (with props) Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cn.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/trackbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32 .rbuild?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Fri Jul 21 15:30:20 2006 @@ -4,18 +4,19 @@ <include base="comctl32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>winmm</library> + <library>uxtheme</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>uxtheme</library> - <library>winmm</library> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> @@ -37,8 +38,8 @@ <file>propsheet.c</file> <file>rebar.c</file> <file>smoothscroll.c</file> + <file>status.c</file> <file>string.c</file> - <file>status.c</file> <file>syslink.c</file> <file>tab.c</file> <file>theme_combo.c</file> Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32 _ros.diff?rev=23203&view=auto ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (added) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Fri Jul 21 15:30:20 2006 @@ -1,0 +1,26 @@ +Index: comctl32.rbuild +=================================================================== +--- comctl32.rbuild (revision 23123) ++++ comctl32.rbuild (working copy) +@@ -1,4 +1,5 @@ + <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> ++ <autoregister infsection="OleControlDlls" type="DllInstall" /> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/reactos/wine</include> +Index: listview.c +=================================================================== +--- listview.c (revision 23123) ++++ listview.c (working copy) +@@ -3770,9 +3770,8 @@ + if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) + { + TRACE("iImage=%d\n", lvItem.iImage); ++ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, ++ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); +- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, +- rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, +- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + } + + /* Don't bother painting item being edited */ Propchange: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff ---------------------------------------------------------------------------- -- svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_B g.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Bg.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Bg.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà íà " +CAPTION "Ñâîéñòâà íà %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_C n.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "ÊôÐÔ " +CAPTION "ÊôÐÔ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_C s.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Fri Jul 21 15:30:20 2006 @@ -26,7 +26,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Vlastnosti " +CAPTION "Vlastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_D e.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Fri Jul 21 15:30:20 2006 @@ -41,7 +41,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschaften für " +CAPTION "Eigenschaften für %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E n.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E o.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ecoj laý " +CAPTION "Ecoj laý %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E s.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " +CAPTION "Propiedades de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_F r.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Fri Jul 21 15:30:20 2006 @@ -24,7 +24,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriétés pour " +CAPTION "Propriétés pour %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_H u.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Tulajdonságok: " +CAPTION "Tulajdonságok: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_I t.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Proprietà per " +CAPTION "Proprietà per %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_J a.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_K o.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¼Ó¼º" +CAPTION "%s ¼Ó¼º" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -54,11 +54,11 @@ FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "´Ù½Ã(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "À§·Î ÀÌµ¿(&U)", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "¾Æ·¡·Î ÀÌµ¿(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10 + LTEXT "°¡´ÉÇÑ ¹öÆ°(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "´õÇÏ±â(&A) ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- Á¦°ÅÇÏ±â(&R)", IDC_REMOVE_BTN,131,62,44,14 @@ -81,3 +81,8 @@ { IDS_SEPARATOR "ºÐ¸®ÀÚ" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "¾øÀ½" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_N l.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschappen van " +CAPTION "Eigenschappen van %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_N o.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper for " +CAPTION "Egenskaper for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_P l.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "W³aœciwoœci " +CAPTION "W³aœciwoœci %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_P t.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para " +CAPTION "Propriedades para %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_R u.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà äëÿ " +CAPTION "Ñâîéñòâà äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_S i.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Lastnosti" +CAPTION "Lastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_S v.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Sv.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Sv.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper för " +CAPTION "Egenskaper för %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_T h.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ " +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_T r.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Tr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Tr.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Özellikler: " +CAPTION "Özellikler: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Tamam", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_U k.rc?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Âëàñòèâîñò³ äëÿ " +CAPTION "Âëàñòèâîñò³ äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listview .c?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Fri Jul 21 15:30:20 2006 @@ -3770,8 +3770,8 @@ if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { TRACE("iImage=%d\n", lvItem.iImage); - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } /* Don't bother painting item being edited */ @@ -5617,9 +5617,11 @@ { POINT Position; LVITEMW lvItem; - INT nColumn = lprc->top; + INT nColumn; if (!lprc) return FALSE; + + nColumn = lprc->top; TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ @@ -6274,7 +6276,13 @@ memcpy(&item, lpLVItem, offsetof( LVITEMW, iIndent )); } item.iItem = nItem; - if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) item.state &= ~LVIS_STATEIMAGEMASK; + if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + item.mask |= LVIF_STATE; + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* if we're sorted, sort the list, and update the index */ @@ -6592,6 +6600,7 @@ /* make space for the new column */ LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left); + LISTVIEW_UpdateItemSize(infoPtr); return nNewColumn; @@ -6871,7 +6880,15 @@ { HIMAGELIST himl = 0; if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + LVITEMW item; + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + LISTVIEW_SetItemState(infoPtr, -1, &item); + himl = LISTVIEW_CreateCheckBoxIL(infoPtr); + } LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); } Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshee t.c?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Fri Jul 21 15:30:20 2006 @@ -2151,8 +2151,7 @@ int lenprop = strlenW(psInfo->strPropertiesFor); dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR)); - strcpyW(dest, psInfo->strPropertiesFor); - strcatW(dest, lpszText); + wsprintfW(dest, psInfo->strPropertiesFor, lpszText); SetWindowTextW(hwndDlg, dest); Free(dest); Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackbar .c?rev=23203&r1=23202&r2=23203&view=diff ============================================================================ == --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Fri Jul 21 15:30:20 2006 @@ -237,7 +237,7 @@ return 0; } -static void inline +inline static void TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; @@ -249,7 +249,7 @@ } -static void inline +inline static void TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; @@ -260,7 +260,7 @@ notify_with_scroll (infoPtr, TB_PAGEUP); } -static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; infoPtr->lPos -= infoPtr->lLineSize; @@ -269,7 +269,7 @@ notify_with_scroll (infoPtr, TB_LINEUP); } -static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; infoPtr->lPos += infoPtr->lLineSize; @@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumb (infoPtr, newPos); } -static BOOL inline +inline static BOOL TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr) { return infoPtr->lSelMin != infoPtr->lSelMax; @@ -757,7 +757,7 @@ } -static void inline +inline static void TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) { TTTOOLINFOW ti; @@ -1022,7 +1022,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) { if (lprc == NULL) return 0; @@ -1036,7 +1036,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) @@ -1058,7 +1058,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) { if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics) @@ -1069,7 +1069,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic) { LONG range, width, pos, tic; @@ -1111,7 +1111,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) { LONG lTemp = infoPtr->lLineSize; @@ -1122,7 +1122,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; @@ -1133,7 +1133,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) { LONG oldPos = infoPtr->lPos; @@ -1152,7 +1152,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) { infoPtr->lRangeMin = (SHORT)LOWORD(lRange); @@ -1177,7 +1177,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) { infoPtr->lRangeMax = lMax; @@ -1195,7 +1195,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) { infoPtr->lRangeMin = lMin; @@ -1213,7 +1213,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1234,7 +1234,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1252,7 +1252,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1270,7 +1270,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) { @@ -1283,7 +1283,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) @@ -1310,7 +1310,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) { @@ -1323,7 +1323,7 @@ } -static INT inline +inline static INT TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation) { INT fTemp = infoPtr->fLocation; @@ -1334,7 +1334,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT) { infoPtr->hwndToolTip = hwndTT; @@ -1343,7 +1343,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) { BOOL bTemp = infoPtr->bUnicode; @@ -1702,7 +1702,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) { switch (nVirtKey) {

2 1

Broken RtlMultiByteToUnicodeSize
by Myria 20 Jul '06

20 Jul '06

A Taiwanese user of ReactOS came into the IRC channel to report a bug. If you set ReactOS's code page to 936, the function RtlMultiByteToUnicodeSize will crash during startup. I can't code a fix for it, but I can say how. The algorithm should work like this: - If the code page is not DBCS, don't bother, and just set *UnicodeSize to MbSize * sizeof(WCHAR). This is already done. - Begin counting with a length of 0. - While MbSize is not zero: -- Grab a byte and decrement MbSize. -- Determine whether it is a DBCS lead byte for the code page. -- If it is a lead byte: --- If MbSize is now zero, increment length, set *UnicodeSize to your length * sizeof(WCHAR) and return STATUS_SUCCESS. The broken half-character is counted. --- Decrement MbSize and increment your length. Two DBCS bytes just became a single Unicode character. We ignore the value of the second byte. -- If it is not: --- Increment length. - Set *UnicodeSize to length * sizeof(WCHAR) and return STATUS_SUCCESS. Is it possible for a DBCS character's mapping to be a UTF-16 surrogate? If so, the routine becomes more complicated. I personally think ReactOS should support UTF-8 as a default code page, but I doubt that others agree. This function is one of the many that would have to change... Melissa

1 0

Re: [ros-dev] [ros-diffs] [ion] 23175: - Major formatting cleanup and optimizations to NtQueryInformationProcess so that it does not burn the eyes of anyone that might attempt to read it.
by Royce Mitchell III 20 Jul '06

20 Jul '06

ion(a)svn.reactos.org wrote: >DstBuffer = (PWSTR)(DstPath + 1); > > that looks pretty eye-burning itself... perhaps I'm just seeing things but, 1) you're incrementing a pointer without checking if it's null ( I realize this might be safe if we can trust our caller ). 2) do we really want the address: DstPath + sizeof(PUNICODE_STRING)? I realize this too might work, but do we want to assume that sizeof(PUNICODE_STRING) == 2*sizeof(USHORT) ???

2 1

NtUserDrawCaption implementation, please review.
by Saveliy Tretiakov 18 Jul '06

18 Jul '06

Hi. This is my first attempt to implement something in win32k. Please review and point out mistakes, if any. I commited testapps to trunk. From testcode I found that our current implementation has bugs and fixed them. You can see them on screenshot: http://i1.tinypic.com/20a9te1.jpg In windows: http://i1.tinypic.com/20a9thf.jpg With my patch: http://i1.tinypic.com/20a9to2.jpg And now I'll ask some questions :) 1) Internal functions naming. Some functions have prefix like Int*, User*, co_* etc., some don't have any prefix. Is there any standart? 2) Is there any difference between shared and exclusive lock? When should I use shared lock, and when exlusive? In ntuser.h I saw this: #define UserEnterShared() UserEnterExclusive() I guess this is temporary hack, isn't it? Index: subsystems/win32/win32k/ntuser/painting.c =================================================================== --- subsystems/win32/win32k/ntuser/painting.c (revision 23134) +++ subsystems/win32/win32k/ntuser/painting.c (working copy) @@ -32,7 +32,7 @@ #include <w32k.h> -#define NDEBUG +#undef NDEBUG #include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ @@ -1372,4 +1372,392 @@ END_CLEANUP; } +/* Don't know where to put this */ +BOOL FASTCALL IntGdiGradientFill(DC *dc, PTRIVERTEX pVertex, ULONG uVertex, PVOID pMesh, ULONG uMesh, ULONG ulMode); +ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); +BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, + INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); + +BOOL +IntDrawSysMenuButton( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPRECT lpRc, + BOOL Down) +{ + HICON hIcon; + PCURICON_OBJECT pIcon; + + ASSERT(pWnd && lpRc); + + /* Get the icon to draw. We don't care about WM_GETICON here. */ + + hIcon = pWnd->Class->hIconSm; + + if(!hIcon) + { + DPRINT("Wnd class has no small icon.\n"); + hIcon = pWnd->Class->hIcon; + } + + if(!hIcon) + { + DPRINT("Wnd class hasn't any icon.\n"); + //FIXME: Draw "winlogo" icon. + return FALSE; + } + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + return FALSE; + } + + return UserDrawIconEx(hDc, lpRc->left, lpRc->top, pIcon, + UserGetSystemMetrics(SM_CXSMICON), + UserGetSystemMetrics(SM_CYSMICON), + 0, NULL, DI_NORMAL); +} + +BOOL +IntDrawCaptionText(HDC hDc, + const PUNICODE_STRING Text, + const LPRECT lpRc, + UINT uFlags) +{ + HFONT hOldFont = NULL, hFont = NULL; + COLORREF OldTextColor; + NONCLIENTMETRICS nclm; + NTSTATUS Status; + INT i; + + #ifndef NDEBUG + DPRINT("%s:", __FUNCTION__); + for(i = 0; i < Text->Length/sizeof(WCHAR); i++) + DbgPrint("%C", Text->Buffer[i]); + DbgPrint(", %d\n", Text->Length/sizeof(WCHAR)); + #endif + + nclm.cbSize = sizeof(nclm); + if(!IntSystemParametersInfo(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), &nclm, 0)) + { + DPRINT1("%s: IntSystemParametersInfo() failed!\n", __FUNCTION__); + return FALSE; + } + + NtGdiSetBkMode(hDc, TRANSPARENT); + + if(uFlags & DC_SMALLCAP) + Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); + else Status = TextIntCreateFontIndirect(&nclm.lfCaptionFont, &hFont); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("%s: TextIntCreateFontIndirect() failed! Status: 0x%x\n", + __FUNCTION__, Status); + return FALSE; + } + + hOldFont = NtGdiSelectObject(hDc, hFont); + if(!hOldFont) + { + DPRINT1("%s: SelectObject() failed!\n", __FUNCTION__); + NtGdiDeleteObject(hFont); + return FALSE; + } + + if(uFlags & DC_INBUTTON) + OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); + else OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); + + //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. + + NtGdiTextOut(hDc, lpRc->left, + lpRc->top, Text->Buffer, + Text->Length/sizeof(WCHAR)); + + NtGdiSetTextColor(hDc, OldTextColor); + NtGdiSelectObject(hDc, hOldFont); + NtGdiDeleteObject(hFont); + + return TRUE; +} + +BOOL UserDrawCaption( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + BOOL Ret = FALSE; + HBITMAP hMemBmp = NULL, hOldBmp = NULL; + HBRUSH hOldBrush = NULL; + HDC hMemDc = NULL; + ULONG Height; + UINT VCenter = 0, Padding = 0; + RECT r = *lpRc; + LONG ButtonWidth, IconWidth; + BOOL HasIcon; + + ASSERT(pWnd != NULL); + + hMemBmp = NtGdiCreateCompatibleBitmap(hDc, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top); + + if(!hMemBmp) + { + DPRINT1("%s: NtGdiCreateCompatibleBitmap() failed!\n", __FUNCTION__); + return FALSE; + } + + hMemDc = NtGdiCreateCompatibleDC(hDc); + if(!hMemDc) + { + DPRINT1("%s: NtGdiCreateCompatibleDC() failed!\n", __FUNCTION__); + goto cleanup; + } + + hOldBmp = NtGdiSelectObject(hMemDc, hMemBmp); + if(!hOldBmp) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + Height = UserGetSystemMetrics(SM_CYCAPTION) - 1; + VCenter = (lpRc->bottom - lpRc->top) / 2; + Padding = VCenter - (Height / 2); + HasIcon = (uFlags & DC_ICON) && (pWnd->Style & WS_SYSMENU) + && !(uFlags & DC_SMALLCAP); + IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding; + + r.left = Padding; + r.right = r.left + (lpRc->right - lpRc->left); + r.top = Padding; + r.bottom = r.top + (Height / 2); + + // Draw the caption background + if(uFlags & DC_INBUTTON) + { + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_BTNFACE : COLOR_BTNSHADOW)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(!NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY)) + { + DPRINT1("%s: NtGdiPatBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon) r.left+=IconWidth; + } + else + { + r.right = (lpRc->right - lpRc->left); + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon && (uFlags & DC_GRADIENT)) + { + NtGdiPatBlt(hMemDc, 0, 0, + IconWidth+1, + lpRc->bottom - lpRc->top, + PATCOPY); + r.left+=IconWidth; + } + else + { + NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + if(uFlags & DC_GRADIENT) + { + static GRADIENT_RECT gcap = {0, 1}; + TRIVERTEX vert[2]; + COLORREF Colors[2]; + PDC pMemDc; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(!(uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + + //Draw buttons background + if(!NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION))) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + NtGdiPatBlt(hMemDc, + r.right, + 0, + lpRc->right - lpRc->left - r.right, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + Colors[0] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); + + Colors[1] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); + + vert[0].x = r.left; + vert[0].y = 0; + vert[0].Red = (WORD)Colors[0]<<8; + vert[0].Green = (WORD)Colors[0] & 0xFF00; + vert[0].Blue = (WORD)(Colors[0]>>8) & 0xFF00; + vert[0].Alpha = 0; + + vert[1].x = r.right; + vert[1].y = lpRc->bottom - lpRc->top; + vert[1].Red = (WORD)Colors[1]<<8; + vert[1].Green = (WORD)Colors[1] & 0xFF00; + vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; + vert[1].Alpha = 0; + + pMemDc = DC_LockDc(hMemDc); + if(!pMemDc) + { + DPRINT1("%s: Can't lock dc!\n", __FUNCTION__); + goto cleanup; + } + + if(!IntGdiGradientFill(pMemDc, vert, 2, &gcap, + 1, GRADIENT_FILL_RECT_H)) + { + DPRINT1("%s: IntGdiGradientFill() failed!\n", __FUNCTION__); + } + + DC_UnlockDc(pMemDc); + } //if(uFlags & DC_GRADIENT) + } + + if(HasIcon) + { + r.top ++; + r.left -= --IconWidth; + IntDrawSysMenuButton(pWnd, hMemDc, &r, FALSE); + r.left += IconWidth; + r.top --; + } + + r.top ++; + r.left += 2; + + r.bottom = r.top + Height; + + if((uFlags & DC_TEXT) && pWnd->WindowName.Length) + { + if(!(uFlags & DC_GRADIENT)) + { + r.right = (lpRc->right - lpRc->left); + + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(! (uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + } + } + + IntDrawCaptionText(hMemDc, &pWnd->WindowName, &r, uFlags); + } + + if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top, + lpRc->right - lpRc->left, lpRc->bottom - lpRc->top, + hMemDc, 0, 0, SRCCOPY, 0, 0)) + { + DPRINT1("%s: NtGdiBitBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + Ret = TRUE; + +cleanup: + if (hOldBrush) NtGdiSelectObject(hMemDc, hOldBrush); + if (hOldBmp) NtGdiSelectObject(hMemDc, hOldBmp); + if (hMemBmp) NtGdiDeleteObject(hMemBmp); + if (hMemDc) NtGdiDeleteObjectApp(hMemDc); + + return Ret; +} + + +BOOL +STDCALL +NtUserDrawCaption(HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + PWINDOW_OBJECT pWnd; + RECT SafeRect; + BOOL Ret; + + if(!NT_SUCCESS(MmCopyFromCaller(&SafeRect, lpRc, sizeof(RECT)))) + { + DPRINT1("%s: MmCopyFromCaller failed!", __FUNCTION__); + return FALSE; + } + + UserEnterExclusive(); + + if(!(pWnd = UserGetWindowObject(hWnd))) + { + UserLeave(); + return FALSE; + } + + Ret = UserDrawCaption(pWnd, hDc, &SafeRect, uFlags); + + UserLeave(); + return Ret; +} + /* EOF */ Index: subsystems/win32/win32k/ntuser/cursoricon.c =================================================================== --- subsystems/win32/win32k/ntuser/cursoricon.c (revision 23134) +++ subsystems/win32/win32k/ntuser/cursoricon.c (working copy) @@ -72,7 +72,6 @@ } -static PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon) { PCURICON_OBJECT CurIcon; @@ -1346,66 +1345,49 @@ (Rop3), 0) #endif /* STRETCH_CAN_SRCCOPY_ONLY */ -/* - * @implemented - */ -BOOL -STDCALL -NtUserDrawIconEx( - HDC hdc, - int xLeft, - int yTop, - HICON hIcon, - int cxWidth, - int cyHeight, +BOOL +UserDrawIconEx( + HDC hDc, + INT xLeft, + INT yTop, + PCURICON_OBJECT pIcon, + INT cxWidth, + INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, - UINT diFlags, - DWORD Unknown0, - DWORD Unknown1) + UINT diFlags) { - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; + BOOL Ret = FALSE; HBITMAP hbmMask, hbmColor; BITMAP bmpMask, bmpColor; + COLORREF oldFg, oldBg; BOOL DoFlickerFree; + INT nStretchMode; SIZE IconSize; - COLORREF oldFg, oldBg; - HDC hdcMem, hdcOff = (HDC)0; - HBITMAP hbmOff = (HBITMAP)0; - HGDIOBJ hOldOffBrush = 0, hOldOffBmp = 0, hOldMem; - BOOL Ret = FALSE; - INT nStretchMode; + + HDC hdcOff; + HGDIOBJ hOldOffBrush = 0; + HGDIOBJ hOldOffBmp = 0; + HBITMAP hbmOff = 0; + HDC hdcMem = 0; + HGDIOBJ hOldMem; + + hbmMask = pIcon->IconInfo.hbmMask; + hbmColor = pIcon->IconInfo.hbmColor; - DECLARE_RETURN(BOOL); + if(istepIfAniCur) + DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - DPRINT("Enter NtUserDrawIconEx\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) + if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) { - RETURN( FALSE); + return FALSE; } - if (!(CurIcon = UserGetCurIconObject(hIcon))) + if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) { - ObDereferenceObject(WinSta); - RETURN(FALSE); + return FALSE; } - hbmMask = CurIcon->IconInfo.hbmMask; - hbmColor = CurIcon->IconInfo.hbmColor; - - if(istepIfAniCur) - DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - - if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) - goto done; - - if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) - goto done; - if(hbmColor) { IconSize.cx = bmpColor.bmWidth; @@ -1421,11 +1403,15 @@ diFlags = DI_NORMAL; if(!cxWidth) - cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + cxWidth = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + if(!cyHeight) - cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + cyHeight = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CYICON) : IconSize.cy); - DoFlickerFree = (hbrFlickerFreeDraw && (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); + DoFlickerFree = (hbrFlickerFreeDraw && + (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); if(DoFlickerFree) { @@ -1433,29 +1419,45 @@ r.right = cxWidth; r.bottom = cyHeight; - hdcOff = NtGdiCreateCompatibleDC(hdc); + hdcOff = NtGdiCreateCompatibleDC(hDc); if(!hdcOff) - goto done; + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + return FALSE; + } - hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); + hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); if(!hbmOff) { - NtGdiDeleteObjectApp(hdcOff); - goto done; + DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); + goto cleanup; } + hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); + if(!hOldOffBrush) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); + if(!hOldOffBmp) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - NtGdiSelectObject(hdcOff, hbmOff); } - - hdcMem = NtGdiCreateCompatibleDC(hdc); + else hdcOff = hDc; + + hdcMem = NtGdiCreateCompatibleDC(hDc); if(!hdcMem) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); goto cleanup; + } - if(!DoFlickerFree) - hdcOff = hdc; - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); @@ -1464,13 +1466,19 @@ if(diFlags & DI_MASK) { hOldMem = NtGdiSelectObject(hdcMem, hbmMask); + if(!hOldMem) + { + DPRINT("NtGdiSelectObject() failed!\n"); + goto cleanup; + } DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, 0, 0, IconSize.cx, IconSize.cy, ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) && (diFlags & DI_IMAGE)) + if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) + && (diFlags & DI_IMAGE)) { DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, @@ -1479,9 +1487,10 @@ diFlags &= ~DI_IMAGE; } + NtGdiSelectObject(hdcMem, hOldMem); } - + if(diFlags & DI_IMAGE) { hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); @@ -1496,35 +1505,72 @@ } if(DoFlickerFree) - NtGdiBitBlt(hdc, xLeft, yTop, cxWidth, cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); - + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, + cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); + } + NtGdiSetTextColor(hdcOff, oldFg); NtGdiSetBkColor(hdcOff, oldBg); - NtGdiSetStretchBltMode(hdcOff, nStretchMode); - + Ret = TRUE; - + cleanup: if(DoFlickerFree) { - NtGdiSelectObject(hdcOff, hOldOffBmp); - NtGdiSelectObject(hdcOff, hOldOffBrush); - NtGdiDeleteObject(hbmOff); - NtGdiDeleteObjectApp(hdcOff); + if(hOldOffBmp) NtGdiSelectObject(hdcOff, hOldOffBmp); + if(hOldOffBrush) NtGdiSelectObject(hdcOff, hOldOffBrush); + if(hbmOff) NtGdiDeleteObject(hbmOff); + if(hdcOff) NtGdiDeleteObjectApp(hdcOff); } - if(hdcMem) - NtGdiDeleteObjectApp(hdcMem); + + if(hdcMem) NtGdiDeleteObjectApp(hdcMem); + return Ret; +} -done: - ObDereferenceObject(WinSta); +/* + * @implemented + */ +BOOL +STDCALL +NtUserDrawIconEx( + HDC hdc, + int xLeft, + int yTop, + HICON hIcon, + int cxWidth, + int cyHeight, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags, + DWORD Unknown0, + DWORD Unknown1) +{ + PCURICON_OBJECT pIcon; + BOOL Ret; - RETURN( Ret); + DPRINT("Enter NtUserDrawIconEx\n"); + UserEnterExclusive(); + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + UserLeave(); + return FALSE; + } + + Ret = UserDrawIconEx(hdc, + xLeft, + yTop, + pIcon, + cxWidth, + cyHeight, + istepIfAniCur, + hbrFlickerFreeDraw, + diFlags); -CLEANUP: - DPRINT("Leave NtUserDrawIconEx, ret=%i\n",_ret_); UserLeave(); - END_CLEANUP; + return Ret; } - Index: subsystems/win32/win32k/ntuser/ntstubs.c =================================================================== --- subsystems/win32/win32k/ntuser/ntstubs.c (revision 23134) +++ subsystems/win32/win32k/ntuser/ntstubs.c (working copy) @@ -193,19 +193,6 @@ DWORD STDCALL -NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserDrawCaptionTemp( DWORD Unknown0, DWORD Unknown1, Index: subsystems/win32/win32k/include/intgdi.h =================================================================== --- subsystems/win32/win32k/include/intgdi.h (revision 23134) +++ subsystems/win32/win32k/include/intgdi.h (working copy) @@ -188,12 +188,18 @@ BOOL FASTCALL IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes); +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object); + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens); BOOL FASTCALL IntGetSysColors(COLORREF *Colors, UINT nColors); +DWORD FASTCALL +IntGetSysColor(INT nIndex); + /* Other Stuff */ INT FASTCALL Index: subsystems/win32/win32k/objects/stockobj.c =================================================================== --- subsystems/win32/win32k/objects/stockobj.c (revision 23134) +++ subsystems/win32/win32k/objects/stockobj.c (working copy) @@ -210,6 +210,12 @@ return nBrushes > 0; } +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object) +{ + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : SysColorBrushes[Object]; +} + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens) { @@ -254,6 +260,12 @@ return nColors > 0; } +DWORD FASTCALL +IntGetSysColor(INT nIndex) +{ + return ((nIndex < 0) || (NUM_SYSCOLORS <= nIndex)) ? 0 : SysColors[nIndex]; +} + VOID FASTCALL CreateSysColorObjects(VOID) { Index: include/reactos/win32k/ntuser.h =================================================================== --- include/reactos/win32k/ntuser.h (revision 23134) +++ include/reactos/win32k/ntuser.h (working copy) @@ -687,12 +687,11 @@ DWORD NTAPI NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 - ); + HWND hwnd1, + HWND hwnd2, + UINT u1, + DWORD dw1, + HCURSOR hc1); DWORD NTAPI @@ -702,24 +701,24 @@ DWORD Unknown2, DWORD Unknown3); -DWORD +BOOL NTAPI NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags); DWORD -NTAPI +STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6); BOOL NTAPI Index: dll/win32/user32/windows/nonclient.c =================================================================== --- dll/win32/user32/windows/nonclient.c (revision 23134) +++ dll/win32/user32/windows/nonclient.c (working copy) @@ -1097,231 +1097,9 @@ BOOL WINAPI DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags) { - NONCLIENTMETRICSW nclm; - BOOL result = FALSE; - RECT r = *lprc; - UINT VCenter = 0, Padding = 0, Height; - ULONG Style; - WCHAR buffer[256]; - HFONT hFont = NULL; - HFONT hOldFont = NULL; - HBRUSH OldBrush = NULL; - HDC MemDC = NULL; - int ButtonWidth; - COLORREF OldTextColor; - -#ifdef DOUBLE_BUFFER_CAPTION - HBITMAP MemBMP = NULL, OldBMP = NULL; - - MemDC = CreateCompatibleDC(hDC); - if (! MemDC) goto cleanup; - MemBMP = CreateCompatibleBitmap(hDC, lprc->right - lprc->left, lprc->bottom - lprc->top); - if (! MemBMP) goto cleanup; - OldBMP = SelectObject(MemDC, MemBMP); - if (! OldBMP) goto cleanup; -#else - MemDC = hDC; - - OffsetViewportOrgEx(MemDC, lprc->left, lprc->top, NULL); -#endif - - Style = GetWindowLongW(hWnd, GWL_STYLE); - - /* Windows behaves like this */ - Height = GetSystemMetrics(SM_CYCAPTION) - 1; - - VCenter = (lprc->bottom - lprc->top) / 2; - Padding = VCenter - (Height / 2); - - r.left = Padding; - r.right = r.left + (lprc->right - lprc->left); - r.top = Padding; - r.bottom = r.top + (Height / 2); - - // Draw the caption background - if (uFlags & DC_INBUTTON) - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_BTNFACE : COLOR_BTNSHADOW) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - else - { - if (uFlags & DC_GRADIENT) - { - static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; - COLORREF Colors[2]; - LONG xx; - - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - //if (Style & WS_SYSMENU) - //{ - // r.right -= 3 + ButtonWidth; - // if (! (uFlags & DC_SMALLCAP)) - // { - // if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - // r.right -= 2 + 2 * ButtonWidth; - // else - // r.right -= 2; - // r.right -= 2; - // } - //} - - Colors[0] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); - Colors[1] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - - vert[0].x = r.left; - vert[0].y = 0; - vert[0].Red = GetRValue(Colors[0]) << 8; - vert[0].Green = GetGValue(Colors[0]) << 8; - vert[0].Blue = GetBValue(Colors[0]) << 8; - vert[0].Alpha = 0; - - vert[1].x = r.right; - vert[1].y = lprc->bottom - lprc->top; - vert[1].Red = GetRValue(Colors[1]) << 8; - vert[1].Green = GetGValue(Colors[1]) << 8; - vert[1].Blue = GetBValue(Colors[1]) << 8; - vert[1].Alpha = 0; - - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); - - if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - r.top --; - SetBkMode( MemDC, TRANSPARENT ); - xx = GetSystemMetrics(SM_CXSIZE) + Padding; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += xx; - r.top ++; - } - - if(OldBrush) - { - SelectObject(MemDC, OldBrush); - OldBrush = NULL; - } - //xx = lprc->right - lprc->left - r.right; - //if(xx > 0) - //{ - // OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION)); - // if (!OldBrush) goto cleanup; - // PatBlt(MemDC, r.right, 0, xx, lprc->bottom - lprc->top, PATCOPY); - //} - } - else - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - } - - if ((uFlags & DC_ICON) && !(uFlags & DC_GRADIENT) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - /* For some reason the icon isn't centered correctly... */ - r.top --; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += GetSystemMetrics(SM_CXSIZE) + Padding; - r.top ++; - } - r.top ++; - r.left += 2; - - r.bottom = r.top + Height; - - if ((uFlags & DC_TEXT) && (NtUserInternalGetWindowText( hWnd, buffer, sizeof(buffer)/sizeof(buffer[0]) ))) - { - if(!(uFlags & DC_GRADIENT)) - { - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - if (Style & WS_SYSMENU) - { - r.right -= 3 + ButtonWidth; - if (! (uFlags & DC_SMALLCAP)) - { - if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else - r.right -= 2; - r.right -= 2; - } - } - } - - nclm.cbSize = sizeof(nclm); - if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nclm, 0)) goto cleanup; - - SetBkMode( MemDC, TRANSPARENT ); - if (uFlags & DC_SMALLCAP) - hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont); - else - hFont = CreateFontIndirectW(&nclm.lfCaptionFont); - - if (! hFont) goto cleanup; - - hOldFont = SelectObject(MemDC, hFont); - if (! hOldFont) goto cleanup; - - if (uFlags & DC_INBUTTON) - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_BTNTEXT : COLOR_GRAYTEXT)); - else - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); - - DrawTextW(MemDC, buffer, wcslen(buffer), &r, DT_VCENTER | DT_END_ELLIPSIS); - - SetTextColor(MemDC, OldTextColor); - } - -#if 0 - if (uFlags & DC_BUTTONS) - { - // Windows XP draws the caption buttons with DC_BUTTONS -// r.left += GetSystemMetrics(SM_CXSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONCLOSE); -// r.right -= GetSystemMetrics(SM_CXSMSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMIN); -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMAX); - } -#endif - -#ifdef DOUBLE_BUFFER_CAPTION - if (! BitBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, lprc->bottom - lprc->top, - MemDC, 0, 0, SRCCOPY)) goto cleanup; -#endif - - result = TRUE; - - cleanup : - if (MemDC) - { - if (OldBrush) SelectObject(MemDC, OldBrush); - if (hOldFont) SelectObject(MemDC, hOldFont); - if (hFont) DeleteObject(hFont); -#ifdef DOUBLE_BUFFER_CAPTION - if (OldBMP) SelectObject(MemDC, OldBMP); - if (MemBMP) DeleteObject(MemBMP); - DeleteDC(MemDC); -#else - OffsetViewportOrgEx(MemDC, -lprc->left, -lprc->top, NULL); -#endif - } - - return result; + return NtUserDrawCaption(hWnd, hDC, lprc, uFlags); } - /* * @unimplemented */

1 0

Changes to Menu Set Masking
by James Tabor 18 Jul '06

18 Jul '06

Hi, Okay~ I am finishing up rewriting menu mask setting in win32 and use32. The reason for so much junk in the menus was due to doing a full mask set for setting nothing other than "Rect" so if the structure was packed with S$@%! it would keep it and think it was valid data. MenuGetRosMenuItemInfo was naughty too. It set a full mask and it was passed to MenuSetRosMenuItemInfo and saved! Until I figured this out it was two weeks later! So I'm fixing this, Set will be selective and create errors if the wrong combination is used. Strings may have; MIIM_TYPE & MFT_STRING == good MIIM_STRING & MFT_STRING == good MIIM_STRING == good so you might have this -> if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) and this is good due to there might be one of them. You can not have. MIIM_TYPE & MIIM_STRING == bad MIIM_TYPE & MIIM_FTYPE == bad MIIM_TYPE & MIIM_BITMAP == bad MIIM_FTYPE & MFT_BITMAP == bad just read msdn doc on MENUITEMINFO structure, once you decode their logic it starts to make sense. Remember one supersedes another. What a mess, James

1 0

Reactos became closed?
by wac 17 Jul '06

17 Jul '06

Hi Folks: I don't see mails here since some time. Have ROS discusions moved to somewhere else or is just the sources revision process? Regards Waldo

4 4

Re: [ros-dev] 0.3.0 RC1 Update
by Murphy, Ged (Bolton) 13 Jul '06

13 Jul '06

WaxDragon wrote: > The only bug > I'm concerned about right now is the broken links in the start menu, > which I think is even fixed in trunk. Nothing else can really be > addressed at this point. That is easily fixed with a small hack in the explorer code. It's certainly not a correct fix, but it will ensure the links work for this release and allow us to move on. If you agree, I'll change it tonight. Ged.

2 2

Grievous and unwarranted mistreatment by a senior operator of the IRC channel
by Steven Maddox (Cyorxamp) 11 Jul '06

11 Jul '06

Dear ReactOS Developers, I apologize for taking these extra ordinary steps in this matter but I could not locate another way of bringing this issue to attention on your site. I was in the IRC channel on the 11th July '06 from about 3am to 5am GMT... I was posing some very interesting and fundamental questions about how the project began, it's direction. I was pleased that after a few minutes most of the users had agreed that ReactOS is intending to be much more than just NT compatible but in a sense 'Windows + Better'. After this there was many hours of discussion of how to make it more than just a windows clone, many of such involving the idea of ReactOS being similar to Linux in some senses and how to get a Linux feel while maintaining windows compatibility. Near the end of the log (I hope these are saved, I have no copies myself) an 'Alex_Ionescu' joined in on the conversation. He had many interesting views that greatly heightened the debate to whether ReactOS should intend to be more than windows now, or at a later date. I was for the view that in order to gain a user base quicker that it must at least intent to be more than a clone and was trying to illustrate why. I first tried to illustrate this and got shot down due to my poor phrasing of what I meant. I tried to rephrase my point, and I began with a sentence talking about firefox as a metaphor of another great piece of floss software. I was interrupted by Alex_Ionescu (whom is an op in that channel) who told me i 'must' state my reason using a single statement only and began quoting regulations of the English language and structuring a proper argument... so many regulations in fact i feel even if I did comply it would be difficult to fit it in one statement. I decided to wait until Alex_Ionescu had given up on such a silly and clear attempt at limiting my free speech in this matter. However he persisted to want to know what my point was on this matter, when trying again... he shut me down. Eventually he set the entire channel to moderated status only so only those he selected could discuss the matter. Apparently this was until I could phrase my argument using just one statement. I waited until this was lifted and it was not, eventually I came back... spoke Spanish and under another nick! Granted this was to yet again give my point across... instead of this they knew who I was and quickly identified me. A silly tactic I know, but having done this I was quickly misquoted in the channel from my conversation with Alex_Ionescu about things I was trying to explain to him as well as very childish remarks as tho I had said "I love cock". I have high hopes for this project and wish it every success, I had a very enlightened experience up until meeting this person with the arguments put and listened and responded to them well. Alex_Ionescu on the other hand obviously has no understanding of what it means to express oneself freely, and it would seem has a childish nature too. I ask that the decision to give this person power of the level of communication about the project in the channel be reviewed as quickly as possible in light of these or other past events. Thank you, -- Steven Maddox (Cyorxamp) Cyorxamp http://www.cyorxamp.info

8 12

Re: [ros-dev] Status of xen port?
by Dmitriy Budko 11 Jul '06

11 Jul '06

Reactos can be ported to VMI instead: http://www.vmware.com/interfaces/vmi_specs.html http://www.vmware.com/pdf/vmi_specs.pdf It will allow reactos to switch between VMI and native HW on the fly. Dmitriy Budko VMware ________________________________ From: ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] On Behalf Of Jerry Sent: Saturday, July 08, 2006 11:54 AM To: ReactOS Development List Subject: Re: [ros-dev] Status of xen port? Can reactos be made to run on Xen or native hardware by detecting either one on the fly? Steven Edwards wrote: On 7/7/06, Pablo Menichini <pablo(a)menichini.com.ar> <mailto:pablo@menichini.com.ar> wrote: I look at xen port and it hasn't been touch in a year. Is it possible to port reactos to xen or is the kernel not mature enought? If it's possible, how long can it take to have a bare minimum port? Its possible there has just been a lack of developer resources. One of the developers had the boot loader ported however those changes were not merged in to the trunk.

1 0

Re: [ros-dev] [ros-diffs] [fireball] 23005: [FORMATTING] / [AUDIT] - Cleanup a big coding-style mess - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) - Add proper debug headers inclusion in every file - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) - Standardize per-file headers (some files still lack contributors names, they will be added later too) No code change except for addin
by Alex Ionescu 10 Jul '06

10 Jul '06

fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Tue Jul 11 01:03:26 2006 > New Revision: 23005 > > URL: http://svn.reactos.org/svn/reactos?rev=23005&view=rev > Log: > [FORMATTING] / [AUDIT] > - Cleanup a big coding-style mess > - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) > - Add proper debug headers inclusion in every file > - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) > - Standardize per-file headers (some files still lack contributors names, they will be added later too) > > No code change except for adding UNIMPLEMENTED macros in the code. Name.c unlocked because the implementations of functions are trivial and in fact could be derived from their names. Not documented functions will be further reviewed. > Good work... two things: 1) I think Brandon wrote a tool which does documentation headers using TinyKRNL syntax. Since ROS's is the same (afaik), maybe you could talk to him about it instead of doing everything by hand :). 2) Most of the functions are documented in te IFS, I'm not aware of any undocumented FsRtl stuff... Captive also has implementations for nearly all of them, and Captive was clean-roomed. Best regards, Alex Ionescu

1 0

Re: [ros-dev] 0.3.0 RC1 Update
by Murphy, Ged (Bolton) 10 Jul '06

10 Jul '06

Brandon Turner wrote: > I have added a debug bootcd build of RC1 to sourceforge. > So anyone out there looking to get there hands one for > troubleshooting 0.3.0 can hop on there and grab it. We've had this up for 3 weeks now. Changes to trunk have been so heavy since we branched 0.3, we effectively now have two _very_ different versions of ReactOS .... heh Maybe our release process needs reviewing slightly ;) Ged.

7 9

Re: [ros-dev] 0.3.0 RC1 Update
by Murphy, Ged (Bolton) 10 Jul '06

10 Jul '06

Brandon Turner wrote: > Perhaps I am > mistaken on the process and missed the time I should have > made another > release. If this is the case please feel free to let me know > what I can > do to resolve the the problem. > > Brandon No no, nothing has gone wrong, I was just making an observation and putting some traffic on ros-dev ;) IIRC, a 2 month release cycle has been mentioned in the past. Going off our recent release speed, we'd struggle to hit 1 per year ;) At least we know ROS development is moving fast internally, even if releases aren't. Ged.

1 0

Status report on Remote Desktop client - with screenshots!
by Michele Cicciotti 10 Jul '06

10 Jul '06

I opted for a different porting strategy than I originally thought. I simply couldn't work effectively outside of Visual Studio, so I decided to create a test application (rdesktop-core-tester), and turn the smallest subset possible of rdesktop into a statically-linked library (rdesktop-core). It needs a lot more work, but the results are very encouraging Here is the first screenshot *ever* of rdesktop running on pure Win32: <http://img209.imageshack.us/my.php?image=whohoo3ts.png> What's wrong with this picture, and why? All text is missing: text output in RDP is tedious. I'll rip the code off from the X11 version, but it's not vital for now. All bitmaps are black: this is a bug, or rather a peculiarity, of rdesktop, which passes only part of raster operation codes (specifically, the "source" mask), forcing me to do some bit-juggling to turn them back into valid GDI raster operation codes - just passing the "mutilated" code resulted in the code for the BLACKNESS operation every time, and I think it shows. "Shut down..." is upside down: this is a bitmap painted directly to the screen, without a raster operation, so it worked out of the box, unlike the Windows logo in the upper half of the dialog. It turns out RDP bitmaps are top-down, like the framebuffer but unlike regular bitmaps. Easily solved by creating all bitmaps with negative heights! Also, I could not go further than this point at the time, because keyboard input wasn't hooked up yet! I whipped up some quick support (very easy, just pass the scancodes on the wire), and of course fixed the aforementioned issues, tweaked a couple more things, blind-typed the password (no text output) and... <http://img62.imageshack.us/my.php?image=meh9ct.png> ... eh. I expected a lot better. So many bugs. And I really don't understand why the strange "tile" effect... debugging drawing routines is a pain, let me tell you. I would love to have a night-time bug-hunt, but I have some *terrible* back pain, and it's becoming really hard to sit at my desk All in all, I must say I'm a bit disappointed that the rdesktop authors, who in general stayed true to the Win32 equivalents of RDP features, here and there placed annoying little idiosyncracies - like mutilating rasterops, or using their own structures instead of the "standard" LOGPEN, LOGBRUSH, etc. or calculating and passing around coordinates of left-top + dimensions when they're actually RECTs on the wire, forcing me to recalculate the RECT, and so on, and so on - that I *know* are going to cause me headaches in the days to come (the off-by-one-pixel bug must be caused by something like that) Well, that's all for this week! see you soon!

1 0

0 lines patch
by Timo Kreuzer 09 Jul '06

09 Jul '06

| \|/ 22802 <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> trunk/reactos/subsystems/win32/csrss/win32csr/ <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> resource.h <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> 0/0 <http://www.anonymizer.ru/cgi-bin/webproxy?session=demo&url=http://svn.react…> Mon Jul 3 19:59:50 2006 UTC greatlrd *Log:* wrong propyty on inlcude file it is not a executable format Looks like this patch got lost somewhere...

2 1

Re: [ros-dev] Hello list!
by Michele Cicciotti 08 Jul '06

08 Jul '06

Aleksey Bragin wrote: > thanks for sharing, we appreciate more often and better communication > with our SoC participants. sorry for the long periods of silence, but I'm currently without internet connectivity outside of weekends. It should go a lot better starting next week!

1 0

Hello list!
by Michele Cicciotti 08 Jul '06

08 Jul '06

I thought I might share my current progress on my Google Summer of Code project with this lovely project... Briefly, I don't have a lot of code but, I believe, a pretty solid design & a well laid down plan. Here is a writeup I have made about it on my PlanetSoC 2006 blog: <http://2006.planet-soc.com/node/361> It's quite long, so I hope you understand why this here post is so short :-) I'd love any kind of comment on it See you all soon(er)!

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev