Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[dgorbachev] 39681: Change page file PTE format to distinguish paged out pages from noaccess pages. It fixes kernel crash at the end of Sun JRE setup.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Feb 19 05:47:34 2009 New Revision: 39681 URL: http://svn.reactos.org/svn/reactos?rev=39681&view=rev Log: Change page file PTE format to distinguish paged out pages from noaccess pages. It fixes kernel crash at the end of Sun JRE setup. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Feb 19 05:47:34 2009 @@ -671,7 +671,7 @@ NTAPI MmIsPagePresent(PEPROCESS Process, PVOID Address) { - return MmGetPageEntryForProcess(Process, Address) & PA_PRESENT ? TRUE : FALSE; + return MmGetPageEntryForProcess(Process, Address) & PA_PRESENT; } BOOLEAN @@ -680,7 +680,7 @@ { ULONG Entry; Entry = MmGetPageEntryForProcess(Process, Address); - return !(Entry & PA_PRESENT) && Entry != 0 ? TRUE : FALSE; + return !(Entry & PA_PRESENT) && (Entry & 0x800) && Entry != 0; } NTSTATUS @@ -841,7 +841,7 @@ if (PageCount > 0x10000 || (ULONG_PTR) Address / PAGE_SIZE + PageCount > 0x100000) { - DPRINT1("Page count to large\n"); + DPRINT1("Page count too large\n"); KeBugCheck(MEMORY_MANAGEMENT); } } @@ -856,7 +856,7 @@ (ULONG_PTR) Address / PAGE_SIZE + PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) { - DPRINT1("Page Count to large\n"); + DPRINT1("Page Count too large\n"); KeBugCheck(MEMORY_MANAGEMENT); } } @@ -909,13 +909,14 @@ Pte = *Pt; MmMarkPageMapped(Pages[i]); - if (PAGE_MASK((Pte)) != 0 && !((Pte) & PA_PRESENT)) - { + if (PAGE_MASK(Pte) != 0 && !(Pte & PA_PRESENT) && (Pte & 0x800)) + { + DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } - if (PAGE_MASK((Pte)) != 0) - { - MmMarkPageUnmapped(PTE_TO_PFN((Pte))); + if (PAGE_MASK(Pte) != 0) + { + MmMarkPageUnmapped(PTE_TO_PFN(Pte)); } InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); if (Pte != 0) @@ -1014,6 +1015,7 @@ Process, Address, flProtect); Attributes = ProtectToPTE(flProtect); + if (Attributes & 0x80000000) { NoExecute = TRUE; Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Thu Feb 19 05:47:34 2009 @@ -117,9 +117,9 @@ /* * Translate between a swap entry and a file and offset pair. */ -#define FILE_FROM_ENTRY(i) ((i) >> 24) -#define OFFSET_FROM_ENTRY(i) (((i) & 0xffffff) - 1) -#define ENTRY_FROM_FILE_OFFSET(i, j) (((i) << 24) | ((j) + 1)) +#define FILE_FROM_ENTRY(i) ((i) & 0x0f) +#define OFFSET_FROM_ENTRY(i) ((i) >> 11) +#define ENTRY_FROM_FILE_OFFSET(i, j) ((i) | (j) << 11 | 0x400) static BOOLEAN MmSwapSpaceMessage = FALSE;

15 years, 10 months

[mkupfer] 39680: - initial default message handler for WM_SYSCOLORCHANGE messages

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Thu Feb 19 05:43:26 2009 New Revision: 39680 URL: http://svn.reactos.org/svn/reactos?rev=39680&view=rev Log: - initial default message handler for WM_SYSCOLORCHANGE messages Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Thu Feb 19 05:43:26 2009 @@ -1202,6 +1202,18 @@ return (0); } + case WM_SYSCOLORCHANGE: + { + /* force to redraw non-client area */ + DefWndNCPaint(hWnd, (HRGN)1, -1); + /* Use InvalidateRect to redraw client area, enable + * erase to redraw all subcontrols otherwise send the + * WM_SYSCOLORCHANGE to child windows/controls is required + */ + InvalidateRect(hWnd,NULL,TRUE); + return (0); + } + case WM_PAINTICON: case WM_PAINT: {

15 years, 10 months

[dreimer] 39679: Sync winfile and write to Wine HEAD

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Feb 19 04:09:34 2009 New Revision: 39679 URL: http://svn.reactos.org/svn/reactos?rev=39679&view=rev Log: Sync winfile and write to Wine HEAD Added: trunk/rosapps/applications/write/lang/sv-SE.rc (with props) Modified: trunk/rosapps/applications/winfile/lang/sv-SE.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/rsrc.rc Modified: trunk/rosapps/applications/winfile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/sv-SE.rc [iso-8859-1] Thu Feb 19 04:09:34 2009 @@ -4,6 +4,7 @@ * * Copyright 2005 David Nordenberg * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2009 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,7 +126,7 @@ POPUP "&Fönster" { MENUITEM "Nytt &fönster", ID_WINDOW_NEW MENUITEM "Överlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &horisontellt", ID_WINDOW_TILE_HORZ MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT @@ -171,10 +172,63 @@ PUSHBUTTON "&Bläddra", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Efter filtyp" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Namn:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Filtyp",-1,7,23,87,56 + CONTROL "&Kataloger",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Program",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Dokument",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Andra filer",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Visa gömda/&system-filer",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Egenskaper för %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,191,29,50,14 + LTEXT "&Filnamn:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "F&ull sökväg:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Sist ändrad:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Storlek:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attribut",-1,7,79,158,46 + CONTROL "Sk&rivskyddad",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Dold",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arkiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Komprimerad",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versionsinfo",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Verkställ teckensnittsinställningar" - IDS_FONT_SEL_ERROR "Ett fel uppstog när ett nytt teckensnitt valdes." + IDS_FONT_SEL_ERROR "Ett fel uppstod när ett nytt teckensnitt valdes." } STRINGTABLE @@ -187,7 +241,7 @@ IDS_SHELL "Skal" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Inte implementerat ännu" - IDS_WINE_FILE "Wine File" + IDS_WINE_FILE "Winefile" } STRINGTABLE Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Thu Feb 19 04:09:34 2009 @@ -2732,7 +2732,7 @@ x = pane->positions[col] + cx; - for(; col<COLUMNS; ) { + for(; col<COLUMNS-1; ) { pane->positions[++col] = x; x += pane->widths[col]; } @@ -4706,7 +4706,7 @@ } -static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) +static BOOL show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) { static const TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; @@ -4718,7 +4718,7 @@ CLIENTCREATESTRUCT ccs; if (Globals.hMainWnd) - return; + return TRUE; opts = load_registry_settings(); hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); @@ -4796,8 +4796,10 @@ child->pos.rcNormalPosition.right = 320; child->pos.rcNormalPosition.bottom = 280; - if (!create_child_window(child)) + if (!create_child_window(child)) { HeapFree(GetProcessHeap(), 0, child); + return FALSE; + } SetWindowPlacement(child->hwnd, &child->pos); @@ -4807,7 +4809,7 @@ UpdateWindow(Globals.hMainWnd); - if (path && path[0]) + if (child->hwnd && path && path[0]) { int index,count; TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; @@ -4835,6 +4837,7 @@ } } } + return TRUE; } static void ExitInstance(void) @@ -4888,7 +4891,11 @@ InitInstance(hinstance); - show_frame(0, cmdshow, path); + if( !show_frame(0, cmdshow, path) ) + { + ExitInstance(); + return 1; + } while(GetMessage(&msg, 0, 0, 0)) { if (Globals.hmdiclient && TranslateMDISysAccel(Globals.hmdiclient, &msg)) Added: trunk/rosapps/applications/write/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/sv… ============================================================================== --- trunk/rosapps/applications/write/lang/sv-SE.rc (added) +++ trunk/rosapps/applications/write/lang/sv-SE.rc [iso-8859-1] Thu Feb 19 04:09:34 2009 @@ -1,0 +1,26 @@ +/* + * Swedish language support + * + * Copyright (C) 2009 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Kunde inte starta Wordpad" +} Propchange: trunk/rosapps/applications/write/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc… ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Thu Feb 19 04:09:34 2009 @@ -37,4 +37,5 @@ #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" #include "lang/uk-UA.rc"

15 years, 10 months

[dreimer] 39678: Sync xcopy, winhlp32 and wordpad to Wine HEAD.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Feb 19 04:09:19 2009 New Revision: 39678 URL: http://svn.reactos.org/svn/reactos?rev=39678&view=rev Log: Sync xcopy, winhlp32 and wordpad to Wine HEAD. Added: trunk/reactos/base/applications/wordpad/Sv.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -984,7 +984,8 @@ #define MAX_WRITECONSOLE_SIZE 65535 va_list parms; - DWORD len, nOut; + DWORD nOut; + int len; DWORD res = 0; /* @@ -1003,6 +1004,10 @@ va_start(parms, format); len = vsnprintfW(output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(WCHAR), format, parms); va_end(parms); + if (len < 0) { + WINE_FIXME("String too long.\n"); + return 0; + } /* Try to write as unicode all the time we think its a console */ if (toConsole) { Modified: trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -5,6 +5,7 @@ * Swedish language by Karl Backström <karl_b(a)geocities.com> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2009 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -51,9 +52,9 @@ MENUITEM "Historik", MNID_OPTS_HISTORY POPUP "Typsnitt" BEGIN - MENUITEM "Liten", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Stor", MNID_OPTS_FONTS_LARGE + MENUITEM "Litet", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalt", MNID_OPTS_FONTS_NORMAL + MENUITEM "Stort", MNID_OPTS_FONTS_LARGE END MENUITEM "Använd systemfärger", MNID_OPTS_SYSTEM_COLORS } @@ -68,10 +69,26 @@ } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Sök" +{ + LTEXT "Inte implementerat ännu", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Hjälp" +STID_WINE_HELP, "Wine Hjälp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" @@ -86,3 +103,26 @@ STID_NO_RICHEDIT "Kan inte hitta en implementation av richedit... Avslutar" STID_PSH_INDEX, "Hjälprubriker: " } + +CONTEXT_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Kommentar...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiera", MNID_CTXT_COPY + MENUITEM "Skriv ut...", MNID_CTXT_PRINT + POPUP "Typsnitt" + BEGIN + MENUITEM "Litet", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalt", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stort", MNID_CTXT_FONTS_LARGE + END + POPUP "Hjälp alltid synlig" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Ej synlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Använd systemfärger", MNID_CTXT_SYSTEM_COLORS + END +END Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -274,7 +274,7 @@ { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - if (!LoadString(Globals.hInstance, STID_WINE_HELP, + if (hlpfile && !LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption))) strcpy(mwi.caption, hlpfile->lpszTitle); mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; Added: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Sv.rc (added) +++ trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -1,0 +1,247 @@ +/* + * Copyright 2009 by Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Nytt...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Ãppna...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Spara\tCtrl+S", ID_FILE_SAVE + MENUITEM "Spara s&om...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "Skriv &ut...\tCtrl+P", ID_PRINT + MENUITEM "&FÃ¶rhandsgranskning...", ID_PREVIEW + MENUITEM "U&tskriftsformat...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Redigera" + BEGIN + MENUITEM "&Ãngra\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "Ã&terstÃ¤ll\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "Klipp &ut\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopiera\tCtrl+C", ID_EDIT_COPY + MENUITEM "Klistra &in\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Ta &bort\tDEL", ID_EDIT_CLEAR + MENUITEM "&Markera allt\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&SÃ¶k...\tCrtl+F", ID_FIND + MENUITEM "SÃ¶k &nÃ¤sta\tF3", ID_FIND_NEXT + MENUITEM "&ErsÃ¤tt...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Sk&rivskyddat", ID_EDIT_READONLY + MENUITEM "&Ãndrat", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtra" + BEGIN + MENUITEM "&Information om markerad text", ID_EDIT_SELECTIONINFO + MENUITEM "&Teckenformat", ID_EDIT_CHARFORMAT + MENUITEM "&Standardteckenformat", ID_EDIT_DEFCHARFORMAT + MENUITEM "Stycke&format", ID_EDIT_PARAFORMAT + MENUITEM "&HÃ¤mta text", ID_EDIT_GETTEXT + END + END + POPUP "&Visa" + BEGIN + MENUITEM "&VerktygsfÃ¤lt", ID_TOGGLE_TOOLBAR + MENUITEM "&FormatfÃ¤lt", ID_TOGGLE_FORMATBAR + MENUITEM "&Linjal", ID_TOGGLE_RULER + MENUITEM "&StatusfÃ¤lt", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Alternativ...", ID_VIEWPROPERTIES + END + POPUP "&Infoga" + BEGIN + MENUITEM "&Datum och tid...", ID_DATETIME + END + POPUP "F&ormat" + BEGIN + MENUITEM "T&ecken...", ID_FONTSETTINGS + MENUITEM "&PunktuppstÃ¤llning" ID_BULLET + MENUITEM "&Stycke..." ID_PARAFORMAT + MENUITEM "&Tabulatorer..." ID_TABSTOPS + POPUP "&Bakgrund" + BEGIN + MENUITEM "&System\tCtrl+1", ID_BACK_1 + MENUITEM "Anteckningslapps-&gult\tCtrl+2", ID_BACK_2 + END + END + POPUP "&HjÃ¤lp" + BEGIN + MENUITEM "&Om Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Klipp &ut", ID_EDIT_CUT + MENUITEM "&Kopiera", ID_EDIT_COPY + MENUITEM "Klistra &in", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&PunktuppstÃ¤llning" ID_BULLET + MENUITEM "&Stycke..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Datum och tid" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "TillgÃ¤ngliga format",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Avbryt",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ny" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Ny dokumenttyp",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Avbryt",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Formatera stycke" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indrag", -1, 10, 10, 120, 68 + LTEXT "VÃ¤nster", -1, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "HÃ¶ger", -1, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "FÃ¶rsta rad", -1, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Justering", -1, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Tabulatorer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "LÃ¤gg &till", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "Ta &bort", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "Ta bort a&lla", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Radbrytning", -1, 10, 10, 130, 85 + RADIOBUTTON "&Ingen radbrytning", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "&Bryt text vid fÃ¶nsterkanten", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Bryt text vid &marginalen", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Verktygsrader", -1, 150, 10, 120, 85 + CHECKBOX "&Verktygsrad", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatrad", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusrad", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rich text-format (*.rtf)" + STRING_TEXT_FILES_TXT, "Textdokument (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode-textdokument (*.txt)" + STRING_ALL_FILES, "Alla filer (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "VÃ¤nsterstÃ¤llt" + STRING_ALIGN_RIGHT, "HÃ¶gerstÃ¤llt" + STRING_ALIGN_CENTER, "Centrerat" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Rich text-dokument" + STRING_NEWFILE_TXT, "Textdokument" + STRING_NEWFILE_TXT_UNICODE, "Textdokument (Unicode)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Skrivarfiler (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Alternativ" + STRING_VIEWPROPS_TEXT, "Text" + STRING_VIEWPROPS_RICHTEXT, "Rich text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Skriv ut" + STRING_PREVIEW_NEXTPAGE, "NÃ¤sta sida" + STRING_PREVIEW_PREVPAGE, "FÃ¶regÃ¥ende sida" + STRING_PREVIEW_TWOPAGES, "TvÃ¥ sidor" + STRING_PREVIEW_ONEPAGE, "En sida" + STRING_PREVIEW_CLOSE, "StÃ¤ng" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Spara Ã¤ndringar i '%s'?" + STRING_SEARCH_FINISHED, "SÃ¶kningen i dokumentet har slutfÃ¶rts." + STRING_LOAD_RICHED_FAILED, "Misslyckades att ladda RichEdit-biblioteket." + STRING_SAVE_LOSEFORMATTING, "Du har valt att spara i rent textformat, " \ + "vilket kommer leda till att all formatering fÃ¶rloras. " \ + "Ãr du sÃ¤ker att du vill gÃ¶ra detta?" + STRING_INVALID_NUMBER, "Ogiltigt talformat" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_WRITE_FAILED, "Kunde inte spara filen." + STRING_WRITE_ACCESS_DENIED, "Du har inte tillgÃ¥ng till att spara filen." + STRING_OPEN_FAILED, "Kunde inte Ã¶ppna filen." + STRING_OPEN_ACCESS_DENIED, "Du har inte tillgÃ¥ng till att Ã¶ppna filen." + STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." +END + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/wordpad/Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -95,7 +95,7 @@ LoadStringW(hInstance, string, text, MAX_STRING_LEN); hButton = CreateWindowW(WC_BUTTONW, text, WS_VISIBLE | WS_CHILD, 5, 5, 100, 15, - hRebarWnd, (HMENU)ULongToHandle(command), hInstance, NULL); + hRebarWnd, ULongToHandle(command), hInstance, NULL); rb.cbSize = sizeof(rb); rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; @@ -226,12 +226,12 @@ ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.hwndOwner = hMainWnd; ofn.lpstrFilter = file_filter; - ofn.lpstrFile = (LPWSTR)file; + ofn.lpstrFile = file; ofn.nMaxFile = MAX_PATH; - ofn.lpstrDefExt = (LPWSTR)defExt; + ofn.lpstrDefExt = defExt; if(GetSaveFileNameW(&ofn)) - return (LPWSTR)file; + return file; else return FALSE; } Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -77,5 +77,6 @@ #include "Pt.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc" #include "Tr.rc" #include "Zh.rc" Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Thu Feb 19 04:09:19 2009 @@ -301,7 +301,7 @@ if(lstrcmpW(sizeBuffer, wszNewFontSize)) { float size = 0; - if(number_from_string((LPCWSTR) wszNewFontSize, &size, FALSE) + if(number_from_string(wszNewFontSize, &size, FALSE) && size > 0) { set_size(size); @@ -322,7 +322,7 @@ cbItem.iItem = -1; wsprintfW(buffer, stringFormat, size); - cbItem.pszText = (LPWSTR)buffer; + cbItem.pszText = buffer; SendMessageW(hSizeListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); } @@ -494,7 +494,7 @@ SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); if(lstrcmpW(format.szFaceName, wszNewFaceName)) - set_font((LPCWSTR) wszNewFaceName); + set_font(wszNewFaceName); } static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, const NEWTEXTMETRICEXW *ntmc) @@ -1412,11 +1412,11 @@ WCHAR buffer[MAX_STRING_LEN]; HWND hListWnd = GetDlgItem(hWnd, IDC_NEWFILE); - LoadStringW(hInstance, STRING_NEWFILE_RICHTEXT, (LPWSTR)buffer, MAX_STRING_LEN); + LoadStringW(hInstance, STRING_NEWFILE_RICHTEXT, buffer, MAX_STRING_LEN); SendMessageW(hListWnd, LB_ADDSTRING, 0, (LPARAM)&buffer); - LoadStringW(hInstance, STRING_NEWFILE_TXT, (LPWSTR)buffer, MAX_STRING_LEN); + LoadStringW(hInstance, STRING_NEWFILE_TXT, buffer, MAX_STRING_LEN); SendMessageW(hListWnd, LB_ADDSTRING, 0, (LPARAM)&buffer); - LoadStringW(hInstance, STRING_NEWFILE_TXT_UNICODE, (LPWSTR)buffer, MAX_STRING_LEN); + LoadStringW(hInstance, STRING_NEWFILE_TXT_UNICODE, buffer, MAX_STRING_LEN); SendMessageW(hListWnd, LB_ADDSTRING, 0, (LPARAM)&buffer); SendMessageW(hListWnd, LB_SETSEL, TRUE, 0);

15 years, 10 months

[dgoette] 39677: * removed templates (functionality is moved into contents) * add new tab for help (just empty for now) * remove quickinfo and replace it with a tooltip * move legend into the blue box and make it foldable * replace buttons with a toolbar * combine select links into a dropdown * replace old user search with a new filter based version * save user search filters (like smart filter) * unify basic layout * move account update functions to ROSUser class * show selectable entries in ad

by dgoette＠svn.reactos.org

15 years, 10 months

[mkupfer] 39676: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix for mouse cursor in 256 color mode. - See issue #4172 for details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Thu Feb 19 03:18:27 2009 New Revision: 39676 URL: http://svn.reactos.org/svn/reactos?rev=39676&view=rev Log: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix for mouse cursor in 256 color mode. - See issue #4172 for details. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Thu Feb 19 03:18:27 2009 @@ -250,7 +250,7 @@ { XlateObj->pulXlate[i] = ClosestColorMatch( XlateGDI, SourcePalGDI->IndexedColors + i, - DestPalGDI->IndexedColors, XlateObj->cEntries); + DestPalGDI->IndexedColors, DestPalGDI->NumColors); if (XlateObj->pulXlate[i] != i) XlateObj->flXlate &= ~XO_TRIVIAL; }

15 years, 10 months

[janderwald] 39675: - If the current irp buffer is finished, set the state to pause (fixes looping of last sample) - Use KeSetTimer if Irql is below equal DISPATCH_LEVEL

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 18 23:48:51 2009 New Revision: 39675 URL: http://svn.reactos.org/svn/reactos?rev=39675&view=rev Log: - If the current irp buffer is finished, set the state to pause (fixes looping of last sample) - Use KeSetTimer if Irql is below equal DISPATCH_LEVEL Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed Feb 18 23:48:51 2009 @@ -105,9 +105,10 @@ NTSTATUS Status; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); -#if 0 + if (This->ActiveIrp && This->ActiveIrpOffset >= This->ActiveIrpBufferSize) { + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); if (KeGetCurrentIrql() > DISPATCH_LEVEL) { if (This->DelayedRequestInProgress) @@ -140,7 +141,6 @@ return; } } -#endif if (!This->ActiveIrp) { @@ -186,7 +186,8 @@ } else { - This->Stream->lpVtbl->Silence(This->Stream, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, BytesToCopy); + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); + return; } BufferLength = Position; IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; @@ -209,6 +210,12 @@ BytesToCopy = min(BufferLength, IrpLength); DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + + if (!BytesToCopy) + { + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); + return; + } This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Wed Feb 18 23:48:51 2009 @@ -211,8 +211,11 @@ if (This->Initialized) { - //KeSetTimer(&This->Timer, DueTime, &This->Dpc); - KeInsertQueueDpc(&This->Dpc, NULL, NULL); + if (KeGetCurrentIrql() <= DISPATCH_LEVEL) + KeSetTimer(&This->Timer, DueTime, &This->Dpc); + else + KeInsertQueueDpc(&This->Dpc, NULL, NULL); + KeClearEvent(&This->DpcEvent); } }

15 years, 10 months

[janderwald] 39674: - Implement writing into cyclic buffer - Implement queuing write requests - Use KeInsertQueueDpc over KeSetTimer in IServiceGroup_fnRequestDelayedService - Playing an irp sound buffer now basically works. However the last sample is always repeated(w/o irp buffer bounds checking playing works normally but bsod occurs due to reading out of bounds)

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 18 23:19:08 2009 New Revision: 39674 URL: http://svn.reactos.org/svn/reactos?rev=39674&view=rev Log: - Implement writing into cyclic buffer - Implement queuing write requests - Use KeInsertQueueDpc over KeSetTimer in IServiceGroup_fnRequestDelayedService - Playing an irp sound buffer now basically works. However the last sample is always repeated(w/o irp buffer bounds checking playing works normally but bsod occurs due to reading out of bounds) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed Feb 18 23:19:08 2009 @@ -16,7 +16,26 @@ KSSTATE State; PKSDATAFORMAT Format; + LIST_ENTRY QueueHead; + KSPIN_LOCK QueueLock; + + PVOID CommonBuffer; + ULONG CommonBufferSize; + ULONG CommonBufferOffset; + + PIRP ActiveIrp; + PUCHAR ActiveIrpBuffer; + ULONG ActiveIrpBufferSize; + ULONG ActiveIrpOffset; + ULONG DelayedRequestInProgress; + + }IPortPinWaveCyclicImpl; + +NTSTATUS +NTAPI +IPortWaveCyclic_fnProcessNewIrp( + IPortPinWaveCyclicImpl * This); //================================================================================================================================== @@ -81,9 +100,125 @@ IServiceSink_fnRequestService( IServiceSink* iface) { + ULONG Position; + ULONG BufferLength, IrpLength, BytesToCopy; + NTSTATUS Status; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); - - DPRINT("IServiceSink_fnRequestService entered %p\n", This); +#if 0 + if (This->ActiveIrp && This->ActiveIrpOffset >= This->ActiveIrpBufferSize) + { + if (KeGetCurrentIrql() > DISPATCH_LEVEL) + { + if (This->DelayedRequestInProgress) + return; + + This->ActiveIrp->IoStatus.Information = This->ActiveIrpBufferSize; + This->ActiveIrp->IoStatus.Status = STATUS_SUCCESS; + This->DelayedRequestInProgress = TRUE; + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return; + } + else + { + if (This->ActiveIrp) + { + IoCompleteRequest(This->ActiveIrp, IO_SOUND_INCREMENT); + } + + This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryTail, KsAcquireAndRemove); + if (!This->ActiveIrp) + { + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return; + } + + DPRINT1("processing next irp\n"); + + IPortWaveCyclic_fnProcessNewIrp(This); + This->DelayedRequestInProgress = FALSE; + return; + } + } +#endif + + if (!This->ActiveIrp) + { + if (KeGetCurrentIrql() > DISPATCH_LEVEL) + { + if (This->DelayedRequestInProgress) + return; + + This->DelayedRequestInProgress = TRUE; + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return; + } + This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryTail, KsAcquireAndRemove); + if (!This->ActiveIrp) + { + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return; + } + + IPortWaveCyclic_fnProcessNewIrp(This); + This->DelayedRequestInProgress = FALSE; + return; + } + + + Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); + DPRINT1("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, This->ActiveIrpOffset); + + if (Position < This->CommonBufferOffset) + { + BufferLength = This->CommonBufferSize - This->CommonBufferOffset; + IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; + + BytesToCopy = min(BufferLength, IrpLength); + + DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + + if (BytesToCopy) + { + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, (PUCHAR)This->ActiveIrpBuffer + This->ActiveIrpOffset, BytesToCopy); + This->ActiveIrpOffset += BytesToCopy; + This->CommonBufferOffset = 0; + } + else + { + This->Stream->lpVtbl->Silence(This->Stream, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, BytesToCopy); + } + BufferLength = Position; + IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; + BytesToCopy = min(BufferLength, IrpLength); + + DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + + if (BytesToCopy) + { + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)(PUCHAR)This->CommonBuffer, (PUCHAR)This->ActiveIrpBuffer + This->ActiveIrpOffset, BytesToCopy); + This->ActiveIrpOffset += Position; + This->CommonBufferOffset = Position; + } + + } + else if (Position >= This->CommonBufferOffset) + { + BufferLength = Position - This->CommonBufferOffset; + IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; + + BytesToCopy = min(BufferLength, IrpLength); + DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, + (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, + (PUCHAR)This->ActiveIrpBuffer + This->ActiveIrpOffset, + BytesToCopy); + + This->ActiveIrpOffset += BytesToCopy; + This->CommonBufferOffset = Position; + } + } static IServiceSinkVtbl vt_IServiceSink = @@ -173,13 +308,42 @@ NTSTATUS NTAPI +IPortWaveCyclic_fnProcessNewIrp( + IPortPinWaveCyclicImpl * This) +{ + PIO_STACK_LOCATION IoStack; + PKSSTREAM_HEADER Header; + + DPRINT1("ActiveIrp %p\n", This->ActiveIrp); + + IoStack = IoGetCurrentIrpStackLocation(This->ActiveIrp); + + if (IoStack->Parameters.DeviceIoControl.InputBufferLength != sizeof(KSSTREAM_HEADER)) + { + DPRINT1("Irp has unexpected header\n"); + return STATUS_INVALID_PARAMETER; + } + + Header = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + DPRINT1("Header %p Size %u\n", Header, Header->Size); + + + This->ActiveIrpOffset = 0; + This->ActiveIrpBuffer = Header->Data; + This->ActiveIrpBufferSize = Header->DataUsed; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI IPortPinWaveCyclic_HandleKsProperty( IN IPortPinWaveCyclic * iface, IN PIRP Irp) { PKSPROPERTY Property; NTSTATUS Status; - UNICODE_STRING GuidString; + UNICODE_STRING GuidString, GuidString2; PIO_STACK_LOCATION IoStack; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; @@ -209,12 +373,31 @@ return STATUS_BUFFER_TOO_SMALL; } - if (Property->Id & KSPROPERTY_TYPE_SET) + if (Property->Flags & KSPROPERTY_TYPE_SET) { Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; if (This->Stream) { + This->CommonBufferOffset = 0; + This->CommonBufferSize = This->DmaChannel->lpVtbl->AllocatedBufferSize(This->DmaChannel); + This->CommonBuffer = This->DmaChannel->lpVtbl->SystemAddress(This->DmaChannel); + + This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryHead, KsAcquireAndRemove); + if (This->ActiveIrp) + { + Status = IPortWaveCyclic_fnProcessNewIrp(This); + DPRINT1("IPortWaveCyclic_fnProcessNewIrp result %x\n", Status); + if (NT_SUCCESS(Status)) + { + //FIXME + // verify offset - resume stream + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, This->CommonBuffer, This->ActiveIrpBuffer, This->CommonBufferSize); + This->ActiveIrpOffset += This->CommonBufferSize; + } + } + + Status = This->Stream->lpVtbl->SetState(This->Stream, *State); DPRINT1("Setting state %x\n", Status); @@ -229,7 +412,7 @@ } return Irp->IoStatus.Status; } - else if (Property->Id & KSPROPERTY_TYPE_GET) + else if (Property->Flags & KSPROPERTY_TYPE_GET) { *State = This->State; Irp->IoStatus.Information = sizeof(KSSTATE); @@ -240,7 +423,7 @@ else if (Property->Id == KSPROPERTY_CONNECTION_DATAFORMAT) { PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; - if (Property->Id & KSPROPERTY_TYPE_SET) + if (Property->Flags & KSPROPERTY_TYPE_SET) { PKSDATAFORMAT NewDataFormat = AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); if (!NewDataFormat) @@ -268,7 +451,7 @@ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL; } - else if (Property->Id & KSPROPERTY_TYPE_GET) + else if (Property->Flags & KSPROPERTY_TYPE_GET) { PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; if (!This->Format) @@ -291,18 +474,48 @@ return STATUS_SUCCESS; } } + } RtlStringFromGUID(&Property->Set, &GuidString); - - DPRINT1("Unhandeled property Set %S Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + RtlStringFromGUID(&KSPROPSETID_Connection, &GuidString2); + DPRINT1("Unhandeled property Set |%S| |%S|Id %u Flags %x\n", GuidString.Buffer, GuidString2.Buffer, Property->Id, Property->Flags); DbgBreakPoint(); RtlFreeUnicodeString(&GuidString); + RtlFreeUnicodeString(&GuidString2); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +NTAPI +IPortPinWaveCyclic_HandleKsStream( + IN IPortPinWaveCyclic * iface, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("IPortPinWaveCyclic_HandleKsStream entered\n"); + + if (!This->Stream) + { + IoCancelIrp(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + return Irp->IoStatus.Status; + } + + KsAddIrpToCancelableQueue(&This->QueueHead, &This->QueueLock, Irp, KsListEntryTail, NULL); + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + + return STATUS_PENDING; +} /* * @unimplemented @@ -316,11 +529,9 @@ { PIO_STACK_LOCATION IoStack; - UNIMPLEMENTED - IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("IPortPinWaveCyclic_fnDeviceIoControl %x %x\n",IoStack->Parameters.DeviceIoControl.IoControlCode, IOCTL_KS_PROPERTY); + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) { return IPortPinWaveCyclic_HandleKsProperty(iface, Irp); @@ -342,14 +553,14 @@ } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM || IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) { - /// FIXME - /// handle reset state + return IPortPinWaveCyclic_HandleKsStream(iface, Irp); } else { return KsDefaultDeviceIoCompletion(DeviceObject, Irp); } + UNIMPLEMENTED return STATUS_UNSUCCESSFUL; } @@ -514,6 +725,8 @@ This->Filter = Filter; This->KsPinDescriptor = KsPinDescriptor; This->Miniport = GetWaveCyclicMiniport(Port); + KeInitializeSpinLock(&This->QueueLock); + InitializeListHead(&This->QueueHead); DataFormat = (PKSDATAFORMAT)(ConnectDetails + 1); @@ -547,6 +760,7 @@ DPRINT1("Failed to add pin to service group\n"); return Status; } + This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); This->State = KSSTATE_STOP; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Wed Feb 18 23:19:08 2009 @@ -211,7 +211,8 @@ if (This->Initialized) { - KeSetTimer(&This->Timer, DueTime, &This->Dpc); + //KeSetTimer(&This->Timer, DueTime, &This->Dpc); + KeInsertQueueDpc(&This->Dpc, NULL, NULL); KeClearEvent(&This->DpcEvent); } }

15 years, 10 months

[janderwald] 39673: - Implement KsAddIrpToCancelableQueue and KsRemoveIrpFromCancelableQueue

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 18 19:11:59 2009 New Revision: 39673 URL: http://svn.reactos.org/svn/reactos?rev=39673&view=rev Log: - Implement KsAddIrpToCancelableQueue and KsRemoveIrpFromCancelableQueue Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Feb 18 19:11:59 2009 @@ -18,9 +18,11 @@ } /* - @unimplemented -*/ -KSDDKAPI VOID NTAPI + @implemented +*/ +KSDDKAPI +VOID +NTAPI KsAddIrpToCancelableQueue( IN OUT PLIST_ENTRY QueueHead, IN PKSPIN_LOCK SpinLock, @@ -28,7 +30,26 @@ IN KSLIST_ENTRY_LOCATION ListLocation, IN PDRIVER_CANCEL DriverCancel OPTIONAL) { - UNIMPLEMENTED; + PQUEUE_ENTRY Entry; + + if (!QueueHead || !SpinLock || !Irp) + return; + + Entry = ExAllocatePool(NonPagedPool, sizeof(QUEUE_ENTRY)); + if (!Entry) + return; + + ///FIXME + // setup cancel routine + // + + Entry->Irp = Irp; + + if (ListLocation == KsListEntryTail) + ExInterlockedInsertTailList(QueueHead, &Entry->Entry, SpinLock); + else + ExInterlockedInsertHeadList(QueueHead, &Entry->Entry, SpinLock); + } /* @@ -607,18 +628,60 @@ } /* - @unimplemented -*/ -KSDDKAPI PIRP NTAPI + @implemented +*/ +KSDDKAPI +PIRP +NTAPI KsRemoveIrpFromCancelableQueue( IN OUT PLIST_ENTRY QueueHead, IN PKSPIN_LOCK SpinLock, IN KSLIST_ENTRY_LOCATION ListLocation, IN KSIRP_REMOVAL_OPERATION RemovalOperation) { - UNIMPLEMENTED; - return NULL; - /*return STATUS_UNSUCCESSFUL; */ + PQUEUE_ENTRY Entry = NULL; + PIRP Irp; + KIRQL OldIrql; + + if (!QueueHead || !SpinLock) + return NULL; + + if (ListLocation != KsListEntryTail && ListLocation != KsListEntryHead) + return NULL; + + if (RemovalOperation != KsAcquireOnly && RemovalOperation != KsAcquireAndRemove) + return NULL; + + KeAcquireSpinLock(SpinLock, &OldIrql); + + if (!IsListEmpty(QueueHead)) + { + if (RemovalOperation == KsAcquireOnly) + { + if (ListLocation == KsListEntryHead) + Entry = (PQUEUE_ENTRY)QueueHead->Flink; + else + Entry = (PQUEUE_ENTRY)QueueHead->Blink; + } + else if (RemovalOperation == KsAcquireAndRemove) + { + if (ListLocation == KsListEntryTail) + Entry = (PQUEUE_ENTRY)RemoveTailList(QueueHead); + else + Entry = (PQUEUE_ENTRY)RemoveHeadList(QueueHead); + } + } + KeReleaseSpinLock(SpinLock, OldIrql); + + if (!Entry) + return NULL; + + Irp = Entry->Irp; + + if (RemovalOperation == KsAcquireAndRemove) + ExFreePool(Entry); + + return Irp; } /* Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Wed Feb 18 19:11:59 2009 @@ -39,6 +39,11 @@ }DEVICE_EXTENSION, *PDEVICE_EXTENSION; +typedef struct +{ + LIST_ENTRY Entry; + PIRP Irp; +}QUEUE_ENTRY, *PQUEUE_ENTRY; #endif Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Feb 18 19:11:59 2009 @@ -40,7 +40,7 @@ Status = IoCreateFile(NodeHandle, DesiredAccess, &ObjectAttributes, - &IoStatusBlock, + &IoStatusBlock, NULL, 0, 0,

15 years, 10 months

[janderwald] 39672: - Fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 18 18:47:00 2009 New Revision: 39672 URL: http://svn.reactos.org/svn/reactos?rev=39672&view=rev Log: - Fix build Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3967… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Wed Feb 18 18:47:00 2009 @@ -1018,7 +1018,7 @@ KSSTATE_ACQUIRE, KSSTATE_PAUSE, KSSTATE_RUN -} KSSTATE; +} KSSTATE, *PKSSTATE; typedef enum {

15 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
56
Older →

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 February 2009