Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[janderwald] 35675: - Readd undocumented constants as commdlg needs them

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 26 11:01:13 2008 New Revision: 35675 URL: http://svn.reactos.org/svn/reactos?rev=35675&view=rev Log: - Readd undocumented constants as commdlg needs them Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Tue Aug 26 11:01:13 2008 @@ -151,9 +151,44 @@ #define SV_CLASS_NAME ("SHELLDLL_DefView") #define FCIDM_SHVIEWFIRST 0x0000 +/* undocumented */ +#define FCIDM_SHVIEW_ARRANGE 0x7001 +#define FCIDM_SHVIEW_DELETE 0x7011 +#define FCIDM_SHVIEW_PROPERTIES 0x7013 +#define FCIDM_SHVIEW_CUT 0x7018 +#define FCIDM_SHVIEW_COPY 0x7019 +#define FCIDM_SHVIEW_INSERT 0x701A +#define FCIDM_SHVIEW_UNDO 0x701B +#define FCIDM_SHVIEW_INSERTLINK 0x701C +#define FCIDM_SHVIEW_SELECTALL 0x7021 +#define FCIDM_SHVIEW_INVERTSELECTION 0x7022 + +#define FCIDM_SHVIEW_BIGICON 0x7029 +#define FCIDM_SHVIEW_SMALLICON 0x702A +#define FCIDM_SHVIEW_LISTVIEW 0x702B +#define FCIDM_SHVIEW_REPORTVIEW 0x702C +/* 0x7030-0x703f are used by the shellbrowser */ +#define FCIDM_SHVIEW_AUTOARRANGE 0x7031 +#define FCIDM_SHVIEW_SNAPTOGRID 0x7032 + +#define FCIDM_SHVIEW_HELP 0x7041 +#define FCIDM_SHVIEW_RENAME 0x7050 +#define FCIDM_SHVIEW_CREATELINK 0x7051 +#define FCIDM_SHVIEW_NEWLINK 0x7052 +#define FCIDM_SHVIEW_NEWFOLDER 0x7053 + +#define FCIDM_SHVIEW_REFRESH 0x7100 /* FIXME */ +#define FCIDM_SHVIEW_EXPLORE 0x7101 /* FIXME */ +#define FCIDM_SHVIEW_OPEN 0x7102 /* FIXME */ + #define FCIDM_SHVIEWLAST 0x7fff #define FCIDM_BROWSERFIRST 0xA000 /* undocumented toolbar items from stddlg's*/ +#define FCIDM_TB_UPFOLDER 0xA001 +#define FCIDM_TB_NEWFOLDER 0xA002 +#define FCIDM_TB_SMALLICON 0xA003 +#define FCIDM_TB_REPORTVIEW 0xA004 +#define FCIDM_TB_DESKTOP 0xA005 /* FIXME */ #define FCIDM_BROWSERLAST 0xbf00 #define FCIDM_GLOBALFIRST 0x8000

16 years, 4 months

[janderwald] 35674: shell32 update (1/2) - Use precompiled headers for shell32 - Use __inline for MSVC compability - Fix api definitions of SHCreateStdEnumFmtEtc, GetFileNameFromBrowse, SHCreateDirectory, SHCreateDirectoryExA, SHCreateDirectoryExW, Dad_AutoScroll, CDefFolderMenu_Create2, SHChangeNotifyRegister - msvc now compiles nearly all of shell32 (with WDK headers)

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 26 10:50:23 2008 New Revision: 35674 URL: http://svn.reactos.org/svn/reactos?rev=35674&view=rev Log: shell32 update (1/2) - Use precompiled headers for shell32 - Use __inline for MSVC compability - Fix api definitions of SHCreateStdEnumFmtEtc, GetFileNameFromBrowse, SHCreateDirectory, SHCreateDirectoryExA, SHCreateDirectoryExW, Dad_AutoScroll, CDefFolderMenu_Create2, SHChangeNotifyRegister - msvc now compiles nearly all of shell32 (with WDK headers) Added: trunk/reactos/dll/win32/shell32/precomp.h (with props) Modified: trunk/reactos/dll/win32/shell32/autocomplete.c trunk/reactos/dll/win32/shell32/brsfolder.c trunk/reactos/dll/win32/shell32/changenotify.c trunk/reactos/dll/win32/shell32/classes.c trunk/reactos/dll/win32/shell32/clipboard.c trunk/reactos/dll/win32/shell32/control.c trunk/reactos/dll/win32/shell32/cpanelfolder.c trunk/reactos/dll/win32/shell32/dataobject.c trunk/reactos/dll/win32/shell32/dde.c trunk/reactos/dll/win32/shell32/debughlp.c trunk/reactos/dll/win32/shell32/desktop.c trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/dragdrophelper.c trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/enumidlist.c trunk/reactos/dll/win32/shell32/extracticon.c trunk/reactos/dll/win32/shell32/folder_options.c trunk/reactos/dll/win32/shell32/folders.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/iconcache.c trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/ros-systray.c trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shell.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.c trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellfolder.h trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/shellpath.c trunk/reactos/dll/win32/shell32/shellreg.c trunk/reactos/dll/win32/shell32/shellstring.c trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shfldr_admintools.c trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shfldr_fonts.c trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shfldr_mycomp.c trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c trunk/reactos/dll/win32/shell32/shfldr_netplaces.c trunk/reactos/dll/win32/shell32/shfldr_printers.c trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c trunk/reactos/dll/win32/shell32/shlexec.c trunk/reactos/dll/win32/shell32/shlfileop.c trunk/reactos/dll/win32/shell32/shlfolder.c trunk/reactos/dll/win32/shell32/shlfsbind.c trunk/reactos/dll/win32/shell32/shlmenu.c trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shell32/shpolicy.c trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_def_cmenu.c trunk/reactos/dll/win32/shell32/shv_item_new.c trunk/reactos/dll/win32/shell32/startmenu.c trunk/reactos/dll/win32/shell32/undocshell.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… Modified: trunk/reactos/dll/win32/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… Modified: trunk/reactos/dll/win32/shell32/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… Modified: trunk/reactos/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… Modified: trunk/reactos/dll/win32/shell32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/clipboar… Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… Modified: trunk/reactos/dll/win32/shell32/dataobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje… Modified: trunk/reactos/dll/win32/shell32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.c?re… Modified: trunk/reactos/dll/win32/shell32/debughlp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/debughlp… Modified: trunk/reactos/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… Modified: trunk/reactos/dll/win32/shell32/dragdrophelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dragdrop… Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… Modified: trunk/reactos/dll/win32/shell32/enumidlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… Modified: trunk/reactos/dll/win32/shell32/extracticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/extracti… Modified: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… Modified: trunk/reactos/dll/win32/shell32/folders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… Added: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Modified: trunk/reactos/dll/win32/shell32/ros-systray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/ros-syst… Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Modified: trunk/reactos/dll/win32/shell32/shell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell.c?… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shellfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellfol… Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… Modified: trunk/reactos/dll/win32/shell32/shellreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellreg… Modified: trunk/reactos/dll/win32/shell32/shellstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellstr… Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… Modified: trunk/reactos/dll/win32/shell32/shfldr_admintools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Modified: trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Modified: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Modified: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… Modified: trunk/reactos/dll/win32/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… Modified: trunk/reactos/dll/win32/shell32/shlfsbind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfsbin… Modified: trunk/reactos/dll/win32/shell32/shlmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.… Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… Modified: trunk/reactos/dll/win32/shell32/shpolicy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shpolicy… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… Modified: trunk/reactos/dll/win32/shell32/startmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/startmen… Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe…

16 years, 4 months

[janderwald] 35673: shell32 update (1/2) - The Fonts Shell Folder && Admin Shell Folder GUID is not documented in shlguid.h - Fix api declaration of SHCreateStdEnumFmtEtc, GetFileNameFromBrowse, SHCreateDirectory, SHCreateDirectoryExA, SHCreateDirectoryExW, Dad_AutoScroll, CDefFolderMenu_Create2, SHChangeNotifyRegister - Fix EXP_DARWIN_LINK && OPENASINFO structure - Remove CSIDL_FOLDER_MASK undocumented shellview ids

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 26 10:50:17 2008 New Revision: 35673 URL: http://svn.reactos.org/svn/reactos?rev=35673&view=rev Log: shell32 update (1/2) - The Fonts Shell Folder && Admin Shell Folder GUID is not documented in shlguid.h - Fix api declaration of SHCreateStdEnumFmtEtc, GetFileNameFromBrowse, SHCreateDirectory, SHCreateDirectoryExA, SHCreateDirectoryExW, Dad_AutoScroll, CDefFolderMenu_Create2, SHChangeNotifyRegister - Fix EXP_DARWIN_LINK && OPENASINFO structure - Remove CSIDL_FOLDER_MASK undocumented shellview ids Modified: trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Tue Aug 26 10:50:17 2008 @@ -116,8 +116,6 @@ DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36, 0x1b, 0x11, 0x03); DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, 0x32, 0xF1, 0xE9, 0x57, 0x5D); -DEFINE_GUID(CLSID_FontsFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41,0x52); -DEFINE_GUID(CLSID_AdminFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41, 0x53); DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57); DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Tue Aug 26 10:50:17 2008 @@ -46,12 +46,12 @@ DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); #define SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString) -HRESULT WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IEnumFORMATETC**); +HRESULT WINAPI SHCreateStdEnumFmtEtc(UINT,const FORMATETC *,IEnumFORMATETC**); void WINAPI SHDestroyPropSheetExtArray(HPSXA); BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); void WINAPI SHFree(LPVOID); -BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); +BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); @@ -151,44 +151,9 @@ #define SV_CLASS_NAME ("SHELLDLL_DefView") #define FCIDM_SHVIEWFIRST 0x0000 -/* undocumented */ -#define FCIDM_SHVIEW_ARRANGE 0x7001 -#define FCIDM_SHVIEW_DELETE 0x7011 -#define FCIDM_SHVIEW_PROPERTIES 0x7013 -#define FCIDM_SHVIEW_CUT 0x7018 -#define FCIDM_SHVIEW_COPY 0x7019 -#define FCIDM_SHVIEW_INSERT 0x701A -#define FCIDM_SHVIEW_UNDO 0x701B -#define FCIDM_SHVIEW_INSERTLINK 0x701C -#define FCIDM_SHVIEW_SELECTALL 0x7021 -#define FCIDM_SHVIEW_INVERTSELECTION 0x7022 - -#define FCIDM_SHVIEW_BIGICON 0x7029 -#define FCIDM_SHVIEW_SMALLICON 0x702A -#define FCIDM_SHVIEW_LISTVIEW 0x702B -#define FCIDM_SHVIEW_REPORTVIEW 0x702C -/* 0x7030-0x703f are used by the shellbrowser */ -#define FCIDM_SHVIEW_AUTOARRANGE 0x7031 -#define FCIDM_SHVIEW_SNAPTOGRID 0x7032 - -#define FCIDM_SHVIEW_HELP 0x7041 -#define FCIDM_SHVIEW_RENAME 0x7050 -#define FCIDM_SHVIEW_CREATELINK 0x7051 -#define FCIDM_SHVIEW_NEWLINK 0x7052 -#define FCIDM_SHVIEW_NEWFOLDER 0x7053 - -#define FCIDM_SHVIEW_REFRESH 0x7100 /* FIXME */ -#define FCIDM_SHVIEW_EXPLORE 0x7101 /* FIXME */ -#define FCIDM_SHVIEW_OPEN 0x7102 /* FIXME */ - #define FCIDM_SHVIEWLAST 0x7fff #define FCIDM_BROWSERFIRST 0xA000 /* undocumented toolbar items from stddlg's*/ -#define FCIDM_TB_UPFOLDER 0xA001 -#define FCIDM_TB_NEWFOLDER 0xA002 -#define FCIDM_TB_SMALLICON 0xA003 -#define FCIDM_TB_REPORTVIEW 0xA004 -#define FCIDM_TB_DESKTOP 0xA005 /* FIXME */ #define FCIDM_BROWSERLAST 0xbf00 #define FCIDM_GLOBALFIRST 0x8000 @@ -1147,7 +1112,13 @@ } NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; typedef struct { + +#ifdef __cplusplus DATABLOCK_HEADER dbh; +#else + DWORD cbSize; + DWORD dwSignature; +#endif CHAR szDarwinID[MAX_PATH]; WCHAR szwDarwinID[MAX_PATH]; } EXP_DARWIN_LINK, *LPEXP_DARWIN_LINK; @@ -1188,7 +1159,7 @@ } SHChangeProductKeyAsIDList, *LPSHChangeProductKeyAsIDList; ULONG WINAPI SHChangeNotifyRegister(HWND hwnd, int fSources, LONG fEvents, UINT wMsg, - int cEntries, SHChangeNotifyEntry *pshcne); + int cEntries, const SHChangeNotifyEntry *pshcne); BOOL WINAPI SHChangeNotifyDeregister(ULONG ulID); BOOL WINAPI SHChangeNotification_Unlock(HANDLE hLock); @@ -1197,9 +1168,9 @@ /**************************************************************************** * SHCreateDirectory API */ -DWORD WINAPI SHCreateDirectory(HWND, LPCVOID); -int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); -int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); +DWORD WINAPI SHCreateDirectory(HWND, LPCWSTR); +int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, const SECURITY_ATTRIBUTES*); +int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, const SECURITY_ATTRIBUTES*); /**************************************************************************** * SHGetSpecialFolderLocation API @@ -1277,7 +1248,6 @@ #define CSIDL_CDBURN_AREA 0x003b #define CSIDL_COMPUTERSNEARME 0x003d #define CSIDL_PROFILES 0x003e -#define CSIDL_FOLDER_MASK 0x00ff #define CSIDL_FLAG_PER_USER_INIT 0x0800 #define CSIDL_FLAG_NO_ALIAS 0x1000 #define CSIDL_FLAG_DONT_VERIFY 0x4000 @@ -1417,7 +1387,7 @@ BOOL WINAPI DAD_DragEnterEx2(HWND,POINT,IDataObject*); BOOL WINAPI DAD_DragMove(POINT); BOOL WINAPI DAD_DragLeave(void); -BOOL WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,LPPOINT); +BOOL WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,const POINT*); HRESULT WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD); LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL); @@ -1470,7 +1440,7 @@ HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv); typedef HRESULT (CALLBACK * LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM); -INT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,HKEY *,IContextMenu **); +HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,const HKEY *,IContextMenu **); /**************************************************************************** * SHCreateDefaultContextMenu API @@ -1522,8 +1492,8 @@ typedef struct tagOPENASINFO { - LPCTSTR pcszFile; - LPCTSTR pcszClass; + LPCWSTR pcszFile; + LPCWSTR pcszClass; OPEN_AS_INFO_FLAGS oaifInFlags; } OPENASINFO; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Tue Aug 26 10:50:17 2008 @@ -7,6 +7,13 @@ #ifdef __cplusplus extern "C" { #endif + +#if !defined(_USER32_) +#define WINUSERAPI DECLSPEC_IMPORT +#else +#define WINUSERAPI +#endif + #define WC_DIALOG MAKEINTATOM(0x8002) #define FALT 16 Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Tue Aug 26 10:50:17 2008 @@ -8,7 +8,7 @@ #include <wingdi.h> #if !defined(_MSC_VER) -#include "../../psdk/winuser.h" +#include_next "winuser.h" #endif #define WS_EX_TRAYWINDOW 0x80000000L @@ -16,8 +16,8 @@ #define WS_EX_MANAGED 0x40000000L /* Window managed by the window system */ #define LB_CARETOFF 0x01a4 -UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); -UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); +WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); +WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); typedef struct tagCWPSTRUCT *LPCWPSTRUCT; @@ -31,12 +31,13 @@ #endif /* MapVirtualKey translation types */ +#if 0 #define MAPVK_VK_TO_VSC 0 #define MAPVK_VSC_TO_VK 1 #define MAPVK_VK_TO_CHAR 2 #define MAPVK_VSC_TO_VK_EX 3 #define MAPVK_VK_TO_VSC_EX 4 - +#endif #define WM_SETVISIBLE 0x0009 #define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom))))

16 years, 4 months

[jmorlan] 35672: - RtlSetEnvironmentVariable: To delete a variable, it is necessary to pass a NULL pointer as the value; passing an empty string should create an empty variable. Remove Value->Length > 0 check. - SetEnvironmentVariable(A|W): When given a NULL value, pass NULL to RtlSetEnvironmentVariable. - cmd_set: When given an empty value, pass NULL to SetEnvironmentVariable.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Aug 26 10:28:29 2008 New Revision: 35672 URL: http://svn.reactos.org/svn/reactos?rev=35672&view=rev Log: - RtlSetEnvironmentVariable: To delete a variable, it is necessary to pass a NULL pointer as the value; passing an empty string should create an empty variable. Remove Value->Length > 0 check. - SetEnvironmentVariable(A|W): When given a NULL value, pass NULL to RtlSetEnvironmentVariable. - cmd_set: When given an empty value, pass NULL to SetEnvironmentVariable. Modified: trunk/reactos/base/shell/cmd/set.c trunk/reactos/dll/win32/kernel32/misc/env.c trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Tue Aug 26 10:28:29 2008 @@ -154,7 +154,7 @@ } *p++ = _T('\0'); - if (!SetEnvironmentVariable(param, p)) + if (!SetEnvironmentVariable(param, *p ? p : NULL)) { nErrorLevel = 1; return 1; Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] Tue Aug 26 10:28:29 2008 @@ -193,18 +193,27 @@ &VarName, TRUE); - RtlInitAnsiString (&VarValue, - (LPSTR)lpValue); - RtlAnsiStringToUnicodeString (&VarValueU, - &VarValue, - TRUE); - - Status = RtlSetEnvironmentVariable (NULL, - &VarNameU, - &VarValueU); - + if (lpValue) + { + RtlInitAnsiString (&VarValue, + (LPSTR)lpValue); + RtlAnsiStringToUnicodeString (&VarValueU, + &VarValue, + TRUE); + + Status = RtlSetEnvironmentVariable (NULL, + &VarNameU, + &VarValueU); + + RtlFreeUnicodeString (&VarValueU); + } + else + { + Status = RtlSetEnvironmentVariable (NULL, + &VarNameU, + NULL); + } RtlFreeUnicodeString (&VarNameU); - RtlFreeUnicodeString (&VarValueU); if (!NT_SUCCESS(Status)) { @@ -235,12 +244,22 @@ RtlInitUnicodeString (&VarName, lpName); - RtlInitUnicodeString (&VarValue, - lpValue); - - Status = RtlSetEnvironmentVariable (NULL, - &VarName, - &VarValue); + if (lpValue) + { + RtlInitUnicodeString (&VarValue, + lpValue); + + Status = RtlSetEnvironmentVariable (NULL, + &VarName, + &VarValue); + } + else + { + Status = RtlSetEnvironmentVariable (NULL, + &VarName, + NULL); + } + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus (Status); Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=35672&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Tue Aug 26 10:28:29 2008 @@ -355,7 +355,7 @@ } found: - if (Value != NULL && Value->Length > 0) + if (Value != NULL) { hole_len = tail - hole; /* calculate new environment size */

16 years, 4 months

[jmorlan] 35671: Prohibit an empty name in RtlSetEnvironmentVariable

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Aug 26 09:45:37 2008 New Revision: 35671 URL: http://svn.reactos.org/svn/reactos?rev=35671&view=rev Log: Prohibit an empty name in RtlSetEnvironmentVariable Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=35671&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Tue Aug 26 09:45:37 2008 @@ -282,6 +282,10 @@ DPRINT("RtlSetEnvironmentVariable(Environment %p Name %wZ Value %wZ)\n", Environment, Name, Value); + /* Variable name must not be empty */ + if (Name->Length < sizeof(WCHAR)) + return STATUS_INVALID_PARAMETER; + /* Variable names can't contain a '=' except as a first character. */ for (wcs = Name->Buffer + 1; wcs < Name->Buffer + (Name->Length / sizeof(WCHAR));

16 years, 4 months

[dreimer] 35670: More work. Now you can use command line Parameters to disable parts of the Updater.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Aug 26 08:41:43 2008 New Revision: 35670 URL: http://svn.reactos.org/svn/reactos?rev=35670&view=rev Log: More work. Now you can use command line Parameters to disable parts of the Updater. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Aug 26 08:41:43 2008 @@ -8,107 +8,134 @@ :: @echo off +:: Set Title +title Updating... + :: The Update Server. set _ROSBE_URL=www.foo.bar -:: First check for a new Updater -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/update.cmd -"%_ROSBE_BASEDIR%\update.cmd" +:: Default Variables. +set _ROSBE_CMDS=yes +set _ROSBE_ZIPS=yes -:: PS1 Files. -if exist "%_ROSBE_BASEDIR%\Build.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.ps1 -) -if exist "%_ROSBE_BASEDIR%\Clean.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.ps1 -) -if exist "%_ROSBE_BASEDIR%\Help.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.ps1 -) -if exist "%_ROSBE_BASEDIR%\MinGW.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.ps1 -) -if exist "%_ROSBE_BASEDIR%\RosBE.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.ps1 -) -if exist "%_ROSBE_BASEDIR%\rosbe-gcc-env.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.ps1 +:: Update the Vars if the params say so. +if "%1" == "nocmds" ( + set _ROSBE_CMDS=no +) else if "%1" == "nozips" ( + set _ROSBE_ZIPS=no +) else if not "%1" == "" ( + cls + echo Unknown parameter specified. Exiting. + goto :EOU ) -:: Options Files. -if exist "%_ROSBE_BASEDIR%\options.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/options.cmd +if _ROSBE_CMDS == yes ( + :: First check for a new Updater + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/update.cmd + "%_ROSBE_BASEDIR%\update.cmd" + + :: PS1 Files. + if exist "%_ROSBE_BASEDIR%\Build.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.ps1 + ) + if exist "%_ROSBE_BASEDIR%\Clean.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.ps1 + ) + if exist "%_ROSBE_BASEDIR%\Help.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.ps1 + ) + if exist "%_ROSBE_BASEDIR%\MinGW.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.ps1 + ) + if exist "%_ROSBE_BASEDIR%\RosBE.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.ps1 + ) + if exist "%_ROSBE_BASEDIR%\rosbe-gcc-env.ps1" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.ps1 + ) + + :: Options Files. + if exist "%_ROSBE_BASEDIR%\options.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/options.cmd + ) + + :: SVN Files. + if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/sSVN.cmd + ) + + :: SCut Files. + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/scut.cmd + ) + + :: RelAddr2Line Files. + if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/reladdr2line.cmd + ) + + :: Other Tools Files. + if exist "%_ROSBE_BASEDIR%\Config.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Config.cmd + ) + if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefdir.cmd + ) + + :: Default Files. + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/ChangeLog.txt + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefgcc.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/LICENSE.TXT + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/mingw.ico + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.mac + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/README.pdf + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe.ico + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.mac + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/TimeDate.cmd ) -:: SVN Files. -if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/sSVN.cmd +if _ROSBE_CMDS == yes ( + :: Add Dates into Vars and load GCC and Tool SRC packages if needed. + if exist GCC.7z ( + for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE=%%i + ) + if exist Tools.7z ( + for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE=%%i + ) + + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/GCC.7z + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Tools.7z + + :: Add the maybe Updated Dates to another Var. + for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE2=%%i + for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE2=%%i + + :: Extract GCC. + if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" + ) + if %_ROSBE_TOOLSDATE% NEQ %_ROSBE_TOOLSDATE2% ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%" + :: Build the tools + make -f %TEMP%\makefile + copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" + ) ) -:: SCut Files. -if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/scut.cmd -) - -:: RelAddr2Line Files. -if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/reladdr2line.cmd -) - -:: Other Tools Files. -if exist "%_ROSBE_BASEDIR%\Config.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Config.cmd -) -if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefdir.cmd -) - -:: Default Files. -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/ChangeLog.txt -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefgcc.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/LICENSE.TXT -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/mingw.ico -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.mac -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/README.pdf -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe.ico -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.mac -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/TimeDate.cmd - -:: Add Dates into Vars and load GCC and Tool SRC packages if needed. -if exist GCC.7z ( - for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE=%%i -) -if exist Tools.7z ( - for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE=%%i -) - -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/GCC.7z -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Tools.7z - -:: Add the maybe Updated Dates to another Var. -for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE2=%%i -for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE2=%%i - -:: Extract GCC. -if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% ( - "%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" -) -if %_ROSBE_TOOLSDATE% NEQ %_ROSBE_TOOLSDATE2% ( - "%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%" - :: Build the tools - make -f %TEMP%\makefile - copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" -) - +:EOU :: Unload Vars. set _ROSBE_URL= set _ROSBE_GCCDATE= set _ROSBE_TOOLSDATE= set _ROSBE_GCCDATE2= set _ROSBE_TOOLSDATE2= +set _ROSBE_CMDS= +set _ROSBE_ZIPS= + +title ReactOS Build Environment %_ROSBE_VERSION%

16 years, 4 months

[arty] 35669: Commit patches from bugboy, fixing bug 2392.

by arty＠svn.reactos.org

Author: arty Date: Tue Aug 26 08:28:44 2008 New Revision: 35669 URL: http://svn.reactos.org/svn/reactos?rev=35669&view=rev Log: Commit patches from bugboy, fixing bug 2392. Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c [iso-8859-1] Tue Aug 26 08:28:44 2008 @@ -238,6 +238,7 @@ BOOL SetDnsByDhcp; TCHAR pszRegKey[MAX_PATH]; const char *AddressString; + char emptyString[]="\0"; DWORD Address = 0; LONG rc; HKEY hKey = NULL; @@ -282,7 +283,7 @@ goto cleanup; if (DlgData->Dns1 == INADDR_NONE) { - rc = RegDeleteValue(hKey, _T("NameServer")); + rc = RegSetValueExA(hKey, "NameServer",0, REG_SZ, (const BYTE*)emptyString, strlen(emptyString) + 1); if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) goto cleanup; } @@ -445,6 +446,7 @@ char Dns[MAX_PATH]; DWORD Size; DWORD Type; + DWORD dwError; char *NextDnsServer; DlgData->AdapterName = Info->AdapterName; @@ -469,7 +471,15 @@ swprintf(RegKey, L"SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Parameters\\Interfaces\\%S", Info->AdapterName); - if (ERROR_SUCCESS == RegOpenKeyW(HKEY_LOCAL_MACHINE, RegKey, &hKey)) { + dwError = RegOpenKeyW(HKEY_LOCAL_MACHINE, RegKey, &hKey); + if (dwError != ERROR_SUCCESS) + { + /* Try and fall back on the NameServer in Parameters */ + swprintf(RegKey, + L"SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Parameters\\"); + } + dwError = RegOpenKeyW(HKEY_LOCAL_MACHINE, RegKey, &hKey); + if (ERROR_SUCCESS == dwError) { Size = sizeof(Dns); RegQueryValueExA(hKey, "NameServer", NULL, &Type, (BYTE *)Dns, &Size); Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Tue Aug 26 08:28:44 2008 @@ -88,6 +88,19 @@ return RtlNtStatusToDosError(addIPAddress(Address, Netmask, IfIndex, NteContext, NteInstance)); } +DWORD getInterfaceGatewayByIndex(DWORD index) +{ + DWORD ndx, retVal = 0, numRoutes = getNumRoutes(); + RouteTable *table = getRouteTable(); + + for (ndx = 0; ndx < numRoutes; ndx++) + { + if ((table->routes[ndx].ifIndex == (index - 1)) && (table->routes[ndx].dest == 0)) + retVal = table->routes[ndx].gateway; + } + HeapFree(GetProcessHeap(), 0, table); + return retVal; +} /****************************************************************** * AllocateAndGetIfTableFromStack (IPHLPAPI.@) @@ -640,6 +653,8 @@ ptr->IpAddressList.IpAddress.String); toIPAddressString(getInterfaceMaskByIndex(table->indexes[ndx]), ptr->IpAddressList.IpMask.String); + toIPAddressString(getInterfaceGatewayByIndex(table->indexes[ndx]), + ptr->GatewayList.IpAddress.String); getDhcpInfoForAdapter(table->indexes[ndx], &dhcpEnabled, &dhcpServer, &ptr->LeaseObtained, &ptr->LeaseExpires); @@ -1160,7 +1175,7 @@ pIpForwardTable->dwNumEntries = table->numRoutes; for (ndx = 0; ndx < numRoutes; ndx++) { pIpForwardTable->table[ndx].dwForwardIfIndex = - table->routes[ndx].ifIndex; + table->routes[ndx].ifIndex + 1; pIpForwardTable->table[ndx].dwForwardDest = table->routes[ndx].dest; pIpForwardTable->table[ndx].dwForwardMask = @@ -1190,7 +1205,7 @@ sizeof(MIB_IPFORWARDROW), IpForwardTableSorter); ret = NO_ERROR; } - free(table); + HeapFree(GetProcessHeap(), 0, table); } else ret = ERROR_OUTOFMEMORY;

16 years, 4 months

[tkreuzer] 35668: Add D3DFMT_D32_LOCKABLE and D3DFMT_S8_LOCKABLE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 26 07:01:58 2008 New Revision: 35668 URL: http://svn.reactos.org/svn/reactos?rev=35668&view=rev Log: Add D3DFMT_D32_LOCKABLE and D3DFMT_S8_LOCKABLE Modified: branches/ros-amd64-bringup/reactos/include/psdk/d3d9types.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/d3d9types.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/d3d9types.h [iso-8859-1] Tue Aug 26 07:01:58 2008 @@ -822,6 +822,8 @@ D3DFMT_L16 = 81, D3DFMT_D32F_LOCKABLE = 82, D3DFMT_D24FS8 = 83, + D3DFMT_D32_LOCKABLE = 84, + D3DFMT_S8_LOCKABLE = 85, D3DFMT_VERTEXDATA = 100, D3DFMT_INDEX16 = 101,

16 years, 4 months

[fireball] 35667: - Add an ability to have VMWare video driver installed without inserting CD. Just copy 4 files (vmx_fb.dll, vmx_mode.dll, vmx_svga.sys and vmx_svga.inf) from VMWare Tools CD to your reactos/modules/windows directory and build a bootcd. You'll just need to choose a resolution and a bit depth in 2nd stage setup.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Aug 26 06:30:02 2008 New Revision: 35667 URL: http://svn.reactos.org/svn/reactos?rev=35667&view=rev Log: - Add an ability to have VMWare video driver installed without inserting CD. Just copy 4 files (vmx_fb.dll, vmx_mode.dll, vmx_svga.sys and vmx_svga.inf) from VMWare Tools CD to your reactos/modules/windows directory and build a bootcd. You'll just need to choose a resolution and a bit depth in 2nd stage setup. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Aug 26 06:30:02 2008 @@ -677,3 +677,7 @@ ; Native libraries modules\windows\mfc42.dll 1 optional +modules\windows\vmx_fb.dll 1 optional +modules\windows\vmx_mode.dll 1 optional +modules\windows\vmx_svga.sys 2 optional +modules\windows\vmx_svga.inf 6 optional

16 years, 4 months

[tkreuzer] 35666: #undef Interlocked before implementing the functions on all architectures.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 26 06:22:30 2008 New Revision: 35666 URL: http://svn.reactos.org/svn/reactos?rev=35666&view=rev Log: #undef Interlocked before implementing the functions on all architectures. Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Tue Aug 26 06:22:30 2008 @@ -394,29 +394,23 @@ return TRUE; } -//wtf -#ifdef _WIN64 #undef InterlockedIncrement +LONG +WINAPI +InterlockedIncrement(IN OUT LONG volatile *lpAddend) +{ + return _InterlockedIncrement(lpAddend); +} + #undef InterlockedDecrement +LONG +WINAPI +InterlockedDecrement(IN OUT LONG volatile *lpAddend) +{ + return _InterlockedDecrement(lpAddend); +} + #undef InterlockedExchange -#undef InterlockedExchangeAdd -#undef InterlockedCompareExchange -#endif - -LONG -WINAPI -InterlockedIncrement(IN OUT LONG volatile *lpAddend) -{ - return _InterlockedIncrement(lpAddend); -} - -LONG -WINAPI -InterlockedDecrement(IN OUT LONG volatile *lpAddend) -{ - return _InterlockedDecrement(lpAddend); -} - LONG WINAPI InterlockedExchange(IN OUT LONG volatile *Target, @@ -425,6 +419,7 @@ return _InterlockedExchange(Target, Value); } +#undef InterlockedExchangeAdd LONG WINAPI InterlockedExchangeAdd(IN OUT LONG volatile *Addend, @@ -433,6 +428,7 @@ return _InterlockedExchangeAdd(Addend, Value); } +#undef InterlockedCompareExchange LONG WINAPI InterlockedCompareExchange(IN OUT LONG volatile *Destination,

16 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
86
Older →

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 2008