Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 23383: User32 synced up to 22634 no.2
by jimtabor＠svn.reactos.org 31 Jul '06

31 Jul '06

Author: jimtabor Date: Mon Jul 31 07:07:47 2006 New Revision: 23383 URL: http://svn.reactos.org/svn/reactos?rev=23383&view=rev Log: User32 synced up to 22634 no.2 Added: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Uk.rc - copied unchanged from r22634, trunk/reactos/dll/win32/user32/Uk.rc Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/button.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/combo.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/edit.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/icontitle.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/listbox.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/regcontrol.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/scrollbar.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/static.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/dde_private.h branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/user32.h branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dde.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeclient.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeserver.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/desktop.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/display.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dllmain.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exit.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exticon.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/object.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/resources.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/strpool.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/timer.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winhelp.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winsta.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/wsprintf.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/bitmap.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/caret.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/clipboard.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/cursor.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dc.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/draw.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/font.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/hook.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/icon.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/messagebox.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/paint.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/prop.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/rect.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/text.c branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/winpos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/strpool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winhelp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/wsprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/text.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…

1 0

[jimtabor] 23382: User32 synced up to 22634
by jimtabor＠svn.reactos.org 31 Jul '06

31 Jul '06

Author: jimtabor Date: Mon Jul 31 06:17:13 2006 New Revision: 23382 URL: http://svn.reactos.org/svn/reactos?rev=23382&view=rev Log: User32 synced up to 22634 Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc branches/ros-branch-0_3_0/reactos/include/dde.h branches/ros-branch-0_3_0/reactos/include/ddeml.h branches/ros-branch-0_3_0/reactos/include/winuser.h Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc Mon Jul 31 06:17:13 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Vælg Vindue" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc Mon Jul 31 06:17:13 2006 @@ -10,7 +10,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Fenster Auswählen" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc Mon Jul 31 06:17:13 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Select Window" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc Mon Jul 31 06:17:13 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Selecciones Ventana" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc Mon Jul 31 06:17:13 2006 @@ -12,7 +12,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Select Window" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc Mon Jul 31 06:17:13 2006 @@ -12,7 +12,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Select Window" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc Mon Jul 31 06:17:13 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Selecteer venster" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc Mon Jul 31 06:17:13 2006 @@ -10,7 +10,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Wybieranie okna" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc Mon Jul 31 06:17:13 2006 @@ -28,7 +28,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Välj fönster" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild Mon Jul 31 06:17:13 2006 @@ -14,6 +14,7 @@ <library>gdi32</library> <library>kernel32</library> <library>advapi32</library> + <library>imm32</library> <directory name="include"> <pch>user32.h</pch> </directory> Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc Mon Jul 31 06:17:13 2006 @@ -73,3 +73,4 @@ #include "Sv.rc" #include "Hu.rc" #include "Es.rc" +#include "Uk.rc" Modified: branches/ros-branch-0_3_0/reactos/include/dde.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_0/reactos/include/dde.h (original) +++ branches/ros-branch-0_3_0/reactos/include/dde.h Mon Jul 31 06:17:13 2006 @@ -1,64 +1,90 @@ -#ifndef _DDE_H -#define _DDE_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +/***************************************************************************** + * Copyright 1995, Technion, Israel Institute of Technology + * Electrical Eng, Software Lab. + * Author: Michael Veksler. + * Purpose: dde declarations + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ***************************************************************************** + */ +#ifndef __WINE_DDE_H +#define __WINE_DDE_H + +#include <windef.h> #ifdef __cplusplus extern "C" { #endif -#define WM_DDE_FIRST 0x03E0 -#define WM_DDE_INITIATE (WM_DDE_FIRST) -#define WM_DDE_TERMINATE (WM_DDE_FIRST+1) -#define WM_DDE_ADVISE (WM_DDE_FIRST+2) -#define WM_DDE_UNADVISE (WM_DDE_FIRST+3) -#define WM_DDE_ACK (WM_DDE_FIRST+4) -#define WM_DDE_DATA (WM_DDE_FIRST+5) -#define WM_DDE_REQUEST (WM_DDE_FIRST+6) -#define WM_DDE_POKE (WM_DDE_FIRST+7) -#define WM_DDE_EXECUTE (WM_DDE_FIRST+8) -#define WM_DDE_LAST (WM_DDE_FIRST+8) -#ifndef RC_INVOKED -typedef struct { - unsigned short bAppReturnCode:8,reserved:6,fBusy:1,fAck:1; +#define WM_DDE_INITIATE 0x3E0 +#define WM_DDE_TERMINATE 0x3E1 +#define WM_DDE_ADVISE 0x3E2 +#define WM_DDE_UNADVISE 0x3E3 +#define WM_DDE_ACK 0x3E4 +#define WM_DDE_DATA 0x3E5 +#define WM_DDE_REQUEST 0x3E6 +#define WM_DDE_POKE 0x3E7 +#define WM_DDE_EXECUTE 0x3E8 +#define WM_DDE_LAST WM_DDE_EXECUTE +#define WM_DDE_FIRST WM_DDE_INITIATE + +/* DDEACK: wStatus in WM_DDE_ACK message */ +typedef struct +{ + unsigned short bAppReturnCode:8, reserved:6, fBusy:1, fAck:1; } DDEACK; -typedef struct { - unsigned short reserved:14,fDeferUpd:1,fAckReq:1; - short cfFormat; + +/* DDEDATA: hData in WM_DDE_DATA message */ +typedef struct +{ + unsigned short unused:12, fResponse:1, fRelease:1, reserved:1, fAckReq:1; + short cfFormat; + BYTE Value[1]; /* undetermined array */ +} DDEDATA; + +/* DDEADVISE: hOptions in WM_DDE_ADVISE message */ +typedef struct +{ + unsigned short reserved:14, fDeferUpd:1, fAckReq:1; + short cfFormat; } DDEADVISE; -typedef struct { - unsigned short unused:12,fResponse:1,fRelease:1,reserved:1,fAckReq:1; - short cfFormat; - BYTE Value[1]; -} DDEDATA; -typedef struct { - unsigned short unused:13,fRelease:1,fReserved:2; - short cfFormat; - BYTE Value[1]; + +/* DDEPOKE: hData in WM_DDE_POKE message. */ +typedef struct +{ + unsigned short unused:13, fRelease:1, fReserved:2; + short cfFormat; + BYTE Value[1]; /* undetermined array */ } DDEPOKE; -typedef struct { - unsigned short unused:13, - fRelease:1, - fDeferUpd:1, - fAckReq:1; - short cfFormat; -} DDELN; -typedef struct { - unsigned short unused:12,fAck:1,fRelease:1,fReserved:1,fAckReq:1; - short cfFormat; - BYTE rgb[1]; -} DDEUP; -BOOL WINAPI DdeSetQualityOfService(HWND,const SECURITY_QUALITY_OF_SERVICE*,PSECURITY_QUALITY_OF_SERVICE); -BOOL WINAPI ImpersonateDdeClientWindow(HWND,HWND); -LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); -BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); -BOOL WINAPI FreeDDElParam(UINT,LPARAM); -LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); -#endif +BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, + CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, + PSECURITY_QUALITY_OF_SERVICE pqosPrev); + +BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer); + +/* lParam packing/unpacking API */ + +LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); +BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); +BOOL WINAPI FreeDDElParam(UINT,LPARAM); +LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); + #ifdef __cplusplus } #endif -#endif + +#endif /* __WINE_DDE_H */ Modified: branches/ros-branch-0_3_0/reactos/include/ddeml.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_0/reactos/include/ddeml.h (original) +++ branches/ros-branch-0_3_0/reactos/include/ddeml.h Mon Jul 31 06:17:13 2006 @@ -1,326 +1,377 @@ -#ifndef _DDEML_H -#define _DDEML_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +/* + * DDEML library definitions + * + * Copyright 1997 Alexandre Julliard + * Copyright 1997 Len White + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_DDEML_H +#define __WINE_DDEML_H #ifdef __cplusplus extern "C" { -#endif - -#define EXPENTRY CALLBACK -#define CP_WINANSI 1004 -#define CP_WINUNICODE 1200 -#define XTYPF_NOBLOCK 2 -#define XTYPF_NODATA 4 -#define XTYPF_ACKREQ 8 -#define XCLASS_MASK 0xFC00 -#define XCLASS_BOOL 0x1000 -#define XCLASS_DATA 0x2000 -#define XCLASS_FLAGS 0x4000 -#define XCLASS_NOTIFICATION 0x8000 -#define XST_NULL 0 -#define XST_INCOMPLETE 1 -#define XST_CONNECTED 2 -#define XST_INIT1 3 -#define XST_INIT2 4 -#define XST_REQSENT 5 -#define XST_DATARCVD 6 -#define XST_POKESENT 7 -#define XST_POKEACKRCVD 8 -#define XST_EXECSENT 9 -#define XST_EXECACKRCVD 10 -#define XST_ADVSENT 11 -#define XST_UNADVSENT 12 -#define XST_ADVACKRCVD 13 -#define XST_UNADVACKRCVD 14 -#define XST_ADVDATASENT 15 -#define XST_ADVDATAACKRCVD 16 -#define XTYP_ERROR (XCLASS_NOTIFICATION|XTYPF_NOBLOCK) -#define XTYP_ADVDATA (16|XCLASS_FLAGS) -#define XTYP_ADVREQ (32|XCLASS_DATA|XTYPF_NOBLOCK) -#define XTYP_ADVSTART (0x30|XCLASS_BOOL) -#define XTYP_ADVSTOP (0x0040|XCLASS_NOTIFICATION) -#define XTYP_EXECUTE (0x0050|XCLASS_FLAGS) -#define XTYP_CONNECT (0x0060|XCLASS_BOOL|XTYPF_NOBLOCK) -#define XTYP_CONNECT_CONFIRM (0x0070|XCLASS_NOTIFICATION|XTYPF_NOBLOCK) -#define XTYP_XACT_COMPLETE (0x0080|XCLASS_NOTIFICATION) -#define XTYP_POKE (0x0090|XCLASS_FLAGS) -#define XTYP_REGISTER (0x00A0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK) -#define XTYP_REQUEST (0x00B0|XCLASS_DATA) -#define XTYP_DISCONNECT (0x00C0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK) -#define XTYP_UNREGISTER (0x00D0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK) -#define XTYP_WILDCONNECT (0x00E0|XCLASS_DATA|XTYPF_NOBLOCK) -#define XTYP_MASK 0xF0 -#define XTYP_SHIFT 4 -#define TIMEOUT_ASYNC 0xFFFFFFFF +#endif /* defined(__cplusplus) */ + +/* Codepage Constants + */ + +#define CP_WINANSI 1004 +#define CP_WINUNICODE 1200 + +/* DDE synchronisation constants + */ + +#define MSGF_DDEMGR 0x8001 + #define QID_SYNC 0xFFFFFFFF -#define ST_CONNECTED 1 -#define ST_ADVISE 2 -#define ST_ISLOCAL 4 -#define ST_BLOCKED 8 -#define ST_CLIENT 16 -#define ST_TERMINATED 32 -#define ST_INLIST 64 -#define ST_BLOCKNEXT 128 -#define ST_ISSELF 256 -#define CADV_LATEACK 0xFFFF -#define DMLERR_NO_ERROR 0 -#define DMLERR_FIRST 0x4000 -#define DMLERR_ADVACKTIMEOUT 0x4000 -#define DMLERR_BUSY 0x4001 -#define DMLERR_DATAACKTIMEOUT 0x4002 -#define DMLERR_DLL_NOT_INITIALIZED 0x4003 -#define DMLERR_DLL_USAGE 0x4004 -#define DMLERR_EXECACKTIMEOUT 0x4005 -#define DMLERR_INVALIDPARAMETER 0x4006 -#define DMLERR_LOW_MEMORY 0x4007 -#define DMLERR_MEMORY_ERROR 0x4008 -#define DMLERR_NOTPROCESSED 0x4009 -#define DMLERR_NO_CONV_ESTABLISHED 0x400a -#define DMLERR_POKEACKTIMEOUT 0x400b -#define DMLERR_POSTMSG_FAILED 0x400c -#define DMLERR_REENTRANCY 0x400d -#define DMLERR_SERVER_DIED 0x400e -#define DMLERR_SYS_ERROR 0x400f -#define DMLERR_UNADVACKTIMEOUT 0x4010 -#define DMLERR_UNFOUND_QUEUE_ID 0x4011 -#define DMLERR_LAST 0x4011 -#define DDE_FACK 0x8000 -#define DDE_FBUSY 0x4000 -#define DDE_FDEFERUPD 0x4000 -#define DDE_FACKREQ 0x8000 -#define DDE_FRELEASE 0x2000 -#define DDE_FREQUESTED 0x1000 -#define DDE_FAPPSTATUS 0x00ff -#define DDE_FNOTPROCESSED 0 -#define DDE_FACKRESERVED (~(DDE_FACK|DDE_FBUSY|DDE_FAPPSTATUS)) -#define DDE_FADVRESERVED (~(DDE_FACKREQ|DDE_FDEFERUPD)) -#define DDE_FDATRESERVED (~(DDE_FACKREQ|DDE_FRELEASE|DDE_FREQUESTED)) -#define DDE_FPOKRESERVED (~DDE_FRELEASE) -#define MSGF_DDEMGR 0x8001 -#define CBR_BLOCK ((HDDEDATA)0xffffffff) -#define CBF_FAIL_SELFCONNECTIONS 0x1000 -#define CBF_FAIL_CONNECTIONS 0x2000 -#define CBF_FAIL_ADVISES 0x4000 -#define CBF_FAIL_EXECUTES 0x8000 -#define CBF_FAIL_POKES 0x10000 -#define CBF_FAIL_REQUESTS 0x20000 -#define CBF_FAIL_ALLSVRXACTIONS 0x3f000 -#define CBF_SKIP_CONNECT_CONFIRMS 0x40000 -#define CBF_SKIP_REGISTRATIONS 0x80000 -#define CBF_SKIP_UNREGISTRATIONS 0x100000 -#define CBF_SKIP_DISCONNECTS 0x200000 -#define CBF_SKIP_ALLNOTIFICATIONS 0x3c0000 -#define APPCMD_CLIENTONLY 0x10L -#define APPCMD_FILTERINITS 0x20L -#define APPCMD_MASK 0xFF0L -#define APPCLASS_STANDARD 0 -#define APPCLASS_MASK 0xFL -#define EC_ENABLEALL 0 -#define EC_ENABLEONE ST_BLOCKNEXT -#define EC_DISABLE ST_BLOCKED -#define EC_QUERYWAITING 2 -#define DNS_REGISTER 1 -#define DNS_UNREGISTER 2 -#define DNS_FILTERON 4 -#define DNS_FILTEROFF 8 -#define HDATA_APPOWNED 1 -#define MAX_MONITORS 4 -#define APPCLASS_MONITOR 1L -#define XTYP_MONITOR (XCLASS_NOTIFICATION|XTYPF_NOBLOCK|0xF0) -#define MF_HSZ_INFO 0x1000000 -#define MF_SENDMSGS 0x2000000 -#define MF_POSTMSGS 0x4000000 -#define MF_CALLBACKS 0x8000000 -#define MF_ERRORS 0x10000000 -#define MF_LINKS 0x20000000 -#define MF_CONV 0x40000000 -#define MF_MASK 0xFF000000 -#define MH_CREATE 1 -#define MH_KEEP 2 -#define MH_DELETE 3 -#define MH_CLEANUP 4 + +/* Type variation for MS deliberate departures from ANSI standards + */ + +#define EXPENTRY CALLBACK + +#define SZDDESYS_TOPIC TEXT("System") +#define SZDDESYS_ITEM_TOPICS TEXT("Topics") +#define SZDDESYS_ITEM_SYSITEMS TEXT("SysItems") +#define SZDDESYS_ITEM_RTNMSG TEXT("ReturnMessage") +#define SZDDESYS_ITEM_STATUS TEXT("Status") +#define SZDDESYS_ITEM_FORMATS TEXT("Formats") +#define SZDDESYS_ITEM_HELP TEXT("Help") +#define SZDDE_ITEM_ITEMLIST TEXT("TopicItemList") + +/*************************************************** + + FLAGS Section - copied from Microsoft SDK as must be standard, probably Copyright Microsoft Corporation + +***************************************************/ + +#define XST_NULL 0 +#define XST_INCOMPLETE 1 +#define XST_CONNECTED 2 +#define XST_INIT1 3 +#define XST_INIT2 4 +#define XST_REQSENT 5 +#define XST_DATARCVD 6 +#define XST_POKESENT 7 +#define XST_POKEACKRCVD 8 +#define XST_EXECSENT 9 +#define XST_EXECACKRCVD 10 +#define XST_ADVSENT 11 +#define XST_UNADVSENT 12 +#define XST_ADVACKRCVD 13 +#define XST_UNADVACKRCVD 14 +#define XST_ADVDATASENT 15 +#define XST_ADVDATAACKRCVD 16 + +#define ST_CONNECTED 0x0001 +#define ST_ADVISE 0x0002 +#define ST_ISLOCAL 0x0004 +#define ST_BLOCKED 0x0008 +#define ST_CLIENT 0x0010 +#define ST_TERMINATED 0x0020 +#define ST_INLIST 0x0040 +#define ST_BLOCKNEXT 0x0080 +#define ST_ISSELF 0x0100 + +/* + * DdeEnableCallback function codes + */ + +#define EC_ENABLEALL 0 +#define EC_ENABLEONE ST_BLOCKNEXT +#define EC_DISABLE ST_BLOCKED +#define EC_QUERYWAITING 2 + +/* + * Callback filter flags for use with standard apps. + */ + +#define CBF_FAIL_SELFCONNECTIONS 0x00001000 +#define CBF_FAIL_CONNECTIONS 0x00002000 +#define CBF_FAIL_ADVISES 0x00004000 +#define CBF_FAIL_EXECUTES 0x00008000 +#define CBF_FAIL_POKES 0x00010000 +#define CBF_FAIL_REQUESTS 0x00020000 +#define CBF_FAIL_ALLSVRXACTIONS 0x0003f000 + +#define CBF_SKIP_CONNECT_CONFIRMS 0x00040000 +#define CBF_SKIP_REGISTRATIONS 0x00080000 +#define CBF_SKIP_UNREGISTRATIONS 0x00100000 +#define CBF_SKIP_DISCONNECTS 0x00200000 +#define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000 + +#define CBR_BLOCK ((HDDEDATA)~0UL) + +/* + * Application command flags + */ +#define APPCMD_CLIENTONLY 0x00000010L +#define APPCMD_FILTERINITS 0x00000020L +#define APPCMD_MASK 0x00000FF0L + +/* + * Application classification flags + */ + +#define APPCLASS_STANDARD 0x00000000L +#define APPCLASS_MONITOR 0x00000001L +#define APPCLASS_MASK 0x0000000FL + +/* + * Callback filter flags for use with MONITOR apps - 0 implies no monitor + * callbacks. + */ +#define MF_HSZ_INFO 0x01000000 +#define MF_SENDMSGS 0x02000000 +#define MF_POSTMSGS 0x04000000 +#define MF_CALLBACKS 0x08000000 +#define MF_ERRORS 0x10000000 +#define MF_LINKS 0x20000000 +#define MF_CONV 0x40000000 + +#define MF_MASK 0xFF000000 + +/* + * DdeNameService service name flags + */ + +#define DNS_REGISTER 0x0001 +#define DNS_UNREGISTER 0x0002 +#define DNS_FILTERON 0x0004 +#define DNS_FILTEROFF 0x0008 + + +/**************************************************** + + End of Flags section + +****************************************************/ + +/**************************************************** + + Message Types Section + +****************************************************/ + +#define XTYPF_NOBLOCK 0x0002 /* CBR_NOBLOCK will not work */ +#define XTYPF_NODATA 0x0004 /* DDE_FDEFERUPD */ +#define XTYPF_ACKREQ 0x0008 /* DDE_FACKREQ */ + +#define XCLASS_MASK 0xFC00 +#define XCLASS_BOOL 0x1000 +#define XCLASS_DATA 0x2000 +#define XCLASS_FLAGS 0x4000 +#define XCLASS_NOTIFICATION 0x8000 + +#define XTYP_ERROR (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) +#define XTYP_ADVDATA (0x0010 | XCLASS_FLAGS) +#define XTYP_ADVREQ (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK) +#define XTYP_ADVSTART (0x0030 | XCLASS_BOOL) +#define XTYP_ADVSTOP (0x0040 | XCLASS_NOTIFICATION) +#define XTYP_EXECUTE (0x0050 | XCLASS_FLAGS) +#define XTYP_CONNECT (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK) +#define XTYP_CONNECT_CONFIRM (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) +#define XTYP_XACT_COMPLETE (0x0080 | XCLASS_NOTIFICATION ) +#define XTYP_POKE (0x0090 | XCLASS_FLAGS) +#define XTYP_REGISTER (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) +#define XTYP_REQUEST (0x00B0 | XCLASS_DATA ) +#define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) +#define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) +#define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK) + +#define XTYP_MASK 0x00F0 +#define XTYP_SHIFT 4 + +#define TIMEOUT_ASYNC 0xFFFFFFFF + +#define CADV_LATEACK 0xFFFF + +/************************************************** + + End of Message Types Section + +****************************************************/ + +/***************************************************** + + DDE Codes for wStatus field + +*****************************************************/ + +#define DDE_FACK 0x8000 +#define DDE_FBUSY 0x4000 +#define DDE_FDEFERUPD 0x4000 +#define DDE_FACKREQ 0x8000 +#define DDE_FRELEASE 0x2000 +#define DDE_FREQUESTED 0x1000 +#define DDE_FAPPSTATUS 0x00FF +#define DDE_FNOTPROCESSED 0x0000 + +#define DDE_FACKRESERVED (~(DDE_FACK | DDE_FBUSY | DDE_FAPPSTATUS)) +#define DDE_FADVRESERVED (~(DDE_FACKREQ | DDE_FDEFERUPD)) +#define DDE_FDATRESERVED (~(DDE_FACKREQ | DDE_FRELEASE | DDE_FREQUESTED)) +#define DDE_FPOKRESERVED (~(DDE_FRELEASE)) + +/***************************************************** + + End of wStatus codes + +*****************************************************/ + +/**************************************************** + + Return Codes section again copied from SDK as must be same + +*****************************************************/ + +#define DMLERR_NO_ERROR 0 /* must be 0 */ + +#define DMLERR_FIRST 0x4000 + +#define DMLERR_ADVACKTIMEOUT 0x4000 +#define DMLERR_BUSY 0x4001 +#define DMLERR_DATAACKTIMEOUT 0x4002 +#define DMLERR_DLL_NOT_INITIALIZED 0x4003 +#define DMLERR_DLL_USAGE 0x4004 +#define DMLERR_EXECACKTIMEOUT 0x4005 +#define DMLERR_INVALIDPARAMETER 0x4006 +#define DMLERR_LOW_MEMORY 0x4007 +#define DMLERR_MEMORY_ERROR 0x4008 +#define DMLERR_NOTPROCESSED 0x4009 +#define DMLERR_NO_CONV_ESTABLISHED 0x400a +#define DMLERR_POKEACKTIMEOUT 0x400b +#define DMLERR_POSTMSG_FAILED 0x400c +#define DMLERR_REENTRANCY 0x400d +#define DMLERR_SERVER_DIED 0x400e +#define DMLERR_SYS_ERROR 0x400f +#define DMLERR_UNADVACKTIMEOUT 0x4010 +#define DMLERR_UNFOUND_QUEUE_ID 0x4011 + +#define DMLERR_LAST 0x4011 + +#define HDATA_APPOWNED 0x0001 + +/***************************************************** + + End of Return Codes and Microsoft section + +******************************************************/ + + DECLARE_HANDLE(HCONVLIST); DECLARE_HANDLE(HCONV); DECLARE_HANDLE(HSZ); DECLARE_HANDLE(HDDEDATA); -typedef HDDEDATA CALLBACK FNCALLBACK(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD); -typedef HDDEDATA(CALLBACK *PFNCALLBACK)(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD); -typedef struct tagHSZPAIR { - HSZ hszSvc; - HSZ hszTopic; + + + +/******************************************************* + + API Entry Points + +*******************************************************/ + +typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ, + HDDEDATA, ULONG_PTR, ULONG_PTR); + +/*************************************************** + + Externally visible data structures + +***************************************************/ + +typedef struct tagHSZPAIR +{ + HSZ hszSvc; + HSZ hszTopic; } HSZPAIR, *PHSZPAIR; -typedef struct tagCONVCONTEXT { - UINT cb; - UINT wFlags; - UINT wCountryID; - int iCodePage; - DWORD dwLangID; - DWORD dwSecurity; - SECURITY_QUALITY_OF_SERVICE qos; -} CONVCONTEXT,*PCONVCONTEXT; -typedef struct tagCONVINFO { - DWORD cb; - DWORD hUser; - HCONV hConvPartner; - HSZ hszSvcPartner; - HSZ hszServiceReq; - HSZ hszTopic; - HSZ hszItem; - UINT wFmt; - UINT wType; - UINT wStatus; - UINT wConvst; - UINT wLastError; - HCONVLIST hConvList; - CONVCONTEXT ConvCtxt; - HWND hwnd; - HWND hwndPartner; -} CONVINFO,*PCONVINFO; -typedef struct tagDDEML_MSG_HOOK_DATA { - UINT uiLo; - UINT uiHi; - DWORD cbData; - DWORD Data[8]; -} DDEML_MSG_HOOK_DATA; -typedef struct tagMONHSZSTRUCTA { - UINT cb; - BOOL fsAction; - DWORD dwTime; - HSZ hsz; - HANDLE hTask; - CHAR str[1]; -} MONHSZSTRUCTA, *PMONHSZSTRUCTA; -typedef struct tagMONHSZSTRUCTW { - UINT cb; - BOOL fsAction; - DWORD dwTime; - HSZ hsz; - HANDLE hTask; - WCHAR str[1]; -} MONHSZSTRUCTW, *PMONHSZSTRUCTW; -typedef struct tagMONLINKSTRUCT { - UINT cb; - DWORD dwTime; - HANDLE hTask; - BOOL fEstablished; - BOOL fNoData; - HSZ hszSvc; - HSZ hszTopic; - HSZ hszItem; - UINT wFmt; - BOOL fServer; - HCONV hConvServer; - HCONV hConvClient; -} MONLINKSTRUCT, *PMONLINKSTRUCT; -typedef struct tagMONCONVSTRUCT { - UINT cb; - BOOL fConnect; - DWORD dwTime; - HANDLE hTask; - HSZ hszSvc; - HSZ hszTopic; - HCONV hConvClient; - HCONV hConvServer; -} MONCONVSTRUCT, *PMONCONVSTRUCT; -typedef struct tagMONCBSTRUCT { - UINT cb; - DWORD dwTime; - HANDLE hTask; - DWORD dwRet; - UINT wType; - UINT wFmt; - HCONV hConv; - HSZ hsz1; - HSZ hsz2; - HDDEDATA hData; - ULONG_PTR dwData1; - ULONG_PTR dwData2; - CONVCONTEXT cc; - DWORD cbData; - DWORD Data[8]; -} MONCBSTRUCT, *PMONCBSTRUCT; -typedef struct tagMONERRSTRUCT { - UINT cb; - UINT wLastError; - DWORD dwTime; - HANDLE hTask; -} MONERRSTRUCT, *PMONERRSTRUCT; -typedef struct tagMONMSGSTRUCT { - UINT cb; - HWND hwndTo; - DWORD dwTime; - HANDLE hTask; - UINT wMsg; - WPARAM wParam; - LPARAM lParam; - DDEML_MSG_HOOK_DATA dmhd; -} MONMSGSTRUCT, *PMONMSGSTRUCT; - -BOOL WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD); -PBYTE WINAPI DdeAccessData(HDDEDATA,PDWORD); -HDDEDATA WINAPI DdeAddData(HDDEDATA,PBYTE,DWORD,DWORD); -HDDEDATA WINAPI DdeClientTransaction(PBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,PDWORD); -int WINAPI DdeCmpStringHandles(HSZ,HSZ); -HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT); + +typedef struct tagCONVCONTEXT +{ + UINT cb; + UINT wFlags; + UINT wCountryID; + INT iCodePage; + DWORD dwLangID; + DWORD dwSecurity; +} CONVCONTEXT, *PCONVCONTEXT; + +typedef struct tagCONVINFO +{ + DWORD cb; + DWORD hUser; + HCONV hConvPartner; + HSZ hszSvcPartner; + HSZ hszServiceReq; + HSZ hszTopic; + HSZ hszItem; + UINT wFmt; + UINT wType; + UINT wStatus; + UINT wConvst; + UINT wLastError; + HCONVLIST hConvList; + CONVCONTEXT ConvCtxt; + HWND hwnd; + HWND hwndPartner; +} CONVINFO, *PCONVINFO; + +/* Interface Definitions */ + + +UINT WINAPI DdeInitializeA(LPDWORD,PFNCALLBACK,DWORD,DWORD); +UINT WINAPI DdeInitializeW(LPDWORD,PFNCALLBACK,DWORD,DWORD); +#define DdeInitialize WINELIB_NAME_AW(DdeInitialize) +BOOL WINAPI DdeUninitialize(DWORD); HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT); -HDDEDATA WINAPI DdeCreateDataHandle(DWORD,PBYTE,DWORD,DWORD,HSZ,UINT,UINT); -HSZ WINAPI DdeCreateStringHandleA(DWORD,LPSTR,int); -HSZ WINAPI DdeCreateStringHandleW(DWORD,LPWSTR,int); -BOOL WINAPI DdeDisconnect(HCONV); -BOOL WINAPI DdeDisconnectList(HCONVLIST); -BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT); -BOOL WINAPI DdeFreeDataHandle(HDDEDATA); -BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ); -DWORD WINAPI DdeGetData(HDDEDATA,PBYTE,DWORD,DWORD); -UINT WINAPI DdeGetLastError(DWORD); -BOOL WINAPI DdeImpersonateClient(HCONV); -UINT WINAPI DdeInitializeA(PDWORD,PFNCALLBACK,DWORD,DWORD); -UINT WINAPI DdeInitializeW(PDWORD,PFNCALLBACK,DWORD,DWORD); -BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ); -HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT); -BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ); -UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO); -HCONV WINAPI DdeQueryNextServer(HCONVLIST,HCONV); -DWORD WINAPI DdeQueryStringA(DWORD,HSZ,LPSTR,DWORD,int); -DWORD WINAPI DdeQueryStringW(DWORD,HSZ,LPWSTR,DWORD,int); -HCONV WINAPI DdeReconnect(HCONV); -BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD); -BOOL WINAPI DdeUnaccessData(HDDEDATA); -BOOL WINAPI DdeUninitialize(DWORD); - -#ifdef UNICODE -#define SZDDESYS_TOPIC L"System" -#define SZDDESYS_ITEM_TOPICS L"Topics" -#define SZDDESYS_ITEM_SYSITEMS L"SysItems" -#define SZDDESYS_ITEM_RTNMSG L"ReturnMessage" -#define SZDDESYS_ITEM_STATUS L"Status" -#define SZDDESYS_ITEM_FORMATS L"Formats" -#define SZDDESYS_ITEM_HELP L"Help" -#define SZDDE_ITEM_ITEMLIST L"TopicItemList" -#define MONHSZSTRUCT MONHSZSTRUCTA -#define PMONHSZSTRUCT PMONHSZSTRUCTA -#define DdeCreateStringHandle DdeCreateStringHandleW -#define DdeInitialize DdeInitializeW -#define DdeQueryString DdeQueryStringW -#else -#define SZDDESYS_TOPIC "System" -#define SZDDESYS_ITEM_TOPICS "Topics" -#define SZDDESYS_ITEM_SYSITEMS "SysItems" -#define SZDDESYS_ITEM_RTNMSG "ReturnMessage" -#define SZDDESYS_ITEM_STATUS "Status" -#define SZDDESYS_ITEM_FORMATS "Formats" -#define SZDDESYS_ITEM_HELP "Help" -#define SZDDE_ITEM_ITEMLIST "TopicItemList" -#define MONHSZSTRUCT MONHSZSTRUCTW -#define PMONHSZSTRUCT PMONHSZSTRUCTW -#define DdeCreateStringHandle DdeCreateStringHandleA -#define DdeInitialize DdeInitializeA -#define DdeQueryString DdeQueryStringA -#endif +HCONV WINAPI DdeQueryNextServer(HCONVLIST, HCONV); +DWORD WINAPI DdeQueryStringA(DWORD, HSZ, LPSTR, DWORD, INT); +DWORD WINAPI DdeQueryStringW(DWORD, HSZ, LPWSTR, DWORD, INT); +#define DdeQueryString WINELIB_NAME_AW(DdeQueryString) +BOOL WINAPI DdeDisconnectList(HCONVLIST); +HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT); +BOOL WINAPI DdeDisconnect(HCONV); +HDDEDATA WINAPI DdeCreateDataHandle(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT,UINT); +HCONV WINAPI DdeReconnect(HCONV); +HSZ WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,INT); +HSZ WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,INT); +#define DdeCreateStringHandle WINELIB_NAME_AW(DdeCreateStringHandle) +BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ); +BOOL WINAPI DdeFreeDataHandle(HDDEDATA); +BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ); +HDDEDATA WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,LPDWORD); +BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction); +BOOL WINAPI DdeImpersonateClient(HCONV); +BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ); +HDDEDATA WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD); +DWORD WINAPI DdeGetData(HDDEDATA,LPBYTE,DWORD,DWORD); +LPBYTE WINAPI DdeAccessData(HDDEDATA,LPDWORD); +BOOL WINAPI DdeUnaccessData(HDDEDATA); +BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT); +INT WINAPI DdeCmpStringHandles(HSZ,HSZ); +BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD); + +HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT); +UINT WINAPI DdeGetLastError(DWORD); +UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO); + #ifdef __cplusplus -} -#endif -#endif /* _DDEML_H */ +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* __WINE_DDEML_H */ Modified: branches/ros-branch-0_3_0/reactos/include/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_0/reactos/include/winuser.h (original) +++ branches/ros-branch-0_3_0/reactos/include/winuser.h Mon Jul 31 06:17:13 2006 @@ -306,6 +306,7 @@ #define SS_BLACKRECT 4 #define SS_CENTER 1 #define SS_CENTERIMAGE 512 +#define SS_EDITCONTROL 0x2000 #define SS_ENHMETAFILE 15 #define SS_ETCHEDFRAME 18 #define SS_ETCHEDHORZ 16 @@ -318,6 +319,7 @@ #define SS_NOPREFIX 128 #define SS_NOTIFY 256 #define SS_OWNERDRAW 0xd +#define SS_REALSIZECONTROL 0x040 #define SS_REALSIZEIMAGE 0x800 #define SS_RIGHT 2 #define SS_RIGHTJUST 0x400

1 0

[turner] 23381: Implement the reading and writing of pagefile settings. We should not longer have to edit it by hand in regedit. This works 100% flawlessly in win2k3 but has not been tested in ros yet. Patch by Christian Wallukat (cwallukat@gmx.at) and myself.
by turner＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: turner Date: Mon Jul 31 03:14:02 2006 New Revision: 23381 URL: http://svn.reactos.org/svn/reactos?rev=23381&view=rev Log: Implement the reading and writing of pagefile settings. We should not longer have to edit it by hand in regedit. This works 100% flawlessly in win2k3 but has not been tested in ros yet. Patch by Christian Wallukat (cwallukat(a)gmx.at) and myself. Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Mon Jul 31 03:14:02 2006 @@ -11,6 +11,7 @@ <library>user32</library> <library>comctl32</library> <library>netapi32</library> + <library>ntdll</library> <file>advanced.c</file> <file>computer.c</file> <file>environment.c</file> 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 31 03:14:02 2006 @@ -1,39 +1,735 @@ +/* +* ReactOS +* Copyright (C) 2004 ReactOS Team +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +/* $Id$ +* +* PROJECT: ReactOS System Control Panel +* FILE: lib/cpl/sysdm/virtmem.c +* PURPOSE: pagefile settings +* PROGRAMMER: Christian Wallukat cwallukat(at)gmx(dot)at +*/ + #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) +#include <stdio.h> +#include <winternl.h> + + + +// +// An array of these structs will interally manage system page files +// +typedef struct _sPagefiles { - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) - { + WCHAR szDrive[10]; + INT nMinValue; + INT nMaxValue; + INT nUsed; +} sPageFiles; + + + +// +// At most there can be 32 drives, so only 32 page files +// +sPageFiles g_sPagefile[32]; +// +// This is the number of drives that could have page files +// +INT g_nCount; +// +// Will save the user set action signal saving to the registry on exit +// +BOOL g_bSave; + + +// +// ReadRegSettings reads the page file settings from the regisrty +// +VOID ReadRegSettings(HWND hwndDlg); +// +// ParseMemSettings takes the regisrty string and create the internal page file array +// +VOID ParseMemSettings(TCHAR *szSettings, HWND hwndDlg); +// +// SaveSettings writes the paging file array to the registry +// +VOID SaveSettings(HWND hwndDlg); + +// +// Callback function for messages for the windows +// +INT_PTR +CALLBACK +VirtMemDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + SYSTEM_PROCESS_INFORMATION siSysPInfo; + TCHAR szTemp[255]; + INT nIndex = 0; + + // + // We dont need to look at this part of the message + // + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { case WM_INITDIALOG: - break; + { + // + // We dont save the changes until set is clicked + // + g_bSave = FALSE; + // + // We start with no page files + // + g_nCount = 0; + // + // Clear out the file pagefile + // + g_sPagefile[0].nMaxValue = 0; + g_sPagefile[0].nMinValue = 0; + g_sPagefile[0].nUsed = 0; + + // + // Grad the system stats to get some page file into + // + NtQuerySystemInformation(SystemProcessInformation, &siSysPInfo, sizeof(SYSTEM_PROCESS_INFORMATION), NULL); + + // + // Convert the pagefile usage to a string + // + _itow(siSysPInfo.PeakPagefileUsage, szTemp, 10); + + // + // Set pagefle useage to its label + // + SendDlgItemMessage(hwndDlg, IDC_CURRENT, WM_SETTEXT, (WPARAM)0, (LPARAM)szTemp); + + // + // Load the pagefile systems from the reg + // + ReadRegSettings(hwndDlg); + }; + break; case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDCANCEL: - EndDialog(hwndDlg, 0); - return TRUE; - } - break; + { + switch (LOWORD(wParam)) + { + case IDCANCEL: + { + // + // If the user hits cancel we just close and dont save + // + EndDialog(hwndDlg, 0); + return TRUE; + }; + break; + + + case IDOK: + { + // + // Check to make sure that the user hit set and we will save the settings + // + if(g_bSave == TRUE) + { + SaveSettings(hwndDlg); + }; + + // + // Close out the window + // + EndDialog(hwndDlg, 0); + }; + break; + + + case IDC_PAGEFILELIST: + { + switch(HIWORD(wParam)) + { + case LBN_SELCHANGE: + { + // + // Get the currently selected page file from the list box + // + nIndex = (INT)SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); + + // + // If the index is in our range then process that page file + // + if(nIndex < g_nCount) + { + // + // Convert the minvalue for the page file + // + _itow(g_sPagefile[nIndex].nMinValue, szTemp, 10); + + // + // Set the min value to its textbox + // + SendDlgItemMessage(hwndDlg, IDC_INITIALSIZE, WM_SETTEXT, (WPARAM)0, (LPARAM)szTemp); + + // + // Convert the max value of the page file to a string + // + _itow(g_sPagefile[nIndex].nMaxValue, szTemp, 10); + + // + // Set the max value to its textbox + // + SendDlgItemMessage(hwndDlg, IDC_MAXSIZE, WM_SETTEXT, (WPARAM)0, (LPARAM)szTemp); + + // + // Figure out what type of page file it is + // + if(g_sPagefile[nIndex].nMinValue == 0 && g_sPagefile[nIndex].nMaxValue == 0) + { + // + // There is either no page file or a system managed page file so we disable custom sizes + // + EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), FALSE); + // + // Check to see if that drive is used for paging + // + if(g_sPagefile[nIndex].nUsed == 1) + { + // + // This is a system managed page file + // + SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)1, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + } + else + { + // + // There is no page file on this drive + // + SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)1, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + } + } + else + { + // + // THis is a custom sized page file + // + SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)1, (LPARAM)0); + // + // We need to allow the user to change the sizes + // + EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), TRUE); + } + }; + }; + break; + }; + }; + break; + + + case IDC_NOPAGEFILE: + { + // + // Set the pagefile to no page file + // + SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)1, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + + // + // Disable the page file custom size boxes + // + EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), FALSE); + }; + break; + + case IDC_SYSMANSIZE: + { + // + // User changed this to a system managed page file + // + SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)1, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + + // + // Disable the page file custom size boxes + // + EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), FALSE); + }; + break; + + case IDC_CUSTOM: + { + // + // User changed this to a cutom sized page file + // + SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)1, (LPARAM)0); + + // + // The user should be able to change the size of these files + // + EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), TRUE); + }; + break; + + case IDC_SET: + { + // + // The user hit set, so we are clear to save the settings when we are done + // + g_bSave = TRUE; + + // + // Figure out which pagefile we are saving the settings too + // + nIndex = SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0); + + // + // Make sure it isnt out of our range + // + if(nIndex < g_nCount) + { + // + // Check to see what the current user input settings are + // + if(SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) + { + // + // If custom is checked we need to get the min size + // + SendDlgItemMessage(hwndDlg, IDC_INITIALSIZE, WM_GETTEXT, (WPARAM)254, (LPARAM)szTemp); + + // + // Convert the size to an int and save it + // + g_sPagefile[nIndex].nMinValue = _wtoi(szTemp); + + // + // If custom is checked we need to get the max size + // + SendDlgItemMessage(hwndDlg, IDC_MAXSIZE, WM_GETTEXT, (WPARAM)254, (LPARAM)szTemp); + + // + // If custom is checked we need to get the max size + // + g_sPagefile[nIndex].nMaxValue = _wtoi(szTemp); + + } + else + { + // + // If it is no paging file or system then we set the sizes to zero + // + g_sPagefile[nIndex].nMinValue = g_sPagefile[nIndex].nMaxValue = 0; + } + + // + // We check to see if this drive is used for a paging file anymore + // + g_sPagefile[nIndex].nUsed = (SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_UNCHECKED); + + + // + // FIXME: Rebuild the paging list + // + }; + }; + break; + }; + }; + break; case WM_NOTIFY: - break; - } - - return FALSE; -} + { + }; + break; + }; + + return FALSE; +}; + + +VOID +ReadRegSettings(HWND hwndDlg) +{ + HKEY hk = NULL; + DWORD dwType = 0x0; + DWORD dwDataSize = 0x0; + TCHAR szValue[2048]; + + + // + // Open or create this key to read our settings + // + if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, + _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"), + 0x0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_READ, + NULL, + &hk, + NULL) == ERROR_SUCCESS) + { + + // + // Get the size of the data + // + if(RegQueryValueEx(hk, _T("PagingFiles"), 0, &dwType, (PBYTE)NULL, &dwDataSize) == ERROR_SUCCESS) + { + + // + // Read paging file settings from the regisrty + // + if(RegQueryValueEx(hk, _T("PagingFiles"), 0, &dwType, (PBYTE)(LPTSTR)szValue, &dwDataSize) == ERROR_SUCCESS) + { + // + // Parse our settings and set up controls accordingly + // + ParseMemSettings(szValue, hwndDlg); + } + else + { + // + // We had a problem :( + // + OutputDebugString(_T("Err read pagefile\n")); + }; + } + else + { + // + // We had a problem :( + // + OutputDebugString(_T("Err open reg pagefile\n")); + }; + + // + // Close our key + // + RegCloseKey(hk); + }; +}; + + +VOID +ParseMemSettings(TCHAR *szSettings, HWND hwndDlg) +{ + TCHAR szVolName[256]; + TCHAR szDrive[25]; + TCHAR szDrvLst[256]; + TCHAR szTemp[256]; + TCHAR szList[256]; + INT nLastPos = 0; + INT nMinSize = 0; + INT nMaxSize = 0; + INT nTemp = 0; + BOOL bFound = FALSE; + + g_nCount = 0; + + // + // Clear out all our buffers + // + _wcsnset(szTemp, 0, sizeof(szTemp)); + _wcsnset(szVolName, 0, sizeof(szVolName)); + _wcsnset(szDrive, 0, sizeof(szDrive)); + _wcsnset(szList, 0, sizeof(szList)); + + // + // Get a list of all the drives + // + GetLogicalDriveStrings(255, szDrvLst); + + // + // Print out our drives and our reg string + // + OutputDebugString(szDrvLst); + OutputDebugString((TCHAR*)szSettings); + + // + // Loop through all the drives + // + while(TRUE) + { + // + // Copy over the drive letter + // + wsprintf(szDrive, _T("%s"), szDrvLst + nLastPos); + nLastPos += 4; + + // + // We should fixed and removeable drives, no network / cd + // + if(GetDriveType(szDrive) == DRIVE_FIXED || GetDriveType(szDrive) == DRIVE_REMOVABLE) + { + // + // Get some info about out drive + // + GetVolumeInformation(szDrive, (LPTSTR)szVolName, 255, NULL, NULL, NULL, NULL, 0); + + // + // Cut off the Drive letter : + // + szDrive[2] = 0; + + // + // Clear out our vars to prepare to walk page file setting string + // + nTemp = 0; + bFound = FALSE; + + // + // Walk through the list of page files + // + while(TRUE) + { + // + // Copy over a page file setting for a drive skipping already processed ones + // + wsprintf(szTemp, _T("%s"), szSettings + nTemp); + + + // + // Check to see if the drive for the page file setting matches our current drive + // + if(!_tcsnicmp(szTemp,szDrive,1)) + { + // + // Extract the min/max size from the string + // + nMinSize = (INT)(wcsstr(szTemp + 16, _T(" ")) - (szTemp + 16)) + 1; + nMaxSize = _wtoi(szTemp + 16 + nMinSize); + nMinSize = _wtoi(szTemp + 16); + + // + // Fill in the page file settings in the internal array + // + g_sPagefile[g_nCount].nMaxValue = nMaxSize; + g_sPagefile[g_nCount].nMinValue = nMinSize; + g_sPagefile[g_nCount].nUsed = 1; + wsprintf(g_sPagefile[g_nCount].szDrive, _T("%s"), szDrive); + + // + // Add up one more page file found + // + ++g_nCount; + + // + // Indicate that we found a pagefile for this drive + // + bFound = TRUE; + + break; + }; + + // + // Skip passed the just processed drive setting + // + nTemp += _tcslen(szSettings + nTemp) + 1; + + // + // If we are done looking through the page file settings + // or found a matching setting then break out + // + if((_tcslen(szSettings + nTemp) <= 0) || (bFound == TRUE)) + { + break; + }; + }; + + // + // If we found a page file we make a string for the list box with the size + // + if(bFound == TRUE) + { + wsprintf(szList, _T("%s [%s] %i - %i"), szDrive, szVolName, nMinSize, nMaxSize); + } + else + { + // + // Otherwise we make a blank pagefile element to show no page file + // + g_sPagefile[g_nCount].nMaxValue = 0; + g_sPagefile[g_nCount].nMinValue = 0; + g_sPagefile[g_nCount].nUsed = 0; + + // + // Copy over the drive for the blank page file element + // + wsprintf(g_sPagefile[g_nCount].szDrive, _T("%s"), szDrive); + + // + // Add up one for the blank page file + // + ++g_nCount; + + // + // We just show the name of the drive if there is no page file + // + wsprintf(szList, _T("%s [%s]"), szDrive, szVolName); + }; + + // + // Add our string to the page file list + // + SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_ADDSTRING, (WPARAM)NULL, (LPARAM)szList); + + // + // Print out the newly added string + // + OutputDebugString(szList); + }; + + // + // Once all drive have finished being processed then we break out + // + if(_tcslen(szDrvLst + nLastPos) <= 0) + { + return; + }; + }; +}; + + +void SaveSettings(HWND hwndDlg) +{ + HKEY hk = NULL; + TCHAR szValue[2048]; + TCHAR szTemp[512]; + INT nCount = 0; + INT nPos = 0; + + // + // Clear out our buffers + // + _wcsnset(szValue, 0, sizeof(szValue)); + _wcsnset(szTemp, 0, sizeof(szTemp)); + + // + // Go through all our internal pagefile records + // + for(nCount = 0; nCount < g_nCount; ++nCount) + { + // + // We only save it to the regisrty if is used + // + if(g_sPagefile[nCount].nUsed == 1) + { + // + // Clear out our temp buffer + // + _wcsnset(szTemp, 0, sizeof(szTemp)); + // + // Copy the path and sizes to our temp buffer for the page file + // + wsprintf(szTemp, _T("%s\\pagefile.sys %i %i"), g_sPagefile[nCount].szDrive, g_sPagefile[nCount].nMinValue, g_sPagefile[nCount].nMaxValue); + + // + // Add it to our overall regisrty string + // + _tcscat(szValue+nPos,szTemp); + + // + // Record the positioon where the next string will be placed in the buffer + // + nPos += _tcslen(szTemp) + 1; + // Add our null chars in to seperate the page files(REG_MULTI_SZ string) + szValue[nPos - 1] = 0; + szValue[nPos] = 0; + }; + }; + + // + // Now that we have page file setting string we open up the key to save it + // + if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, + _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"), + 0x0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hk, + NULL) == ERROR_SUCCESS) + { + // + // We save our page file settings to the PagingFiles value + // + if (RegSetValueEx(hk, + _T("PagingFiles"), + 0, + REG_MULTI_SZ, + (LPBYTE) szValue, + (DWORD) (nPos+2)*sizeof(TCHAR))) + { + // + // We had a problem, so print out a message + // + OutputDebugString(_T("Could not save")); + + // + // Get the error for our last operation + // + _ltow(GetLastError(), szValue, 10); + + // + // Print out the error code + // + OutputDebugString(szValue); + + } + + // + // Close up the regisrty + // + RegCloseKey(hk); + } + else + { + // + // Print out an error that we couldnt open(create) the registry key. + // + OutputDebugString(_T("Could not open key")); + }; +}; + /* EOF */

1 0

[winesync] 23380: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: winesync Date: Mon Jul 31 01:27:45 2006 New Revision: 23380 URL: http://svn.reactos.org/svn/reactos?rev=23380&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc Mon Jul 31 01:27:45 2006 @@ -15,7 +15,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 */ #include "windef.h"

1 0

[janderwald] 23379: merge 23368
by janderwald＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: janderwald Date: Mon Jul 31 01:26:57 2006 New Revision: 23379 URL: http://svn.reactos.org/svn/reactos?rev=23379&view=rev Log: merge 23368 Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c Mon Jul 31 01:26:57 2006 @@ -165,7 +165,7 @@ WrapperConfigurationContext, NULL, &BufferSize); - if (*Status != NDIS_STATUS_RESOURCES) + if (*Status != NDIS_STATUS_SUCCESS) return; *Status = NdisAllocateMemory((PVOID)&AssignedResources, Modified: branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c Mon Jul 31 01:26:57 2006 @@ -103,7 +103,7 @@ ULONG ResourceListSize; PAGED_CODE(); - ASSERT(Status && ResourceList); + ASSERT((Status && ResourceList) || *BufferSize != 0); NDIS_DbgPrint(MAX_TRACE, ("Called\n"));

1 0

[ekohl] 23378: Updated information about widl.
by ekohl＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: ekohl Date: Sun Jul 30 17:39:42 2006 New Revision: 23378 URL: http://svn.reactos.org/svn/reactos?rev=23378&view=rev Log: Updated information about widl. Modified: trunk/reactos/media/doc/README.WINE 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 Sun Jul 30 17:39:42 2006 @@ -9,8 +9,8 @@ If you find that a function in ReactOS that is not implemented properly and is based on WINE sources, check the latest Winehq CVS and see if -it has been fixed there. If so, please submit a patch to -ros-dev(a)reactos.com. Otherwise please send a patch to both +it has been fixed there. If so, please submit a patch to +ros-dev(a)reactos.com. Otherwise please send a patch to both wine-patches(a)winehq.com and ros-dev(a)reactos.com When porting a dll from WINE to ReactOS please take a look at how @@ -21,7 +21,7 @@ This will cause the reactos build system to look for a file called makefile.ros-template. This file contains all of the information needed -for the ReactOS build system to make use of the WINE Makefile.in. +for the ReactOS build system to make use of the WINE Makefile.in. This will allow you to use the WINE tools and librarys with very little work to import a new dll. @@ -29,11 +29,11 @@ reactos/tools/unicode # Synced to Wine-0_9_5 reactos/tools/wpp # Synced to Wine-0_9_5 -reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_5 +reactos/tools/bin2res # Resource to binary converter +reactos/tools/winebuild # Synced to Wine-0_9_5 reactos/tools/wmc # Synced to Wine-0_9_5 reactos/tools/wrc # Synced to Wine-0_9_5 -reactos/tools/widl # Forked at Wine-20050930 +reactos/tools/widl # Synced to Wine-20060729 The following libraries are shared with Wine. @@ -43,8 +43,8 @@ reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 reactos/dll/win32/crypt32 # Autosync reactos/dll/win32/cryptdll # Autosync -reactos/dll/win32/dbghelp # -reactos/dll/win32/icmp # Synced to Wine-0_9_10 +reactos/dll/win32/dbghelp # +reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. @@ -52,7 +52,7 @@ reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/mpr # Synced to Wine-0_9_5 -reactos/dll/win32/msacm # Out of sync +reactos/dll/win32/msacm # Out of sync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Synced to Wine-0_9_5 reactos/dll/win32/msvideo # Out of sync @@ -73,7 +73,7 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Synced to Wine-0_9_5 -reactos/dll/win32/twain # Out of sync +reactos/dll/win32/twain # Out of sync reactos/dll/win32/urlmon # Synced to Wine-0_9_10 reactos/dll/win32/uxtheme # Autosync reactos/dll/win32/version # Synced at 20060509

1 0

[ekohl] 23377: This modification is required for use with the WINE widl.
by ekohl＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: ekohl Date: Sun Jul 30 17:02:53 2006 New Revision: 23377 URL: http://svn.reactos.org/svn/reactos?rev=23377&view=rev Log: This modification is required for use with the WINE widl. Modified: trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl Sun Jul 30 17:02:53 2006 @@ -49,7 +49,8 @@ BOOL ScmrControlService([in] handle_t BindingHandle, [in] SC_HANDLE hService, [in] DWORD dwControl, - [out] LPSERVICE_STATUS lpServiceStatus); + [out] SERVICE_STATUS *lpServiceStatus); +/* [out] LPSERVICE_STATUS lpServiceStatus); */ /* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, @@ -78,7 +79,8 @@ /* Function 6 */ DWORD ScmrQueryServiceStatus([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, - [out] LPSERVICE_STATUS lpServiceStatus); + [out] SERVICE_STATUS *lpServiceStatus); +/* [out] LPSERVICE_STATUS lpServiceStatus); */ /* Function 7 */ DWORD ScmrSetServiceStatus([in] handle_t BindingHandle,

1 0

[ekohl] 23376: Synchronize with current WINE widl 20060729.
by ekohl＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: ekohl Date: Sun Jul 30 16:58:24 2006 New Revision: 23376 URL: http://svn.reactos.org/svn/reactos?rev=23376&view=rev Log: Synchronize with current WINE widl 20060729. Added: trunk/reactos/tools/widl/parser.tab.c (with props) trunk/reactos/tools/widl/parser.tab.h (with props) trunk/reactos/tools/widl/typegen.c (with props) trunk/reactos/tools/widl/typegen.h (with props) trunk/reactos/tools/widl/widl.man.in Removed: trunk/reactos/tools/widl/widl.man trunk/reactos/tools/widl/winglue.h trunk/reactos/tools/widl/y.tab.c trunk/reactos/tools/widl/y.tab.h Modified: trunk/reactos/tools/widl/ChangeLog trunk/reactos/tools/widl/Makefile.in trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/hash.h trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/lex.yy.c trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/ChangeLog?rev=2… Modified: trunk/reactos/tools/widl/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/Makefile.in?rev… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=23… Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=2337… Modified: trunk/reactos/tools/widl/hash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.h?rev=2337… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=23… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=23… Modified: trunk/reactos/tools/widl/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/lex.yy.c?rev=23… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=23… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=23… Added: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Added: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=23… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=233… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=23… Added: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=2… Added: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=2… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=2… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=2… Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=233… Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=233… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=2337… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=2337… Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=23… Removed: trunk/reactos/tools/widl/widl.man URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.man?rev=23… Added: trunk/reactos/tools/widl/widl.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.man.in?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Removed: trunk/reactos/tools/widl/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/winglue.h?rev=2… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… Removed: trunk/reactos/tools/widl/y.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/y.tab.c?rev=233… Removed: trunk/reactos/tools/widl/y.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/y.tab.h?rev=233…

1 0

[hpoussin] 23375: - Create a window to receive the CTRL+ALT+DELETE event (not working yet) - Remove support for console start (it is the role of msgina, not winlogon) - Implement some simple functions
by hpoussin＠svn.reactos.org 30 Jul '06

30 Jul '06

Author: hpoussin Date: Sun Jul 30 12:38:35 2006 New Revision: 23375 URL: http://svn.reactos.org/svn/reactos?rev=23375&view=rev Log: - Create a window to receive the CTRL+ALT+DELETE event (not working yet) - Remove support for console start (it is the role of msgina, not winlogon) - Implement some simple functions Modified: trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Sun Jul 30 12:38:35 2006 @@ -1,7 +1,6 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Winlogon * FILE: services/winlogon/winlogon.c * PURPOSE: Logon * PROGRAMMER: David Welch (welch(a)cwcom.net) @@ -14,9 +13,6 @@ #define NDEBUG #include <debug.h> - -#define SUPPORT_CONSOLESTART 1 -#define START_LSASS 1 /* GLOBALS ******************************************************************/ @@ -33,10 +29,7 @@ HINSTANCE hAppInstance; PWLSESSION WLSession = NULL; - -#if SUPPORT_CONSOLESTART -BOOL StartConsole = TRUE; -#endif +HWND hwndSASWindow = NULL; /* FUNCTIONS *****************************************************************/ @@ -153,7 +146,6 @@ return TRUE; } -#if START_LSASS static BOOLEAN StartLsass (VOID) { @@ -205,7 +197,6 @@ return(TRUE); } -#endif static BOOLEAN @@ -280,7 +271,7 @@ VOID STDCALL RegisterHotKeys(VOID) { - RegisterHotKey(NULL, 0, MOD_ALT | MOD_CONTROL, VK_DELETE); + RegisterHotKey(hwndSASWindow, 0, MOD_ALT | MOD_CONTROL, VK_DELETE); } VOID STDCALL @@ -324,34 +315,6 @@ CloseHandle (ProcessInformation.hThread); } } - -#if SUPPORT_CONSOLESTART -static BOOL StartIntoGUI(VOID) -{ - HKEY WinLogonKey; - DWORD Type, Size, Value; - - if(OpenRegistryKey(&WinLogonKey)) - { - Size = sizeof(DWORD); - if(ERROR_SUCCESS == RegQueryValueEx(WinLogonKey, - L"StartGUI", - NULL, - &Type, - (LPBYTE)&Value, - &Size)) - { - if(Type == REG_DWORD) - { - RegCloseKey(WinLogonKey); - return (Value != 0); - } - } - RegCloseKey(WinLogonKey); - } - return FALSE; -} - static PWCHAR GetUserInit (WCHAR *CommandLine) @@ -496,10 +459,8 @@ while (WaitForSingleObject (ProcessInformation.hProcess, 100) != WAIT_OBJECT_0) { - if (PeekMessage(&Msg, 0, 0, 0, PM_REMOVE)) - { - if (Msg.message == WM_HOTKEY) - HandleHotKey(&Msg); + if (PeekMessage(&Msg, hwndSASWindow, 0, 0, PM_REMOVE)) + { TranslateMessage(&Msg); DispatchMessage(&Msg); } @@ -526,7 +487,32 @@ return TRUE; } -#endif + +static LRESULT CALLBACK +SASWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + DbgBreakPoint(); + switch (uMsg) + { + case WM_HOTKEY: + { + switch (lParam) + { + case MAKELONG(MOD_CONTROL | MOD_ALT, VK_DELETE): + { + DispatchSAS(WLSession, WLX_SAS_TYPE_CTRL_ALT_DEL); + return TRUE; + } + } + } + } + + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); +} int STDCALL WinMain(HINSTANCE hInstance, @@ -535,10 +521,7 @@ int nShowCmd) { BOOLEAN Old; -#if SUPPORT_CONSOLESTART -// WCHAR LoginName[255]; -// WCHAR Password[255]; -#endif + WNDCLASS wndClass; #if 0 LSA_STRING ProcessName, PackageName; HANDLE LsaHandle; @@ -559,7 +542,6 @@ /* Get privilege */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); -#if START_LSASS if (StartProcess(L"StartLsass")) { if (!StartLsass()) @@ -571,7 +553,6 @@ { DPRINT1("WL: StartProcess() failed!\n"); } -#endif if(!(WLSession = MsGinaInit())) { @@ -615,9 +596,6 @@ return 0; } -#if SUPPORT_CONSOLESTART - StartConsole = !StartIntoGUI(); -#endif if(!InitializeSAS(WLSession)) { DPRINT1("WL: Failed to initialize SAS\n"); @@ -663,6 +641,17 @@ * Register SAS with the window. * Register for logoff notification */ + /* Create a window class */ + ZeroMemory(&wndClass, sizeof(WNDCLASS)); + wndClass.style = CS_GLOBALCLASS; + wndClass.lpfnWndProc = SASWindowProc; + wndClass.hInstance = hInstance; + wndClass.lpszClassName = L"SAS Window class"; + RegisterClass(&wndClass); + hwndSASWindow = CreateWindow( + L"SAS Window class", L"SAS window", 0, + 0, 0, 0, 0, + NULL, NULL, hInstance, NULL); /* Main loop */ #if 0 @@ -701,21 +690,6 @@ i++; } while (Password[i - 1] != '\n'); Password[i - 1] =0; -#endif - -#if SUPPORT_CONSOLESTART - if(StartConsole) - { -// if (! DoLogonUser(LoginName, Password)) - if (! DoLogonUser(L"Administrator", L"Secret")) - { - } - - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); - } - else - { #endif RegisterHotKeys(); @@ -745,9 +719,6 @@ DPRINT1("WL: LogonStatus != LOGON_SHUTDOWN!!!\n"); ExitProcess(0); } -#if SUPPORT_CONSOLESTART - } -#endif return 0; } @@ -759,17 +730,6 @@ { return TRUE; } - - #if SUPPORT_CONSOLESTART - if(StartConsole) - { - if(pMessage) - { - DPRINT1("WL-Status: %ws\n", pMessage); - } - return TRUE; - } - #endif return Session->MsGina.Functions.WlxDisplayStatusMessage(Session->MsGina.Context, hDesktop, dwOptions, pTitle, pMessage); } @@ -848,9 +808,6 @@ WlxSetTimeout(Session->MsGina.Context, 0); Session->SuppressStatus = TRUE; /* tell msgina to show a window telling the user one can logon */ - #if SUPPORT_CONSOLESTART - if(!StartConsole) - #endif DisplaySASNotice(Session); Session->SuppressStatus = FALSE; @@ -863,7 +820,11 @@ } WlxAction = DoLogin(Session); - if(WlxAction == WLX_SAS_ACTION_LOGOFF) + if (WlxAction == WLX_SAS_ACTION_LOGON) + { + DoLogonUser(L"Administrator", L"Secret"); + } + else if(WlxAction == WLX_SAS_ACTION_LOGOFF) { /* the user doesn't want to login, instead pressed cancel we should display the window again so one can logon again */ @@ -900,10 +861,8 @@ } /* Message loop for the SAS window */ - while(GetMessage(&Msg, 0, 0, 0)) - { - if (Msg.message == WM_HOTKEY) - HandleHotKey(&Msg); + while(GetMessage(&Msg, hwndSASWindow, 0, 0)) + { TranslateMessage(&Msg); DispatchMessage(&Msg); } Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Sun Jul 30 12:38:35 2006 @@ -84,7 +84,7 @@ } /* - * @unimplemented + * @implemented */ int WINAPI WlxMessageBox( @@ -95,12 +95,11 @@ UINT fuStyle ) { - Unimplemented; - return 0; -} - -/* - * @unimplemented + return MessageBoxW(hwndOwner, lpszText, lpszTitle, fuStyle); +} + +/* + * @implemented */ int WINAPI WlxDialogBox( @@ -111,12 +110,11 @@ DLGPROC dlgprc ) { - Unimplemented; - return 0; -} - -/* - * @unimplemented + return (int)DialogBox(hInst, lpszTemplate, hwndOwner, dlgprc); +} + +/* + * @implemented */ int WINAPI WlxDialogBoxParam( @@ -128,8 +126,7 @@ LPARAM dwInitParam ) { - Unimplemented; - return 0; + return (int)DialogBoxParam(hInst, lpszTemplate, hwndOwner, dlgprc, dwInitParam); } /* @@ -144,12 +141,11 @@ DLGPROC dlgprc ) { - Unimplemented; - return 0; -} - -/* - * @unimplemented + return (int)DialogBoxIndirect(hInst, hDialogTemplate, hwndOwner, dlgprc); +} + +/* + * @implemented */ int WINAPI WlxDialogBoxIndirectParam( @@ -161,8 +157,7 @@ LPARAM dwInitParam ) { - Unimplemented; - return 0; + return (int)DialogBoxIndirectParam(hInst, hDialogTemplate, hwndOwner, dlgprc, dwInitParam); } /*

1 0

[hpoussin] 23374: Implement SM_REMOTESESSION message
by hpoussin＠svn.reactos.org 29 Jul '06

29 Jul '06

Author: hpoussin Date: Sun Jul 30 03:55:07 2006 New Revision: 23374 URL: http://svn.reactos.org/svn/reactos?rev=23374&view=rev Log: Implement SM_REMOTESESSION message Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c Sun Jul 30 03:55:07 2006 @@ -212,6 +212,8 @@ return(0); case SM_CMONITORS: return(1); + case SM_REMOTESESSION: + return (0); default: return(0xFFFFFFFF);

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