Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[dreimer] 41671: Sync wordpad and winhlp32 with wine 1.1.24.
by dreimer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: dreimer Date: Sun Jun 28 21:27:56 2009 New Revision: 41671 URL: http://svn.reactos.org/svn/reactos?rev=41671&view=rev Log: Sync wordpad and winhlp32 with wine 1.1.24. Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/macro.h trunk/reactos/base/applications/winhlp32/macro.lex.l trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp.h trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Si.rc Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -39,21 +39,21 @@ POPUP "&Segnalibro" { MENUITEM "&Definisci...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opzioni" { + POPUP "Aiuto sempre visibile" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Predefinito", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visibile", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visibile", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Cronologia", MNID_OPTS_HISTORY + POPUP "Caratteri" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Piccolo", MNID_OPTS_FONTS_SMALL + MENUITEM "Normale", MNID_OPTS_FONTS_NORMAL + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usa colori di sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "&?" { MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON @@ -61,7 +61,7 @@ MENUITEM SEPARATOR MENUITEM "&Informazioni su...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Informazion su WINE", MNID_HELP_WINE + MENUITEM "&Informazioni su WINE", MNID_HELP_WINE #endif } } @@ -76,12 +76,12 @@ STID_INFO, "Informazione" STID_NOT_IMPLEMENTED, "Non ancora implementato" STID_HLPFILE_ERROR_s, "Errore di lettura del file della Guida `%s'" -STID_INDEX, "Index" +STID_INDEX, "Indice" STID_CONTENTS, "&Sommario" STID_BACK, "&Precedente" STID_ALL_FILES, "Tutti i file (*.*)" STID_HELP_FILES_HLP, "File della Guida (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "Non Ã¨ stato possibile trovare '%s'. Vuoi cercare questo file?" +STID_NO_RICHEDIT "Non Ã¨ stato possibile trovare un'implementazione richedit... Annullando" +STID_PSH_INDEX, "Argomenti di aiuto: " } Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -380,9 +380,9 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "macro.lex.l" +#line 1 ".\\macro.lex.l" #define INITIAL 0 -#line 2 "macro.lex.l" +#line 2 ".\\macro.lex.l" /* * Help Viewer * @@ -407,15 +407,20 @@ #define YY_NO_UNPUT 1 #define quote 1 -#line 26 "macro.lex.l" +#line 26 ".\\macro.lex.l" #include "config.h" #include <assert.h> +#include <stdarg.h> #ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H #endif -#include "macro.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winhelp.h" #include "wine/debug.h" @@ -428,6 +433,7 @@ unsigned quote_stk_idx; LPSTR cache_string[32]; int cache_used; + WINHELP_WINDOW* window; }; static struct lex_data* lex_data = NULL; @@ -436,7 +442,7 @@ #define YY_INPUT(buf,result,max_size)\ if ((result = *lex_data->macroptr ? 1 : 0)) buf[0] = *lex_data->macroptr++; -#line 440 "lex.yy.c" +#line 446 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -587,10 +593,10 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 55 "macro.lex.l" - - -#line 594 "lex.yy.c" +#line 61 ".\\macro.lex.l" + + +#line 600 "lex.yy.c" if ( yy_init ) { @@ -675,32 +681,32 @@ case 1: YY_RULE_SETUP -#line 57 "macro.lex.l" +#line 63 ".\\macro.lex.l" yylval.integer = strtol(yytext, NULL, 10); return INTEGER; YY_BREAK case 2: YY_RULE_SETUP -#line 58 "macro.lex.l" +#line 64 ".\\macro.lex.l" yylval.integer = strtol(yytext, NULL, 16); return INTEGER; YY_BREAK case 3: YY_RULE_SETUP -#line 60 "macro.lex.l" +#line 66 ".\\macro.lex.l" return MACRO_Lookup(yytext, &yylval); YY_BREAK case 4: -#line 63 "macro.lex.l" +#line 69 ".\\macro.lex.l" case 5: -#line 64 "macro.lex.l" +#line 70 ".\\macro.lex.l" case 6: -#line 65 "macro.lex.l" +#line 71 ".\\macro.lex.l" case 7: -#line 66 "macro.lex.l" +#line 72 ".\\macro.lex.l" case 8: -#line 67 "macro.lex.l" +#line 73 ".\\macro.lex.l" case 9: YY_RULE_SETUP -#line 67 "macro.lex.l" +#line 73 ".\\macro.lex.l" { if (lex_data->quote_stk_idx == 0 || (yytext[0] == '\"' && lex_data->quote_stack[lex_data->quote_stk_idx - 1] != '\"') || @@ -735,34 +741,34 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 99 "macro.lex.l" +#line 105 ".\\macro.lex.l" *lex_data->strptr++ = yytext[0]; YY_BREAK case 11: YY_RULE_SETUP -#line 100 "macro.lex.l" +#line 106 ".\\macro.lex.l" *lex_data->strptr++ = yytext[1]; YY_BREAK case YY_STATE_EOF(quote): -#line 101 "macro.lex.l" +#line 107 ".\\macro.lex.l" return 0; YY_BREAK case 12: YY_RULE_SETUP -#line 103 "macro.lex.l" +#line 109 ".\\macro.lex.l" YY_BREAK case 13: YY_RULE_SETUP -#line 104 "macro.lex.l" +#line 110 ".\\macro.lex.l" return yytext[0]; YY_BREAK case 14: YY_RULE_SETUP -#line 105 "macro.lex.l" +#line 111 ".\\macro.lex.l" ECHO; YY_BREAK -#line 766 "lex.yy.c" +#line 772 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1648,7 +1654,7 @@ return 0; } #endif -#line 105 "macro.lex.l" +#line 111 ".\\macro.lex.l" #if 0 @@ -1813,7 +1819,7 @@ return 1; } -BOOL MACRO_ExecuteMacro(LPCSTR macro) +BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro) { struct lex_data curr_lex_data, *prev_lex_data; BOOL ret = TRUE; @@ -1826,6 +1832,7 @@ memset(lex_data, 0, sizeof(*lex_data)); lex_data->macroptr = macro; + lex_data->window = WINHELP_GrabWindow(window); while ((t = yylex()) != EMPTY) { @@ -1840,13 +1847,15 @@ break; default: WINE_WARN("got unexpected type %s\n", ts(t)); - return 0; + YY_FLUSH_BUFFER; + ret = FALSE; + goto done; } switch (t = yylex()) { case EMPTY: goto done; case ';': break; - default: ret = FALSE; goto done; + default: ret = FALSE; YY_FLUSH_BUFFER; goto done; } } @@ -1854,10 +1863,16 @@ for (t = 0; t < lex_data->cache_used; t++) HeapFree(GetProcessHeap(), 0, lex_data->cache_string[t]); lex_data = prev_lex_data; + WINHELP_ReleaseWindow(window); return ret; } +WINHELP_WINDOW* MACRO_CurrentWindow(void) +{ + return lex_data ? lex_data->window : Globals.active_win; +} + #ifndef yywrap int yywrap(void) { return 1; } #endif Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -68,7 +68,7 @@ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro) { - WINHELP_WINDOW *win = Globals.active_win; + WINHELP_WINDOW *win = MACRO_CurrentWindow(); WINHELP_BUTTON *button, **b; LONG size; LPSTR ptr; @@ -115,7 +115,7 @@ WINE_TRACE("(\"%s\")\n", id); - b = MACRO_LookupButton(Globals.active_win, id); + b = MACRO_LookupButton(MACRO_CurrentWindow(), id); if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} EnableWindow((*b)->hWnd, FALSE); @@ -127,7 +127,7 @@ WINE_TRACE("(\"%s\")\n", id); - b = MACRO_LookupButton(Globals.active_win, id); + b = MACRO_LookupButton(MACRO_CurrentWindow(), id); if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;} EnableWindow((*b)->hWnd, TRUE); @@ -172,7 +172,7 @@ static void CALLBACK MACRO_Back(void) { - WINHELP_WINDOW* win = Globals.active_win; + WINHELP_WINDOW* win = MACRO_CurrentWindow(); WINE_TRACE("()\n"); @@ -182,7 +182,7 @@ static void CALLBACK MACRO_BackFlush(void) { - WINHELP_WINDOW* win = Globals.active_win; + WINHELP_WINDOW* win = MACRO_CurrentWindow(); WINE_TRACE("()\n"); @@ -201,7 +201,7 @@ static void CALLBACK MACRO_BrowseButtons(void) { - HLPFILE_PAGE* page = Globals.active_win->page; + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; ULONG relative; WINE_TRACE("()\n"); @@ -217,7 +217,7 @@ static void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) { - WINHELP_WINDOW* win = Globals.active_win; + WINHELP_WINDOW* win = MACRO_CurrentWindow(); WINHELP_BUTTON* button; WINHELP_BUTTON** b; LONG size; @@ -280,8 +280,8 @@ WINE_TRACE("()\n"); for (win = Globals.win_list; win; win = win->next) - if (win->lpszName && lstrcmpi(win->lpszName, "main")) - DestroyWindow(win->hMainWnd); + if (lstrcmpi(win->info->name, "main")) + WINHELP_ReleaseWindow(win); } static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) @@ -293,8 +293,8 @@ if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; for (win = Globals.win_list; win; win = win->next) - if (win->lpszName && !lstrcmpi(win->lpszName, lpszWindow)) - DestroyWindow(win->hMainWnd); + if (!lstrcmpi(win->info->name, lpszWindow)) + WINHELP_ReleaseWindow(win); } static void CALLBACK MACRO_Compare(LPCSTR str) @@ -304,10 +304,12 @@ static void CALLBACK MACRO_Contents(void) { - WINE_TRACE("()\n"); - - if (Globals.active_win->page) - MACRO_JumpContents(Globals.active_win->page->file->lpszPath, NULL); + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; + + WINE_TRACE("()\n"); + + if (page) + MACRO_JumpContents(page->file->lpszPath, NULL); } static void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u) @@ -365,7 +367,7 @@ WINE_TRACE("()\n"); while (Globals.win_list) - DestroyWindow(Globals.win_list->hMainWnd); + WINHELP_ReleaseWindow(Globals.win_list); } static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u) @@ -428,7 +430,7 @@ if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; for (win = Globals.win_list; win; win = win->next) - if (win->lpszName && !lstrcmpi(win->lpszName, lpszWindow)) + if (!lstrcmpi(win->info->name, lpszWindow)) SetFocus(win->hMainWnd); } @@ -447,7 +449,7 @@ LPCSTR file; WINE_TRACE("()\n"); - file = Globals.active_win->page->file->help_on_file; + file = MACRO_CurrentWindow()->page->file->help_on_file; if (!file) file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp"; @@ -473,12 +475,13 @@ static void CALLBACK MACRO_IfThen(BOOL b, LPCSTR t) { - if (b) MACRO_ExecuteMacro(t); + if (b) MACRO_ExecuteMacro(MACRO_CurrentWindow(), t); } static void CALLBACK MACRO_IfThenElse(BOOL b, LPCSTR t, LPCSTR f) { - if (b) MACRO_ExecuteMacro(t); else MACRO_ExecuteMacro(f); + if (b) MACRO_ExecuteMacro(MACRO_CurrentWindow(), t); + else MACRO_ExecuteMacro(MACRO_CurrentWindow(), f); } static BOOL CALLBACK MACRO_InitMPrint(void) @@ -532,7 +535,10 @@ HLPFILE* hlpfile; WINE_TRACE("(\"%s\", \"%s\", %u)\n", lpszPath, lpszWindow, lHash); - hlpfile = WINHELP_LookupHelpFile(lpszPath); + if (!lpszPath || !lpszPath[0]) + hlpfile = MACRO_CurrentWindow()->page->file; + else + hlpfile = WINHELP_LookupHelpFile(lpszPath); WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, WINHELP_GetWindowInfo(hlpfile, lpszWindow), SW_NORMAL); @@ -599,12 +605,12 @@ WINHELP_WNDPAGE wp; WINE_TRACE("()\n"); - wp.page = Globals.active_win->page; + wp.page = MACRO_CurrentWindow()->page; wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_fwd, &wp.relative); if (wp.page) { wp.page->file->wRefCount++; - wp.wininfo = Globals.active_win->info; + wp.wininfo = MACRO_CurrentWindow()->info; WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } @@ -639,12 +645,12 @@ WINHELP_WNDPAGE wp; WINE_TRACE("()\n"); - wp.page = Globals.active_win->page; + wp.page = MACRO_CurrentWindow()->page; wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_bwd, &wp.relative); if (wp.page) { wp.page->file->wRefCount++; - wp.wininfo = Globals.active_win->info; + wp.wininfo = MACRO_CurrentWindow()->info; WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } @@ -656,7 +662,7 @@ WINE_TRACE("()\n"); printer.lStructSize = sizeof(printer); - printer.hwndOwner = Globals.active_win->hMainWnd; + printer.hwndOwner = MACRO_CurrentWindow()->hMainWnd; printer.hInstance = Globals.hInstance; printer.hDevMode = 0; printer.hDevNames = 0; @@ -774,19 +780,23 @@ static void CALLBACK MACRO_SetHelpOnFile(LPCSTR str) { + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; + WINE_TRACE("(\"%s\")\n", str); - HeapFree(GetProcessHeap(), 0, Globals.active_win->page->file->help_on_file); - Globals.active_win->page->file->help_on_file = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); - if (Globals.active_win->page->file->help_on_file) - strcpy(Globals.active_win->page->file->help_on_file, str); + HeapFree(GetProcessHeap(), 0, page->file->help_on_file); + page->file->help_on_file = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + if (page->file->help_on_file) + strcpy(page->file->help_on_file, str); } static void CALLBACK MACRO_SetPopupColor(LONG r, LONG g, LONG b) { + HLPFILE_PAGE* page = MACRO_CurrentWindow()->page; + WINE_TRACE("(%x, %x, %x)\n", r, g, b); - Globals.active_win->page->file->has_popup_color = TRUE; - Globals.active_win->page->file->popup_color = RGB(r, g, b); + page->file->has_popup_color = TRUE; + page->file->popup_color = RGB(r, g, b); } static void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4) @@ -911,7 +921,7 @@ {"MPrintHash", NULL, 0, "U", (FARPROC)MACRO_MPrintHash}, {"MPrintID", NULL, 0, "S", (FARPROC)MACRO_MPrintID}, {"Next", NULL, 0, "", (FARPROC)MACRO_Next}, - {"NoShow", NULL, 0, "", (FARPROC)MACRO_NoShow}, + {"NoShow", "NS", 0, "", (FARPROC)MACRO_NoShow}, {"PopupContext", "PC", 0, "SU", (FARPROC)MACRO_PopupContext}, {"PopupHash", NULL, 0, "SU", (FARPROC)MACRO_PopupHash}, {"PopupId", "PI", 0, "SS", (FARPROC)MACRO_PopupId}, Modified: trunk/reactos/base/applications/winhlp32/macro.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.h [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -33,9 +33,11 @@ }; extern struct lexret yylval; +struct tagWinHelp; -BOOL MACRO_ExecuteMacro(LPCSTR); -int MACRO_Lookup(const char* name, struct lexret* lr); +BOOL MACRO_ExecuteMacro(struct tagWinHelp*, LPCSTR); +int MACRO_Lookup(const char* name, struct lexret* lr); +struct tagWinHelp* MACRO_CurrentWindow(void); enum token_types {EMPTY, VOID_FUNCTION, BOOL_FUNCTION, INTEGER, STRING, IDENTIFIER}; void CALLBACK MACRO_About(void); Modified: trunk/reactos/base/applications/winhlp32/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -25,12 +25,17 @@ %{ #include "config.h" #include <assert.h> +#include <stdarg.h> #ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H #endif -#include "macro.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winhelp.h" #include "wine/debug.h" @@ -43,6 +48,7 @@ unsigned quote_stk_idx; LPSTR cache_string[32]; int cache_used; + WINHELP_WINDOW* window; }; static struct lex_data* lex_data = NULL; @@ -266,7 +272,7 @@ return 1; } -BOOL MACRO_ExecuteMacro(LPCSTR macro) +BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro) { struct lex_data curr_lex_data, *prev_lex_data; BOOL ret = TRUE; @@ -279,6 +285,7 @@ memset(lex_data, 0, sizeof(*lex_data)); lex_data->macroptr = macro; + lex_data->window = WINHELP_GrabWindow(window); while ((t = yylex()) != EMPTY) { @@ -293,13 +300,15 @@ break; default: WINE_WARN("got unexpected type %s\n", ts(t)); - return 0; + YY_FLUSH_BUFFER; + ret = FALSE; + goto done; } switch (t = yylex()) { case EMPTY: goto done; case ';': break; - default: ret = FALSE; goto done; + default: ret = FALSE; YY_FLUSH_BUFFER; goto done; } } @@ -307,8 +316,14 @@ for (t = 0; t < lex_data->cache_used; t++) HeapFree(GetProcessHeap(), 0, lex_data->cache_string[t]); lex_data = prev_lex_data; + WINHELP_ReleaseWindow(window); return ret; +} + +WINHELP_WINDOW* MACRO_CurrentWindow(void) +{ + return lex_data ? lex_data->window : Globals.active_win; } #ifndef yywrap 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] Sun Jun 28 21:27:56 2009 @@ -257,11 +257,11 @@ unsigned int i; if (!name || !name[0]) - name = Globals.active_win->lpszName; + name = Globals.active_win->info->name; if (hlpfile) for (i = 0; i < hlpfile->numWindows; i++) - if (!strcmp(hlpfile->windows[i].name, name)) + if (!lstrcmpi(hlpfile->windows[i].name, name)) return &hlpfile->windows[i]; if (strcmp(name, "main") != 0) @@ -274,11 +274,19 @@ { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); + if (hlpfile && hlpfile->lpszTitle[0]) + { + char tmp[128]; + LoadString(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp)); + snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", + hlpfile->lpszTitle, tmp, hlpfile->lpszPath); + } + else + LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW; - mwi.sr_color = mwi.sr_color = 0xFFFFFF; + mwi.sr_color = mwi.nsr_color = 0xFFFFFF; } return &mwi; } @@ -500,11 +508,39 @@ /*********************************************************************** * + * WINHELP_GrabWindow + */ +WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW* win) +{ + WINE_TRACE("Grab %p#%d++\n", win, win->ref_count); + win->ref_count++; + return win; +} + +/*********************************************************************** + * + * WINHELP_RelaseWindow + */ +BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win) +{ + WINE_TRACE("Release %p#%d--\n", win, win->ref_count); + + if (!--win->ref_count) + { + DestroyWindow(win->hMainWnd); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * * WINHELP_DeleteWindow */ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; + BOOL bExit; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -514,6 +550,7 @@ break; } } + bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->info->name, "main")); if (Globals.active_win == win) { @@ -537,6 +574,10 @@ if (win->page) HLPFILE_FreeHlpFile(win->page->file); HeapFree(GetProcessHeap(), 0, win); + + if (bExit) MACRO_Exit(); + if (!Globals.win_list) + PostQuitMessage(0); } static char* WINHELP_GetCaption(WINHELP_WNDPAGE* wpage) @@ -645,7 +686,6 @@ { WINHELP_WINDOW* win = NULL; BOOL bPrimary, bPopup, bReUsed = FALSE; - LPSTR name; HICON hIcon; HWND hTextWnd = NULL; @@ -656,7 +696,7 @@ { for (win = Globals.win_list; win; win = win->next) { - if (!lstrcmpi(win->lpszName, wpage->wininfo->name)) + if (!lstrcmpi(win->info->name, wpage->wininfo->name)) { POINT pt = {0, 0}; SIZE sz = {0, 0}; @@ -699,21 +739,19 @@ if (!win) { /* Initialize WINHELP_WINDOW struct */ - win = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(WINHELP_WINDOW) + strlen(wpage->wininfo->name) + 1); + win = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINHELP_WINDOW)); if (!win) return FALSE; win->next = Globals.win_list; Globals.win_list = win; - name = (char*)win + sizeof(WINHELP_WINDOW); - lstrcpy(name, wpage->wininfo->name); - win->lpszName = name; win->hHandCur = LoadCursorW(0, (LPWSTR)IDC_HAND); win->back.index = 0; win->font_scale = 1; + WINHELP_GrabWindow(win); } win->page = wpage->page; win->info = wpage->wininfo; + WINHELP_GrabWindow(win); if (!bPopup && wpage->page && remember) { @@ -772,11 +810,19 @@ { HLPFILE_MACRO *macro; for (macro = wpage->page->file->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); + MACRO_ExecuteMacro(win, macro->lpszMacro); for (macro = wpage->page->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); - } + MACRO_ExecuteMacro(win, macro->lpszMacro); + } + /* See #17681, in some cases, the newly created window is closed by the macros it contains + * (braindead), so deal with this case + */ + for (win = Globals.win_list; win; win = win->next) + { + if (!lstrcmpi(win->info->name, wpage->wininfo->name)) break; + } + if (!win || !WINHELP_ReleaseWindow(win)) return TRUE; if (bPopup) { @@ -870,7 +916,7 @@ SW_NORMAL); break; case hlp_link_macro: - MACRO_ExecuteMacro(link->string); + MACRO_ExecuteMacro(win, link->string); break; default: WINE_FIXME("Unknown link cookie %d\n", link->cookie); @@ -888,7 +934,7 @@ */ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT* lret) { - HWND hPopup; + WINHELP_WINDOW* popup; if (!Globals.active_popup) return FALSE; @@ -921,9 +967,9 @@ case WM_NCLBUTTONDOWN: case WM_NCMBUTTONDOWN: case WM_NCRBUTTONDOWN: - hPopup = Globals.active_popup->hMainWnd; + popup = Globals.active_popup; Globals.active_popup = NULL; - DestroyWindow(hPopup); + WINHELP_ReleaseWindow(popup); return TRUE; } return FALSE; @@ -1368,7 +1414,7 @@ for (button = win->first_button; button; button = button->next) if (wParam == button->wParam) break; if (button) - MACRO_ExecuteMacro(button->lpszMacro); + MACRO_ExecuteMacro(win, button->lpszMacro); else if (!HIWORD(wParam)) MessageBox(0, MAKEINTRESOURCE(STID_NOT_IMPLEMENTED), MAKEINTRESOURCE(STID_WHERROR), MB_OK); @@ -1427,7 +1473,8 @@ switch (msgf->msg) { case WM_KEYUP: - if (msgf->wParam == VK_ESCAPE) DestroyWindow(hWnd); + if (msgf->wParam == VK_ESCAPE) + WINHELP_ReleaseWindow((WINHELP_WINDOW*)GetWindowLongPtr(hWnd, 0)); break; case WM_RBUTTONDOWN: { @@ -1491,18 +1538,9 @@ CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE, MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0); break; - - case WM_NCDESTROY: - { - BOOL bExit; - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); - WINHELP_DeleteWindow(win); - - if (bExit) MACRO_Exit(); - if (!Globals.win_list) - PostQuitMessage(0); - } + case WM_DESTROY: + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + WINHELP_DeleteWindow(win); break; } return DefWindowProc(hWnd, msg, wParam, lParam); Modified: trunk/reactos/base/applications/winhlp32/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -71,8 +71,7 @@ typedef struct tagWinHelp { - LPCSTR lpszName; - + unsigned ref_count; WINHELP_BUTTON* first_button; HLPFILE_PAGE* page; @@ -153,6 +152,8 @@ HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name); void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win); +WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW*); +BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW*); extern const char MAIN_WIN_CLASS_NAME[]; extern const char BUTTON_BOX_WIN_CLASS_NAME[]; Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -242,6 +242,7 @@ STRING_OPEN_FAILED, "Die Datei konnte nicht geÃ¶ffnet werden." STRING_OPEN_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu Ã¶ffnen." STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" + STRING_MAX_TAB_STOPS, "Es kÃ¶nnen nur maximal 32 Tabstopps definiert werden." END #pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 by Jonathan Ernst + * Copyright 2006-2009 by Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -240,4 +240,5 @@ STRING_OPEN_FAILED, "Impossible d'ouvrir le fichier." STRING_OPEN_ACCESS_DENIED, "Vous ne disposez pas des accès nécessaires à l'ouverture du fichier." STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas implémentée" -END + STRING_MAX_TAB_STOPS, "Impossible d'ajouter plus de 32 taquets de tabulation." +END Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Sun Jun 28 21:27:56 2009 @@ -242,7 +242,8 @@ STRING_WRITE_ACCESS_DENIED, "Nimate pravic za shranjevanje te datoteke." STRING_OPEN_FAILED, "Napaka pri odpiranju datoteke." STRING_OPEN_ACCESS_DENIED, "Nimate pravic za odpiranje te datoteke." - STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (Å¡e) ni na voljo" + STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (Å¡e) ni na voljo" + STRING_MAX_TAB_STOPS, "Ne morem vstaviti veÄ kot 32 poloÅ¾ajev tabulatorja." END #pragma code_page(default)

1 0

[dreimer] 41670: fix bug in makefile.
by dreimer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: dreimer Date: Sun Jun 28 21:20:19 2009 New Revision: 41670 URL: http://svn.reactos.org/svn/reactos?rev=41670&view=rev Log: fix bug in makefile. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile [iso-8859-1] Sun Jun 28 21:20:19 2009 @@ -9,8 +9,8 @@ LFLAGS := -mwindows -s LIBS := -lshell32 -SRCS := options.c -RC := options.rc +SRCS := options64.c +RC := options64.rc OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff)

1 0

[dreimer] 41669: Forgot one line.
by dreimer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: dreimer Date: Sun Jun 28 20:31:07 2009 New Revision: 41669 URL: http://svn.reactos.org/svn/reactos?rev=41669&view=rev Log: Forgot one line. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Jun 28 20:31:07 2009 @@ -6,6 +6,7 @@ the "buildno.h not found" error, too (Daniel Reimer) - Fixed "ssvn create" not working due to the fact that RosBE creates a log folder and then tries to verify a empty folder. Thx for gabriel_it and kjk_hyperion for mentioning. (Daniel Reimer) +- Updated: NSIS to 2.45 (Daniel Reimer) *** May 26th, 2009 - RosBE 1.4.3 Released

1 0

[dreimer] 41668: Prepare for RosBE 1.4.4 Beta
by dreimer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: dreimer Date: Sun Jun 28 19:02:50 2009 New Revision: 41668 URL: http://svn.reactos.org/svn/reactos?rev=41668&view=rev Log: Prepare for RosBE 1.4.4 Beta Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sun Jun 28 19:02:50 2009 @@ -30,7 +30,7 @@ $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) -$global:_ROSBE_VERSION = "1.4.3" +$global:_ROSBE_VERSION = "1.4.4" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Jun 28 19:02:50 2009 @@ -1,3 +1,12 @@ +*** Jul xxth, 2009 - RosBE 1.4.4 Released + +- Reverted to the old GCC. Because of the optimization we have problems running ROS on Pentium I PCs. (Colin Finck) +- Updated SVN to 1.6.3 (Daniel Reimer) +- Fixed a bug which prevented makefile.auto to be deleted by "clean" in the PS Version, this was the reason for + the "buildno.h not found" error, too (Daniel Reimer) +- Fixed "ssvn create" not working due to the fact that RosBE creates a log folder and then tries to verify a + empty folder. Thx for gabriel_it and kjk_hyperion for mentioning. (Daniel Reimer) + *** May 26th, 2009 - RosBE 1.4.3 Released - GCC is now optimized for Pentium3. Thus it uses MMX and SSE Optimizations (Colin Finck) Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Sun Jun 28 19:02:50 2009 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.4.3 +ReactOS Build Environment v1.4.4 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Jun 28 19:02:50 2009 @@ -30,7 +30,7 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% -set _ROSBE_VERSION=1.4.3 +set _ROSBE_VERSION=1.4.4 set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun Jun 28 19:02:50 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.4.3" +!define PRODUCT_VERSION "1.4.4" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.4.3.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.4.4.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.4.3.0" +VIProductVersion "1.4.4.0" CRCCheck force SetDatablockOptimize on

1 0

[cfinck] 41667: Merge 41666
by cfinck＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cfinck Date: Sun Jun 28 18:59:34 2009 New Revision: 41667 URL: http://svn.reactos.org/svn/reactos?rev=41667&view=rev Log: Merge 41666 Modified: branches/ros-branch-0_3_10/reactos/ (props changed) branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_10/reactos/modules/ (props changed) branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/ros-branch-0_3_10/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 28 18:59:34 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:41447,41526 +/trunk/reactos:41447,41526,41666 Modified: branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/boot/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 28 18:59:34 2009 @@ -654,7 +654,18 @@ subsystems\ntvdm\ntvdm.exe 1 subsystems\win32\win32k\win32k.sys 1 -; Modules +; Optional/proprietary files +modules\optional\kvmnet.inf 6 optional +modules\optional\kvmnet.sys 2 optional +modules\optional\mfc42.dll 1 optional +modules\optional\Systema.ttf 3 optional +modules\optional\vmx_fb.dll 1 optional +modules\optional\vmx_mode.dll 1 optional +modules\optional\vmx_svga.inf 6 optional +modules\optional\vmx_svga.sys 2 optional +modules\optional\wine_gecko-0.9.1.cab 4 optional + +; Rosapps modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional @@ -705,6 +716,7 @@ modules\rosapps\demos\maze\maze.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional +; Rostests modules\rostests\rosautotest\rosautotest.exe 1 optional modules\rostests\tests\pseh2\pseh2_test.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional @@ -760,15 +772,3 @@ modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional - -; Native libraries -modules\windows\mfc42.dll 1 optional -modules\windows\vmx_fb.dll 1 optional -modules\windows\vmx_mode.dll 1 optional -modules\windows\vmx_svga.sys 2 optional -modules\windows\vmx_svga.inf 6 optional -modules\windows\kvmnet.sys 2 optional -modules\windows\kvmnet.inf 6 optional - -; Gecko -modules\windows\wine_gecko-0.9.1.cab 4 optional Propchange: branches/ros-branch-0_3_10/reactos/modules/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jun 28 18:59:34 2009 @@ -5,3 +5,4 @@ *.ncb *.suo *.sln +optional Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 28 18:59:34 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095 -/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526 +/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 28 18:59:34 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.c:41447,41526 +/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 28 18:59:34 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.h:41447,41526 +/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 28 18:59:34 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.mak:41447,41526 +/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 28 18:59:34 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym_common.c:41447,41526 +/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666

1 0

[cfinck] 41666: - Give the "windows" module a more meaningful name. It's now called "optional" as it started to contain other stuff apart from Windows native libraries. - Add an optional file reference to the Systema font for Japanese text. The Japanese ROS GUI is already using it. This is probably just an intermediate solution as the font is Japanese-only (no Chinese or Korean support) and might not fit that well for dialogs, but it should serve us well for some time.
by cfinck＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cfinck Date: Sun Jun 28 18:41:02 2009 New Revision: 41666 URL: http://svn.reactos.org/svn/reactos?rev=41666&view=rev Log: - Give the "windows" module a more meaningful name. It's now called "optional" as it started to contain other stuff apart from Windows native libraries. - Add an optional file reference to the Systema font for Japanese text. The Japanese ROS GUI is already using it. This is probably just an intermediate solution as the font is Japanese-only (no Chinese or Korean support) and might not fit that well for dialogs, but it should serve us well for some time. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/modules/ (props changed) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 28 18:41:02 2009 @@ -654,7 +654,18 @@ subsystems\ntvdm\ntvdm.exe 1 subsystems\win32\win32k\win32k.sys 1 -; Modules +; Optional/proprietary files +modules\optional\kvmnet.inf 6 optional +modules\optional\kvmnet.sys 2 optional +modules\optional\mfc42.dll 1 optional +modules\optional\Systema.ttf 3 optional +modules\optional\vmx_fb.dll 1 optional +modules\optional\vmx_mode.dll 1 optional +modules\optional\vmx_svga.inf 6 optional +modules\optional\vmx_svga.sys 2 optional +modules\optional\wine_gecko-0.9.1.cab 4 optional + +; Rosapps modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional @@ -705,6 +716,7 @@ modules\rosapps\demos\maze\maze.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional +; Rostests modules\rostests\rosautotest\rosautotest.exe 1 optional modules\rostests\tests\pseh2\pseh2_test.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional @@ -760,15 +772,3 @@ modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional - -; Native libraries -modules\windows\mfc42.dll 1 optional -modules\windows\vmx_fb.dll 1 optional -modules\windows\vmx_mode.dll 1 optional -modules\windows\vmx_svga.sys 2 optional -modules\windows\vmx_svga.inf 6 optional -modules\windows\kvmnet.sys 2 optional -modules\windows\kvmnet.inf 6 optional - -; Gecko -modules\windows\wine_gecko-0.9.1.cab 4 optional Propchange: trunk/reactos/modules/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jun 28 18:41:02 2009 @@ -5,3 +5,4 @@ *.ncb *.suo *.sln +optional

1 0

[dreimer] 41665: Fix two RosBE bugs: - clean did not remove the makefile in the PS Version. - ssvn did not work, because RosBE creates the logdir before the folder emptyness test. Plz test.
by dreimer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: dreimer Date: Sun Jun 28 18:23:17 2009 New Revision: 41665 URL: http://svn.reactos.org/svn/reactos?rev=41665&view=rev Log: Fix two RosBE bugs: - clean did not remove the makefile in the PS Version. - ssvn did not work, because RosBE creates the logdir before the folder emptyness test. Plz test. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sun Jun 28 18:23:17 2009 @@ -38,9 +38,9 @@ } if ($ENV:ROS_ARCH -eq "i386") { + $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" + } else { $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" - } else { - $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" } if (Test-Path "$MAKEFILE") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun Jun 28 18:23:17 2009 @@ -73,6 +73,7 @@ if (Test-Path ".svn\.") { "ERROR: Folder already contains a repository." } else { + $null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force) $dir = get-childitem if ($dir -eq $null) { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Sun Jun 28 18:23:17 2009 @@ -46,7 +46,7 @@ echo ERROR: Folder already contains a repository. goto :EOC ) - + rd /s /q "%_ROSBE_LOGDIR%" 1> NUL 2> NUL dir /b 2>nul | findstr "." >nul if errorlevel 1 ( "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos .

1 0

[hyperion] 41664: modified base/applications/taskmgr/affinity.c modified base/applications/taskmgr/debug.c modified base/applications/taskmgr/endproc.c modified base/applications/taskmgr/priority.c Arch Blackmann has never heard of exotic features of the C language such as "subroutines" modified base/applications/taskmgr/dbgchnl.c modified base/applications/taskmgr/procpage.c modified base/applications/taskmgr/procpage.h Did you know that Task Manager killed the wrong process when using the cont
by hyperion＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: hyperion Date: Sun Jun 28 18:22:09 2009 New Revision: 41664 URL: http://svn.reactos.org/svn/reactos?rev=41664&view=rev Log: modified base/applications/taskmgr/affinity.c modified base/applications/taskmgr/debug.c modified base/applications/taskmgr/endproc.c modified base/applications/taskmgr/priority.c Arch Blackmann has never heard of exotic features of the C language such as "subroutines" modified base/applications/taskmgr/dbgchnl.c modified base/applications/taskmgr/procpage.c modified base/applications/taskmgr/procpage.h Did you know that Task Manager killed the wrong process when using the context menu? Fixed by using a sophisticated "subroutine" that reads the process entry index from the currently selected list item's client data, replacing the copy-pasted code that used the index of the list entry as the process entry index (which only worked before due to no sorting) Save the sort column and order modified base/applications/taskmgr/taskmgr.c Sort by image name by default Modified: trunk/reactos/base/applications/taskmgr/affinity.c trunk/reactos/base/applications/taskmgr/dbgchnl.c trunk/reactos/base/applications/taskmgr/debug.c trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/priority.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/procpage.h trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/affinity.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/affinity.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -40,24 +40,15 @@ void ProcessPage_OnSetAffinity(void) { - LV_ITEM lvitem; - ULONG Index; DWORD dwProcessId; WCHAR strErrorText[260]; WCHAR szTitle[256]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LV_ITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } - dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + dwProcessId = GetSelectedProcessId(); + + if (dwProcessId == 0) return; + hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/dbgchnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/dbgchnl.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -40,33 +40,6 @@ return TRUE; #endif return FALSE; -} - -static DWORD get_selected_pid(void) -{ - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return 0; - return dwProcessId; } static int list_channel_CB(HANDLE hProcess, void* addr, WCHAR* buffer, void* user) @@ -290,7 +263,7 @@ (void)ListView_DeleteAllItems(hChannelLV); - hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); + hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, GetSelectedProcessId()); if (!hProcess) return; /* FIXME messagebox */ SendMessageW(hChannelLV, WM_SETREDRAW, FALSE, 0); enum_channel(hProcess, list_channel_CB, (void*)hChannelLV, TRUE); @@ -350,7 +323,7 @@ HANDLE hProcess; NMITEMACTIVATE* nmia = (NMITEMACTIVATE*)lParam; - hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, FALSE, get_selected_pid()); + hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, FALSE, GetSelectedProcessId()); if (!hProcess) return; /* FIXME message box */ lhti.pt = nmia->ptAction; hChannelLV = GetDlgItem(hDlg, IDC_DEBUG_CHANNELS_LIST); Modified: trunk/reactos/base/applications/taskmgr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/debug.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/debug.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -25,8 +25,6 @@ void ProcessPage_OnDebug(void) { - LVITEM lvitem; - ULONG Index; DWORD dwProcessId; WCHAR strErrorText[260]; HKEY hKey; @@ -39,24 +37,9 @@ WCHAR szTemp[256]; WCHAR szTempA[256]; + dwProcessId = GetSelectedProcessId(); - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if (dwProcessId == 0) return; LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, 256); Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -25,30 +25,14 @@ void ProcessPage_OnEndProcess(void) { - LVITEM lvitem; - ULONG Index; DWORD dwProcessId; HANDLE hProcess; WCHAR szTitle[256]; WCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + dwProcessId = GetSelectedProcessId(); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if (dwProcessId == 0) return; LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); @@ -78,30 +62,14 @@ void ProcessPage_OnEndProcessTree(void) { - LVITEM lvitem; - ULONG Index; DWORD dwProcessId; HANDLE hProcess; WCHAR szTitle[256]; WCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + dwProcessId = GetSelectedProcessId(); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if (dwProcessId == 0) return; LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); Modified: trunk/reactos/base/applications/taskmgr/priority.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/priority.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/priority.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -25,30 +25,14 @@ void DoSetPriority(DWORD priority) { - LVITEM lvitem; - ULONG Index; DWORD dwProcessId; HANDLE hProcess; WCHAR szText[260]; WCHAR szTitle[256]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - ZeroMemory(&lvitem, sizeof(LVITEM)); + dwProcessId = GetSelectedProcessId(); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if (dwProcessId == 0) return; LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -40,10 +40,7 @@ static int nProcessPageWidth; static int nProcessPageHeight; -static BOOL bProcessSort = FALSE; -static BOOL bProcessSortAscending = FALSE; static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */ -static ULONG ProcessSortColumnIndex = 0; int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); void AddProcess(ULONG Index); @@ -55,6 +52,29 @@ BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); +DWORD GetSelectedProcessId(void) +{ + int Index; + LVITEM lvitem; + + if(ListView_GetSelectedCount(hProcessPageListCtrl) == 1) + { + Index = ListView_GetSelectionMark(hProcessPageListCtrl); + + memset(&lvitem, 0, sizeof(LVITEM)); + + lvitem.mask = LVIF_PARAM; + lvitem.iItem = Index; + + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); + + if (lvitem.lParam) + return PerfDataGetProcessId(((LPPROCESS_PAGE_LIST_ITEM)lvitem.lParam)->Index); + } + + return 0; +} + INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -171,7 +191,6 @@ LPNMLISTVIEW pnmv; NMLVDISPINFO* pnmdi; LPNMHEADER pnmhdr; - LVITEM lvitem; ULONG Index; ULONG ColumnIndex; LPPROCESS_PAGE_LIST_ITEM pData; @@ -207,26 +226,7 @@ case NM_RCLICK: - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) == 1) && - (PerfDataGetProcessId(Index) != 0)) - { - ProcessPageShowContextMenu(PerfDataGetProcessId(Index)); - } - + ProcessPageShowContextMenu(GetSelectedProcessId()); break; } @@ -237,10 +237,9 @@ { case HDN_ITEMCLICK: - ProcessSortColumnIndex = pnmhdr->iItem; - bProcessSortAscending = !bProcessSortAscending; + TaskManagerSettings.SortColumn = ColumnDataHints[pnmhdr->iItem]; + TaskManagerSettings.SortAscending = !TaskManagerSettings.SortAscending; (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); - bProcessSort = TRUE; break; @@ -447,7 +446,7 @@ { AddProcess(l); } - if (bProcessSort) + if (TaskManagerSettings.SortColumn != -1) { (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); } @@ -674,7 +673,6 @@ int ret = 0; LPPROCESS_PAGE_LIST_ITEM Param1; LPPROCESS_PAGE_LIST_ITEM Param2; - ULONG ColumnIndex; WCHAR text1[260]; WCHAR text2[260]; ULONG l1; @@ -686,130 +684,129 @@ ULONGLONG ull1; ULONGLONG ull2; - if (bProcessSortAscending) { + if (TaskManagerSettings.SortAscending) { Param1 = (LPPROCESS_PAGE_LIST_ITEM)lParam1; Param2 = (LPPROCESS_PAGE_LIST_ITEM)lParam2; } else { Param1 = (LPPROCESS_PAGE_LIST_ITEM)lParam2; Param2 = (LPPROCESS_PAGE_LIST_ITEM)lParam1; } - ColumnIndex = ProcessSortColumnIndex; - - if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) + + if (TaskManagerSettings.SortColumn == COLUMN_IMAGENAME) { PerfDataGetImageName(Param1->Index, text1, sizeof (text1) / sizeof (*text1)); PerfDataGetImageName(Param2->Index, text2, sizeof (text2) / sizeof (*text2)); ret = _wcsicmp(text1, text2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_PID) + else if (TaskManagerSettings.SortColumn == COLUMN_PID) { l1 = PerfDataGetProcessId(Param1->Index); l2 = PerfDataGetProcessId(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) + else if (TaskManagerSettings.SortColumn == COLUMN_USERNAME) { PerfDataGetUserName(Param1->Index, text1, sizeof (text1) / sizeof (*text1)); PerfDataGetUserName(Param2->Index, text2, sizeof (text2) / sizeof (*text2)); ret = _wcsicmp(text1, text2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) + else if (TaskManagerSettings.SortColumn == COLUMN_SESSIONID) { l1 = PerfDataGetSessionId(Param1->Index); l2 = PerfDataGetSessionId(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) + else if (TaskManagerSettings.SortColumn == COLUMN_CPUUSAGE) { l1 = PerfDataGetCPUUsage(Param1->Index); l2 = PerfDataGetCPUUsage(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) + else if (TaskManagerSettings.SortColumn == COLUMN_CPUTIME) { time1 = PerfDataGetCPUTime(Param1->Index); time2 = PerfDataGetCPUTime(Param2->Index); ret = largeintcmp(time1, time2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) + else if (TaskManagerSettings.SortColumn == COLUMN_MEMORYUSAGE) { l1 = PerfDataGetWorkingSetSizeBytes(Param1->Index); l2 = PerfDataGetWorkingSetSizeBytes(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) + else if (TaskManagerSettings.SortColumn == COLUMN_PEAKMEMORYUSAGE) { l1 = PerfDataGetPeakWorkingSetSizeBytes(Param1->Index); l2 = PerfDataGetPeakWorkingSetSizeBytes(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) + else if (TaskManagerSettings.SortColumn == COLUMN_MEMORYUSAGEDELTA) { l1 = PerfDataGetWorkingSetSizeDelta(Param1->Index); l2 = PerfDataGetWorkingSetSizeDelta(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) + else if (TaskManagerSettings.SortColumn == COLUMN_PAGEFAULTS) { l1 = PerfDataGetPageFaultCount(Param1->Index); l2 = PerfDataGetPageFaultCount(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) + else if (TaskManagerSettings.SortColumn == COLUMN_PAGEFAULTSDELTA) { l1 = PerfDataGetPageFaultCountDelta(Param1->Index); l2 = PerfDataGetPageFaultCountDelta(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) + else if (TaskManagerSettings.SortColumn == COLUMN_VIRTUALMEMORYSIZE) { l1 = PerfDataGetVirtualMemorySizeBytes(Param1->Index); l2 = PerfDataGetVirtualMemorySizeBytes(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) + else if (TaskManagerSettings.SortColumn == COLUMN_PAGEDPOOL) { l1 = PerfDataGetPagedPoolUsagePages(Param1->Index); l2 = PerfDataGetPagedPoolUsagePages(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) + else if (TaskManagerSettings.SortColumn == COLUMN_NONPAGEDPOOL) { l1 = PerfDataGetNonPagedPoolUsagePages(Param1->Index); l2 = PerfDataGetNonPagedPoolUsagePages(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) + else if (TaskManagerSettings.SortColumn == COLUMN_BASEPRIORITY) { l1 = PerfDataGetBasePriority(Param1->Index); l2 = PerfDataGetBasePriority(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) + else if (TaskManagerSettings.SortColumn == COLUMN_HANDLECOUNT) { l1 = PerfDataGetHandleCount(Param1->Index); l2 = PerfDataGetHandleCount(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) + else if (TaskManagerSettings.SortColumn == COLUMN_THREADCOUNT) { l1 = PerfDataGetThreadCount(Param1->Index); l2 = PerfDataGetThreadCount(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) + else if (TaskManagerSettings.SortColumn == COLUMN_USEROBJECTS) { l1 = PerfDataGetUSERObjectCount(Param1->Index); l2 = PerfDataGetUSERObjectCount(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) + else if (TaskManagerSettings.SortColumn == COLUMN_GDIOBJECTS) { l1 = PerfDataGetGDIObjectCount(Param1->Index); l2 = PerfDataGetGDIObjectCount(Param2->Index); ret = CMP(l1, l2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) + else if (TaskManagerSettings.SortColumn == COLUMN_IOREADS) { PerfDataGetIOCounters(Param1->Index, &iocounters1); PerfDataGetIOCounters(Param2->Index, &iocounters2); @@ -817,7 +814,7 @@ ull2 = iocounters2.ReadOperationCount; ret = CMP(ull1, ull2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) + else if (TaskManagerSettings.SortColumn == COLUMN_IOWRITES) { PerfDataGetIOCounters(Param1->Index, &iocounters1); PerfDataGetIOCounters(Param2->Index, &iocounters2); @@ -825,7 +822,7 @@ ull2 = iocounters2.WriteOperationCount; ret = CMP(ull1, ull2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) + else if (TaskManagerSettings.SortColumn == COLUMN_IOOTHER) { PerfDataGetIOCounters(Param1->Index, &iocounters1); PerfDataGetIOCounters(Param2->Index, &iocounters2); @@ -833,7 +830,7 @@ ull2 = iocounters2.OtherOperationCount; ret = CMP(ull1, ull2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) + else if (TaskManagerSettings.SortColumn == COLUMN_IOREADBYTES) { PerfDataGetIOCounters(Param1->Index, &iocounters1); PerfDataGetIOCounters(Param2->Index, &iocounters2); @@ -841,7 +838,7 @@ ull2 = iocounters2.ReadTransferCount; ret = CMP(ull1, ull2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) + else if (TaskManagerSettings.SortColumn == COLUMN_IOWRITEBYTES) { PerfDataGetIOCounters(Param1->Index, &iocounters1); PerfDataGetIOCounters(Param2->Index, &iocounters2); @@ -849,7 +846,7 @@ ull2 = iocounters2.WriteTransferCount; ret = CMP(ull1, ull2); } - else if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) + else if (TaskManagerSettings.SortColumn == COLUMN_IOOTHERBYTES) { PerfDataGetIOCounters(Param1->Index, &iocounters1); PerfDataGetIOCounters(Param2->Index, &iocounters2); Modified: trunk/reactos/base/applications/taskmgr/procpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.h [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -31,5 +31,6 @@ INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void RefreshProcessPage(void); +DWORD GetSelectedProcessId(void); #endif /* __PROCESSPAGE_H */ Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sun Jun 28 18:22:09 2009 @@ -706,7 +706,7 @@ TaskManagerSettings.ColumnSizeArray[i] = ColumnPresets[i].size; } - TaskManagerSettings.SortColumn = 1; + TaskManagerSettings.SortColumn = COLUMN_IMAGENAME; TaskManagerSettings.SortAscending = TRUE; /* Performance page settings */

1 0

[janderwald] 41663: - Fix build
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Sun Jun 28 18:12:58 2009 New Revision: 41663 URL: http://svn.reactos.org/svn/reactos?rev=41663&view=rev Log: - Fix build Modified: trunk/reactos/include/ddk/strmini.h Modified: trunk/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/strmini.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/strmini.h [iso-8859-1] Sun Jun 28 18:12:58 2009 @@ -451,7 +451,7 @@ IN ULONG AssertValue ); -VOID +VOID __cdecl StreamClassDebugPrint( IN STREAM_DEBUG_LEVEL DebugPrintLevel, @@ -464,7 +464,10 @@ StreamClassDeviceNotification( IN STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE NotificationType, IN PVOID HwDeviceExtension, - ... + IN PHW_STREAM_REQUEST_BLOCK pSrb, + IN PKSEVENT_ENTRY EventEntry, + IN GUID *EventSet, + IN ULONG EventId ); VOID

1 0

[janderwald] 41662: - Start implementing the stream class driver - Implemented StreamClassRegisterAdapter, StreamClassReenumerateStreams, StreamClassDebugAssert, StreamClassDebugPrint, StreamClassGetDmaBuffer - Drivers using stream class driver should now be able to initialize
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Sun Jun 28 17:58:47 2009 New Revision: 41662 URL: http://svn.reactos.org/svn/reactos?rev=41662&view=rev Log: - Start implementing the stream class driver - Implemented StreamClassRegisterAdapter, StreamClassReenumerateStreams, StreamClassDebugAssert, StreamClassDebugPrint, StreamClassGetDmaBuffer - Drivers using stream class driver should now be able to initialize Added: trunk/reactos/drivers/wdm/audio/legacy/stream/ (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/control.c (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/dll.c (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/helper.c (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/stream.h (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rbuild (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rc (with props) trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec (with props) Modified: trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild Modified: trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/d… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -4,4 +4,8 @@ <directory name="wdmaud"> <xi:include href="wdmaud/wdmaud.rbuild" /> </directory> + <directory name="stream"> + <xi:include href="stream/stream.rbuild" /> + </directory> + </group> Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jun 28 17:58:47 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/wdm/audio/legacy/stream/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/control.c (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/control.c [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,71 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/stream/dll.c + * PURPOSE: kernel mode driver initialization + * PROGRAMMER: Johannes Anderwald + */ + + +#include "stream.h" + + +NTSTATUS +NTAPI +StreamClassPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +StreamClassSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +StreamClassCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +StreamClassFlushBuffers( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +StreamClassDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/control.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/dll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/dll.c (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/dll.c [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/stream/dll.c + * PURPOSE: kernel mode driver initialization + * PROGRAMMER: Johannes Anderwald + */ + + +#include "stream.h" + +/* + * @implemented + */ +ULONG +NTAPI +DllInitialize(ULONG Unknown) +{ + return 0; +} + +/* + * @implemented + */ +ULONG +NTAPI +DllUnload(VOID) +{ + return 0; +} Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/dll.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,299 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/stream/driver.c + * PURPOSE: WDM Codec Class Driver + * PROGRAMMER: Johannes Anderwald + */ + +#include "stream.h" + +NTSTATUS +NTAPI +StreamClassAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PSTREAM_CLASS_DRIVER_EXTENSION DriverObjectExtension; + PDEVICE_OBJECT DeviceObject, LowerDeviceObject; + PSTREAM_DEVICE_EXTENSION DeviceExtension; + PKSOBJECT_CREATE_ITEM ItemList; + NTSTATUS Status; + + /* Fetch driver object extension */ + DriverObjectExtension = IoGetDriverObjectExtension(DriverObject, (PVOID)StreamClassAddDevice); + if (!DriverObjectExtension) + { + /* Failed to get driver extension */ + return STATUS_DEVICE_DOES_NOT_EXIST; + } + /* Allocate Create Item */ + ItemList = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + if (!ItemList) + { + /* Failed to allocated Create Item */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Create the FDO */ + Status = IoCreateDevice(DriverObject, DriverObjectExtension->Data.DeviceExtensionSize + sizeof(STREAM_DEVICE_EXTENSION), NULL, FILE_DEVICE_KS, FILE_AUTOGENERATED_DEVICE_NAME | FILE_DEVICE_SECURE_OPEN, 0, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Failed to create the FDO */ + ExFreePool(ItemList); + return Status; + } + + /* Attach to device stack */ + LowerDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (!LowerDeviceObject) + { + /* Failed to attach */ + IoDeleteDevice(DeviceObject); + return STATUS_UNSUCCESSFUL; + } + + /* Zero Create item */ + RtlZeroMemory(ItemList, sizeof(KSOBJECT_CREATE_ITEM)); + /* Setup object class */ + RtlInitUnicodeString(&ItemList->ObjectClass, L"STREAMCLASS"); + /* Setup CreateDispatch routine */ + ItemList->Create = StreamClassCreateFilter; + + /* Get device extension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* Zero device extension */ + RtlZeroMemory(DeviceExtension, sizeof(STREAM_DEVICE_EXTENSION)); + /* Initialize Ks streaming */ + Status = KsAllocateDeviceHeader(&DeviceExtension->Header, 1, ItemList); + if (!NT_SUCCESS(Status)) + { + /* Cleanup resources */ + IoDetachDevice(LowerDeviceObject); + IoDeleteDevice(DeviceObject); + ExFreePool(ItemList); + return Status; + } + + /* Store lower device object */ + DeviceExtension->LowerDeviceObject = LowerDeviceObject; + + /* Store physical device object */ + DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + /* Store driver object extension */ + DeviceExtension->DriverExtension = DriverObjectExtension; + /* Initialize memory list */ + InitializeListHead(&DeviceExtension->MemoryResourceList); + /* Setup device extension */ + DeviceExtension->DeviceExtension = (PVOID) (DeviceExtension + 1); + /* Init interrupt dpc */ + KeInitializeDpc(&DeviceExtension->InterruptDpc, StreamClassInterruptDpc, (PVOID)DeviceExtension); + + /* Set device transfer method */ + DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + /* Clear init flag */ + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + + return Status; +} + +/* + *@implemented + */ +NTSTATUS +STREAMAPI +StreamClassRegisterAdapter( + IN PVOID Argument1, + IN PVOID Argument2, + IN PHW_INITIALIZATION_DATA HwInitializationData) +{ + NTSTATUS Status; + PSTREAM_CLASS_DRIVER_EXTENSION DriverObjectExtension; + PDRIVER_OBJECT DriverObject = (PDRIVER_OBJECT)Argument1; + + /* Allocate driver extension */ + Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)StreamClassAddDevice, sizeof(STREAM_CLASS_DRIVER_EXTENSION), (PVOID*)&DriverObjectExtension); + if (!NT_SUCCESS(Status)) + { + /* Failed to allocate */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero driver object extension */ + RtlZeroMemory(DriverObjectExtension, sizeof(STREAM_CLASS_DRIVER_EXTENSION)); + + /* copy HwInitializationData */ + RtlCopyMemory(&DriverObjectExtension->Data, HwInitializationData, sizeof(HW_INITIALIZATION_DATA)); + + /* Setup device init methods */ + DriverObject->DriverExtension->AddDevice = StreamClassAddDevice; + DriverObject->DriverUnload = KsNullDriverUnload; + + /* Setup irp handlers */ + DriverObject->MajorFunction[IRP_MJ_PNP] = StreamClassPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = StreamClassPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = StreamClassSystemControl; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = StreamClassCleanup; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = StreamClassFlushBuffers; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = StreamClassDeviceControl; + + /* Let Ks handle these */ + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + + return STATUS_SUCCESS; +} + +/* + *@implemented + */ + +VOID +NTAPI +StreamClassReenumerateStreams( + IN PVOID HwDeviceExtension, + IN ULONG StreamDescriptorSize) +{ + HW_STREAM_REQUEST_BLOCK_EXT RequestBlock; + PSTREAM_DEVICE_EXTENSION DeviceExtension; + PHW_STREAM_DESCRIPTOR StreamDescriptor; + + if (!HwDeviceExtension || !StreamDescriptorSize) + return; + + StreamDescriptor = ExAllocatePool(NonPagedPool, StreamDescriptorSize); + if (!StreamDescriptor) + return; + + /* Zero stream descriptor */ + RtlZeroMemory(StreamDescriptor, StreamDescriptorSize); + + /* Get our DeviceExtension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION) ((ULONG_PTR)HwDeviceExtension - sizeof(STREAM_DEVICE_EXTENSION)); + ASSERT(DeviceExtension->DeviceExtension == HwDeviceExtension); + + + /* Zero RequestBlock */ + RtlZeroMemory(&RequestBlock, sizeof(HW_STREAM_REQUEST_BLOCK_EXT)); + + /* Setup get stream info struct */ + RequestBlock.Block.SizeOfThisPacket = sizeof(HW_STREAM_REQUEST_BLOCK); + RequestBlock.Block.Command = SRB_GET_STREAM_INFO; + RequestBlock.Block.CommandData.StreamBuffer = StreamDescriptor; + KeInitializeEvent(&RequestBlock.Event, SynchronizationEvent, FALSE); + + /* FIXME SYNCHRONIZATION */ + + /* Send the request */ + DeviceExtension->DriverExtension->Data.HwReceivePacket ((PHW_STREAM_REQUEST_BLOCK)&RequestBlock); + + /* Is the device already completed? */ + if (RequestBlock.Block.Status == STATUS_PENDING) + { + /* Request is pending, wait for result */ + KeWaitForSingleObject(&RequestBlock.Event, Executive, KernelMode, FALSE, NULL); + } + + if (!NT_SUCCESS(RequestBlock.Block.Status)) + { + /* Release Stream descriptor */ + ExFreePool(StreamDescriptor); + } + else + { + if (DeviceExtension->StreamDescriptor) + { + /* Release old stream descriptor */ + ExFreePool(DeviceExtension->StreamDescriptor); + } + + /* Store stream descriptor */ + DeviceExtension->StreamDescriptor = StreamDescriptor; + DeviceExtension->StreamDescriptorSize = StreamDescriptorSize; + } + +} + +/* + *@implemented + */ + +VOID +NTAPI +StreamClassDebugAssert( + IN PCHAR File, + IN ULONG Line, + IN PCHAR AssertText, + IN ULONG AssertValue) +{ +#ifdef DBG + DbgBreakPoint(); +#endif +} + +/* + *@implemented + */ +VOID +__cdecl +StreamClassDebugPrint( + IN STREAM_DEBUG_LEVEL DebugPrintLevel, + IN PCCHAR DebugMessage, + ...) +{ +#ifdef DBG + va_list ap; + + if (DebugPrintLevel <=STREAMDEBUG_LEVEL) + { + va_start(ap, DebugMessage); + + DbgPrint(DebugMessage, ap); + + va_end(ap); + } +#endif + +} + +/* + *@unimplemented + */ +VOID +__cdecl +StreamClassDeviceNotification( + IN STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE NotificationType, + IN PVOID HwDeviceExtension, + IN PHW_STREAM_REQUEST_BLOCK pSrb, + IN PKSEVENT_ENTRY EventEntry, + IN GUID *EventSet, + IN ULONG EventId) +{ + PHW_STREAM_REQUEST_BLOCK_EXT RequestBlock; + if (NotificationType == DeviceRequestComplete) + { + RequestBlock = (PHW_STREAM_REQUEST_BLOCK_EXT)pSrb; + + KeSetEvent(&RequestBlock->Event, 0, FALSE); + return; + } + + UNIMPLEMENTED +} + +/* + *@implemented + */ +PVOID +STREAMAPI +StreamClassGetDmaBuffer( + IN PVOID HwDeviceExtension) +{ + PSTREAM_DEVICE_EXTENSION DeviceExtension; + /* Get our DeviceExtension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION) ((ULONG_PTR)HwDeviceExtension - sizeof(STREAM_DEVICE_EXTENSION)); + ASSERT(DeviceExtension->DeviceExtension == HwDeviceExtension); + + return DeviceExtension->DmaCommonBuffer; +} + Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,194 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/stream/filter.c + * PURPOSE: filter instance handling + * PROGRAMMER: Johannes Anderwald + */ + + +#include "stream.h" + +NTSTATUS +NTAPI +FilterDispatch_fnDeviceIoControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("FilterDispatch Called\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +FilterDispatch_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSTREAM_DEVICE_EXTENSION DeviceExtension; + HW_STREAM_REQUEST_BLOCK_EXT RequestBlock; + + /* Get device extension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (!DeviceExtension->DriverExtension->Data.FilterInstanceExtensionSize) + { + /* driver supports only one instance */ + if (DeviceExtension->InstanceCount) + { + /* there is already one instance open */ + return STATUS_UNSUCCESSFUL; + } + } + else + { + /* driver supports more than one filter instance */ + RtlZeroMemory(&RequestBlock, sizeof(HW_STREAM_REQUEST_BLOCK_EXT)); + + /* set up request block */ + RequestBlock.Block.Command = SRB_CLOSE_DEVICE_INSTANCE; + RequestBlock.Block.HwDeviceExtension = DeviceExtension->DeviceExtension; + RequestBlock.Block.Irp = Irp; + KeInitializeEvent(&RequestBlock.Event, SynchronizationEvent, FALSE); + + /*FIXME SYNCHRONIZATION */ + + /* Send the request */ + DeviceExtension->DriverExtension->Data.HwReceivePacket((PHW_STREAM_REQUEST_BLOCK)&RequestBlock); + if (RequestBlock.Block.Status == STATUS_PENDING) + { + /* Wait for the request */ + KeWaitForSingleObject(&RequestBlock.Event, Executive, KernelMode, FALSE, NULL); + } + } + + /* Increment total instance count */ + InterlockedDecrement(&DeviceExtension->InstanceCount); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +static KSDISPATCH_TABLE DispatchTable = +{ + FilterDispatch_fnDeviceIoControl, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + FilterDispatch_fnClose, + NULL, + NULL, + NULL, + NULL, + NULL +}; + +NTSTATUS +InitializeFilterWithKs( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PSTREAM_DEVICE_EXTENSION DeviceExtension; + KSOBJECT_HEADER ObjectHeader; + PKSOBJECT_CREATE_ITEM CreateItem; + PIO_STACK_LOCATION IoStack; + HW_STREAM_REQUEST_BLOCK_EXT RequestBlock; + + /* Get device extension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (!DeviceExtension->DriverExtension->Data.FilterInstanceExtensionSize) + { + /* driver supports only one instance */ + if (DeviceExtension->InstanceCount) + { + /* there is already one instance open */ + return STATUS_UNSUCCESSFUL; + } + } + else + { + /* driver supports more than one filter instance */ + RtlZeroMemory(&RequestBlock, sizeof(HW_STREAM_REQUEST_BLOCK_EXT)); + + /* set up request block */ + RequestBlock.Block.Command = SRB_OPEN_DEVICE_INSTANCE; + RequestBlock.Block.HwDeviceExtension = DeviceExtension->DeviceExtension; + RequestBlock.Block.Irp = Irp; + KeInitializeEvent(&RequestBlock.Event, SynchronizationEvent, FALSE); + + /*FIXME SYNCHRONIZATION */ + + /* Send the request */ + DeviceExtension->DriverExtension->Data.HwReceivePacket((PHW_STREAM_REQUEST_BLOCK)&RequestBlock); + if (RequestBlock.Block.Status == STATUS_PENDING) + { + /* Wait for the request */ + KeWaitForSingleObject(&RequestBlock.Event, Executive, KernelMode, FALSE, NULL); + } + /* Check for success */ + if (!NT_SUCCESS(RequestBlock.Block.Status)) + { + /* Resource is not available */ + return RequestBlock.Block.Status; + } + } + + /* Allocate create item */ + CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + if (!CreateItem) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + /* Zero create item */ + RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); + /* Set item class */ + RtlInitUnicodeString(&CreateItem->ObjectClass, L"STREAMCLASS"); + /* Get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + /* Create Ks streaming object header */ + Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); + if (!NT_SUCCESS(Status)) + { + /* Failed to create header */ + ExFreePool(CreateItem); + return Status; + } + /* Increment total instance count */ + InterlockedIncrement(&DeviceExtension->InstanceCount); + /* Return result */ + return Status; + +} + +NTSTATUS +NTAPI +StreamClassCreateFilter( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + DPRINT1("StreamClassCreateFilter Called\n"); + + /* FIXME Support Pins/Clocks */ + /* Init filter */ + Status = InitializeFilterWithKs(DeviceObject, Irp); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + + + Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/helper.c (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/helper.c [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,56 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/stream/helper.c + * PURPOSE: irp helper routines + * PROGRAMMER: Johannes Anderwald + */ + + +#include "stream.h" + +NTSTATUS +NTAPI +CompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned == TRUE) + { + KeSetEvent ((PKEVENT) Context, IO_NO_INCREMENT, FALSE); + } + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +NTAPI +ForwardIrpSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KEVENT Event; + PSTREAM_DEVICE_EXTENSION DeviceExt; + NTSTATUS Status; + + DeviceExt = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* initialize the notification event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + IoCopyCurrentIrpStackLocationToNext(Irp); + + IoSetCompletionRoutine(Irp, CompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); + + /* now call the driver */ + Status = IoCallDriver(DeviceExt->LowerDeviceObject, Irp); + /* did the request complete yet */ + if (Status == STATUS_PENDING) + { + /* not yet, lets wait a bit */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + return Status; +} Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/helper.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,465 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/stream/pnp.c + * PURPOSE: pnp handling + * PROGRAMMER: Johannes Anderwald + */ + +#include "stream.h" + +VOID +CompleteIrp( + IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information) +{ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +VOID +NTAPI +StreamClassReleaseResources( + IN PDEVICE_OBJECT DeviceObject) +{ + PSTREAM_DEVICE_EXTENSION DeviceExtension; + PLIST_ENTRY Entry; + PMEMORY_RESOURCE_LIST Mem; + + /* Get device extension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* Disconnect interrupt */ + if (DeviceExtension->Interrupt) + { + IoDisconnectInterrupt(DeviceExtension->Interrupt); + DeviceExtension->Interrupt = NULL; + } + + /* Release DmaAdapter */ + if (DeviceExtension->DmaAdapter) + { + DeviceExtension->DmaAdapter->DmaOperations->PutDmaAdapter(DeviceExtension->DmaAdapter); + DeviceExtension->DmaAdapter = NULL; + } + + /* Release mem mapped I/O */ + while(!IsListEmpty(&DeviceExtension->MemoryResourceList)) + { + Entry = RemoveHeadList(&DeviceExtension->MemoryResourceList); + Mem = (PMEMORY_RESOURCE_LIST)CONTAINING_RECORD(Entry, MEMORY_RESOURCE_LIST, Entry); + + MmUnmapIoSpace(Mem->Start, Mem->Length); + ExFreePool(Entry); + } +} + +BOOLEAN +NTAPI +StreamClassSynchronize( + IN PKINTERRUPT Interrupt, + IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, + IN PVOID SynchronizeContext) +{ + /* This function is used when the driver either implements synchronization on its own + * or if there is no interrupt assigned + */ + return SynchronizeRoutine(SynchronizeContext); +} + +VOID +NTAPI +StreamClassInterruptDpc( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + //TODO + //read/write data +} + + +BOOLEAN +NTAPI +StreamClassInterruptRoutine( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext) +{ + BOOLEAN Ret = FALSE; + PSTREAM_DEVICE_EXTENSION DeviceExtension = (PSTREAM_DEVICE_EXTENSION)ServiceContext; + + /* Does the driver implement HwInterrupt routine */ + if (DeviceExtension->DriverExtension->Data.HwInterrupt) + { + /* Check if the interrupt was coming from this device */ + Ret = DeviceExtension->DriverExtension->Data.HwInterrupt(DeviceExtension->DeviceExtension); + if (Ret) + { + /* Interrupt has from this device, schedule a Dpc for us */ + KeInsertQueueDpc(&DeviceExtension->InterruptDpc, NULL, NULL); + } + } + /* Return result */ + return Ret; +} + + + +NTSTATUS +NTAPI +StreamClassStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHW_STREAM_REQUEST_BLOCK_EXT RequestBlock; + PPORT_CONFIGURATION_INFORMATION Config; + PSTREAM_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + PCM_RESOURCE_LIST List; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + PSTREAM_CLASS_DRIVER_EXTENSION DriverObjectExtension; + PDMA_ADAPTER Adapter; + DEVICE_DESCRIPTION DeviceDesc; + NTSTATUS Status = STATUS_SUCCESS; + ULONG ResultLength, Index; + BOOLEAN bUseDMA, bUseInterrupt; + ULONG MapRegisters; + KAFFINITY Affinity = 0; + PHW_STREAM_DESCRIPTOR StreamDescriptor; + PACCESS_RANGE Range; + PVOID MappedAddr; + PMEMORY_RESOURCE_LIST Mem; + + /* Get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* Get resource list */ + List = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; + /* Calculate request length */ + ResultLength = sizeof(HW_STREAM_REQUEST_BLOCK_EXT) + sizeof(PPORT_CONFIGURATION_INFORMATION) + List->List[0].PartialResourceList.Count * sizeof(ACCESS_RANGE); + + /* Allocate Request Block */ + RequestBlock = ExAllocatePool(NonPagedPool, ResultLength); + + if (!RequestBlock) + { + /* Not enough memory */ + CompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get device extension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* Get driver object extension */ + DriverObjectExtension = IoGetDriverObjectExtension(DeviceObject->DriverObject, (PVOID)StreamClassAddDevice); + + /* Zero request block */ + RtlZeroMemory(RequestBlock, ResultLength); + + /* Locate Config struct */ + Config = (PPORT_CONFIGURATION_INFORMATION) (RequestBlock + 1); + Range = (PACCESS_RANGE) (Config + 1); + + /* Initialize Request */ + RequestBlock->Block.SizeOfThisPacket = sizeof(HW_STREAM_REQUEST_BLOCK); + RequestBlock->Block.Command = SRB_INITIALIZE_DEVICE; + RequestBlock->Block.CommandData.ConfigInfo = Config; + KeInitializeEvent(&RequestBlock->Event, SynchronizationEvent, FALSE); + + Config->SizeOfThisPacket = sizeof(PPORT_CONFIGURATION_INFORMATION); + Config->HwDeviceExtension = (PVOID) (DeviceExtension + 1); + Config->ClassDeviceObject = DeviceObject; + Config->PhysicalDeviceObject = DeviceExtension->LowerDeviceObject; + Config->RealPhysicalDeviceObject = DeviceExtension->PhysicalDeviceObject; + Config->AccessRanges = Range; + + IoGetDeviceProperty(DeviceObject, DevicePropertyBusNumber, sizeof(ULONG), (PVOID)&Config->SystemIoBusNumber, &ResultLength); + IoGetDeviceProperty(DeviceObject, DevicePropertyLegacyBusType, sizeof(INTERFACE_TYPE), (PVOID)&Config->AdapterInterfaceType, &ResultLength); + + /* Get resource list */ + List = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; + + /* Scan the translated resources */ + bUseDMA = FALSE; + bUseInterrupt = FALSE; + + Range = (PACCESS_RANGE) (Config + 1); + + for(Index = 0; Index < List->List[0].PartialResourceList.Count; Index++) + { + /* Locate partial descriptor */ + Descriptor = &List->List[0].PartialResourceList.PartialDescriptors[Index]; + + switch(Descriptor->Type) + { + case CmResourceTypePort: + { + /* Store resource information in AccessRange struct */ + Range[Config->NumberOfAccessRanges].RangeLength = Descriptor->u.Port.Length; + Range[Config->NumberOfAccessRanges].RangeStart.QuadPart = Descriptor->u.Port.Start.QuadPart; + Range[Config->NumberOfAccessRanges].RangeInMemory = FALSE; + Config->NumberOfAccessRanges++; + break; + } + case CmResourceTypeInterrupt: + { + /* Store resource information */ + Config->BusInterruptLevel = Descriptor->u.Interrupt.Level; + Config->BusInterruptVector = Descriptor->u.Interrupt.Vector; + Config->InterruptMode = Descriptor->Flags; + Affinity = Descriptor->u.Interrupt.Affinity; + bUseInterrupt = TRUE; + break; + } + case CmResourceTypeMemory: + { + Mem = ExAllocatePool(NonPagedPool, sizeof(MEMORY_RESOURCE_LIST)); + MappedAddr = MmMapIoSpace(Descriptor->u.Memory.Start, Descriptor->u.Memory.Length, MmNonCached); + if (!MappedAddr || !Mem) + { + if (Mem) + { + /* Release Memory resource descriptor */ + ExFreePool(Mem); + } + + if (MappedAddr) + { + /* Release mem mapped I/O */ + MmUnmapIoSpace(MappedAddr, Descriptor->u.Memory.Length); + } + + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Complete irp */ + CompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + ExFreePool(RequestBlock); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* Store range for driver */ + Range[Config->NumberOfAccessRanges].RangeLength = Descriptor->u.Memory.Length; + Range[Config->NumberOfAccessRanges].RangeStart.QuadPart = Descriptor->u.Memory.Start.QuadPart; + Range[Config->NumberOfAccessRanges].RangeInMemory = TRUE; + Config->NumberOfAccessRanges++; + /* Initialize Memory resource descriptor */ + Mem->Length = Descriptor->u.Memory.Length; + Mem->Start = MappedAddr; + InsertTailList(&DeviceExtension->MemoryResourceList, &Mem->Entry); + break; + } + case CmResourceTypeDma: + { + bUseDMA = TRUE; + Config->DmaChannel = Descriptor->u.Dma.Channel; + break; + } + } + } + + if (!!bUseInterrupt || DriverObjectExtension->Data.HwInterrupt == NULL || Config->BusInterruptLevel == 0 || Config->BusInterruptVector == 0) + { + /* requirements not satisfied */ + DeviceExtension->SynchronizeFunction = StreamClassSynchronize; + } + else + { + /* use real sync routine */ + DeviceExtension->SynchronizeFunction = KeSynchronizeExecution; + + /* connect interrupt */ + Status = IoConnectInterrupt(&DeviceExtension->Interrupt, + StreamClassInterruptRoutine, + (PVOID)DeviceExtension, + NULL, + Config->BusInterruptVector, + Config->BusInterruptLevel, + Config->BusInterruptLevel, + Config->InterruptMode, + TRUE, + Affinity, + FALSE); + if (!NT_SUCCESS(Status)) + { + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Failed to connect interrupt */ + CompleteIrp(Irp, Status, 0); + /* Release request block */ + ExFreePool(RequestBlock); + return Status; + } + + /* store interrupt object */ + Config->InterruptObject = DeviceExtension->Interrupt; + } + + /* does the device use DMA */ + if (bUseDMA && DriverObjectExtension->Data.BusMasterDMA) + { + /* Zero device description */ + RtlZeroMemory(&DeviceDesc, sizeof(DEVICE_DESCRIPTION)); + + DeviceDesc.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDesc.Master = TRUE; + DeviceDesc.ScatterGather = TRUE; + DeviceDesc.AutoInitialize = FALSE; + DeviceDesc.DmaChannel = Config->DmaChannel; + DeviceDesc.InterfaceType = Config->AdapterInterfaceType; + DeviceDesc.DmaWidth = Width32Bits; + DeviceDesc.DmaSpeed = Compatible; + DeviceDesc.MaximumLength = (ULONG)-1; + DeviceDesc.Dma32BitAddresses = DriverObjectExtension->Data.Dma24BitAddresses; + + Adapter = IoGetDmaAdapter(DeviceExtension->PhysicalDeviceObject, &DeviceDesc, &MapRegisters); + if (!Adapter) + { + /* Failed to claim DMA Adapter */ + CompleteIrp(Irp, Status, 0); + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Release request block */ + ExFreePool(RequestBlock); + return Status; + } + + if (DeviceExtension->DriverExtension->Data.DmaBufferSize) + { + DeviceExtension->DmaCommonBuffer = Adapter->DmaOperations->AllocateCommonBuffer(Adapter, DeviceExtension->DriverExtension->Data.DmaBufferSize, &DeviceExtension->DmaPhysicalAddress, FALSE); + if (!DeviceExtension->DmaCommonBuffer) + { + /* Failed to allocate a common buffer */ + CompleteIrp(Irp, Status, 0); + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Release request block */ + ExFreePool(RequestBlock); + return Status; + } + } + + + DeviceExtension->MapRegisters = MapRegisters; + DeviceExtension->DmaAdapter = Adapter; + Config->DmaAdapterObject = (PADAPTER_OBJECT)Adapter; + } + + + /* First forward the request to lower attached device object */ + Status = ForwardIrpSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + /* Failed to start lower devices */ + CompleteIrp(Irp, Status, 0); + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Release request block */ + ExFreePool(RequestBlock); + return Status; + } + + Config->Irp = Irp; + + /* FIXME SYNCHRONIZATION */ + + /* Send the request */ + DriverObjectExtension->Data.HwReceivePacket((PHW_STREAM_REQUEST_BLOCK)RequestBlock); + if (RequestBlock->Block.Status == STATUS_PENDING) + { + /* Request is pending, wait for result */ + KeWaitForSingleObject(&RequestBlock->Event, Executive, KernelMode, FALSE, NULL); + /* Get final status code */ + Status = RequestBlock->Block.Status; + } + + /* Copy stream descriptor size */ + DeviceExtension->StreamDescriptorSize = Config->StreamDescriptorSize; + + /* check if the request has succeeded or if stream size is valid*/ + if (!NT_SUCCESS(Status)|| !Config->StreamDescriptorSize) + { + /* Failed to start device */ + CompleteIrp(Irp, Status, 0); + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Release request block */ + ExFreePool(RequestBlock); + return Status; + } + + /* Allocate a stream Descriptor */ + StreamDescriptor = ExAllocatePool(NonPagedPool, DeviceExtension->StreamDescriptorSize); + if (!StreamDescriptor) + { + /* Not enough memory */ + CompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + /* Release resources */ + StreamClassReleaseResources(DeviceObject); + /* Release request block */ + ExFreePool(RequestBlock); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero stream descriptor */ + RtlZeroMemory(StreamDescriptor, DeviceExtension->StreamDescriptorSize); + + /* Setup get stream info struct */ + RequestBlock->Block.Command = SRB_GET_STREAM_INFO; + RequestBlock->Block.CommandData.StreamBuffer = StreamDescriptor; + KeResetEvent(&RequestBlock->Event); + + /* send the request */ + DriverObjectExtension->Data.HwReceivePacket((PHW_STREAM_REQUEST_BLOCK)RequestBlock); + if (RequestBlock->Block.Status == STATUS_PENDING) + { + /* Request is pending, wait for result */ + KeWaitForSingleObject(&RequestBlock->Event, Executive, KernelMode, FALSE, NULL); + /* Get final status code */ + Status = RequestBlock->Block.Status; + } + + if (NT_SUCCESS(Status)) + { + /* store stream descriptor */ + DeviceExtension->StreamDescriptor = StreamDescriptor; + } + else + { + /* cleanup resources */ + ExFreePool(StreamDescriptor); + } + + ExFreePool(RequestBlock); + /* Complete Irp */ + CompleteIrp(Irp, Status, 0); + /* Return result */ + return Status; +} + +NTSTATUS +NTAPI +StreamClassPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + /* Get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch (IoStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + return StreamClassStartDevice(DeviceObject, Irp); + } + } + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; +} + + Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/pnp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/stream.h (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/stream.h [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,140 @@ +#ifndef STREAM_H__ +#define STREAM_H__ + +#include <strmini.h> +#define YDEBUG +#include <debug.h> + +#define STREAMDEBUG_LEVEL DebugLevelMaximum + +typedef BOOLEAN (NTAPI *SYNCHRONIZE_FUNC) (IN PKINTERRUPT Interrupt, IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, IN PVOID SynchronizeContext); + +typedef struct +{ + HW_INITIALIZATION_DATA Data; + +}STREAM_CLASS_DRIVER_EXTENSION, *PSTREAM_CLASS_DRIVER_EXTENSION; + +typedef struct +{ + LIST_ENTRY Entry; + PVOID Start; + ULONG Length; +}MEMORY_RESOURCE_LIST, *PMEMORY_RESOURCE_LIST; + +typedef struct +{ + KSDEVICE_HEADER Header; + PDEVICE_OBJECT LowerDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + + SYNCHRONIZE_FUNC SynchronizeFunction; + + ULONG MapRegisters; + PDMA_ADAPTER DmaAdapter; + PVOID DmaCommonBuffer; + PHYSICAL_ADDRESS DmaPhysicalAddress; + + PKINTERRUPT Interrupt; + KDPC InterruptDpc; + + LIST_ENTRY MemoryResourceList; + + ULONG StreamDescriptorSize; + PHW_STREAM_DESCRIPTOR StreamDescriptor; + PSTREAM_CLASS_DRIVER_EXTENSION DriverExtension; + + PVOID DeviceExtension; + LONG InstanceCount; + +}STREAM_DEVICE_EXTENSION, *PSTREAM_DEVICE_EXTENSION; + +typedef struct +{ + HW_STREAM_REQUEST_BLOCK Block; + KEVENT Event; +}HW_STREAM_REQUEST_BLOCK_EXT, *PHW_STREAM_REQUEST_BLOCK_EXT; + +NTSTATUS +NTAPI +StreamClassCreateFilter( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassFlushBuffers( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +StreamClassAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject); + + +NTSTATUS +NTAPI +ForwardIrpSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +BOOLEAN +NTAPI +StreamClassSynchronize( + IN PKINTERRUPT Interrupt, + IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, + IN PVOID SynchronizeContext); + +BOOLEAN +NTAPI +StreamClassInterruptRoutine( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext); + +VOID +NTAPI +StreamClassInterruptDpc( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2); + +VOID +CompleteIrp( + IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information); + +#endif Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rbuild (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rbuild [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> +<module name="stream" type="kernelmodedriver" installbase="system32/drivers" installname="stream.sys" entrypoint="0"> + <include base="stream">.</include> + <define name="_COMDDK_" /> + <importlibrary definition="stream.spec" /> + <library>ntoskrnl</library> + <library>ks</library> + <library>pseh</library> + <file>control.c</file> + <file>driver.c</file> + <file>dll.c</file> + <file>filter.c</file> + <file>helper.c</file> + <file>pnp.c</file> + <file>stream.rc</file> +</module> Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rc (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rc [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "WDM CODEC Class Device Driver 2.0\0" +#define REACTOS_STR_INTERNAL_NAME "stream.sys\0" +#define REACTOS_STR_ORIGINAL_FILENAME "stream.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec (added) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec [iso-8859-1] Sun Jun 28 17:58:47 2009 @@ -1,0 +1,8 @@ +@ stdcall DllInitialize(long) +@ stdcall DllUnload() +@ stdcall StreamClassRegisterAdapter(ptr ptr ptr) +@ stdcall StreamClassReenumerateStreams(ptr long) +@ stdcall StreamClassDebugAssert(long long ptr long) +@ cdecl StreamClassDebugPrint (long str) +@ cdecl StreamClassDeviceNotification(long ptr) +@ stdcall StreamClassGetDmaBuffer(ptr) Propchange: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009