Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 3 02:49:02 2006 New Revision: 23427 URL: http://svn.reactos.org/svn/reactos?rev=23427&view=rev Log: Fix compilation Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Thu Aug 3 02:49:02 2006 @@ -52,7 +52,7 @@ return TRUE; } -static BOOL +static VOID ChooseGinaUI(VOID) { HKEY WinLogonKey = NULL;

18 years, 2 months

[gedmurphy] 23426: merge r23425 from trunk. It'll remove confusion if a user stumbles across this app when playing around.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Aug 3 01:58:06 2006 New Revision: 23426 URL: http://svn.reactos.org/svn/reactos?rev=23426&view=rev Log: merge r23425 from trunk. It'll remove confusion if a user stumbles across this app when playing around. Modified: branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/En.rc branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/floatwindow.c branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/mainwnd.c branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/precomp.h Modified: branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/En.rc (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/En.rc Thu Aug 3 01:58:06 2006 @@ -32,9 +32,9 @@ END POPUP "&View" BEGIN - MENUITEM "&Tools", ID_TOOLS, CHECKED - MENUITEM "&Colors", ID_COLOR, CHECKED - MENUITEM "&History", ID_HISTORY, CHECKED + MENUITEM "&Tools", ID_TOOLS + MENUITEM "&Colors", ID_COLOR + MENUITEM "&History", ID_HISTORY MENUITEM "&Status Bar", ID_STATUSBAR, CHECKED END POPUP "&Image" Modified: branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/floatwindow.c (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/floatwindow.c Thu Aug 3 01:58:06 2006 @@ -49,7 +49,7 @@ } -VOID +BOOL FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) { HWND hTb; @@ -67,39 +67,45 @@ NULL, hInstance, NULL); - - SendMessage(hTb, - TB_SETEXTENDEDSTYLE, - 0, - TBSTYLE_EX_HIDECLIPPEDBUTTONS); - - SendMessage(hTb, - TB_BUTTONSTRUCTSIZE, - sizeof(ToolsButtons[0]), - 0); - - SendMessage(hTb, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(16, 16)); - - hImageList = InitImageList(NumButtons, - IDB_TOOLSRECTSEL); - - ImageList_Destroy((HIMAGELIST)SendMessage(hTb, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessage(hTb, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)ToolsButtons); - - SendMessage(hTb, - TB_AUTOSIZE, - 0, - 0); + if (hTb != NULL) + { + SendMessage(hTb, + TB_SETEXTENDEDSTYLE, + 0, + TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + SendMessage(hTb, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hTb, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(16, 16)); + + hImageList = InitImageList(NumButtons, + IDB_TOOLSRECTSEL); + + ImageList_Destroy((HIMAGELIST)SendMessage(hTb, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hTb, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)ToolsButtons); + + SendMessage(hTb, + TB_AUTOSIZE, + 0, + 0); + + return TRUE; + } + + return FALSE; } @@ -158,7 +164,7 @@ } -VOID +BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info) { HWND hColorPicker; @@ -183,6 +189,8 @@ NULL, hInstance, NULL); + if (hColorPicker == NULL) + return FALSE; hHueSlider = CreateWindowEx(0, WC_STATIC, @@ -196,6 +204,8 @@ NULL, hInstance, NULL); + if (hHueSlider == NULL) + return FALSE; hMouseButton = CreateWindowEx(0, WC_COMBOBOX, @@ -206,16 +216,16 @@ NULL, hInstance, NULL); + if (hMouseButton == NULL) + return FALSE; + //MakeFlatCombo(hMouseButton); /* temp, just testing */ - if (hMouseButton != NULL) - { - SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary")); - SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary")); - SendMessage(hMouseButton, CB_SETCURSEL, 0, 0); - - } + SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary")); + SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary")); + SendMessage(hMouseButton, CB_SETCURSEL, 0, 0); + hMore = CreateWindowEx(WS_EX_STATICEDGE, WC_BUTTON, @@ -228,6 +238,8 @@ NULL, hInstance, NULL); + if (hMore == NULL) + return FALSE; hMoreBitmap = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_COLORSMORE), @@ -255,10 +267,12 @@ ReleaseDC(hColorPicker, hDc); } -} - - -VOID + return TRUE; + +} + + +BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) { HWND hList; @@ -275,6 +289,8 @@ NULL, hInstance, NULL); + if (hList == NULL) + return FALSE; NumButtons = sizeof(HistoryButtons) / sizeof(HistoryButtons[0]); hButtons = CreateWindowEx(0, @@ -286,34 +302,40 @@ NULL, hInstance, NULL); - - SendMessage(hButtons, - TB_BUTTONSTRUCTSIZE, - sizeof(ToolsButtons[0]), - 0); - - SendMessage(hButtons, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(10, 10)); - - hImageList = InitImageList(NumButtons, - IDB_HISTBACK); - - ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessage(hButtons, - TB_SETBUTTONSIZE, - 0, - MAKELONG(18, 16)); - - SendMessage(hButtons, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)HistoryButtons); + if (hButtons != NULL) + { + SendMessage(hButtons, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hButtons, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(10, 10)); + + hImageList = InitImageList(NumButtons, + IDB_HISTBACK); + + ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hButtons, + TB_SETBUTTONSIZE, + 0, + MAKELONG(18, 16)); + + SendMessage(hButtons, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)HistoryButtons); + + return TRUE; + } + + return FALSE; } LRESULT CALLBACK Modified: branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/mainwnd.c (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/mainwnd.c Thu Aug 3 01:58:06 2006 @@ -528,6 +528,7 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info) { RECT rect; + HMENU hMenu; UINT Res; PFLT_WND WndArr[NUM_FLT_WND]; /* temp array for looping */ INT i; @@ -595,19 +596,45 @@ } + hMenu = GetMenu(Info->hSelf); + if (Info->fltTools->hSelf != NULL) { - FloatToolbarCreateToolsGui(Info); + if (FloatToolbarCreateToolsGui(Info)) + { + //CheckMenuItem(hMenu, + // ID_TOOLS, + // MF_CHECKED); + + /* temp disable windows until they are useful */ + ShowHideWindow(Info->fltTools); + } } if (Info->fltColors->hSelf != NULL) { - FloatToolbarCreateColorsGui(Info); + if (FloatToolbarCreateColorsGui(Info)) + { + //CheckMenuItem(hMenu, + // ID_COLOR, + // MF_CHECKED); + + /* temp disable windows until they are useful */ + ShowHideWindow(Info->fltColors); + } } if (Info->fltHistory->hSelf != NULL) { - FloatToolbarCreateHistoryGui(Info); + if (FloatToolbarCreateHistoryGui(Info)) + { + //CheckMenuItem(hMenu, + // ID_HISTORY, + // MF_CHECKED); + + /* temp disable windows until they are useful */ + ShowHideWindow(Info->fltHistory); + } } } Modified: branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/precomp.h (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/imagesoft/precomp.h Thu Aug 3 01:58:06 2006 @@ -384,9 +384,9 @@ BOOL bOpaque; } FLT_WND, *PFLT_WND; -VOID FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info); -VOID FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info); -VOID FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info); +BOOL FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info); +BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info); +BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info); BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); BOOL ShowHideWindow(PFLT_WND FltInfo);

18 years, 2 months

[gedmurphy] 23425: disable the floating toolbars by default until they are useful.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Aug 3 01:52:20 2006 New Revision: 23425 URL: http://svn.reactos.org/svn/reactos?rev=23425&view=rev Log: disable the floating toolbars by default until they are useful. Modified: trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/precomp.h Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/En.rc (original) +++ trunk/reactos/base/applications/imagesoft/En.rc Thu Aug 3 01:52:20 2006 @@ -32,10 +32,10 @@ END POPUP "&View" BEGIN - MENUITEM "&Tools", ID_TOOLS, CHECKED - MENUITEM "&Colors", ID_COLOR, CHECKED - MENUITEM "&History", ID_HISTORY, CHECKED - MENUITEM "&Status Bar", ID_STATUSBAR, CHECKED + MENUITEM "&Tools", ID_TOOLS + MENUITEM "&Colors", ID_COLOR + MENUITEM "&History", ID_HISTORY + MENUITEM "&Status Bar", ID_STATUSBAR END POPUP "&Image" BEGIN Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Thu Aug 3 01:52:20 2006 @@ -49,7 +49,7 @@ } -VOID +BOOL FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info) { HWND hTb; @@ -67,39 +67,45 @@ NULL, hInstance, NULL); - - SendMessage(hTb, - TB_SETEXTENDEDSTYLE, - 0, - TBSTYLE_EX_HIDECLIPPEDBUTTONS); - - SendMessage(hTb, - TB_BUTTONSTRUCTSIZE, - sizeof(ToolsButtons[0]), - 0); - - SendMessage(hTb, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(16, 16)); - - hImageList = InitImageList(NumButtons, - IDB_TOOLSRECTSEL); - - ImageList_Destroy((HIMAGELIST)SendMessage(hTb, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessage(hTb, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)ToolsButtons); - - SendMessage(hTb, - TB_AUTOSIZE, - 0, - 0); + if (hTb != NULL) + { + SendMessage(hTb, + TB_SETEXTENDEDSTYLE, + 0, + TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + SendMessage(hTb, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hTb, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(16, 16)); + + hImageList = InitImageList(NumButtons, + IDB_TOOLSRECTSEL); + + ImageList_Destroy((HIMAGELIST)SendMessage(hTb, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hTb, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)ToolsButtons); + + SendMessage(hTb, + TB_AUTOSIZE, + 0, + 0); + + return TRUE; + } + + return FALSE; } @@ -158,7 +164,7 @@ } -VOID +BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info) { HWND hColorPicker; @@ -183,6 +189,8 @@ NULL, hInstance, NULL); + if (hColorPicker == NULL) + return FALSE; hHueSlider = CreateWindowEx(0, WC_STATIC, @@ -196,6 +204,8 @@ NULL, hInstance, NULL); + if (hHueSlider == NULL) + return FALSE; hMouseButton = CreateWindowEx(0, WC_COMBOBOX, @@ -206,16 +216,16 @@ NULL, hInstance, NULL); + if (hMouseButton == NULL) + return FALSE; + //MakeFlatCombo(hMouseButton); /* temp, just testing */ - if (hMouseButton != NULL) - { - SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary")); - SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary")); - SendMessage(hMouseButton, CB_SETCURSEL, 0, 0); - - } + SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary")); + SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary")); + SendMessage(hMouseButton, CB_SETCURSEL, 0, 0); + hMore = CreateWindowEx(WS_EX_STATICEDGE, WC_BUTTON, @@ -228,6 +238,8 @@ NULL, hInstance, NULL); + if (hMore == NULL) + return FALSE; hMoreBitmap = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDB_COLORSMORE), @@ -255,10 +267,12 @@ ReleaseDC(hColorPicker, hDc); } -} - - -VOID + return TRUE; + +} + + +BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info) { HWND hList; @@ -275,6 +289,8 @@ NULL, hInstance, NULL); + if (hList == NULL) + return FALSE; NumButtons = sizeof(HistoryButtons) / sizeof(HistoryButtons[0]); hButtons = CreateWindowEx(0, @@ -286,34 +302,40 @@ NULL, hInstance, NULL); - - SendMessage(hButtons, - TB_BUTTONSTRUCTSIZE, - sizeof(ToolsButtons[0]), - 0); - - SendMessage(hButtons, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(10, 10)); - - hImageList = InitImageList(NumButtons, - IDB_HISTBACK); - - ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, - TB_SETIMAGELIST, - 0, - (LPARAM)hImageList)); - - SendMessage(hButtons, - TB_SETBUTTONSIZE, - 0, - MAKELONG(18, 16)); - - SendMessage(hButtons, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)HistoryButtons); + if (hButtons != NULL) + { + SendMessage(hButtons, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hButtons, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(10, 10)); + + hImageList = InitImageList(NumButtons, + IDB_HISTBACK); + + ImageList_Destroy((HIMAGELIST)SendMessage(hButtons, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hButtons, + TB_SETBUTTONSIZE, + 0, + MAKELONG(18, 16)); + + SendMessage(hButtons, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)HistoryButtons); + + return TRUE; + } + + return FALSE; } LRESULT CALLBACK Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Thu Aug 3 01:52:20 2006 @@ -528,6 +528,7 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info) { RECT rect; + HMENU hMenu; UINT Res; PFLT_WND WndArr[NUM_FLT_WND]; /* temp array for looping */ INT i; @@ -595,19 +596,45 @@ } + hMenu = GetMenu(Info->hSelf); + if (Info->fltTools->hSelf != NULL) { - FloatToolbarCreateToolsGui(Info); + if (FloatToolbarCreateToolsGui(Info)) + { + //CheckMenuItem(hMenu, + // ID_TOOLS, + // MF_CHECKED); + + /* temp disable windows until they are useful */ + ShowHideWindow(Info->fltTools); + } } if (Info->fltColors->hSelf != NULL) { - FloatToolbarCreateColorsGui(Info); + if (FloatToolbarCreateColorsGui(Info)) + { + //CheckMenuItem(hMenu, + // ID_COLOR, + // MF_CHECKED); + + /* temp disable windows until they are useful */ + ShowHideWindow(Info->fltColors); + } } if (Info->fltHistory->hSelf != NULL) { - FloatToolbarCreateHistoryGui(Info); + if (FloatToolbarCreateHistoryGui(Info)) + { + //CheckMenuItem(hMenu, + // ID_HISTORY, + // MF_CHECKED); + + /* temp disable windows until they are useful */ + ShowHideWindow(Info->fltHistory); + } } } Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Thu Aug 3 01:52:20 2006 @@ -384,9 +384,9 @@ BOOL bOpaque; } FLT_WND, *PFLT_WND; -VOID FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info); -VOID FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info); -VOID FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info); +BOOL FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info); +BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info); +BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info); BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); BOOL ShowHideWindow(PFLT_WND FltInfo);

18 years, 2 months

[hpoussin] 23424: Winlogon: - Register CTRL+ALT+DELETE notification - Better session loop between all GINA dialogs - Display a dialog box if GINA DLL cannot be loaded GINA: - Add an graphical and text interface to enter username/password - Take care of autologon parameters in registry

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 3 01:01:37 2006 New Revision: 23424 URL: http://svn.reactos.org/svn/reactos?rev=23424&view=rev Log: Winlogon: - Register CTRL+ALT+DELETE notification - Better session loop between all GINA dialogs - Display a dialog box if GINA DLL cannot be loaded GINA: - Add an graphical and text interface to enter username/password - Take care of autologon parameters in registry Added: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/msgina.rbuild trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msgina/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… Added: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… Added: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev…

18 years, 2 months

[janderwald] 23423: .c files are not executable files

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 3 00:51:13 2006 New Revision: 23423 URL: http://svn.reactos.org/svn/reactos?rev=23423&view=rev Log: .c files are not executable files Modified: trunk/reactos/base/setup/usetup/cabinet.c (props changed) trunk/reactos/base/setup/usetup/cabinet.h (props changed) trunk/reactos/base/setup/usetup/format.c (props changed) trunk/reactos/base/setup/usetup/format.h (props changed) trunk/reactos/base/setup/usetup/keytrans.h (contents, props changed) Propchange: trunk/reactos/base/setup/usetup/cabinet.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/usetup/cabinet.h ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/usetup/format.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/usetup/format.h ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/setup/usetup/keytrans.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/keytrans… ============================================================================== --- trunk/reactos/base/setup/usetup/keytrans.h (original) +++ trunk/reactos/base/setup/usetup/keytrans.h Thu Aug 3 00:51:13 2006 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: keytrans.h 12852 2005-01-06 13:58:04Z mf $ +/* $Id$ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/keytrans.h Propchange: trunk/reactos/base/setup/usetup/keytrans.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

18 years, 2 months

[hpoussin] 23422: - Implement INF_STYLE_OLDNT style in SetupOpenInfFileW - Add some documentation in header file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Aug 3 00:45:13 2006 New Revision: 23422 URL: http://svn.reactos.org/svn/reactos?rev=23422&view=rev Log: - Implement INF_STYLE_OLDNT style in SetupOpenInfFileW - Add some documentation in header file Modified: trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Thu Aug 3 00:45:13 2006 @@ -910,7 +910,7 @@ * * parse an INF file. */ -static struct inf_file *parse_file( HANDLE handle, UINT *error_line ) +static struct inf_file *parse_file( HANDLE handle, UINT *error_line, DWORD style ) { void *buffer; DWORD err = 0; @@ -962,6 +962,8 @@ if (!err) /* now check signature */ { int version_index = find_section( file, Version ); + if (version_index == -1 && (style & INF_STYLE_OLDNT)) + goto done; if (version_index != -1) { struct line *line = find_line( file, version_index, Signature ); @@ -1148,6 +1150,12 @@ TRACE("%s %s %lx %p\n", debugstr_w(name), debugstr_w(class), style, error); + if (style & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return (HINF)INVALID_HANDLE_VALUE; + } + if (strchrW( name, '\\' ) || strchrW( name, '/' )) { if (!(len = GetFullPathNameW( name, 0, NULL, NULL ))) return (HINF)INVALID_HANDLE_VALUE; @@ -1185,7 +1193,7 @@ if (handle != INVALID_HANDLE_VALUE) { - file = parse_file( handle, error ); + file = parse_file( handle, error, style ); CloseHandle( handle ); } if (!file) Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Thu Aug 3 00:45:13 2006 @@ -1,6 +1,6 @@ /* * Copyright 2001 Andreas Mohr - * Copyright 2005 Hervé Poussineau + * Copyright 2005-2006 Hervé Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,6 +54,7 @@ { LIST_ENTRY ListEntry; + /* Link to is parent device */ struct DeviceInfoElement* DeviceInfo; GUID InterfaceClassGuid; @@ -64,14 +65,19 @@ */ DWORD Flags; - WCHAR SymbolicLink[ANYSIZE_ARRAY]; /* \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ + /* Contains the symbolic link of this interface, for example + * \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ + WCHAR SymbolicLink[ANYSIZE_ARRAY]; }; /* We don't want to open the .inf file to read only one information in it, so keep a handle to it once it * has been already loaded once. Keep also a reference counter */ struct InfFileDetails { + /* Handle to the .inf file */ HINF hInf; + /* Reference count to this object. Once it raises 0, the .inf file is + * automatically closed and this memory structure is deleted */ LONG References; /* Contains the directory name of the .inf file. @@ -81,6 +87,7 @@ * Points into szData at then end of the structure */ PCWSTR FileName; + /* Variable size array (contains data for DirectoryName and FileName) */ WCHAR szData[ANYSIZE_ARRAY]; }; @@ -105,9 +112,11 @@ struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ { LIST_ENTRY ListEntry; - DEVINST dnDevInst; /* Used in CM_* functions */ - - /* Reserved Field points to a struct DriverInfoElement */ + /* Used when dealing with CM_* functions */ + DEVINST dnDevInst; + + /* Reserved Field of SP_DEVINSTALL_PARAMS_W structure + * points to a struct DriverInfoElement */ SP_DEVINSTALL_PARAMS_W InstallParams; /* Information about devnode: @@ -151,23 +160,29 @@ /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ struct ClassInstallParams ClassInstallParams; + /* Variable size array (contains data for DeviceName, UniqueId, DeviceDescription) */ WCHAR Data[ANYSIZE_ARRAY]; }; struct DeviceInfoSet /* HDEVINFO */ { DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ - GUID ClassGuid; /* If != GUID_NULL, only devices of this class can be in the device info set */ - HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ - HMACHINE hMachine; /* Used in CM_* functions */ + /* If != GUID_NULL, only devices of this class can be in the device info set */ + GUID ClassGuid; + /* Local or distant HKEY_LOCAL_MACHINE registry key */ + HKEY HKLM; + /* Used when dealing with CM_* functions */ + HMACHINE hMachine; /* Reserved Field points to a struct DriverInfoElement */ SP_DEVINSTALL_PARAMS_W InstallParams; - /* If the driver is not searched/detected, this list is empty */ - LIST_ENTRY DriverListHead; /* List of struct DriverInfoElement */ - - LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ + /* List of struct DriverInfoElement (if no driver has been + * searched/detected, this list is empty) */ + LIST_ENTRY DriverListHead; + + /* List of struct DeviceInfoElement */ + LIST_ENTRY ListHead; struct DeviceInfoElement *SelectedDevice; /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ @@ -177,6 +192,8 @@ * or NULL if related to local machine. Points into szData field at the * end of the structure */ PCWSTR MachineName; + + /* Variable size array (contains data for MachineName) */ WCHAR szData[ANYSIZE_ARRAY]; }; @@ -188,6 +205,8 @@ * or NULL if related to local machine. Points into szData field at the * end of the structure */ PCWSTR MachineName; + + /* Variable size array (contains data for MachineName) */ WCHAR szData[ANYSIZE_ARRAY]; };

18 years, 2 months

[gedmurphy] 23421: fix MSI build warnings

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Aug 3 00:01:22 2006 New Revision: 23421 URL: http://svn.reactos.org/svn/reactos?rev=23421&view=rev Log: fix MSI build warnings Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/source.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c (original) +++ trunk/reactos/dll/win32/msi/action.c Thu Aug 3 00:01:22 2006 @@ -30,6 +30,7 @@ #define COBJMACROS +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winerror.h" Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… ============================================================================== --- trunk/reactos/dll/win32/msi/appsearch.c (original) +++ trunk/reactos/dll/win32/msi/appsearch.c Thu Aug 3 00:01:22 2006 @@ -21,6 +21,7 @@ #define COBJMACROS +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winreg.h" Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/classes.c (original) +++ trunk/reactos/dll/win32/msi/classes.c Thu Aug 3 00:01:22 2006 @@ -31,6 +31,7 @@ #include <stdarg.h> +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winerror.h" Modified: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/helpers.c (original) +++ trunk/reactos/dll/win32/msi/helpers.c Thu Aug 3 00:01:22 2006 @@ -25,6 +25,7 @@ #include <stdarg.h> +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winerror.h" Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/install.c (original) +++ trunk/reactos/dll/win32/msi/install.c Thu Aug 3 00:01:22 2006 @@ -22,6 +22,7 @@ #include <stdarg.h> +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winerror.h" Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=23… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c (original) +++ trunk/reactos/dll/win32/msi/msi.c Thu Aug 3 00:01:22 2006 @@ -23,6 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winreg.h" Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Thu Aug 3 00:01:22 2006 @@ -5,6 +5,8 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msiquery.c (original) +++ trunk/reactos/dll/win32/msi/msiquery.c Thu Aug 3 00:01:22 2006 @@ -22,6 +22,7 @@ #define COBJMACROS +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winerror.h" Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c (original) +++ trunk/reactos/dll/win32/msi/registry.c Thu Aug 3 00:01:22 2006 @@ -24,6 +24,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winreg.h" Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/source.c (original) +++ trunk/reactos/dll/win32/msi/source.c Thu Aug 3 00:01:22 2006 @@ -23,6 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winreg.h"

18 years, 2 months

[gedmurphy] 23420: remove wine file. This should now be defined in our psdk

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Aug 3 00:00:45 2006 New Revision: 23420 URL: http://svn.reactos.org/svn/reactos?rev=23420&view=rev Log: remove wine file. This should now be defined in our psdk Removed: trunk/reactos/include/reactos/wine/richedit.h Removed: trunk/reactos/include/reactos/wine/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/riche… ============================================================================== --- trunk/reactos/include/reactos/wine/richedit.h (original) +++ trunk/reactos/include/reactos/wine/richedit.h (removed) @@ -1,52 +1,0 @@ -/* - * Copyright (C) 2000 Jean-Claude Batista - * Copyright (C) 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include_next <richedit.h> - -#ifndef __WINE_RICHEDIT_H -#define __WINE_RICHEDIT_H - -#include "pshpack4.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _RICHEDIT_VER -#define _RICHEDIT_VER 0x0210 -#endif /* _RICHEDIT_VER */ - -#define cchTextLimitDefault 0x7fff - -#define RICHEDIT_CLASS20A "RichEdit20A" -#if defined(__GNUC__) -# define RICHEDIT_CLASS20W (const WCHAR []){ 'R','i','c','h','E','d','i','t','2','0','W',0 } -#elif defined(_MSC_VER) -# define RICHEDIT_CLASS20W L"RichEdit20W" -#else -static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 }; -#endif -#define RICHEDIT_CLASS10A "RICHEDIT" - -#ifdef __cplusplus -} -#endif - -#include "poppack.h" -#endif /* __WINE_RICHEDIT_H */

18 years, 2 months

[janderwald] 23419: add description on how to bypass MBR installation page

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 2 22:59:06 2006 New Revision: 23419 URL: http://svn.reactos.org/svn/reactos?rev=23419&view=rev Log: add description on how to bypass MBR installation page Modified: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Wed Aug 2 22:59:06 2006 @@ -3,4 +3,8 @@ Signature = "$ReactOS$" DestinationDiskNumber = 0 DestinationPartitionNumber = 1 -InstallationDirectory=ReactOS +InstallationDirectory=ReactOS +;MBRInstallType=0 skips MBR installation +;MBRInstallType=1 install MBR on floppy +;MBRInstallType=2 install MBR on hdd +MBRInstallType=2

18 years, 2 months

[janderwald] 23418: * make ReactOS textmode setup full-unattendable

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 2 22:58:07 2006 New Revision: 23418 URL: http://svn.reactos.org/svn/reactos?rev=23418&view=rev Log: * make ReactOS textmode setup full-unattendable Modified: trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Wed Aug 2 22:58:07 2006 @@ -84,6 +84,7 @@ BOOLEAN IsUnattendedSetup; LONG UnattendDestinationDiskNumber; LONG UnattendDestinationPartitionNumber; +LONG UnattendMBRInstallType = -1; WCHAR UnattendInstallationDirectory[MAX_PATH]; /* LOCALS *******************************************************************/ @@ -506,9 +507,28 @@ wcscpy(UnattendInstallationDirectory, Value); InfFreeContext(Context); + + IsUnattendedSetup = TRUE; + + /* Search for 'MBRInstallType' in the 'Unattend' section */ + if (!InfFindFirstLine(UnattendInf, L"Unattend", L"MBRInstallType", &Context)) + { + DPRINT("InfFindFirstLine() failed for key 'MBRInstallType'\n"); + InfFreeContext(Context); + InfCloseFile(UnattendInf); + return; + } + if (!InfGetIntField(Context, 0, &IntValue)) + { + DPRINT("InfGetIntField() failed for key 'MBRInstallType'\n"); + InfFreeContext(Context); + InfCloseFile(UnattendInf); + return; + } + UnattendMBRInstallType = IntValue; + InfFreeContext(Context); + InfCloseFile(UnattendInf); - - IsUnattendedSetup = TRUE; DPRINT("Running unattended setup\n"); } @@ -707,6 +727,12 @@ if (IsUnattendedSetup) { + //TODO + //read options from inf + ComputerList = CreateComputerTypeList(SetupInf); + DisplayList = CreateDisplayDriverList(SetupInf); + KeyboardList = CreateKeyboardDriverList(SetupInf); + LayoutList = CreateKeyboardLayoutList(SetupInf); return INSTALL_INTRO_PAGE; } @@ -3299,6 +3325,22 @@ return BOOT_LOADER_FLOPPY_PAGE; } + if (IsUnattendedSetup) + { + if (UnattendMBRInstallType == 0) /* skip MBR installation */ + { + return SUCCESS_PAGE; + } + else if (UnattendMBRInstallType == 1) /* install on floppy */ + { + return BOOT_LOADER_FLOPPY_PAGE; + } + else if (UnattendMBRInstallType == 2) /* install on hdd */ + { + return BOOT_LOADER_HARDDISK_PAGE; + } + } + SetTextXY(6, 8, "Setup is installing the boot loader"); SetTextXY(8, 12, "Install bootloader on the harddisk (MBR).");

18 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2006