Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[gedmurphy] 34016: The start of a GUI to make running the Wine API tests a pleasure rather than a pain. This will plug into the new testing framework for the Wine tests, which will also publish it's results on a live website (if I can get Colin to help me with the web stuff ; ) ) This is the time to pester me with requests / ideas anyone may have.
by gedmurphy＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: gedmurphy Date: Wed Jun 18 14:10:39 2008 New Revision: 34016 URL: http://svn.reactos.org/svn/reactos?rev=34016&view=rev Log: The start of a GUI to make running the Wine API tests a pleasure rather than a pain. This will plug into the new testing framework for the Wine tests, which will also publish it's results on a live website (if I can get Colin to help me with the web stuff ;) ) This is the time to pester me with requests / ideas anyone may have. Added: trunk/rostests/winetests/GUI/ trunk/rostests/winetests/GUI/WinetestsGUI.rc (with props) trunk/rostests/winetests/GUI/browsewnd.c (with props) trunk/rostests/winetests/GUI/lang/ trunk/rostests/winetests/GUI/lang/en-US.rc (with props) trunk/rostests/winetests/GUI/mainwnd.c (with props) trunk/rostests/winetests/GUI/misc.c (with props) trunk/rostests/winetests/GUI/precomp.h (with props) trunk/rostests/winetests/GUI/res/ trunk/rostests/winetests/GUI/resource.h (with props) trunk/rostests/winetests/GUI/rsrc.rc (with props) Added: trunk/rostests/winetests/GUI/WinetestsGUI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/WinetestsGU… ============================================================================== --- trunk/rostests/winetests/GUI/WinetestsGUI.rc (added) +++ trunk/rostests/winetests/GUI/WinetestsGUI.rc [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,11 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Character Map\0" +#define REACTOS_STR_INTERNAL_NAME "charmap\0" +#define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" +//#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/rostests/winetests/GUI/WinetestsGUI.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c (added) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,224 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: browse dialog implementation + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include <precomp.h> + +#define DLL_SEARCH_DIR L"\\Debug\\testlibs\\*" + +static INT +GetNumberOfDllsInFolder(LPWSTR lpFolder) +{ + HANDLE hFind; + WIN32_FIND_DATAW findFileData; + INT numFiles = 0; + + hFind = FindFirstFileW(lpFolder, + &findFileData); + if (hFind == INVALID_HANDLE_VALUE) + { + DisplayError(GetLastError()); + return 0; + } + + do + { + if (!(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + numFiles++; + } + } while (FindNextFile(hFind, &findFileData) != 0); + + return numFiles; +} + +static INT +GetListOfTestDlls(PMAIN_WND_INFO pInfo) +{ + HANDLE hFind; + WIN32_FIND_DATAW findFileData; + WCHAR szDllPath[MAX_PATH]; + LPWSTR ptr; + INT numFiles = 0; + INT len; + + len = GetCurrentDirectory(MAX_PATH, szDllPath); + if (!len) return 0; + + wcsncat(szDllPath, DLL_SEARCH_DIR, MAX_PATH - (len + 1)); + + numFiles = GetNumberOfDllsInFolder(szDllPath); + if (!numFiles) return 0; + + pInfo->lpDllList = HeapAlloc(GetProcessHeap(), 0, numFiles * (MAX_PATH * sizeof(WCHAR))); + if (!pInfo->lpDllList) + return 0; + + hFind = FindFirstFileW(szDllPath, + &findFileData); + if (hFind == INVALID_HANDLE_VALUE) + { + DisplayError(GetLastError()); + HeapFree(GetProcessHeap(), 0, pInfo->lpDllList); + return 0; + } + + /* remove the glob */ + ptr = wcschr(szDllPath, L'*'); + if (ptr) + *ptr = L'\0'; + + /* don't mod our base pointer */ + ptr = pInfo->lpDllList; + + do + { + if (!(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + //MessageBoxW(NULL, findFileData.cFileName, NULL, 0); + + /* set the path */ + wcscpy(ptr, szDllPath); + + /* tag the file onto the path */ + len = MAX_PATH - (wcslen(ptr) + 1); + wcsncat(ptr, findFileData.cFileName, len); + + /* move the pointer along by MAX_PATH */ + ptr += MAX_PATH; + } + } while (FindNextFile(hFind, &findFileData) != 0); + + return numFiles; +} + +static HTREEITEM +InsertIntoTreeView(HWND hTreeView, + HTREEITEM hRoot, + LPWSTR lpLabel, + LPWSTR lpDllPath, + INT Image) +{ + TV_ITEM tvi; + TV_INSERTSTRUCT tvins; + + ZeroMemory(&tvi, sizeof(tvi)); + ZeroMemory(&tvins, sizeof(tvins)); + + tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvi.pszText = lpLabel; + tvi.cchTextMax = lstrlen(lpLabel); + tvi.lParam = (LPARAM)lpDllPath; + tvi.iImage = Image; + tvi.iSelectedImage = Image; + + //tvi.stateMask = TVIS_OVERLAYMASK; + + tvins.item = tvi; + tvins.hParent = hRoot; + + return TreeView_InsertItem(hTreeView, &tvins); +} + +static VOID +PopulateTreeView(PMAIN_WND_INFO pInfo) +{ + HWND hTreeView; + HTREEITEM hRoot; + HBITMAP hComp; + TCHAR ComputerName[MAX_PATH]; + DWORD dwSize = MAX_PATH; + INT RootImage; + + hTreeView = GetDlgItem(pInfo->hBrowseDlg, IDC_TREEVIEW); + + (void)TreeView_DeleteAllItems(hTreeView); + + /* insert the root item into the tree */ + hRoot = InsertIntoTreeView(hTreeView, + NULL, + ComputerName, + NULL, + 0);//RootImage); +} + +static VOID +PopulateTestList(PMAIN_WND_INFO pInfo) +{ + INT numFiles; + + if ((numFiles = GetListOfTestDlls(pInfo))) + { + PopulateTreeView(pInfo); + } +} + + +static BOOL +OnInitBrowseDialog(HWND hDlg, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + + pInfo = (PMAIN_WND_INFO)lParam; + + pInfo->hBrowseDlg = hDlg; + + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + PopulateTestList(pInfo); + + return TRUE; +} + + +BOOL CALLBACK +BrowseDlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + + /* Get the window context */ + pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && Message != WM_INITDIALOG) + { + goto HandleDefaultMessage; + } + + switch(Message) + { + case WM_INITDIALOG: + return OnInitBrowseDialog(hDlg, lParam); + + case WM_COMMAND: + { + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + HeapFree(GetProcessHeap(), 0, pInfo->lpDllList); + pInfo->lpDllList = NULL; + + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + + break; + } + +HandleDefaultMessage: + default: + return FALSE; + } + + return FALSE; +} Propchange: trunk/rostests/winetests/GUI/browsewnd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/lang/en-US.… ============================================================================== --- trunk/rostests/winetests/GUI/lang/en-US.rc (added) +++ trunk/rostests/winetests/GUI/lang/en-US.rc [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,35 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_WINETESTGUI DIALOGEX 0, 0, 293, 262 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Winetest GUI" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,236,241,50,14,WS_GROUP + CONTROL "",IDC_LIST,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,69,279,103 + EDITTEXT IDC_OUTPUT,7,175,279,62,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY + COMBOBOX IDC_TESTSELECTION,27,12,205,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Test:",IDC_STATIC,6,14,18,8 + PUSHBUTTON "Browse...",IDC_BROWSE,236,11,50,14 + PUSHBUTTON "Run",IDC_RUN,236,30,50,14 + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,28,30,204,14 + LTEXT "Runs:",IDC_STATIC,8,53,20,8 + LTEXT "?",IDC_NUMRUNS,33,53,8,8 + LTEXT "Errors:",IDC_STATIC,55,53,23,8 + LTEXT "?",IDC_NUMERRORS,85,53,8,8 + LTEXT "Failures:",IDC_STATIC,107,53,28,8 + LTEXT "?",IDC_NUMFAILURES,141,53,8,8 + PUSHBUTTON "Stop",IDC_STOP,236,49,50,14 + CONTROL "Run on start",IDC_RUNONSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,52,56,10 + LTEXT "status bar",IDC_STATUS,7,244,210,8 +END + +IDD_TESTBROWSER DIALOGEX 0, 0, 259, 250 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Test hierarchy" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "Select", IDC_SELECT, 202, 7, 50, 14 + CONTROL "", IDC_TREEVIEW, "SysTreeView32", WS_BORDER | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT, 7, 7, 189, 236 + PUSHBUTTON "Close", IDOK, 202, 34, 50, 14 +END Propchange: trunk/rostests/winetests/GUI/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/mainwnd.c?r… ============================================================================== --- trunk/rostests/winetests/GUI/mainwnd.c (added) +++ trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,155 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: main dialog implementation + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include <precomp.h> + +HINSTANCE hInstance; + + + + +static BOOL +OnInitMainDialog(HWND hDlg, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + //HMENU hSysMenu; + LPWSTR lpAboutText; + + pInfo = (PMAIN_WND_INFO)lParam; + + /* Initialize the main window context */ + pInfo->hMainWnd = hDlg; + + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + pInfo->hSmIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (pInfo->hSmIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)pInfo->hSmIcon); + } + + pInfo->hBgIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); + if (pInfo->hBgIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)pInfo->hBgIcon); + } + + return TRUE; +} + + +static BOOL CALLBACK +MainDlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo; + + /* Get the window context */ + pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && Message != WM_INITDIALOG) + { + goto HandleDefaultMessage; + } + + switch(Message) + { + case WM_INITDIALOG: + return OnInitMainDialog(hDlg, lParam); + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_BROWSE: + DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_TESTBROWSER), + hDlg, + (DLGPROC)BrowseDlgProc, + (LPARAM)pInfo); + + break; + + case IDOK: + EndDialog(hDlg, 0); + break; + } + } + break; + + case WM_CLOSE: + if (pInfo->hSmIcon) + DestroyIcon(pInfo->hSmIcon); + if (pInfo->hBgIcon) + DestroyIcon(pInfo->hBgIcon); + EndDialog(hDlg, 0); + break; + +HandleDefaultMessage: + default: + return FALSE; + } + + return FALSE; +} + + +INT WINAPI +wWinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR Cmd, + int iCmd) +{ + INITCOMMONCONTROLSEX iccx; + PMAIN_WND_INFO pInfo; + INT Ret = 1; + + hInstance = hInst; + + ZeroMemory(&iccx, sizeof(INITCOMMONCONTROLSEX)); + iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwICC = ICC_TAB_CLASSES; + InitCommonControlsEx(&iccx); + + pInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(MAIN_WND_INFO)); + if (pInfo) + { + Ret = (DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_WINETESTGUI), + NULL, + (DLGPROC)MainDlgProc, + (LPARAM)pInfo) == IDOK); + + HeapFree(GetProcessHeap(), 0, pInfo); + + } + + return Ret; +} Propchange: trunk/rostests/winetests/GUI/mainwnd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c (added) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,260 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: + * PURPOSE: miscallanous functions + * COPYRIGHT: Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.org> + * Copyright 2006 - 2008 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include <precomp.h> + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + return -1; + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = (WCHAR*) LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + +INT +AllocAndLoadString(OUT LPWSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(TCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadStringW(hInst, uID, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} + +DWORD +LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPWSTR *lpTarget, + ...) +{ + DWORD Ret = 0; + LPTSTR lpFormat; + va_list lArgs; + + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) > 0) + { + va_start(lArgs, lpTarget); + /* let's use Format to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPTSTR)lpTarget, + 0, + &lArgs); + va_end(lArgs); + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} + +BOOL +StatusBarLoadAndFormatString(IN HWND hStatusBar, + IN INT PartId, + IN HINSTANCE hInstance, + IN UINT uID, + ...) +{ + BOOL Ret = FALSE; + LPWSTR lpFormat, lpStr; + va_list lArgs; + + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) > 0) + { + va_start(lArgs, uID); + /* let's use FormatMessage to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (VOID*)&lpStr, + 0, + &lArgs); + va_end(lArgs); + + if (lpStr != NULL) + { + Ret = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)lpStr); + LocalFree((HLOCAL)lpStr); + } + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} + +BOOL +StatusBarLoadString(IN HWND hStatusBar, + IN INT PartId, + IN HINSTANCE hInstance, + IN UINT uID) +{ + BOOL Ret = FALSE; + LPWSTR lpStr; + + if (AllocAndLoadString(&lpStr, + hInstance, + uID) > 0) + { + Ret = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)lpStr); + LocalFree((HLOCAL)lpStr); + } + + return Ret; +} + + +INT +GetTextFromEdit(OUT LPWSTR lpString, + IN HWND hDlg, + IN UINT Res) +{ + INT len = GetWindowTextLengthW(GetDlgItem(hDlg, Res)); + if(len > 0) + { + GetDlgItemTextW(hDlg, + Res, + lpString, + len + 1); + } + else + lpString = NULL; + + return len; +} + +VOID DisplayError(INT err) +{ + LPWSTR lpMsgBuf = NULL; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + err, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (VOID*)&lpMsgBuf, + 0, + NULL ); + + MessageBoxW(NULL, lpMsgBuf, L"Error!", MB_OK | MB_ICONERROR); + + LocalFree(lpMsgBuf); +} + +VOID DisplayString(LPWSTR lpMsg) +{ + MessageBoxW(NULL, lpMsg, L"Note!", MB_ICONEXCLAMATION|MB_OK); +} + + + +HIMAGELIST +InitImageList(UINT StartResource, + UINT EndResource, + UINT Width, + UINT Height) +{ + HBITMAP hBitmap; + HIMAGELIST hImageList; + UINT i; + INT Ret; + + /* Create the toolbar icon image list */ + hImageList = ImageList_Create(Width, + Height, + ILC_MASK | ILC_COLOR24, + EndResource - StartResource, + 0); + if (hImageList == NULL) + return NULL; + + /* Add all icons to the image list */ + for (i = StartResource; i <= EndResource; i++) + { + hBitmap = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + Width, + Height, + LR_LOADTRANSPARENT); + if (hBitmap == NULL) + return NULL; + + Ret = ImageList_AddMasked(hImageList, + hBitmap, + RGB(255, 0, 128)); + if (Ret == -1) + return NULL; + + DeleteObject(hBitmap); + } + + return hImageList; +} Propchange: trunk/rostests/winetests/GUI/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h (added) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,39 @@ +#ifndef __WINETESTGUI_PRECOMP_H +#define __WINETESTGUI_PRECOMP_H + +#include <stdio.h> +#include <stdlib.h> +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +extern HINSTANCE hInstance; + +typedef struct _MAIN_WND_INFO +{ + HWND hMainWnd; + HWND hBrowseDlg; + HWND hStatus; + int nCmdShow; + + HICON hSmIcon; + HICON hBgIcon; + + INT SelectedItem;/* selection number in the list view */ + BOOL bDlgOpen; + BOOL bInMenuLoop; + BOOL bIsUserAnAdmin; + + LPWSTR lpDllList; + +} MAIN_WND_INFO, *PMAIN_WND_INFO; + + +/* browsewnd.c */ +BOOL CALLBACK BrowseDlgProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); + +/* misc.c */ +VOID DisplayString(LPWSTR lpMsg); +VOID DisplayError(INT err); + +#endif /* __WINETESTGUI_PRECOMP_H */ Propchange: trunk/rostests/winetests/GUI/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/resource.h?… ============================================================================== --- trunk/rostests/winetests/GUI/resource.h (added) +++ trunk/rostests/winetests/GUI/resource.h [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,24 @@ +#define IDD_WINETESTGUI 102 +#define IDD_TESTBROWSER 103 +#define IDM_ABOUT 104 +#define IDM_EXIT 105 +#define IDI_ICON 107 +#define IDI_SMALL 108 +#define IDC_DELETE 109 +#define IDR_MAINFRAME 128 +#define IDC_LIST 1000 +#define IDC_OUTPUT 1001 +#define IDC_TESTSELECTION 1002 +#define IDC_BROWSE 1003 +#define IDC_RUN 1004 +#define IDC_PROGRESS 1005 +#define IDC_NUMRUNS 1006 +#define IDC_NUMERRORS 1007 +#define IDC_NUMFAILURES 1008 +#define IDC_STOP 1010 +#define IDC_CHECK2 1011 +#define IDC_RUNONSTART 1011 +#define IDC_STATUS 1012 +#define IDC_SELECT 1020 +#define IDC_TREEVIEW 1021 +#define IDC_STATIC -1 Propchange: trunk/rostests/winetests/GUI/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/GUI/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/rsrc.rc?rev… ============================================================================== --- trunk/rostests/winetests/GUI/rsrc.rc (added) +++ trunk/rostests/winetests/GUI/rsrc.rc [iso-8859-1] Wed Jun 18 14:10:39 2008 @@ -1,0 +1,25 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON "res/charmap.ico" + +//#include "lang/bg-BG.rc" +//#include "lang/ca-ES.rc" +//#include "lang/cs-CZ.rc" +#include "lang/en-US.rc" +//#include "lang/de-DE.rc" +//#include "lang/es-ES.rc" +//#include "lang/fr-FR.rc" +//#include "lang/id-ID.rc" +//#include "lang/it-IT.rc" +//#include "lang/ko-KO.rc" +//#include "lang/lt-LT.rc" +//#include "lang/nl-NL.rc" +//#include "lang/pl-PL.rc" +//#include "lang/pt-BR.rc" +//#include "lang/sk-SK.rc" +//#include "lang/uk-UA.rc" +//#include "lang/ru-RU.rc" +//#include "lang/el-GR.rc" Propchange: trunk/rostests/winetests/GUI/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 34015: - Add rasacd driver (not implemented)
by dchapyshev＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: dchapyshev Date: Wed Jun 18 14:00:50 2008 New Revision: 34015 URL: http://svn.reactos.org/svn/reactos?rev=34015&view=rev Log: - Add rasacd driver (not implemented) Added: trunk/reactos/drivers/network/acd/ trunk/reactos/drivers/network/acd/acd/ trunk/reactos/drivers/network/acd/acd/main.c (with props) trunk/reactos/drivers/network/acd/include/ trunk/reactos/drivers/network/acd/include/acdapi.h (with props) trunk/reactos/drivers/network/acd/rasacd.def (with props) trunk/reactos/drivers/network/acd/rasacd.rbuild (with props) trunk/reactos/drivers/network/acd/rasacd.rc (with props) Added: trunk/reactos/drivers/network/acd/acd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/acd/ma… ============================================================================== --- trunk/reactos/drivers/network/acd/acd/main.c (added) +++ trunk/reactos/drivers/network/acd/acd/main.c [iso-8859-1] Wed Jun 18 14:00:50 2008 @@ -1,0 +1,45 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS RAS Automatic Connection Driver + * FILE: acd/main.c + * PURPOSE: Driver entry point + * PROGRAMMERS: Dmitry Chapyshev(dmitry(a)reactos.org) + * REVISIONS: + * 25/05/2008 Created + */ + +#include <ndis.h> +#include <tdi.h> +#include <debug.h> + +#include "acdapi.h" + +NTSTATUS +DriverEntry(PDRIVER_OBJECT pDriverObject, + PUNICODE_STRING pRegistryPath) +{ + UNICODE_STRING DeviceName; + PDEVICE_OBJECT pDeviceObject; + NTSTATUS Status; + + RtlInitUnicodeString(&DeviceName, L"RasAcd"); + + Status = IoCreateDevice(pDriverObject, + 0, + &DeviceName, + FILE_DEVICE_RASACD, + 0, + FALSE, + &pDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() failed (Status %lx)\n", Status); + return Status; + } + + return STATUS_SUCCESS; +} + +/* EOF */ + Propchange: trunk/reactos/drivers/network/acd/acd/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/network/acd/include/acdapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/includ… ============================================================================== --- trunk/reactos/drivers/network/acd/include/acdapi.h (added) +++ trunk/reactos/drivers/network/acd/include/acdapi.h [iso-8859-1] Wed Jun 18 14:00:50 2008 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS RAS Automatic Connection Driver + * FILE: include/acdapi.h + * PURPOSE: Header file + * PROGRAMMERS: Dmitry Chapyshev(dmitry(a)reactos.org) + * REVISIONS: + * 25/05/2008 Created + */ + +#define FILE_DEVICE_RASACD 0xf1 Propchange: trunk/reactos/drivers/network/acd/include/acdapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/network/acd/rasacd.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/rasacd… ============================================================================== --- trunk/reactos/drivers/network/acd/rasacd.def (added) +++ trunk/reactos/drivers/network/acd/rasacd.def [iso-8859-1] Wed Jun 18 14:00:50 2008 @@ -1,0 +1,8 @@ +; RAS Automatic Connection Driver - ReactOS Operating System + +LIBRARY RASACD.SYS + +EXPORTS + + +; EOF Propchange: trunk/reactos/drivers/network/acd/rasacd.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/network/acd/rasacd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/rasacd… ============================================================================== --- trunk/reactos/drivers/network/acd/rasacd.rbuild (added) +++ trunk/reactos/drivers/network/acd/rasacd.rbuild [iso-8859-1] Wed Jun 18 14:00:50 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="rasacd" type="kernelmodedriver" installbase="system32/drivers" installname="rasacd.sys"> + <importlibrary definition="rasacd.def"></importlibrary> + <include base="rasacd">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="include"> + <pch>acdapi.h</pch> + </directory> + <directory name="acd"> + <file>main.c</file> + </directory> + <file>rasacd.rc</file> +</module> Propchange: trunk/reactos/drivers/network/acd/rasacd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/network/acd/rasacd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/acd/rasacd… ============================================================================== --- trunk/reactos/drivers/network/acd/rasacd.rc (added) +++ trunk/reactos/drivers/network/acd/rasacd.rc [iso-8859-1] Wed Jun 18 14:00:50 2008 @@ -1,0 +1,7 @@ +/* $Id: ndis.rc 21293 2006-03-11 23:55:37Z jimtabor $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "NDIS Library\0" +#define REACTOS_STR_INTERNAL_NAME "ndis\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ndis.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/network/acd/rasacd.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 34014: - Add "Alternate Sorts" keys (used by kernel32) - Delete static codepages values (they are added in usetup) - Add keys for powrprof/powercfg
by dchapyshev＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: dchapyshev Date: Wed Jun 18 13:58:16 2008 New Revision: 34014 URL: http://svn.reactos.org/svn/reactos?rev=34014&view=rev Log: - Add "Alternate Sorts" keys (used by kernel32) - Delete static codepages values (they are added in usetup) - Add keys for powrprof/powercfg Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Jun 18 13:58:16 2008 @@ -28,6 +28,23 @@ ;Cursors Schemes HKCU,"Control Panel\Cursors",,,"ReactOS Default" HKCU,"Control Panel\Cursors","Scheme Source",0x00010001,0x00000002 + +;PowerCfg +HKCU,"Control Panel\PowerCfg","CurrentPowerPolicy",0x00000002,"0" +HKCU,"Control Panel\PowerCfg\GlobalPowerPolicy","Policies",0x00000001,01,00,00,00,03,\ +00,00,00,03,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,\ +00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,00,\ +00,00,80,00,00,00,00,01,00,00,00,00,00,00,80,01,00,00,00,03,00,00,00,02,00,00,00,04,\ +00,00,c0,01,00,00,00,04,00,00,00,01,00,00,00,0a,00,00,00,00,00,00,00,03,00,00,00,01,\ +00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,02,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,00,00,16,\ +00,00,00 +HKCU,"Control Panel\PowerCfg\PowerPolicies\0","Name",0x00020000,"Home/Office Desk" +HKCU,"Control Panel\PowerCfg\PowerPolicies\0","Description",0x00020000,"This scheme is suited to most home or desktop computers that are left plugged in all the time." +HKCU,"Control Panel\PowerCfg\PowerPolicies\0","Policies",0x00000001,01,00,00,00,02,\ +00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,2c,\ +01,00,00,32,32,00,03,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,b0,04,00,00,2c,\ +01,00,00,00,00,00,00,58,02,00,00,01,01,64,50,64,64,00,00 ; Color schemes HKCU,"Control Panel\Current","Color Schemes",0x00020000,"ReactOS Standard" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Jun 18 13:58:16 2008 @@ -1049,6 +1049,18 @@ ;Cursors Schemes HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,"\",,,,,,,,,,,,,\"" +;PowerCfg +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","LastID",0x00000002,"0" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","DiskSpinDownMax",0x00000002,"3600" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","DiskSpinDownMin",0x00000002,"3" + +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg\GlobalPowerPolicy","Policies",0x00000001,\ +01,00,00,00,01,00,00,00,01,00,00,00,03,00,00,00 + +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg\PowerPolicies\0","Policies",0x00000001,\ +01,00,00,00,02,00,00,00,04,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,84,03,00,00,00,00,00,00,84,03,\ +00,00,32,32,00,00,02,00,00,00,04,00,00,c0,00,00,00,00,02,00,00,00,04,00,00,c0,00,00,00,00 + ; deskadp.dll shell extension HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Adapter CPL Extension","",0x00000000,"{42071712-76d4-11d1-8b24-00a0c9068ff3}" Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Jun 18 13:58:16 2008 @@ -338,8 +338,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetService" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Protocol" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetTrans" - - ; NLS Files HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls" @@ -395,9 +393,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28597",0x00000000,"c_28597.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28598",0x00000000,"c_28598.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","28599",0x00000000,"c_28599.nls" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","ACP",0x00000000,"1252" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","OEMCP",0x00000000,"437" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","MACCP",0x00000000,"10000" ; NLS Language settings HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.nls" @@ -629,6 +624,14 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language Groups","e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language Groups","f",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","00010407",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","0001040e",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","00010437",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","00020804",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","00021004",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","00021404",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale\Alternate Sorts","00030404",0x00000000,"" + ; Some installers check for SP6 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600

1 0

[fireball] 34013: - Add a bit more DPFLTR items.
by fireball＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: fireball Date: Wed Jun 18 12:56:07 2008 New Revision: 34013 URL: http://svn.reactos.org/svn/reactos?rev=34013&view=rev Log: - Add a bit more DPFLTR items. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed Jun 18 12:56:07 2008 @@ -339,6 +339,15 @@ DPFLTR_STORPORT_ID = 91, DPFLTR_STORMINIPORT_ID = 92, DPFLTR_PRINTSPOOLER_ID = 93, + DPFLTR_VDS_ID = 94, + DPFLTR_VDSBAS_ID = 95, + DPFLTR_VDSDYNDR_ID = 96, + DPFLTR_VDSUTIL_ID = 97, + DPFLTR_DFRGIFC_ID = 98, + DPFLTR_DEFAULT_ID = 99, + DPFLTR_MM_ID = 100, + DPFLTR_DFSC_ID = 101, + DPFLTR_WOW64_ID = 102, DPFLTR_ENDOFTABLE_ID } DPFLTR_TYPE;

1 0

[dchapyshev] 34012: - Small update icon
by dchapyshev＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: dchapyshev Date: Wed Jun 18 11:48:25 2008 New Revision: 34012 URL: http://svn.reactos.org/svn/reactos?rev=34012&view=rev Log: - Small update icon Modified: trunk/reactos/dll/win32/user32/resources/oic_sample.ico Modified: trunk/reactos/dll/win32/user32/resources/oic_sample.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available.

1 0

[hyperion] 34011: Cleaning up after failed development model experiment
by hyperion＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: hyperion Date: Wed Jun 18 11:15:22 2008 New Revision: 34011 URL: http://svn.reactos.org/svn/reactos?rev=34011&view=rev Log: Cleaning up after failed development model experiment Removed: branches/hyperion/

1 0

[dchapyshev] 34010: - Implement ReplaceFileA/W (not fully) - Implement DnsHostnameToComputerNameA/W (not fully) - Implement FoldStringA/W - Implement SetCPGlobal (not tested) - Implement TzSpecificLocalTimeToSystemTime - Implement ReadFileScatter - Implement WriteFileGather - Other small changes All based on Wine 1.0 implementation
by dchapyshev＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: dchapyshev Date: Wed Jun 18 10:37:44 2008 New Revision: 34010 URL: http://svn.reactos.org/svn/reactos?rev=34010&view=rev Log: - Implement ReplaceFileA/W (not fully) - Implement DnsHostnameToComputerNameA/W (not fully) - Implement FoldStringA/W - Implement SetCPGlobal (not tested) - Implement TzSpecificLocalTimeToSystemTime - Implement ReadFileScatter - Implement WriteFileGather - Other small changes All based on Wine 1.0 implementation Added: trunk/reactos/dll/win32/kernel32/misc/lang.h (with props) Modified: trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Added: trunk/reactos/dll/win32/kernel32/misc/lang.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti…

1 0

[fireball] 34009: - Rename made-up Ob functions names to match publicly available NT names, as most of other Ob names do.
by fireball＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: fireball Date: Wed Jun 18 07:28:29 2008 New Revision: 34009 URL: http://svn.reactos.org/svn/reactos?rev=34009&view=rev Log: - Rename made-up Ob functions names to match publicly available NT names, as most of other Ob names do. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -66,7 +66,7 @@ // We can call the Ob Inlined API, it's the same thing // #define IopAllocateMdlFromLookaside \ - ObpAllocateCapturedAttributes + ObpAllocateObjectCreateInfoBuffer #define IopFreeMdlFromLookaside \ ObpFreeCapturedAttributes Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -562,7 +562,7 @@ NTSTATUS NTAPI -ObpCaptureObjectAttributes( +ObpCaptureObjectCreateInformation( IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, IN BOOLEAN AllocateFromLookaside, Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -79,7 +79,7 @@ POBJECT_HEADER_NAME_INFO FORCEINLINE -ObpAcquireNameInformation(IN POBJECT_HEADER ObjectHeader) +ObpReferenceNameInfo(IN POBJECT_HEADER ObjectHeader) { POBJECT_HEADER_NAME_INFO ObjectNameInfo; ULONG NewValue, References; @@ -120,7 +120,7 @@ VOID FORCEINLINE -ObpReleaseNameInformation(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo) +ObpDereferenceNameInfo(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo) { POBJECT_DIRECTORY Directory; @@ -198,7 +198,7 @@ VOID FORCEINLINE -ObpInitializeDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context) +ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context) { /* Initialize a null context */ Context->Object = NULL; @@ -222,7 +222,7 @@ HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); /* release the name information */ - ObpReleaseNameInformation(HeaderNameInfo); + ObpDereferenceNameInfo(HeaderNameInfo); /* Dereference the object */ ObDereferenceObject(Context->Object); @@ -232,7 +232,7 @@ VOID FORCEINLINE -ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context) +ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context) { /* Check if we came back with the directory locked */ if (Context->DirectoryLocked) @@ -273,7 +273,7 @@ VOID FORCEINLINE -ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +ObpReleaseObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) { /* Check if we have a security descriptor */ if (ObjectCreateInfo->SecurityDescriptor) @@ -288,7 +288,7 @@ PVOID FORCEINLINE -ObpAllocateCapturedAttributes(IN PP_NPAGED_LOOKASIDE_NUMBER Type) +ObpAllocateObjectCreateInfoBuffer(IN PP_NPAGED_LOOKASIDE_NUMBER Type) { PVOID Buffer; PNPAGED_LOOKASIDE_LIST List; @@ -369,10 +369,10 @@ VOID FORCEINLINE -ObpFreeAndReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) +ObpFreeObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) { /* First release the attributes, then free them from the lookaside list */ - ObpReleaseCapturedAttributes(ObjectCreateInfo); + ObpReleaseObjectCreateInformation(ObjectCreateInfo); ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList); } Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -262,7 +262,7 @@ { /* Get the object name information */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); - ObpAcquireNameInformation(ObjectHeader); + ObpReferenceNameInfo(ObjectHeader); /* Reference the object being looked up */ ObReferenceObject(FoundObject); @@ -281,7 +281,7 @@ /* We already did a lookup, so remove this object's query reference */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - ObpReleaseNameInformation(HeaderNameInfo); + ObpDereferenceNameInfo(HeaderNameInfo); /* Also dereference the object itself */ ObDereferenceObject(Context->Object); @@ -480,7 +480,7 @@ PAGED_CODE(); /* Initialize lookup */ - ObpInitializeDirectoryLookup(&LookupContext); + ObpInitializeLookupContext(&LookupContext); /* Check if we need to do any probing */ if (PreviousMode != KernelMode) Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -1467,7 +1467,7 @@ if ((Type) && (ObjectType != Type)) { /* They don't, cleanup */ - if (Context) ObpCleanupDirectoryLookup(Context); + if (Context) ObpReleaseLookupContext(Context); return STATUS_OBJECT_TYPE_MISMATCH; } @@ -1508,7 +1508,7 @@ * We failed (meaning security failure, according to NT Internals) * detach and return */ - if (Context) ObpCleanupDirectoryLookup(Context); + if (Context) ObpReleaseLookupContext(Context); if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return Status; } @@ -1545,7 +1545,7 @@ } /* Now we can release the object */ - if (Context) ObpCleanupDirectoryLookup(Context); + if (Context) ObpReleaseLookupContext(Context); /* Save the access mask */ NewEntry.GrantedAccess = GrantedAccess; @@ -2417,11 +2417,11 @@ if (!TempBuffer) return STATUS_INSUFFICIENT_RESOURCES; /* Capture all the info */ - Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, - TRUE, - &TempBuffer->ObjectCreateInfo, - &ObjectName); + Status = ObpCaptureObjectCreateInformation(ObjectAttributes, + AccessMode, + TRUE, + &TempBuffer->ObjectCreateInfo, + &ObjectName); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -2467,7 +2467,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(&TempBuffer->LookupContext); + ObpReleaseLookupContext(&TempBuffer->LookupContext); goto Cleanup; } @@ -2482,7 +2482,7 @@ if (ObjectHeader->ObjectCreateInfo) { /* Free it */ - ObpFreeAndReleaseCapturedAttributes(ObjectHeader-> + ObpFreeObjectCreateInformation(ObjectHeader-> ObjectCreateInfo); ObjectHeader->ObjectCreateInfo = NULL; } @@ -2501,7 +2501,7 @@ Status = STATUS_INVALID_PARAMETER; /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(&TempBuffer->LookupContext); + ObpReleaseLookupContext(&TempBuffer->LookupContext); /* Dereference the object */ ObDereferenceObject(Object); @@ -2531,7 +2531,7 @@ Quickie: /* Release the object attributes and temporary buffer */ - ObpReleaseCapturedAttributes(&TempBuffer->ObjectCreateInfo); + ObpReleaseObjectCreateInformation(&TempBuffer->ObjectCreateInfo); if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); ExFreePool(TempBuffer); @@ -2813,7 +2813,7 @@ /* Get the create and name info, as well as the object type */ ObjectCreateInfo = ObjectHeader->ObjectCreateInfo; - ObjectNameInfo = ObpAcquireNameInformation(ObjectHeader); + ObjectNameInfo = ObpReferenceNameInfo(ObjectHeader); ObjectType = ObjectHeader->Type; ObjectName = NULL; @@ -2849,10 +2849,10 @@ Handle); /* Free the create information */ - ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + ObpFreeObjectCreateInformation(ObjectCreateInfo); /* Release the object name information */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); /* Remove the extra keep-alive reference */ ObDereferenceObject(Object); @@ -2878,7 +2878,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); ObDereferenceObject(Object); return Status; } @@ -2892,13 +2892,13 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); ObDereferenceObject(Object); return Status; } /* Setup a lookup context */ - ObpInitializeDirectoryLookup(&Context); + ObpInitializeLookupContext(&Context); InsertObject = Object; OpenReason = ObCreateHandle; @@ -2959,10 +2959,10 @@ if (!NT_SUCCESS(Status)) { /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); /* Remove query reference that we added */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); /* Dereference the object and delete the access state */ ObDereferenceObject(Object); @@ -3038,10 +3038,10 @@ } /* Cleanup the lookup */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); /* Remove query reference that we added */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); /* Dereference the object and delete the access state */ ObDereferenceObject(Object); @@ -3086,7 +3086,7 @@ } /* Remove a query reference */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); /* Remove the extra keep-alive reference */ ObDereferenceObject(Object); @@ -3109,7 +3109,7 @@ } /* We can delete the Create Info now */ - ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + ObpFreeObjectCreateInformation(ObjectCreateInfo); /* Check if we created our own access state and delete it if so */ if (AccessState == &LocalAccessState) SeDeleteAccessState(AccessState); Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -298,7 +298,7 @@ if (!NT_SUCCESS(Status)) return FALSE; /* Initialize lookup context */ - ObpInitializeDirectoryLookup(&Context); + ObpInitializeLookupContext(&Context); /* Lock it */ ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context); @@ -339,7 +339,7 @@ } /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); /* Initialize DOS Devices Directory and related Symbolic Links */ Status = ObpCreateDosDevicesDirectory(); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -80,7 +80,7 @@ if (Header->ObjectCreateInfo) { /* Free it */ - ObpFreeAndReleaseCapturedAttributes(Header->ObjectCreateInfo); + ObpFreeObjectCreateInformation(Header->ObjectCreateInfo); Header->ObjectCreateInfo = NULL; } } @@ -311,7 +311,7 @@ { /* Allocate from the lookaside */ //MaximumLength = 248; <= hack, we should actually set this...! - Buffer = ObpAllocateCapturedAttributes(LookasideNameBufferList); + Buffer = ObpAllocateObjectCreateInfoBuffer(LookasideNameBufferList); } /* Setup the string */ @@ -418,7 +418,7 @@ NTSTATUS NTAPI -ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, +ObpCaptureObjectCreateInformation(IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, IN BOOLEAN AllocateFromLookaside, IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, @@ -541,7 +541,7 @@ } /* Cleanup if we failed */ - if (!NT_SUCCESS(Status)) ObpReleaseCapturedAttributes(ObjectCreateInfo); + if (!NT_SUCCESS(Status)) ObpFreeObjectCreateInformation(ObjectCreateInfo); /* Return status to caller */ return Status; @@ -916,15 +916,15 @@ POBJECT_HEADER Header; /* Allocate a capture buffer */ - ObjectCreateInfo = ObpAllocateCapturedAttributes(LookasideCreateInfoList); + ObjectCreateInfo = ObpAllocateObjectCreateInfoBuffer(LookasideCreateInfoList); if (!ObjectCreateInfo) return STATUS_INSUFFICIENT_RESOURCES; /* Capture all the info */ - Status = ObpCaptureObjectAttributes(ObjectAttributes, - ProbeMode, - FALSE, - ObjectCreateInfo, - &ObjectName); + Status = ObpCaptureObjectCreateInformation(ObjectAttributes, + ProbeMode, + FALSE, + ObjectCreateInfo, + &ObjectName); if (NT_SUCCESS(Status)) { /* Validate attributes */ @@ -984,7 +984,7 @@ } /* Release the Capture Info, we don't need it */ - ObpReleaseCapturedAttributes(ObjectCreateInfo); + ObpFreeObjectCreateInformation(ObjectCreateInfo); if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); } @@ -1038,7 +1038,7 @@ } /* Setup a lookup context */ - ObpInitializeDirectoryLookup(&Context); + ObpInitializeLookupContext(&Context); /* Check if we've already created the directory of types */ if (ObpTypeDirectoryObject) @@ -1054,7 +1054,7 @@ &Context)) { /* We have already created it, so fail */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); return STATUS_OBJECT_NAME_COLLISION; } } @@ -1066,7 +1066,7 @@ if (!ObjectName.Buffer) { /* Out of memory, fail */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1084,7 +1084,7 @@ if (!NT_SUCCESS(Status)) { /* Free the name and fail */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); ExFreePool(ObjectName.Buffer); return Status; } @@ -1224,7 +1224,7 @@ } /* Cleanup the lookup context */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); /* Return the object type and success */ *ObjectType = LocalObjectType; @@ -1232,7 +1232,7 @@ } /* If we got here, then we failed */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -179,7 +179,7 @@ /* Get object structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - ObjectNameInfo = ObpAcquireNameInformation(ObjectHeader); + ObjectNameInfo = ObpReferenceNameInfo(ObjectHeader); ObjectType = ObjectHeader->Type; /* @@ -193,7 +193,7 @@ !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) { /* Setup a lookup context */ - ObpInitializeDirectoryLookup(&Context); + ObpInitializeLookupContext(&Context); /* Lock the directory */ ObpAcquireDirectoryLockExclusive(ObjectNameInfo->Directory, &Context); @@ -242,16 +242,16 @@ } /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); /* Remove another query reference since we added one on top */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); /* Check if we were inserted in a directory */ if (Directory) { /* We were, so first remove the extra reference we had added */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); /* Now dereference the object as well */ ObDereferenceObject(Object); @@ -260,7 +260,7 @@ else { /* Remove the reference we added */ - ObpReleaseNameInformation(ObjectNameInfo); + ObpDereferenceNameInfo(ObjectNameInfo); } } @@ -300,7 +300,7 @@ InsertObject); /* Initialize starting state */ - ObpInitializeDirectoryLookup(LookupContext); + ObpInitializeLookupContext(LookupContext); *FoundObject = NULL; Status = STATUS_SUCCESS; Object = NULL; @@ -755,7 +755,7 @@ InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); /* Cleanup from the first lookup */ - ObpCleanupDirectoryLookup(LookupContext); + ObpReleaseLookupContext(LookupContext); /* Check if we have a referenced directory */ if (ReferencedDirectory) @@ -931,7 +931,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(LookupContext); + ObpReleaseLookupContext(LookupContext); } /* Check if we have a device map and dereference it if so */ Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] Wed Jun 18 07:28:29 2008 @@ -429,7 +429,7 @@ &Object); /* Cleanup after lookup */ - ObpCleanupDirectoryLookup(&Context); + ObpReleaseLookupContext(&Context); /* Check if the lookup succeeded */ if (NT_SUCCESS(Status))

1 0

[fireball] 34008: - More fixes to pushlock implementation: * In ExTimedWaitForUnblockPushLock, check only for STATUS_SUCCESS (which is the only status return when the wait was satisfied, while other like STATUS_TIMEOUT would still be considered a success). * In ExBlockPushlock, fix a typo when trying out an interlocked exchange with a new value - wrong value was assigned. * In ExfAcquirePushLockShared, assign PushLock value passed to this function, not the NewValue, like it's done in ExfAcquireP
by fireball＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: fireball Date: Wed Jun 18 06:34:10 2008 New Revision: 34008 URL: http://svn.reactos.org/svn/reactos?rev=34008&view=rev Log: - More fixes to pushlock implementation: * In ExTimedWaitForUnblockPushLock, check only for STATUS_SUCCESS (which is the only status return when the wait was satisfied, while other like STATUS_TIMEOUT would still be considered a success). * In ExBlockPushlock, fix a typo when trying out an interlocked exchange with a new value - wrong value was assigned. * In ExfAcquirePushLockShared, assign PushLock value passed to this function, not the NewValue, like it's done in ExfAcquirePushLockExclusive. * In ExfReleaseReleasePushLockExclusive, fix a typo which led to incorrect behavior and not waking up the pushlock when it should be. Modified: trunk/reactos/ntoskrnl/ex/pushlock.c Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Wed Jun 18 06:34:10 2008 @@ -343,9 +343,10 @@ KernelMode, FALSE, Timeout); - if (!NT_SUCCESS(Status)) - { - /* Try unblocking the pushlock */ + /* Check if the wait was satisfied */ + if (Status != STATUS_SUCCESS) + { + /* Try unblocking the pushlock if it was not */ ExfUnblockPushLock(PushLock, WaitBlock); } } @@ -432,7 +433,7 @@ if (OldValue.Ptr == NewValue.Ptr) break; /* Try again with the new value */ - NewValue = OldValue; + OldValue = NewValue; } } @@ -657,7 +658,7 @@ if (NewValue.Value != OldValue.Value) { /* Retry */ - OldValue = NewValue; + OldValue = *PushLock; continue; } @@ -721,7 +722,7 @@ if (NewValue.Ptr != OldValue.Ptr) { /* Retry */ - OldValue = NewValue; + OldValue = *PushLock; continue; } @@ -1088,7 +1089,7 @@ OldValue.Ptr); /* Check if the value changed behind our back */ - if (NewValue.Value != OldValue.Value) + if (NewValue.Value == OldValue.Value) { /* Wake the Pushlock */ ExfWakePushLock(PushLock, WakeValue);

1 0

[mkupfer] 34007: - several german translation fixes - missing file of issue #3365 added (see rev. 35004)
by mkupfer＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: mkupfer Date: Wed Jun 18 06:19:07 2008 New Revision: 34007 URL: http://svn.reactos.org/svn/reactos?rev=34007&view=rev Log: - several german translation fixes - missing file of issue #3365 added (see rev. 35004) Added: trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc (with props) Modified: trunk/reactos/base/system/expand/lang/de-DE.rc trunk/reactos/base/system/format/lang/de-DE.rc trunk/reactos/base/system/winlogon/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/base/system/expand/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/de… ============================================================================== --- trunk/reactos/base/system/expand/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/expand/lang/de-DE.rc [iso-8859-1] Wed Jun 18 06:19:07 2008 @@ -10,7 +10,7 @@ IDS_Copy, "ReactOS Dateiexpansionsprogramm Version 1.0\n\ Copyright Victor Schneider 1997\n\n\ -Verwendung: %s infile [outfile]\n" +Verwendung: %s Eingabedatei [Ausgabedatei]\n" IDS_FAILS "LZCopy fehlgeschlagen: Rückgabe ist %ld\n" END Modified: trunk/reactos/base/system/format/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de… ============================================================================== --- trunk/reactos/base/system/format/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/de-DE.rc [iso-8859-1] Wed Jun 18 06:19:07 2008 @@ -12,19 +12,19 @@ -STRING_HELP, "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ +STRING_HELP, "Syntax: %S Datenträger: [-FS:Dateisystem] [-V:Label] [-Q] [-A:Größe] [-C]\n\n\ [Datenträger:] Legt das zu formatierende Laufwerk fest.\n\ - -FS:file-system Legt das Dateisystem fest (%s).\n\ - -V:label Legt den Datenträgernamen fest.\n\ + -FS:Dateisystem Legt das Dateisystem fest (%s).\n\ + -V:Label Legt den Datenträgernamen fest.\n\ -Q Führt eine Schnellformatierung durch.\n\ - -A:size Überschreibt Anweisung für Standardblockgrösse. Es wird dringend\n\ + -A:Größe Überschreibt Anweisung für Standardblockgröße. Es wird dringend\n\ empfohlen, grundsätzlich Standardeinstellungen zu verwenden!\n\ NTFS unterstützt 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT unterstützt 8192, 16K, 32K, 64K, 128K, 256K.\n\ NTFS-Kompression wird für Blockgrössen über 4096 nicht\n\ unterstützt.\n\ -C Auf dem neuen Datenträger erstellte Dateien werden\n\ - standardmässig komprimiert.\n\n" + standardmäßig komprimiert.\n\n" STRING_COMPLETE "%lu Prozent komplett.\r" @@ -48,9 +48,9 @@ STRING_FILESYSTEM "Der Typ des Dateisystems ist %S.\n" -STRING_LABEL_NAME_EDIT "Geben Sie die aktuelle Volumebezeichnung für Datenträger %C: ein" +STRING_LABEL_NAME_EDIT "Geben Sie die aktuelle Datenträgerbezeichnung für Datenträger %C: ein" -STRING_ERROR_LABEL "Eine unzulässige Volumebezeichnung wurde für diesen Datenträger eingegeben.\n" +STRING_ERROR_LABEL "Eine unzulässige Datenträgerbezeichnung wurde für diesen Datenträger eingegeben.\n" STRING_YN_FORMAT "\nACHTUNG, beim Formatieren werden ALLE Daten auf dem Datenträger %C: gelöscht!\nMit Formatierung fortfahren? (Ja/Nein)? " @@ -66,11 +66,11 @@ STRING_VOL_COMPRESS "Medium unterstützt keine Kompression.\n" -STRING_ENTER_LABEL "Volumebezeichnung (11 Zeichen, Enter für keine)? " +STRING_ENTER_LABEL "Datenträgerbezeichnung (11 Zeichen, Enter für keine)? " STRING_NO_LABEL "Konnte Datenträger nicht benennen" STRING_FREE_SPACE "\n%I64d bytes Speicherkapazität.\n%I64d bytes freier Speicher.\n" -STRING_SERIAL_NUMBER "\nVolume Seriennummer ist %04X-%04X\n" +STRING_SERIAL_NUMBER "\nDatenträger Seriennummer ist %04X-%04X\n" END Modified: trunk/reactos/base/system/winlogon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/de-DE.rc [iso-8859-1] Wed Jun 18 06:19:07 2008 @@ -27,10 +27,10 @@ IDS_PREPARENETWORKCONNECTIONS "Netzwerkverbindungen vorbereiten..." IDS_APPLYINGCOMPUTERSETTINGS "Computereinstellungen laden..." IDS_RUNNINGSTARTUPSCRIPTS "Startskripte ausführen..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Skripte um den Computer herunterzufahren ausführen..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Skripte zum Herunterfahren ausführen..." IDS_APPLYINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen setzen..." - IDS_RUNNINGLOGOFFSCRIPTS "Skripte um abzumelden ausführen..." - IDS_RUNNINGLOGONSCRIPTS "Skripte um anzumelden ausführen..." + IDS_RUNNINGLOGOFFSCRIPTS "Abmeldeskripte ausführen..." + IDS_RUNNINGLOGONSCRIPTS "Anmeldeskripte ausführen..." IDS_LOADINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen laden..." IDS_CLOSINGNETWORKCONNECTIONS "Netzwerkverbindungen schliessen..." IDS_REACTOSISSHUTTINGDOWN "ReactOS fährt herunter..." Added: trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/lt-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc [iso-8859-1] Wed Jun 18 06:19:07 2008 @@ -1,0 +1,21 @@ +/* + * Translation by Vytis Girdþijauskas, CMan (cman(a)cman.us) + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "ReactOS paveikslëliø ir faksogramø perþiûros programa" + IDS_SETASDESKBG "Nustatyti kaip darbalaukio fonà" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Tolesnis paveikslëlis" + IDS_TOOLTIP_PREV_PIC "Ankstesnis paveikslëlis" + IDS_TOOLTIP_ZOOM_IN "Didinti (+)" + IDS_TOOLTIP_ZOOM_OUT "Maþinti (-)" + IDS_TOOLTIP_ROT_CLOCKW "Pasukti pagal laikrodþio rodyklæ (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Pasukti prieð laikrodþio rodyklæ (Ctrl+L)" + IDS_TOOLTIP_PRINT "Spausdinti (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Áraðyti kaip... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Wed Jun 18 06:19:07 2008 @@ -190,7 +190,7 @@ STRINGTABLE BEGIN - IDS_CMT_DOWNLOADER "Downloaden und installeren verschiedener Anwendungen" + IDS_CMT_DOWNLOADER "Downloaden und installieren verschiedener Anwendungen" END STRINGTABLE

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008