Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 30840: - display printer folder
by janderwald＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: janderwald Date: Wed Nov 28 18:55:26 2007 New Revision: 30840 URL: http://svn.reactos.org/svn/reactos?rev=30840&view=rev Log: - display printer folder Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Wed Nov 28 18:55:26 2007 @@ -1984,9 +1984,6 @@ CloseStartMenu(id); #ifndef ROSSHELL -#ifdef _ROS_ // to be removed when printer folder will be implemented - MessageBox(0, TEXT("printer folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); -#else #ifndef _NO_MDI XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); bool mdi = XMLBool(explorer_options, "mdi", true); @@ -1996,7 +1993,6 @@ else #endif SDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}"), 0); -#endif #else launch_file(_hwnd, SHELLPATH_PRINTERS); #endif

1 0

[cwittich] 30839: add winineti.h from wine
by cwittich＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cwittich Date: Wed Nov 28 17:33:56 2007 New Revision: 30839 URL: http://svn.reactos.org/svn/reactos?rev=30839&view=rev Log: add winineti.h from wine Added: trunk/reactos/include/psdk/winineti.h (with props) Added: trunk/reactos/include/psdk/winineti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winineti.h?re… ============================================================================== --- trunk/reactos/include/psdk/winineti.h (added) +++ trunk/reactos/include/psdk/winineti.h Wed Nov 28 17:33:56 2007 @@ -1,0 +1,108 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINE_WININETI_H_ +#define _WINE_WININETI_H_ + +/* FIXME: #include <iedial.h> */ +#include <schannel.h> + +typedef struct _INTERNET_CACHE_CONFIG_PATH_ENTRYA +{ + CHAR CachePath[MAX_PATH]; + DWORD dwCacheSize; +} INTERNET_CACHE_CONFIG_PATH_ENTRYA, *LPINTERNET_CACHE_CONFIG_PATH_ENTRYA; + +typedef struct _INTERNET_CACHE_CONFIG_PATH_ENTRYW +{ + WCHAR CachePath[MAX_PATH]; + DWORD dwCacheSize; +} INTERNET_CACHE_CONFIG_PATH_ENTRYW, *LPINTERNET_CACHE_CONFIG_PATH_ENTRYW; + +DECL_WINELIB_TYPE_AW(INTERNET_CACHE_CONFIG_PATH_ENTRY) +DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_CONFIG_PATH_ENTRY) + +typedef struct _INTERNET_CACHE_CONFIG_INFOA +{ + DWORD dwStructSize; + DWORD dwContainer; + DWORD dwQuota; + DWORD dwReserved4; + BOOL fPerUser; + DWORD dwSyncMode; + DWORD dwNumCachePaths; + union + { + struct + { + CHAR CachePath[MAX_PATH]; + DWORD dwCacheSize; + } DUMMYSTRUCTNAME; + INTERNET_CACHE_CONFIG_PATH_ENTRYA CachePaths[ANYSIZE_ARRAY]; + } DUMYUNIONNAME; + DWORD dwNormalUsage; + DWORD dwExemptUsage; +} INTERNET_CACHE_CONFIG_INFOA, *LPINTERNET_CACHE_CONFIG_INFOA; + +typedef struct _INTERNET_CACHE_CONFIG_INFOW +{ + DWORD dwStructSize; + DWORD dwContainer; + DWORD dwQuota; + DWORD dwReserved4; + BOOL fPerUser; + DWORD dwSyncMode; + DWORD dwNumCachePaths; + union + { + struct + { + WCHAR CachePath[MAX_PATH]; + DWORD dwCacheSize; + } DUMMYSTRUCTNAME; + INTERNET_CACHE_CONFIG_PATH_ENTRYW CachePaths[ANYSIZE_ARRAY]; + } ; + DWORD dwNormalUsage; + DWORD dwExemptUsage; +} INTERNET_CACHE_CONFIG_INFOW, *LPINTERNET_CACHE_CONFIG_INFOW; + +DECL_WINELIB_TYPE_AW(INTERNET_CACHE_CONFIG_INFO) +DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_CONFIG_INFO) + + +#ifdef __cplusplus +extern "C" { +#endif + +DWORD WINAPI DeleteIE3Cache(HWND,HINSTANCE,LPSTR,int); +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,LPDWORD,DWORD); +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,LPDWORD,DWORD); +#define GetUrlCacheConfigInfo WINELIB_NAME_AW(GetUrlCacheConfigInfo) +BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); +BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); +BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); +#define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired) +BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD); +BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD); +#define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo) + +#ifdef __cplusplus +} +#endif + +#endif /* _WINE_WININETI_H_ */ Propchange: trunk/reactos/include/psdk/winineti.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 30838: fix exception filters
by cwittich＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cwittich Date: Wed Nov 28 16:27:42 2007 New Revision: 30838 URL: http://svn.reactos.org/svn/reactos?rev=30838&view=rev Log: fix exception filters Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Wed Nov 28 16:27:42 2007 @@ -215,14 +215,22 @@ NTSTATUS ErrCode; if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && - ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) - { - /* Change the protection on some write attempts, some InstallShield setups - have this bug */ - RetValue = BasepCheckForReadOnlyResource( - (PVOID)ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); - if (RetValue == EXCEPTION_CONTINUE_EXECUTION) - return EXCEPTION_CONTINUE_EXECUTION; + ExceptionInfo->ExceptionRecord->NumberParameters >= 2) + { + switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) + { + case EXCEPTION_WRITE_FAULT: + /* Change the protection on some write attempts, some InstallShield setups + have this bug */ + RetValue = BasepCheckForReadOnlyResource( + (PVOID)ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); + if (RetValue == EXCEPTION_CONTINUE_EXECUTION) + return EXCEPTION_CONTINUE_EXECUTION; + break; + case EXCEPTION_EXECUTE_FAULT: + /* FIXME */ + break; + } } /* Is there a debugger running ? */ @@ -241,6 +249,13 @@ return EXCEPTION_CONTINUE_SEARCH; } + if (GlobalTopLevelExceptionFilter) + { + LONG ret = GlobalTopLevelExceptionFilter( ExceptionInfo ); + if (ret != EXCEPTION_CONTINUE_SEARCH) + return ret; + } + if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) == 0) { #ifdef _X86_

1 0

[cwittich] 30837: add some defines
by cwittich＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cwittich Date: Wed Nov 28 16:25:56 2007 New Revision: 30837 URL: http://svn.reactos.org/svn/reactos?rev=30837&view=rev Log: add some defines Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Wed Nov 28 16:25:56 2007 @@ -117,6 +117,15 @@ #define NTSYSCALLAPI DECLSPEC_ADDRSAFE #endif #endif + +/* i386 context definitions */ +#ifdef __i386__ + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +#endif /* __i386__ */ #ifndef VOID #define VOID void

1 0

[hpoussin] 30836: Fix indentation
by hpoussin＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: hpoussin Date: Wed Nov 28 15:32:06 2007 New Revision: 30836 URL: http://svn.reactos.org/svn/reactos?rev=30836&view=rev Log: Fix indentation Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Wed Nov 28 15:32:06 2007 @@ -265,7 +265,7 @@ this->file.file.relative_path.c_str (), cSep, this->file.file.name.c_str () ); - } + } p++; } Close (); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Wed Nov 28 15:32:06 2007 @@ -845,10 +845,10 @@ fp = popen ( versionCommand.c_str () , "r" ); for( i = 0; - ( i < 80 ) && - ( feof ( fp ) == 0 && - ( ( ch = fgetc( fp ) ) != -1 ) ); - i++ ) + ( i < 80 ) && + ( feof ( fp ) == 0 && + ( ( ch = fgetc( fp ) ) != -1 ) ); + i++ ) { buffer[i] = (char) ch; } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Nov 28 15:32:06 2007 @@ -412,19 +412,19 @@ att->value, &moduleNode ); - output = new FileLocation ( GetTargetDirectoryTree (), - modulePath, - att->value, - &moduleNode ); - } - else - { + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + att->value, + &moduleNode ); + } + else + { install = NULL; - output = new FileLocation ( GetTargetDirectoryTree (), - modulePath, - name + extension, - &moduleNode ); - } + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + name + extension, + &moduleNode ); + } att = moduleNode.GetAttribute ( "allowwarnings", false ); if ( att == NULL )

1 0

[hpoussin] 30835: Support real deletion of directories from the recycle bin
by hpoussin＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: hpoussin Date: Wed Nov 28 12:32:14 2007 New Revision: 30835 URL: http://svn.reactos.org/svn/reactos?rev=30835&view=rev Log: Support real deletion of directories from the recycle bin Modified: trunk/reactos/lib/recyclebin/readme.txt trunk/reactos/lib/recyclebin/recyclebin_v5.c Modified: trunk/reactos/lib/recyclebin/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/readme.txt?… ============================================================================== --- trunk/reactos/lib/recyclebin/readme.txt (original) +++ trunk/reactos/lib/recyclebin/readme.txt Wed Nov 28 12:32:14 2007 @@ -2,7 +2,6 @@ It is aimed to be compatible with Windows 2000/XP/2003 (at least) on FAT or NTFS volumes. TODO -- Empty a recycle bin containing directories (v5) - Set security on recycle bin folder - Make the library thread-safe Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Wed Nov 28 12:32:14 2007 @@ -17,7 +17,11 @@ IN LPCWSTR FullName) { DWORD RemovableAttributes = FILE_ATTRIBUTE_READONLY; + WIN32_FIND_DATAW FindData; + HANDLE hSearch = INVALID_HANDLE_VALUE; + LPWSTR FullPath = NULL, pFilePart; DWORD FileAttributes; + SIZE_T dwLength; BOOL ret = FALSE; FileAttributes = GetFileAttributesW(FullName); @@ -34,11 +38,46 @@ } if (FileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - /* Recursive deletion */ - /* FIXME: recursive deletion */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - goto cleanup; - + /* Prepare file specification */ + dwLength = wcslen(FullName); + FullPath = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1 + MAX_PATH + 1) * sizeof(WCHAR)); + if (!FullPath) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + wcscpy(FullPath, FullName); + if (FullPath[dwLength - 1] != '\\') + { + FullPath[dwLength] = '\\'; + dwLength++; + } + pFilePart = &FullPath[dwLength]; + wcscpy(pFilePart, L"*"); + + /* Enumerate contents, and delete it */ + hSearch = FindFirstFileW(FullPath, &FindData); + if (hSearch == INVALID_HANDLE_VALUE) + goto cleanup; + do + { + if (!(FindData.cFileName[0] == '.' && + (FindData.cFileName[1] == '\0' || (FindData.cFileName[1] == '.' && FindData.cFileName[2] == '\0')))) + { + wcscpy(pFilePart, FindData.cFileName); + if (!IntDeleteRecursive(FullPath)) + { + FindClose(hSearch); + goto cleanup; + } + } + } + while (FindNextFileW(hSearch, &FindData)); + FindClose(hSearch); + if (GetLastError() != ERROR_NO_MORE_FILES) + goto cleanup; + + /* Remove (now empty) directory */ if (!RemoveDirectoryW(FullName)) goto cleanup; } @@ -50,6 +89,7 @@ ret = TRUE; cleanup: + HeapFree(GetProcessHeap(), 0, FullPath); return ret; }

1 0

[dreimer] 30834: Add a Hyperlink to the MARCH Settings List where it belongs.
by dreimer＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: dreimer Date: Wed Nov 28 12:28:26 2007 New Revision: 30834 URL: http://svn.reactos.org/svn/reactos?rev=30834&view=rev Log: Add a Hyperlink to the MARCH Settings List where it belongs. Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html Wed Nov 28 12:28:26 2007 @@ -66,11 +66,14 @@ <dd>Usage: config [OPTIONS]</dd> <dd> This Command creates a Configuration File, which tells RosBE how to build the Tree. There are many things you can modify in the build -process and this tool can edit all for you. ISOs made with a non -default are NOT usable to file bugs in any way! </dd> +process, like SubArchitecture (XBox), <a href="config.html">CPU +specific Optimization</a>, Compiler Optimisation, Enable/Disable +Debugger etc etc and this tool can edit all for you. ISOs made with a +non +default Configuration are NOT usable to file bugs in any way!</dd> <dd> <ul> - <li> <dfn>delete</dfn> - Deletes the created configuration File + <li><dfn>delete</dfn> - Deletes the created configuration File and so sets back to default settings.</li> <li>update - Deletes the old created configuration file and updates it with a new, default one.

1 0

[jimtabor] 30833: Check first to see if the DC handle is dead, if so return true.
by jimtabor＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: jimtabor Date: Wed Nov 28 11:35:47 2007 New Revision: 30833 URL: http://svn.reactos.org/svn/reactos?rev=30833&view=rev Log: Check first to see if the DC handle is dead, if so return true. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Nov 28 11:35:47 2007 @@ -940,6 +940,8 @@ if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC) return NtGdiDeleteObject((HGDIOBJ) DCHandle); + + if(IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; if (!GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, DCHandle)) {

1 0

[dreimer] 30832: Update Documentation (Part 1 of X).
by dreimer＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: dreimer Date: Wed Nov 28 11:18:51 2007 New Revision: 30832 URL: http://svn.reactos.org/svn/reactos?rev=30832&view=rev Log: Update Documentation (Part 1 of X). Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/adv.html Wed Nov 28 11:18:51 2007 @@ -1,12 +1,26 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Advanced Features</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Lists the Advanced Features of RosBE"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Advanced Features</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" + content="Lists the Advanced Features of RosBE"> </head> <body> -SVN 1.4.5 is included in RosBE. Manual can be found here: +MinGW GCC 4.1.3 is included in RosBE. Manual can be found here: <a + href="http://www.mingw.org/">http://www.mingw.org/</a>and <a + href="http://gcc.gnu.org/">http://gcc.gnu.org</a> +Binutils 2.18.50 is included in RosBE. Manual can be found here: <a + href="http://www.gnu.org/software/binutils/">http://www.gnu.org/software/binutils</a> +SVN 1.4.5 is included in RosBE. Manual can be found here: <a + href="http://subversion.tigris.org/">http://subversion.tigris.org</a> +CCache 2.4 is included in RosBE. Manual can be found here: <a + href="http://ccache.samba.org/">http://ccache.samba.org</a> +GDB 6.7.1 is included in RosBE. Manual can be found here: <a + href="http://www.gnu.org/software/gdb/">http://www.gnu.org/software/gdb</a> +NASM 2.00 is included in RosBE. Manual can be found here: <a + href="http://nasm.sourceforge.net/">http://nasm.sourceforge.net</a> + </body> </html> Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/basic.html Wed Nov 28 11:18:51 2007 @@ -33,7 +33,8 @@ located in the RosBE directory, instructions for doing so are contained within the file.</dd> <dt>basedir</dt> - <dd>Usage: basedir</dd> + <dd>Usage: basedir + </dd> <dd>Switches back to the ReactOS source directory.</dd> <dt>chdefdir</dt> <dd>Usage: chdefdir [OPTIONS]</dd> @@ -42,10 +43,12 @@ Trees. Exiting RosBE sets back to the Default. </dd> <dd> <ul> - <li> <dfn>default</dfn> - Sets back to the Default Source Folder -without a restart of RosBE.</li> + <li> <dfn>previous </dfn>- Switch to the previous ReactOS +source directory.</li> </ul> </dd> + <dt>chdefgcc [PATH]</dt> + <dd>Change the MinGW/GCC directory for the current RosBE session.</dd> <dt>clean</dt> <dd>Usage: clean [logs]</dd> <dd> Fully cleans the ReactOS source directory and does a better job @@ -68,7 +71,10 @@ <dd> <ul> <li> <dfn>delete</dfn> - Deletes the created configuration File -and so sets back to default settings. </li> +and so sets back to default settings.</li> + <li>update - Deletes the +old created configuration file and updates it with a new, default one. + </li> </ul> </dd> <dt>help</dt> @@ -80,7 +86,7 @@ <dd> Starts the RosBE Configuration Program. </dd> <dt>raddr2line</dt> - <dd>Usage: raddr2line [OPTIONS]</dd> + <dd>Usage: raddr2line [FILE] [ADDRESS]</dd> <dd> This Command translates program addresses of BSODs into file names and line numbers of the Code it was built of to assist Developers to find specific Bugs in ReactOS. This Tool is mainly a Dev Tool. @@ -88,21 +94,24 @@ something. </dd> <dd> <ul> - <li> <dfn>first parameter</dfn> - has to be the Executable to be -analyzed. </li> - <li> <dfn>second parameter</dfn> - has to be the address to be -translated. If you don't set the needed Parameters, you will be asked -for them. </li> + <li> <dfn>FILE</dfn> - This can be either a fully specified path +or just the file name [you can use a partial name ie. ntdll*] of the +executable to be analyzed. When using just a file the current directory +and all sub-directories are searched.<dfn></dfn></li> + <li><dfn>ADDRESS</dfn> - The address to be translated. + <dfn></dfn></li> </ul> </dd> <dt>scut</dt> <dd>Usage: scut [OPTIONS]</dd> <dd>Defines, Edits, Removes, Switches and Defaults to Shortcutted Source Directories. scut started without a parameter or with the name -of a Shortcut as parameter sets this Shortcut active. </dd> +of a Shortcut as parameter sets this Shortcut active. + </dd> <dd> <ul> - <li> <dfn>add</dfn> - Adds a Shortcut to a sourcecode. </li> + <li> <dfn>list</dfn> - Lists all shortcuts and their paths. <dfn></dfn></li> + <li><dfn>add</dfn> - Adds a Shortcut to a sourcecode.</li> <li> <dfn>rem</dfn> - Deletes a specific shortcut. </li> <li> <dfn>edit</dfn> - Lets you edit a specific shortcut. </li> <li> <dfn>def</dfn> - Chooses Default Shortcut which is enabled Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/features.html Wed Nov 28 11:18:51 2007 @@ -1,21 +1,21 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Features of RosBE" name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Features of RosBE" name="description"> </head> <body> - <ul> - <li>Creating, Cleaning and Updating the Tree with included SVN and sSVN.</li> - <li>Building the Source (Multi Core Optimized)*</li> - <li>Maintain Several Trees at once.</li> - <li>Configure the Tree Settings with an easy to use editor.</li> - <li>Help for Debugging, thanks to included GDB and raddr2line.</li> - <li>Support for non Admin Rights Account.*</li> - </ul> - - * = This Feature is not supported under Windows Vista! +<ul> + <li>Creating, Cleaning and Updating the Tree with included SVN and +sSVN.</li> + <li>Building the Source (Multi Core Optimized)</li> + <li>Maintain Several Trees at once.</li> + <li>Configure the Tree Settings with an easy to use editor.</li> + <li>Help for Debugging, thanks to included GDB and raddr2line.</li> + <li>Support for non Admin Rights Account.*</li> +</ul> +* = This Feature is not supported under Windows Vista! </body> </html> Modified: trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html (original) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/intro.html Wed Nov 28 11:18:51 2007 @@ -1,29 +1,41 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Introduction</title> - <meta name="author" content="Daniel Reimer"> - <meta name="description" content="Shows the Introduction to RosBE"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Introduction</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the Introduction to RosBE"> </head> <body> First of all, lets answer the main question: What is RosBE? -Its a Environment for building ReactOS on your own, its based on GCC 4.1.3 +Its a Environment for building ReactOS on your own, its based on GCC +4.1.3 Compiler and aims to be the one and only Build Environment for absolute Beginners up to skilled devs. - Realizing this wide spectrum in one BE is quite difficult of course. -How, as an example, do you tell a newbie how to use SVN or maintain/update a +How, as an example, do you tell a newbie how to use SVN or +maintain/update a Source tree? -Easy. This package has the typical, well known SVN for all advanced devs and a -slim Version specially made for newbies, called sSVN (Simple SVN), which only -does the main stuff and has no difficult to understand or even dangerous, if -wrong used, functions. Additionally it checks the working folder, if its empty -or not. If its no empty folder, it does not even allow the User to continue. - +Easy. This package has the typical, well known SVN for all advanced +devs and a +slim Version specially made for newbies, called sSVN (Simple SVN), +which only +does the main stuff and has no difficult to understand or even +dangerous, if +wrong used, functions. Additionally it checks the working folder, if +its empty +or not. If its no empty folder, it does not even allow the User to +continue. And this is just the beginning of a big list of features. Devs will be happy with the included GDB and raddr2line. -Multi Core PC Users will love "makex" which automatically detects the number of -CPU Cores and optimizes the Build process to that Number. +Multi Core PC Users will love "makex" which automatically detects the +number of +CPU Cores and optimizes the Build process to that Number. +Easy to maintain several trees by making Shortcuts to the paths with +our tool, SCut. +Setting of a dozen of build parameters with a easy to understand +Configurator App. +etc... + </body> </html>

1 0

[jimtabor] 30831: - Removed NtGdiGet/SetStretchBltMode, updated all related files. - Implement GetHFONT & Get/SetLayout/Width. - Add layout types to PSDK. - Updates and small cleanups.
by jimtabor＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: jimtabor Date: Wed Nov 28 10:52:51 2007 New Revision: 30831 URL: http://svn.reactos.org/svn/reactos?rev=30831&view=rev Log: - Removed NtGdiGet/SetStretchBltMode, updated all related files. - Implement GetHFONT & Get/SetLayout/Width. - Add layout types to PSDK. - Updates and small cleanups. Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Wed Nov 28 10:52:51 2007 @@ -64,17 +64,6 @@ * @implemented * */ -int -STDCALL -GetStretchBltMode(HDC hdc) -{ - return NtGdiGetStretchBltMode(hdc); -} - -/* - * @implemented - * - */ BOOL STDCALL OffsetViewportOrgEx(HDC hdc, Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Nov 28 10:52:51 2007 @@ -61,17 +61,6 @@ { /* FIXME share memory */ return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); -} - -/* - * @unimplemented - */ -int -STDCALL -SetStretchBltMode(HDC hdc, int iStretchMode) -{ - /* FIXME share memory */ - return NtGdiSetStretchBltMode(hdc, iStretchMode); } /* @@ -1439,31 +1428,6 @@ } /* - * @unimplemented - */ -HFONT -STDCALL -GetHFONT(HDC dc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -GetLayout(HDC hdc -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* * @implemented */ BOOL @@ -1583,33 +1547,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - -/* - * @unimplemented - */ -DWORD -STDCALL -SetLayout(HDC hdc, - DWORD dwLayout) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Wed Nov 28 10:52:51 2007 @@ -1515,7 +1515,7 @@ if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + return NULL; } if (pLDC->iType == LDC_EMFLDC) { @@ -1560,11 +1560,134 @@ else { SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + return 0; } #endif if ((Mode == Dc_Attr->iMapMode) && (Mode != MM_ISOTROPIC)) return Mode; return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 ); } - +/* + * @implemented + * + */ +int +STDCALL +GetStretchBltMode(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->lStretchBltMode; +} + +/* + * @implemented + */ +int +STDCALL +SetStretchBltMode(HDC hdc, int iStretchMode) +{ + INT oSMode; + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetStretchBltMode( hdc, iStretchMode); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetStretchBltMode( hdc, iStretchMode); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + + oSMode = Dc_Attr->lStretchBltMode; + Dc_Attr->lStretchBltMode = iStretchMode; + + // Wine returns an error here. We set the default. + if ((iStretchMode <= 0) || (iStretchMode > MAXSTRETCHBLTMODE)) iStretchMode = WHITEONBLACK; + + Dc_Attr->jStretchBltMode = iStretchMode; + + return oSMode; +} + +/* + * @implemented + */ +HFONT +STDCALL +GetHFONT(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return NULL; + return Dc_Attr->hlfntNew; +} + +/* + * @implemented + */ +DWORD +STDCALL +GetLayout(HDC hdc +) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return GDI_ERROR; + return Dc_Attr->dwLayout; +} + + +/* + * @implemented + */ +DWORD +STDCALL +SetLayout(HDC hdc, + DWORD dwLayout) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetLayout( hdc, dwLayout); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetLayout( hdc, dwLayout); + } + } + } +#endif + if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + return NtGdiSetLayout( hdc, -1, dwLayout); +} + +/* + * @implemented + */ +DWORD +STDCALL +SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) +{ + if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + return NtGdiSetLayout( hdc, wox, dwLayout); +} + Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Wed Nov 28 10:52:51 2007 @@ -1193,7 +1193,10 @@ #define WGL_SWAP_UNDERLAY14 0x20000000 #define WGL_SWAP_UNDERLAY15 0x40000000 #define AC_SRC_OVER 0 -#define LAYOUT_RTL 1 +#define LAYOUT_RTL 1 // Right to left +#define LAYOUT_BTT 2 // Bottom to top +#define LAYOUT_VBH 4 // Vertical before horizontal +#define LAYOUT_ORIENTATIONMASK (LAYOUT_RTL | LAYOUT_BTT | LAYOUT_VBH) #define LAYOUT_BITMAPORIENTATIONPRESERVED 8 #if (WINVER > 0x400) #define CS_ENABLE 0x00000001 Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Nov 28 10:52:51 2007 @@ -276,9 +276,6 @@ NtGdiGetPixelFormat(HDC hDC); /* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetStretchBltMode(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ UINT STDCALL NtGdiGetTextCharset(HDC hDC); @@ -388,9 +385,6 @@ STDCALL NtGdiSetMapperFlags(HDC hDC, DWORD Flag); - -/* Needs to be done in user-mode, using shared GDI Object Attributes. */ -INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); /* Needs to be done in user-mode. */ BOOL Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Nov 28 10:52:51 2007 @@ -378,6 +378,9 @@ HDC hNext; HDC hPrev; + RECTL erclWindow; + RECTL erclBounds; + CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Wed Nov 28 10:52:51 2007 @@ -42,6 +42,7 @@ PERESOURCE hsemDevLock; + PVOID pvGammaRamp; PVOID pfnSync; DHPDEV PDev; @@ -112,6 +113,7 @@ UINT FASTCALL NtGdiSetTextAlign(HDC hDC, UINT Mode); UINT STDCALL NtGdiGetTextAlign(HDC hDC); COLORREF STDCALL NtGdiGetTextColor(HDC hDC); +INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); /* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ typedef struct Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Wed Nov 28 10:52:51 2007 @@ -959,5 +959,43 @@ return TRUE; } + /* + * @unimplemented + */ +DWORD +APIENTRY +NtGdiSetLayout( + IN HDC hdc, + IN LONG wox, + IN DWORD dwLayout) +{ + PDC dc; + PDC_ATTR Dc_Attr; + DWORD oLayout; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + Dc_Attr->dwLayout = dwLayout; + oLayout = Dc_Attr->dwLayout; + + if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) + { + DC_UnlockDc(dc); + return oLayout; + } + +// DC_UpdateXforms(dc); + DC_UnlockDc(dc); + + UNIMPLEMENTED; + return GDI_ERROR; +} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Nov 28 10:52:51 2007 @@ -827,11 +827,15 @@ ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); - if (! CreateAsIC) + if (!CreateAsIC) { NewDC->PalIndexed = NtGdiGetStockObject(DEFAULT_PALETTE); NewDC->w.hPalette = PrimarySurface.DevInfo.hpalDefault; nDc_Attr->jROP2 = R2_COPYPEN; + + NewDC->erclWindow.top = NewDC->erclWindow.left = 0; + NewDC->erclWindow.right = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes; + NewDC->erclWindow.bottom = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes; DC_UnlockDc( NewDC ); @@ -1189,6 +1193,7 @@ if(!nDc_Attr) nDc_Attr = &newdc->Dc_Attr; newdc->w.flags = dc->w.flags | DC_SAVED; + nDc_Attr->dwLayout = Dc_Attr->dwLayout; nDc_Attr->hpen = Dc_Attr->hpen; nDc_Attr->hbrush = Dc_Attr->hbrush; nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; @@ -1272,6 +1277,7 @@ dc->w.hDevice = dcs->w.hDevice; #endif + Dc_Attr->dwLayout = sDc_Attr->dwLayout; dc->w.totalExtent = dcs->w.totalExtent; Dc_Attr->jROP2 = sDc_Attr->jROP2; Dc_Attr->jFillMode = sDc_Attr->jFillMode; Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Nov 28 10:52:51 2007 @@ -3172,20 +3172,6 @@ /* * @unimplemented */ -DWORD -APIENTRY -NtGdiSetLayout( - IN HDC hdc, - IN LONG wox, - IN DWORD dwLayout) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ INT APIENTRY NtGdiStretchDIBitsInternal( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Nov 28 10:52:51 2007 @@ -683,7 +683,6 @@ NtGdiSetEnhMetaFileBits 2 NtGdiSetICMProfile 2 NtGdiSetMapperFlags 2 -NtGdiSetStretchBltMode 2 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 @@ -749,7 +748,6 @@ NtGdiGetICMProfile 3 NtGdiGetLogColorSpace 3 NtGdiGetPixelFormat 1 -NtGdiGetStretchBltMode 1 NtGdiGetTextExtentPoint32 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4

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