Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 29867: - Cleanup cpucount a bit, add usage info etc...
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Thu Oct 25 12:16:01 2007 New Revision: 29867 URL: http://svn.reactos.org/svn/reactos?rev=29867&view=rev Log: - Cleanup cpucount a bit, add usage info etc... Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Thu Oct 25 12:16:01 2007 @@ -15,27 +15,39 @@ { SYSTEM_INFO SystemInformation; + if (argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + GetSystemInfo(&SystemInformation); if (argc == 1) { - GetSystemInfo(&SystemInformation); printf("%ld\n", SystemInformation.dwNumberOfProcessors); - return 0; } - else if (!strcmp(argv[1], "-x1")) + else if ((!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) { - GetSystemInfo(&SystemInformation); + printf("Usage: %s [OPTIONS]\n", argv[0]); + printf("Running cpucount without options returns\n"); + printf("the number of processors in the system.\n"); + printf("-x1 - Number of processors in the system, plus 1.\n"); + printf("-x2 - Number of processors in the system, doubled.\n"); + } + else if (!strncmp(argv[1], "-x1", 3)) + { printf("%ld\n", (SystemInformation.dwNumberOfProcessors + 1)); - return 0; } - else if (!strcmp(argv[1], "-x2")) + else if (!strncmp(argv[1], "-x2", 3)) { - GetSystemInfo(&SystemInformation); printf("%ld\n", (SystemInformation.dwNumberOfProcessors + SystemInformation.dwNumberOfProcessors)); - return 0; } else { - printf("Unknown parameter specified. Exiting.\n"); - return 1; + fprintf(stderr, "%s: Error unknown parameter '%s' specified.\n", argv[0], argv[1]); + return -1; } + + return 0; }

1 0

[peterw] 29866: - Added a minimal replacement for tee. - Some other miscellaneous cleanup.
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Thu Oct 25 11:14:03 2007 New Revision: 29866 URL: http://svn.reactos.org/svn/reactos?rev=29866&view=rev Log: - Added a minimal replacement for tee. - Some other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/tee.c (with props) Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c trunk/tools/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE-Windows/Tools/chkslash.c trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE-Windows/Tools/buildtime.c Thu Oct 25 11:14:03 2007 @@ -82,9 +82,7 @@ } CommandLineBuffer[0] = 0; - //strcat(CommandLineBuffer, "\""); strcat(CommandLineBuffer, CommandLine); - //strcat(CommandLineBuffer, "\""); // // Grab the starting timestamp. Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Thu Oct 25 11:14:03 2007 @@ -25,7 +25,7 @@ if (argc > 3) { - printf("%s: Error too many parameters specified.\n", argv[0]); + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); return -1; } if ((argc == 1) || @@ -43,19 +43,20 @@ FILE1 = fopen(argv[1], "r"); if (!FILE1) { - printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[1]); + fprintf(stderr, "%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[1]); return -1; } else { if (fclose(FILE1)) { - printf("%s: Error closing file \"%s\"\n", argv[0], argv[1]); + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + return -1; } file1time = getfmodtime(argv[1]); if (!file1time) { - printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); + fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); return -1; } } @@ -63,19 +64,20 @@ FILE2 = fopen(argv[2], "r"); if (!FILE2) { - printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[2]); + fprintf(stderr, "%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[2]); return -1; } else { if (fclose(FILE2)) { - printf("%s: Error closing file \"%s\"\n", argv[0], argv[2]); + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[2]); + return -1; } file2time = getfmodtime(argv[2]); if (!file2time) { - printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); + fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); return -1; } } Modified: trunk/tools/RosBE-Windows/Tools/chkslash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chkslash… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chkslash.c (original) +++ trunk/tools/RosBE-Windows/Tools/chkslash.c Thu Oct 25 11:14:03 2007 @@ -17,7 +17,7 @@ if (argc > 2) { - printf("%s: Error too many parameters specified.\n", argv[0]); + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); return -1; } if ((argc == 1) || Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Thu Oct 25 11:14:03 2007 @@ -7,7 +7,7 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime chknewer chkslash cpucount echoh flash getdate +all: buildtime chknewer chkslash cpucount echoh flash getdate tee buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c @@ -30,5 +30,8 @@ getdate: getdate.c ${CC} ${CFLAGS} getdate getdate.c +tee: tee.c + ${CC} ${CFLAGS} tee tee.c + clean: - del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe + del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe tee.exe Added: trunk/tools/RosBE-Windows/Tools/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/tee.c?re… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/tee.c (added) +++ trunk/tools/RosBE-Windows/Tools/tee.c Thu Oct 25 11:14:03 2007 @@ -1,0 +1,69 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/tee.c + * PURPOSE: Spit stdin to stdout and a file. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#include <stdio.h> +#include <string.h> + +int main(int argc, char* argv[]) +{ + unsigned char charbuff; + FILE *FILE; + + if (argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + if ((argc == 1) || + (!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) + { + printf("Usage: %s FILE\n", argv[0]); + printf("Takes standard input and sends it to standard output\n"); + printf("and FILE.\n\n"); + return 0; + } + + FILE = fopen(argv[1], "r"); + if (FILE) + { + fprintf(stderr, "%s: Error file \"%s\" already exists.\n", argv[0], argv[1]); + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + } + return -1; + } + else + { + FILE = fopen(argv[1], "w"); + if (!FILE) + { + fprintf(stderr, "%s: Error cannot create file \"%s\".\n", argv[0], argv[1]); + return -1; + } + while (!feof(stdin)) + { + charbuff = fgetc(stdin); + if (!feof(stdin)) + { + fputc(charbuff, stdout); + fputc(charbuff, FILE); + } + } + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + return -1; + } + } + + return 0; +} Propchange: trunk/tools/RosBE-Windows/Tools/tee.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[peterw] 29865: Silence an error msg I missed and make reladdr2line.cmd display the binary it's reading from.
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Thu Oct 25 07:50:41 2007 New Revision: 29865 URL: http://svn.reactos.org/svn/reactos?rev=29865&view=rev Log: Silence an error msg I missed and make reladdr2line.cmd display the binary it's reading from. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Oct 25 07:50:41 2007 @@ -49,6 +49,7 @@ echo ERROR: The path specified doesn't seem to exist. goto :EOC ) +echo %_1% for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i lss %_2% ( raddr2line "%_1%" "%_2%" @@ -80,7 +81,7 @@ :CHECKPATH chkslash %_1% if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% | findstr "%_1%""`) do set _1=%%i + for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i ) goto :EOF

1 0

[jimtabor] 29864: Sync with Wine: Static controls.
by jimtabor＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: jimtabor Date: Thu Oct 25 06:25:53 2007 New Revision: 29864 URL: http://svn.reactos.org/svn/reactos?rev=29864&view=rev Log: Sync with Wine: Static controls. Modified: trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c (original) +++ trunk/reactos/dll/win32/user32/controls/static.c Thu Oct 25 06:25:53 2007 @@ -115,6 +115,33 @@ #endif }; +static void setup_clipping(HWND hwnd, HDC hdc, HRGN *orig) +{ + RECT rc; + HRGN hrgn; + + /* Native control has always a clipping region set (this may be because + * builtin controls uses CS_PARENTDC) and an application depends on it + */ + hrgn = CreateRectRgn(0, 0, 1, 1); + if (GetClipRgn(hdc, hrgn) != 1) + { + DeleteObject(hrgn); + *orig = NULL; + } else + *orig = hrgn; + + GetClientRect(hwnd, &rc); + DPtoLP(hdc, (POINT *)&rc, 2); + IntersectClipRect(hdc, rc.left, rc.top, rc.right, rc.bottom); +} + +static void restore_clipping(HDC hdc, HRGN hrgn) +{ + SelectClipRgn(hdc, hrgn); + if (hrgn != NULL) + DeleteObject(hrgn); +} /*********************************************************************** * STATIC_SetIcon @@ -140,8 +167,21 @@ { return 0; } - SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + + /* Windows currently doesn't implement SS_RIGHTJUST */ + /* + if ((style & SS_RIGHTJUST) != 0) + { + RECT wr; + GetWindowRect(hwnd, &wr); + SetWindowPos( hwnd, 0, wr.right - info->nWidth, wr.bottom - info->nHeight, + info->nWidth, info->nHeight, SWP_NOACTIVATE | SWP_NOZORDER ); + } + else */ + { + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + } } return prevIcon; } @@ -157,7 +197,7 @@ if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { - ERR("huh? hBitmap!=0, but not bitmap\n"); + WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; } hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); @@ -165,8 +205,20 @@ { BITMAP bm; GetObjectW(hBitmap, sizeof(bm), &bm); - SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + /* Windows currently doesn't implement SS_RIGHTJUST */ + /* + if ((style & SS_RIGHTJUST) != 0) + { + RECT wr; + GetWindowRect(hwnd, &wr); + SetWindowPos( hwnd, 0, wr.right - bm.bmWidth, wr.bottom - bm.bmHeight, + bm.bmWidth, bm.bmHeight, SWP_NOACTIVATE | SWP_NOZORDER ); + } + else */ + { + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + } } return hOldBitmap; } @@ -298,15 +350,23 @@ if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) { HDC hdc; + HRGN hOrigClipping; + hdc = GetDC( hwnd ); + setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); + restore_clipping(hdc, hOrigClipping); ReleaseDC( hwnd, hdc ); } } static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) { - HBRUSH hBrush = (HBRUSH) SendMessageW( GetParent(hwnd), + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if(!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); if (!hBrush) /* did the app forget to call DefWindowProc ? */ { @@ -382,13 +442,22 @@ else return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : DefWindowProcA(hwnd, uMsg, wParam, lParam); + case WM_ERASEBKGND: + /* do all painting in WM_PAINT like Windows does */ + return 1; + case WM_PRINTCLIENT: case WM_PAINT: { PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); if (staticPaintFunc[style]) + { + HRGN hOrigClipping; + setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); + restore_clipping(hdc, hOrigClipping); + } if (!wParam) EndPaint(hwnd, &ps); } break; @@ -479,7 +548,7 @@ { SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); if (LOWORD(lParam)) - STATIC_TryPaintFcn( hwnd, full_style ); + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; @@ -598,7 +667,7 @@ HBRUSH hBrush; HFONT hFont, hOldFont = NULL; WORD wFormat; - INT len; + INT len, buf_size; WCHAR *text; GetClientRect( hwnd, &rc); @@ -656,12 +725,21 @@ if ((style & SS_TYPEMASK) != SS_SIMPLE) { FillRect( hdc, &rc, hBrush ); - if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); - } - - if (!(len = SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ))) return; - if (!(text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; - SendMessageW( hwnd, WM_GETTEXT, len + 1, (LPARAM)text ); + if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); + } + + buf_size = 256; + if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; + + while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) + { + buf_size *= 2; + if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; + } + + if (!len) goto no_TextOut; if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX)) { @@ -673,9 +751,10 @@ } else { - DrawTextW( hdc, text, -1, &rc, wFormat ); - } - + DrawTextW( hdc, text, -1, &rc, wFormat ); + } + +no_TextOut: HeapFree( GetProcessHeap(), 0, text ); if (hFont) @@ -689,6 +768,7 @@ GetClientRect( hwnd, &rc); + /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: @@ -833,6 +913,7 @@ { RECT rc; + /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); switch (style & SS_TYPEMASK) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Oct 25 06:25:53 2007 @@ -127,7 +127,7 @@ reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023 reactos/dll/win32/user32/controls/scrollbar.c # Forked - reactos/dll/win32/user32/controls/static.c # Synced at 20060908 + reactos/dll/win32/user32/controls/static.c # Synced at 20071024 reactos/dll/win32/user32/misc/dde.c # Synced at 20060623 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced at 20060623

1 0

[peterw] 29863: Missed this little fellow.
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Thu Oct 25 05:53:11 2007 New Revision: 29863 URL: http://svn.reactos.org/svn/reactos?rev=29863&view=rev Log: Missed this little fellow. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Oct 25 05:53:11 2007 @@ -80,7 +80,7 @@ :CHECKPATH chkslash %_1% if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %1 | findstr "%_1%""`) do set _1=%%i + for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% | findstr "%_1%""`) do set _1=%%i ) goto :EOF

1 0

[mpiulachs] 29862: fix cat.exe > tcat.exe executable filename
by mpiulachs＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: mpiulachs Date: Thu Oct 25 05:21:44 2007 New Revision: 29862 URL: http://svn.reactos.org/svn/reactos?rev=29862&view=rev Log: fix cat.exe > tcat.exe executable filename Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Oct 25 05:21:44 2007 @@ -497,7 +497,7 @@ modules\rosapps\sysutils\man\man.exe 1 optional modules\rosapps\sysutils\pedump\pedump.exe 1 optional modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\cat.exe 1 optional +modules\rosapps\sysutils\tcat\tcat.exe 1 optional modules\rosapps\sysutils\tlist\tlist.exe 1 optional modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional modules\rosapps\sysutils\utils\cat\cat.exe 1 optional

1 0

[peterw] 29861: - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes below. - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) (yes you can s
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Thu Oct 25 05:15:26 2007 New Revision: 29861 URL: http://svn.reactos.org/svn/reactos?rev=29861&view=rev Log: - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes below. - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) (yes you can still specify the full path if you like) - Some other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/chkslash.c (with props) Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Oct 25 05:15:26 2007 @@ -5,64 +5,84 @@ :: PURPOSE: Converts a value to hex and displays it. :: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> :: Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> :: :: @echo off -title relAddr2Line... +title reladdr2line... + +:: +:: Clear variables before use. +:: +set _1= +set _2= :: :: Receive the Parameters and decide what to do. :: - -if "%1" == "" ( - goto :MAN +if not "%3" == "" ( + echo ERROR: Too many parameters specified. + goto :EOC ) if not "%1" == "" ( set _1=%1 - if "%2" == "" ( - goto :AUTO1 - ) else ( - set _2=%2 - goto :EOC - ) + call :CHECKPATH ) +if not "%2" == "" ( + set _2=%2 +) +call :INTERACTIVE -:: -:: If Parameters were set, parse them, if not, ask the user to add them. -:: -:MAN -set /p _1="Please enter the path to the executable to be examined: " -:AUTO1 -set /p _2="Please enter the address you would like to analyze: " - -:EOC -if not exist "%_1%\." ( - echo ERROR: The path specified doesn't seem to exist. - goto :END -) -if /i "%_1%" == "" ( - echo ERROR: You must enter a valid directory. - goto :END -) -if /i "%_2%" == "" ( - echo ERROR: You must enter a address to analyze. - goto :END -) +:RADD2RLINE :: :: First get the ImageBase of the File. If its smaller than the given :: Parameter, everything is ok, because it was already added onto the :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: +if %_1% == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC +) +if not exist "%_1%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOC +) for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i lss %_2% ( - raddr2line "%_1%" "%_2%" 2>NUL + raddr2line "%_1%" "%_2%" ) else ( set /a baseaddr+=0x%_2% for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i - raddr2line "%_1%" "%relbase%" 2>NUL + raddr2line "%_1%" "%relbase%" ) +goto :EOC -:END +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: +:INTERACTIVE +if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH +) +if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " +) +goto :EOF + +:: +:: Check if the user supplied a path, if they didn't look for +:: the specified file in the current directory and any +:: sub-directories. +:: +:CHECKPATH + chkslash %_1% + if errorlevel 2 ( + for /f "usebackq" %%i in (`"dir /a:-d /s /b %1 | findstr "%_1%""`) do set _1=%%i + ) +goto :EOF + +:EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Thu Oct 25 05:15:26 2007 @@ -11,11 +11,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> time_t -StatFile( +getfmodtime( char* FileName ); @@ -53,7 +52,7 @@ { printf("%s: Error closing file \"%s\"\n", argv[0], argv[1]); } - file1time = StatFile(argv[1]); + file1time = getfmodtime(argv[1]); if (!file1time) { printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); @@ -73,7 +72,7 @@ { printf("%s: Error closing file \"%s\"\n", argv[0], argv[2]); } - file2time = StatFile(argv[2]); + file2time = getfmodtime(argv[2]); if (!file2time) { printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); @@ -91,11 +90,11 @@ } } -time_t StatFile(char* FileName) +time_t getfmodtime(char* filename) { struct stat filestat; - if (!stat(FileName, &filestat)) + if (!stat(filename, &filestat)) { return mktime(localtime(&filestat.st_mtime)); } Added: trunk/tools/RosBE-Windows/Tools/chkslash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chkslash… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chkslash.c (added) +++ trunk/tools/RosBE-Windows/Tools/chkslash.c Thu Oct 25 05:15:26 2007 @@ -1,0 +1,49 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/chkslash.c + * PURPOSE: Checks if a string has a backslash '\' in it or not. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#include <stdio.h> +#include <string.h> + +int main(int argc, char* argv[]) +{ + int hasslash = 0; + unsigned int i = 0; + + if (argc > 2) + { + printf("%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + if ((argc == 1) || + (!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) + { + printf("Usage: %s STRING\n", argv[0]); + printf("Checks if STRING has a backslash or not. Returns\n"); + printf("1 if STRING has a backslash and 2 if not.\n\n"); + return 0; + } + for (i = 0; i < strlen(argv[1]); i++) + { + if (argv[1][i] == '\\') + { + hasslash = 1; + } + } + + if (hasslash) + { + return 1; + } + else + { + return 2; + } +} Propchange: trunk/tools/RosBE-Windows/Tools/chkslash.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Thu Oct 25 05:15:26 2007 @@ -7,13 +7,16 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime chknewer cpucount echoh flash getdate +all: buildtime chknewer chkslash cpucount echoh flash getdate buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c chknewer: chknewer.c ${CC} ${CFLAGS} chknewer chknewer.c + +chkslash: chkslash.c + ${CC} ${CFLAGS} chkslash chkslash.c cpucount: cpucount.c ${CC} ${CFLAGS} cpucount cpucount.c @@ -28,4 +31,4 @@ ${CC} ${CFLAGS} getdate getdate.c clean: - del /f buildtime.exe chknewer.exe cpucount.exe echoh.exe flash.exe getdate.exe + del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[mpiulachs] 29860: Build files updates and fixes
by mpiulachs＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: mpiulachs Date: Thu Oct 25 05:15:21 2007 New Revision: 29860 URL: http://svn.reactos.org/svn/reactos?rev=29860&view=rev Log: Build files updates and fixes Added: trunk/rosapps/sysutils/tcat/tcat.rbuild - copied unchanged from r29859, trunk/rosapps/sysutils/tcat/cat.rbuild Removed: trunk/rosapps/sysutils/tcat/cat.rbuild Modified: trunk/rosapps/cmdutils/cmdutils.rbuild trunk/rosapps/cmdutils/uptime/uptime.rbuild trunk/rosapps/directory.rbuild trunk/rosapps/sysutils/sysutils.rbuild trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild trunk/rosapps/sysutils/utils/cat/cat.rbuild trunk/rosapps/sysutils/utils/driver/load/load.rbuild trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild trunk/rosapps/sysutils/utils/infinst/infinst.rbuild trunk/rosapps/sysutils/utils/stats/stats.rbuild trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild Modified: trunk/rosapps/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cmdutils/cmdutils.rbuild?r… ============================================================================== --- trunk/rosapps/cmdutils/cmdutils.rbuild (original) +++ trunk/rosapps/cmdutils/cmdutils.rbuild Thu Oct 25 05:15:21 2007 @@ -18,4 +18,7 @@ <directory name="y"> <xi:include href="y/y.rbuild" /> </directory> + <directory name="uptime"> + <xi:include href="uptime/uptime.rbuild" /> + </directory> </group> Modified: trunk/rosapps/cmdutils/uptime/uptime.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cmdutils/uptime/uptime.rbu… ============================================================================== --- trunk/rosapps/cmdutils/uptime/uptime.rbuild (original) +++ trunk/rosapps/cmdutils/uptime/uptime.rbuild Thu Oct 25 05:15:21 2007 @@ -1,4 +1,4 @@ -<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe"> +<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe" allowwarnings="true"> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29860… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Thu Oct 25 05:15:21 2007 @@ -26,11 +26,19 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> </directory> - + <directory name="fontview"> <xi:include href="fontview/fontview.rbuild" /> </directory> - + <directory name="gettype"> <xi:include href="gettype/gettype.rbuild" /> </directory> Modified: trunk/rosapps/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/sysutils.rbuild?r… ============================================================================== --- trunk/rosapps/sysutils/sysutils.rbuild (original) +++ trunk/rosapps/sysutils/sysutils.rbuild Thu Oct 25 05:15:21 2007 @@ -39,7 +39,11 @@ </directory> <directory name="tcat"> - <xi:include href="tcat/cat.rbuild" /> + <xi:include href="tcat/tcat.rbuild" /> + </directory> + + <directory name="utils"> + <xi:include href="utils/utils.rbuild" /> </directory> <directory name="tlist"> Removed: trunk/rosapps/sysutils/tcat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/tcat/cat.rbuild?r… ============================================================================== --- trunk/rosapps/sysutils/tcat/cat.rbuild (original) +++ trunk/rosapps/sysutils/tcat/cat.rbuild (removed) @@ -1,8 +1,0 @@ -<module name="tcat" type="win32cui" installbase="system32" installname="tcat.exe"> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>kernel32</library> - <library>user32</library> - - <file>cat.c</file> -</module> Modified: trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/binpatch/bi… ============================================================================== --- trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild (original) +++ trunk/rosapps/sysutils/utils/binpatch/binpatch.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>patch.c</file> Modified: trunk/rosapps/sysutils/utils/cat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/cat/cat.rbu… ============================================================================== --- trunk/rosapps/sysutils/utils/cat/cat.rbuild (original) +++ trunk/rosapps/sysutils/utils/cat/cat.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="cat" type="win32cui" installbase="bin" installname="cat.exe" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>cat.c</file> Modified: trunk/rosapps/sysutils/utils/driver/load/load.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/driver/load… ============================================================================== --- trunk/rosapps/sysutils/utils/driver/load/load.rbuild (original) +++ trunk/rosapps/sysutils/utils/driver/load/load.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <library>user32</library> Modified: trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/driver/unlo… ============================================================================== --- trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild (original) +++ trunk/rosapps/sysutils/utils/driver/unload/unload.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true"> <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <library>user32</library> Modified: trunk/rosapps/sysutils/utils/infinst/infinst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/infinst/inf… ============================================================================== --- trunk/rosapps/sysutils/utils/infinst/infinst.rbuild (original) +++ trunk/rosapps/sysutils/utils/infinst/infinst.rbuild Thu Oct 25 05:15:21 2007 @@ -1,6 +1,5 @@ <module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" > <define name="__USE_W32API" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <library>user32</library> Modified: trunk/rosapps/sysutils/utils/stats/stats.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/stats/stats… ============================================================================== --- trunk/rosapps/sysutils/utils/stats/stats.rbuild (original) +++ trunk/rosapps/sysutils/utils/stats/stats.rbuild Thu Oct 25 05:15:21 2007 @@ -1,8 +1,5 @@ <module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" > <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>stats.c</file> Modified: trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/tickcount/t… ============================================================================== --- trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild (original) +++ trunk/rosapps/sysutils/utils/tickcount/tickcount.rbuild Thu Oct 25 05:15:21 2007 @@ -1,8 +1,5 @@ <module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" > <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> <file>tickcount.c</file>

1 0

[greatlrd] 29859: Fix the build of ReactX and smaller typos
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Thu Oct 25 03:18:05 2007 New Revision: 29859 URL: http://svn.reactos.org/svn/reactos?rev=29859&view=rev Log: Fix the build of ReactX and smaller typos Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Thu Oct 25 03:18:05 2007 @@ -20,6 +20,8 @@ #include <prntfont.h> #include <dde.h> #include <wincon.h> + +#include <reactos/drivers/directx/directxint.h> #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> @@ -44,3 +46,10 @@ BOOL DdHmgCreate(); BOOL DdHmgDestroy(); +/* define stuff */ +#define drvDxEngLockDC gpEngFuncs[DXENG_INDEX_DxEngLockDC] +#define drvDxEngGetDCState gpEngFuncs[DXENG_INDEX_DxEngGetDCState] +#define drvDxEngGetHdevData gpEngFuncs[DXENG_INDEX_DxEngGetHdevData] +#define drvDxEngUnlockDC gpEngFuncs[DXENG_INDEX_DxEngUnlockDC] +#define drvDxEngUnlockHdev gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev] +#define drvDxEngLockHdev gpEngFuncs[DXENG_INDEX_DxEngLockHdev] Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Thu Oct 25 03:18:05 2007 @@ -132,8 +132,7 @@ /* resverd in msdn for internal use in win32k */ #define HDEVGETDATA_DWRESERVED19 1 -/* Get the destory palette functions */ -#define HDEVGETDATA_PFN_DESTORYPALETTE 2 +#define HDEVGETDATA_PALETTECALLBACKS_DWFLAGS 2 /* resverd in msdn for internal use in win32k */ #define HDEVGETDATA_DWRESERVED24 3 @@ -141,7 +140,6 @@ /* Unknown */ #define HDEVGETDATA_UNK_54C_20 4 -/* Get the DD_CALLBACKS dwSize member value */ #define DEVGETDATA_PALETTECALLBACKS_DWSIZE 5 /* Unknown */ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Oct 25 03:18:05 2007 @@ -318,8 +318,8 @@ case HDEVGETDATA_DWRESERVED19: return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19; - case HDEVGETDATA_PFN_DESTORYPALETTE: - return (DWORD)pEDDgpl->ddPaletteCallbacks.DestroyPalette; + case HDEVGETDATA_PALETTECALLBACKS_DWFLAGS: + return (DWORD)pEDDgpl->ddPaletteCallbacks.dwFlags; case HDEVGETDATA_DWRESERVED24: return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24;

1 0

[greatlrd] 29858: Implement DxEngGetHdevData after some old notes I found , hope every things works. Partly implement DxEngGetDCState
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Thu Oct 25 02:52:13 2007 New Revision: 29858 URL: http://svn.reactos.org/svn/reactos?rev=29858&view=rev Log: Implement DxEngGetHdevData after some old notes I found , hope every things works. Partly implement DxEngGetDCState Modified: branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h Thu Oct 25 02:52:13 2007 @@ -1,6 +1,9 @@ #ifndef __WIN32K_FLOAT_H #define __WIN32K_FLOAT_H + +#include <reactos/win32k/ntgdityp.h> +#include <reactos/win32k/ntgdihdl.h> #include "dc.h" #include "math.h" #include <ft2build.h> Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Thu Oct 25 02:52:13 2007 @@ -3,6 +3,7 @@ #include <ddrawint.h> #include <ddkernel.h> +#include <reactos/drivers/directx/directxint.h> #include <reactos/drivers/directx/dxg.h> #include <reactos/drivers/directx/dxeng.h> Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Oct 25 02:52:13 2007 @@ -306,10 +306,70 @@ /************************************************************************/ /* DxEngGetHdevData */ /************************************************************************/ -DWORD DxEngGetHdevData(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; +DWORD +DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl, + DWORD Index) +{ + switch (Index) + { + case HDEVGETDATA_UNK_54C_8: + return (DWORD)pEDDgpl->unk_54c[8]; + + case HDEVGETDATA_DWRESERVED19: + return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved19; + + case HDEVGETDATA_PFN_DESTORYPALETTE: + return (DWORD)pEDDgpl->ddPaletteCallbacks.DestroyPalette; + + case HDEVGETDATA_DWRESERVED24: + return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved24; + + case HDEVGETDATA_UNK_54C_20: + return (DWORD)pEDDgpl->unk_54c[20]; + + case DEVGETDATA_PALETTECALLBACKS_DWSIZE: + return (DWORD)pEDDgpl->ddPaletteCallbacks.dwSize; + + case HDEVGETDATA_UNK_70C: + return (DWORD)pEDDgpl->unk_70C; + + case HDEVGETDATA_SURFACECALLBACK_DWFLAGS: + return (DWORD)pEDDgpl->ddSurfaceCallbacks.dwFlags; + + case HDEVGETDATA_UNK_588: + return (DWORD)pEDDgpl->unk_54c[15]; + + case HDEVGETDATA_UNK_01C_F400: + return (DWORD)pEDDgpl->unk_01c[1] & 0x400; + + case HDEVGETDATA_UNK_01C_F20000: + return (DWORD)pEDDgpl->unk_01c[1] & 0x20000; + + case 0x0B: + return (DWORD)pEDDgpl->unk_01c[1] & 0x1; + + case 0x0C: + return (DWORD)pEDDgpl->unk_01c[0]; + + case HDEVGETDATA_CDRIVERREF: + return (DWORD) (pEDDgpl->cDriverReferences) ? TRUE : FALSE ; + + case 0x11: + return (DWORD)pEDDgpl->d3dNtHalCallbacks.dwReserved8 & 0x100; + + case HDEVGETDATA_PFN_SETPALETTE: + return (DWORD)pEDDgpl->ddSurfaceCallbacks.SetPalette; + + case 0x13: + return (DWORD)pEDDgpl->unk_54c[0x0A]; + + case 0x14: + return (DWORD)pEDDgpl->unk_01c[1] & 0x80000; + + default: + break; + } + return 0; } /************************************************************************/ @@ -369,10 +429,34 @@ /************************************************************************/ /* DxEngGetDCState */ /************************************************************************/ -DWORD DxEngGetDCState(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; +DWORD +DxEngGetDCState(HDC hDC, + DWORD type) +{ + PEDD_DIRECTDRAW_GLOBAL pEDDgpl = NULL; + PDC pDC = DC_LockDc(hDC); + if (pDC) + { + switch (type) + { + case 1: + UNIMPLEMENTED; + return 0; + case 2: + UNIMPLEMENTED; + return 0; + case 3: + pEDDgpl = pDC->pEDDgpl; + DC_UnlockDc(pDC); + return (DWORD)pEDDgpl; + + default: + UNIMPLEMENTED; + break; + } + } + + return 0; } /************************************************************************/

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