Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[hbelusca] 58756: [ROS-CSRSS] Fix compilation with MSVC. In particular initialization of structures variables (due to MSVC-C-compilation dumbass convention).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 14 14:49:30 2013 New Revision: 58756 URL: http://svn.reactos.org/svn/reactos?rev=58756&view=rev Log: [ROS-CSRSS] Fix compilation with MSVC. In particular initialization of structures variables (due to MSVC-C-compilation dumbass convention). Modified: branches/ros-csrss/dll/cpl/console/console.c branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/de-DE.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/el-GR.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/en-US.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/es-ES.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/he-IL.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/id-ID.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/it-IT.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/no-NO.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc branches/ros-csrss/win32ss/user/consrv/frontends/gui/resource.h branches/ros-csrss/win32ss/user/consrv/settings.c Modified: branches/ros-csrss/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… ============================================================================== --- branches/ros-csrss/dll/cpl/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/console.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -97,8 +97,10 @@ pConInfo->ci.QuickEdit = FALSE; pConInfo->ci.InsertMode = TRUE; // pConInfo->ci.InputBufferSize; - pConInfo->ci.ScreenBufferSize = (COORD){80, 300}; - pConInfo->ci.ConsoleSize = (COORD){80, 25 }; + pConInfo->ci.ScreenBufferSize.X = 80; + pConInfo->ci.ScreenBufferSize.Y = 300; + pConInfo->ci.ConsoleSize.X = 80; + pConInfo->ci.ConsoleSize.Y = 25; pConInfo->ci.CursorBlinkOn = TRUE; pConInfo->ci.ForceCursorOff = FALSE; pConInfo->ci.CursorSize = CSR_DEFAULT_CURSOR_SIZE; @@ -118,7 +120,8 @@ GuiInfo->UseRasterFonts = TRUE; GuiInfo->AutoPosition = TRUE; - GuiInfo->WindowOrigin = (POINT){0, 0}; + GuiInfo->WindowOrigin.x = 0; + GuiInfo->WindowOrigin.y = 0; memcpy(pConInfo->ci.Colors, s_Colors, sizeof(s_Colors)); } Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -292,9 +292,12 @@ } } - pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight}; - pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight}; - GuiInfo->WindowOrigin = (POINT){left, top}; + pConInfo->ci.ScreenBufferSize.X = swidth; + pConInfo->ci.ScreenBufferSize.Y = sheight; + pConInfo->ci.ConsoleSize.X = wwidth; + pConInfo->ci.ConsoleSize.Y = wheight; + GuiInfo->WindowOrigin.x = left; + GuiInfo->WindowOrigin.y = top; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -339,9 +342,12 @@ wheight = sheight; } - pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight}; - pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight}; - GuiInfo->WindowOrigin = (POINT){left, top}; + pConInfo->ci.ScreenBufferSize.X = swidth; + pConInfo->ci.ScreenBufferSize.Y = sheight; + pConInfo->ci.ConsoleSize.X = wwidth; + pConInfo->ci.ConsoleSize.Y = wheight; + GuiInfo->WindowOrigin.x = left; + GuiInfo->WindowOrigin.y = top; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -356,7 +362,8 @@ left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); - GuiInfo->WindowOrigin = (POINT){left, top}; + GuiInfo->WindowOrigin.x = left; + GuiInfo->WindowOrigin.y = top; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE); @@ -365,7 +372,8 @@ } else if (res == BST_UNCHECKED) { - GuiInfo->WindowOrigin = (POINT){UINT_MAX, UINT_MAX}; + GuiInfo->WindowOrigin.x = UINT_MAX; + GuiInfo->WindowOrigin.y = UINT_MAX; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -535,7 +535,8 @@ SetDisplayModeRequest->OutputHandle = hConsoleOutput; SetDisplayModeRequest->DisplayMode = dwFlags; - SetDisplayModeRequest->NewSBDim = (COORD){0, 0}; + SetDisplayModeRequest->NewSBDim.X = 0; + SetDisplayModeRequest->NewSBDim.Y = 0; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, @@ -1113,7 +1114,8 @@ PCONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest = &ApiMessage.Data.GetLargestWindowSizeRequest; GetLargestWindowSizeRequest->OutputHandle = hConsoleOutput; - GetLargestWindowSizeRequest->Size = (COORD){0, 0}; + GetLargestWindowSizeRequest->Size.X = 0; + GetLargestWindowSizeRequest->Size.Y = 0; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, @@ -2238,7 +2240,7 @@ WINAPI GetConsoleInputExeNameW(DWORD nBufferLength, LPWSTR lpBuffer) { - int lenName = lstrlenW(InputExeName); + ULONG lenName = lstrlenW(InputExeName); if (nBufferLength == 0) { Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -143,7 +143,7 @@ typedef struct { - USHORT nMaxIds; + ULONG nMaxIds; ULONG nProcessIdsTotal; PDWORD pProcessIds; } CONSOLE_GETPROCESSLIST, *PCONSOLE_GETPROCESSLIST; Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -115,7 +115,8 @@ { ClearLineBuffer(*Buffer); } - (*Buffer)->CursorPosition = (COORD){0, 0}; + (*Buffer)->CursorPosition.X = 0; + (*Buffer)->CursorPosition.Y = 0; (*Buffer)->Mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; (*Buffer)->DisplayMode = DisplayMode; @@ -1394,7 +1395,7 @@ PCONSOLE Console; PCONSOLE_SCREEN_BUFFER Buff; - COORD ScreenBufferSize = (COORD){80, 25}; + COORD ScreenBufferSize = {80, 25}; USHORT ScreenAttrib = DEFAULT_SCREEN_ATTRIB; USHORT PopupAttrib = DEFAULT_POPUP_ATTRIB; ULONG DisplayMode = CONSOLE_WINDOWED_MODE; Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -348,9 +348,10 @@ { #define PATH_SEPARATOR L'\\' - BOOL RetVal = FALSE; - LPWSTR LinkName = NULL; - SIZE_T Length = 0; + BOOL RetVal = FALSE; + HRESULT hRes = S_OK; + LPWSTR LinkName = NULL; + SIZE_T Length = 0; if ((ConsoleStartInfo->dwStartupFlags & STARTF_TITLEISLINKNAME) == 0) return FALSE; @@ -379,7 +380,7 @@ return FALSE; /* 3- It may be a link. Try to retrieve some properties */ - HRESULT hRes = CoInitialize(NULL); + hRes = CoInitialize(NULL); if (SUCCEEDED(hRes)) { /* Get a pointer to the IShellLink interface */ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guisettings.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -198,7 +198,8 @@ TermInfo->ShowWindow = SW_SHOWNORMAL; TermInfo->AutoPosition = TRUE; - TermInfo->WindowOrigin = (POINT){0, 0}; + TermInfo->WindowOrigin.x = 0; + TermInfo->WindowOrigin.y = 0; /* * 2. Overwrite them with the ones stored in HKCU\Console. Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -226,7 +226,8 @@ LPWSTR WindowTitle = NULL; SIZE_T Length = 0; - Console->dwSelectionCursor = (COORD){0, 0}; + Console->dwSelectionCursor.X = 0; + Console->dwSelectionCursor.Y = 0; Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor; Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); @@ -251,7 +252,8 @@ case ID_SYSTEM_EDIT_SELECTALL: { - Console->Selection.dwSelectionAnchor = (COORD){0, 0}; + Console->Selection.dwSelectionAnchor.X = 0; + Console->Selection.dwSelectionAnchor.Y = 0; Console->dwSelectionCursor.X = Console->ConsoleSize.X - 1; Console->dwSelectionCursor.Y = Console->ConsoleSize.Y - 1; GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor); @@ -768,7 +770,8 @@ case VK_HOME: { Interpreted = TRUE; - Console->dwSelectionCursor = (COORD){0, 0}; + Console->dwSelectionCursor.X = 0; + Console->dwSelectionCursor.Y = 0; break; } @@ -1911,11 +1914,17 @@ } /* Initialize the console window class */ - ghDefaultIcon = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON, - GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), - LR_SHARED); - ghDefaultIconSm = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), + ghDefaultIcon = LoadImageW(ConSrvDllInstance, + MAKEINTRESOURCEW(IDI_TERMINAL), + IMAGE_ICON, + GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), + LR_SHARED); + ghDefaultIconSm = LoadImageW(ConSrvDllInstance, + MAKEINTRESOURCEW(IDI_TERMINAL), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_SHARED); ghDefaultCursor = LoadCursorW(NULL, IDC_ARROW); wc.cbSize = sizeof(WNDCLASSEXW); @@ -2042,7 +2051,7 @@ ScrollWindowEx(GuiData->hWindow, 0, - -(ScrolledLines * GuiData->CharHeight), + -(int)(ScrolledLines * GuiData->CharHeight), &ScrollRect, NULL, NULL, Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -10,7 +10,7 @@ // #define REACTOS_STR_ORIGINAL_FILENAME "consrv.dll" // #include <reactos/version.rc> -// IDI_CONSOLE ICON DISCARDABLE "res/terminal.ico" -IDI_CONSOLE ICON DISCARDABLE "frontends/gui/res/terminal.ico" +// IDI_TERMINAL ICON DISCARDABLE "res/terminal.ico" +IDI_TERMINAL ICON DISCARDABLE "frontends/gui/res/terminal.ico" #include "rsrc.rc" Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -17,6 +17,8 @@ IDS_FIND "Ð¢ÑÑÑÐµÐ½Ðµ..." IDS_DEFAULTS "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¸" IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" + +/* IDS_SCROLLHERE "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ ÑÑÐº" IDS_SCROLLTOP "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð´Ð¾ Ð³Ð¾ÑÐµ" IDS_SCROLLBOTTOM "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð´Ð¾ Ð´Ð¾Ð»Ñ" @@ -24,6 +26,7 @@ IDS_SCROLLPAGE_DOWN "ÐÐ¾Ð»Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°" IDS_SCROLLUP "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð½Ð°Ð³Ð¾ÑÐµ" IDS_SCROLLDOWN "ÐÑÐµÐ»Ð¸ÑÑÐ²Ð°Ð½Ðµ Ð½Ð°Ð´Ð¾Ð»Ñ" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -17,6 +17,8 @@ IDS_FIND "NajÃt..." IDS_DEFAULTS "VÃ½chozÃ" IDS_PROPERTIES "Vlastnosti" + +/* IDS_SCROLLHERE "Posunout sem" IDS_SCROLLTOP "Posunout na zaÄÃ¡tek" IDS_SCROLLBOTTOM "Posunout na konec" @@ -24,6 +26,7 @@ IDS_SCROLLPAGE_DOWN "O strÃ¡nku nÃÅ¾e" IDS_SCROLLUP "Posunout nahoru" IDS_SCROLLDOWN "Posunout dolÅ¯" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "Suchen..." IDS_DEFAULTS "Standardwerte" IDS_PROPERTIES "Eigenschaften" + +/* IDS_SCROLLHERE "Hier scrollen" IDS_SCROLLTOP "Ganz nach oben scrollen" IDS_SCROLLBOTTOM "Ganz nach unten scrollen" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "Seite nach unten" IDS_SCROLLUP "Nach oben scrollen" IDS_SCROLLDOWN "Nach unten scrollen" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "ÎÏÏÎµÏÎ·..." IDS_DEFAULTS "Î ÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î®" IDS_PROPERTIES "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ" + +/* IDS_SCROLLHERE "ÎÏÎ»Î¹ÏÎ· ÎµÎ´Ï" IDS_SCROLLTOP "ÎÏÏÎ®" IDS_SCROLLBOTTOM "Î¤ÎÎ»Î¿Ï" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "ÎÏÏÎ¼ÎµÎ½Î· ÏÎµÎ»Î¯Î´Î±" IDS_SCROLLUP "ÎÏÎ»Î¹ÏÎ· ÏÎ¬Î½Ï" IDS_SCROLLDOWN "ÎÏÎ»Î¹ÏÎ· ÎºÎ¬ÏÏ" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "Find..." IDS_DEFAULTS "Defaults" IDS_PROPERTIES "Properties" + +/* IDS_SCROLLHERE "Scroll here" IDS_SCROLLTOP "Scroll top" IDS_SCROLLBOTTOM "Scroll bottom" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "Page down" IDS_SCROLLUP "Scroll up" IDS_SCROLLDOWN "Scroll down" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -16,6 +16,8 @@ IDS_FIND "Buscar..." IDS_DEFAULTS "Por defecto" IDS_PROPERTIES "Propiedades" + +/* IDS_SCROLLHERE "Desplazar aquÃ" IDS_SCROLLTOP "Desplazar hasta arriba" IDS_SCROLLBOTTOM "Desplazar hasta abajo" @@ -23,6 +25,7 @@ IDS_SCROLLPAGE_DOWN "Bajar pÃ¡gina" IDS_SCROLLUP "Desplazar arriba" IDS_SCROLLDOWN "Desplazar abajo" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -13,6 +13,8 @@ IDS_FIND "Trouver..." IDS_DEFAULTS "DÃ©fauts" IDS_PROPERTIES "PropriÃ©tÃ©s" + +/* IDS_SCROLLHERE "DÃ©filer ici" IDS_SCROLLTOP "DÃ©filer tout en haut" IDS_SCROLLBOTTOM "DÃ©filer tout en bas" @@ -20,6 +22,7 @@ IDS_SCROLLPAGE_DOWN "Page suivante" IDS_SCROLLUP "DÃ©filer en haut" IDS_SCROLLDOWN "DÃ©filer en bas" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "××¦×..." IDS_DEFAULTS "××¨××¨×ª ××××" IDS_PROPERTIES "×××¤××× ××" + +/* IDS_SCROLLHERE "×××× ××××" IDS_SCROLLTOP "×××× ×××¢××" IDS_SCROLLBOTTOM "×××× ××××" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "×¢××× ×××" IDS_SCROLLUP "×××× ××¢××" IDS_SCROLLDOWN "×××× ×××" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "Cari..." IDS_DEFAULTS "Standar" IDS_PROPERTIES "Properti" + +/* IDS_SCROLLHERE "Gulung ke Sini" IDS_SCROLLTOP "Gulung ke Atas" IDS_SCROLLBOTTOM "Gulung ke Bawah" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "Halaman Turun" IDS_SCROLLUP "Gulung Naik" IDS_SCROLLDOWN "Gulung Turun" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -20,6 +20,8 @@ IDS_FIND "Trova..." IDS_DEFAULTS "Impostazioni predefinite" IDS_PROPERTIES "ProprietÃ " + +/* IDS_SCROLLHERE "Scorri qui" IDS_SCROLLTOP "Scorri in cima" IDS_SCROLLBOTTOM "Scorri in fondo" @@ -27,6 +29,7 @@ IDS_SCROLLPAGE_DOWN "Pagina giÃ¹" IDS_SCROLLUP "Scorri sÃ¹" IDS_SCROLLDOWN "Scorri giÃ¹" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "æ¤ç´¢..." IDS_DEFAULTS "è¦å®å¤" IDS_PROPERTIES "ããããã£" + +/* IDS_SCROLLHERE "ããã«ã¹ã¯ãã¼ã«" IDS_SCROLLTOP "ä¸çªä¸ã«ã¹ã¯ãã¼ã«" IDS_SCROLLBOTTOM "ä¸çªä¸ã«ã¹ã¯ãã¼ã«" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "Page down" IDS_SCROLLUP "ä¸ã«ã¹ã¯ãã¼ã«" IDS_SCROLLDOWN "ä¸ã«ã¹ã¯ãã¼ã«" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "Finn..." IDS_DEFAULTS "Standard" IDS_PROPERTIES "Egenskaper" + +/* IDS_SCROLLHERE "Rull her" IDS_SCROLLTOP "Rull til toppen" IDS_SCROLLBOTTOM "Rull knapp" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "Side ned" IDS_SCROLLUP "Rull opp" IDS_SCROLLDOWN "Rull ned" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -19,6 +19,8 @@ IDS_FIND "ZnajdÅº..." IDS_DEFAULTS "Ustawienia domyÅlne" IDS_PROPERTIES "WÅaÅciwoÅci" + +/* IDS_SCROLLHERE "PrzewiÅ tutaj" IDS_SCROLLTOP "PrzewiÅ na poczÄtek" IDS_SCROLLBOTTOM "PrzewiÅ na koniec" @@ -26,6 +28,7 @@ IDS_SCROLLPAGE_DOWN "NastÄpna strona" IDS_SCROLLUP "PrzewiÅ do gÃ³ry" IDS_SCROLLDOWN "PrzewiÅ na dÃ³Å" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -13,6 +13,8 @@ IDS_FIND "Procurar..." IDS_DEFAULTS "PadrÃµes" IDS_PROPERTIES "Propriedades" + +/* IDS_SCROLLHERE "Rolar aqui" IDS_SCROLLTOP "Rolar atÃ© o topo" IDS_SCROLLBOTTOM "Rolar atÃ© o fim" @@ -20,6 +22,7 @@ IDS_SCROLLPAGE_DOWN "Page down" IDS_SCROLLUP "Scroll up" IDS_SCROLLDOWN "Scroll down" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -18,6 +18,8 @@ IDS_FIND "GÄsireâ¦" IDS_DEFAULTS "Implicite" IDS_PROPERTIES "ProprietÄÈi" + +/* IDS_SCROLLHERE "DeruleazÄ aici" IDS_SCROLLTOP "DeruleazÄ la Ã®nceput" IDS_SCROLLBOTTOM "DeruleazÄ la sfÃ¢rÈit" @@ -25,6 +27,7 @@ IDS_SCROLLPAGE_DOWN "Pagina urmÄtoare" IDS_SCROLLUP "DeruleazÄ Ã®n sus" IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "ÐÑÐºÐ°ÑÑ..." IDS_DEFAULTS "Ð£Ð¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ" IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" + +/* IDS_SCROLLHERE "Scroll Here" IDS_SCROLLTOP "Scroll Top" IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð½Ð¸Ð·" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "ÐÐ½Ð¸Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ" IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð²ÐµÑÑ" IDS_SCROLLDOWN "Scroll Down" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -16,6 +16,8 @@ IDS_FIND "NÃ¡jsÅ¥..." // Find IDS_DEFAULTS "PredvolenÃ©" // Defaults IDS_PROPERTIES "Vlastnosti" + +/* IDS_SCROLLHERE "RolovaÅ¥ sem" IDS_SCROLLTOP "K hornÃ©mu okraju" IDS_SCROLLBOTTOM "K dolnÃ©mu okraju" @@ -23,6 +25,7 @@ IDS_SCROLLPAGE_DOWN "O strÃ¡nku niÅ¾Å¡ie" IDS_SCROLLUP "RolovaÅ¥ nahor" IDS_SCROLLDOWN "RolovaÅ¥ nadol" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -18,6 +18,8 @@ IDS_FIND "SÃ¶k..." IDS_DEFAULTS "Ursprunglig" IDS_PROPERTIES "Egenskaper" + +/* IDS_SCROLLHERE "Skrolla hit" IDS_SCROLLTOP "Skrolla till topp" IDS_SCROLLBOTTOM "Skrolla till botten" @@ -25,6 +27,7 @@ IDS_SCROLLPAGE_DOWN "Sida ner" IDS_SCROLLUP "Skrolla upp" IDS_SCROLLDOWN "Skrolla ner" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -31,6 +31,8 @@ IDS_FIND "Bul..." IDS_DEFAULTS "VarsayÄ±lanlar" IDS_PROPERTIES "Ãzellikler" + +/* IDS_SCROLLHERE "Buraya yuvarla" IDS_SCROLLTOP "Ãste yuvarla" IDS_SCROLLBOTTOM "Alta yuvarla" @@ -38,6 +40,7 @@ IDS_SCROLLPAGE_DOWN "Sayfa aÅaÄÄ±" IDS_SCROLLUP "YukarÄ± yuvarla" IDS_SCROLLDOWN "AÅaÄÄ± yuvarla" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -19,6 +19,8 @@ IDS_FIND "ÐÐ½Ð°Ð¹ÑÐ¸..." IDS_DEFAULTS "ÐÐ°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½Ñ" IDS_PROPERTIES "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" + +/* IDS_SCROLLHERE "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ ÑÑÐ´Ð¸" IDS_SCROLLTOP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð½Ð° Ð¿Ð¾ÑÐ°ÑÐ¾Ðº" IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð½Ð° ÐºÑÐ½ÐµÑÑ" @@ -26,6 +28,7 @@ IDS_SCROLLPAGE_DOWN "ÐÐ°ÑÑÑÐ¿Ð½Ð° ÑÑÐ¾ÑÑÐ½ÐºÐ°" IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð´Ð¾Ð³Ð¾ÑÐ¸" IDS_SCROLLDOWN "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÐ¸ Ð´Ð¾Ð½Ð¸Ð·Ñ" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "æ¥æ¾..." IDS_DEFAULTS "é»è®¤" IDS_PROPERTIES "å±æ§" + +/* IDS_SCROLLHERE "æ»å¨å°æ¤" IDS_SCROLLTOP "æ»å¨è³é¡¶ç«¯" IDS_SCROLLBOTTOM "æ»å¨è³æ«ç«¯" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "ä¸ä¸é¡µ" IDS_SCROLLUP "åä¸æ»å¨" IDS_SCROLLDOWN "åä¸æ»å¨" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -11,6 +11,8 @@ IDS_FIND "å°æ¾..." IDS_DEFAULTS "é è¨" IDS_PROPERTIES "å±¬æ§" + +/* IDS_SCROLLHERE "æ»¾åå°æ¤ " IDS_SCROLLTOP "æ»¾åå°é ç½®" IDS_SCROLLBOTTOM "æ»¾åå°æ«ç«¯" @@ -18,6 +20,7 @@ IDS_SCROLLPAGE_DOWN "ä¸ä¸é " IDS_SCROLLUP "åä¸æ»¾å" IDS_SCROLLDOWN "åä¸æ»¾å" +*/ - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS Console" END Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/resource.h [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -7,37 +7,39 @@ #pragma once -#define ID_SYSTEM_EDIT_MARK 1001 -#define ID_SYSTEM_EDIT_COPY 1002 -#define ID_SYSTEM_EDIT_PASTE 1003 +#define ID_SYSTEM_EDIT_MARK 1001 +#define ID_SYSTEM_EDIT_COPY 1002 +#define ID_SYSTEM_EDIT_PASTE 1003 #define ID_SYSTEM_EDIT_SELECTALL 1004 -#define ID_SYSTEM_EDIT_SCROLL 1005 -#define ID_SYSTEM_EDIT_FIND 1006 -#define ID_SYSTEM_DEFAULTS 1007 -#define ID_SYSTEM_PROPERTIES 1008 +#define ID_SYSTEM_EDIT_SCROLL 1005 +#define ID_SYSTEM_EDIT_FIND 1006 +#define ID_SYSTEM_DEFAULTS 1007 +#define ID_SYSTEM_PROPERTIES 1008 -#define NCPOPUP_MENU 103 +#define NCPOPUP_MENU 103 -#define IDS_EDIT 204 -#define IDS_MARK 205 -#define IDS_COPY 206 -#define IDS_PASTE 207 -#define IDS_SELECTALL 208 -#define IDS_SCROLL 209 -#define IDS_FIND 210 -#define IDS_DEFAULTS 211 -#define IDS_PROPERTIES 212 +#define IDS_EDIT 204 +#define IDS_MARK 205 +#define IDS_COPY 206 +#define IDS_PASTE 207 +#define IDS_SELECTALL 208 +#define IDS_SCROLL 209 +#define IDS_FIND 210 +#define IDS_DEFAULTS 211 +#define IDS_PROPERTIES 212 -// Scrollbar resource ids -#define IDS_SCROLLHERE 304 -#define IDS_SCROLLTOP 305 -#define IDS_SCROLLBOTTOM 306 -#define IDS_SCROLLPAGE_UP 307 +// Scrollbar resource ids. Unused. +/* +#define IDS_SCROLLHERE 304 +#define IDS_SCROLLTOP 305 +#define IDS_SCROLLBOTTOM 306 +#define IDS_SCROLLPAGE_UP 307 #define IDS_SCROLLPAGE_DOWN 308 -#define IDS_SCROLLUP 309 -#define IDS_SCROLLDOWN 310 +#define IDS_SCROLLUP 309 +#define IDS_SCROLLDOWN 310 +*/ -#define IDI_CONSOLE 1 -#define IDS_CONSOLE_TITLE 500 +#define IDI_TERMINAL 1 +#define IDS_TERMINAL_TITLE 400 /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] Sun Apr 14 14:49:30 2013 @@ -415,8 +415,10 @@ ConsoleInfo->QuickEdit = FALSE; ConsoleInfo->InsertMode = TRUE; // ConsoleInfo->InputBufferSize; - ConsoleInfo->ScreenBufferSize = (COORD){80, 300}; - ConsoleInfo->ConsoleSize = (COORD){80, 25 }; + ConsoleInfo->ScreenBufferSize.X = 80; + ConsoleInfo->ScreenBufferSize.Y = 300; + ConsoleInfo->ConsoleSize.X = 80; + ConsoleInfo->ConsoleSize.Y = 25; ConsoleInfo->CursorBlinkOn; ConsoleInfo->ForceCursorOff;

11 years, 5 months

[spetreolle] 58755: [HOST-TOOLS] Add log2lines to build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Apr 14 14:18:34 2013 New Revision: 58755 URL: http://svn.reactos.org/svn/reactos?rev=58755&view=rev Log: [HOST-TOOLS] Add log2lines to build. Added: trunk/reactos/tools/log2lines/CMakeLists.txt (with props) Modified: trunk/reactos/tools/CMakeLists.txt trunk/reactos/tools/rsym/CMakeLists.txt Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Sun Apr 14 14:18:34 2013 @@ -11,6 +11,7 @@ add_subdirectory(cdmake) add_subdirectory(gendib) add_subdirectory(geninc) +add_subdirectory(log2lines) add_subdirectory(mkhive) add_subdirectory(obj2bin) add_subdirectory(spec2def) Added: trunk/reactos/tools/log2lines/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/CMakeLists… ============================================================================== --- trunk/reactos/tools/log2lines/CMakeLists.txt (added) +++ trunk/reactos/tools/log2lines/CMakeLists.txt [iso-8859-1] Sun Apr 14 14:18:34 2013 @@ -1,0 +1,17 @@ +list(APPEND SOURCE + cache.c + cmd.c + help.c + image.c + list.c + log2lines.c + match.c + options.c + revision.c + stat.c + util.c) + +include_directories(${REACTOS_SOURCE_DIR}/tools/rsym) + +add_executable(log2lines ${SOURCE}) +target_link_libraries(log2lines rsym_common) Propchange: trunk/reactos/tools/log2lines/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/rsym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/CMakeLists.txt?… ============================================================================== --- trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] Sun Apr 14 14:18:34 2013 @@ -1,7 +1,9 @@ +add_library(rsym_common rsym_common.c) if(ARCH STREQUAL "i386") - add_executable(rsym rsym_common.c rsym.c) + add_executable(rsym rsym.c) elseif(ARCH STREQUAL "amd64") - add_executable(rsym rsym_common.c rsym64.c) + add_executable(rsym rsym64.c) endif() +target_link_libraries(rsym rsym_common) add_executable(raddr2line rsym_common.c raddr2line.c)

11 years, 5 months

[hbelusca] 58754: Forgot these changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 14 13:25:02 2013 New Revision: 58754 URL: http://svn.reactos.org/svn/reactos?rev=58754&view=rev Log: Forgot these changes. Modified: branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] Sun Apr 14 13:25:02 2013 @@ -13,13 +13,13 @@ const TCHAR szPreviewText[] = _T("C:\\ReactOS> dir \n") \ - _T("SYSTEM <DIR> 03-04-15 5:00a\n") \ - _T("SYSTEM32 <DIR> 03-04-15 5:00a\n") \ - _T("readme txt 1739 03-04-15 5:00a\n") \ - _T("explorer exe 3329536 03-04-15 5:00a\n") \ - _T("vgafonts cab 18736 03-04-15 5:00a\n") \ - _T("setuplog txt 313 03-04-15 5:00a\n") \ - _T("win ini 7005 03-04-15 5:00a\n"); + _T("SYSTEM <DIR> 13-04-15 5:00a\n") \ + _T("SYSTEM32 <DIR> 13-04-15 5:00a\n") \ + _T("readme txt 1739 13-04-15 5:00a\n") \ + _T("explorer exe 3329536 13-04-15 5:00a\n") \ + _T("vgafonts cab 18736 13-04-15 5:00a\n") \ + _T("setuplog txt 313 13-04-15 5:00a\n") \ + _T("win ini 7005 13-04-15 5:00a\n"); VOID Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Apr 14 13:25:02 2013 @@ -131,7 +131,7 @@ /* Adapted from CONSOLE_ALLOCCONSOLE */ CONSOLE_START_INFO ConsoleStartInfo; - HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCSRSS_CONSOLE + HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -180,7 +180,7 @@ { PCONSOLE_START_INFO ConsoleStartInfo; - HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCSRSS_CONSOLE + HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -192,7 +192,7 @@ typedef struct { DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console. - HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCSRSS_CONSOLE + HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle;

11 years, 5 months

[hbelusca] 58753: [CONSOLE.CPL-KERNEL32-USER32-NTDLL-CSRSRV-CONSRV-BASESRV-WINSRV] - Fix some comments. - Remove unuseful DPRINTs and just shut-up some DPRINT1s. - Rename remaining CSRSS_*** struct...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 14 12:14:00 2013 New Revision: 58753 URL: http://svn.reactos.org/svn/reactos?rev=58753&view=rev Log: [CONSOLE.CPL-KERNEL32-USER32-NTDLL-CSRSRV-CONSRV-BASESRV-WINSRV] - Fix some comments. - Remove unuseful DPRINTs and just shut-up some DPRINT1s. - Rename remaining CSRSS_*** structures. Modified: branches/ros-csrss/dll/cpl/console/console.c branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/ntdll/csr/capture.c branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/dll/win32/kernel32/client/dllmain.c branches/ros-csrss/dll/win32/kernel32/client/path.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/vdm.c branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/include/reactos/subsys/win/base.h branches/ros-csrss/include/reactos/subsys/win/basemsg.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/include/reactos/subsys/win/console.h branches/ros-csrss/include/reactos/subsys/win/winmsg.h branches/ros-csrss/subsystems/win/basesrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/user32/misc/exit.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt branches/ros-csrss/win32ss/user/winsrv/harderror.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/register.c branches/ros-csrss/win32ss/user/winsrv/shutdown.c Modified: branches/ros-csrss/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… ============================================================================== --- branches/ros-csrss/dll/cpl/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/console.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -196,7 +196,6 @@ } } - // if (res == IDC_RADIO_APPLY_ALL || res == IDC_RADIO_APPLY_CURRENT) if (SetParams) { HANDLE hSection; @@ -290,10 +289,6 @@ return 0; } - // if (IsBadReadPtr((PVOID)pSharedInfo, sizeof(CONSOLE_PROPS))) - // { - // } - /* Find the console window and whether we must use default parameters */ pConInfo->hConsoleWindow = pSharedInfo->hConsoleWindow; pConInfo->ShowDefaultParams = pSharedInfo->ShowDefaultParams; Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -13,13 +13,13 @@ const TCHAR szPreviewText[] = _T("C:\\ReactOS> dir \n") \ - _T("SYSTEM <DIR> 03-03-13 5:00a\n") \ - _T("SYSTEM32 <DIR> 03-03-13 5:00a\n") \ - _T("readme txt 1739 03-03-13 5:00a\n") \ - _T("explorer exe 3329536 03-03-13 5:00a\n") \ - _T("vgafonts cab 18736 03-03-13 5:00a\n") \ - _T("setuplog txt 313 03-03-13 5:00a\n") \ - _T("win ini 7005 03-03-13 5:00a\n"); + _T("SYSTEM <DIR> 03-04-15 5:00a\n") \ + _T("SYSTEM32 <DIR> 03-04-15 5:00a\n") \ + _T("readme txt 1739 03-04-15 5:00a\n") \ + _T("explorer exe 3329536 03-04-15 5:00a\n") \ + _T("vgafonts cab 18736 03-04-15 5:00a\n") \ + _T("setuplog txt 313 03-04-15 5:00a\n") \ + _T("win ini 7005 03-04-15 5:00a\n"); VOID Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?r… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/api.c + * FILE: dll/ntdll/csr/api.c * PURPOSE: CSR APIs exported through NTDLL * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: branches/ros-csrss/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/capture… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/capture.c + * FILE: dll/ntdll/csr/capture.c * PURPOSE: Routines for probing and capturing CSR API Messages * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ @@ -94,7 +94,8 @@ if (BufferSize >= MAXLONG) return NULL; /* Add the size of the header and for each offset to the pointers */ - BufferSize += FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + (ArgumentCount * sizeof(ULONG_PTR)); + BufferSize += FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + + (ArgumentCount * sizeof(ULONG_PTR)); /* Align it to a 4-byte boundary */ BufferSize = (BufferSize + 3) & ~3; Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/connect.c + * FILE: dll/ntdll/csr/connect.c * PURPOSE: Routines for connecting and calling CSR * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ @@ -54,14 +54,14 @@ ULONG PointerCount; PULONG_PTR OffsetPointer; - /* Fill out the Port Message Header. */ + /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; ApiMessage->Header.u1.s1.TotalLength = FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - /* Fill out the CSR Header. */ + /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber; ApiMessage->CsrCaptureData = NULL; @@ -70,10 +70,10 @@ ApiMessage->Header.u1.s1.DataLength, ApiMessage->Header.u1.s1.TotalLength); - /* Check if we are already inside a CSR Server. */ + /* Check if we are already inside a CSR Server */ if (!InsideCsrProcess) { - /* Check if we got a Capture Buffer. */ + /* Check if we got a Capture Buffer */ if (CaptureBuffer) { /* @@ -104,12 +104,12 @@ } } - /* Send the LPC Message. */ + /* Send the LPC Message */ Status = NtRequestWaitReplyPort(CsrApiPort, &ApiMessage->Header, &ApiMessage->Header); - /* Check if we got a Capture Buffer. */ + /* Check if we got a Capture Buffer */ if (CaptureBuffer) { /* @@ -137,7 +137,7 @@ } } - /* Check for success. */ + /* Check for success */ if (!NT_SUCCESS(Status)) { /* We failed. Overwrite the return value with the failure. */ @@ -150,13 +150,13 @@ /* This is a server-to-server call. Save our CID and do a direct call. */ DPRINT1("Next gen server-to-server call\n"); - /* We check this equality inside CsrValidateMessageBuffer. */ + /* We check this equality inside CsrValidateMessageBuffer */ ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header); - /* Check for success. */ + /* Check for success */ if (!NT_SUCCESS(Status)) { /* We failed. Overwrite the return value with the failure. */ @@ -164,7 +164,7 @@ } } - /* Return the CSR Result. */ + /* Return the CSR Result */ DPRINT("Got back: 0x%lx\n", ApiMessage->Status); return ApiMessage->Status; } @@ -404,7 +404,8 @@ if (!CsrApiPort) { /* No, set it up now */ - if (!NT_SUCCESS(Status = CsrpConnectToServer(ObjectDirectory))) + Status = CsrpConnectToServer(ObjectDirectory); + if (!NT_SUCCESS(Status)) { /* Failed */ DPRINT1("Failure to connect to CSR\n"); Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -2227,8 +2227,8 @@ * \name GetConsoleInputExeNameW * \brief Retrieves the console input file name as unicode string. * \param nBufferLength Length of the buffer in WCHARs. - * Specify 0 to recieve the needed buffer length. - * \param lpBuffer Pointer to a buffer that recieves the string. + * Specify 0 to receive the needed buffer length. + * \param lpBuffer Pointer to a buffer that receives the string. * \return Needed buffer size if \p nBufferLength is 0. * Otherwise 1 if successful, 2 if buffer is too small. * \remarks Sets last error value to ERROR_BUFFER_OVERFLOW if the buffer @@ -2274,10 +2274,10 @@ * \name GetConsoleInputExeNameA * \brief Retrieves the console input file name as ansi string. * \param nBufferLength Length of the buffer in CHARs. - * \param lpBuffer Pointer to a buffer that recieves the string. + * \param lpBuffer Pointer to a buffer that receives the string. * \return 1 if successful, 2 if buffer is too small. * \remarks Sets last error value to ERROR_BUFFER_OVERFLOW if the buffer - * is not big enough. The buffer recieves as much characters as fit. + * is not big enough. The buffer receives as much characters as fit. */ DWORD WINAPI Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -134,7 +134,6 @@ } /* Connect to the base server */ - DPRINT("Connecting to CSR in DllMain...\n"); Status = CsrClientConnectToServer(SessionDir, BASESRV_SERVERDLL_INDEX, &Dummy, @@ -146,7 +145,6 @@ NtTerminateProcess(NtCurrentProcess(), Status); return FALSE; } - DPRINT("kernel32 DllMain - OK, connection succeeded\n"); /* Get the server data */ ASSERT(Peb->ReadOnlyStaticServerData); @@ -214,13 +212,11 @@ /* Insert more dll attach stuff here! */ DllInitialized = TRUE; - DPRINT("Initialization complete\n"); break; } case DLL_PROCESS_DETACH: { - DPRINT("DLL_PROCESS_DETACH\n"); if (DllInitialized == TRUE) { /* Insert more dll detach stuff here! */ Modified: branches/ros-csrss/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1430,7 +1430,7 @@ } Quickie: - /* Check if there was a dynamic path stirng to free */ + /* Check if there was a dynamic path string to free */ if ((PathString.Buffer != lpPath) && (PathString.Buffer)) { /* And free it */ Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -581,7 +581,7 @@ /* * For GUI applications we turn on the 2nd bit. This also allows - * us to know whether or not the application is a GUI or CUI app. + * us to know whether or not this is a GUI or a TUI application. */ if (IMAGE_SUBSYSTEM_WINDOWS_GUI == SectionImageInfo->SubSystemType) { @@ -1856,7 +1856,7 @@ ULONG Response; NTSTATUS Status; - /* Setup the stirng to print out */ + /* Setup the string to print out */ RtlInitUnicodeString(&UnicodeString, lpMessageText); /* Display the hard error no matter what */ Modified: branches/ros-csrss/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -233,7 +233,7 @@ } else { - /* Non-DOS, build the stirng for it without the task ID */ + /* Non-DOS, build the string for it without the task ID */ _snwprintf(CommandLine, sizeof(CommandLine), L"\"%s\\ntvdm.exe\" %s%c", Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -33,7 +33,7 @@ /* -typedef union _CSR_API_NUMBER +typedef struct _CSR_API_NUMBER { WORD Index; WORD Subsystem; Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -9,15 +9,6 @@ #ifndef _CSRSRV_H #define _CSRSRV_H - -// see http://code.google.com/p/ontl/source/browse/branches/x64/ntl/nt/csr.hxx?r=67 - -/* -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning (disable:4201) -#endif -*/ #include "csrmsg.h" @@ -213,6 +204,7 @@ IN BOOLEAN FirstPhase ); +// See http://redplait.blogspot.fr/2011/07/csrserverdll.html typedef struct _CSR_SERVER_DLL { ULONG Length; @@ -221,8 +213,8 @@ HANDLE ServerHandle; ULONG ServerId; ULONG Unknown; - ULONG ApiBase; // ApiNumberBase - ULONG HighestApiSupported; // MaxApiNumber + ULONG ApiBase; + ULONG HighestApiSupported; PCSR_API_ROUTINE *DispatchTable; PBOOLEAN ValidTable; // Table of booleans which describe whether or not a server function call is valid when it is called via CsrCallServerFromServer. PCHAR *NameTable; @@ -230,7 +222,7 @@ PCSR_CONNECT_CALLBACK ConnectCallback; PCSR_DISCONNECT_CALLBACK DisconnectCallback; PCSR_HARDERROR_CALLBACK HardErrorCallback; - PVOID SharedSection; // SharedStaticServerData + PVOID SharedSection; PCSR_NEWPROCESS_CALLBACK NewProcessCallback; PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback; ULONG Unknown2[3]; @@ -419,12 +411,6 @@ CsrValidateMessageString(IN PCSR_API_MESSAGE ApiMessage, IN LPWSTR *MessageString); -/* -#ifdef _MSC_VER -#pragma warning(pop) -#endif -*/ - #endif // _CSRSRV_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Client/Server Runtime SubSystem + * PROJECT: ReactOS Base API Server DLL * FILE: include/reactos/subsys/win/base.h * PURPOSE: Public definitions for Base API Clients * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Client/Server Runtime SubSystem + * PROJECT: ReactOS Base API Server DLL * FILE: include/reactos/subsys/win/basemsg.h * PURPOSE: Public definitions for communication * between Base API Clients and Servers @@ -184,7 +184,7 @@ PCSR_CAPTURE_BUFFER CsrCaptureData; CSR_API_NUMBER ApiNumber; - NTSTATUS Status; // ReturnValue; + NTSTATUS Status; ULONG Reserved; union { Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Client/Server Runtime SubSystem + * PROJECT: ReactOS Console Server DLL * FILE: include/reactos/subsys/win/conmsg.h * PURPOSE: Public definitions for communication * between Console API Clients and Servers @@ -131,7 +131,7 @@ /* Adapted from CONSOLE_ALLOCCONSOLE */ CONSOLE_START_INFO ConsoleStartInfo; - HANDLE Console; // ConsoleHandle // In fact, it is a PCSRSS_CONSOLE <-- correct that !! + HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCSRSS_CONSOLE HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -180,7 +180,7 @@ { PCONSOLE_START_INFO ConsoleStartInfo; - HANDLE Console; // ConsoleHandle // In fact, it is a PCSRSS_CONSOLE <-- correct that !! + HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCSRSS_CONSOLE HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -192,7 +192,7 @@ typedef struct { DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console. - HANDLE Console; // ConsoleHandle // In fact, it is a PCSRSS_CONSOLE <-- correct that !! + HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCSRSS_CONSOLE HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -585,7 +585,7 @@ PCSR_CAPTURE_BUFFER CsrCaptureData; CSR_API_NUMBER ApiNumber; - NTSTATUS Status; // ReturnValue; + NTSTATUS Status; ULONG Reserved; union { Modified: branches/ros-csrss/include/reactos/subsys/win/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Client/Server Runtime SubSystem + * PROJECT: ReactOS Console Server DLL * FILE: include/reactos/subsys/win/console.h * PURPOSE: Public definitions for Console API Clients * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Client/Server Runtime SubSystem + * PROJECT: ReactOS User API Server DLL * FILE: include/reactos/subsys/win/winmsg.h * PURPOSE: Public definitions for communication * between User-Mode API Clients and Servers @@ -40,18 +40,18 @@ { UINT Flags; DWORD Reserved; -} CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS; +} USER_EXIT_REACTOS, *PUSER_EXIT_REACTOS; typedef struct { ULONG_PTR ProcessId; -} CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; +} USER_REGISTER_SERVICES_PROCESS, *PUSER_REGISTER_SERVICES_PROCESS; typedef struct { ULONG_PTR ProcessId; BOOL Register; -} CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; +} USER_REGISTER_LOGON_PROCESS, *PUSER_REGISTER_LOGON_PROCESS; typedef struct _USER_API_MESSAGE @@ -60,13 +60,13 @@ PCSR_CAPTURE_BUFFER CsrCaptureData; CSR_API_NUMBER ApiNumber; - NTSTATUS Status; // ReturnValue; + NTSTATUS Status; ULONG Reserved; union { - CSRSS_EXIT_REACTOS ExitReactosRequest; - CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; - CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; + USER_EXIT_REACTOS ExitReactosRequest; + USER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; + USER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; } Data; } USER_API_MESSAGE, *PUSER_API_MESSAGE; Modified: branches/ros-csrss/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -138,16 +138,19 @@ SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; NTSTATUS Status; - // UCHAR KeyValueBuffer[0x40]; - // PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - // UNICODE_STRING KeyName; - // ULONG ProtectionMode = 0; - ULONG AclLength; // , ResultLength; - // HANDLE hKey; - // OBJECT_ATTRIBUTES ObjectAttributes; +#if 0 // Unused code + UCHAR KeyValueBuffer[0x40]; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + UNICODE_STRING KeyName; + ULONG ProtectionMode = 0; +#endif + ULONG AclLength; +#if 0 // Unused code + ULONG ResultLength; + HANDLE hKey; + OBJECT_ATTRIBUTES ObjectAttributes; /* Open the Session Manager Key */ - /* RtlInitUnicodeString(&KeyName, SM_REG_KEY); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -157,7 +160,7 @@ Status = NtOpenKey(&hKey, KEY_READ, &ObjectAttributes); if (NT_SUCCESS(Status)) { - /\* Read the key value *\/ + /* Read the key value */ RtlInitUnicodeString(&KeyName, L"ProtectionMode"); Status = NtQueryValueKey(hKey, &KeyName, @@ -166,19 +169,19 @@ sizeof(KeyValueBuffer), &ResultLength); - /\* Make sure it's what we expect it to be *\/ + /* Make sure it's what we expect it to be */ KeyValuePartialInfo = (PKEY_VALUE_PARTIAL_INFORMATION)KeyValueBuffer; if ((NT_SUCCESS(Status)) && (KeyValuePartialInfo->Type == REG_DWORD) && (*(PULONG)KeyValuePartialInfo->Data)) { - /\* Save the Protection Mode *\/ - // ProtectionMode = *(PULONG)KeyValuePartialInfo->Data; + /* Save the Protection Mode */ + ProtectionMode = *(PULONG)KeyValuePartialInfo->Data; } - /\* Close the handle *\/ + /* Close the handle */ NtClose(hKey); } - */ +#endif /* Allocate the System SID */ Status = RtlAllocateAndInitializeSid(&NtAuthority, @@ -520,8 +523,8 @@ CSR_SERVER_DLL_INIT(ServerDllInitialization) { /* Setup the DLL Object */ - LoadedServerDll->ApiBase = BASESRV_FIRST_API_NUMBER; // ApiNumberBase - LoadedServerDll->HighestApiSupported = BasepMaxApiNumber; // MaxApiNumber + LoadedServerDll->ApiBase = BASESRV_FIRST_API_NUMBER; + LoadedServerDll->HighestApiSupported = BasepMaxApiNumber; LoadedServerDll->DispatchTable = BaseServerApiDispatchTable; LoadedServerDll->ValidTable = BaseServerApiServerValidTable; LoadedServerDll->NameTable = BaseServerApiNameTable; Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -1365,7 +1365,7 @@ return Status; } -/* FIXME: Temporary hack. This is really "CsrShutdownProcess", mostly. Used by winsrv */ +/* HACK: Temporary hack. This is really "CsrShutdownProcesses", mostly. Used by winsrv */ #if 0 NTSTATUS WINAPI Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -603,6 +603,8 @@ ULONG_PTR ErrorParameters[4]; ULONG Response; + DPRINT1("CsrUnhandledExceptionFilter called\n"); + /* Check if a debugger is installed */ Status = NtQuerySystemInformation(SystemKernelDebuggerInformation, &DebuggerInfo, Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -367,7 +367,7 @@ PVOID InputHandle = WaitArgument2; - DPRINT1("ReadInputBufferThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); + DPRINT("ReadInputBufferThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); /* * If we are notified of the process termination via a call @@ -500,7 +500,7 @@ PVOID InputHandle = WaitArgument2; - DPRINT1("ReadCharsThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); + DPRINT("ReadCharsThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); /* * If we are notified of the process termination via a call Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -18,6 +18,12 @@ #define NDEBUG #include <debug.h> + +/* +// Define wmemset(...) +#include <wchar.h> +#define HAVE_WMEMSET +*/ /* GLOBALS ********************************************************************/ @@ -598,7 +604,7 @@ { NTSTATUS Status; - DPRINT1("WriteConsoleThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); + DPRINT("WriteConsoleThread - WaitContext = 0x%p, WaitArgument1 = 0x%p, WaitArgument2 = 0x%p, WaitFlags = %lu\n", WaitContext, WaitArgument1, WaitArgument2, WaitFlags); /* * If we are notified of the process termination via a call Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -639,7 +639,7 @@ if (!GuiMode) { - DPRINT1("CONSRV: Opening text-mode terminal emulator\n"); + DPRINT("CONSRV: Opening text-mode terminal emulator\n"); Status = TuiInitConsole(Console, ConsoleStartInfo, &ConsoleInfo, @@ -663,7 +663,7 @@ */ if (GuiMode) { - DPRINT1("CONSRV: Opening GUI-mode terminal emulator\n"); + DPRINT("CONSRV: Opening GUI-mode terminal emulator\n"); Status = GuiInitConsole(Console, ConsoleStartInfo, &ConsoleInfo, Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -23,12 +23,6 @@ #define NDEBUG #include <debug.h> - -/* -// Define wmemset(...) -#include <wchar.h> -#define HAVE_WMEMSET -*/ /* GUI Console Window Class name */ #define GUI_CONSOLE_WINDOW_CLASS L"ConsoleWindowClass" Modified: branches/ros-csrss/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -76,7 +76,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx), - sizeof(CSRSS_EXIT_REACTOS)); + sizeof(USER_EXIT_REACTOS)); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -101,7 +101,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterServicesProcess), - sizeof(CSRSS_REGISTER_SERVICES_PROCESS)); + sizeof(USER_REGISTER_SERVICES_PROCESS)); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -55,7 +55,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess), - sizeof(CSRSS_REGISTER_LOGON_PROCESS)); + sizeof(USER_REGISTER_LOGON_PROCESS)); if (!NT_SUCCESS(Status)) { ERR("Failed to register logon process with CSRSS\n"); Modified: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/C… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -19,7 +19,6 @@ set_module_type(winsrv win32dll UNICODE) -# add_importlibs(winsrv psapi msvcrt kernel32 ntdll csrsrv) add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv) add_delay_importlibs(winsrv user32 gdi32 advapi32) Modified: branches/ros-csrss/win32ss/user/winsrv/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -23,7 +23,7 @@ static NTSTATUS -CsrpGetClientFileName( +UserpGetClientFileName( OUT PUNICODE_STRING ClientFileNameU, HANDLE hProcess) { @@ -110,7 +110,7 @@ static VOID -CsrpFreeStringParameters( +UserpFreeStringParameters( IN OUT PULONG_PTR Parameters, IN PHARDERROR_MSG HardErrorMessage) { @@ -130,7 +130,7 @@ static NTSTATUS -CsrpCaptureStringParameters( +UserpCaptureStringParameters( OUT PULONG_PTR Parameters, OUT PULONG SizeOfAllUnicodeStrings, IN PHARDERROR_MSG HardErrorMessage, @@ -226,7 +226,7 @@ if (!NT_SUCCESS(Status)) { - CsrpFreeStringParameters(Parameters, HardErrorMessage); + UserpFreeStringParameters(Parameters, HardErrorMessage); return Status; } @@ -238,7 +238,7 @@ static NTSTATUS -CsrpFormatMessages( +UserpFormatMessages( OUT PUNICODE_STRING TextStringU, OUT PUNICODE_STRING CaptionStringU, IN PULONG_PTR Parameters, @@ -254,7 +254,7 @@ ULONG Size, ExceptionCode; /* Get the file name of the client process */ - CsrpGetClientFileName(&FileNameU, hProcess); + UserpGetClientFileName(&FileNameU, hProcess); /* Check if we have a file name */ if (!FileNameU.Buffer) @@ -440,7 +440,7 @@ static ULONG -CsrpMessageBox( +UserpMessageBox( PWSTR Text, PWSTR Caption, ULONG ValidResponseOptions, @@ -547,7 +547,7 @@ } /* Capture all string parameters from the process memory */ - Status = CsrpCaptureStringParameters(Parameters, &Size, Message, hProcess); + Status = UserpCaptureStringParameters(Parameters, &Size, Message, hProcess); if (!NT_SUCCESS(Status)) { NtClose(hProcess); @@ -555,15 +555,15 @@ } /* Format the caption and message box text */ - Status = CsrpFormatMessages(&TextU, - &CaptionU, - Parameters, - Size, - Message, - hProcess); + Status = UserpFormatMessages(&TextU, + &CaptionU, + Parameters, + Size, + Message, + hProcess); /* Cleanup */ - CsrpFreeStringParameters(Parameters, Message); + UserpFreeStringParameters(Parameters, Message); NtClose(hProcess); if (!NT_SUCCESS(Status)) @@ -572,10 +572,10 @@ } /* Display the message box */ - Message->Response = CsrpMessageBox(TextU.Buffer, - CaptionU.Buffer, - Message->ValidResponseOptions, - (ULONG)Message->Status >> 30); + Message->Response = UserpMessageBox(TextU.Buffer, + CaptionU.Buffer, + Message->ValidResponseOptions, + (ULONG)Message->Status >> 30); RtlFreeUnicodeString(&TextU); RtlFreeUnicodeString(&CaptionU); Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -191,13 +191,13 @@ } /********************************************************************** - * CsrpInitVideo/3 + * UserpInitVideo * * TODO: we need a virtual device for sessions other than * TODO: the console one */ NTSTATUS -CsrpInitVideo(VOID) +UserpInitVideo(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); @@ -270,7 +270,7 @@ UserServerHeap = RtlGetProcessHeap(); /* Initialize the video */ - CsrpInitVideo(); + UserpInitVideo(); NtUserInitialize(0, NULL, NULL); PrivateCsrssManualGuiCheck(0); Modified: branches/ros-csrss/win32ss/user/winsrv/register.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/register.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/register.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -25,7 +25,7 @@ CSR_API(SrvRegisterLogonProcess) { - PCSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterLogonProcessRequest; + PUSER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterLogonProcessRequest; if (RegisterLogonProcessRequest->Register) { @@ -51,7 +51,7 @@ CSR_API(SrvRegisterServicesProcess) { - PCSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterServicesProcessRequest; + PUSER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterServicesProcessRequest; if (ServicesProcessIdValid == TRUE) { Modified: branches/ros-csrss/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Sun Apr 14 12:14:00 2013 @@ -4,6 +4,8 @@ * FILE: win32ss/user/winsrv/shutdown.c * PURPOSE: Logout/shutdown * PROGRAMMERS: + * + * NOTE: The shutdown code must be rewritten completely. (hbelusca) */ /* INCLUDES *******************************************************************/ @@ -915,7 +917,7 @@ CSR_API(SrvExitWindowsEx) { - PCSRSS_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest; + PUSER_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest; if (0 == (ExitReactosRequest->Flags & EWX_INTERNAL_FLAG)) {

11 years, 5 months

[akhaldi] 58752: [DSOUND] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 13 23:33:54 2013 New Revision: 58752 URL: http://svn.reactos.org/svn/reactos?rev=58752&view=rev Log: [DSOUND] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/directx/dsound/dsound_classes.idl (with props) trunk/reactos/dll/directx/dsound/dsound_classes.rgs (with props) trunk/reactos/dll/directx/dsound/fir.h (with props) Removed: trunk/reactos/dll/directx/dsound/regsvr.c trunk/reactos/dll/directx/dsound/tests/ trunk/reactos/include/psdk/dsdriver.h Modified: trunk/reactos/dll/directx/dsound/CMakeLists.txt trunk/reactos/dll/directx/dsound/buffer.c trunk/reactos/dll/directx/dsound/capture.c trunk/reactos/dll/directx/dsound/dsound.c trunk/reactos/dll/directx/dsound/dsound_convert.c trunk/reactos/dll/directx/dsound/dsound_main.c trunk/reactos/dll/directx/dsound/dsound_private.h trunk/reactos/dll/directx/dsound/duplex.c trunk/reactos/dll/directx/dsound/mixer.c trunk/reactos/dll/directx/dsound/primary.c trunk/reactos/dll/directx/dsound/propset.c trunk/reactos/dll/directx/dsound/sound3d.c trunk/reactos/dll/directx/dsound/version.rc trunk/reactos/include/psdk/devpropdef.h trunk/reactos/include/psdk/dsound.h trunk/reactos/include/psdk/propkeydef.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/CMakeLi… Modified: trunk/reactos/dll/directx/dsound/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/buffer.… Modified: trunk/reactos/dll/directx/dsound/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/capture… Modified: trunk/reactos/dll/directx/dsound/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… Added: trunk/reactos/dll/directx/dsound/dsound_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Added: trunk/reactos/dll/directx/dsound/dsound_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/dsound_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/duplex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/duplex.… Added: trunk/reactos/dll/directx/dsound/fir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/fir.h?r… Modified: trunk/reactos/dll/directx/dsound/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/mixer.c… Modified: trunk/reactos/dll/directx/dsound/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/primary… Modified: trunk/reactos/dll/directx/dsound/propset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/propset… Removed: trunk/reactos/dll/directx/dsound/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/regsvr.… Modified: trunk/reactos/dll/directx/dsound/sound3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/sound3d… Modified: trunk/reactos/dll/directx/dsound/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/version… Modified: trunk/reactos/include/psdk/devpropdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devpropdef.h?… Removed: trunk/reactos/include/psdk/dsdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsdriver.h?re… Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… Modified: trunk/reactos/include/psdk/propkeydef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propkeydef.h?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 5 months

[akhaldi] 58751: [PSDK] * Import audioclient.idl and mmdeviceapi.idl from Wine and add them to the generated PSDK headers. * Add missing WAVE_FORMAT_IEEE_FLOAT definition to mmreg.h. * Import audio...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 13 23:28:46 2013 New Revision: 58751 URL: http://svn.reactos.org/svn/reactos?rev=58751&view=rev Log: [PSDK] * Import audioclient.idl and mmdeviceapi.idl from Wine and add them to the generated PSDK headers. * Add missing WAVE_FORMAT_IEEE_FLOAT definition to mmreg.h. * Import audiosessiontypes.h, devpkey.h and propkey.h from Wine. Added: trunk/reactos/include/psdk/audioclient.idl (with props) trunk/reactos/include/psdk/audiosessiontypes.h (with props) trunk/reactos/include/psdk/devpkey.h (with props) trunk/reactos/include/psdk/mmdeviceapi.idl (with props) trunk/reactos/include/psdk/propkey.h (with props) Modified: trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -12,6 +12,7 @@ # asynot.idl # asysta.idl atliface.idl + audioclient.idl bdaiface.idl # binres.idl bits.idl @@ -51,6 +52,7 @@ mimeinfo.idl mimeole.idl mlang.idl + mmdeviceapi.idl mscoree.idl msctf.idl msdadc.idl Added: trunk/reactos/include/psdk/audioclient.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/audioclient.i… ============================================================================== --- trunk/reactos/include/psdk/audioclient.idl (added) +++ trunk/reactos/include/psdk/audioclient.idl [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -1,0 +1,327 @@ +/* + * Core Audio audioclient definitions + * + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +import "wtypes.idl"; +import "unknwn.idl"; +import "audiosessiontypes.h"; + +/* Forward declarations */ +interface IAudioClient; +interface IAudioRenderClient; +interface IAudioCaptureClient; +interface IAudioClock; +interface IAudioClock2; +interface IAudioClockAdjustment; +interface ISimpleAudioVolume; +interface IAudioStreamVolume; +interface IChannelAudioVolume; + +cpp_quote("#if 0") +typedef struct WAVEFORMATEX /*[hidden,restricted]*/ +{ + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMATEX; +cpp_quote("#else") +cpp_quote("#include <mmreg.h>") +cpp_quote("#endif") + +cpp_quote("#if 0") +typedef LONGLONG /*[hidden,restricted]*/ REFERENCE_TIME; +cpp_quote("#else") +cpp_quote("#define _IKsControl_") +cpp_quote("#include <ks.h>") +cpp_quote("#include <ksmedia.h>") +cpp_quote("#endif") + +enum _AUDCLNT_BUFFERFLAGS +{ + AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY = 0x1, + AUDCLNT_BUFFERFLAGS_SILENT = 0x2, + AUDCLNT_BUFFERFLAGS_TIMESTAMP_ERROR = 0x4 +}; + +[ + local, + pointer_default(unique), + uuid(1cb9ad4c-dbfa-4c32-b178-c2f568a703b2), + object, +] +interface IAudioClient : IUnknown +{ + HRESULT Initialize( + [in] AUDCLNT_SHAREMODE ShareMode, + [in] DWORD StreamFlags, + [in] REFERENCE_TIME hnsBufferDuration, + [in] REFERENCE_TIME hnsPeriodicity, + [in] const WAVEFORMATEX *pFormat, + [in] LPCGUID AudioSessionGuid + ); + HRESULT GetBufferSize( + [out] UINT32 *pNumBufferFrames + ); + HRESULT GetStreamLatency( + [out] REFERENCE_TIME *phnsLatency + ); + HRESULT GetCurrentPadding( + [out] UINT32 *pNumPaddingFrames + ); + HRESULT IsFormatSupported( + [in] AUDCLNT_SHAREMODE ShareMode, + [in] const WAVEFORMATEX *pFormat, + [out,unique] WAVEFORMATEX **ppClosestMatch + ); + HRESULT GetMixFormat( + [out] WAVEFORMATEX **ppDeviceFormat + ); + HRESULT GetDevicePeriod( + [out] REFERENCE_TIME *phnsDefaultDevicePeriod, + [out] REFERENCE_TIME *phnsMinimumDevicePeriod + ); + HRESULT Start(void); + HRESULT Stop(void); + HRESULT Reset(void); + HRESULT SetEventHandle([in] HANDLE eventHandle); + HRESULT GetService( + [in] REFIID riid, + [iid_is(riid),out] void **ppv + ); +} + +[ + local, + pointer_default(unique), + uuid(f294acfc-3146-4483-a7bf-addca7c260e2), + object, +] +interface IAudioRenderClient : IUnknown +{ + HRESULT GetBuffer( + [in] UINT32 NumFramesRequested, + [out] BYTE **ppData + ); + HRESULT ReleaseBuffer( + [in] UINT32 NumFramesWritten, + [in] DWORD dwFlags + ); +} + +[ + local, + pointer_default(unique), + uuid(c8adbd64-e71e-48a0-a4de-185c395cd317), + object, +] +interface IAudioCaptureClient : IUnknown +{ + HRESULT GetBuffer( + [out] BYTE **ppData, + [out] UINT32 *pNumFramesToRead, + [out] DWORD *pdwFlags, + [unique,out] UINT64 *pu64DevicePosition, + [unique,out] UINT64 *pu64QPCPosition + ); + HRESULT ReleaseBuffer( + [in] UINT32 NumFramesRead + ); + HRESULT GetNextPacketSize( + [out] UINT32 *pNumFramesInNextPacket + ); +} + +cpp_quote("#define AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ 0x00000001") + +[ + local, + pointer_default(unique), + uuid("cd63314f-3fba-4a1b-812c-ef96358728e7"), + object, +] +interface IAudioClock : IUnknown +{ + HRESULT GetFrequency( + [out] UINT64 *pu64Frequency + ); + HRESULT GetPosition( + [out] UINT64 *pu64Position, + [out,unique] UINT64 *pu64QPCPosition + ); + HRESULT GetCharacteristics( + [out] DWORD *pdwCharacteristics + ); +} + +[ + local, + pointer_default(unique), + uuid("6f49ff73-6727-49ac-a008-d98cf5e70048"), + object, +] +interface IAudioClock2 : IUnknown +{ + HRESULT GetPosition( + [out] UINT64 *DevicePosition, + [out,unique] UINT64 *QPCPosition + ); +} + +[ + local, + pointer_default(unique), + uuid("f6e4c0a0-46d9-4fb9-be21-57a3ef2b626c"), + object, +] +interface IAudioClockAdjustment : IUnknown +{ + HRESULT SetSampleRate( + [in] float flSampleRate + ); +} + +[ + local, + pointer_default(unique), + uuid("87ce5498-68d6-44e5-9215-6da47ef883d8"), + object, +] +interface ISimpleAudioVolume : IUnknown +{ + HRESULT SetMasterVolume( + [in] float fLevel, + [unique,in] LPCGUID EventContext + ); + HRESULT GetMasterVolume( + [out] float *pfLevel + ); + HRESULT SetMute( + [in] const BOOL bMute, + [unique,in] LPCGUID EventContext + ); + HRESULT GetMute( + [out] BOOL *pbMute + ); +} + +[ + local, + pointer_default(unique), + uuid("93014887-242d-4068-8a15-cf5e93b90fe3"), + object, +] +interface IAudioStreamVolume : IUnknown +{ + HRESULT GetChannelCount( + [out] UINT32 *pdwCount + ); + HRESULT SetChannelVolume( + [in] UINT32 dwIndex, + [in] const float fLevel + ); + HRESULT GetChannelVolume( + [in] UINT32 dwIndex, + [out] float *pfLevel + ); + HRESULT SetAllVolumes( + [in] UINT32 dwCount, + [size_is(dwCount),in] const float *pfVolumes + ); + HRESULT GetAllVolumes( + [in] UINT32 dwCount, + [size_is(dwCount),out] float *pfVolumes + ); +} + +[ + local, + pointer_default(unique), + uuid("1c158861-b533-4b30-b1cf-e853e51c59b8"), + object, +] +interface IChannelAudioVolume : IUnknown +{ + HRESULT GetChannelCount( + [out] UINT32 *pdwCount + ); + HRESULT SetChannelVolume( + [in] UINT32 dwIndex, + [in] const float fLevel, + [unique,in] LPCGUID EventContext + ); + HRESULT GetChannelVolume( + [in] UINT32 dwIndex, + [out] float *pfLevel + ); + HRESULT SetAllVolumes( + [in] UINT32 dwCount, + [size_is(dwCount),in] const float *pfVolumes, + [unique,in] LPCGUID EventContext + ); + HRESULT GetAllVolumes( + [in] UINT32 dwCount, + [size_is(dwCount),out] float *pfVolumes + ); +} + +cpp_quote("#define FACILIY_AUDCLNT 0x889") +cpp_quote("#define AUDCLNT_ERR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILIY_AUDCLNT, n)") +cpp_quote("#define AUDCLNT_SUCCESS(n) MAKE_SCODE(SEVERITY_SUCCESS, FACILIY_AUDCLNT, n)") +cpp_quote("#define AUDCLNT_E_NOT_INITIALIZED AUDCLNT_ERR(1)") +cpp_quote("#define AUDCLNT_E_ALREADY_INITIALIZED AUDCLNT_ERR(2)") +cpp_quote("#define AUDCLNT_E_WRONG_ENDPOINT_TYPE AUDCLNT_ERR(3)") +cpp_quote("#define AUDCLNT_E_DEVICE_INVALIDATED AUDCLNT_ERR(4)") +cpp_quote("#define AUDCLNT_E_NOT_STOPPED AUDCLNT_ERR(5)") +cpp_quote("#define AUDCLNT_E_BUFFER_TOO_LARGE AUDCLNT_ERR(6)") +cpp_quote("#define AUDCLNT_E_OUT_OF_ORDER AUDCLNT_ERR(7)") +cpp_quote("#define AUDCLNT_E_UNSUPPORTED_FORMAT AUDCLNT_ERR(8)") +cpp_quote("#define AUDCLNT_E_INVALID_SIZE AUDCLNT_ERR(9)") +cpp_quote("#define AUDCLNT_E_DEVICE_IN_USE AUDCLNT_ERR(0x0a)") +cpp_quote("#define AUDCLNT_E_BUFFER_OPERATION_PENDING AUDCLNT_ERR(0x0b)") +cpp_quote("#define AUDCLNT_E_THREAD_NOT_REGISTERED AUDCLNT_ERR(0x0c)") +/* Not defined? cpp_quote("#define AUDCLNT_E_UNKNOWN_XXX1 AUDCLNT_ERR(0x0d)") */ +cpp_quote("#define AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED AUDCLNT_ERR(0x0e)") +cpp_quote("#define AUDCLNT_E_ENDPOINT_CREATE_FAILED AUDCLNT_ERR(0x0f)") +cpp_quote("#define AUDCLNT_E_SERVICE_NOT_RUNNING AUDCLNT_ERR(0x10)") +cpp_quote("#define AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED AUDCLNT_ERR(0x11)") +cpp_quote("#define AUDCLNT_E_EXCLUSIVE_MODE_ONLY AUDCLNT_ERR(0x12)") +cpp_quote("#define AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL AUDCLNT_ERR(0x13)") +cpp_quote("#define AUDCLNT_E_EVENTHANDLE_NOT_SET AUDCLNT_ERR(0x14)") +cpp_quote("#define AUDCLNT_E_INCORRECT_BUFFER_SIZE AUDCLNT_ERR(0x15)") +cpp_quote("#define AUDCLNT_E_BUFFER_SIZE_ERROR AUDCLNT_ERR(0x16)") +cpp_quote("#define AUDCLNT_E_CPUUSAGE_EXCEEDED AUDCLNT_ERR(0x17)") +cpp_quote("#define AUDCLNT_E_BUFFER_ERROR AUDCLNT_ERR(0x18)") +cpp_quote("#define AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED AUDCLNT_ERR(0x19)") +/* Hex fail */ +cpp_quote("#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x20)") +cpp_quote("#define AUDCLNT_E_INVALID_STREAM_FLAG AUDCLNT_ERR(0x021)") +cpp_quote("#define AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE AUDCLNT_ERR(0x022)") +cpp_quote("#define AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES AUDCLNT_ERR(0x023)") +cpp_quote("#define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x024)") +cpp_quote("#define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x025)") +cpp_quote("#define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x026)") + +cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") +cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)") +cpp_quote("#define AUDCLNT_S_POSITION_STALLED AUDCLNT_SUCCESS(0x3)") Propchange: trunk/reactos/include/psdk/audioclient.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/audiosessiontypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/audiosessiont… ============================================================================== --- trunk/reactos/include/psdk/audiosessiontypes.h (added) +++ trunk/reactos/include/psdk/audiosessiontypes.h [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -1,0 +1,48 @@ + +/* + * Core Audio audio session types definitions + * + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __AUDIOSESSIONTYPES__ +#define __AUDIOSESSIONTYPES__ + +typedef enum _AUDCLNT_SHAREMODE +{ + AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_SHAREMODE_EXCLUSIVE, +} AUDCLNT_SHAREMODE; + +#define AUDCLNT_STREAMFLAGS_CROSSPROCESS 0x00010000 +#define AUDCLNT_STREAMFLAGS_LOOPBACK 0x00020000 +#define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 +#define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 +#define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 +#define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 +#define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 + +typedef enum _AudioSessionState +{ + AudioSessionStateInactive = 0, + AudioSessionStateActive, + AudioSessionStateExpired, +} AudioSessionState; + +#endif Propchange: trunk/reactos/include/psdk/audiosessiontypes.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/devpkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devpkey.h?rev… ============================================================================== --- trunk/reactos/include/psdk/devpkey.h (added) +++ trunk/reactos/include/psdk/devpkey.h [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -1,0 +1,62 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <devpropdef.h> + +/* TODO: Not all DEVPROPKEYS have been defined here */ + +DEFINE_DEVPROPKEY(DEVPKEY_NAME, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac, 10); + +DEFINE_DEVPROPKEY(DEVPKEY_Device_DeviceDesc, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_HardwareIds, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_CompatibleIds, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Service, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Class, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ClassGuid, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Driver, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ConfigFlags, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Manufacturer, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 13); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyName, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 14); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationInfo, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 15); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PDOName, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 16); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Capabilities, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 17); +DEFINE_DEVPROPKEY(DEVPKEY_Device_UINumber, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 18); +DEFINE_DEVPROPKEY(DEVPKEY_Device_UpperFilters, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 19); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LowerFilters, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 20); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusTypeGuid, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 21); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LegacyBusType, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 22); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusNumber, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 23); +DEFINE_DEVPROPKEY(DEVPKEY_Device_EnumeratorName, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 24); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Security, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 25); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SecuritySDS, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 26); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DevType, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 27); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Exclusive, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 28); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Characteristics, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 29); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Address, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 30); +DEFINE_DEVPROPKEY(DEVPKEY_Device_UINumberDescFormat, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 31); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PowerData, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 32); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicy, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 33); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicyDefault, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 34); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicyOverride, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 35); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 36); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); Propchange: trunk/reactos/include/psdk/devpkey.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/mmdeviceapi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmdeviceapi.i… ============================================================================== --- trunk/reactos/include/psdk/mmdeviceapi.idl (added) +++ trunk/reactos/include/psdk/mmdeviceapi.idl [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -1,0 +1,250 @@ +/* + * Copyright (C) 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propsys.idl"; + +cpp_quote("#ifndef E_NOTFOUND") +cpp_quote("#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)") +cpp_quote("#endif") +cpp_quote("#ifndef E_UNSUPPORTED_TYPE") +cpp_quote("#define E_UNSUPPORTED_TYPE HRESULT_FROM_WIN32(ERROR_UNSUPPORTED_TYPE)") +cpp_quote("#endif") + + +cpp_quote("#define DEVICE_STATE_ACTIVE 0x1") +cpp_quote("#define DEVICE_STATE_DISABLED 0x2") +cpp_quote("#define DEVICE_STATE_NOTPRESENT 0x4") +cpp_quote("#define DEVICE_STATE_UNPLUGGED 0x8") +cpp_quote("#define DEVICE_STATEMASK_ALL 0xf") + +/* Generic PKEY_AudioEndPoint ID for grepping: {1da5d803-d492-4edd-8c23-e0c0ffee7f0e} */ +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_FormFactor,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,0);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_ControlPanelPageProvider,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,1);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_Association,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,2);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_PhysicalSpeakers,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,3);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_GUID,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,4);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_Disable_SysFx,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,5);") + +cpp_quote("#define ENDPOINT_SYSFX_ENABLED 0") +cpp_quote("#define ENDPOINT_SYSFX_DISABLED 1") + +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_FullRangeSpeakers,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,6);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_Supports_EventDriven_Mode,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,7);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_JackSubType,0x1da5d803,0xd492,0x4edd,0x8c,0x23,0xe0,0xc0,0xff,0xee,0x7f,0x0e,8);") + +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEngine_DeviceFormat,0xf19f064d,0x082c,0x4e27,0xbc,0x73,0x68,0x82,0xa1,0xbb,0x8e,0x4c,0);") +cpp_quote("DEFINE_PROPERTYKEY(PKEY_AudioEngine_OEMFormat,0xe4870e26,0x3cc5,0x4cd2,0xba,0x46,0xca,0x0a,0x9a,0x70,0xed,0x04,3);") + +typedef struct tagDIRECTX_AUDIO_ACTIVATION_PARAMS +{ + DWORD cbDirectXAudioActivationParams; + GUID guidAudioSession; + DWORD dwAudioStreamFlags; +} DIRECTX_AUDIO_ACTIVATION_PARAMS, *PDIRECTX_AUDIO_ACTIVATION_PARAMS; + +typedef enum _EDataFlow +{ + eRender, + eCapture, + eAll, + EDataFlow_enum_count +} EDataFlow; + +typedef enum _ERole +{ + eConsole, + eMultimedia, + eCommunications, + ERole_enum_count +} ERole; + +typedef enum _EndpointFormFactor +{ + RemoteNetworkDevice, + Speakers, + LineLevel, + Headphones, + Microphone, + Headset, + Handset, + UnknownDigitalPassthrough, + SPDIF, + DigitalAudioDisplayDevice, + UnknownFormFactor, + EndpointFormFactor_enum_count +} EndpointFormFactor; + +cpp_quote("#define HDMI DigitalAudioDisplayDevice") + +[ + object, + local, + uuid(7991eec9-7e89-4d85-8390-6c703cec60c0), + nonextensible, + pointer_default(unique) +] +interface IMMNotificationClient : IUnknown +{ + [id(1)] HRESULT OnDeviceStateChanged( + [in] LPCWSTR pwstrDeviceId, + [in] DWORD dwNewState + ); + [id(2)] HRESULT OnDeviceAdded( + [in] LPCWSTR pwstrDeviceId + ); + [id(3)] HRESULT OnDeviceRemoved( + [in] LPCWSTR pwstrDeviceId + ); + [id(4)] HRESULT OnDefaultDeviceChanged( + [in] EDataFlow flow, + [in] ERole role, + [in] LPCWSTR pwstrDeviceId + ); + [id(5)] HRESULT OnPropertyValueChanged( + [in] LPCWSTR pwstrDeviceId, + [in] const PROPERTYKEY key + ); +} + +[ + object, + local, + uuid(d666063f-1587-4e43-81f1-b948e807363f), + nonextensible, + pointer_default(unique) +] +interface IMMDevice : IUnknown +{ + [id(1)] HRESULT Activate( + [in] REFIID iid, + [in] DWORD dwClsCtx, + [in,unique] PROPVARIANT *pActivationParams, + [out,iid_is(iid)] void **ppv + ); + [id(2)] HRESULT OpenPropertyStore( + [in] DWORD stgmAccess, + [out] IPropertyStore **ppProperties + ); + [id(3)] HRESULT GetId( + [out] LPWSTR *ppstrId + ); + [id(4)] HRESULT GetState( + [out] DWORD *pdwState + ); +} + +[ + object, + local, + uuid(0bd7a1be-7a1a-44db-8397-cc5392387b5e), + nonextensible, + pointer_default(unique) +] +interface IMMDeviceCollection : IUnknown +{ + [id(1)] HRESULT GetCount( + [out] UINT *pcDevices + ); + [id(2)] HRESULT Item( + [in] UINT nDevice, + [out] IMMDevice **ppdevice + ); +} + +[ + object, + local, + uuid(1be09788-6894-4089-8586-9a2a6c265ac5), + nonextensible, + pointer_default(unique) +] +interface IMMEndpoint : IUnknown +{ + [id(1)] HRESULT GetDataFlow( + [out] EDataFlow *pDataFlow + ); +} + +[ + object, + local, + uuid(a95664d2-9614-4f35-a746-de8db63617e6), + nonextensible, + pointer_default(unique) +] +interface IMMDeviceEnumerator : IUnknown +{ + [id(1)] HRESULT EnumAudioEndpoints( + [in] EDataFlow dataFlow, + [in] DWORD dwStateMask, + [out] IMMDeviceCollection **ppDevices + ); + [id(2)] HRESULT GetDefaultAudioEndpoint( + [in] EDataFlow dataFlow, + [in] ERole role, + [out] IMMDevice **ppEndpoint + ); + [id(3)] HRESULT GetDevice( + [in] LPCWSTR pwstrId, + [out] IMMDevice **ppDevice + ); + [id(4)] HRESULT RegisterEndpointNotificationCallback( + [in] IMMNotificationClient *pClient + ); + [id(5)] HRESULT UnregisterEndpointNotificationCallback( + [in] IMMNotificationClient *pClient + ); +} + +[ + object, + local, + uuid(3b0d0ea4-d0a9-4b0e-935b-09516746fac0), + nonextensible, + pointer_default(unique) +] +interface IMMDeviceActivator : IUnknown +{ + [id(1)] HRESULT Activate( + [in] REFIID iid, + [in] IMMDevice *pDevice, + [in] PROPVARIANT *pActivationParams, + [out,iid_is(iid)] void **ppv + ); +} + +typedef struct _AudioExtensionParams +{ + LPARAM AddPageParam; + IMMDevice *pEndPoint; + IMMDevice *pPnpInterface; + IMMDevice *pPnpDevnode; +} AudioExtensionParams; + +[ + uuid(2fdaafa3-7523-4f66-9957-9d5e7fe698f6), + version(1.0) +] +library MMDeviceAPILib +{ + [ uuid(bcde0395-e52f-467c-8e3d-c4579291692e) ] coclass MMDeviceEnumerator + { + [default] interface IMMDeviceEnumerator; + } +} Propchange: trunk/reactos/include/psdk/mmdeviceapi.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -92,6 +92,7 @@ /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #define WAVE_FORMAT_ADPCM 0x0002 /* Microsoft Corporation */ +#define WAVE_FORMAT_IEEE_FLOAT 0x0003 /* Microsoft Corporation */ #define WAVE_FORMAT_IBM_CVSD 0x0005 /* IBM Corporation */ #define WAVE_FORMAT_ALAW 0x0006 /* Microsoft Corporation */ #define WAVE_FORMAT_MULAW 0x0007 /* Microsoft Corporation */ Added: trunk/reactos/include/psdk/propkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propkey.h?rev… ============================================================================== --- trunk/reactos/include/psdk/propkey.h (added) +++ trunk/reactos/include/psdk/propkey.h [iso-8859-1] Sat Apr 13 23:28:46 2013 @@ -1,0 +1,46 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_PROPKEY +#define _INC_PROPKEY + +#include <propkeydef.h> + +DEFINE_PROPERTYKEY(PKEY_Audio_ChannelCount, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 7); +DEFINE_PROPERTYKEY(PKEY_Audio_Compression, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 10); +DEFINE_PROPERTYKEY(PKEY_Audio_Format, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 2); +DEFINE_PROPERTYKEY(PKEY_Audio_IsVariableBitRate, 0xe6822fee, 0x8c17, 0x4d62, 0x82, 0x3c, 0x8e, 0x9c, 0xfc, 0xbd, 0x1d, 0x5c, 100); +DEFINE_PROPERTYKEY(PKEY_Audio_PeakValue, 0x2579e5d0, 0x1116, 0x4084, 0xbd, 0x9a, 0x9b, 0x4f, 0x7c, 0xb4, 0xdf, 0x5e, 100); +DEFINE_PROPERTYKEY(PKEY_Audio_SampleRate, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 5); +DEFINE_PROPERTYKEY(PKEY_Audio_SampleSize, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 6); +DEFINE_PROPERTYKEY(PKEY_Audio_StreamName, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 9); +DEFINE_PROPERTYKEY(PKEY_Audio_StreamNumber, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 8); + +DEFINE_PROPERTYKEY(PKEY_Title, 0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9,2); + +DEFINE_PROPERTYKEY(PKEY_ItemName, 0x6b8da074,0x3b5c,0x43bc,0x88,0x6f,0x0a,0x2c,0xdc,0xe0,0x0b,0x6f,100); + +DEFINE_PROPERTYKEY(PKEY_AppUserModel_ExcludeFromShowInNewInstall, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,8); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_ID, 0x9f4c2855,0x9f79,0x4B39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,5); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,6); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_PreventPinning, 0x9f4c2855,0x9F79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,9); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_RelaunchCommand, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,2); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_RelaunchDisplayNameResource, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,4); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_RelaunchIconResource, 0x9f4c2855,0x9f79,0x4b39,0xa8,0xd0,0xe1,0xd4,0x2d,0xe1,0xd5,0xf3,3); + +#endif /*_INC_PROPKEY*/ Propchange: trunk/reactos/include/psdk/propkey.h ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 5 months

[akhaldi] 58750: * Forgot the GCC case.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 13 22:42:50 2013 New Revision: 58750 URL: http://svn.reactos.org/svn/reactos?rev=58750&view=rev Log: * Forgot the GCC case. Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Apr 13 22:42:50 2013 @@ -300,7 +300,7 @@ #endif /* DECLSPEC_ALIGN */ #ifndef DECLSPEC_SELECTANY -#if (_MSC_VER >= 1100) +#if (_MSC_VER >= 1100) || defined(__GNUC__) #define DECLSPEC_SELECTANY __declspec(selectany) #else #define DECLSPEC_SELECTANY Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Apr 13 22:42:50 2013 @@ -218,7 +218,7 @@ #endif #ifndef DECLSPEC_SELECTANY -#if (_MSC_VER >= 1100) +#if (_MSC_VER >= 1100) || defined(__GNUC__) #define DECLSPEC_SELECTANY __declspec(selectany) #else #define DECLSPEC_SELECTANY

11 years, 5 months

[akhaldi] 58749: [PSDK] * Add DECLSPEC_SELECTANY.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 13 22:35:13 2013 New Revision: 58749 URL: http://svn.reactos.org/svn/reactos?rev=58749&view=rev Log: [PSDK] * Add DECLSPEC_SELECTANY. Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Apr 13 22:35:13 2013 @@ -298,6 +298,14 @@ #define DECLSPEC_ALIGN(x) #endif #endif /* DECLSPEC_ALIGN */ + +#ifndef DECLSPEC_SELECTANY +#if (_MSC_VER >= 1100) +#define DECLSPEC_SELECTANY __declspec(selectany) +#else +#define DECLSPEC_SELECTANY +#endif +#endif /* Use to silence unused variable warnings when it is intentional */ #define UNREFERENCED_PARAMETER(P) {(P)=(P);} Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Apr 13 22:35:13 2013 @@ -215,6 +215,14 @@ # else # define DECLSPEC_NOVTABLE # endif +#endif + +#ifndef DECLSPEC_SELECTANY +#if (_MSC_VER >= 1100) +#define DECLSPEC_SELECTANY __declspec(selectany) +#else +#define DECLSPEC_SELECTANY +#endif #endif #ifndef DECLSPEC_ADDRSAFE

11 years, 5 months

[hbelusca] 58748: [REACTOS] Addendum to revision r58744. CORE-7062 #comment the NDIS_** structures, albeit containing the "recieve" misspelling, must be kept as they are because we must be compatib...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Apr 13 22:11:40 2013 New Revision: 58748 URL: http://svn.reactos.org/svn/reactos?rev=58748&view=rev Log: [REACTOS] Addendum to revision r58744. CORE-7062 #comment the NDIS_** structures, albeit containing the "recieve" misspelling, must be kept as they are because we must be compatible with the Windows DDK. Indeed this one contains the misspelling. Blame Microsoft if they do not know how to write proper English or if they do not re-read what they are writing !! Modified: trunk/reactos/include/ddk/ndiswan.h Modified: trunk/reactos/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndiswan.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ndiswan.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndiswan.h [iso-8859-1] Sat Apr 13 22:11:40 2013 @@ -212,6 +212,12 @@ IN NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_SET_COMP_INFO, *PNDIS_WAN_SET_COMP_INFO; +/* + * NOTE: As some people may notice, this structure contains three misspelled + * fields (the "Tunnel*Recieve*" fields). Their names come from the Windows + * Driver Development Kit and thus, blame Microsoft if they do not know how + * to write proper English or if they do not re-read what they are writing !! + */ typedef struct _NDIS_WAN_GET_STATS_INFO { IN NDIS_HANDLE NdisLinkHandle; OUT ULONG BytesSent; @@ -228,10 +234,10 @@ OUT ULONG BytesReceivedUncompressed; OUT ULONG BytesTransmittedCompressed; OUT ULONG BytesReceivedCompressed; - OUT ULONG TunnelPacketsReceived; - OUT ULONG TunnelReceivePacketsPending; + OUT ULONG TunnelPacketsRecieved; + OUT ULONG TunnelRecievePacketsPending; OUT ULONG TunnelPacketsIndicatedUp; - OUT ULONG TunnelReceivePacketsRejected; + OUT ULONG TunnelRecievePacketsRejected; OUT ULONG TunnelPacketsSent; OUT ULONG TunnelPacketsSentComplete; OUT ULONG TunnelTransmitPacketsPending; @@ -302,6 +308,12 @@ IN NDIS_WAN_COMPRESS_INFO RecvCapabilities; } NDIS_WAN_CO_SET_COMP_INFO, *PNDIS_WAN_CO_SET_COMP_INFO; +/* + * NOTE: As some people may notice, this structure contains three misspelled + * fields (the "Tunnel*Recieve*" fields). Their names come from the Windows + * Driver Development Kit and thus, blame Microsoft if they do not know how + * to write proper English or if they do not re-read what they are writing !! + */ typedef struct _NDIS_WAN_CO_GET_STATS_INFO { OUT ULONG BytesSent; OUT ULONG BytesRcvd; @@ -317,10 +329,10 @@ OUT ULONG BytesReceivedUncompressed; OUT ULONG BytesTransmittedCompressed; OUT ULONG BytesReceivedCompressed; - OUT ULONG TunnelPacketsReceived; - OUT ULONG TunnelReceivePacketsPending; + OUT ULONG TunnelPacketsRecieved; + OUT ULONG TunnelRecievePacketsPending; OUT ULONG TunnelPacketsIndicatedUp; - OUT ULONG TunnelReceivePacketsRejected; + OUT ULONG TunnelRecievePacketsRejected; OUT ULONG TunnelPacketsSent; OUT ULONG TunnelPacketsSentComplete; OUT ULONG TunnelTransmitPacketsPending;

11 years, 5 months

[ekohl] 58747: [MSV1_0] Retrieve all information about the user.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 13 21:50:54 2013 New Revision: 58747 URL: http://svn.reactos.org/svn/reactos?rev=58747&view=rev Log: [MSV1_0] Retrieve all information about the user. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sat Apr 13 21:50:54 2013 @@ -206,10 +206,12 @@ SAMPR_HANDLE ServerHandle = NULL; SAMPR_HANDLE DomainHandle = NULL; + SAMPR_HANDLE UserHandle = NULL; PRPC_SID AccountDomainSid = NULL; RPC_UNICODE_STRING Names[1]; SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; SAMPR_ULONG_ARRAY Use = {0, NULL}; + PSAMPR_USER_INFO_BUFFER UserInfo = NULL; NTSTATUS Status; TRACE("()\n"); @@ -302,9 +304,38 @@ goto done; } + /* Open the user object */ + Status = SamrOpenUser(DomainHandle, + USER_READ_GENERAL | USER_READ_LOGON | + USER_READ_ACCOUNT | USER_READ_PREFERENCES, /* FIXME */ + RelativeIds.Element[0], + &UserHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenUser failed (Status %08lx)\n", Status); + goto done; + } + + Status = SamrQueryInformationUser(UserHandle, + UserAllInformation, + &UserInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrQueryInformationUser failed (Status %08lx)\n", Status); + goto done; + } + + + TRACE("UserName: %S\n", UserInfo->All.UserName.Buffer); + done: + if (UserHandle != NULL) + SamrCloseHandle(&UserHandle); + + SamIFree_SAMPR_USER_INFO_BUFFER(UserInfo, + UserAllInformation); SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); SamIFree_SAMPR_ULONG_ARRAY(&Use); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Sat Apr 13 21:50:54 2013 @@ -53,11 +53,111 @@ typedef wchar_t *PSAMPR_SERVER_NAME; typedef void *SAMPR_HANDLE; +typedef struct _OLD_LARGE_INTEGER +{ + unsigned long LowPart; + long HighPart; +} OLD_LARGE_INTEGER, *POLD_LARGE_INTEGER; + +typedef struct RPC_SHORT_BLOB +{ + unsigned short Length; + unsigned short MaximumLength; + unsigned short *Buffer; +} RPC_SHORT_BLOB, *PRPC_SHORT_BLOB; + +typedef struct _SAMPR_SR_SECURITY_DESCRIPTOR +{ + unsigned long Length; + unsigned char *SecurityDescriptor; +} SAMPR_SR_SECURITY_DESCRIPTOR, *PSAMPR_SR_SECURITY_DESCRIPTOR; + +typedef struct _ENCRYPTED_LM_OWF_PASSWORD +{ + char data[16]; +} ENCRYPTED_LM_OWF_PASSWORD, *PENCRYPTED_LM_OWF_PASSWORD, ENCRYPTED_NT_OWF_PASSWORD, *PENCRYPTED_NT_OWF_PASSWORD; + typedef struct _SAMPR_ULONG_ARRAY { ULONG Count; PULONG Element; } SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; + +typedef struct _SAMPR_LOGON_HOURS +{ + unsigned short UnitsPerWeek; + unsigned char *LogonHours; +} SAMPR_LOGON_HOURS, *PSAMPR_LOGON_HOURS; + +typedef struct _SAMPR_USER_ALL_INFORMATION +{ + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + OLD_LARGE_INTEGER PasswordLastSet; + OLD_LARGE_INTEGER AccountExpires; + OLD_LARGE_INTEGER PasswordCanChange; + OLD_LARGE_INTEGER PasswordMustChange; + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; + RPC_UNICODE_STRING HomeDirectory; + RPC_UNICODE_STRING HomeDirectoryDrive; + RPC_UNICODE_STRING ScriptPath; + RPC_UNICODE_STRING ProfilePath; + RPC_UNICODE_STRING AdminComment; + RPC_UNICODE_STRING WorkStations; + RPC_UNICODE_STRING UserComment; + RPC_UNICODE_STRING Parameters; + RPC_SHORT_BLOB LmOwfPassword; + RPC_SHORT_BLOB NtOwfPassword; + RPC_UNICODE_STRING PrivateData; + SAMPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor; + unsigned long UserId; + unsigned long PrimaryGroupId; + unsigned long UserAccountControl; + unsigned long WhichFields; + SAMPR_LOGON_HOURS LogonHours; + unsigned short BadPasswordCount; + unsigned short LogonCount; + unsigned short CountryCode; + unsigned short CodePage; + unsigned char LmPasswordPresent; + unsigned char NtPasswordPresent; + unsigned char PasswordExpired; + unsigned char PrivateDataSensitive; +} SAMPR_USER_ALL_INFORMATION, *PSAMPR_USER_ALL_INFORMATION; + +typedef union _SAMPR_USER_INFO_BUFFER +{ +#if 0 + SAMPR_USER_GENERAL_INFORMATION General; + SAMPR_USER_PREFERENCES_INFORMATION Preferences; + SAMPR_USER_LOGON_INFORMATION Logon; + SAMPR_USER_LOGON_HOURS_INFORMATION LogonHours; + SAMPR_USER_ACCOUNT_INFORMATION Account; + SAMPR_USER_NAME_INFORMATION Name; + SAMPR_USER_A_NAME_INFORMATION AccountName; + SAMPR_USER_F_NAME_INFORMATION FullName; + USER_PRIMARY_GROUP_INFORMATION PrimaryGroup; + SAMPR_USER_HOME_INFORMATION Home; + SAMPR_USER_SCRIPT_INFORMATION Script; + SAMPR_USER_PROFILE_INFORMATION Profile; + SAMPR_USER_ADMIN_COMMENT_INFORMATION AdminComment; + SAMPR_USER_WORKSTATIONS_INFORMATION WorkStations; + SAMPR_USER_SET_PASSWORD_INFORMATION SetPassword; + USER_CONTROL_INFORMATION Control; + USER_EXPIRES_INFORMATION Expires; + SAMPR_USER_INTERNAL1_INFORMATION Internal1; + SAMPR_USER_PARAMETERS_INFORMATION Parameters; +#endif + SAMPR_USER_ALL_INFORMATION All; +#if 0 + SAMPR_USER_INTERNAL4_INFORMATION Internal4; + SAMPR_USER_INTERNAL5_INFORMATION Internal5; + SAMPR_USER_INTERNAL4_INFORMATION_NEW Internal4New; + SAMPR_USER_INTERNAL5_INFORMATION_NEW Internal5New; +#endif +} SAMPR_USER_INFO_BUFFER, *PSAMPR_USER_INFO_BUFFER; + NTSTATUS NTAPI @@ -70,16 +170,14 @@ NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr); +VOID +NTAPI +SamIFree_SAMPR_USER_INFO_BUFFER(PSAMPR_USER_INFO_BUFFER Ptr, + USER_INFORMATION_CLASS InformationClass); + NTSTATUS NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); - -NTSTATUS -NTAPI -SamrOpenDomain(IN SAMPR_HANDLE ServerHandle, - IN ACCESS_MASK DesiredAccess, - IN PRPC_SID DomainId, - OUT SAMPR_HANDLE *DomainHandle); NTSTATUS NTAPI @@ -88,6 +186,27 @@ IN RPC_UNICODE_STRING Names[], OUT PSAMPR_ULONG_ARRAY RelativeIds, OUT PSAMPR_ULONG_ARRAY Use); + +NTSTATUS +NTAPI +SamrOpenDomain(IN SAMPR_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN PRPC_SID DomainId, + OUT SAMPR_HANDLE *DomainHandle); + +NTSTATUS +NTAPI +SamrOpenUser(IN SAMPR_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG UserId, + OUT SAMPR_HANDLE *UserHandle); + +NTSTATUS +NTAPI +SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + OUT PSAMPR_USER_INFO_BUFFER *Buffer); + typedef PVOID LSAPR_HANDLE;

11 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013