Ros-diffs November 2006

ros-diffs@reactos.org

16 participants
324 discussions

[janderwald] 24697: - improve namedpipe_reader parsing of lines code - it should now be able handle partial / full lines

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Nov 7 02:50:03 2006 New Revision: 24697 URL: http://svn.reactos.org/svn/reactos?rev=24697&view=rev Log: - improve namedpipe_reader parsing of lines code - it should now be able handle partial / full lines Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Tue Nov 7 02:50:03 2006 @@ -95,11 +95,43 @@ //--------------------------------------------------------------------------------------- void NamedPipeReader::extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead) { - TCHAR * offset = _tcsstr(buffer, _T("\x0D")); + TCHAR * offset = _tcschr(buffer, _T('\x0D')); DWORD buf_offset = 0; while(offset) { - offset[0] = _T('\0'); + /// + /// HACKHACK + /// due to some mysterious reason, _tcschr / _tcsstr sometimes returns + /// not always the offset to the CR character but to the next LF + /// in MSVC 2005 (Debug Modus) + + if (offset[0] == _T('\x0A')) + { + if (buf_offset) + { + offset--; + } + else + { + //TODO + // implement me special case + } + } + + if (offset[0] == _T('\x0D')) + { + buf_offset += 2; + offset[0] = _T('\0'); + offset +=2; + } + else + { + /// + /// BUG detected in parsing code + /// + abort(); + } + string line = buffer; if (append_line) { @@ -115,18 +147,18 @@ vect.push_back (line); } - offset += 2; - - buf_offset += line.length () + 2; + buf_offset += line.length(); if (buf_offset >= cbRead) { break; } buffer = offset; + offset = _tcsstr(buffer, _T("\n")); } if (buf_offset < cbRead) { + buffer[cbRead - buf_offset] = _T('\0'); string line = buffer; if (append_line) { @@ -195,7 +227,7 @@ #endif } while (!fSuccess); // repeat loop if ERROR_MORE_DATA - } while (localbuf[strlen(localbuf)-1] != '\n'); + } while (append_line); if (!fSuccess) return 0;

18 years, 1 month

[frik85] 24696: RosCMS update: Update has been tested for 1 1/2 days and is already on our web-server. This commit don't effect ReactOS itself, as it is just for our website. Updates: * improved generator interface, more options, rarely used (debug) options removed * complete new (from scratch) written page generator code; more than 5 times faster than the old one, plus new "update" feature * new generator has a compatibility layer to support the old generator API * the new generator was meant t

by frik85＠svn.reactos.org

18 years, 1 month

[frik85] 24695: RSDB update: Update has been tested for two days and is already on our web-server. This commit *don't* effect ReactOS itself, as it is just for our website. Updates: * add human readable URI (HRI); now old-style URI and HRI are usable * improved submit wizard pages * update several pages to add URI support * updated help&faq Information: * to update more links, please have a look at: "rsdb_config.php" and "rsdb_human_readable_url.php" * all links are defined in "rsdb_config.php"

by frik85＠svn.reactos.org

18 years, 1 month

[janderwald] 24694: - fix a devasting bug (introduced by me) Sorry JaixBly...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 6 14:03:57 2006 New Revision: 24694 URL: http://svn.reactos.org/svn/reactos?rev=24694&view=rev Log: - fix a devasting bug (introduced by me) Sorry JaixBly... Modified: trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Mon Nov 6 14:03:57 2006 @@ -553,7 +553,7 @@ } } /* Search for 'FormatPartition' in the 'Unattend' section */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"FormatPartition", &Context)) + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"FormatPartition", &Context)) { if (SetupGetIntField(&Context, 1, &IntValue)) {

18 years, 1 month

[fireball] 24693: Revert 24074 by Saveliy Tretiakov until correct fix available. Fixes bug with moveable calculator buttons.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 6 13:20:40 2006 New Revision: 24693 URL: http://svn.reactos.org/svn/reactos?rev=24693&view=rev Log: Revert 24074 by Saveliy Tretiakov until correct fix available. Fixes bug with moveable calculator buttons. Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Mon Nov 6 13:20:40 2006 @@ -735,7 +735,7 @@ return HTBORDER; } - if (Style & WS_CAPTION) + if ((Style & WS_CAPTION) == WS_CAPTION) { if (ExStyle & WS_EX_TOOLWINDOW) WindowRect.top += GetSystemMetrics(SM_CYSMCAPTION); @@ -751,15 +751,11 @@ } else { + WindowRect.left += GetSystemMetrics(SM_CXSIZE); WindowRect.right -= GetSystemMetrics(SM_CXSIZE); } - - // On windows with WS_EX_DLGMODALFRAME and - // WS_EX_TOOLWINDOW there is no system menu button. - if (!(ExStyle & WS_EX_DLGMODALFRAME) && !(ExStyle & WS_EX_TOOLWINDOW)) - WindowRect.left += GetSystemMetrics(SM_CXSIZE); } - if (Point.x < WindowRect.left) + if (Point.x <= WindowRect.left) return HTSYSMENU; if (WindowRect.right <= Point.x) return HTCLOSE;

18 years, 1 month

[cwittich] 24692: added missing copyright information

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Nov 6 01:55:11 2006 New Revision: 24692 URL: http://svn.reactos.org/svn/reactos?rev=24692&view=rev Log: added missing copyright information Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Mon Nov 6 01:55:11 2006 @@ -3,6 +3,7 @@ * Copyright (C) 2005 Casper S. Hornstrup * Copyright (C) 2005 Steven Edwards * Copyright (C) 2005 Royce Mitchell + * Copyright (C) 2006 Christoph von Wittich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Nov 6 01:55:11 2006 @@ -2,6 +2,7 @@ * Copyright (C) 2002 Patrik Stridvall * Copyright (C) 2005 Royce Mitchell III * Copyright (C) 2006 Hervé Poussineau + * Copyright (C) 2006 Christoph von Wittich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

18 years, 1 month

[cwittich] 24691: implemented timeout settings on startup and recovery page

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Nov 6 01:53:48 2006 New Revision: 24691 URL: http://svn.reactos.org/svn/reactos?rev=24691&view=rev Log: implemented timeout settings on startup and recovery page Modified: trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/precomp.h trunk/reactos/dll/cpl/sysdm/startrec.c trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/en.rc (original) +++ trunk/reactos/dll/cpl/sysdm/en.rc Mon Nov 6 01:53:48 2006 @@ -165,11 +165,11 @@ LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 - CONTROL "&Time to display list of operating systems:", IDC_STRECLIST, "button", BS_CHECKBOX, 14, 56, 150, 8 + CONTROL "&Time to display list of operating systems:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "seconds", IDC_STATIC, 215, 56, 25, 8 - CONTROL "Time to &display recovery options when needed:", IDC_STRRECREC, "button", BS_CHECKBOX, 14, 70, 163, 8 + CONTROL "Time to &display recovery options when needed:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "seconds", IDC_STATIC, 215, 70, 25, 8 Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h Mon Nov 6 01:53:48 2006 @@ -8,6 +8,7 @@ #include <lm.h> #include <cpl.h> #include <shellapi.h> +#include <shlwapi.h> #include "resource.h" #define NUM_APPLETS (1) Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Mon Nov 6 01:53:48 2006 @@ -1,13 +1,30 @@ + /* * PROJECT: ReactOS System Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/sysdm/startrec.c * PURPOSE: Computer settings for startup and recovery * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * Copyright 2006 Christoph von Wittich <Christoph(a)ApiViewer.de> * */ #include "precomp.h" + +static TCHAR m_szFreeldrIni[MAX_PATH + 15]; + +void SetTimeout(HWND hwndDlg, int Timeout) +{ + if (Timeout == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), FALSE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); + } + SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); +} /* Property page dialog callback */ INT_PTR CALLBACK @@ -17,24 +34,85 @@ LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + TCHAR *szSystemDrive; + TCHAR szDefaultOS[MAX_PATH]; + TCHAR szDefaultOSName[MAX_PATH]; + TCHAR szTimeout[10]; + int iTimeout; + switch(uMsg) { case WM_INITDIALOG: { - MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); + /* get Path to freeldr.ini or boot.ini */ + szSystemDrive = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); + if (szSystemDrive != NULL) + { + szSystemDrive = _tgetenv(_T("SystemDrive")); + if (m_szFreeldrIni != NULL) + { + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); + if (!PathFileExists(m_szFreeldrIni)) + { + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + } + } + HeapFree(GetProcessHeap(), 0, szSystemDrive); + } + + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); + + /* load settings from freeldr.ini */ + GetPrivateProfileString(_T("boot loader"), _T("default"), NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); + GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); + + /* timeout */ + iTimeout = GetPrivateProfileInt(_T("boot loader"), _T("timeout"), 0, m_szFreeldrIni); + SetTimeout(hwndDlg, iTimeout); + if (iTimeout != 0) + SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } break; case WM_COMMAND: { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; - } + switch(LOWORD(wParam)) + { + case IDC_STRRECEDIT: + { + ShellExecute(0, _T("open"), _T("notepad"), m_szFreeldrIni, NULL, SW_SHOWNORMAL); + break; + } + case IDOK: + { + /* save timeout */ + if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) + iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); + else + iTimeout = 0; + _stprintf(szTimeout, _T("%i"), iTimeout); + WritePrivateProfileString(_T("boot loader"), _T("timeout"), szTimeout, m_szFreeldrIni); + } + case IDCANCEL: + { + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + break; + } + case IDC_STRECLIST: + { + if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) + SetTimeout(hwndDlg, 30); + else + SetTimeout(hwndDlg, 0); + } + } } break; } Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Mon Nov 6 01:53:48 2006 @@ -16,6 +16,7 @@ <library>ntdll</library> <library>msimg32</library> <library>shell32</library> + <library>shlwapi</library> <file>advanced.c</file> <file>computer.c</file> <file>custclicklink.c</file>

18 years, 1 month

[greatlrd] 24690: 1. Fixed some vc warings and fault 2. Implement AcquireDDThreadLock, ReleaseDDThreadLock (does not working as it should yet) 3. Start making ddraw thread safe 4. Fixed some mirors bugs

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Nov 6 00:19:53 2006 New Revision: 24690 URL: http://svn.reactos.org/svn/reactos?rev=24690&view=rev Log: 1. Fixed some vc warings and fault 2. Implement AcquireDDThreadLock, ReleaseDDThreadLock (does not working as it should yet) 3. Start making ddraw thread safe 4. Fixed some mirors bugs Modified: trunk/reactos/dll/directx/ddraw/clipper.c trunk/reactos/dll/directx/ddraw/color.c trunk/reactos/dll/directx/ddraw/ddraw.def trunk/reactos/dll/directx/ddraw/gamma.c trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/kernel.c trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/palette.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_hel.c trunk/reactos/dll/directx/ddraw/startup.c trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c trunk/reactos/dll/directx/ddraw/thunks/surface_thunk.c Modified: trunk/reactos/dll/directx/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/clipper.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/clipper.c (original) +++ trunk/reactos/dll/directx/ddraw/clipper.c Mon Nov 6 00:19:53 2006 @@ -13,11 +13,12 @@ ULONG WINAPI DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); +{ IDirectDrawClipperImpl* This = (IDirectDrawClipperImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -40,12 +41,11 @@ ULONG WINAPI DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ +{ + IDirectDrawClipperImpl * This = (IDirectDrawClipperImpl*)iface; + ULONG ref=0; + DX_WINDBG_trace(); - - IDirectDrawClipperImpl * This = (IDirectDrawClipperImpl*)iface; - - ULONG ref=0; if (iface!=NULL) { Modified: trunk/reactos/dll/directx/ddraw/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/color.c?… ============================================================================== --- trunk/reactos/dll/directx/ddraw/color.c (original) +++ trunk/reactos/dll/directx/ddraw/color.c Mon Nov 6 00:19:53 2006 @@ -12,12 +12,11 @@ ULONG WINAPI DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) -{ +{ + IDirectDrawColorImpl * This = (IDirectDrawColorImpl*)iface; + ULONG ref=0; + DX_WINDBG_trace(); - - IDirectDrawColorImpl * This = (IDirectDrawColorImpl*)iface; - - ULONG ref=0; if (iface!=NULL) { @@ -28,11 +27,11 @@ ULONG WINAPI DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawColorImpl* This = (IDirectDrawColorImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { Modified: trunk/reactos/dll/directx/ddraw/ddraw.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.de… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.def (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.def Mon Nov 6 00:19:53 2006 @@ -1,7 +1,9 @@ EXPORTS -;AcquireDDThreadLock +AcquireDDThreadLock@0 +D3DParseUnknownCommand@8 +ReleaseDDThreadLock@0 + ;CompleteCreateSysmemSurface -D3DParseUnknownCommand@8 ;DDGetAttachedSurfaceLcl ;DDInternalLock ;DDInternalUnlock @@ -19,4 +21,4 @@ ;GetOLEThunkData ;GetSurfaceFromDC ;RegisterSpecialCase -;ReleaseDDThreadLock + Modified: trunk/reactos/dll/directx/ddraw/gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/gamma.c?… ============================================================================== --- trunk/reactos/dll/directx/ddraw/gamma.c (original) +++ trunk/reactos/dll/directx/ddraw/gamma.c Mon Nov 6 00:19:53 2006 @@ -12,12 +12,12 @@ ULONG WINAPI DirectDrawGammaControl_AddRef( LPDIRECTDRAWGAMMACONTROL iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawGammaImpl * This = (IDirectDrawGammaImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -28,11 +28,10 @@ ULONG WINAPI DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawGammaImpl* This = (IDirectDrawGammaImpl*)iface; ULONG ref=0; + DX_WINDBG_trace(); if (iface!=NULL) { Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Mon Nov 6 00:19:53 2006 @@ -8,7 +8,7 @@ * */ -#include "rosdraw.h" +#include "../rosdraw.h" Modified: trunk/reactos/dll/directx/ddraw/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/kernel.c… ============================================================================== --- trunk/reactos/dll/directx/ddraw/kernel.c (original) +++ trunk/reactos/dll/directx/ddraw/kernel.c Mon Nov 6 00:19:53 2006 @@ -15,12 +15,13 @@ ULONG WINAPI DirectDrawKernel_AddRef ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); +{ IDirectDrawKernelImpl * This = (IDirectDrawKernelImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -31,11 +32,11 @@ ULONG WINAPI DirectDrawKernel_Release ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawKernelImpl* This = (IDirectDrawKernelImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -83,12 +84,11 @@ ULONG WINAPI DDSurfaceKernel_AddRef ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceKernelImpl * This = (IDirectDrawSurfaceKernelImpl*)iface; ULONG ref=0; + DX_WINDBG_trace(); if (iface!=NULL) { @@ -99,11 +99,11 @@ ULONG WINAPI DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceKernelImpl* This = (IDirectDrawSurfaceKernelImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Mon Nov 6 00:19:53 2006 @@ -13,6 +13,7 @@ #include "rosdraw.h" #include "d3dhal.h" +CRITICAL_SECTION ddcs; // This function is exported by the dll HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, @@ -34,6 +35,13 @@ LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) { + DX_WINDBG_trace(); + + if (IsBadWritePtr( lplpDD, sizeof( LPVOID )) ) + { + return DDERR_INVALIDPARAMS; + } + /* check see if pUnkOuter is null or not */ if (pUnkOuter) { @@ -55,7 +63,14 @@ LPVOID* lplpDD, REFIID id, LPUNKNOWN pUnkOuter) -{ +{ + DX_WINDBG_trace(); + + if (IsBadWritePtr( lplpDD, sizeof( LPVOID )) ) + { + return DDERR_INVALIDPARAMS; + } + /* check see if pUnkOuter is null or not */ if (pUnkOuter) { @@ -202,5 +217,44 @@ return retCode; } - - + +VOID +WINAPI +AcquireDDThreadLock() +{ + EnterCriticalSection(&ddcs); +} + +VOID +WINAPI +ReleaseDDThreadLock() +{ + LeaveCriticalSection(&ddcs); +} + +BOOL APIENTRY +DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) +{ + BOOL retStatus; + switch(ul_reason_for_call) + { + case DLL_PROCESS_DETACH: + DeleteCriticalSection( &ddcs ); + retStatus = TRUE; + break; + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hModule ); + InitializeCriticalSection( &ddcs ); + EnterCriticalSection( &ddcs ); + LeaveCriticalSection( &ddcs ); + retStatus = FALSE; + break; + + default: + retStatus = TRUE; + break; + } + return retStatus; + +} Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon Nov 6 00:19:53 2006 @@ -13,17 +13,17 @@ * Status ok */ -#include "rosdraw.h" +#include "../rosdraw.h" HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, LPVOID *obj) -{ - DX_WINDBG_trace(); - +{ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DX_WINDBG_trace(); if (IsEqualGUID(&IID_IDirectDraw7, id)) { @@ -57,10 +57,10 @@ ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -82,10 +82,10 @@ ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -139,12 +139,14 @@ LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { + IDirectDrawClipperImpl* That; + DX_WINDBG_trace(); if (pUnkOuter!=NULL) return CLASS_E_NOAGGREGATION; - IDirectDrawClipperImpl* That; + That = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawClipperImpl)); if (That == NULL) @@ -278,13 +280,15 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - DX_WINDBG_trace(); + DxSurf *surf; IDirectDrawImpl* This = (IDirectDrawImpl*)iface; IDirectDrawSurfaceImpl* That; DEVMODE DevMode; LONG extra_surfaces = 0; + + DX_WINDBG_trace(); if (pUnkOuter!=NULL) { @@ -548,7 +552,10 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - return internal_CreateNewSurface( This, That); + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + DDHAL_CREATESURFACEDATA mDdCreateSurface; + + return internal_CreateNewSurface( This, That); memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC)); @@ -564,7 +571,7 @@ That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = pDDSD->ddpfPixelFormat.dwFlags; That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = pDDSD->ddpfPixelFormat.dwRGBBitCount; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; @@ -608,7 +615,7 @@ That->Surf->mpOverlayLocals[0] = &That->Surf->mOverlayLocal[0]; - DDHAL_CREATESURFACEDATA mDdCreateSurface; + mDdCreateSurface.lpDD = &This->mDDrawGlobal; mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; @@ -755,148 +762,148 @@ DX_STUB_DD_OK; - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDSURFACEDESC2 desc_callback; - DEVMODE DevMode; - int iMode=0; - - RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); - - desc_callback.dwSize = sizeof(DDSURFACEDESC2); - - desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; - - if (dwFlags & DDEDM_REFRESHRATES) - { - desc_callback.dwFlags |= DDSD_REFRESHRATE; - desc_callback.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - - /* FIXME check if the mode are suppretd before sending it back */ - - memset(&DevMode,0,sizeof(DEVMODE)); - DevMode.dmSize = (WORD)sizeof(DEVMODE); - DevMode.dmDriverExtra = 0; - - while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) - { - - if (pDDSD) - { - if ((pDDSD->dwFlags & DDSD_WIDTH) && (pDDSD->dwWidth != DevMode.dmPelsWidth)) - continue; - if ((pDDSD->dwFlags & DDSD_HEIGHT) && (pDDSD->dwHeight != DevMode.dmPelsHeight)) - continue; - if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) && - (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) - continue; - } - - desc_callback.dwHeight = DevMode.dmPelsHeight; - desc_callback.dwWidth = DevMode.dmPelsWidth; - - if (DevMode.dmFields & DM_DISPLAYFREQUENCY) - { - desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; - } - - if (desc_callback.dwRefreshRate == 0) - { - DX_STUB_str("dwRefreshRate = 0, we hard code it to value 60"); - desc_callback.dwRefreshRate = 60; /* Maybe the valye should be biger */ - } - - /* above same as wine */ - if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) ) - { - switch(DevMode.dmBitsPerPel) - { - case 8: - desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc_callback.ddpfPixelFormat.dwFourCC = 0; - desc_callback.ddpfPixelFormat.dwRGBBitCount=8; - /* FIXME right value */ - desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ - desc_callback.ddpfPixelFormat.dwGBitMask = 0; /* Green bitmask */ - desc_callback.ddpfPixelFormat.dwBBitMask = 0; /* Blue bitmask */ - break; - - case 15: - desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc_callback.ddpfPixelFormat.dwFourCC = 0; - desc_callback.ddpfPixelFormat.dwRGBBitCount=15; - /* FIXME right value */ - desc_callback.ddpfPixelFormat.dwRBitMask = 0x7C00; /* red bitmask */ - desc_callback.ddpfPixelFormat.dwGBitMask = 0x3E0; /* Green bitmask */ - desc_callback.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ - break; - - case 16: - desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc_callback.ddpfPixelFormat.dwFourCC = 0; - desc_callback.ddpfPixelFormat.dwRGBBitCount=16; - /* FIXME right value */ - desc_callback.ddpfPixelFormat.dwRBitMask = 0xF800; /* red bitmask */ - desc_callback.ddpfPixelFormat.dwGBitMask = 0x7E0; /* Green bitmask */ - desc_callback.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ - break; - - case 24: - desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc_callback.ddpfPixelFormat.dwFourCC = 0; - desc_callback.ddpfPixelFormat.dwRGBBitCount=24; - /* FIXME right value */ - desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ - desc_callback.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ - desc_callback.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ - break; - - case 32: - desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc_callback.ddpfPixelFormat.dwFourCC = 0; - desc_callback.ddpfPixelFormat.dwRGBBitCount=8; - /* FIXME right value */ - desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ - desc_callback.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ - desc_callback.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ - break; - - default: - break; - } - desc_callback.ddsCaps.dwCaps = 0; - if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) - { - /* FIXME srt DDCS Caps flag */ - desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; - } - } - - if (DevMode.dmBitsPerPel==15) - { - desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; - } - else - { - desc_callback.lPitch = DevMode.dmPelsWidth * (DevMode.dmBitsPerPel / 8); - desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; - } - - if (callback(&desc_callback, context) == DDENUMRET_CANCEL) - { - return DD_OK; - } - - iMode++; - } - - return DD_OK; + // IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + // DDSURFACEDESC2 desc_callback; + // DEVMODE DevMode; + // int iMode=0; + // + //RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); + // + // desc_callback.dwSize = sizeof(DDSURFACEDESC2); + + // desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; + + // if (dwFlags & DDEDM_REFRESHRATES) + // { + // desc_callback.dwFlags |= DDSD_REFRESHRATE; + // desc_callback.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + // } + + // + // /* FIXME check if the mode are suppretd before sending it back */ + + //memset(&DevMode,0,sizeof(DEVMODE)); + //DevMode.dmSize = (WORD)sizeof(DEVMODE); + //DevMode.dmDriverExtra = 0; + + // while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) + // { + // + // if (pDDSD) + // { + // if ((pDDSD->dwFlags & DDSD_WIDTH) && (pDDSD->dwWidth != DevMode.dmPelsWidth)) + // continue; + // if ((pDDSD->dwFlags & DDSD_HEIGHT) && (pDDSD->dwHeight != DevMode.dmPelsHeight)) + // continue; + // if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) && + // (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) + // continue; + // } + // + // desc_callback.dwHeight = DevMode.dmPelsHeight; + // desc_callback.dwWidth = DevMode.dmPelsWidth; + // + // if (DevMode.dmFields & DM_DISPLAYFREQUENCY) + // { + // desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; + // } + + // if (desc_callback.dwRefreshRate == 0) + // { + // DX_STUB_str("dwRefreshRate = 0, we hard code it to value 60"); + // desc_callback.dwRefreshRate = 60; /* Maybe the valye should be biger */ + // } + + // /* above same as wine */ + // if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) ) + // { + // switch(DevMode.dmBitsPerPel) + // { + // case 8: + // desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + // desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + // desc_callback.ddpfPixelFormat.dwFourCC = 0; + // desc_callback.ddpfPixelFormat.dwRGBBitCount=8; + // /* FIXME right value */ + // desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + // desc_callback.ddpfPixelFormat.dwGBitMask = 0; /* Green bitmask */ + // desc_callback.ddpfPixelFormat.dwBBitMask = 0; /* Blue bitmask */ + // break; + + // case 15: + // desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + // desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + // desc_callback.ddpfPixelFormat.dwFourCC = 0; + // desc_callback.ddpfPixelFormat.dwRGBBitCount=15; + // /* FIXME right value */ + // desc_callback.ddpfPixelFormat.dwRBitMask = 0x7C00; /* red bitmask */ + // desc_callback.ddpfPixelFormat.dwGBitMask = 0x3E0; /* Green bitmask */ + // desc_callback.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + // break; + + // case 16: + // desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + // desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + // desc_callback.ddpfPixelFormat.dwFourCC = 0; + // desc_callback.ddpfPixelFormat.dwRGBBitCount=16; + // /* FIXME right value */ + // desc_callback.ddpfPixelFormat.dwRBitMask = 0xF800; /* red bitmask */ + // desc_callback.ddpfPixelFormat.dwGBitMask = 0x7E0; /* Green bitmask */ + // desc_callback.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + // break; + + // case 24: + // desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + // desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + // desc_callback.ddpfPixelFormat.dwFourCC = 0; + // desc_callback.ddpfPixelFormat.dwRGBBitCount=24; + // /* FIXME right value */ + // desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + // desc_callback.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + // desc_callback.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + // break; + + // case 32: + // desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + // desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + // desc_callback.ddpfPixelFormat.dwFourCC = 0; + // desc_callback.ddpfPixelFormat.dwRGBBitCount=8; + // /* FIXME right value */ + // desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + // desc_callback.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + // desc_callback.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + // break; + + // default: + // break; + // } + // desc_callback.ddsCaps.dwCaps = 0; + // if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) + // { + // /* FIXME srt DDCS Caps flag */ + // desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; + // } + // } + // + // if (DevMode.dmBitsPerPel==15) + // { + // desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; + // } + // else + // { + // desc_callback.lPitch = DevMode.dmPelsWidth * (DevMode.dmBitsPerPel / 8); + // desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; + // } + // + // if (callback(&desc_callback, context) == DDENUMRET_CANCEL) + // { + // return DD_OK; + // } + // + // iMode++; + // } + + // return DD_OK; } /* @@ -945,11 +952,13 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { - DX_WINDBG_trace(); + DDSCAPS2 ddscaps = {0}; DWORD status = DD_FALSE; IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + DX_WINDBG_trace(); if (pDriverCaps != NULL) { @@ -984,10 +993,10 @@ * Status ok */ HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - DX_WINDBG_trace(); - +{ IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + DX_WINDBG_trace(); if (pDDSD == NULL) { @@ -1048,10 +1057,10 @@ */ HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - +{ IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + DX_WINDBG_trace(); if (freq == NULL) { @@ -1068,11 +1077,10 @@ */ HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; *lpdwScanLine = 0; @@ -1111,10 +1119,10 @@ HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - +{ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DX_WINDBG_trace(); if (iface==NULL) { @@ -1158,10 +1166,12 @@ // for now we always asume it is the active dirver that should be use. // - allow more Flags - DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + + DX_WINDBG_trace(); // check the parameters if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) @@ -1217,7 +1227,7 @@ Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; BOOL dummy = TRUE; @@ -1226,6 +1236,8 @@ int Width=0; int Height=0; int BPP=0; + + DX_WINDBG_trace(); /* FIXME check the refresrate if it same if it not same do the mode switch */ if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && @@ -1289,9 +1301,9 @@ Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { - DX_WINDBG_trace(); - + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DX_WINDBG_trace(); if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank == NULL) { @@ -1317,11 +1329,12 @@ HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); +{ DDHAL_GETAVAILDRIVERMEMORYDATA mem; IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DX_WINDBG_trace(); /* Only Hal version exists acodring msdn */ if (!(This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Mon Nov 6 00:19:53 2006 @@ -8,7 +8,7 @@ * */ -#include "rosdraw.h" +#include "../rosdraw.h" /* FIXME adding hal and hel stub @@ -60,10 +60,10 @@ HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DX_WINDBG_trace(); if (This->Owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT) @@ -77,11 +77,11 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + DX_WINDBG_trace(); + if (event != NULL) { return DDERR_INVALIDPARAMS; @@ -96,10 +96,10 @@ } HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DX_WINDBG_trace(); if (This->Owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) { @@ -113,11 +113,11 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { - DWORD ret; - DX_WINDBG_trace(); - + DWORD ret; IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)pAttach; + + DX_WINDBG_trace(); if (pAttach==NULL) { @@ -273,10 +273,10 @@ HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DX_WINDBG_trace(); if (This->Owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_FLIP) { @@ -362,11 +362,11 @@ HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + DX_WINDBG_trace(); + if (This->Owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_FLIP) { return Hal_DDrawSurface_GetBltStatus( iface, dwFlags); @@ -377,10 +377,10 @@ HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This; + + DX_WINDBG_trace(); if (iface == NULL) { @@ -421,9 +421,9 @@ HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { - DX_WINDBG_trace(); - IDirectDrawSurfaceImpl* This; + + DX_WINDBG_trace(); if (iface == NULL) { @@ -527,10 +527,9 @@ Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD) { - DWORD dwSize; - DX_WINDBG_trace(); - + DWORD dwSize; IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; + DX_WINDBG_trace(); dwSize = pDDSD->dwSize; @@ -584,10 +583,9 @@ HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) -{ - DX_WINDBG_trace(); - - IDirectDrawSurfaceImpl* This; +{ + IDirectDrawSurfaceImpl* This; + DX_WINDBG_trace(); if (iface == NULL) { @@ -625,10 +623,10 @@ HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DX_WINDBG_trace(); if (This->Owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_SETCOLORKEY) { @@ -693,10 +691,10 @@ HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - +{ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DX_WINDBG_trace(); if (This->Owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) { Modified: trunk/reactos/dll/directx/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/palette.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/palette.c (original) +++ trunk/reactos/dll/directx/ddraw/palette.c Mon Nov 6 00:19:53 2006 @@ -12,11 +12,11 @@ ULONG WINAPI DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - +{ IDirectDrawPaletteImpl* This = (IDirectDrawPaletteImpl*)iface; ULONG ref=0; + + DX_WINDBG_trace(); if (iface!=NULL) { @@ -39,12 +39,11 @@ ULONG WINAPI DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) -{ +{ + IDirectDrawPaletteImpl * This = (IDirectDrawPaletteImpl*)iface; + ULONG ref=0; + DX_WINDBG_trace(); - - IDirectDrawPaletteImpl * This = (IDirectDrawPaletteImpl*)iface; - - ULONG ref=0; if (iface!=NULL) { Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Mon Nov 6 00:19:53 2006 @@ -25,6 +25,9 @@ /******** Main Object ********/ /* Public interface */ +VOID WINAPI AcquireDDThreadLock(); +VOID WINAPI ReleaseDDThreadLock(); + HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, LPVOID *obj); ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface); ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface); @@ -317,6 +320,7 @@ /*********** Macros ***********/ #define DX_STUB \ +{ \ static BOOL firstcall = TRUE; \ if (firstcall) \ { \ @@ -325,9 +329,11 @@ OutputDebugStringA(buffer); \ firstcall = FALSE; \ } \ +} \ return DDERR_UNSUPPORTED; #define DX_STUB_DD_OK \ +{ \ static BOOL firstcall = TRUE; \ if (firstcall) \ { \ @@ -336,6 +342,7 @@ OutputDebugStringA(buffer); \ firstcall = FALSE; \ } \ +} \ return DD_OK; Modified: trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Mon Nov 6 00:19:53 2006 @@ -8,7 +8,7 @@ * */ -#include "rosdraw.h" +#include "../rosdraw.h" extern DDPIXELFORMAT pixelformats[]; Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Mon Nov 6 00:19:53 2006 @@ -8,7 +8,7 @@ * */ -#include "rosdraw.h" +#include "../rosdraw.h" Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Mon Nov 6 00:19:53 2006 @@ -53,7 +53,19 @@ This->mpModeInfos[0].lPitch = (devmode.dmPelsWidth*devmode.dmBitsPerPel)/8; This->mpModeInfos[0].wRefreshRate = (WORD)devmode.dmDisplayFrequency; - This->hdc = CreateDCW(L"DISPLAY",L"DISPLAY",NULL,NULL); + if ( This->devicetype <3 ) + { + /* Create HDC for default, hal and hel driver */ + This->hdc = CreateDCW(L"DISPLAY",L"DISPLAY",NULL,NULL); + } + else + { + /* FIXME : need getting driver from the GUID that have been pass in from + the register. we do not support that yet + */ + This->hdc = NULL ; + } + if (This->hdc == NULL) { @@ -222,6 +234,7 @@ StartDirectDrawHal(LPDIRECTDRAW* iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_GETDRIVERINFODATA DriverInfo; /* HAL Startup process */ BOOL newmode = FALSE; @@ -354,7 +367,7 @@ //DeleteDC(This->hdc); - DDHAL_GETDRIVERINFODATA DriverInfo; + memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); DriverInfo.dwContext = This->mDDrawGlobal.hDD; @@ -425,14 +438,21 @@ REFIID id, BOOL ex) { - IDirectDrawImpl* This = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawImpl)); + IDirectDrawImpl* This; DX_WINDBG_trace(); + + //AcquireDDThreadLock(); + + This = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawImpl)); + if (This == NULL) { + ReleaseDDThreadLock(); return E_OUTOFMEMORY; } + ZeroMemory(This,sizeof(IDirectDrawImpl)); @@ -442,29 +462,39 @@ This->lpVtbl_v4 = &DDRAW_IDirectDraw4_VTable; *pIface = (LPDIRECTDRAW)This; - - This->devicetype = 0; - - if (pGUID == (LPGUID) DDCREATE_HARDWAREONLY) - { - This->devicetype = 1; /* hal only */ - } - - if (pGUID == (LPGUID) DDCREATE_EMULATIONONLY) - { - This->devicetype = 2; /* hel only */ - } + + if (pGUID == 0) + { + This->devicetype = 0; /* both hal and hel default driver "DISPLAY" */ + } + else if (pGUID == (LPGUID) DDCREATE_HARDWAREONLY) + { + This->devicetype = 1; /* hal only default driver "DISPLAY" */ + } + + else if (pGUID == (LPGUID) DDCREATE_EMULATIONONLY) + { + This->devicetype = 2; /* hel only default driver "DISPLAY" */ + } + else + { + This->devicetype = 3; /* Read from the register which driver it should be */ + } + if(This->lpVtbl->QueryInterface ((LPDIRECTDRAW7)This, id, (void**)&pIface) != S_OK) { + ReleaseDDThreadLock(); return DDERR_INVALIDPARAMS; } if (StartDirectDraw((LPDIRECTDRAW*)This) == DD_OK); { + //ReleaseDDThreadLock(); return This->lpVtbl->Initialize ((LPDIRECTDRAW7)This, pGUID); } + //ReleaseDDThreadLock(); return DDERR_INVALIDPARAMS; } Modified: trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/thunks/d… ============================================================================== --- trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c (original) +++ trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c Mon Nov 6 00:19:53 2006 @@ -22,7 +22,7 @@ * */ -#include "winedraw.h" +#include "../winedraw.h" static HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/thunks/surface_thunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/thunks/s… ============================================================================== --- trunk/reactos/dll/directx/ddraw/thunks/surface_thunk.c (original) +++ trunk/reactos/dll/directx/ddraw/thunks/surface_thunk.c Mon Nov 6 00:19:53 2006 @@ -22,7 +22,7 @@ * */ -#include "winedraw.h" +#include "../winedraw.h" #define CONVERT(pdds) COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, \ IDirectDrawSurface3, \

18 years, 1 month

[peterw] 24689: - Added missing variable for the SMP build, noticed by Usurp. - Trimmed trailing white-space.

by peterw＠svn.reactos.org

Author: peterw Date: Mon Nov 6 00:00:42 2006 New Revision: 24689 URL: http://svn.reactos.org/svn/reactos?rev=24689&view=rev Log: - Added missing variable for the SMP build, noticed by Usurp. - Trimmed trailing white-space. Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2468… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Mon Nov 6 00:00:42 2006 @@ -189,7 +189,7 @@ OutputString->Length = i + 1; OutputString->MaximumLength = i + 1; } - else + else { /* Direct Output to Screen */ InbvDisplayString(BugCode); @@ -521,6 +521,9 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; PULONG_PTR HardErrorParameters; KIRQL OldIrql; +#ifdef CONFIG_SMP + LONG i = 0; +#endif /* Set active bugcheck */ KeBugCheckActive = TRUE; @@ -868,7 +871,7 @@ #ifdef CONFIG_SMP /* Freeze the other CPUs */ - for (i = 0; i < KeNumberProcessors; i++) + for (i = 0; i < KeNumberProcessors; i++) { if (i != (LONG)KeGetCurrentProcessorNumber()) {

18 years, 1 month

[janderwald] 24688: - read lines into a vector of string lines - move os specific functions into an own file - fix a bug in command line options parsing - add function for converting ansi2Unicode

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Nov 5 23:51:02 2006 New Revision: 24688 URL: http://svn.reactos.org/svn/reactos?rev=24688&view=rev Log: - read lines into a vector of string lines - move os specific functions into an own file - fix a bug in command line options parsing - add function for converting ansi2Unicode Added: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/unicode.cpp trunk/reactos/tools/sysreg/unicode.h Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sample.cfg trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/sysreg/sysreg.mak Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Sun Nov 5 23:51:02 2006 @@ -38,7 +38,7 @@ #endif if (!file) { - cerr << " Error: ConfigParser::parseFile failed to open configuration file " <<endl; + cerr << "Error: ConfigParser::parseFile failed to open configuration file " << FileName << endl; return false; } Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Sun Nov 5 23:51:02 2006 @@ -9,6 +9,7 @@ */ #include "namedpipe_reader.h" +#include "unicode.h" #include <iostream> #include <assert.h> @@ -17,6 +18,7 @@ { #define MIN(a, b) (((a) < (b)) ? (a) : (b)) + using std::vector; //--------------------------------------------------------------------------------------- NamedPipeReader::NamedPipeReader() : h_Pipe(NULL) { @@ -90,71 +92,126 @@ h_Pipe = NULL; return true; } - -//--------------------------------------------------------------------------------------- - - string::size_type NamedPipeReader::readPipe(string &Buffer) - { - TCHAR * buf = (TCHAR *)Buffer.c_str(); - string::size_type buffer_size = Buffer.capacity(); - string::size_type bytes_read = 0; - DWORD cbRead; +//--------------------------------------------------------------------------------------- + void NamedPipeReader::extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead) + { + TCHAR * offset = _tcsstr(buffer, _T("\x0D")); + DWORD buf_offset = 0; + while(offset) + { + offset[0] = _T('\0'); + string line = buffer; + if (append_line) + { + assert(vect.empty () == false); + string prev_line = vect[vect.size () -1]; + prev_line += line; + vect.pop_back (); + vect.push_back (prev_line); + append_line = false; + } + else + { + vect.push_back (line); + } + + offset += 2; + + buf_offset += line.length () + 2; + if (buf_offset >= cbRead) + { + break; + } + buffer = offset; + offset = _tcsstr(buffer, _T("\n")); + } + if (buf_offset < cbRead) + { + string line = buffer; + if (append_line) + { + assert(vect.empty () == false); + string prev_line = vect[vect.size () -1]; + vect.pop_back (); + prev_line += line; + vect.push_back (prev_line); + } + else + { + vect.push_back (line); + append_line = true; + } + } + else + { + append_line = false; + } + } + +//--------------------------------------------------------------------------------------- + + size_t NamedPipeReader::readPipe(vector<string> & vect) + { + char * localbuf; + DWORD localsize = 100; + size_t lines = vect.size (); + +#ifdef WIN32 BOOL fSuccess; - TCHAR * localbuf; - DWORD localsize = MIN(100, buffer_size); - -//#ifdef NDEBUG - memset(buf, 0x0, sizeof(TCHAR) * buffer_size); -//#endif - -#ifdef __LINUX__ - -#else - localbuf = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(TCHAR)); + localbuf = (char*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(char)); +#ifdef UNICODE + wchar_t * wbuf = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(wchar_t)); +#endif if (localbuf != NULL) { - + bool append_line = false; do { + DWORD cbRead; do { - ZeroMemory(localbuf, localsize * sizeof(TCHAR)); + ZeroMemory(localbuf, localsize * sizeof(char)); +#ifdef UNICODE + ZeroMemory(wbuf, localsize * sizeof(wchar_t)); +#endif fSuccess = ReadFile( h_Pipe, localbuf, - localsize * sizeof(TCHAR), + (localsize-1) * sizeof(char), &cbRead, NULL); if (! fSuccess && GetLastError() != ERROR_MORE_DATA) break; - - if(bytes_read + cbRead > buffer_size) + +#ifdef UNICODE + if (UnicodeConverter::ansi2Unicode(localbuf, wbuf, cbRead)) { - Buffer.reserve(bytes_read + localsize * 3); - buf = (TCHAR *)Buffer.c_str(); - buffer_size = Buffer.capacity(); + extractLines(wbuf, vect, append_line, cbRead); } - - memcpy(&buf[bytes_read], localbuf, cbRead); - bytes_read += cbRead; +#else + extractLines(localbuf, vect, append_line, cbRead); +#endif } while (!fSuccess); // repeat loop if ERROR_MORE_DATA - } while (localbuf[_tcslen(localbuf)-1] != '\n'); + } while (localbuf[strlen(localbuf)-1] != '\n'); if (!fSuccess) return 0; HeapFree(GetProcessHeap(), 0, localbuf); +#ifdef UNICODE + HeapFree(GetProcessHeap(), 0, wbuf); +#endif } else { return 0; } #endif - buf[_tcslen(buf)-_tcslen(_T("\n"))-1] = '\0'; - return _tcslen(buf); + + return (vect.size () - lines); } Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Sun Nov 5 23:51:02 2006 @@ -14,12 +14,13 @@ #include "user_types.h" +#include <vector> #include <stdio.h> #include <stdlib.h> #ifdef __LINUX__ -#else +#elif defined(WIN32) #include <windows.h> #endif @@ -82,9 +83,9 @@ /// false, call PipeReader::isEoF() to determine if the pipe should be closed /// /// @param Buffer to be written to -/// @return string::size_type +/// @return size_t - string::size_type readPipe(string & Buffer); + size_t readPipe(std::vector<string> & vect); //--------------------------------------------------------------------------------------- /// @@ -96,6 +97,21 @@ bool isEof(); protected: +//--------------------------------------------------------------------------------------- +/// +/// extractLines +/// +/// Description: this functions extract lines from a buffer and pushes them into the supplied vector +/// +/// @param buffer from which the lines are extracted from +/// @param vect vector storing the extracted lines +/// @param append_line if the line isnt fully read, the line is appended + + void extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead); + + + + HANDLE h_Pipe; }; // end of class NamedPipeReader Added: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (added) +++ trunk/reactos/tools/sysreg/os_support.cpp Sun Nov 5 23:51:02 2006 @@ -1,0 +1,76 @@ +/* $Id: os_support.h 24643 2006-10-24 11:45:21Z janderwald $ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: operating systems specific code + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "os_support.h" + +namespace System_ +{ +#ifdef WIN32 + bool OsSupport::terminateProcess(OsSupport::ProcessID pid) + { + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!hProcess) + { + return false; + } + + bool ret = TerminateProcess(hProcess, 0); + CloseHandle(hProcess); + return ret; + } + + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + { + STARTUPINFO siStartInfo; + PROCESS_INFORMATION piProcInfo; + OsSupport::ProcessID pid; + + UNREFERENCED_PARAMETER(procargsnum); + UNREFERENCED_PARAMETER(procargs); + + ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); + ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); + + siStartInfo.cb = sizeof(STARTUPINFO); + siStartInfo.wShowWindow = SW_SHOWNORMAL; + siStartInfo.dwFlags = STARTF_USESHOWWINDOW; + + LPTSTR command = _tcsdup(procname); + + if (!CreateProcess(NULL, procname, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) + { + cerr << "Error: CreateProcess failed " << command <<endl; + pid = 0; + } + else + { + pid = piProcInfo.dwProcessId; + CloseHandle(piProcInfo.hProcess); + CloseHandle(piProcInfo.hThread); + } + free(command); + return pid; + } +#elif defined (__LINUX__) +/********************************************************************************************************************/ + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + { + ProcessID pid; + + if ((pid = fork()) < 0) + { + cerr << "OsSupport::createProcess> fork failed" << endl; + return pid; + } + + } + +#endif + +} // end of namespace System_ Added: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (added) +++ trunk/reactos/tools/sysreg/os_support.h Sun Nov 5 23:51:02 2006 @@ -1,0 +1,95 @@ +#ifndef OS_SUPPORT_H__ +#define OS_SUPPORT_H__ + +/* $Id: os_support.h 24643 2006-10-24 11:45:21Z janderwald $ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: operating systems specific code + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#ifdef WIN32 +#include <windows.h> +#elif defined(__LINUX__) +#include <unistd.h> +#endif + +#include "user_types.h" + +namespace System_ +{ +//--------------------------------------------------------------------------------------- +/// +/// class OsSupport +/// +/// Description: this class encapsulates operating system specific functions +/// +/// + + class OsSupport + { + public: +#ifdef WIN32 + + typedef DWORD ProcessID; + +#elif defined(__LINUX__) + + typedef pid_t ProcessID; + +#else +#error you need to define pid handle type for your platform +#endif + +//--------------------------------------------------------------------------------------- +/// +/// OsSupport +/// +/// Description: constructor of class OsSupport + + virtual ~OsSupport() + {} + +//--------------------------------------------------------------------------------------- +/// +/// createProcess +/// +/// Description: this functions creates a new process and returns its pid on success +/// +/// @param procname name of the file to execute +/// @param procargsnum num of arguments for the new process +/// @param procargs arguments for the new process +/// +/// + + static ProcessID createProcess(TCHAR * procname, int procargsnum, TCHAR ** procargs); + +//--------------------------------------------------------------------------------------- +/// +/// terminateProcess +/// +/// Description: this function terminates a process given by its pid +/// +/// Note: returns true if the process with the given pid was terminated +/// +/// @param pid process id of the process to terminate + + static bool terminateProcess(ProcessID pid); + + protected: +//--------------------------------------------------------------------------------------- +/// +/// OsSupport +/// +/// Description: constructor of class OsSupport + + OsSupport() + {} + + }; // end of class OsSupport + +} // end of namespace System_ + +#endif /* end of OS_SUPPORT_H__ */ Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sun Nov 5 23:51:02 2006 @@ -14,6 +14,7 @@ #include "namedpipe_reader.h" #include "sym_file.h" #include "file_reader.h" +#include "os_support.h" #include <iostream> #include <vector> @@ -24,11 +25,6 @@ #include <assert.h> -#ifndef __LINUX__ -#include <windows.h> -#endif - - namespace Sysreg_ { using std::vector; @@ -36,6 +32,7 @@ using System_::NamedPipeReader; using System_::SymbolFile; using System_::FileReader; + using System_::OsSupport; string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); string RosBootTest::CLASS_NAME = _T("rosboot"); @@ -113,9 +110,11 @@ /// conf_parser.getStringValue (RosBootTest::CHECK_POINT, m_Checkpoint); - conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile); conf_parser.getStringValue (RosBootTest::CRITICAL_APP, m_CriticalApp); - + if (conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile)) + { + _tremove(m_PidFile.c_str ()); + } if (!_tcscmp(debug_port.c_str(), _T("pipe"))) { @@ -318,40 +317,19 @@ { NamedPipeReader namedpipe_reader; string pipecmd = _T(""); - -#ifdef __LINUX__ - pid_t pid; -#else - STARTUPINFO siStartInfo; - PROCESS_INFORMATION piProcInfo; - DWORD pid; - - ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); - ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); - - siStartInfo.cb = sizeof(STARTUPINFO); - siStartInfo.wShowWindow = SW_SHOWNORMAL; - siStartInfo.dwFlags = STARTF_USESHOWWINDOW; - - LPTSTR command = _tcsdup(boot_cmd.c_str()); - - if (!CreateProcess(NULL, command, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) - { - cerr << "Error: CreateProcess failed " << boot_cmd <<endl; - return false; - } - else - { - pid = piProcInfo.dwProcessId; - } -#endif + + /// + /// FIXME + /// split up arguments + + OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0, NULL); string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:")); pipe_pos += 12; string::size_type pipe_pos_end = boot_cmd.find (_T(" "), pipe_pos); if (pipe_pos != string::npos && pipe_pos > 0 && pipe_pos < boot_cmd.size()) { - pipecmd = "\\\\.\\pipe\\" + boot_cmd.substr (pipe_pos, pipe_pos_end - pipe_pos); + pipecmd = _T("\\\\.\\pipe\\") + boot_cmd.substr (pipe_pos, pipe_pos_end - pipe_pos); } else { @@ -385,10 +363,8 @@ break; } - if (namedpipe_reader.readPipe (Buffer) != 0) - { - vect.push_back (Buffer.c_str()); - + if (namedpipe_reader.readPipe (vect) != 0) + { DebugState state = checkDebugData(vect); if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) { @@ -402,17 +378,8 @@ } } namedpipe_reader.closePipe (); - -#ifdef __LINUX__ - kill(pid, SIGTERM); -#else - HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (hProcess) - { - TerminateProcess(hProcess, 0); - } - CloseHandle(hProcess); -#endif + _sleep(3* CLOCKS_PER_SEC); + OsSupport::terminateProcess (pid); return ret; } @@ -421,7 +388,7 @@ { PipeReader pipe_reader; _tremove(debug_log.c_str ()); - _tremove(m_PidFile.c_str ()); + if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; @@ -437,7 +404,7 @@ _sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); } - int pid = 0; + OsSupport::ProcessID pid = 0; if (m_PidFile != _T("")) { @@ -502,17 +469,9 @@ if (pid) { -#ifdef __LINUX__ - kill(pid, SIGTERM); -#else - HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (hProcess) - { - TerminateProcess(hProcess, 0); - } - CloseHandle(hProcess); -#endif - } + OsSupport::terminateProcess (pid); + } + pipe_reader.closePipe (); return ret; } Modified: trunk/reactos/tools/sysreg/sample.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re… ============================================================================== --- trunk/reactos/tools/sysreg/sample.cfg (original) +++ trunk/reactos/tools/sysreg/sample.cfg Sun Nov 5 23:51:02 2006 @@ -27,7 +27,7 @@ ; This value is the command which is executed to gain debugging data ; this value is mandatory -ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt +ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt ; ; ROSBOOT_PIDFILE @@ -47,8 +47,8 @@ ; If the value is set to pipe, then sysreg will read from pipe created by the ; ROSBOOT_CMD ; -;ROSBOOT_DEBUG_PORT=pipe -ROSBOOT_DEBUG_PORT=file +;ROSBOOT_DEBUG_PORT=file +ROSBOOT_DEBUG_PORT=pipe ; ; ROSBOOT_DEBUG_FILE Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sun Nov 5 23:51:02 2006 @@ -36,6 +36,7 @@ ComponentFactory comp_factory; TCHAR DefaultConfig[] = _T("sysreg.cfg"); TCHAR *ConfigFile; + TCHAR * TestName; if ((argc != 3) && (argc != 2)) { @@ -59,9 +60,15 @@ } if (argc == 2) - _tcscpy(ConfigFile, DefaultConfig); + { + ConfigFile = DefaultConfig; + TestName = argv[1]; + } else + { ConfigFile = argv[1]; + TestName = argv[2]; + } if (!config.parseFile (ConfigFile)) @@ -70,7 +77,7 @@ return -1; } - RegressionTest * regtest = comp_factory.createComponent (argv[2]); + RegressionTest * regtest = comp_factory.createComponent (TestName); if (!regtest) { cerr << "Error: the requested regression test does not exist" << endl; @@ -82,7 +89,7 @@ config.getStringValue (ros, envvar); SymbolFile::initialize (config, envvar); - + if (regtest->execute (config)) { cout << "The regression test " << regtest->getName () << " completed successfully" << endl; Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Sun Nov 5 23:51:02 2006 @@ -27,6 +27,8 @@ sym_file.cpp \ sysreg.cpp \ file_reader.cpp \ + os_support.cpp \ + unicode.cpp \ ) SYSREGBUILD_OBJECTS = \ @@ -76,6 +78,14 @@ $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ +$(SYSREGBUILD_INT_)os_support.o: $(SYSREGBUILD_BASE_)os_support.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)unicode.o: $(SYSREGBUILD_BASE_)unicode.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + .PHONY: sysregbuild_clean sysreg_clean: -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) Added: trunk/reactos/tools/sysreg/unicode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/unicode.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/unicode.cpp (added) +++ trunk/reactos/tools/sysreg/unicode.cpp Sun Nov 5 23:51:02 2006 @@ -1,0 +1,31 @@ +#include "unicode.h" + +#include <stdlib.h> +#include <stdio.h> + +namespace System_ +{ +//--------------------------------------------------------------------------------------- + bool UnicodeConverter::ansi2Unicode(char * abuf, wchar_t *outbuf, size_t length) + { + size_t i = 0; + int conv; + + while((conv = mbtowc(&outbuf[i], &abuf[i], length - i))) + { + i += conv; + if (i == length) + break; + } + outbuf[i] = L'\0'; + + if (i) + { + return true; + } + else + { + return false; + } + } +} // end of namespace System_ Added: trunk/reactos/tools/sysreg/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/unicode.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/unicode.h (added) +++ trunk/reactos/tools/sysreg/unicode.h Sun Nov 5 23:51:02 2006 @@ -1,0 +1,55 @@ +#ifndef UNICODE_H__ +#define UNICODE_H__ // unicode.h + +#include "user_types.h" + +namespace System_ +{ + + class UnicodeConverter + { + public: +//--------------------------------------------------------------------------------------- +/// +/// UnicodeConverter +/// +/// Description: destructor of class UnicodeConverter + + virtual ~UnicodeConverter() + {} + +//--------------------------------------------------------------------------------------- +/// +/// UnicodeConverter +/// +/// Description: converts an ANSI buffer to wide character buffer +/// using standard c routines +/// +/// Note: make sure before calling that outbuf is big enough to receive the result +/// +/// @param abuf ansi buffer used a source +/// @param outbuf wide character buffer receives result +/// @param length length of abuf +/// +/// @return bool + + static bool ansi2Unicode(char * abuf, wchar_t * outbuf, size_t length); + + + protected: +//--------------------------------------------------------------------------------------- +/// +/// UnicodeConverter +/// +/// Description: constructor of class UnicodeConverter + + UnicodeConverter() + {} + + }; // end of class UnicodeConverter + + + +} // end of namespace System_ + +#endif /* end of UNICODE_H__ */

18 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2006