Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 44367: Revert to the old boot method for the release on request of Aleksey
by cfinck＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: cfinck Date: Wed Dec 2 21:02:07 2009 New Revision: 44367 URL: http://svn.reactos.org/svn/reactos?rev=44367&view=rev Log: Revert to the old boot method for the release on request of Aleksey Modified: branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini Modified: branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Dec 2 21:02:07 2009 @@ -415,13 +415,13 @@ /* ReactOS */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS", L"\"ReactOS\"", - L"Windows2003", ArcPath, + L"ReactOS", ArcPath, L""); /* ReactOS_Debug */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Debug", L"\"ReactOS (Debug)\"", - L"Windows2003", ArcPath, + L"ReactOS", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG @@ -443,18 +443,6 @@ L"ReactOS", L"ramdisk(0)\\ReactOS", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif - - /* ReactOS_old */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_old", L"\"ReactOS (old boot method)\"", - L"ReactOS", ArcPath, - L""); - - /* ReactOS_Debug_old */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_Debug_old", L"\"ReactOS (Debug, old boot method)\"", - L"ReactOS", ArcPath, - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); Modified: branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/boot/… ============================================================================== --- branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Wed Dec 2 21:02:07 2009 @@ -1,6 +1,6 @@ [FREELOADER] DefaultOS=Setup -Timeout=1 +Timeout=0 [Display] TitleText=ReactOS Setup @@ -21,10 +21,6 @@ [Operating Systems] Setup="Setup" -Setup_old="Setup (old boot method)" [Setup] -BootType=ReactOSSetup2 - -[Setup_old] BootType=ReactOSSetup Modified: branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/boot/… ============================================================================== --- branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini [iso-8859-1] Wed Dec 2 21:02:07 2009 @@ -1,6 +1,6 @@ [FREELOADER] DefaultOS=ReactOS -Timeout=1 +Timeout=0 [Display] TitleText=ReactOS Boot Manager @@ -21,14 +21,8 @@ [Operating Systems] ReactOS="ReactOS" -Reactos_old="ReactOS (old boot method)" [ReactOS] -BootType=Windows2003 -SystemPath=LiveCD\reactos -Options=/DEBUGPORT=COM1 /SOS /MININT - -[Reactos_old] BootType=ReactOS SystemPath=LiveCD\reactos Options=/DEBUGPORT=COM1 /SOS

1 0

[gschneider] 44366: Move tsclient to rosapps [2/2]
by gschneider＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: gschneider Date: Wed Dec 2 19:58:51 2009 New Revision: 44366 URL: http://svn.reactos.org/svn/reactos?rev=44366&view=rev Log: Move tsclient to rosapps [2/2] Removed: trunk/reactos/base/applications/tsclient/

1 0

[gschneider] 44365: Move tsclient to rosapps (not included in build process and superseded by Geds mstsc implementation) [1/2]
by gschneider＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: gschneider Date: Wed Dec 2 19:58:05 2009 New Revision: 44365 URL: http://svn.reactos.org/svn/reactos?rev=44365&view=rev Log: Move tsclient to rosapps (not included in build process and superseded by Geds mstsc implementation) [1/2] Added: trunk/rosapps/applications/net/tsclient/ - copied from r44364, trunk/reactos/base/applications/tsclient/

1 0

[gschneider] 44364: Martin Ettl <ettl DOT martin AT gmx DOT de>: Fix various resource and memory leaks See issue #4974 for more details.
by gschneider＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: gschneider Date: Wed Dec 2 19:28:52 2009 New Revision: 44364 URL: http://svn.reactos.org/svn/reactos?rev=44364&view=rev Log: Martin Ettl <ettl DOT martin AT gmx DOT de>: Fix various resource and memory leaks See issue #4974 for more details. Modified: trunk/reactos/base/applications/network/telnet/src/tnetwork.h trunk/reactos/base/applications/tsclient/rdesktop/printercache.c trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.c trunk/reactos/base/applications/tsclient/rdesktop/uiports/qtwin.cpp Modified: trunk/reactos/base/applications/network/telnet/src/tnetwork.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnetwork.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnetwork.h [iso-8859-1] Wed Dec 2 19:28:52 2009 @@ -24,7 +24,7 @@ TNetwork(SOCKET s = 0): socket(s), local_echo(1), line_mode(1), net_type(TN_NETSOCKET), naws_func((Naws_func_t)NULL), local_address((char *)NULL) {} - ~TNetwork() {if(local_address) delete local_address;} + ~TNetwork() {if(local_address) delete[] local_address;} void SetSocket(SOCKET s); SOCKET GetSocket() {return socket;} Modified: trunk/reactos/base/applications/tsclient/rdesktop/printercache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/printercache.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/printercache.c [iso-8859-1] Wed Dec 2 19:28:52 2009 @@ -180,6 +180,7 @@ if (fstat(fd, &st)) { xfree(path); + close(fd); return 0; } Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.c [iso-8859-1] Wed Dec 2 19:28:52 2009 @@ -1405,7 +1405,10 @@ return -1; if (fstat(fd, &st)) + { + close(fd); return -1; + } *data = (uint8 *) xmalloc(st.st_size); length = read(fd, *data, st.st_size); Modified: trunk/reactos/base/applications/tsclient/rdesktop/uiports/qtwin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/uiports/qtwin.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/uiports/qtwin.cpp [iso-8859-1] Wed Dec 2 19:28:52 2009 @@ -1475,6 +1475,8 @@ } if (fstat(fd, &st)) { + close(fd); + xfree(path); return -1; } *data = (uint8 *) xmalloc(st.st_size);

1 0

[dgorbachev] 44363: Update log2lines to version 1.5. Jan Roeloffzen, bug #4342.
by dgorbachev＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: dgorbachev Date: Wed Dec 2 18:11:32 2009 New Revision: 44363 URL: http://svn.reactos.org/svn/reactos?rev=44363&view=rev Log: Update log2lines to version 1.5. Jan Roeloffzen, bug #4342. Modified: trunk/reactos/tools/rsym/log2lines.c Modified: trunk/reactos/tools/rsym/log2lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/log2lines.c?rev… ============================================================================== --- trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] Wed Dec 2 18:11:32 2009 @@ -10,11 +10,12 @@ #include "rsym.h" -#define LOG2LINES_VERSION "1.4" +#define LOG2LINES_VERSION "1.5" #define INVALID_BASE 0xFFFFFFFFL #define DEF_OPT_DIR "output-i386" +#define SOURCES_ENV "_ROSBE_ROSSOURCEDIR" #if defined (__DJGPP__) || defined (__WIN32__) @@ -52,6 +53,7 @@ "%s x -y -r %s" PATH_STR "reactos" PATH_STR "reactos.cab -o%s" PATH_STR "reactos" PATH_STR "reactos > " DEV_NULL #define LINESIZE 1024 +#define NAMESIZE 80 #define log(outFile, fmt, ...) \ { \ @@ -90,13 +92,26 @@ int total; }; +struct lineinfo_struct +{ + int valid; + char file1[LINESIZE]; + char func1[NAMESIZE]; + int nr1; + char file2[LINESIZE]; + char func2[NAMESIZE]; + int nr2; +}; + typedef struct cache_struct CACHE; typedef struct summ_struct SUMM; +typedef struct lineinfo_struct LINEINFO; static CACHE cache; static SUMM summ; - -static char *optchars = "bcd:fFhl:mMrstTuUvz:"; +static LINEINFO lastLine; + +static char *optchars = "bcd:fFhl:mMrsS:tTuUvz:"; static int opt_buffered= 0; // -b static int opt_help = 0; // -h static int opt_force = 0; // -f @@ -107,6 +122,7 @@ static int opt_Mark = 0; // -M static int opt_raw = 0; // -r static int opt_stats = 0; // -s +static int opt_Source = 0; // -S static int opt_twice = 0; // -t static int opt_Twice = 0; // -T static int opt_undo = 0; // -u @@ -120,6 +136,63 @@ static char *cache_name; static char *tmp_name; +static char sources_path[LINESIZE]; + +static void +clearLastLine(void) +{ + memset(&lastLine, 0, sizeof(LINEINFO)); +} + +static void +log_file(FILE *outFile, char *fileName, int max ) +{ + int i = 0, min = 0; + char s[LINESIZE]; + char p[LINESIZE]; + FILE *src; + + strcpy(p, sources_path); + strcat(p, fileName); + if ((src = fopen(p, "r"))) + { + min = max - opt_Source; + min = (min < 0) ? 0 : min; + while (i < max && fgets(s, LINESIZE, src)) + { + if (i >= min) + log(outFile, "| %4.4d %s", i + 1, s); + i++; + } + fclose(src); + } + else if (opt_verbose) + fprintf(stderr, "Can't open: %s (check " SOURCES_ENV ")\n", p); +} + +static void +logSource(FILE *outFile) +{ + log_file(outFile, lastLine.file1, lastLine.nr1); + if (lastLine.nr2) + { + log(outFile, "| ---- [%u] ----\n", lastLine.nr2); + log_file(outFile, lastLine.file2, lastLine.nr2); + } +} + +static void +reportSource(FILE *outFile) +{ + if (!opt_Source) + return; + if (lastLine.valid) + { + logSource(outFile); + } + clearLastLine(); +} + static char * basename(char *path) { @@ -206,17 +279,24 @@ } if (e || e2) { + strcpy(lastLine.file1, &Strings[e->FileOffset]); + strcpy(lastLine.func1, &Strings[e->FunctionOffset]); + lastLine.nr1 = e->SourceLine; + lastLine.valid = 1; if (e2) { + strcpy(lastLine.file2, &Strings[e2->FileOffset]); + strcpy(lastLine.func2, &Strings[e2->FunctionOffset]); + lastLine.nr2 = e2->SourceLine; bFileOffsetChanged = e->FileOffset != e2->FileOffset; if (e->FileOffset != e2->FileOffset || e->FunctionOffset != e2->FunctionOffset) summ.majordiff++; /* - * - "%.0s" displays nothing, but processes argument - * - bFileOffsetChanged implies always display 2nd SourceLine even if the same - * - also for FunctionOffset - */ + * - "%.0s" displays nothing, but processes argument + * - bFileOffsetChanged implies always display 2nd SourceLine even if the same + * - also for FunctionOffset + */ strcat(fmt, "%s"); if (bFileOffsetChanged) strcat(fmt, "[%s]"); @@ -238,23 +318,23 @@ if (toString) { // put in toString if provided snprintf(toString, LINESIZE, fmt, - &Strings[e->FileOffset], - &Strings[e2->FileOffset], - (unsigned int)e->SourceLine, - (unsigned int)e2->SourceLine, - &Strings[e->FunctionOffset], - &Strings[e2->FunctionOffset]); + &Strings[e->FileOffset], + &Strings[e2->FileOffset], + (unsigned int)e->SourceLine, + (unsigned int)e2->SourceLine, + &Strings[e->FunctionOffset], + &Strings[e2->FunctionOffset]); } else { - strcat(fmt, "\n"); - printf(fmt, - &Strings[e->FileOffset], - &Strings[e2->FileOffset], - (unsigned int)e->SourceLine, - (unsigned int)e2->SourceLine, - &Strings[e->FunctionOffset], - &Strings[e2->FunctionOffset]); + strcat(fmt, "\n"); + printf(fmt, + &Strings[e->FileOffset], + &Strings[e2->FileOffset], + (unsigned int)e->SourceLine, + (unsigned int)e2->SourceLine, + &Strings[e->FunctionOffset], + &Strings[e2->FunctionOffset]); } } else @@ -262,16 +342,16 @@ if (toString) { // put in toString if provided snprintf(toString, LINESIZE, "%s:%u (%s)", - &Strings[e->FileOffset], - (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset]); + &Strings[e->FileOffset], + (unsigned int)e->SourceLine, + &Strings[e->FunctionOffset]); } else { printf("%s:%u (%s)\n", - &Strings[e->FileOffset], - (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset]); + &Strings[e->FileOffset], + (unsigned int)e->SourceLine, + &Strings[e->FunctionOffset]); } } return 0; @@ -831,9 +911,19 @@ if (!*Line) return; + res = 1; mark = ""; s = remove_mark(Line); + if (opt_undo) + { + /* Strip all lines added by this tool: */ + char buf[NAMESIZE]; + if (sscanf(s, "| %s", buf) == 1) + if (buf[0] == '0' || strcmp(buf, "----") == 0 || atoi(buf)) + res = 0; + } + sep = strchr(s, ':'); if (sep) { @@ -947,6 +1037,7 @@ translate_line(outFile, Line, path, LineOut); i = 0; translate_char(c, outFile); + reportSource(outFile); break; case '<': i = 0; @@ -1005,6 +1096,7 @@ if (!opt_raw) { translate_line(outFile, Line, path, LineOut); + reportSource(outFile); } else { @@ -1075,20 +1167,27 @@ " - Offset error: Image exists, but error retrieving offset info.\n" " - Total: Total number of lines attempted to translate.\n" " Also some version info is displayed.\n\n" -" -t Translate twice. The address itself and for (address - 1)\n" +" -S <context>\n" +" Source lines. Display up to <context> lines until linenumber.\n" +" The environment variable _ROSBE_ROSSOURCEDIR should be correctly set.\n" +" For a reliable result, these sources should be up to date with\n" +" the revision you test.\n" +" Can be combined with -tT.\n" +" Implies -U. Retranslation needed for retrieving source info.\n\n" +" -t Translate twice. The address itself and for (address - 1).\n" " Show extra filename, func and linenumber between [..] if they differ\n" " So if only the linenumbers differ, then only show the extra\n" " linenumber.\n\n" -" -T As -t, but the original filename+func+linenumber gets replaced\n\n" +" -T As -t, but show only filename+func+linenumber for (address - 1.)\n\n" " -u Undo translations.\n" " Lines are translated back (reverted) to the form <IMAGENAME:ADDRESS>\n" -" Overrides console mode -c.\n\n" +" Also removes all lines previously added by this tool (see -S)\n\n" " -U Undo and reprocess.\n" " Reverted to the form <IMAGENAME:ADDRESS>, and then retranslated\n" -" Overrides console mode -c, implies -u.\n\n" +" Implies -u.\n\n" " -v Show detailed errors and tracing.\n" " Repeating this option adds more verbosity.\n" -" Default: only (major) errors\n" "\n\n" +" Default: only (major) errors\n\n" " -z <path to 7z>\n" " Specify path to 7z. See also option -d.\n" " Default: '7z'\n" @@ -1113,6 +1212,14 @@ " The following command line invocations are equivalent:\n" " log2lines msi.dll 2e35d msi.dll 2235 msiexec.exe 30a8 msiexec.exe 2e89\n" " log2lines msi.dll 2e35d 2235 msiexec.exe 30a8 2e89\n\n" +" Generate source lines from backtrace ('bt') output. Show 2 lines of context:\n" +" log2lines -S 2 -d bootcd-38701-dbg.7z < bugxxxx.log\n" +" <msiexec.exe:2e89 (lib/3rdparty/mingw/crtexe.c:259 (__tmainCRTStartup))>\n" +" | 0258 #else\n" +" | 0259 mainret = main (\n" +" <msiexec.exe:2fad (lib/3rdparty/mingw/crtexe.c:160 (WinMainCRTStartup))>\n" +" | 0159 return __tmainCRTStartup ();\n" +" | 0160 }\n" "\n"; static void @@ -1277,6 +1384,14 @@ int opt; int optCount = 0; int i; + char *s; + + strcpy(sources_path, ""); + if ((s = getenv(SOURCES_ENV))) + { + strcpy(sources_path, s); + strcat(sources_path, PATH_STR); + } strcpy(opt_scanned, ""); for (i = 1; i < argc; i++) @@ -1289,6 +1404,7 @@ strcpy(opt_7z, CMD_7Z); memset(&summ, 0, sizeof(SUMM)); + clearLastLine(); while (-1 != (opt = getopt(argc, (char **const)argv, optchars))) { @@ -1332,6 +1448,10 @@ case 's': opt_stats++; break; + case 'S': + optCount++; + opt_Source = atoi(optarg); + break; case 't': opt_twice++; break; @@ -1360,9 +1480,12 @@ } optCount++; } - if (opt_undo) - opt_console = 0; - + if (opt_Source) + { + /* need to retranslate for source info: */ + opt_undo++; + opt_redo++; + } argc -= optCount; if (check_directory(opt_force)) return 3; @@ -1413,6 +1536,7 @@ if (opt_verbose > 1) fprintf(stderr, "translating %s %s\n", base, offset); translate_file(base, my_atoi(offset), NULL); + reportSource(stdout); } else {

1 0

[khornicek] 44362: - use EngMovePointer when appropriate, fixes mouse in VBox
by khornicek＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: khornicek Date: Wed Dec 2 15:31:16 2009 New Revision: 44362 URL: http://svn.reactos.org/svn/reactos?rev=44362&view=rev Log: - use EngMovePointer when appropriate, fixes mouse in VBox Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Wed Dec 2 15:31:16 2009 @@ -20,9 +20,10 @@ IN RECTL *prcl) { SURFACE *pSurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + PPDEVOBJ ppdev = GDIDEV(pso); SURFACE_LockBitmapBits(pSurf); - GDIDEVFUNCS(pso).MovePointer(pso, x, y, prcl); + ppdev->pfnMovePointer(pso, x, y, prcl); SURFACE_UnlockBitmapBits(pSurf); }

1 0

[khornicek] 44361: - bring support for EnumDisplaySettings and ChangeDisplaySettings from trunk
by khornicek＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: khornicek Date: Wed Dec 2 14:17:44 2009 New Revision: 44361 URL: http://svn.reactos.org/svn/reactos?rev=44361&view=rev Log: - bring support for EnumDisplaySettings and ChangeDisplaySettings from trunk Added: branches/arwinss/reactos/subsystems/win32/win32k/main/display.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -366,8 +366,15 @@ LONG CDECL RosDrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode, HWND hwnd, DWORD flags, LPVOID lparam ) { - UNIMPLEMENTED; - return DISP_CHANGE_FAILED; + UNICODE_STRING usDeviceName, *pusDeviceName = NULL; + + if (name) + { + RtlInitUnicodeString(&usDeviceName, name); + pusDeviceName = &usDeviceName; + } + + return RosUserChangeDisplaySettings(pusDeviceName, mode, hwnd, flags, lparam); } BOOL CDECL RosDrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) @@ -433,8 +440,15 @@ BOOL CDECL RosDrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { - UNIMPLEMENTED; - return FALSE; + UNICODE_STRING usDeviceName, *pusDeviceName = NULL; + + if (name) + { + RtlInitUnicodeString(&usDeviceName, name); + pusDeviceName = &usDeviceName; + } + + return NT_SUCCESS(RosUserEnumDisplaySettings(pusDeviceName, num, mode, flags)); } BOOL CDECL RosDrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -49,12 +49,29 @@ void NTAPI RosUserSetCursor( ICONINFO* IconInfo ); +LONG +APIENTRY +RosUserChangeDisplaySettings( + PUNICODE_STRING lpszDeviceName, + LPDEVMODEW lpDevMode, + HWND hwnd, + DWORD dwflags, + LPVOID lParam); + INT APIENTRY RosUserEnumDisplayMonitors( OPTIONAL OUT HMONITOR *hMonitorList, OPTIONAL OUT PRECTL monitorRectList, OPTIONAL IN DWORD listSize); + +NTSTATUS +APIENTRY +RosUserEnumDisplaySettings( + PUNICODE_STRING pusDeviceName, + DWORD iModeNum, + LPDEVMODEW lpDevMode, + DWORD dwFlags ); BOOL APIENTRY Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -508,10 +508,10 @@ return FALSE; } - /*if (! PrepareVideoPrt()) + if (! PrepareVideoPrt()) { return FALSE; - }*/ + } /* Enable the drawing surface */ PrimarySurface.pSurface = @@ -568,6 +568,612 @@ KeResetEvent(&VideoDriverPrepared); ObDereferenceObject(PrimarySurface.VideoFileObject); +} + +NTSTATUS FASTCALL +GetVideoRegistryKey( + OUT PUNICODE_STRING RegistryPath, + IN PCUNICODE_STRING DeviceName) /* ex: "\Device\Video0" */ +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + RtlInitUnicodeString(RegistryPath, NULL); + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED | RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].Name = DeviceName->Buffer; + QueryTable[0].EntryContext = RegistryPath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, + L"VIDEO", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No %wZ value in DEVICEMAP\\VIDEO found (Status 0x%08lx)\n", DeviceName, Status); + return STATUS_NO_SUCH_DEVICE; + } + + DPRINT("RegistryPath %wZ\n", RegistryPath); + return STATUS_SUCCESS; +} + +static NTSTATUS FASTCALL +GetVideoDeviceName( + OUT PUNICODE_STRING VideoDeviceName, + IN PCUNICODE_STRING DisplayDevice) /* ex: "\.\DISPLAY1" or "\??\DISPLAY1" */ +{ + UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\??\\"); + UNICODE_STRING ObjectName; + UNICODE_STRING KernelModeName = { 0, }; + OBJECT_ATTRIBUTES ObjectAttributes; + USHORT LastSlash; + ULONG Length; + HANDLE LinkHandle = NULL; + NTSTATUS Status; + + RtlInitUnicodeString(VideoDeviceName, NULL); + + /* Get device name (DisplayDevice is "\.\xxx") */ + for (LastSlash = DisplayDevice->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) + { + if (DisplayDevice->Buffer[LastSlash - 1] == L'\\') + break; + } + + if (LastSlash == 0) + { + DPRINT1("Invalid device name '%wZ'\n", DisplayDevice); + Status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + ObjectName = *DisplayDevice; + ObjectName.Length -= LastSlash * sizeof(WCHAR); + ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); + ObjectName.Buffer += LastSlash; + + /* Create "\??\xxx" (ex: "\??\DISPLAY1") */ + KernelModeName.MaximumLength = Prefix.Length + ObjectName.Length + sizeof(UNICODE_NULL); + KernelModeName.Buffer = ExAllocatePoolWithTag(PagedPool, + KernelModeName.MaximumLength, + TAG_DC); + if (!KernelModeName.Buffer) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + RtlCopyUnicodeString(&KernelModeName, &Prefix); + Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); + if (!NT_SUCCESS(Status)) + goto cleanup; + + /* Open \??\xxx (ex: "\??\DISPLAY1") */ + InitializeObjectAttributes(&ObjectAttributes, + &KernelModeName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + GENERIC_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to open symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + + Status = ZwQuerySymbolicLinkObject(LinkHandle, VideoDeviceName, &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("Unable to query symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + VideoDeviceName->MaximumLength = Length; + VideoDeviceName->Buffer = ExAllocatePoolWithTag(PagedPool, + VideoDeviceName->MaximumLength + sizeof(UNICODE_NULL), + TAG_DC); + if (!VideoDeviceName->Buffer) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = ZwQuerySymbolicLinkObject(LinkHandle, VideoDeviceName, NULL); + VideoDeviceName->Buffer[VideoDeviceName->MaximumLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to query symbolic link %wZ (Status 0x%08lx)\n", &KernelModeName, Status); + Status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + Status = STATUS_SUCCESS; + +cleanup: + if (!NT_SUCCESS(Status) && VideoDeviceName->Buffer) + ExFreePoolWithTag(VideoDeviceName->Buffer, TAG_DC); + if (KernelModeName.Buffer) + ExFreePoolWithTag(KernelModeName.Buffer, TAG_DC); + if (LinkHandle) + ZwClose(LinkHandle); + return Status; +} + +LONG +FASTCALL +GreChangeDisplaySettings( + IN PUNICODE_STRING pDeviceName OPTIONAL, + IN LPDEVMODEW DevMode, + IN DWORD dwflags, + IN PVOID lParam OPTIONAL) +{ + BOOLEAN Global = FALSE; + BOOLEAN NoReset = FALSE; + BOOLEAN Reset = FALSE; + BOOLEAN SetPrimary = FALSE; + LONG Ret = DISP_CHANGE_SUCCESSFUL; + NTSTATUS Status ; + + DPRINT1("display flags : %x\n",dwflags); + + if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) + { + /* Check global, reset and noreset flags */ + if ((dwflags & CDS_GLOBAL) == CDS_GLOBAL) + Global = TRUE; + if ((dwflags & CDS_NORESET) == CDS_NORESET) + NoReset = TRUE; + dwflags &= ~(CDS_GLOBAL | CDS_NORESET); + } + if ((dwflags & CDS_RESET) == CDS_RESET) + Reset = TRUE; + if ((dwflags & CDS_SET_PRIMARY) == CDS_SET_PRIMARY) + SetPrimary = TRUE; + dwflags &= ~(CDS_RESET | CDS_SET_PRIMARY); + + if (Reset && NoReset) + return DISP_CHANGE_BADFLAGS; + + if (dwflags == 0) + { + /* Dynamically change graphics mode */ + DPRINT1("flag 0 UNIMPLEMENTED\n"); + return DISP_CHANGE_FAILED; + SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); + } + + if ((dwflags & CDS_TEST) == CDS_TEST) + { + /* Test resolution */ + dwflags &= ~CDS_TEST; + Status = GreEnumDisplaySettings(pDeviceName, ENUM_REGISTRY_SETTINGS, DevMode, 0); + if (!NT_SUCCESS(Status)) + Ret = DISP_CHANGE_BADMODE; + return Ret; + } + + if ((dwflags & CDS_FULLSCREEN) == CDS_FULLSCREEN) + { + DEVMODEW lpDevMode; + /* Full Screen */ + dwflags &= ~CDS_FULLSCREEN; + DPRINT1("flag CDS_FULLSCREEN partially implemented\n"); + Ret = DISP_CHANGE_FAILED; + + RtlZeroMemory(&lpDevMode, sizeof(DEVMODEW)); + lpDevMode.dmSize = sizeof(DEVMODEW); + + Status = GreEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0); + if (!NT_SUCCESS(Status)) + return DISP_CHANGE_FAILED; + + DPRINT1("Req Mode : %d x %d x %d\n", DevMode->dmPelsWidth,DevMode->dmPelsHeight,DevMode->dmBitsPerPel); + DPRINT1("Current Mode : %d x %d x %d\n", lpDevMode.dmPelsWidth,lpDevMode.dmPelsHeight, lpDevMode.dmBitsPerPel); + + + if ((lpDevMode.dmBitsPerPel == DevMode->dmBitsPerPel) && + (lpDevMode.dmPelsWidth == DevMode->dmPelsWidth) && + (lpDevMode.dmPelsHeight == DevMode->dmPelsHeight)) + Ret = DISP_CHANGE_SUCCESSFUL; + } + + if ((dwflags & CDS_VIDEOPARAMETERS) == CDS_VIDEOPARAMETERS) + { + dwflags &= ~CDS_VIDEOPARAMETERS; + if (lParam == NULL) + Ret=DISP_CHANGE_BADPARAM; + else + { + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENTED\n"); + Ret = DISP_CHANGE_FAILED; + SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); + } + + } + + if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) + { + + UNICODE_STRING DeviceName; + UNICODE_STRING RegistryKey; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DevInstRegKey; + ULONG NewValue; + + DPRINT1("set CDS_UPDATEREGISTRY\n"); + + dwflags &= ~CDS_UPDATEREGISTRY; + + /* Check if pDeviceName is NULL, we need to retrieve it */ + if (pDeviceName == NULL) + { + // FIXME + DPRINT1("fixme: pDeviceName is NULL\n"); + return DISP_CHANGE_FAILED; + } + + Status = GetVideoDeviceName(&DeviceName, pDeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get destination of '%wZ' (Status 0x%08lx)\n", pDeviceName, Status); + return DISP_CHANGE_FAILED; + } + Status = GetVideoRegistryKey(&RegistryKey, &DeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to get registry key for '%wZ' (Status 0x%08lx)\n", &DeviceName, Status); + ExFreePoolWithTag(DeviceName.Buffer, TAG_DC); + return DISP_CHANGE_FAILED; + } + ExFreePoolWithTag(DeviceName.Buffer, TAG_DC); + + InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&DevInstRegKey, KEY_SET_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to open registry key %wZ (Status 0x%08lx)\n", &RegistryKey, Status); + ExFreePoolWithTag(RegistryKey.Buffer, TAG_RTLREGISTRY); + return DISP_CHANGE_FAILED; + } + ExFreePoolWithTag(RegistryKey.Buffer, TAG_RTLREGISTRY); + + /* Update needed fields */ + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_BITSPERPEL) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.BitsPerPel"); + NewValue = DevMode->dmBitsPerPel; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); + NewValue = DevMode->dmPelsWidth; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSHEIGHT) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.YResolution"); + NewValue = DevMode->dmPelsHeight; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + if (NT_SUCCESS(Status) && DevMode->dmFields & DM_DISPLAYFREQUENCY) + { + RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.VRefresh"); + NewValue = DevMode->dmDisplayFrequency; + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + } + + ZwClose(DevInstRegKey); + if (NT_SUCCESS(Status)) + Ret = DISP_CHANGE_RESTART; + else + /* return DISP_CHANGE_NOTUPDATED when we can save to reg only valid for NT */ + Ret = DISP_CHANGE_NOTUPDATED; + } + + if (dwflags != 0) + Ret = DISP_CHANGE_BADFLAGS; + + DPRINT("IntChangeDisplaySettings returning %x\n", Ret); + return Ret; +} + +NTSTATUS FASTCALL +GetDisplayNumberFromDeviceName( + IN PUNICODE_STRING pDeviceName OPTIONAL, + OUT ULONG *DisplayNumber) +{ + UNICODE_STRING DisplayString = RTL_CONSTANT_STRING(L"\\\\.\\DISPLAY"); + NTSTATUS Status = STATUS_SUCCESS; + ULONG Length; + ULONG Number; + ULONG i; + + if (DisplayNumber == NULL) + return STATUS_INVALID_PARAMETER_2; + + /* Check if DeviceName is valid */ + if (pDeviceName && + pDeviceName->Length > 0 && pDeviceName->Length <= DisplayString.Length) + return STATUS_OBJECT_NAME_INVALID; + + if (pDeviceName == NULL || pDeviceName->Length == 0) + { + /* FIXME + + PWINDOW_OBJECT DesktopObject; + HDC DesktopHDC; + PDC pDC; + + DesktopObject = UserGetDesktopWindow(); + DesktopHDC = UserGetWindowDC(DesktopObject); + pDC = DC_LockDc(DesktopHDC); + + *DisplayNumber = pDC->ppdev->DisplayNumber; + + DC_UnlockDc(pDC); + UserReleaseDC(DesktopObject, DesktopHDC, FALSE); + */ + *DisplayNumber = 1; + DPRINT1("FIXME: DeviceName is NULL, trying display nr. 1\n"); + return STATUS_SUCCESS; + } + + /* Hack to check if the first parts are equal, by faking the device name length */ + Length = pDeviceName->Length; + pDeviceName->Length = DisplayString.Length; + if (RtlEqualUnicodeString(&DisplayString, pDeviceName, FALSE) == FALSE) + Status = STATUS_OBJECT_NAME_INVALID; + pDeviceName->Length = Length; + + if (NT_SUCCESS(Status)) + { + /* Convert the last part of pDeviceName to a number */ + Number = 0; + Length = pDeviceName->Length / sizeof(WCHAR); + for (i = DisplayString.Length / sizeof(WCHAR); i < Length; i++) + { + WCHAR Char = pDeviceName->Buffer[i]; + if (Char >= L'0' && Char <= L'9') + Number = Number * 10 + Char - L'0'; + else if (Char != L'\0') + return STATUS_OBJECT_NAME_INVALID; + } + + *DisplayNumber = Number - 1; + } + + return Status; +} + +NTSTATUS +FASTCALL +GreEnumDisplaySettings( + IN PUNICODE_STRING pDeviceName OPTIONAL, + IN DWORD iModeNum, + IN OUT LPDEVMODEW pDevMode, + IN DWORD dwFlags) +{ + static DEVMODEW *CachedDevModes = NULL, *CachedDevModesEnd = NULL; + static DWORD SizeOfCachedDevModes = 0; + static UNICODE_STRING CachedDeviceName; + PDEVMODEW CachedMode = NULL; + DEVMODEW DevMode; + ULONG DisplayNumber; + NTSTATUS Status; + + Status = GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize); + DPRINT("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra); + + if (iModeNum == ENUM_CURRENT_SETTINGS) + { + CachedMode = &PrimarySurface.DMW; + ASSERT(CachedMode->dmSize > 0); + } + else if (iModeNum == ENUM_REGISTRY_SETTINGS) + { + RtlZeroMemory(&DevMode, sizeof (DevMode)); + DevMode.dmSize = sizeof (DevMode); + DevMode.dmDriverExtra = 0; + if (SetupDevMode(&DevMode, DisplayNumber)) + CachedMode = &DevMode; + else + { + return STATUS_UNSUCCESSFUL; // FIXME: what status? + } + /* FIXME: Maybe look for the matching devmode supplied by the + * driver so we can provide driver private/extra data? + */ + } + else + { + BOOL IsCachedDevice = (CachedDevModes != NULL); + + if (CachedDevModes && + ((pDeviceName == NULL && CachedDeviceName.Length > 0) || + (pDeviceName != NULL && pDeviceName->Buffer != NULL && CachedDeviceName.Length == 0) || + (pDeviceName != NULL && pDeviceName->Buffer != NULL && CachedDeviceName.Length > 0 && RtlEqualUnicodeString(pDeviceName, &CachedDeviceName, TRUE) == FALSE))) + { + IsCachedDevice = FALSE; + } + + if (iModeNum == 0 || IsCachedDevice == FALSE) /* query modes from drivers */ + { + UNICODE_STRING DriverFileNames; + LPWSTR CurrentName; + DRVENABLEDATA DrvEnableData; + + /* Free resources from last driver cache */ + if (IsCachedDevice == FALSE && CachedDeviceName.Buffer != NULL) + { + RtlFreeUnicodeString(&CachedDeviceName); + } + + /* Retrieve DDI driver names from registry */ + RtlInitUnicodeString(&DriverFileNames, NULL); + if (!FindDriverFileNames(&DriverFileNames, DisplayNumber)) + { + DPRINT1("FindDriverFileNames failed\n"); + return STATUS_UNSUCCESSFUL; + } + + if (!IntPrepareDriverIfNeeded()) + { + DPRINT1("IntPrepareDriverIfNeeded failed\n"); + return STATUS_UNSUCCESSFUL; + } + + /* + * DriverFileNames may be a list of drivers in REG_SZ_MULTI format, + * scan all of them until a good one found. + */ + CurrentName = DriverFileNames.Buffer; + for (;CurrentName < DriverFileNames.Buffer + (DriverFileNames.Length / sizeof (WCHAR)); + CurrentName += wcslen(CurrentName) + 1) + { + INT i; + PFN_DrvEnableDriver GDEnableDriver; + PFN_DrvGetModes GetModes = NULL; + INT SizeNeeded, SizeUsed; + + /* Get the DDI driver's entry point */ + //GDEnableDriver = DRIVER_FindDDIDriver(CurrentName); + GDEnableDriver = DRIVER_FindExistingDDIDriver(L"DISPLAY"); + if (NULL == GDEnableDriver) + { + DPRINT("FindDDIDriver failed for %S\n", CurrentName); + continue; + } + + /* Call DDI driver's EnableDriver function */ + RtlZeroMemory(&DrvEnableData, sizeof(DrvEnableData)); + + if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof (DrvEnableData), &DrvEnableData)) + { + DPRINT("DrvEnableDriver failed for %S\n", CurrentName); + continue; + } + + CachedDevModesEnd = CachedDevModes; + + /* find DrvGetModes function */ + for (i = 0; i < DrvEnableData.c; i++) + { + PDRVFN DrvFn = DrvEnableData.pdrvfn + i; + + if (DrvFn->iFunc == INDEX_DrvGetModes) + { + GetModes = (PFN_DrvGetModes)DrvFn->pfn; + break; + } + } + + if (GetModes == NULL) + { + DPRINT("DrvGetModes doesn't exist for %S\n", CurrentName); + continue; + } + + /* make sure we have enough memory to hold the modes */ + SizeNeeded = GetModes((HANDLE)(PrimarySurface.VideoFileObject->DeviceObject), 0, NULL); + if (SizeNeeded <= 0) + { + DPRINT("DrvGetModes failed for %S\n", CurrentName); + break; + } + + SizeUsed = (PCHAR)CachedDevModesEnd - (PCHAR)CachedDevModes; + if (SizeOfCachedDevModes < SizeUsed + SizeNeeded) + { + PVOID NewBuffer; + + SizeOfCachedDevModes += SizeNeeded; + NewBuffer = ExAllocatePool(PagedPool, SizeOfCachedDevModes); + if (NewBuffer == NULL) + { + /* clean up */ + ExFreePool(CachedDevModes); + CachedDevModes = NULL; + CachedDevModesEnd = NULL; + SizeOfCachedDevModes = 0; + + if (CachedDeviceName.Buffer != NULL) + RtlFreeUnicodeString(&CachedDeviceName); + + return STATUS_NO_MEMORY; + } + if (CachedDevModes != NULL) + { + RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed); + ExFreePool(CachedDevModes); + } + CachedDevModes = NewBuffer; + CachedDevModesEnd = (DEVMODEW *)((PCHAR)NewBuffer + SizeUsed); + } + + if (!IsCachedDevice) + { + if (CachedDeviceName.Buffer != NULL) + RtlFreeUnicodeString(&CachedDeviceName); + + if (pDeviceName) + RtlCopyUnicodeString(&CachedDeviceName, pDeviceName); + + IsCachedDevice = TRUE; + } + + /* query modes */ + SizeNeeded = GetModes((HANDLE)(PrimarySurface.VideoFileObject->DeviceObject), + SizeNeeded, + CachedDevModesEnd); + if (SizeNeeded <= 0) + { + DPRINT("DrvGetModes failed for %S\n", CurrentName); + } + else + { + CachedDevModesEnd = (DEVMODEW *)((PCHAR)CachedDevModesEnd + SizeNeeded); + } + } + + ExFreePoolWithTag(DriverFileNames.Buffer, TAG_RTLREGISTRY); + } + + /* return cached info */ + CachedMode = CachedDevModes; + if (CachedMode >= CachedDevModesEnd) + { + return STATUS_NO_MORE_ENTRIES; + } + while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) + { + assert(CachedMode->dmSize > 0); + CachedMode = (DEVMODEW *)((PCHAR)CachedMode + CachedMode->dmSize + CachedMode->dmDriverExtra); + } + if (CachedMode >= CachedDevModesEnd) + { + return STATUS_NO_MORE_ENTRIES; + } + } + + ASSERT(CachedMode != NULL); + + RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize)); + RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); + RtlCopyMemory(pDevMode + min(pDevMode->dmSize, CachedMode->dmSize), CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); + + return STATUS_SUCCESS; } INT APIENTRY Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -34,7 +34,4 @@ ((PDC) GDIOBJ_LockObj ((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) #define DC_Unlock(pDC) \ GDIOBJ_UnlockObjByPtr ((PBASEOBJECT)pDC) - -INT APIENTRY GreGetDeviceCaps(PDC pDC, INT cap); - #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -83,6 +83,14 @@ extern HGDIOBJ hStockBmp; VOID CreateStockBitmap(); +/* device.c */ +LONG FASTCALL GreChangeDisplaySettings(PUNICODE_STRING pDeviceName, + LPDEVMODEW DevMode, DWORD dwflags, + PVOID lParam); +NTSTATUS FASTCALL GreEnumDisplaySettings(PUNICODE_STRING pDeviceName, DWORD iModeNum, + LPDEVMODEW pDevMode, DWORD dwFlags); +INT APIENTRY GreGetDeviceCaps(PDC pDC, INT cap); + /* font.c */ VOID NTAPI GreTextOut(PDC pDC, INT x, INT y, UINT flags, Added: branches/arwinss/reactos/subsystems/win32/win32k/main/display.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/display.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/display.c [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -1,0 +1,195 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/main/display.c + * PURPOSE: ReactOS display settings support + */ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + + +NTSTATUS +APIENTRY +RosUserEnumDisplaySettings( + PUNICODE_STRING pusDeviceName, + DWORD iModeNum, + LPDEVMODEW lpDevMode, + DWORD dwFlags ) +{ + NTSTATUS Status; + LPDEVMODEW pSafeDevMode = NULL; + PUNICODE_STRING pusSafeDeviceName = NULL; + UNICODE_STRING usSafeDeviceName; + USHORT ExtraSize = 0; + + _SEH2_TRY + { + ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT("FIXME: DEVMODEW size out of range\n"); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + if (lpDevMode->dmSize != sizeof(DEVMODEW)) + { + return STATUS_BUFFER_TOO_SMALL; + } + + pSafeDevMode = ExAllocatePool(PagedPool, sizeof(DEVMODEW) + lpDevMode->dmDriverExtra); + + if (pSafeDevMode == NULL) + { + return STATUS_NO_MEMORY; + } + + pSafeDevMode->dmSize = sizeof(DEVMODEW); + pSafeDevMode->dmDriverExtra = lpDevMode->dmDriverExtra; + + ExtraSize = pSafeDevMode->dmDriverExtra; + + /* Copy the device name */ + if (pusDeviceName != NULL) + { + _SEH2_TRY + { + RtlInitUnicodeString(&usSafeDeviceName, pusDeviceName->Buffer); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePool(pSafeDevMode); + _SEH2_YIELD(return STATUS_UNSUCCESSFUL); + } + _SEH2_END; + pusSafeDeviceName = &usSafeDeviceName; + } + + /* Call internal function */ + Status = GreEnumDisplaySettings(pusSafeDeviceName, iModeNum, pSafeDevMode, dwFlags); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(pSafeDevMode); + return Status; + } + + /* Copy some information back */ + _SEH2_TRY + { + ProbeForWrite(lpDevMode,sizeof(DEVMODEW) + ExtraSize, 1); + lpDevMode->dmPelsWidth = pSafeDevMode->dmPelsWidth; + lpDevMode->dmPelsHeight = pSafeDevMode->dmPelsHeight; + lpDevMode->dmBitsPerPel = pSafeDevMode->dmBitsPerPel; + lpDevMode->dmDisplayFrequency = pSafeDevMode->dmDisplayFrequency; + lpDevMode->dmDisplayFlags = pSafeDevMode->dmDisplayFlags; + + /* output private/extra driver data */ + if (ExtraSize > 0) + { + memcpy((PCHAR)lpDevMode + sizeof(DEVMODEW), (PCHAR)pSafeDevMode + sizeof(DEVMODEW), ExtraSize); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + ExFreePool(pSafeDevMode); + return Status; +} + +LONG +APIENTRY +RosUserChangeDisplaySettings( + PUNICODE_STRING pusDeviceName, + LPDEVMODEW lpDevMode, + HWND hwnd, + DWORD dwflags, + LPVOID lParam) +{ + LPDEVMODEW pSafeDevMode = NULL; + PUNICODE_STRING pusSafeDeviceName = NULL; + UNICODE_STRING usSafeDeviceName; + LONG Ret; + WORD Size; + + /* Check arguments */ +#ifdef CDS_VIDEOPARAMETERS + + if (dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) +#else + + if (lParam != NULL) +#endif + + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } + if (hwnd != NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } + + /* Copy devmode */ + _SEH2_TRY + { + ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); + Size = lpDevMode->dmSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT("FIXME: DEVMODEW size out of range\n"); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + if (Size != sizeof(DEVMODEW)) + { + SetLastNtError(STATUS_BUFFER_TOO_SMALL); + return DISP_CHANGE_BADPARAM; + } + + pSafeDevMode = ExAllocatePool(PagedPool, Size); + + if (pSafeDevMode == NULL) + { + return DISP_CHANGE_BADPARAM; + } + + pSafeDevMode->dmSize = Size; + + if(lpDevMode->dmDriverExtra != 0) + DPRINT1("ignoring DriverExtra\n"); + + pSafeDevMode->dmDriverExtra = 0; + + RtlCopyMemory(pSafeDevMode, lpDevMode, pSafeDevMode->dmSize); + + /* Copy the device name */ + if (pusDeviceName != NULL) + { + _SEH2_TRY + { + RtlInitUnicodeString(&usSafeDeviceName, pusDeviceName->Buffer); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePool(pSafeDevMode); + _SEH2_YIELD(return DISP_CHANGE_BADPARAM); + } + _SEH2_END; + pusSafeDeviceName = &usSafeDeviceName; + } + + /* Call internal function */ + Ret = GreChangeDisplaySettings(pusSafeDeviceName, pSafeDevMode, dwflags, lParam); + + return Ret; +} Propchange: branches/arwinss/reactos/subsystems/win32/win32k/main/display.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -70,7 +70,9 @@ RosUserSetCursorPos 2 RosUserClipCursor 1 RosUserSetCursor 1 +RosUserChangeDisplaySettings 5 RosUserEnumDisplayMonitors 3 +RosUserEnumDisplaySettings 4 RosUserGetMonitorInfo 2 RosUserGetKeyboardLayout 1 RosUserGetKeyboardLayoutName 1 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Wed Dec 2 14:17:44 2009 @@ -112,6 +112,7 @@ <file>err.c</file> <file>init.c</file> <file>cursor.c</file> + <file>display.c</file> <file>monitor.c</file> <file>kbdlayout.c</file> <file>keyboard.c</file>

1 0

[khornicek] 44360: - add EngCreateDeviceSurface, one step closer to working VBox video driver
by khornicek＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: khornicek Date: Wed Dec 2 13:55:44 2009 New Revision: 44360 URL: http://svn.reactos.org/svn/reactos?rev=44360&view=rev Log: - add EngCreateDeviceSurface, one step closer to working VBox video driver Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Wed Dec 2 13:55:44 2009 @@ -232,8 +232,47 @@ IN SIZEL Size, IN ULONG Format) { - UNIMPLEMENTED; - return NULL; + HSURF hSurf; + SURFOBJ *pso; + PSURFACE pSurf; + + pSurf = (PSURFACE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP); + + if (!pSurf) + { + return 0; + } + + hSurf = pSurf->BaseObject.hHmgr; + GDIOBJ_SetOwnership(hSurf, NULL); + + pSurf->pBitsLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FAST_MUTEX), + TAG_SURFOBJ); + + if (!pSurf->pBitsLock) + { + SURFACE_Unlock(pSurf); + GDIOBJ_FreeObjByHandle(hSurf, GDI_OBJECT_TYPE_BITMAP); + return 0; + } + + ExInitializeFastMutex(pSurf->pBitsLock); + + pso = &pSurf->SurfObj; + pso->dhsurf = dhSurf; + pso->hsurf = hSurf; + pso->sizlBitmap = Size; + pso->iBitmapFormat = Format; + pso->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); + pso->iType = STYPE_DEVICE; + pso->iUniq = 0; + + pSurf->flHooks = 0; + + SURFACE_Unlock(pSurf); + + return hSurf; } BOOL

1 0

[gedmurphy] 44358: Handle the upcoming name change from mingw32-make.exe to make.exe in the next version of RosBE.
by gedmurphy＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: gedmurphy Date: Wed Dec 2 10:16:10 2009 New Revision: 44358 URL: http://svn.reactos.org/svn/reactos?rev=44358&view=rev Log: Handle the upcoming name change from mingw32-make.exe to make.exe in the next version of RosBE. Modified: trunk/reactos/rosbuild.bat Modified: trunk/reactos/rosbuild.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/rosbuild.bat?rev=44358&r1=… ============================================================================== --- trunk/reactos/rosbuild.bat [iso-8859-1] (original) +++ trunk/reactos/rosbuild.bat [iso-8859-1] Wed Dec 2 10:16:10 2009 @@ -1,5 +1,5 @@ :: -:: Call from Makefile command line within Visual Studio with the following parameters: +:: This script is called from the Makefile command line within Visual Studio using the following parameters: :: :: %1 - $(build) :: %2 - $(target) @@ -41,21 +41,28 @@ ::echo RosBE insall path = %_ROSBE_FULL_PATH_% :: Set the path which contains our build tools -set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%\i386\bin +set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%i386\bin -:: Set the make.exe path -set _MAKE_COMMAND=%_ROSBE_BIN_PATH%\mingw32-make.exe +:: Add the path to the search path +path=%path%;%_ROSBE_BIN_PATH% + +:: Set the make path +set _MAKE_COMMAND="" +if exist "%_ROSBE_BIN_PATH%\mingw32-make.exe" ( + set _MAKE_COMMAND=mingw32-make.exe +) +if exist "%_ROSBE_BIN_PATH%\make.exe" ( + set _MAKE_COMMAND=make.exe +) +if %_MAKE_COMMAND% == "" ( + goto err_no_make +) :: This file is located in the source root set _ROS_SOURCE_ROOT=%~dp0 -:: Add the path to the search path -path=%path%;%_ROSBE_BIN_PATH% - :: Change the current dir to the source root cd %_ROS_SOURCE_ROOT% - - :: Run the requested build task if "%1" == "build" ( @@ -89,6 +96,10 @@ goto :exit +:err_no_make +echo. +echo Cannot find a make executable +goto :err_no_rosbe :err_no_rosbe echo. @@ -104,5 +115,3 @@ :exit echo. -echo done -echo.

1 0

[dreimer] 44357: Wouldn't be me if I need two commits for getting this done, right? Just realized that starting make will call our script. Fixed this by renaming it to make.exe.
by dreimer＠svn.reactos.org 02 Dec '09

02 Dec '09

Author: dreimer Date: Wed Dec 2 09:44:16 2009 New Revision: 44357 URL: http://svn.reactos.org/svn/reactos?rev=44357&view=rev Log: Wouldn't be me if I need two commits for getting this done, right? Just realized that starting make will call our script. Fixed this by renaming it to make.exe. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/version.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Dec 2 09:44:16 2009 @@ -60,9 +60,9 @@ New-Item -path "$_ROSBE_LOGDIR" -type directory } $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - &{IEX "&'make' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file + &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file } else { - &{IEX "&'make' -j $MAKE_JOBS $($args)"} $($args) + &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) } if ($_ROSBE_SHOWTIME -eq 1) { $sw.Stop() Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Wed Dec 2 09:44:16 2009 @@ -30,4 +30,4 @@ & bison '--version' | select-string "GNU Bison" $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" -& make -v | & find "GNU Make" +& make.exe -v | & find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Wed Dec 2 09:44:16 2009 @@ -55,9 +55,9 @@ if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL ) - %BUILDTIME_COMMAND% "make" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% "make" -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %* ) :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Wed Dec 2 09:44:16 2009 @@ -32,4 +32,4 @@ :: Bison, Flex and Make bison --version | find "GNU Bison" flex --version -make -v | find "GNU Make" +make.exe -v | find "GNU Make"

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