Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 74333: [AT] Added RU translation to the AT command. [BLACKSHADE] Added RU translation to the blackshade theme. CORE-12961
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 20:57:30 2017 New Revision: 74333 URL: http://svn.reactos.org/svn/reactos?rev=74333&view=rev Log: [AT] Added RU translation to the AT command. [BLACKSHADE] Added RU translation to the blackshade theme. CORE-12961 Added: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc (with props) trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/at/at.rc trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc Modified: trunk/reactos/base/applications/cmdutils/at/at.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -15,3 +15,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -0,0 +1,50 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° AT Ð¿ÑÐµÐ´Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼\n\ +Ð² ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ Ð¿Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐ¼ Ð´Ð½ÑÐ¼. ÐÐ»Ñ ÑÐ°Ð±Ð¾ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾, ÑÑÐ¾Ð±Ñ\n\ +Ð±ÑÐ»Ð° Ð·Ð°Ð¿ÑÑÐµÐ½Ð° ÑÐ»ÑÐ¶Ð±Ð° Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²ÑÐ¸ÐºÐ° (Schedule service).\n\n\ +AT [\\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°] Ð²ÑÐµÐ¼Ñ [/INTERACTIVE]\n\ + [ /EVERY:Ð´ÐµÐ½Ñ[,...] | /NEXT:Ð´ÐµÐ½Ñ[,...]] ""ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°""\n\n\ +\\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° ÐÐ¼Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°. ÐÑÐ»Ð¸ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, \n\ + Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ.\n\ +id ÐÐ¾ÑÑÐ´ÐºÐ¾Ð²ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¹ Ð·Ð°Ð´Ð°ÑÐ¸.\n\ +/DELETE ÐÑÐ¼ÐµÐ½ÑÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. ÐÑÐ»Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ is Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, ÑÐ¾\n\ + Ð²ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ, Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ, Ð±ÑÐ´ÑÑ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ñ.\n\ +/YES ÐÑÐ¼ÐµÐ½Ð° Ð·Ð°Ð¿ÑÐ¾ÑÐ° Ð½Ð° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸ Ð¾ÑÐ¼ÐµÐ½Ðµ Ð²ÑÐµÑ\n\ + Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð·Ð°Ð´Ð°Ñ.\n\ +Ð²ÑÐµÐ¼Ñ ÐÑÐµÐ¼Ñ Ð·Ð°Ð¿ÑÑÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\n\ +/INTERACTIVE Ð Ð°Ð·ÑÐµÑÐ°ÐµÑ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð·Ð°Ð´Ð°ÑÐ¸ Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼,\n\ + ÑÐ°Ð±Ð¾ÑÐ°ÑÑÐ¸Ð¼ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð²Ð¾ Ð²ÑÐµÐ¼Ñ Ð·Ð°Ð¿ÑÑÐºÐ° Ð·Ð°Ð´Ð°ÑÐ¸.\n\ +/EVERY:Ð´ÐµÐ½Ñ[,...] ÐÐ°Ð´Ð°ÑÐ° Ð±ÑÐ´ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÑÑÑÑ ÐºÐ°Ð¶Ð´ÑÐ¹ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð´ÐµÐ½Ñ (Ð´Ð½Ð¸) Ð¸Ð»Ð¸\n\ + Ð¼ÐµÑÑÑ. ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´ÐµÐ½Ñ \n\ + Ð¼ÐµÑÑÑÐ°.\n\ +/NEXT:Ð´ÐµÐ½Ñ[,...] ÐÐ°Ð´Ð°ÑÐ° Ð±ÑÐ´ÐµÑ Ð·Ð°Ð¿ÑÑÐµÐ½Ð° Ð² ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð´ÐµÐ½Ñ Ð½ÐµÐ´ÐµÐ»Ð¸\n\ + (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð² ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÐµÑÐ²ÐµÑÐ³). ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, ÑÐ¾ \n\ + Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´ÐµÐ½Ñ Ð¼ÐµÑÑÑÐ°.\n\ +""ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"" ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n" + + IDS_CONFIRM_DELETE "ÐÑÐ° Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ ÑÐ´Ð°Ð»Ð¸Ñ Ð²ÑÐµ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ.\nÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸? (Y-Ð´Ð°/N-Ð½ÐµÑ) [N] " + IDS_NEW_JOB "ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ Ð½Ð¾Ð²Ð¾Ðµ Ð·Ð°Ð´Ð°Ð½Ð¸Ðµ Ñ ID = %lu\n" + IDS_JOBS_LIST "Ð¡ÑÐ°ÑÑÑ ID ÐÐµÐ½Ñ ÐÑÐµÐ¼Ñ ÐÐ¾Ð¼Ð°Ð½Ð´Ð°\n" + IDS_NO_ENTRIES "Ð ÑÐ¿Ð¸ÑÐºÐµ Ð½ÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð·Ð°Ð´Ð°Ñ.\n" + + IDS_TODAY "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ" + IDS_TOMORROW "ÐÐ°Ð²ÑÑÐ°" + IDS_EVERY "ÐÐ°Ð¶Ð´ÑÐ¹" + IDS_NEXT "Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ð¹" + + IDS_YES "ÐÐ°" + IDS_NO "ÐÐµÑ" + IDS_ERROR "ÐÐ¨ÐÐÐÐ" + IDS_OK "ÐÐ" + + IDS_TASKID "ID Ð·Ð°Ð´Ð°ÑÐ¸: %lu\n" + IDS_STATUS "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ: %s\n" + IDS_SCHEDULE "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ: %s\n" + IDS_TIME "ÐÑÐµÐ¼Ñ ÑÑÑÐ¾Ðº: %s\n" + IDS_INTERACTIVE "Interactive: %s\n" + IDS_COMMAND "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°: %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -183,5 +183,9 @@ #pragma code_page(65001) -#include "lang/en-US.rc" - +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc (added) +++ trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -0,0 +1,37 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ +1000, "Black Shade" +} + +STRINGTABLE +{ +2000, "Black Shade" +} + +STRINGTABLE +{ +3000, "ÐÐ±ÑÑÐ½ÑÐ¹" +3001, "ÐÑÑÐ¿Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +3002, "ÐÐ³ÑÐ¾Ð¼Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +} + +STRINGTABLE +{ +4000, "ÐÐ±ÑÑÐ½ÑÐ¹" +4001, "ÐÑÑÐ¿Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +4002, "ÐÐ³ÑÐ¾Ð¼Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +} + +STRINGTABLE +{ +5000, "Black Shade" +5001, "ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹ Ð¡ÑÐ¸Ð»Ñ" +5002, "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +5003, "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñ David Quintana <gigaherz(a)gmail.com>" +5004, "ÐÑÐ¿ÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ CC-BY-SA 4.0" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÑÐ¸Ð»Ñ Ð´Ð»Ñ ReactOS" +} Propchange: trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 74332: [DESK] Added en-GB to desk.cpl. CORE-13014
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 20:39:37 2017 New Revision: 74332 URL: http://svn.reactos.org/svn/reactos?rev=74332&view=rev Log: [DESK] Added en-GB to desk.cpl. CORE-13014 Added: trunk/reactos/dll/cpl/desk/lang/en-GB.rc (with props) Modified: trunk/reactos/dll/cpl/desk/desk.rc Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.rc [iso-8859-1] Sun Apr 16 20:39:37 2017 @@ -37,6 +37,9 @@ #endif #ifdef LANGUAGE_EL_GR #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_GB + #include "lang/en-GB.rc" #endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" Added: trunk/reactos/dll/cpl/desk/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-GB.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-GB.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/en-GB.rc [iso-8859-1] Sun Apr 16 20:39:37 2017 @@ -0,0 +1,255 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK + +IDD_BACKGROUND DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Background" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 103, 230, 9 + PUSHBUTTON "&Browse...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 + PUSHBUTTON "&Colour...", IDC_COLOR_BUTTON, 188, 177, 55, 15 + LTEXT "&Placement", IDC_STATIC, 188, 138, 55, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Screensaver" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Se&ttings", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Wait", IDC_WAITTEXT, 14, 125, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 + LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", IDC_STATIC, 14, 166, 146, 27 + PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 +END + +IDD_APPEARANCE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Visual Style", IDC_STATIC, 7, 130, 104, 9 + COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "&Colour scheme", IDC_STATIC, 7, 160, 104, 9 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "&Font size", IDC_STATIC, 7, 190, 104, 9 + COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "A&dvanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Element", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | + UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + LTEXT "&1st Colour", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "&2nd Colour", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "&Font", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Font Si&ze", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + LTEXT "Colou&r", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips", + IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 + CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 + CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", + IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + +IDD_SETTINGS DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20 + CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | + WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE + LTEXT "&Display:", 1820, 3, 107, 70, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 + GROUPBOX "&Screen area", 1818, 3, 127, 115, 43 + CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 + LTEXT "Less", 1815, 9, 137, 25, 9, NOT WS_GROUP + LTEXT "More", 1816, 93, 137, 20, 9, NOT WS_GROUP + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colours", 1817, 125, 127, 115, 43 + COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 + PUSHBUTTON "Ad&vanced...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 14 +END + +IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size", -1, 14, 20, 222, 9 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change colour settings.\n\nAfter I change colour settings", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new colour settings.", IDC_RESTART_RB, 14, 116, 228, 10 + AUTORADIOBUTTON "Apply the new colour settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + AUTORADIOBUTTON "Ask me before applying the new colour settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END +END + +STRINGTABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Display" + IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_NONE "(None)" + IDS_CENTER "Center" + IDS_STRETCH "Stretch" + IDS_TILE "Tile" +END + +STRINGTABLE +BEGIN + IDS_COLOR_4BIT "16 Colours" + IDS_COLOR_8BIT "256 Colours" + IDS_COLOR_16BIT "High Colour (16 Bit)" + IDS_COLOR_24BIT "True Colour (24 Bit)" + IDS_COLOR_32BIT "True Colour (32 Bit)" + IDS_PIXEL "%lux%lu pixels" +END + +STRINGTABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures" +END + +STRINGTABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" + IDS_CLASSIC_THEME "Classic Theme" +END + +STRINGTABLE +BEGIN + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Selected Items" + IDS_ELEMENT_7 "Windows" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objects" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Application background" + IDS_ELEMENT_14 "Icon distance (horizontal)" + IDS_ELEMENT_15 "Icon distance (vertical)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Icon" +// IDS_ELEMENT_18 "Deactivated menu elements" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_SETTINGS "Display settings" + IDS_APPLY_FAILED "Failed to apply new settings..." + IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." +END Propchange: trunk/reactos/dll/cpl/desk/lang/en-GB.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 74331: [USETUP] base/setup/usetup/it-IT translation patch. CORE-12999 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 20:22:03 2017 New Revision: 74331 URL: http://svn.reactos.org/svn/reactos?rev=74331&view=rev Log: [USETUP] base/setup/usetup/it-IT translation patch. CORE-12999 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Apr 16 20:22:03 2017 @@ -595,7 +595,7 @@ { 10, 9, - "tutti i CD-ROMs dalle unit.", + "Tutti i CD-ROMs dalle unità.", TEXT_STYLE_NORMAL }, { @@ -797,20 +797,19 @@ { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Premere C per creare una nuova partizione.", + "\x07 Premere P per creare una nuova partizione.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 Premere E per creare una partizione estesa.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press L to create a logical partition.", + "\x07 Premere L per creare una partizione logica.", TEXT_STYLE_NORMAL }, { @@ -844,79 +843,79 @@ { 6, 8, - "You have chosen to delete the system partition.", + "Hai scelto di eliminare la partizione di sistema.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnostic programs, hardware configuration", + "Le partizioni di sistema possono contenere i programmi diagnostici, configurazione hardware", TEXT_STYLE_NORMAL }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + "Programmi utilizzati per l'avvio di un sistema operativo (come ReactOS) o altri.", TEXT_STYLE_NORMAL }, { 6, 12, - "programs provided by the hardware manufacturer.", + "Programmi forniti dal produttore dell'hardware.", TEXT_STYLE_NORMAL }, { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "Elimina una partizione di sistema solo quando sei sicuro che non ci siano", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partition, or when you are sure you want to delete them.", + "programmi sulla partizione, o quando sei sicuro di eliminarla.", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "Cancellando una partizione, non sarÃ piÃ¹ possibile avviare", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + "il computer dall'harddisk fino al termine del setup di ReactOS.", TEXT_STYLE_NORMAL }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 Primere INVIO per eliminare una partizione di sistema. Ti sarÃ chiesto", TEXT_STYLE_NORMAL }, { 8, 21, - " to confirm the deletion of the partition again later.", + " di confermare ancora l'eliminazione della partizione.", TEXT_STYLE_NORMAL }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", + "\x07 Premere ESC per ritornare alla pagina precedente. La partizione", TEXT_STYLE_NORMAL }, { 8, 25, - " not be deleted.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER=Continue ESC=Cancel", + " non verrÃ cancellata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "INVIO=Continua ESC=Annulla", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1365,7 +1364,7 @@ { { // NOT_AN_ERROR - "Success\n" + "Successo\n" }, { //ERROR_NOT_INSTALLED @@ -1573,37 +1572,37 @@ }, { //ERROR_DIRECTORY_NAME, - "Invalid directory name.\n" + "Nome della cartella non valido.\n" "\n" - " * Press any key to continue." + " * Premere un tasto qualsiasi per continuare." }, { //ERROR_INSUFFICIENT_PARTITION_SIZE, - "The selected partition is not large enough to install ReactOS.\n" - "The install partition must have a size of at least %lu MB.\n" + "Spazio nella partizione insufficiente per installare ReactOS.\n" + "La partizione deve avere una dimensione di almeno %lu MB.\n" "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, { //ERROR_PARTITION_TABLE_FULL, - "You can not create a new primary or extended partition in the\n" - "partition table of this disk because the partition table is full.\n" + "Non Ã¨ possibile creare una partizione primaria o secondaria nella\n" + "tabella delle partizioni del disco perchÃ¨ questa Ã¨ piena.\n" "\n" - " * Press any key to continue." + " * Premere un tasto qualsiasi per continuare." }, { //ERROR_ONLY_ONE_EXTENDED, - "You can not create more than one extended partition per disk.\n" + "Impossibile creare piÃ¹ di una partizione primaria per disco.\n" "\n" - " * Press any key to continue." + " * Premere un tasto qualsiasi per continuare." }, { //ERROR_FORMATTING_PARTITION, - "Setup is unable to format the partition:\n" + "Setup non Ã¨ riuscito a formattare la partizione:\n" " %S\n" "\n" - "ENTER = Reboot computer" + "ENTER = Riavvia il computer" }, { NULL, @@ -1720,23 +1719,21 @@ {STRING_PLEASEWAIT, " Attendere..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " INVIO = Installa C = Crea Partizione F3 = Esci"}, + " INVIO = Installa P = Crea Partizione E = Crea Partizione Estesa F3 = Esci"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " INVIO = Installa L = Crea Partizione Lgica F3 = Esci"}, {STRING_INSTALLDELETEPARTITION, " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Elimina Partizione F3 = Esci"}, {STRING_PARTITIONSIZE, "Dimensione della nuova partizione:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a primary partition on"}, -// "Avete scelto di creare una nuova partizione su"}, + "Si Ã¨ scelto di creare una nuova partizione primaria su"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, - "You have chosen to create an extended partition on"}, + "Si Ã¨ scelto di creare una nuova partizione estesa su"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "You have chosen to create a logical partition on"}, + "Si Ã¨ scelto di creare una nuova partizione logica su"}, {STRING_HDDSIZE, "Indicare la dimensione della nuova partizione in megabyte."}, {STRING_CREATEPARTITION, @@ -1746,9 +1743,9 @@ {STRING_NONFORMATTEDPART, "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, {STRING_NONFORMATTEDSYSTEMPART, - "The system partition is not formatted yet."}, + "La partizione di sistema non Ã¨ stata ancora formattata."}, {STRING_NONFORMATTEDOTHERPART, - "The new partition is not formatted yet."}, + "La nuova partizione non Ã¨ stata ancora formattata."}, {STRING_INSTALLONPART, "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART,

1 0

[gadamopoulos] 74330: [SHLWAPI_UNDOC.H] -Fix definition of IUnknown_SetOwner.
by gadamopoulos＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: gadamopoulos Date: Sun Apr 16 19:35:19 2017 New Revision: 74330 URL: http://svn.reactos.org/svn/reactos?rev=74330&view=rev Log: [SHLWAPI_UNDOC.H] -Fix definition of IUnknown_SetOwner. Modified: trunk/reactos/sdk/include/reactos/shlwapi_undoc.h Modified: trunk/reactos/sdk/include/reactos/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/shlwap… ============================================================================== --- trunk/reactos/sdk/include/reactos/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/shlwapi_undoc.h [iso-8859-1] Sun Apr 16 19:35:19 2017 @@ -103,7 +103,7 @@ #define SHCreateWorkerWindow SHCreateWorkerWindowA #endif -HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); +HRESULT WINAPI IUnknown_SetOwner(IUnknown *iface, IUnknown *pUnk); HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg);

1 0

[gadamopoulos] 74329: [EXPLORER] -If rshell is present and CBandSiteMenu_CreateInstance or CBandSite_CreateInstance are exported, use them instead of using the one provided by the system. Now we ca...
by gadamopoulos＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: gadamopoulos Date: Sun Apr 16 19:29:27 2017 New Revision: 74329 URL: http://svn.reactos.org/svn/reactos?rev=74329&view=rev Log: [EXPLORER] -If rshell is present and CBandSiteMenu_CreateInstance or CBandSite_CreateInstance are exported, use them instead of using the one provided by the system. Now we can start developing CBandSite and CBandSiteMenu on windows to implement support for taskbar toolbars. Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/rshell.cpp trunk/reactos/base/shell/explorer/tbsite.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -205,6 +205,8 @@ */ SetProcessShutdownParameters(2, 0); + InitRSHELL(); + #if !WIN7_COMPAT_MODE BOOL CreateShellDesktop = FALSE; Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -108,11 +108,14 @@ * rshell.c */ +VOID InitRSHELL(VOID); HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv); HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); DWORD WINAPI _WinList_Init(void); void WINAPI _ShellDDEInit(BOOL bInit); +HRESULT WINAPI _CBandSiteMenu_CreateInstance(REFIID riid, void **ppv); +HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv); /* * traywnd.c Modified: trunk/reactos/base/shell/explorer/rshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/rshell… ============================================================================== --- trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -20,20 +20,20 @@ #include "precomp.h" -static HINSTANCE hRShell = NULL; +static HINSTANCE ghRShell = NULL; typedef HRESULT(WINAPI * PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); +VOID InitRSHELL(VOID) +{ + ghRShell = LoadLibraryW(L"rshell.dll"); +} + HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv) { - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(hRShell, "CStartMenu_Constructor"); + if (ghRShell) + { + PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(ghRShell, "CStartMenu_Constructor"); if (func) { return func(riid, ppv); @@ -44,7 +44,7 @@ NULL, CLSCTX_INPROC_SERVER, riid, - ppv); + ppv); } typedef HANDLE(WINAPI * PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); @@ -53,14 +53,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(hRShell, "SHCreateDesktop"); + if (ghRShell) + { + PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(ghRShell, "SHCreateDesktop"); if (func) { return func(ShellDesk); @@ -87,14 +82,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(hRShell, "SHDesktopMessageLoop"); + if (ghRShell) + { + PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(ghRShell, "SHDesktopMessageLoop"); if (func) { return func(hDesktop); @@ -121,14 +111,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(hRShell, "WinList_Init"); + if (ghRShell) + { + PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(ghRShell, "WinList_Init"); if (func) { return func(); @@ -155,14 +140,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(hRShell, "ShellDDEInit"); + if (ghRShell) + { + PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(ghRShell, "ShellDDEInit"); if (func) { func(bInit); @@ -182,3 +162,42 @@ } } } + +typedef HRESULT (WINAPI *CBANDSITEMENU_CREATEINSTANCE)(REFIID riid, void **ppv); +HRESULT WINAPI _CBandSiteMenu_CreateInstance(REFIID riid, void **ppv) +{ + if (ghRShell) + { + CBANDSITEMENU_CREATEINSTANCE func = (CBANDSITEMENU_CREATEINSTANCE)GetProcAddress(ghRShell, "CBandSiteMenu_CreateInstance"); + if (func) + { + return func(riid, ppv); + } + } + + return CoCreateInstance(CLSID_BandSiteMenu, + NULL, + CLSCTX_INPROC_SERVER, + riid, + ppv); +} + +typedef HRESULT (WINAPI *CBANDSITE_CREATEINSTANCE)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv); +HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv) +{ + if (ghRShell) + { + CBANDSITE_CREATEINSTANCE func = (CBANDSITE_CREATEINSTANCE)GetProcAddress(ghRShell, "CBandSite_CreateInstance"); + if (func) + { + return func(pUnkOuter, riid, ppv); + } + } + + return CoCreateInstance(CLSID_RebarBandSite, + pUnkOuter, + CLSCTX_INPROC_SERVER, + riid, + ppv); +} + Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… ============================================================================== --- trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -285,26 +285,17 @@ IN UINT uFlags, OUT IContextMenu **ppcm) { + HRESULT hRet; + if (m_ContextMenu == NULL) { - HRESULT hRet; - CComPtr<IShellService> pSs; - /* Cache the context menu so we don't need to CoCreateInstance all the time... */ - hRet = CoCreateInstance(CLSID_BandSiteMenu, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellService, &pSs)); - TRACE("CoCreateInstance(CLSID_BandSiteMenu) for IShellService returned: 0x%x\n", hRet); - if (!SUCCEEDED(hRet)) + hRet = _CBandSiteMenu_CreateInstance(IID_PPV_ARG(IContextMenu, &m_ContextMenu)); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - hRet = pSs->SetOwner((IBandSite*)this); - if (!SUCCEEDED(hRet)) - { - return hRet; - } - - hRet = pSs->QueryInterface(IID_PPV_ARG(IContextMenu, &m_ContextMenu)); - - if (!SUCCEEDED(hRet)) + hRet = IUnknown_SetOwner(m_ContextMenu, (IBandSite*)this); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; } @@ -315,7 +306,11 @@ } /* Add the menu items */ - return m_ContextMenu->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + hRet = m_ContextMenu->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE Lock(IN BOOL bLock) @@ -643,10 +638,7 @@ m_TaskBand = pTaskBand; /* Create the RebarBandSite */ - hRet = CoCreateInstance(CLSID_RebarBandSite, - static_cast<IBandSite*>(this), - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IUnknown, &m_Inner)); + hRet = _CBandSite_CreateInstance(static_cast<IBandSite*>(this), IID_PPV_ARG(IUnknown, &m_Inner)); if (FAILED_UNEXPECTEDLY(hRet)) return hRet;

1 0

[cfinck] 74328: Fix GCC build, part 4/X (losing my optimism)
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 15:51:44 2017 New Revision: 74328 URL: http://svn.reactos.org/svn/reactos?rev=74328&view=rev Log: Fix GCC build, part 4/X (losing my optimism) Modified: trunk/rostests/apitests/spoolss/PackStrings.c Modified: trunk/rostests/apitests/spoolss/PackStrings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/PackStri… ============================================================================== --- trunk/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] Sun Apr 16 15:51:44 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for PackStrings - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -21,8 +21,8 @@ START_TEST(PackStrings) { - PCWSTR Source1[] = { L"Test", L"String" }; - PCWSTR Source2[] = { L"Test", NULL }; + PWSTR Source1[] = { L"Test", L"String" }; + PWSTR Source2[] = { L"Test", NULL }; BYTE Buffer[50]; PBYTE pEnd;

1 0

[cfinck] 74327: Fix GCC build (3/3) :)
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 15:44:22 2017 New Revision: 74327 URL: http://svn.reactos.org/svn/reactos?rev=74327&view=rev Log: Fix GCC build (3/3) :) Modified: trunk/reactos/win32ss/printing/processors/winprint/main.c Modified: trunk/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/processor… ============================================================================== --- trunk/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Sun Apr 16 15:44:22 2017 @@ -8,7 +8,7 @@ #include "precomp.h" // Local Constants -static PCWSTR _pwszDatatypes[] = { +static PWSTR _pwszDatatypes[] = { L"RAW", 0 }; @@ -114,7 +114,7 @@ DWORD dwDatatypeCount = 0; DWORD dwErrorCode; DWORD dwOffsets[_countof(_pwszDatatypes)]; - PCWSTR* pCurrentDatatype; + PWSTR* pCurrentDatatype; PDWORD pCurrentOffset = dwOffsets; TRACE("EnumPrintProcessorDatatypesW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned);

1 0

[cfinck] 74326: Fix GCC build (2/2)
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 15:37:31 2017 New Revision: 74326 URL: http://svn.reactos.org/svn/reactos?rev=74326&view=rev Log: Fix GCC build (2/2) Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c trunk/reactos/win32ss/printing/base/spoolss/tools.c trunk/reactos/win32ss/printing/include/spoolss.h trunk/reactos/win32ss/printing/providers/localspl/main.c trunk/reactos/win32ss/printing/providers/localspl/precomp.h trunk/reactos/win32ss/printing/providers/localspl/printers.c Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -65,7 +65,6 @@ BOOL WINAPI EnumPrintersW(DWORD Flags, PWSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - BOOL bReturnValue; DWORD cbCallBuffer; DWORD cbNeeded; DWORD dwErrorCode = 0xFFFFFFFF; @@ -94,7 +93,7 @@ pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); // Call the EnumPrinters function of this Print Provider. - bReturnValue = pPrintProvider->PrintProvider.fpEnumPrinters(Flags, Name, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); + pPrintProvider->PrintProvider.fpEnumPrinters(Flags, Name, Level, pCallBuffer, cbCallBuffer, &cbNeeded, &dwReturned); // Add the returned counts to the total values. *pcbNeeded += cbNeeded; Modified: trunk/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Miscellaneous tool functions - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -86,7 +86,7 @@ * The strings are copied in reverse order, so this pointer will point to the last copied string of pSource. */ PBYTE WINAPI -PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) +PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) { DWORD cbString; ULONG_PTR StringAddress; Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -26,7 +26,7 @@ BOOL WINAPI DllFreeSplStr(PWSTR pwszString); BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); -PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); +PBYTE WINAPI PackStrings(PWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -16,7 +16,7 @@ const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; -const WCHAR* wszPrintProviderInfo[3] = { +PWSTR wszPrintProviderInfo[3] = { L"Windows NT Local Print Providor", // Name L"Locally connected Printers", // Comment L"Windows NT Local Printers" // Description Modified: trunk/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -258,7 +258,7 @@ extern const WCHAR wszCurrentEnvironment[]; extern const DWORD cbCurrentEnvironment; extern const WCHAR wszDefaultDocumentName[]; -extern const WCHAR* wszPrintProviderInfo[3]; +extern PWSTR wszPrintProviderInfo[3]; extern WCHAR wszSpoolDirectory[MAX_PATH]; extern DWORD cchSpoolDirectory; Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Sun Apr 16 15:37:31 2017 @@ -386,9 +386,9 @@ { const WCHAR wszComma[] = L","; - DWORD cbName; - DWORD cbComment; - DWORD cbDescription; + size_t cbName; + size_t cbComment; + size_t cbDescription; DWORD cchComputerName = 0; DWORD dwErrorCode; DWORD i;

1 0

[cfinck] 74325: Fix GCC build
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 14:30:07 2017 New Revision: 74325 URL: http://svn.reactos.org/svn/reactos?rev=74325&view=rev Log: Fix GCC build Modified: trunk/reactos/win32ss/printing/include/spoolss.h Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Sun Apr 16 14:30:07 2017 @@ -30,7 +30,7 @@ PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); -DWORD WINAPI SpoolerInit(); +BOOL WINAPI SpoolerInit(); PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif

1 0

[cfinck] 74324: [LOCALSPL] - Refactor LocalEnumPrinters to make it ready for supporting additional levels. - Correctly handle all passed flags for Level 1 queries to the Local Print Provider. - Int...
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 14:12:01 2017 New Revision: 74324 URL: http://svn.reactos.org/svn/reactos?rev=74324&view=rev Log: [LOCALSPL] - Refactor LocalEnumPrinters to make it ready for supporting additional levels. - Correctly handle all passed flags for Level 1 queries to the Local Print Provider. - Introduce strsafe functions to LocalEnumPrinters in a way that actually makes the code smaller. To be done in other parts too. - Use PackStrings in LocalEnumPrinters to simplify the code. - Return the correct 3 strings in the Description field of Level 1 queries. That also introduces the "Location" field. - Remove debug spam in _OpenEnvironment. [SPOOLSV] - Make use of the newly implemented AlignRpcPtr/UndoAlignRpcPtr. Fixes a test. [WINSPOOL] - Dismiss invalid levels already in EnumPrintersW and zero the input buffer here (but not in localspl). Verified by a test. EnumPrintersW for Level 1 should be fully supported now. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/win32ss/printing/base/spoolss/printers.c trunk/reactos/win32ss/printing/base/spoolsv/precomp.h trunk/reactos/win32ss/printing/base/spoolsv/printers.c trunk/reactos/win32ss/printing/base/winspool/printers.c trunk/reactos/win32ss/printing/include/spoolss.h trunk/reactos/win32ss/printing/providers/localspl/main.c trunk/reactos/win32ss/printing/providers/localspl/precomp.h trunk/reactos/win32ss/printing/providers/localspl/printers.c trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c trunk/rostests/apitests/winspool/EnumPrinters.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -1277,6 +1277,7 @@ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Location",,"At Home" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Port",,"LPT1:" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Print Processor",,"winprint" HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Printer Driver",,"Dummy Printer Driver" Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -68,27 +68,27 @@ BOOL bReturnValue; DWORD cbCallBuffer; DWORD cbNeeded; + DWORD dwErrorCode = 0xFFFFFFFF; DWORD dwReturned; PBYTE pCallBuffer; PSPOOLSS_PRINT_PROVIDER pPrintProvider; PLIST_ENTRY pEntry; - // Sanity checks. - if ((cbBuf && !pPrinterEnum) || !pcbNeeded || !pcReturned) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - // Begin counting. *pcbNeeded = 0; *pcReturned = 0; + if (cbBuf && !pPrinterEnum) + { + dwErrorCode = ERROR_INVALID_USER_BUFFER; + goto Cleanup; + } + // At the beginning, we have the full buffer available. cbCallBuffer = cbBuf; pCallBuffer = pPrinterEnum; - // Loop through all Print Provider. + // Loop through all Print Providers. for (pEntry = PrintProviderList.Flink; pEntry != &PrintProviderList; pEntry = pEntry->Flink) { pPrintProvider = CONTAINING_RECORD(pEntry, SPOOLSS_PRINT_PROVIDER, Entry); @@ -109,9 +109,15 @@ // Advance the buffer if the caller provided it. if (pCallBuffer) pCallBuffer += cbNeeded; - } - - return bReturnValue; + + // dwErrorCode shall not be overwritten if a previous EnumPrinters call already succeeded. + if (dwErrorCode != ERROR_SUCCESS) + dwErrorCode = GetLastError(); + } + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI @@ -148,6 +154,7 @@ OpenPrinterW(PWSTR pPrinterName, PHANDLE phPrinter, PPRINTER_DEFAULTSW pDefault) { BOOL bReturnValue; + DWORD dwErrorCode = ERROR_INVALID_PRINTER_NAME; HANDLE hPrinter; PLIST_ENTRY pEntry; PSPOOLSS_PRINTER_HANDLE pHandle; @@ -156,8 +163,8 @@ // Sanity checks. if (!pPrinterName || !phPrinter) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } // Loop through all Print Providers to find one able to open this Printer. @@ -173,27 +180,33 @@ pHandle = DllAllocSplMem(sizeof(SPOOLSS_PRINTER_HANDLE)); if (!pHandle) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); - return FALSE; + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } pHandle->pPrintProvider = pPrintProvider; pHandle->hPrinter = hPrinter; *phPrinter = (HANDLE)pHandle; - SetLastError(ERROR_SUCCESS); - return TRUE; + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; } else if (bReturnValue == ROUTER_STOP_ROUTING) { ERR("A Print Provider returned ROUTER_STOP_ROUTING for Printer \"%S\"!\n", pPrinterName); - return FALSE; + dwErrorCode = GetLastError(); + goto Cleanup; } } - // We found no Print Provider able to open this Printer. - return FALSE; + // ERROR_INVALID_NAME by the Print Provider is translated to ERROR_INVALID_PRINTER_NAME here, but not in other APIs as far as I know. + if (dwErrorCode == ERROR_INVALID_NAME) + dwErrorCode = ERROR_INVALID_PRINTER_NAME; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI Modified: trunk/reactos/win32ss/printing/base/spoolsv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Precompiled Header for all source files - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #ifndef _PRECOMP_H @@ -18,14 +18,12 @@ #include <winsplp.h> #include <winspool_s.h> +#include <spoolss.h> + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); // rpcserver.c DWORD WINAPI LrpcThreadProc(LPVOID lpParameter); -// Undocumented spoolss -BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); -DWORD WINAPI SpoolerInit(); - #endif Modified: trunk/reactos/win32ss/printing/base/spoolsv/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolsv/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler Service * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -137,21 +137,24 @@ _RpcEnumPrinters(DWORD Flags, WINSPOOL_HANDLE Name, DWORD Level, BYTE* pPrinterEnum, DWORD cbBuf, DWORD* pcbNeeded, DWORD* pcReturned) { DWORD dwErrorCode; - DWORD i; - PBYTE p = pPrinterEnum; - - dwErrorCode = RpcImpersonateClient(NULL); - if (dwErrorCode != ERROR_SUCCESS) - { - ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); - return dwErrorCode; - } - - EnumPrintersW(Flags, Name, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + PBYTE pPrinterEnumAligned; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + pPrinterEnumAligned = AlignRpcPtr(pPrinterEnum, &cbBuf); + EnumPrintersW(Flags, Name, Level, pPrinterEnumAligned, cbBuf, pcbNeeded, pcReturned); dwErrorCode = GetLastError(); if (dwErrorCode == ERROR_SUCCESS) { + DWORD i; + PBYTE p = pPrinterEnumAligned; + // Replace absolute pointer addresses in the output by relative offsets. for (i = 0; i < *pcReturned; i++) { @@ -165,6 +168,8 @@ } RpcRevertToSelf(); + UndoAlignRpcPtr(pPrinterEnum, pPrinterEnumAligned, cbBuf, pcbNeeded); + return dwErrorCode; } Modified: trunk/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler API * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -309,6 +309,16 @@ DWORD i; PBYTE p = pPrinterEnum; + // Dismiss invalid levels already at this point. + if (Level == 3 || Level > 5) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + if (cbBuf && pPrinterEnum) + ZeroMemory(pPrinterEnum, cbBuf); + // Do the RPC call RpcTryExcept { @@ -335,6 +345,7 @@ } } +Cleanup: SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); } Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -24,11 +24,13 @@ PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); +BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle); BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); +DWORD WINAPI SpoolerInit(); PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Main functions - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -18,8 +18,8 @@ const WCHAR* wszPrintProviderInfo[3] = { L"Windows NT Local Print Providor", // Name - L"Windows NT Local Printers", // Description - L"Locally connected Printers" // Comment + L"Locally connected Printers", // Comment + L"Windows NT Local Printers" // Description }; // Local Constants Modified: trunk/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -15,6 +15,7 @@ #include <lmcons.h> #include <rpc.h> +#include <strsafe.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -114,6 +115,7 @@ DWORD dwAttributes; DWORD dwStatus; + PWSTR pwszLocation; PWSTR pwszPrinterDriver; PWSTR pwszDescription; PWSTR pwszDefaultDatatype; Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions related to Printers and printing - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -10,6 +10,13 @@ // Global Variables SKIPLIST PrinterList; +// Local Constants +static DWORD dwPrinterInfo1Offsets[] = { + FIELD_OFFSET(PRINTER_INFO_1W, pName), + FIELD_OFFSET(PRINTER_INFO_1W, pComment), + FIELD_OFFSET(PRINTER_INFO_1W, pDescription), + MAXDWORD +}; /** * @name _PrinterListCompareRoutine @@ -170,6 +177,11 @@ pPrinter->pPort = pPort; InitializePrinterJobList(pPrinter); + // Get the location. + pPrinter->pwszLocation = AllocAndRegQueryWSZ(hSubKey, L"Location"); + if (!pPrinter->pwszLocation) + continue; + // Get the printer driver. pPrinter->pwszPrinterDriver = AllocAndRegQueryWSZ(hSubKey, L"Printer Driver"); if (!pPrinter->pwszPrinterDriver) @@ -284,9 +296,93 @@ return (dwErrorCode == ERROR_SUCCESS); } - -DWORD -_LocalEnumPrintersLevel1(DWORD Flags, LPWSTR Name, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +/** + * @name _IsLocalComputerName + * + * Checks if the given Computer Name matches the local Computer Name. + * + * @param Name + * Computer Name prepended with two backslashes to check. + * + * @param pwszComputerName + * Pointer to a string able to hold 2 + MAX_COMPUTERNAME_LENGTH + 1 + 1 characters. + * Will contain a string "\\COMPUTERNAME\" on success that can be prepended in EnumPrinters. + * + * @param pcchComputerName + * On success, this pointer receives the length in characters of pwszComputerName. + * + * @return + * ERROR_SUCCESS on success or an error code on failure. + */ +static DWORD +_IsLocalComputerName(PCWSTR Name, PWSTR pwszComputerName, PDWORD pcchComputerName) +{ + DWORD dwErrorCode; + + // Prepend slashes to the computer name. + pwszComputerName[0] = L'\\'; + pwszComputerName[1] = L'\\'; + + // Get the local computer name for comparison. + *pcchComputerName = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(&pwszComputerName[2], pcchComputerName)) + { + dwErrorCode = GetLastError(); + ERR("GetComputerNameW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Add the leading slashes to the total length. + *pcchComputerName += 2; + + // Now compare this with the local computer name and reject it with ERROR_INVALID_NAME if it doesn't match. + if (wcsicmp(&Name[2], &pwszComputerName[2]) != 0) + { + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; + } + + // Add a trailing backslash to pwszComputerName, which will later be prepended in front of the printer names. + pwszComputerName[(*pcchComputerName)++] = L'\\'; + pwszComputerName[*pcchComputerName] = 0; + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +static DWORD +_DumpLevel1PrintProviderInformation(PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + int i; + + // Count the needed bytes for Print Provider information. + *pcbNeeded = sizeof(PRINTER_INFO_1W); + + for (i = 0; i < 3; i++) + *pcbNeeded += (wcslen(wszPrintProviderInfo[i]) + 1) * sizeof(WCHAR); + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + return ERROR_INSUFFICIENT_BUFFER; + + // Copy over the Print Provider information. + ((PPRINTER_INFO_1W)pPrinterEnum)->Flags = 0; + PackStrings(wszPrintProviderInfo, pPrinterEnum, dwPrinterInfo1Offsets, &pPrinterEnum[*pcbNeeded]); + *pcReturned = 1; + + return ERROR_SUCCESS; +} + +static DWORD +_LocalEnumPrintersLevel0(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; +} + +static DWORD +_LocalEnumPrintersLevel1(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { const WCHAR wszComma[] = L","; @@ -297,57 +393,28 @@ DWORD dwErrorCode; DWORD i; PBYTE pPrinterInfo; - PBYTE pPrinterString; + PBYTE pPrinterStrings; PSKIPLIST_NODE pNode; PLOCAL_PRINTER pPrinter; - PRINTER_INFO_1W PrinterInfo1; - WCHAR wszComputerName[2 + MAX_COMPUTERNAME_LENGTH + 1 + 1]; - - DWORD dwOffsets[] = { - FIELD_OFFSET(PRINTER_INFO_1W, pName), - FIELD_OFFSET(PRINTER_INFO_1W, pDescription), - FIELD_OFFSET(PRINTER_INFO_1W, pComment), - MAXDWORD - }; + PWSTR p; + PWSTR pwszStrings[3]; + WCHAR wszComputerName[2 + MAX_COMPUTERNAME_LENGTH + 1 + 1] = { 0 }; if (Flags & PRINTER_ENUM_NAME) { if (Name) { // The user supplied a Computer Name (with leading double backslashes) or Print Provider Name. - // Only process what's directed at us and dismiss every other request with ERROR_INVALID_NAME. + // Only process what's directed at us. if (Name[0] == L'\\' && Name[1] == L'\\') { - // Prepend slashes to the computer name. - wszComputerName[0] = L'\\'; - wszComputerName[1] = L'\\'; - - // Get the local computer name for comparison. - cchComputerName = MAX_COMPUTERNAME_LENGTH + 1; - if (!GetComputerNameW(&wszComputerName[2], &cchComputerName)) - { - dwErrorCode = GetLastError(); - ERR("GetComputerNameW failed with error %lu!\n", dwErrorCode); + dwErrorCode = _IsLocalComputerName(Name, wszComputerName, &cchComputerName); + if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; - } - - // Add the leading slashes to the total length. - cchComputerName += 2; - - // Now compare this with the local computer name and reject if it doesn't match. - if (wcsicmp(&Name[2], &wszComputerName[2]) != 0) - { - dwErrorCode = ERROR_INVALID_NAME; - goto Cleanup; - } - - // Add a trailing backslash to wszComputerName, which will later be prepended in front of the printer names. - wszComputerName[cchComputerName++] = L'\\'; - wszComputerName[cchComputerName] = 0; } else if (wcsicmp(Name, wszPrintProviderInfo[0]) != 0) { - // The user supplied a name that cannot be processed by the local print provider. + // The user supplied a name that cannot be processed by the Local Print Provider. dwErrorCode = ERROR_INVALID_NAME; goto Cleanup; } @@ -356,23 +423,7 @@ { // The caller wants information about this Print Provider. // spoolss packs this into an array of information about all Print Providers. - *pcbNeeded = sizeof(PRINTER_INFO_1W); - - for (i = 0; i < 3; i++) - *pcbNeeded += (wcslen(wszPrintProviderInfo[i]) + 1) * sizeof(WCHAR); - - // Check if the supplied buffer is large enough. - if (cbBuf < *pcbNeeded) - { - dwErrorCode = ERROR_INSUFFICIENT_BUFFER; - goto Cleanup; - } - - // Copy over the print processor information. - ((PPRINTER_INFO_1W)pPrinterEnum)->Flags = 0; - PackStrings(wszPrintProviderInfo, pPrinterEnum, dwOffsets, &pPrinterEnum[*pcbNeeded]); - *pcReturned = 1; - dwErrorCode = ERROR_SUCCESS; + dwErrorCode = _DumpLevel1PrintProviderInformation(pPrinterEnum, cbBuf, pcbNeeded, pcReturned); goto Cleanup; } } @@ -384,14 +435,17 @@ { pPrinter = (PLOCAL_PRINTER)pNode->Element; - // This looks wrong, but is totally right. PRINTER_INFO_1W has three members pName, pComment and pDescription. - // But pComment equals the "Description" registry value while pDescription is concatenated out of pName and pComment. + // TODO: If PRINTER_ENUM_SHARED is given, add this Printer if it's shared instead of just ignoring it. + if (Flags & PRINTER_ENUM_SHARED) + continue; + + // Attention: pComment equals the "Description" registry value while pDescription is concatenated out of several strings. // On top of this, the computer name is prepended to the printer name if the user supplied the local computer name during the query. - cbName = (wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + cbName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbComment = (wcslen(pPrinter->pwszDescription) + 1) * sizeof(WCHAR); - cbDescription = cchComputerName * sizeof(WCHAR) + cbName + cbComment + sizeof(WCHAR); - - *pcbNeeded += sizeof(PRINTER_INFO_1W) + cchComputerName * sizeof(WCHAR) + cbName + cbComment + cbDescription; + cbDescription = cbName + (wcslen(pPrinter->pwszPrinterDriver) + 1 + wcslen(pPrinter->pwszLocation) + 1) * sizeof(WCHAR); + + *pcbNeeded += sizeof(PRINTER_INFO_1W) + cbName + cbComment + cbDescription; i++; } @@ -402,49 +456,53 @@ goto Cleanup; } - // Put the strings right after the last PRINTER_INFO_1W structure. - // Due to all the required string processing, we can't just use PackStrings here :( + // Initialize the variables for filling the output buffer using PackStrings. pPrinterInfo = pPrinterEnum; - pPrinterString = pPrinterEnum + i * sizeof(PRINTER_INFO_1W); - - // Copy over the printer information. + pPrinterStrings = &pPrinterEnum[*pcbNeeded]; + + // Copy over the Printer information. for (pNode = PrinterList.Head.Next[0]; pNode; pNode = pNode->Next[0]) { pPrinter = (PLOCAL_PRINTER)pNode->Element; - // FIXME: As for now, the Flags member returns no information. - PrinterInfo1.Flags = 0; - - // Copy the printer name. - PrinterInfo1.pName = (PWSTR)pPrinterString; - CopyMemory(pPrinterString, wszComputerName, cchComputerName * sizeof(WCHAR)); - pPrinterString += cchComputerName * sizeof(WCHAR); - cbName = (wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszPrinterName, cbName); - pPrinterString += cbName; - - // Copy the printer comment (equals the "Description" registry value). - PrinterInfo1.pComment = (PWSTR)pPrinterString; + // TODO: If PRINTER_ENUM_SHARED is given, add this Printer if it's shared instead of just ignoring it. + if (Flags & PRINTER_ENUM_SHARED) + continue; + + // Indicate that this is a Printer. + ((PPRINTER_INFO_1W)pPrinterInfo)->Flags = PRINTER_ENUM_ICON8; + + // Calculate the string lengths. + cbName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbComment = (wcslen(pPrinter->pwszDescription) + 1) * sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszDescription, cbComment); - pPrinterString += cbComment; - - // Copy the description, which for PRINTER_INFO_1W has the form "Name,Comment," - PrinterInfo1.pDescription = (PWSTR)pPrinterString; - CopyMemory(pPrinterString, wszComputerName, cchComputerName * sizeof(WCHAR)); - pPrinterString += cchComputerName * sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszPrinterName, cbName - sizeof(WCHAR)); - pPrinterString += cbName - sizeof(WCHAR); - CopyMemory(pPrinterString, wszComma, sizeof(WCHAR)); - pPrinterString += sizeof(WCHAR); - CopyMemory(pPrinterString, pPrinter->pwszDescription, cbComment - sizeof(WCHAR)); - pPrinterString += cbComment - sizeof(WCHAR); - CopyMemory(pPrinterString, wszComma, sizeof(wszComma)); - pPrinterString += sizeof(wszComma); - + cbDescription = cbName + (wcslen(pPrinter->pwszPrinterDriver) + 1 + wcslen(pPrinter->pwszLocation) + 1) * sizeof(WCHAR); + + // Copy the Printer Name. + pwszStrings[0] = DllAllocSplMem(cbName); + p = pwszStrings[0]; + StringCbCopyExW(p, cbName, wszComputerName, &p, &cbName, 0); + StringCbCopyExW(p, cbName, pPrinter->pwszPrinterName, &p, &cbName, 0); + + // Copy the Printer comment (equals the "Description" registry value). + pwszStrings[1] = pPrinter->pwszDescription; + + // Copy the description, which for PRINTER_INFO_1W has the form "Name,Printer Driver,Location" + pwszStrings[2] = DllAllocSplMem(cbDescription); + p = pwszStrings[2]; + StringCbCopyExW(p, cbDescription, wszComputerName, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, pPrinter->pwszPrinterName, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, wszComma, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, pPrinter->pwszPrinterDriver, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, wszComma, &p, &cbDescription, 0); + StringCbCopyExW(p, cbDescription, pPrinter->pwszLocation, &p, &cbDescription, 0); + // Finally copy the structure and advance to the next one in the output buffer. - CopyMemory(pPrinterInfo, &PrinterInfo1, sizeof(PRINTER_INFO_1W)); + pPrinterStrings = PackStrings(pwszStrings, pPrinterInfo, dwPrinterInfo1Offsets, pPrinterStrings); pPrinterInfo += sizeof(PRINTER_INFO_1W); + + // Free the memory for temporary strings. + DllFreeSplMem(pwszStrings[0]); + DllFreeSplMem(pwszStrings[2]); } *pcReturned = i; @@ -452,6 +510,24 @@ Cleanup: return dwErrorCode; +} + +static DWORD +_LocalEnumPrintersLevel2(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; +} + +static DWORD +_LocalEnumPrintersLevel4(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; +} + +static DWORD +_LocalEnumPrintersLevel5(DWORD Flags, PCWSTR Name, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return ERROR_INVALID_LEVEL; } BOOL WINAPI @@ -465,24 +541,47 @@ *pcbNeeded = 0; *pcReturned = 0; - // Think positive :) - // Treat it as success if the caller queried no information and we don't need to return any. - dwErrorCode = ERROR_SUCCESS; - - if (Flags & PRINTER_ENUM_LOCAL) - { - // The function behaves quite differently for each level. - if (Level == 1) - { - dwErrorCode = _LocalEnumPrintersLevel1(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - } - else - { - // TODO: Handle other levels. - // The caller supplied an invalid level. - dwErrorCode = ERROR_INVALID_LEVEL; - goto Cleanup; - } + if (Flags & PRINTER_ENUM_CONNECTIONS || Flags & PRINTER_ENUM_REMOTE || Flags & PRINTER_ENUM_NETWORK) + { + // If the flags for the Network Print Provider are given, bail out with ERROR_INVALID_NAME. + // This is the internal way for a Print Provider to signal that it doesn't handle this request. + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; + } + + if (!(Flags & PRINTER_ENUM_LOCAL || Flags & PRINTER_ENUM_NAME)) + { + // The Local Print Provider is the right destination for the request, but without any of these flags, + // there is no information that can be returned. + // So just signal a successful request. + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + if (Level == 0) + { + dwErrorCode = _LocalEnumPrintersLevel0(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 1) + { + dwErrorCode = _LocalEnumPrintersLevel1(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 2) + { + dwErrorCode = _LocalEnumPrintersLevel2(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 4) + { + dwErrorCode = _LocalEnumPrintersLevel4(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else if (Level == 5) + { + dwErrorCode = _LocalEnumPrintersLevel5(Flags, Name, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + } + else + { + // The caller supplied an invalid level. + dwErrorCode = ERROR_INVALID_LEVEL; } Cleanup: Modified: trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -160,10 +160,7 @@ // Open the environment registry key. dwErrorCode = _OpenEnvironment(wszCurrentEnvironment, &hKey); if (dwErrorCode != ERROR_SUCCESS) - { - ERR("_OpenEnvironment failed with error %lu!\n", dwErrorCode); - goto Cleanup; - } + goto Cleanup; // Open the "Print Processors" subkey. dwErrorCode = (DWORD)RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); @@ -494,10 +491,7 @@ // We use the registry and not the PrintProcessorList here, because the caller may request information about a different environment. dwErrorCode = _OpenEnvironment(pEnvironment, &hKey); if (dwErrorCode != ERROR_SUCCESS) - { - ERR("_OpenEnvironment failed with error %lu!\n", dwErrorCode); - goto Cleanup; - } + goto Cleanup; // Open the "Print Processors" subkey. dwErrorCode = (DWORD)RegOpenKeyExW(hKey, L"Print Processors", 0, KEY_READ, &hSubKey); Modified: trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/dll/fpE… ============================================================================== --- trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler API Tests Injected DLL * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for fpEnumPrinters - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -22,6 +22,8 @@ START_TEST(fpEnumPrinters) { + BYTE TempBuffer[50]; + BYTE ZeroBuffer[50]; DWORD cbNeeded; DWORD cbTemp; DWORD dwReturned; @@ -33,18 +35,30 @@ if (!GetLocalsplFuncs(&pp)) return; + // Verify that fpEnumPrinters returns success and zeros cbNeeded and dwReturned (but not TempBuffer!) if no flag has been specified. + memset(TempBuffer, 0xDE, sizeof(TempBuffer)); + memset(ZeroBuffer, 0, sizeof(ZeroBuffer)); + cbNeeded = 0xDEADBEEF; + dwReturned = 0xDEADBEEF; + SetLastError(0xDEADBEEF); + ok(pp.fpEnumPrinters(0, NULL, 1, TempBuffer, sizeof(TempBuffer), &cbNeeded, &dwReturned), "fpEnumPrinters returns FALSE\n"); + ok(GetLastError() == ERROR_SUCCESS, "fpEnumPrinters returns error %lu!\n", GetLastError()); + ok(memcmp(TempBuffer, ZeroBuffer, sizeof(TempBuffer)) != 0, "TempBuffer has been zeroed!\n"); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + // Verify that localspl only returns information about a single print provider (namely itself). cbNeeded = 0xDEADBEEF; dwReturned = 0xDEADBEEF; SetLastError(0xDEADBEEF); - ok(!pp.fpEnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "fpEnumPrinters returns TRUE\n"); + ok(!pp.fpEnumPrinters(PRINTER_ENUM_NAME, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "fpEnumPrinters returns TRUE\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "fpEnumPrinters returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); SetLastError(0xDEADBEEF); pPrinterInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded); - ok(pp.fpEnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, NULL, 1, (PBYTE)pPrinterInfo1, cbNeeded, &cbNeeded, &dwReturned), "fpEnumPrinters returns FALSE\n"); + ok(pp.fpEnumPrinters(PRINTER_ENUM_NAME, NULL, 1, (PBYTE)pPrinterInfo1, cbNeeded, &cbNeeded, &dwReturned), "fpEnumPrinters returns FALSE\n"); ok(GetLastError() == ERROR_SUCCESS, "fpEnumPrinters returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 1, "dwReturned is %lu!\n", dwReturned); Modified: trunk/rostests/apitests/winspool/EnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/EnumPri… ============================================================================== --- trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] Sun Apr 16 14:12:01 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler DLL API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for EnumPrintersA/EnumPrintersW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -15,12 +15,25 @@ START_TEST(EnumPrinters) { + BYTE TempBuffer[50]; + BYTE ZeroBuffer[50] = { 0 }; DWORD cbNeeded; DWORD cbTemp; DWORD dwReturned; PVOID pMem; DWORD i; DWORD dwValidLevels[] = { 0, 1, 2, 4, 5 }; + + // Verify that EnumPrintersW returns success and zeroes all input variables even though no flag has been specified. + memset(TempBuffer, 0xDE, sizeof(TempBuffer)); + cbNeeded = 0xDEADBEEF; + dwReturned = 0xDEADBEEF; + SetLastError(0xDEADBEEF); + ok(EnumPrintersW(0, NULL, 1, TempBuffer, sizeof(TempBuffer), &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE\n"); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(memcmp(TempBuffer, ZeroBuffer, sizeof(TempBuffer)) == 0, "TempBuffer has not been zeroed!\n"); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); // Level 5 is the highest supported under Windows Server 2003. Higher levels need to fail and leave the variables untouched! cbNeeded = 0xDEADBEEF; @@ -69,7 +82,7 @@ ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", dwValidLevels[i]); ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); - // Same error has to occur with a size to small. + // Same error has to occur with no buffer, but a size < 4 (AlignRpcPtr comes into play here). SetLastError(0xDEADBEEF); ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, 1, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs