Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[tkreuzer] 29310: reorder libs in rbuild file, reducing the number of unresolved references to 4

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 30 17:48:53 2007 New Revision: 29310 URL: http://svn.reactos.org/svn/reactos?rev=29310&view=rev Log: reorder libs in rbuild file, reducing the number of unresolved references to 4 Modified: trunk/rosapps/smartpdf/smartpdf.rbuild Modified: trunk/rosapps/smartpdf/smartpdf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/smartpdf.rbuild?r… ============================================================================== --- trunk/rosapps/smartpdf/smartpdf.rbuild (original) +++ trunk/rosapps/smartpdf/smartpdf.rbuild Sun Sep 30 17:48:53 2007 @@ -1,4 +1,4 @@ -<module name="smartpdf" type="win32cui" installbase="system32" installname="smartpdf.exe" allowwarnings="true" stdlib="host"> +<module name="smartpdf" type="win32gui" installbase="system32" installname="smartpdf.exe" allowwarnings="true" stdlib="host"> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> @@ -9,11 +9,11 @@ <library>shell32</library> <library>user32</library> <library>winspool</library> + <library>fitz</library> + <library>poppler</library> + <library>freetype</library> <library>libjpeg</library> <library>zlib</library> - <library>freetype</library> - <library>fitz</library> - <library>poppler</library> <define name="__USE_W32API" /> <define name="WIN32" /> <define name="_WIN32" />

17 years, 2 months

[gbrunmar] 29309: Changes to regedit: * Fixed updating tree view when renaming a key * Fixed a tree view refresh bug * Proper updating of the tree view when deleting keys

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Sep 30 17:31:44 2007 New Revision: 29309 URL: http://svn.reactos.org/svn/reactos?rev=29309&view=rev Log: Changes to regedit: * Fixed updating tree view when renaming a key * Fixed a tree view refresh bug * Proper updating of the tree view when deleting keys Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sun Sep 30 17:31:44 2007 @@ -522,7 +522,7 @@ HKEY hRootKey; HKEY hKey = NULL; LPNMTVDISPINFO ptvdi; - LONG lResult = ERROR_SUCCESS; + LONG lResult = TRUE; TCHAR szBuffer[MAX_PATH]; ptvdi = (LPNMTVDISPINFO) lParam; @@ -533,13 +533,14 @@ keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); if (RegOpenKeyEx(hRootKey, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - lResult = REG_OPENED_EXISTING_KEY; + lResult = FALSE; RegCloseKey(hKey); (void)TreeView_EditLabel(pChildWnd->hTreeWnd, ptvdi->item.hItem); } else { - lResult = RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText); + if (RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText) != ERROR_SUCCESS) + lResult = FALSE; } return lResult; } Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Sun Sep 30 17:31:44 2007 @@ -949,7 +949,10 @@ MessageBeep(MB_ICONHAND); } else if (DeleteKey(hWnd, hKeyRoot, keyPath)) + { DeleteNode(g_pChildWnd->hTreeWnd, 0); + RefreshTreeView(g_pChildWnd->hTreeWnd); + } } break; case ID_EDIT_NEW_STRINGVALUE: Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c (original) +++ trunk/reactos/base/applications/regedit/treeview.c Sun Sep 30 17:31:44 2007 @@ -218,7 +218,17 @@ pszNodes[dwActualSize] = '\0'; } - /* Now go through all the children in the registry, and check if any have to be added. */ + /* Now go through all the children in the tree, and check if any have to be removed. */ + childItem = TreeView_GetChild(hwndTV, hItem); + while (childItem) { + HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); + if (RefreshTreeItem(hwndTV, childItem) == FALSE) { + (void)TreeView_DeleteItem(hwndTV, childItem); + } + childItem = nextItem; + } + + /* Now go through all the children in the registry, and check if any have to be added. */ bAddedAny = FALSE; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; @@ -258,15 +268,6 @@ if (bAddedAny) SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM) hItem); - /* Now go through all the children in the tree, and check if any have to be removed. */ - childItem = TreeView_GetChild(hwndTV, hItem); - while (childItem) { - HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); - if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - (void)TreeView_DeleteItem(hwndTV, childItem); - } - childItem = nextItem; - } bSuccess = TRUE; done:

17 years, 2 months

[gbrunmar] 29308: * Unicode fixes to regedit * Fixed bug 2494 Patch by Carlo Bramix [carlo (dot) bramix (at) libero (dot) it]. See issue #2494 for more details.

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Sep 30 17:23:31 2007 New Revision: 29308 URL: http://svn.reactos.org/svn/reactos?rev=29308&view=rev Log: * Unicode fixes to regedit * Fixed bug 2494 Patch by Carlo Bramix [carlo (dot) bramix (at) libero (dot) it]. See issue #2494 for more details. Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sun Sep 30 17:23:31 2007 @@ -202,7 +202,7 @@ iSuggestionsLength--; /* Are we a root key in HKEY_CLASSES_ROOT? */ - if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, '\\')) + if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, TEXT('\\'))) { do { Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Sun Sep 30 17:23:31 2007 @@ -150,7 +150,7 @@ /* load appropriate string*/ LPTSTR lpsz = str; /* first newline terminates actual string*/ - lpsz = _tcschr(lpsz, '\n'); + lpsz = _tcschr(lpsz, _T('\n')); if (lpsz != NULL) *lpsz = '\0'; } @@ -877,7 +877,7 @@ if (lRet != ERROR_SUCCESS) hKey = 0; } - switch (LOWORD(wParam)) { + switch (LOWORD(wParam)) { case ID_EDIT_MODIFY: if (valueName && ModifyValue(hWnd, hKey, valueName, FALSE)) RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); @@ -887,13 +887,23 @@ RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); break; case ID_EDIT_RENAME: - if(ListView_GetSelectedCount(g_pChildWnd->hListWnd) == 1) - { - item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); - if(item > -1) - { - (void)ListView_EditLabel(g_pChildWnd->hListWnd, item); - } + if (GetFocus() == g_pChildWnd->hListWnd) + { + if(ListView_GetSelectedCount(g_pChildWnd->hListWnd) == 1) + { + item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); + if(item > -1) + { + (void)ListView_EditLabel(g_pChildWnd->hListWnd, item); + } + } + } + if (GetFocus() == g_pChildWnd->hTreeWnd) + { + /* Get focused entry of treeview (if any) */ + HTREEITEM hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + if (hItem != NULL) + (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, hItem); } break; case ID_EDIT_DELETE: Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sun Sep 30 17:23:31 2007 @@ -1735,7 +1735,7 @@ /* Go up and find the next sibling key */ do { - s = _tcsrchr(lpSubKey, '\\'); + s = _tcsrchr(lpSubKey, TEXT('\\')); if (s) { *s = '\0'; @@ -1832,7 +1832,7 @@ if (lResult != ERROR_SUCCESS) return lResult; - s = _tcsrchr(lpSubKey, '\\'); + s = _tcsrchr(lpSubKey, TEXT('\\')); s = s ? s + 1 : lpSubKey; } while(!(dwSearchFlags & RSF_LOOKATKEYS) || !RegSearchCompare(s, pszSearchString, dwSearchFlags)); @@ -1871,3 +1871,4 @@ } + Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c (original) +++ trunk/reactos/base/applications/regedit/treeview.c Sun Sep 30 17:23:31 2007 @@ -602,7 +602,7 @@ while(keyPath[0]) { - s = _tcschr(keyPath, '\\'); + s = _tcschr(keyPath, TEXT('\\')); lstrcpyn(szPathPart, keyPath, s ? s - keyPath + 1 : _tcslen(keyPath) + 1); /* Special case for root to expand root key abbreviations */ @@ -656,3 +656,4 @@ return TRUE; } +

17 years, 2 months

[hpoussin] 29307: Reference file handle according to previous mode

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Sep 30 17:11:36 2007 New Revision: 29307 URL: http://svn.reactos.org/svn/reactos?rev=29307&view=rev Log: Reference file handle according to previous mode Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sun Sep 30 17:11:36 2007 @@ -2421,7 +2421,7 @@ Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, - UserMode, + ExGetPreviousMode(), (PVOID*)(PVOID)&FileObject, NULL); if (!NT_SUCCESS(Status))

17 years, 2 months

[greatlrd] 29306: Adding a text file call notes.txt it is some werid thing I have have not yet figout how it works. Add testcase for AddFontResourceA

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Sep 30 15:57:37 2007 New Revision: 29306 URL: http://svn.reactos.org/svn/reactos?rev=29306&view=rev Log: Adding a text file call notes.txt it is some werid thing I have have not yet figout how it works. Add testcase for AddFontResourceA Added: trunk/rostests/apitests/gdi32api/Notes.txt (with props) trunk/rostests/apitests/gdi32api/tests/AddFontResource.c (with props) trunk/rostests/apitests/testdata/ trunk/rostests/apitests/testdata/ReadMe.txt (with props) trunk/rostests/apitests/testdata/test.otf (with props) trunk/rostests/apitests/testdata/test.sfd (with props) trunk/rostests/apitests/testdata/test.ttf (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/apitests/gdi32api/Notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/Notes.t… Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… Added: trunk/rostests/apitests/gdi32api/tests/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/A… Added: trunk/rostests/apitests/testdata/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/ReadMe.… Added: trunk/rostests/apitests/testdata/test.otf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.ot… Added: trunk/rostests/apitests/testdata/test.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.sf… Added: trunk/rostests/apitests/testdata/test.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.tt… Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt…

17 years, 2 months

[dreimer] 29305: Part II of Piere Schweitzer's Patch: - Added French translation. - Added the possibility to choose MingW directory. - Added support for WinXP style. - Added the support of C99. - Fixed warnings. Small Modification by me: added -s and went from -O3 to -O2 in Makefile.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Sep 30 13:29:25 2007 New Revision: 29305 URL: http://svn.reactos.org/svn/reactos?rev=29305&view=rev Log: Part II of Piere Schweitzer's Patch: - Added French translation. - Added the possibility to choose MingW directory. - Added support for WinXP style. - Added the support of C99. - Fixed warnings. Small Modification by me: added -s and went from -O3 to -O2 in Makefile. Added: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/makefile trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/options.rc trunk/tools/RosBE-Windows/Tools/config/resources.h trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sun Sep 30 13:29:25 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 175 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" @@ -15,6 +15,8 @@ CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP - PUSHBUTTON "Speichern", ID_OK, 63, 138, 59, 26, WS_TABSTOP - PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 138, 59, 26, WS_TABSTOP + EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP + PUSHBUTTON "Speichern", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP } Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sun Sep 30 13:29:25 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 175 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Settings" FONT 8, "MS Shell Dlg" @@ -15,6 +15,8 @@ CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP - PUSHBUTTON "Save", ID_OK, 63, 138, 59, 26, WS_TABSTOP - PUSHBUTTON "Cancel", ID_CANCEL, 133, 138, 59, 26, WS_TABSTOP + EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP + PUSHBUTTON "Save", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Cancel", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP } Added: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (added) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Sep 30 13:29:25 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paramètre du RosBE" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Paramètres de l'Environnement de Compilation de ReactOS", 0x0, 10, 10, 140, 13 + LTEXT "Couleur d'arrière plan", 0x0, 10, 35, 60, 12 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Couleur de la police", 0x0, 10, 60, 60, 12 + COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 + EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP + EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP + PUSHBUTTON "Sauvegarder", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Annuler", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP +} Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Sun Sep 30 13:29:25 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 175 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè RosBE" FONT 8, "MS Shell Dlg" @@ -15,6 +15,8 @@ CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 138, 59, 26, WS_TABSTOP - PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 138, 59, 26, WS_TABSTOP + EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 155, 59, 26, WS_TABSTOP + PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP } Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/config/makefile Sun Sep 30 13:29:25 2007 @@ -5,8 +5,8 @@ all: $(TARGET) CPP=mingw32-gcc -CFLAGS := -DWIN32 -DUNICODE -O3 -LFLAGS := -mwindows +CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99 +LFLAGS := -mwindows -s LIBS := SRCS := options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Sep 30 13:29:25 2007 @@ -2,6 +2,7 @@ * RosBE Options Dialog (options.c) * * Copyright 2007 by Maarten Bosma + * Pierre Schweitzer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +22,10 @@ #include <windows.h> #include <stdio.h> #include <shlobj.h> +#include <wchar.h> #include "resources.h" + +#define MINGWVERSION L"\\4.1.3" // note: do not change the order - theses are the color under winxp they might differ in another OSes WCHAR *Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", @@ -31,18 +35,19 @@ HINSTANCE hInstance; -int +VOID WriteSettings(HWND hwnd) { int foreground, background; BOOL showtime, writelog; - WCHAR logpath[MAX_PATH]; + WCHAR logpath[MAX_PATH], mingwpath[MAX_PATH]; showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); FILE *pFile = fopen("options.cmd", "w"); @@ -51,6 +56,7 @@ fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime); fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog); fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath); + fprintf(pFile, "set ROSBE_MINGWPATH=%S\n", mingwpath); fclose(pFile); } @@ -58,7 +64,7 @@ INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - int i = 0; + WCHAR defaultmingwpath[MAX_PATH]; static HICON hIcon; switch (Msg) @@ -74,13 +80,16 @@ if(hIcon) SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - for(i = 0; i < sizeof(Colors) / sizeof(char *); i++) + for(unsigned int i = 0; i < sizeof(Colors) / sizeof(char *); i++) { SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); } SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0xA, 0); SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0, 0); + GetCurrentDirectory(MAX_PATH, defaultmingwpath); + wcscat(defaultmingwpath, MINGWVERSION); + SetDlgItemText(Dlg, ID_MGWDIR, defaultmingwpath); EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE); EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE); return TRUE; @@ -100,12 +109,34 @@ else if (wParam == ID_BROWSE) { WCHAR Path[MAX_PATH]; - BROWSEINFO PathInfo = { 0 }; + BROWSEINFO PathInfo; + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); PathInfo.hwndOwner = Dlg; PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); if (pidl && SHGetPathFromIDList(pidl, Path)) SetDlgItemText(Dlg, ID_LOGDIR, Path); + } + else if (wParam == ID_BROWSEMGW) + { + WCHAR MGWPath[MAX_PATH]; + BROWSEINFO PathInfo; + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); +/* Fails with IShellFolder interface */ +#if 0 + LPSHELLFOLDER psf = NULL; + HRESULT hr; + hr = SHGetDesktopFolder(&psf); + LPITEMIDLIST pidlRoot; + hr = psf->ParseDisplayName(NULL, NULL, defaultmingwpath, NULL, &pidlRoot, NULL); + psf->Release(); + PathInfo.pidlRoot = pidlRoot; +#endif + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose the directory where MingW is located:"; + LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); + if (pidl && SHGetPathFromIDList(pidl, MGWPath)) + SetDlgItemText(Dlg, ID_MGWDIR, MGWPath); } else if (wParam == ID_SAVELOGS) { Added: trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest (added) +++ trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest Sun Sep 30 13:29:25 2007 @@ -1,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + name="ReactOS.options" + processorArchitecture="x86" + version="1.1.0.0" + type="win32"/> +<description>Config Tool</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Modified: trunk/tools/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.rc Sun Sep 30 13:29:25 2007 @@ -3,9 +3,11 @@ ID_OPTICON ICON "reactos.ico" +1 24 "options.exe.Manifest" + VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,0 - PRODUCTVERSION 1,0,0,0 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -20,14 +22,14 @@ BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Marteen Bosma / Daniel Reimer\0" + VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0" VALUE "FileDescription", "Config Tool for RosBE\0" - VALUE "FileVersion", "1.0.0.0\0" + VALUE "FileVersion", "1.1.0.0\0" VALUE "InternalName", "options\0" VALUE "LegalCopyright", "Copyright © Daniel Reimer 2007\0" VALUE "OriginalFilename", "options.exe\0" VALUE "ProductName", "Config Tool for RosBE\0" - VALUE "ProductVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.1.0.0\0" END END BLOCK "VarFileInfo" @@ -36,6 +38,7 @@ END END +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" +#include "lang/fr-FR.rc" #include "lang/ru-RU.rc" Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Sun Sep 30 13:29:25 2007 @@ -8,3 +8,5 @@ #define ID_SHOWBUILDTIME 0x6 #define ID_LOGDIR 0x7 #define ID_BROWSE 0x7 +#define ID_MGWDIR 0x8 +#define ID_BROWSEMGW 0x9 Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Sep 30 13:29:25 2007 @@ -2,6 +2,5 @@ - Load old settings - Disable Save button if there are no changes - Check validity of log path before saving -- Use styled controls (uxtheme) for dialog - Find out how to disable ... button - Font preview

17 years, 2 months

[fireball] 29304: - ObReferenceObjectByHandle/ObpReferenceProcessByHandle: Properly return STATUS_INVALID_HANDLE if user-mode tries to reference a kernel-mode handle. - ObReferenceObjectByHandle: Properly validate process/thread access rights before giving a reference to the caller. - Fix definition of "SizeOfHandle" macro in the handle table implementation. Fixes handle leaks at process rundown, handle allocation, and problems with processes that use more than 512 handles. - Remove checks for "

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 30 12:32:34 2007 New Revision: 29304 URL: http://svn.reactos.org/svn/reactos?rev=29304&view=rev Log: - ObReferenceObjectByHandle/ObpReferenceProcessByHandle: Properly return STATUS_INVALID_HANDLE if user-mode tries to reference a kernel-mode handle. - ObReferenceObjectByHandle: Properly validate process/thread access rights before giving a reference to the caller. - Fix definition of "SizeOfHandle" macro in the handle table implementation. Fixes handle leaks at process rundown, handle allocation, and problems with processes that use more than 512 handles. - Remove checks for "VALID_INHERIT_FLAGS". These flags have nothing to do with handle table entries and shouldn't appear in them. Please fix callers if they're attempting to send inherit flags as access masks. - Thanks to Alex! :) Modified: trunk/reactos/ntoskrnl/ex/handle.c (contents, props changed) trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Sun Sep 30 12:32:34 2007 @@ -17,7 +17,7 @@ LIST_ENTRY HandleTableListHead; EX_PUSH_LOCK HandleTableListLock; -#define SizeOfHandle(x) sizeof(HANDLE) * x +#define SizeOfHandle(x) (sizeof(HANDLE) * x) /* PRIVATE FUNCTIONS *********************************************************/ Propchange: trunk/reactos/ntoskrnl/ex/handle.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* 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 (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sun Sep 30 12:32:34 2007 @@ -73,55 +73,64 @@ /* Assume failure */ *Object = NULL; - - /* Check if the caller wants the current process */ - if (Handle == NtCurrentProcess()) - { - /* Return handle info */ - HandleInformation->HandleAttributes = 0; - HandleInformation->GrantedAccess = Process->GrantedAccess; - - /* No audit mask */ - *AuditMask = 0; - - /* Reference ourselves */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Process); - InterlockedIncrement(&ObjectHeader->PointerCount); - - /* Return the pointer */ - *Object = Process; - ASSERT(*Object != NULL); - return STATUS_SUCCESS; - } - - /* Check if the caller wants the current thread */ - if (Handle == NtCurrentThread()) - { - /* Return handle information */ - HandleInformation->HandleAttributes = 0; - HandleInformation->GrantedAccess = Thread->GrantedAccess; - - /* Reference ourselves */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Thread); - InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); - - /* No audit mask */ - *AuditMask = 0; - - /* Return the pointer */ - *Object = Thread; - ASSERT(*Object != NULL); - return STATUS_SUCCESS; - } - - /* Check if this is a kernel handle */ - if (ObIsKernelHandle(Handle, AccessMode)) - { - /* Use the kernel handle table and get the actual handle value */ - Handle = ObKernelHandleToHandle(Handle); - HandleTable = ObpKernelHandleTable; - } - + + /* Check if this is a special handle */ + if (HandleToLong(Handle) < 0) + { + /* Check if the caller wants the current process */ + if (Handle == NtCurrentProcess()) + { + /* Return handle info */ + HandleInformation->HandleAttributes = 0; + HandleInformation->GrantedAccess = Process->GrantedAccess; + + /* No audit mask */ + *AuditMask = 0; + + /* Reference ourselves */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Process); + InterlockedIncrement(&ObjectHeader->PointerCount); + + /* Return the pointer */ + *Object = Process; + ASSERT(*Object != NULL); + return STATUS_SUCCESS; + } + + /* Check if the caller wants the current thread */ + if (Handle == NtCurrentThread()) + { + /* Return handle information */ + HandleInformation->HandleAttributes = 0; + HandleInformation->GrantedAccess = Thread->GrantedAccess; + + /* Reference ourselves */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Thread); + InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + + /* No audit mask */ + *AuditMask = 0; + + /* Return the pointer */ + *Object = Thread; + ASSERT(*Object != NULL); + return STATUS_SUCCESS; + } + + /* This is a kernel handle... do we have access? */ + if (AccessMode == KernelMode) + { + /* Use the kernel handle table and get the actual handle value */ + Handle = ObKernelHandleToHandle(Handle); + HandleTable = ObpKernelHandleTable; + } + else + { + /* This is an illegal attempt to access a kernel handle */ + return STATUS_INVALID_HANDLE; + } + } + /* Enter a critical region while we touch the handle table */ ASSERT(HandleTable != NULL); KeEnterCriticalRegion(); @@ -2053,12 +2062,7 @@ ExSweepHandleTable(HandleTable, ObpCloseHandleCallback, &Context); - //ASSERT(HandleTable->HandleCount == 0); - /* HACK: Until the problem is investigated... */ - if (HandleTable->HandleCount != 0) - { - DPRINT1("Leaking %d handles!\n", HandleTable->HandleCount); - } + ASSERT(HandleTable->HandleCount == 0); /* Leave the critical region */ KeLeaveCriticalRegion(); Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Sun Sep 30 12:32:34 2007 @@ -480,70 +480,111 @@ /* Assume failure */ *Object = NULL; - /* Check if the caller wants the current process */ - if ((Handle == NtCurrentProcess()) && - ((ObjectType == PsProcessType) || !(ObjectType))) - { - /* Get the current process */ - CurrentProcess = PsGetCurrentProcess(); - - /* Check if the caller wanted handle information */ - if (HandleInformation) - { - /* Return it */ - HandleInformation->HandleAttributes = 0; - HandleInformation->GrantedAccess = PROCESS_ALL_ACCESS; - } - - /* Reference ourselves */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentProcess); - InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); - - /* Return the pointer */ - *Object = CurrentProcess; - return STATUS_SUCCESS; - } - else if (Handle == NtCurrentProcess()) - { - /* The caller used this special handle value with a non-process type */ - return STATUS_OBJECT_TYPE_MISMATCH; - } - - /* Check if the caller wants the current thread */ - if ((Handle == NtCurrentThread()) && - ((ObjectType == PsThreadType) || !(ObjectType))) - { - /* Get the current thread */ - CurrentThread = PsGetCurrentThread(); - - /* Check if the caller wanted handle information */ - if (HandleInformation) - { - /* Return it */ - HandleInformation->HandleAttributes = 0; - HandleInformation->GrantedAccess = THREAD_ALL_ACCESS; - } - - /* Reference ourselves */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentThread); - InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); - - /* Return the pointer */ - *Object = CurrentThread; - return STATUS_SUCCESS; - } - else if (Handle == NtCurrentThread()) - { - /* The caller used this special handle value with a non-thread type */ - return STATUS_OBJECT_TYPE_MISMATCH; - } - - /* Check if this is a kernel handle */ - if (ObIsKernelHandle(Handle, AccessMode)) - { - /* Use the kernel handle table and get the actual handle value */ - Handle = ObKernelHandleToHandle(Handle); - HandleTable = ObpKernelHandleTable; + /* Check if this is a special handle */ + if (HandleToLong(Handle) < 0) + { + /* Check if this is the current process */ + if (Handle == NtCurrentProcess()) + { + /* Check if this is the right object type */ + if ((ObjectType == PsProcessType) || !(ObjectType)) + { + /* Get the current process and granted access */ + CurrentProcess = PsGetCurrentProcess(); + GrantedAccess = CurrentProcess->GrantedAccess; + + /* Validate access */ + if ((AccessMode == KernelMode) || + !(~GrantedAccess & DesiredAccess)) + { + /* Check if the caller wanted handle information */ + if (HandleInformation) + { + /* Return it */ + HandleInformation->HandleAttributes = 0; + HandleInformation->GrantedAccess = GrantedAccess; + } + + /* Reference ourselves */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentProcess); + InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + + /* Return the pointer */ + *Object = CurrentProcess; + ASSERT(*Object != NULL); + Status = STATUS_SUCCESS; + } + else + { + /* Access denied */ + Status = STATUS_ACCESS_DENIED; + } + } + else + { + /* The caller used this special handle value with a non-process type */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Return the status */ + return Status; + } + else if (Handle == NtCurrentThread()) + { + /* Check if this is the right object type */ + if ((ObjectType == PsThreadType) || !(ObjectType)) + { + /* Get the current process and granted access */ + CurrentThread = PsGetCurrentThread(); + GrantedAccess = CurrentThread->GrantedAccess; + + /* Validate access */ + if ((AccessMode == KernelMode) || + !(~GrantedAccess & DesiredAccess)) + { + /* Check if the caller wanted handle information */ + if (HandleInformation) + { + /* Return it */ + HandleInformation->HandleAttributes = 0; + HandleInformation->GrantedAccess = GrantedAccess; + } + + /* Reference ourselves */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentThread); + InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + + /* Return the pointer */ + *Object = CurrentThread; + ASSERT(*Object != NULL); + Status = STATUS_SUCCESS; + } + else + { + /* Access denied */ + Status = STATUS_ACCESS_DENIED; + } + } + else + { + /* The caller used this special handle value with a non-process type */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Return the status */ + return Status; + } + else if (AccessMode == KernelMode) + { + /* Use the kernel handle table and get the actual handle value */ + Handle = ObKernelHandleToHandle(Handle); + HandleTable = ObpKernelHandleTable; + } + else + { + /* Invalid access, fail */ + return STATUS_INVALID_HANDLE; + } } else { @@ -565,11 +606,10 @@ { /* Get the granted access and validate it */ GrantedAccess = HandleEntry->GrantedAccess; - /* Inherit flags are not a kind of access right, they indicate - * the disposition of access rights. Therefore, they should not - * be considered. */ + + /* Validate access */ if ((AccessMode == KernelMode) || - !((~GrantedAccess & DesiredAccess & ~VALID_INHERIT_FLAGS))) + !(~GrantedAccess & DesiredAccess)) { /* Reference the object directly since we have its header */ InterlockedIncrement(&ObjectHeader->PointerCount);

17 years, 2 months

[gbrunmar] 29303: Removed duplicate function entry. Thanks to encoded|lap for finding it.

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Sep 30 12:27:50 2007 New Revision: 29303 URL: http://svn.reactos.org/svn/reactos?rev=29303&view=rev Log: Removed duplicate function entry. Thanks to encoded|lap for finding it. Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Sun Sep 30 12:27:50 2007 @@ -50,7 +50,6 @@ CcUnpinRepinnedBcb@12 CcWaitForCurrentLazyWriterActivity@0 CcSetFileSizes@8 -CcUnpinData@4 CcZeroData@16 CmRegisterCallback@12 CmUnRegisterCallback@8

17 years, 2 months

[dreimer] 29302: Updated everything to NASM 0.99.04. Added a Compatibility Mode to act like the old RosBE regarding the paths. "Simplified" some Variables. (Part 1 of Pierre Schweitzer's Patch)

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Sep 30 02:34:24 2007 New Revision: 29302 URL: http://svn.reactos.org/svn/reactos?rev=29302&view=rev Log: Updated everything to NASM 0.99.04. Added a Compatibility Mode to act like the old RosBE regarding the paths. "Simplified" some Variables. (Part 1 of Pierre Schweitzer's Patch) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Sep 30 02:34:24 2007 @@ -2,7 +2,7 @@ - Updated the Variables for GCC. This is needed in r29185+ because of RBUILD Changes to seperate target and host headers by Hervé Poussineau. (Hervé Poussineau, Daniel Reimer) -- Updated: NASM 0.99.02 to 0.99.03 (Daniel Reimer) +- Updated: NASM 0.99.02 to 0.99.04 (Daniel Reimer) *** Sep 11th, 2007 - RosBE 0.3.8 Released Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Sun Sep 30 02:34:24 2007 @@ -15,7 +15,7 @@ mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 -nasm-0.99.03-win32 +nasm-0.99.04-win32 mingw-4.1.3-20070829-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Sep 30 02:34:24 2007 @@ -21,6 +21,7 @@ set _ROSSOURCEDIRBASE=%CD% set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 +set ROSBE_MINGWPATH=%ROSBEBASEDIR%\4.1.3 set _LOGDIR=%CD%\RosBE-Logs if exist %ROSBEBASEDIR%\options.cmd ( @@ -46,10 +47,18 @@ :: if "%1" == "" ( cls + set HOST_CFLAGS=-I"%ROSBE_MINGWPATH%\include" -I"%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include" + set HOST_CPPFLAGS=-I"%ROSBE_MINGWPATH%\include" -I"%ROSBE_MINGWPATH%\include\c++\4.1.3" -I"%ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32" -I"%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include" call :RosBE4 goto :EndCommandParse ) -if not "%1" == "" ( +if "%1" == "oldmode" ( + cls + set C_INCLUDE_PATH=%ROSBE_MINGWPATH%\include;%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include + set CPLUS_INCLUDE_PATH=%ROSBE_MINGWPATH%\include;%ROSBE_MINGWPATH%\include\c++\4.1.3;%ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32;%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include + call :RosBE4 + goto :EndCommandParse +) else ( cls echo Unknown parameter specified. Exiting. goto :ExitRosBE @@ -111,12 +120,10 @@ :: :: Set the correct path for the build tools and set the MinGW make. :: - set PATH=%ROSBEBASEDIR%\4.1.3\bin;%ROSBEBASEDIR%\4.1.3\libexec\gcc\mingw32\4.1.3;%PATH% - set _MINGWMAKE=%ROSBEBASEDIR%\4.1.3\bin\mingw32-make.exe + set PATH=%ROSBE_MINGWPATH%\bin;%ROSBE_MINGWPATH%\libexec\gcc\mingw32\4.1.3;%PATH% + set _MINGWMAKE=%ROSBE_MINGWPATH%\bin\mingw32-make.exe set _MINGWVERSION=4.1.3 - set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" - set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" - set LIBRARY_PATH=%ROSBEBASEDIR%\4.1.3\lib;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3 + set LIBRARY_PATH=%ROSBE_MINGWPATH%\lib;%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3 echo ******************************************************************************* echo * * Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original) +++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh Sun Sep 30 02:34:24 2007 @@ -1,4 +1,4 @@ -Section "-MinGW, GCC v4.1.3 and NASM 0.99.03" SEC01 +Section "-MinGW, GCC v4.1.3 and NASM 0.99.04" SEC01 SetOutPath "$INSTDIR\4.1.3\" SetOverwrite try File /r Components\4.1.3\*.*

17 years, 2 months

[cwittich] 29301: -cmdinput.c(168) - wrong constant is used. patch by YaronAharonson <yaron dot aharonson at gmail dot com> See issue #2693 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 30 01:58:24 2007 New Revision: 29301 URL: http://svn.reactos.org/svn/reactos?rev=29301&view=rev Log: -cmdinput.c(168) - wrong constant is used. patch by YaronAharonson <yaron dot aharonson at gmail dot com> See issue #2693 for more details. Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c Sun Sep 30 01:58:24 2007 @@ -171,7 +171,7 @@ ConInKey (&ir); if (ir.Event.KeyEvent.dwControlKeyState & - (RIGHT_ALT_PRESSED|RIGHT_ALT_PRESSED| + (RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED| RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) {

17 years, 2 months

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 September 2007